Commit in reactos on MAIN
include/funcs.h+24-241.65 -> 1.66
lib/kernel32/misc/stubs.c+4-41.95 -> 1.96
w32api/include/ddk/ntapi.h+10-101.12 -> 1.13
+38-38
3 modified files
fixed some function prototypes

reactos/include
funcs.h 1.65 -> 1.66
diff -u -r1.65 -r1.66
--- funcs.h	24 Oct 2004 20:37:25 -0000	1.65
+++ funcs.h	4 Dec 2004 19:28:47 -0000	1.66
@@ -1352,9 +1352,9 @@
 NTSTATUS
 STDCALL
 NtAllocateUserPhysicalPages(
-	IN HANDLE ProcessHandle,
-	IN PULONG NumberOfPages,
-	OUT PULONG PageFrameNumbers
+	IN HANDLE  ProcessHandle,
+	IN OUT PULONG_PTR  NumberOfPages,
+	OUT PULONG_PTR  UserPfnArray
 	);
 
 NTSTATUS
@@ -1396,8 +1396,8 @@
 STDCALL
 NtFreeUserPhysicalPages(
 	IN HANDLE ProcessHandle,
-	IN OUT PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN OUT PULONG_PTR NumberOfPages,
+	IN PULONG_PTR UserPfnArray
 	);
 
 NTSTATUS
@@ -1434,17 +1434,17 @@
 NTSTATUS
 STDCALL
 NtMapUserPhysicalPages(
-	IN PVOID BaseAddress,
-	IN PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN PVOID VirtualAddress,
+	IN ULONG_PTR NumberOfPages,
+	IN PULONG_PTR PageArray  OPTIONAL
 	);
 
 NTSTATUS
 STDCALL
 NtMapUserPhysicalPagesScatter(
-	IN PVOID *BaseAddresses,
-	IN PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN PVOID *VirtualAddresses,
+	IN ULONG_PTR NumberOfPages,
+	IN PULONG_PTR PageArray  OPTIONAL
 	);
 
 NTSTATUS
@@ -1782,9 +1782,9 @@
 NTSTATUS
 STDCALL
 ZwAllocateUserPhysicalPages(
-	IN HANDLE ProcessHandle,
-	IN PULONG NumberOfPages,
-	OUT PULONG PageFrameNumbers
+	IN HANDLE  ProcessHandle,
+	IN OUT PULONG_PTR  NumberOfPages,
+	OUT PULONG_PTR  UserPfnArray
 	);
 
 NTSTATUS
@@ -1843,8 +1843,8 @@
 STDCALL
 ZwFreeUserPhysicalPages(
 	IN HANDLE ProcessHandle,
-	IN OUT PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN OUT PULONG_PTR NumberOfPages,
+	IN PULONG_PTR UserPfnArray
 	);
 
 NTSTATUS
@@ -1881,17 +1881,17 @@
 NTSTATUS
 STDCALL
 ZwMapUserPhysicalPages(
-	IN PVOID BaseAddress,
-	IN PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN PVOID VirtualAddress,
+	IN ULONG_PTR NumberOfPages,
+	IN PULONG_PTR PageArray  OPTIONAL
 	);
 
 NTSTATUS
 STDCALL
 ZwMapUserPhysicalPagesScatter(
-	IN PVOID *BaseAddresses,
-	IN PULONG NumberOfPages,
-	IN PULONG PageFrameNumbers
+	IN PVOID *VirtualAddresses,
+	IN ULONG_PTR NumberOfPages,
+	IN PULONG_PTR PageArray  OPTIONAL
 	);
 
 NTSTATUS
@@ -3004,7 +3004,7 @@
 AllocateUserPhysicalPages(
     HANDLE hProcess,
     PULONG_PTR NumberOfPages,
-    PULONG_PTR PageArray
+    PULONG_PTR UserPfnArray
     );
 
 WINBOOL
@@ -3191,7 +3191,7 @@
 FreeUserPhysicalPages(
     HANDLE hProcess,
     PULONG_PTR NumberOfPages,
-    PULONG_PTR PageArray
+    PULONG_PTR UserPfnArray
     );
 
 WINBOOL

reactos/lib/kernel32/misc
stubs.c 1.95 -> 1.96
diff -u -r1.95 -r1.96
--- stubs.c	4 Dec 2004 13:59:41 -0000	1.95
+++ stubs.c	4 Dec 2004 19:28:47 -0000	1.96
@@ -1,4 +1,4 @@
-/* $Id: stubs.c,v 1.95 2004/12/04 13:59:41 ekohl Exp $
+/* $Id: stubs.c,v 1.96 2004/12/04 19:28:47 weiden Exp $
  *
  * KERNEL32.DLL stubs (STUB functions)
  * Remove from this file, if you implement them.
@@ -419,7 +419,7 @@
 AllocateUserPhysicalPages(
     HANDLE hProcess,
     PULONG_PTR NumberOfPages,
-    PULONG_PTR PageArray
+    PULONG_PTR UserPfnArray
     )
 {
     STUB;
@@ -746,7 +746,7 @@
 MapUserPhysicalPages(
     PVOID VirtualAddress,
     ULONG_PTR NumberOfPages,
-    PULONG_PTR PageArray OPTIONAL
+    PULONG_PTR PageArray  OPTIONAL
     )
 {
     STUB;
@@ -761,7 +761,7 @@
 MapUserPhysicalPagesScatter(
     PVOID *VirtualAddresses,
     ULONG_PTR NumberOfPages,
-    PULONG_PTR PageArray OPTIONAL
+    PULONG_PTR PageArray  OPTIONAL
     )
 {
     STUB;

reactos/w32api/include/ddk
ntapi.h 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- ntapi.h	19 Nov 2004 01:30:35 -0000	1.12
+++ ntapi.h	4 Dec 2004 19:28:47 -0000	1.13
@@ -1106,32 +1106,32 @@
 NTAPI
 ZwAllocateUserPhysicalPages(
 	IN HANDLE  ProcessHandle,
-	IN PULONG  NumberOfPages,
-	OUT PULONG  PageFrameNumbers);
+	IN OUT PULONG_PTR  NumberOfPages,
+	OUT PULONG_PTR  UserPfnArray);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwFreeUserPhysicalPages(
 	IN HANDLE  ProcessHandle,
-	IN OUT PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+	IN OUT PULONG_PTR  NumberOfPages,
+	IN PULONG_PTR  UserPfnArray);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwMapUserPhysicalPages(
-	IN PVOID  BaseAddress,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+	IN PVOID  VirtualAddress,
+	IN ULONG_PTR  NumberOfPages,
+	IN PULONG_PTR  PageArray  OPTIONAL);
 
 NTOSAPI
 NTSTATUS
 NTAPI
 ZwMapUserPhysicalPagesScatter(
-	IN PVOID  *BaseAddresses,
-	IN PULONG  NumberOfPages,
-	IN PULONG  PageFrameNumbers);
+	IN PVOID  *VirtualAddresses,
+	IN ULONG_PTR  NumberOfPages,
+	IN PULONG_PTR  PageArray  OPTIONAL);
 
 NTOSAPI
 NTSTATUS
CVSspam 0.2.8