projects / reactos.git / blob
? search:


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