[ros-diffs] [fireball] 37399: - Cleanup 37394, 37396 and 37397: * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE. * Fix headers, actual stub, and usage in kernel32 respectively. * We don't use hungarian notation in RTL ("hFileHandle") .

fireball at svn.reactos.org fireball at svn.reactos.org
Mon Nov 17 14:16:08 CET 2008


Author: fireball
Date: Mon Nov 17 07:16:07 2008
New Revision: 37399

URL: http://svn.reactos.org/svn/reactos?rev=37399&view=rev
Log:
- Cleanup 37394, 37396 and 37397:
 * PRTL_OVERLAPPED_COMPLETION_ROUTINE is a Wine invention. We already have a type for that, since it's an APC routine, the type will be PIO_APC_ROUTINE.
 * Fix headers, actual stub, and usage in kernel32 respectively.
 * We don't use hungarian notation in RTL ("hFileHandle") .

Modified:
    trunk/reactos/dll/win32/kernel32/misc/stubs.c
    trunk/reactos/include/ndk/rtlfuncs.h
    trunk/reactos/include/ndk/rtltypes.h
    trunk/reactos/lib/rtl/workitem.c

Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/stubs.c?rev=37399&r1=37398&r2=37399&view=diff
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Mon Nov 17 07:16:07 2008
@@ -355,7 +355,7 @@
     DPRINT("(%p, %p, %d)\n", FileHandle, Function, Flags);
 
     Status = RtlSetIoCompletionCallback(FileHandle,
-                                        (PRTL_OVERLAPPED_COMPLETION_ROUTINE) Function,
+                                        (PIO_APC_ROUTINE)Function,
                                         Flags);
 
     if (!NT_SUCCESS(Status))

Modified: trunk/reactos/include/ndk/rtlfuncs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev=37399&r1=37398&r2=37399&view=diff
==============================================================================
--- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Nov 17 07:16:07 2008
@@ -2065,7 +2065,7 @@
 NTAPI
 RtlSetIoCompletionCallback(
     IN HANDLE FileHandle,
-    IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function,
+    IN PIO_APC_ROUTINE Callback,
     IN ULONG Flags
 );
 

Modified: trunk/reactos/include/ndk/rtltypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev=37399&r1=37398&r2=37399&view=diff
==============================================================================
--- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Mon Nov 17 07:16:07 2008
@@ -430,16 +430,6 @@
 extern const PRTL_REALLOCATE_STRING_ROUTINE RtlReallocateStringRoutine;
 
 #endif
-
-//
-// Callback for RtlSetIoCompletionCallback
-//
-typedef VOID
-(NTAPI *PRTL_OVERLAPPED_COMPLETION_ROUTINE)(
-    ULONG,
-    ULONG,
-    PVOID
-);
 
 //
 // Callback for RTL Heap Enumeration

Modified: trunk/reactos/lib/rtl/workitem.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=37399&r1=37398&r2=37399&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/workitem.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/workitem.c [iso-8859-1] Mon Nov 17 07:16:07 2008
@@ -885,8 +885,8 @@
  */
 NTSTATUS
 NTAPI
-RtlSetIoCompletionCallback(IN HANDLE hFileHandle,
-                           IN PRTL_OVERLAPPED_COMPLETION_ROUTINE Function,
+RtlSetIoCompletionCallback(IN HANDLE FileHandle,
+                           IN PIO_APC_ROUTINE Callback,
                            IN ULONG Flags)
 {
     UNIMPLEMENTED;



More information about the Ros-diffs mailing list