drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff

   1 Index: drivers/filesystems/cdfs_new/deviosup.c
   2 ===================================================================
   3 --- drivers/filesystems/cdfs_new/deviosup.c     (revision 34615)
   4 +++ drivers/filesystems/cdfs_new/deviosup.c     (working copy)
   5 @@ -165,6 +165,7 @@
   6      );
   7
   8  NTSTATUS
   9 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  10  CdMultiSyncCompletionRoutine (
  11      IN PDEVICE_OBJECT DeviceObject,
  12      IN PIRP Irp,
  13 @@ -172,6 +173,7 @@
  14      );
  15
  16  NTSTATUS
  17 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  18  CdMultiAsyncCompletionRoutine (
  19      IN PDEVICE_OBJECT DeviceObject,
  20      IN PIRP Irp,
  21 @@ -179,6 +181,7 @@
  22      );
  23
  24  NTSTATUS
  25 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  26  CdSingleSyncCompletionRoutine (
  27      IN PDEVICE_OBJECT DeviceObject,
  28      IN PIRP Irp,
  29 @@ -186,6 +189,7 @@
  30      );
  31
  32  NTSTATUS
  33 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  34  CdSingleAsyncCompletionRoutine (
  35      IN PDEVICE_OBJECT DeviceObject,
  36      IN PIRP Irp,
  37 @@ -2943,6 +2947,7 @@
  38  //
  39
  40  NTSTATUS
  41 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  42  CdMultiSyncCompletionRoutine (
  43      IN PDEVICE_OBJECT DeviceObject,
  44      IN PIRP Irp,
  45 @@ -3029,6 +3034,7 @@
  46  //
  47
  48  NTSTATUS
  49 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  50  CdMultiAsyncCompletionRoutine (
  51      IN PDEVICE_OBJECT DeviceObject,
  52      IN PIRP Irp,
  53 @@ -3066,7 +3072,8 @@
  54
  55  {
  56      PCD_IO_CONTEXT IoContext = Context;
  57 -    PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
  58 +    /* ReactOS Change: GCC Unused Variable */
  59 +    //PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
  60
  61      AssertVerifyDeviceIrp( Irp );
  62
  63 @@ -3148,6 +3155,7 @@
  64  //
  65
  66  NTSTATUS
  67 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  68  CdSingleSyncCompletionRoutine (
  69      IN PDEVICE_OBJECT DeviceObject,
  70      IN PIRP Irp,
  71 @@ -3207,6 +3215,7 @@
  72  //
  73
  74  NTSTATUS
  75 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
  76  CdSingleAsyncCompletionRoutine (
  77      IN PDEVICE_OBJECT DeviceObject,
  78      IN PIRP Irp,
  79 @@ -3267,7 +3276,7 @@
  80      //  and finally, free the context record.
  81      //
  82
  83 -    CdFreeIoContext( (PCD_IO_CONTEXT) Context );
  84 +    CdFreeIoContext(  Context ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */
  85      return STATUS_SUCCESS;
  86
  87      UNREFERENCED_PARAMETER( DeviceObject );
  88 Index: drivers/filesystems/cdfs_new/dirctrl.c
  89 ===================================================================
  90 --- drivers/filesystems/cdfs_new/dirctrl.c      (revision 34615)
  91 +++ drivers/filesystems/cdfs_new/dirctrl.c      (working copy)
  92 @@ -209,7 +209,7 @@
  93
  94      ULONG BaseLength;
  95
  96 -    PFILE_BOTH_DIR_INFORMATION DirInfo;
  97 +    PFILE_BOTH_DIR_INFORMATION DirInfo = NULL; /* ReactOS Change: GCC Uninit var */
  98      PFILE_NAMES_INFORMATION NamesInfo;
  99      PFILE_ID_FULL_DIR_INFORMATION IdFullDirInfo;
 100      PFILE_ID_BOTH_DIR_INFORMATION IdBothDirInfo;
 101 @@ -579,6 +579,9 @@
 102                      NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes;
 103
 104                      break;
 105 +
 106 +                /* ReactOS Change: GCC "enumeration value not handled in switch" */
 107 +                default: break;
 108                  }
 109
 110                  //
 111 Index: drivers/filesystems/cdfs_new/create.c
 112 ===================================================================
 113 --- drivers/filesystems/cdfs_new/create.c       (revision 34615)
 114 +++ drivers/filesystems/cdfs_new/create.c       (working copy)
 115 @@ -2106,7 +2106,7 @@
 116      PFCB NextFcb;
 117      PFCB ParentFcb = NULL;
 118
 119 -    NTSTATUS Status;
 120 +    NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC uninitialized variable */
 121
 122      PAGED_CODE();
 123
 124 @@ -2757,8 +2757,8 @@
 125                  OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
 126                                                   IrpContext->Irp,
 127                                                   IrpContext,
 128 -                                                 CdOplockComplete,
 129 -                                                 CdPrePostIrp );
 130 +                                                 (PVOID)CdOplockComplete,   /* ReactOS Change: GCC "assignment from incompatible pointer type" */
 131 +                                                 (PVOID)CdPrePostIrp );   /* ReactOS Change: GCC "assignment from incompatible pointer type" */
 132
 133                  if (OplockStatus == STATUS_PENDING) {
 134
 135 @@ -2789,8 +2789,8 @@
 136              OplockStatus = FsRtlCheckOplock( &Fcb->Oplock,
 137                                               IrpContext->Irp,
 138                                               IrpContext,
 139 -                                             CdOplockComplete,
 140 -                                             CdPrePostIrp );
 141 +                                             (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 142 +                                             (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 143
 144              if (OplockStatus == STATUS_PENDING) {
 145
 146 Index: drivers/filesystems/cdfs_new/devctrl.c
 147 ===================================================================
 148 --- drivers/filesystems/cdfs_new/devctrl.c      (revision 34615)
 149 +++ drivers/filesystems/cdfs_new/devctrl.c      (working copy)
 150 @@ -64,7 +64,7 @@
 151      PIO_STACK_LOCATION IrpSp;
 152      PIO_STACK_LOCATION NextIrpSp;
 153
 154 -    PVOID TargetBuffer = NULL;
 155 +//    PVOID TargetBuffer = NULL; /* ReactOS Change: GCC unused variable */
 156
 157      PAGED_CODE();
 158
 159 Index: drivers/filesystems/cdfs_new/close.c
 160 ===================================================================
 161 --- drivers/filesystems/cdfs_new/close.c        (revision 34615)
 162 +++ drivers/filesystems/cdfs_new/close.c        (working copy)
 163 @@ -77,6 +77,7 @@
 164      );
 165
 166  VOID
 167 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 168  CdCloseWorker (
 169      IN PDEVICE_OBJECT DeviceObject,
 170      IN PVOID Context
 171 @@ -136,9 +137,9 @@
 172      //
 173      //  Continue processing until there are no more closes to process.
 174      //
 175 +    /* ReactOS Change: "GCC suggest parentheses around assignment used as truth value" */
 176 +    while ((IrpContext = CdRemoveClose( Vcb ))) {
 177
 178 -    while (IrpContext = CdRemoveClose( Vcb )) {
 179 -
 180          //
 181          //  If we don't have an IrpContext then use the one on the stack.
 182          //  Initialize it for this request.
 183 @@ -165,7 +166,7 @@
 184              //  Free the IrpContextLite.
 185              //
 186
 187 -            CdFreeIrpContextLite( (PIRP_CONTEXT_LITE) IrpContext );
 188 +            CdFreeIrpContextLite( IrpContext ); /* ReactOS Change: GCC "error: invalid lvalue in unary '&'" */
 189
 190              //
 191              //  Remember we have the IrpContext from the stack.
 192 @@ -662,6 +663,7 @@
 193  }
 194
 195  VOID
 196 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 197  CdCloseWorker (
 198      IN PDEVICE_OBJECT DeviceObject,
 199      IN PVOID Context
 200 Index: drivers/filesystems/cdfs_new/dirsup.c
 201 ===================================================================
 202 --- drivers/filesystems/cdfs_new/dirsup.c       (revision 34615)
 203 +++ drivers/filesystems/cdfs_new/dirsup.c       (working copy)
 204 @@ -465,7 +465,7 @@
 205      //  Save a pointer to the time stamps.
 206      //
 207
 208 -    Dirent->CdTime = RawDirent->RecordTime;
 209 +    Dirent->CdTime = (PCHAR)RawDirent->RecordTime; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */
 210
 211      //
 212      //  Copy the dirent flags.
 213 @@ -501,7 +501,7 @@
 214      }
 215
 216      Dirent->FileNameLen = RawDirent->FileIdLen;
 217 -    Dirent->FileName = RawDirent->FileId;
 218 +    Dirent->FileName = (PCHAR)RawDirent->FileId; /* ReactOS change: GCC "pointer targets in assignment differ in signedness" */
 219
 220      //
 221      //  If there are any remaining bytes at the end of the dirent then
 222 @@ -1457,7 +1457,7 @@
 223  --*/
 224
 225  {
 226 -    XA_EXTENT_TYPE ExtentType;
 227 +    XA_EXTENT_TYPE ExtentType = 0; /* ReactOS Change: GCC Uninit var */
 228      PCOMPOUND_DIRENT CurrentCompoundDirent;
 229      PDIRENT CurrentDirent;
 230
 231 Index: drivers/filesystems/cdfs_new/read.c
 232 ===================================================================
 233 --- drivers/filesystems/cdfs_new/read.c (revision 34615)
 234 +++ drivers/filesystems/cdfs_new/read.c (working copy)
 235 @@ -79,7 +79,7 @@
 236  --*/
 237
 238  {
 239 -    NTSTATUS Status;
 240 +    NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Uninit var */
 241      PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation( Irp );
 242
 243      TYPE_OF_OPEN TypeOfOpen;
 244 @@ -225,8 +225,8 @@
 245              Status = FsRtlCheckOplock( &Fcb->Oplock,
 246                                         Irp,
 247                                         IrpContext,
 248 -                                       CdOplockComplete,
 249 -                                       CdPrePostIrp );
 250 +                                       (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 251 +                                       (PVOID)CdPrePostIrp );/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 252
 253              //
 254              //  If the result is not STATUS_SUCCESS then the Irp was completed
 255 Index: drivers/filesystems/cdfs_new/volinfo.c
 256 ===================================================================
 257 --- drivers/filesystems/cdfs_new/volinfo.c      (revision 34615)
 258 +++ drivers/filesystems/cdfs_new/volinfo.c      (working copy)
 259 @@ -166,8 +166,11 @@
 260
 261              Status = CdQueryFsAttributeInfo( IrpContext, Fcb->Vcb, Irp->AssociatedIrp.SystemBuffer, &Length );
 262              break;
 263 +
 264 +        /* ReactOS Change: GCC "enumeration value not handled in switch" */
 265 +        default: break;
 266          }
 267 -
 268 +
 269          //
 270          //  Set the information field to the number of bytes actually filled in
 271          //
 272 Index: drivers/filesystems/cdfs_new/cdfs.rbuild
 273 ===================================================================
 274 --- drivers/filesystems/cdfs_new/cdfs.rbuild    (revision 34615)
 275 +++ drivers/filesystems/cdfs_new/cdfs.rbuild    (working copy)
 276 @@ -1,8 +1,8 @@
 277  <?xml version="1.0"?>
 278  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 279 -<module name="cdfs_new" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs_new.sys">
 280 +<module name="cdfs" type="kernelmodedriver" installbase="system32/drivers" installname="cdfs.sys">
 281         <bootstrap installbase="$(CDOUTPUT)" />
 282 -       <include base="cdfs_new">.</include>
 283 +       <include base="cdfs">.</include>
 284         <library>ntoskrnl</library>
 285         <library>hal</library>
 286      <file>allocsup.c</file>
 287 @@ -32,6 +32,5 @@
 288      <file>volinfo.c</file>
 289      <file>workque.c</file>
 290         <file>cdfs.rc</file>
 291 -    <compilerflag>-fms-extensions</compilerflag>
 292         <pch>cdprocs.h</pch>
 293  </module>
 294 Index: drivers/filesystems/cdfs_new/cddata.c
 295 ===================================================================
 296 --- drivers/filesystems/cdfs_new/cddata.c       (revision 34615)
 297 +++ drivers/filesystems/cdfs_new/cddata.c       (working copy)
 298 @@ -417,7 +417,6 @@
 299      return Status;
 300  }
 301
 302 -
 303  #ifdef CD_SANITY
 304
 305  VOID
 306 @@ -481,7 +480,6 @@
 307
 308  #endif
 309
 310 -
 311  LONG
 312  CdExceptionFilter (
 313      IN PIRP_CONTEXT IrpContext,
 314 @@ -1006,6 +1004,7 @@
 315
 316  \f
 317  BOOLEAN
 318 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 319  CdFastIoCheckIfPossible (
 320      IN PFILE_OBJECT FileObject,
 321      IN PLARGE_INTEGER FileOffset,
 322 Index: drivers/filesystems/cdfs_new/allocsup.c
 323 ===================================================================
 324 --- drivers/filesystems/cdfs_new/allocsup.c     (revision 34615)
 325 +++ drivers/filesystems/cdfs_new/allocsup.c     (working copy)
 326 @@ -128,7 +128,7 @@
 327  {
 328      BOOLEAN FirstPass = TRUE;
 329      ULONG McbEntryOffset;
 330 -    PFCB ParentFcb;
 331 +    PFCB ParentFcb = NULL; /* ReactOS Change: GCC uninitialized variable bug */
 332      BOOLEAN CleanupParent = FALSE;
 333
 334      BOOLEAN UnlockFcb = FALSE;
 335 Index: drivers/filesystems/cdfs_new/verfysup.c
 336 ===================================================================
 337 --- drivers/filesystems/cdfs_new/verfysup.c     (revision 34615)
 338 +++ drivers/filesystems/cdfs_new/verfysup.c     (working copy)
 339 @@ -431,7 +431,7 @@
 340      ULONG MediaChangeCount = 0;
 341      BOOLEAN ForceVerify = FALSE;
 342      BOOLEAN DevMarkedForVerify;
 343 -    KIRQL SavedIrql;
 344 +    //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */
 345
 346      PAGED_CODE();
 347
 348 @@ -581,6 +581,9 @@
 349
 350          CdRaiseStatus( IrpContext, STATUS_FILE_INVALID );
 351          break;
 352 +
 353 +    /* ReactOS Change: GCC "enumeration value not handled in switch" */
 354 +    default: break;
 355      }
 356  }
 357
 358 @@ -613,7 +616,7 @@
 359  --*/
 360
 361  {
 362 -    NTSTATUS Status = STATUS_SUCCESS;
 363 +    //NTSTATUS Status = STATUS_SUCCESS; /* ReactOS Change: GCC Unused variable */
 364      PVCB Vcb = Fcb->Vcb;
 365      PDEVICE_OBJECT RealDevice = Vcb->Vpb->RealDevice;
 366      PIRP Irp;
 367 Index: drivers/filesystems/cdfs_new/filobsup.c
 368 ===================================================================
 369 --- drivers/filesystems/cdfs_new/filobsup.c     (revision 34615)
 370 +++ drivers/filesystems/cdfs_new/filobsup.c     (working copy)
 371 @@ -105,7 +105,7 @@
 372      FileObject->FsContext = Fcb;
 373      FileObject->FsContext2 = Ccb;
 374
 375 -    SetFlag( ((ULONG_PTR) FileObject->FsContext2), TypeOfOpen );
 376 +    SetFlag( (*(PULONG_PTR)&FileObject->FsContext2), TypeOfOpen ); /* ReactOS Change: GCC "invalid lvalue in assignment" */
 377
 378      //
 379      //  Set the Vpb field in the file object.
 380 @@ -176,7 +176,7 @@
 381          *Fcb = FileObject->FsContext;
 382          *Ccb = FileObject->FsContext2;
 383
 384 -        ClearFlag( (ULONG_PTR) *Ccb, TYPE_OF_OPEN_MASK );
 385 +        ClearFlag( (*(PULONG_PTR)Ccb), TYPE_OF_OPEN_MASK ); /* ReactOS Change: GCC "invalid lvalue in assignment" */
 386      }
 387
 388      //
 389 Index: drivers/filesystems/cdfs_new/pathsup.c
 390 ===================================================================
 391 --- drivers/filesystems/cdfs_new/pathsup.c      (revision 34615)
 392 +++ drivers/filesystems/cdfs_new/pathsup.c      (working copy)
 393 @@ -764,7 +764,7 @@
 394
 395      PathEntry->PathEntryLength = WordAlign( PathEntry->PathEntryLength );
 396
 397 -    PathEntry->DirName = RawPathEntry->DirId;
 398 +    PathEntry->DirName = (PCHAR)RawPathEntry->DirId; /* ReactOS Change: GCC "assignment makes pointer from integer without a cast" */
 399
 400      return TRUE;
 401  }
 402 Index: drivers/filesystems/cdfs_new/cdprocs.h
 403 ===================================================================
 404 --- drivers/filesystems/cdfs_new/cdprocs.h      (revision 34615)
 405 +++ drivers/filesystems/cdfs_new/cdprocs.h      (working copy)
 406 @@ -902,33 +904,39 @@
 407  }
 408
 409  BOOLEAN
 410 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 411  CdNoopAcquire (
 412      IN PVOID Fcb,
 413      IN BOOLEAN Wait
 414      );
 415
 416  VOID
 417 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 418  CdNoopRelease (
 419      IN PVOID Fcb
 420      );
 421
 422  BOOLEAN
 423 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 424  CdAcquireForCache (
 425      IN PFCB Fcb,
 426      IN BOOLEAN Wait
 427      );
 428
 429  VOID
 430 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 431  CdReleaseFromCache (
 432      IN PFCB Fcb
 433      );
 434
 435  VOID
 436 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 437  CdAcquireForCreateSection (
 438      IN PFILE_OBJECT FileObject
 439      );
 440
 441  VOID
 442 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 443  CdReleaseForCreateSection (
 444      IN PFILE_OBJECT FileObject
 445      );
 446 @@ -1184,8 +1192,8 @@
 447  //  Verification support routines.  Contained in verfysup.c
 448  //
 449
 450 -
 451 -INLINE
 452 +/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */
 453 +static inline
 454  BOOLEAN
 455  CdOperationIsDasdOpen(
 456      IN PIRP_CONTEXT IrpContext
 457 @@ -1272,12 +1280,14 @@
 458      );
 459
 460  VOID
 461 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 462  CdPrePostIrp (
 463      IN PIRP_CONTEXT IrpContext,
 464      IN PIRP Irp
 465      );
 466
 467  VOID
 468 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 469  CdOplockComplete (
 470      IN PIRP_CONTEXT IrpContext,
 471      IN PIRP Irp
 472 @@ -1293,7 +1303,9 @@
 473  //  otherwise
 474  //
 475
 476 -//#ifndef BooleanFlagOn
 477 +/* ReactOS Change: GCC doesn't understand the comment style */
 478 +/*
 479 + //#ifndef BooleanFlagOn
 480  //#define BooleanFlagOn(F,SF) (    \
 481  //    (BOOLEAN)(((F) & (SF)) != 0) \
 482  //)
 483 @@ -1310,6 +1322,7 @@
 484  //    (Flags) &= ~(SingleFlag);         \
 485  //}
 486  //#endif
 487 +*/
 488
 489  //
 490  //      CAST
 491 @@ -1598,6 +1611,7 @@
 492  //
 493
 494  BOOLEAN
 495 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 496  CdFastQueryBasicInfo (
 497      IN PFILE_OBJECT FileObject,
 498      IN BOOLEAN Wait,
 499 @@ -1607,6 +1621,7 @@
 500      );
 501
 502  BOOLEAN
 503 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 504  CdFastQueryStdInfo (
 505      IN PFILE_OBJECT FileObject,
 506      IN BOOLEAN Wait,
 507 @@ -1616,6 +1631,7 @@
 508      );
 509
 510  BOOLEAN
 511 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 512  CdFastLock (
 513      IN PFILE_OBJECT FileObject,
 514      IN PLARGE_INTEGER FileOffset,
 515 @@ -1629,6 +1645,7 @@
 516      );
 517
 518  BOOLEAN
 519 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 520  CdFastUnlockSingle (
 521      IN PFILE_OBJECT FileObject,
 522      IN PLARGE_INTEGER FileOffset,
 523 @@ -1640,6 +1657,7 @@
 524      );
 525
 526  BOOLEAN
 527 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 528  CdFastUnlockAll (
 529      IN PFILE_OBJECT FileObject,
 530      PEPROCESS ProcessId,
 531 @@ -1648,6 +1666,7 @@
 532      );
 533
 534  BOOLEAN
 535 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 536  CdFastUnlockAllByKey (
 537      IN PFILE_OBJECT FileObject,
 538      PVOID ProcessId,
 539 @@ -1657,6 +1676,7 @@
 540      );
 541
 542  BOOLEAN
 543 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 544  CdFastIoCheckIfPossible (
 545      IN PFILE_OBJECT FileObject,
 546      IN PLARGE_INTEGER FileOffset,
 547 @@ -1669,6 +1689,7 @@
 548      );
 549
 550  BOOLEAN
 551 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 552  CdFastQueryNetworkInfo (
 553      IN PFILE_OBJECT FileObject,
 554      IN BOOLEAN Wait,
 555 @@ -1862,17 +1883,26 @@
 556  //
 557  //      #define try_return(S)  { S; goto try_exit; }
 558  //
 559 +/* ReactOS Change: Remove SEH */
 560 +#define try
 561 +#define leave goto exitLabel;
 562 +#define finally  if (0) goto exitLabel; exitLabel:
 563 +#define except(x) while (0)
 564 +#define GetExceptionCode() 0
 565 +#define AbnormalTermination() 0
 566
 567  #define try_return(S) { S; goto try_exit; }
 568  #define try_leave(S) { S; leave; }
 569
 570 +
 571  //
 572  //  Encapsulate safe pool freeing
 573  //
 574 +/* ReactOS Change: GCC "passing argument 1 of CdFreePool from incompatible pointer type" */
 575 +#define CdFreePool(x) _CdFreePool((PVOID*)(x))
 576
 577 -INLINE
 578 -VOID
 579 -CdFreePool(
 580 +/* ReactOS Change: "LD multiple definition of `_CdOperationIsDasdOpen'" */
 581 +static inline void _CdFreePool(
 582      IN PVOID *Pool
 583      )
 584  {
 585 Index: drivers/filesystems/cdfs_new/resrcsup.c
 586 ===================================================================
 587 --- drivers/filesystems/cdfs_new/resrcsup.c     (revision 34615)
 588 +++ drivers/filesystems/cdfs_new/resrcsup.c     (working copy)
 589 @@ -123,6 +123,7 @@
 590
 591  \f
 592  BOOLEAN
 593 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 594  CdAcquireForCache (
 595      IN PFCB Fcb,
 596      IN BOOLEAN Wait
 597 @@ -159,6 +160,7 @@
 598
 599  \f
 600  VOID
 601 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 602  CdReleaseFromCache (
 603      IN PFCB Fcb
 604      )
 605 @@ -193,6 +195,7 @@
 606
 607  \f
 608  BOOLEAN
 609 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 610  CdNoopAcquire (
 611      IN PVOID Fcb,
 612      IN BOOLEAN Wait
 613 @@ -224,6 +227,7 @@
 614
 615  \f
 616  VOID
 617 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 618  CdNoopRelease (
 619      IN PVOID Fcb
 620      )
 621 @@ -251,6 +255,7 @@
 622
 623  \f
 624  VOID
 625 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 626  CdAcquireForCreateSection (
 627      IN PFILE_OBJECT FileObject
 628      )
 629 @@ -298,6 +303,7 @@
 630
 631  \f
 632  VOID
 633 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 634  CdReleaseForCreateSection (
 635      IN PFILE_OBJECT FileObject
 636      )
 637 Index: drivers/filesystems/cdfs_new/namesup.c
 638 ===================================================================
 639 --- drivers/filesystems/cdfs_new/namesup.c      (revision 34615)
 640 +++ drivers/filesystems/cdfs_new/namesup.c      (working copy)
 641 @@ -206,7 +206,7 @@
 642
 643  {
 644      NTSTATUS Status;
 645 -    PVOID NewBuffer;
 646 +    //PVOID NewBuffer; /* ReactOS Change: GCC Uninitialized variable */
 647
 648      PAGED_CODE();
 649
 650 Index: drivers/filesystems/cdfs_new/cdinit.c
 651 ===================================================================
 652 --- drivers/filesystems/cdfs_new/cdinit.c       (revision 34615)
 653 +++ drivers/filesystems/cdfs_new/cdinit.c       (working copy)
 654 @@ -22,12 +22,14 @@
 655  #define BugCheckFileId                   (CDFS_BUG_CHECK_CDINIT)
 656
 657  NTSTATUS
 658 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 659  DriverEntry(
 660      IN PDRIVER_OBJECT DriverObject,
 661      IN PUNICODE_STRING RegistryPath
 662      );
 663
 664  VOID
 665 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 666  CdUnload(
 667      IN PDRIVER_OBJECT DriverObject
 668      );
 669 @@ -39,6 +41,7 @@
 670      );
 671
 672  NTSTATUS
 673 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 674  CdShutdown (
 675      IN PDEVICE_OBJECT DeviceObject,
 676      IN PIRP Irp
 677 @@ -57,6 +60,7 @@
 678  //
 679
 680  NTSTATUS
 681 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 682  DriverEntry(
 683      IN PDRIVER_OBJECT DriverObject,
 684      IN PUNICODE_STRING RegistryPath
 685 @@ -169,6 +173,7 @@
 686  }
 687
 688  NTSTATUS
 689 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 690  CdShutdown (
 691      IN PDEVICE_OBJECT DeviceObject,
 692      IN PIRP Irp
 693 @@ -200,6 +205,7 @@
 694
 695
 696  VOID
 697 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 698  CdUnload(
 699      IN PDRIVER_OBJECT DriverObject
 700      )
 701 @@ -310,10 +316,10 @@
 702      //  Initialize the cache manager callback routines
 703      //
 704
 705 -    CdData.CacheManagerCallbacks.AcquireForLazyWrite  = &CdAcquireForCache;
 706 -    CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = &CdReleaseFromCache;
 707 -    CdData.CacheManagerCallbacks.AcquireForReadAhead  = &CdAcquireForCache;
 708 -    CdData.CacheManagerCallbacks.ReleaseFromReadAhead = &CdReleaseFromCache;
 709 +    CdData.CacheManagerCallbacks.AcquireForLazyWrite  = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 710 +    CdData.CacheManagerCallbacks.ReleaseFromLazyWrite = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 711 +    CdData.CacheManagerCallbacks.AcquireForReadAhead  = (PVOID)&CdAcquireForCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 712 +    CdData.CacheManagerCallbacks.ReleaseFromReadAhead = (PVOID)&CdReleaseFromCache;/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 713
 714      CdData.CacheManagerVolumeCallbacks.AcquireForLazyWrite  = &CdNoopAcquire;
 715      CdData.CacheManagerVolumeCallbacks.ReleaseFromLazyWrite = &CdNoopRelease;
 716 Index: drivers/filesystems/cdfs_new/cdstruc.h
 717 ===================================================================
 718 --- drivers/filesystems/cdfs_new/cdstruc.h      (revision 34615)
 719 +++ drivers/filesystems/cdfs_new/cdstruc.h      (working copy)
 720 @@ -504,8 +504,8 @@
 721      //
 722
 723      ULONG VcbCleanup;
 724 -    ULONG VcbReference;
 725 -    ULONG VcbUserReference;
 726 +    LONG VcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
 727 +    LONG VcbUserReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
 728
 729      //
 730      //  Fcb for the Volume Dasd file, root directory and the Path Table.
 731 @@ -655,7 +655,7 @@
 732      //  executed later.
 733      //
 734
 735 -    ULONG PostedRequestCount;
 736 +    LONG PostedRequestCount; /* ReactOS Change: GCC "pointer targets in passing argument 1 of 'InterlockedDecrement' differ in signedness" */
 737
 738      //
 739      //  The following field indicates the number of IRP's waiting
 740 @@ -878,7 +878,7 @@
 741      //
 742
 743      ULONG FcbCleanup;
 744 -    ULONG FcbReference;
 745 +    LONG FcbReference; /* ReactOS Change: GCC 'pointer targets in passing argument 1 of 'InterlockedXxx' differ in signedness */
 746      ULONG FcbUserReference;
 747
 748      //
 749 Index: drivers/filesystems/cdfs_new/lockctrl.c
 750 ===================================================================
 751 --- drivers/filesystems/cdfs_new/lockctrl.c     (revision 34615)
 752 +++ drivers/filesystems/cdfs_new/lockctrl.c     (working copy)
 753 @@ -89,7 +89,7 @@
 754      Status = FsRtlCheckOplock( &Fcb->Oplock,
 755                                 Irp,
 756                                 IrpContext,
 757 -                               CdOplockComplete,
 758 +                               (PVOID)CdOplockComplete,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
 759                                 NULL );
 760
 761      //
 762 @@ -138,6 +138,7 @@
 763
 764  \f
 765  BOOLEAN
 766 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 767  CdFastLock (
 768      IN PFILE_OBJECT FileObject,
 769      IN PLARGE_INTEGER FileOffset,
 770 @@ -246,8 +247,8 @@
 771          //
 772          //  Now call the FsRtl routine to perform the lock request.
 773          //
 774 -
 775 -        if (Results = FsRtlFastLock( Fcb->FileLock,
 776 +        /* ReactOS Change: GCC "suggest parentheses around assignment used as truth value" */
 777 +        if ((Results = FsRtlFastLock( Fcb->FileLock,
 778                                       FileObject,
 779                                       FileOffset,
 780                                       Length,
 781 @@ -257,7 +258,7 @@
 782                                       ExclusiveLock,
 783                                       IoStatus,
 784                                       NULL,
 785 -                                     FALSE )) {
 786 +                                     FALSE ))) {
 787
 788              //
 789              //  Set the flag indicating if Fast I/O is questionable.  We
 790 @@ -284,6 +285,7 @@
 791
 792  \f
 793  BOOLEAN
 794 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 795  CdFastUnlockSingle (
 796      IN PFILE_OBJECT FileObject,
 797      IN PLARGE_INTEGER FileOffset,
 798 @@ -424,6 +426,7 @@
 799
 800  \f
 801  BOOLEAN
 802 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 803  CdFastUnlockAll (
 804      IN PFILE_OBJECT FileObject,
 805      PEPROCESS ProcessId,
 806 @@ -546,6 +549,7 @@
 807
 808  \f
 809  BOOLEAN
 810 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 811  CdFastUnlockAllByKey (
 812      IN PFILE_OBJECT FileObject,
 813      PVOID ProcessId,
 814 Index: drivers/filesystems/cdfs_new/cleanup.c
 815 ===================================================================
 816 --- drivers/filesystems/cdfs_new/cleanup.c      (revision 34615)
 817 +++ drivers/filesystems/cdfs_new/cleanup.c      (working copy)
 818 @@ -159,7 +159,7 @@
 819      //  Use a try-finally to facilitate cleanup.
 820      //
 821
 822 -    try {
 823 +    //try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
 824
 825          //
 826          //  Case on the type of open that we are trying to cleanup.
 827 @@ -279,7 +279,7 @@
 828
 829          IoRemoveShareAccess( FileObject, &Fcb->ShareAccess );
 830
 831 -    } finally {
 832 +    //} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
 833
 834          CdReleaseFcb( IrpContext, Fcb );
 835
 836 @@ -287,7 +287,7 @@
 837
 838              FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK );
 839          }
 840 -    }
 841 +    //} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */
 842
 843      //
 844      //  If appropriate, try to spark teardown by purging the volume.  Should
 845 Index: drivers/filesystems/cdfs_new/devctrl.c
 846 ===================================================================
 847 --- drivers/filesystems/cdfs_new/devctrl.c      (revision 34615)
 848 +++ drivers/filesystems/cdfs_new/devctrl.c      (working copy)
 849 @@ -27,6 +27,7 @@
 850  //
 851
 852  NTSTATUS
 853 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 854  CdDevCtrlCompletionRoutine (
 855      IN PDEVICE_OBJECT DeviceObject,
 856      IN PIRP Irp,
 857 @@ -171,6 +172,7 @@
 858  //
 859
 860  NTSTATUS
 861 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 862  CdDevCtrlCompletionRoutine (
 863      IN PDEVICE_OBJECT DeviceObject,
 864      IN PIRP Irp,
 865 Index: drivers/filesystems/cdfs_new/strucsup.c
 866 ===================================================================
 867 --- drivers/filesystems/cdfs_new/strucsup.c     (revision 34615)
 868 +++ drivers/filesystems/cdfs_new/strucsup.c     (working copy)
 869 @@ -438,7 +438,7 @@
 870  --*/
 871
 872  {
 873 -    ULONG Shift;
 874 +    //ULONG Shift; /* ReactOS Change: GCC Unused variable */
 875      ULONG StartingBlock;
 876      ULONG ByteCount;
 877
 878 Index: drivers/filesystems/cdfs_new/fileinfo.c
 879 ===================================================================
 880 --- drivers/filesystems/cdfs_new/fileinfo.c     (revision 34615)
 881 +++ drivers/filesystems/cdfs_new/fileinfo.c     (working copy)
 882 @@ -460,6 +460,7 @@
 883
 884  \f
 885  BOOLEAN
 886 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 887  CdFastQueryBasicInfo (
 888      IN PFILE_OBJECT FileObject,
 889      IN BOOLEAN Wait,
 890 @@ -577,6 +578,7 @@
 891
 892  \f
 893  BOOLEAN
 894 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 895  CdFastQueryStdInfo (
 896      IN PFILE_OBJECT FileObject,
 897      IN BOOLEAN Wait,
 898 @@ -704,6 +706,7 @@
 899
 900  \f
 901  BOOLEAN
 902 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
 903  CdFastQueryNetworkInfo (
 904      IN PFILE_OBJECT FileObject,
 905      IN BOOLEAN Wait,
 906 Index: drivers/filesystems/cdfs_new/fsctrl.c
 907 ===================================================================
 908 --- drivers/filesystems/cdfs_new/fsctrl.c       (revision 34615)
 909 +++ drivers/filesystems/cdfs_new/fsctrl.c       (working copy)
 910 @@ -82,7 +82,8 @@
 911      IN PIRP_CONTEXT IrpContext,
 912      IN PIRP Irp
 913      );
 914 -
 915 +
 916 +NTSTATUS /* ReactOS Change: Function did not have a type??? */
 917  CdIsVolumeDirty (
 918      IN PIRP_CONTEXT IrpContext,
 919      IN PIRP Irp
 920 @@ -918,7 +919,7 @@
 921
 922          if (CdIsRemount( IrpContext, Vcb, &OldVcb )) {
 923
 924 -            KIRQL SavedIrql;
 925 +            //KIRQL SavedIrql; /* ReactOS Change: GCC Unused variable */
 926
 927              ASSERT( NULL != OldVcb->SwapVpb );
 928
 929 @@ -1374,7 +1375,7 @@
 930                          //  Compute the length of the volume name
 931                          //
 932
 933 -                        AnsiLabel.Buffer = CdRvdVolId( RawIsoVd, Vcb->VcbState );
 934 +                        AnsiLabel.Buffer = (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ); /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 935                          AnsiLabel.MaximumLength = AnsiLabel.Length = VOLUME_ID_LENGTH;
 936
 937                          UnicodeLabel.MaximumLength = VOLUME_ID_LENGTH * sizeof( WCHAR );
 938 @@ -1401,7 +1402,7 @@
 939                      } else {
 940
 941                          CdConvertBigToLittleEndian( IrpContext,
 942 -                                                    CdRvdVolId( RawIsoVd, Vcb->VcbState ),
 943 +                                                    (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 944                                                      VOLUME_ID_LENGTH,
 945                                                      (PCHAR) VolumeLabel );
 946
 947 @@ -2005,7 +2006,7 @@
 948  //
 949  //  Local support routine
 950  //
 951 -
 952 +NTSTATUS /* ReactOS Change: Function did not have a type??? */
 953  CdIsVolumeDirty (
 954      IN PIRP_CONTEXT IrpContext,
 955      IN PIRP Irp
 956 @@ -2296,9 +2297,9 @@
 957                                          0,
 958                                          *IoFileObjectType,
 959                                          KernelMode,
 960 -                                        &FileToMarkBad,
 961 +                                        (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */
 962                                          NULL );
 963
 964      if (!NT_SUCCESS(Status)) {
 965 @@ -2642,8 +2643,8 @@
 966                      //  The track address is BigEndian, we need to flip the bytes.
 967                      //
 968
 969 -                    Source = (PUCHAR) &CdromToc->TrackData[0].Address[3];
 970 -                    Dest = (PUCHAR) &BaseSector;
 971 +                    Source = (PCHAR) &CdromToc->TrackData[0].Address[3];/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 972 +                    Dest = (PCHAR) &BaseSector; /* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 973
 974                      do {
 975
 976 @@ -3118,7 +3119,7 @@
 977          if (NT_SUCCESS( RtlOemToUnicodeN( &Vcb->Vpb->VolumeLabel[0],
 978                                            MAXIMUM_VOLUME_LABEL_LENGTH,
 979                                            &Length,
 980 -                                          CdRvdVolId( RawIsoVd, Vcb->VcbState ),
 981 +                                          (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 982                                            VOLUME_ID_LENGTH ))) {
 983
 984              Vcb->Vpb->VolumeLabelLength = (USHORT) Length;
 985 @@ -3131,7 +3132,7 @@
 986      } else {
 987
 988          CdConvertBigToLittleEndian( IrpContext,
 989 -                                    CdRvdVolId( RawIsoVd, Vcb->VcbState ),
 990 +                                    (PCHAR)CdRvdVolId( RawIsoVd, Vcb->VcbState ),/* ReactOS Change: GCC "pointer targets in assignment differ in signedness" */
 991                                      VOLUME_ID_LENGTH,
 992                                      (PCHAR) Vcb->Vpb->VolumeLabel );
 993
 994 Index: drivers/filesystems/cdfs_new/pnp.c
 995 ===================================================================
 996 --- drivers/filesystems/cdfs_new/pnp.c  (revision 34615)
 997 +++ drivers/filesystems/cdfs_new/pnp.c  (working copy)
 998 @@ -51,6 +51,7 @@
 999      );
1000
1001  NTSTATUS
1002 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
1003  CdPnpCompletionRoutine (
1004      IN PDEVICE_OBJECT DeviceObject,
1005      IN PIRP Irp,
1006 @@ -774,6 +775,7 @@
1007  //
1008
1009  NTSTATUS
1010 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
1011  CdPnpCompletionRoutine (
1012      IN PDEVICE_OBJECT DeviceObject,
1013      IN PIRP Irp,
1014 Index: drivers/filesystems/cdfs_new/workque.c
1015 ===================================================================
1016 --- drivers/filesystems/cdfs_new/workque.c      (revision 34615)
1017 +++ drivers/filesystems/cdfs_new/workque.c      (working copy)
1018 @@ -97,6 +97,7 @@
1019
1020  \f
1021  VOID
1022 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
1023  CdPrePostIrp (
1024      IN PIRP_CONTEXT IrpContext,
1025      IN PIRP Irp
1026 @@ -209,6 +210,7 @@
1027
1028  \f
1029  VOID
1030 +NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
1031  CdOplockComplete (
1032      IN PIRP_CONTEXT IrpContext,
1033      IN PIRP Irp
1034 @@ -386,7 +388,7 @@
1035      //
1036
1037      ExInitializeWorkItem( &IrpContext->WorkQueueItem,
1038 -                          CdFspDispatch,
1039 +                          (PVOID)CdFspDispatch,/* ReactOS Change: GCC "assignment from incompatible pointer type" */
1040                            IrpContext );
1041
1042      ExQueueWorkItem( &IrpContext->WorkQueueItem, CriticalWorkQueue );