Dmitry Timoshkov : kernel32: Fix the size of ThreadAffinityMask to match PSDK. <dmitr...

Dmitry Timoshkov : winternl.h: Make the fields of the PROCESS_BASIC_INFORMATION structure use same type width as a PSDK one .

svn path=/trunk/; revision=31090

diff --git a/reactos/dll/win32/kernel32/thread/thread.c b/reactos/dll/win32/kernel32/thread/thread.c
index 2a819aa..25fe5b8 100644 (file)
--- a/reactos/dll/win32/kernel32/thread/thread.c
+++ b/reactos/dll/win32/kernel32/thread/thread.c
@@ -489,10 +489,10 @@ SuspendThread(HANDLE hThread)
 /*
  * @implemented
  */
-DWORD
+DWORD_PTR
 WINAPI
 SetThreadAffinityMask(HANDLE hThread,
-                      DWORD dwThreadAffinityMask)
+                      DWORD_PTR dwThreadAffinityMask)
 {
     THREAD_BASIC_INFORMATION ThreadBasic;
     KAFFINITY AffinityMask;

diff --git a/reactos/include/psdk/winbase.h b/reactos/include/psdk/winbase.h
index ee557fe..5fecc91 100644 (file)
--- a/reactos/include/psdk/winbase.h
+++ b/reactos/include/psdk/winbase.h
@@ -1998,7 +1998,7 @@ BOOL WINAPI SetSystemTime(const SYSTEMTIME*);
 BOOL WINAPI SetSystemTimeAdjustment(DWORD,BOOL);
 DWORD WINAPI SetTapeParameters(HANDLE,DWORD,PVOID);
 DWORD WINAPI SetTapePosition(HANDLE,DWORD,DWORD,DWORD,DWORD,BOOL);
-DWORD WINAPI SetThreadAffinityMask(HANDLE,DWORD);
+DWORD_PTR WINAPI SetThreadAffinityMask(HANDLE,DWORD_PTR);
 BOOL WINAPI SetThreadContext(HANDLE,const CONTEXT*);
 DWORD WINAPI SetThreadIdealProcessor(HANDLE,DWORD);
 BOOL WINAPI SetThreadPriority(HANDLE,int);

diff --git a/reactos/include/psdk/winternl.h b/reactos/include/psdk/winternl.h
index 7ac0028..21133bd 100644 (file)
--- a/reactos/include/psdk/winternl.h
+++ b/reactos/include/psdk/winternl.h
@@ -708,7 +708,7 @@ typedef struct _THREAD_BASIC_INFORMATION
     NTSTATUS  ExitStatus;
     PVOID     TebBaseAddress;
     CLIENT_ID ClientId;
-    ULONG     AffinityMask;
+    ULONG_PTR AffinityMask;
     LONG      Priority;
     LONG      BasePriority;
 } THREAD_BASIC_INFORMATION, *PTHREAD_BASIC_INFORMATION;
@@ -914,12 +914,12 @@ typedef struct _OBJECT_DATA_INFORMATION {
 
 typedef struct _PROCESS_BASIC_INFORMATION {
 #ifdef __WINESRC__
-    DWORD ExitStatus;
-    DWORD PebBaseAddress;
-    DWORD AffinityMask;
-    DWORD BasePriority;
-    ULONG UniqueProcessId;
-    ULONG InheritedFromUniqueProcessId;
+    DWORD_PTR ExitStatus;
+    PPEB PebBaseAddress;
+    DWORD_PTR AffinityMask;
+    DWORD_PTR BasePriority;
+    ULONG_PTR UniqueProcessId;
+    ULONG_PTR InheritedFromUniqueProcessId;
 #else
     PVOID Reserved1;
     PPEB PebBaseAddress;