Austin English : kernel32: Add a stub for GetCurrentProcessorNumberEx.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 132ff59b3ecb80d9e1c18616861ec4cc098bae53
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=132ff59b3ecb80d9e1c1861686...

Author: Austin English 
Date:   Sun Oct 11 11:50:53 2015 -0500

kernel32: Add a stub for GetCurrentProcessorNumberEx.

Signed-off-by: Austin English 
Signed-off-by: Sebastian Lackner 
Signed-off-by: Alexandre Julliard

---

.../api-ms-win-core-processthreads-l1-1-1.spec                |  2 +-
 .../api-ms-win-core-processthreads-l1-1-2.spec                |  2 +-
 dlls/kernel32/kernel32.spec                                   |  2 +-
 dlls/ntdll/ntdll.spec                                         |  1 +
 dlls/ntdll/rtl.c                                              | 11 +++++++++++
 include/winternl.h                                            |  1 +
 6 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec
index 9fb1941..84f43d8 100644
--- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec
+++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec
@@ -12,7 +12,7 @@
 @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess
 @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId
 @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber
-@ stub GetCurrentProcessorNumberEx
+@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx
 @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread
 @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId
 @ stub GetCurrentThreadStackLimits
diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec
index 830578f..6430c63 100644
--- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec
+++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec
@@ -12,7 +12,7 @@
 @ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess
 @ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId
 @ stdcall GetCurrentProcessorNumber() kernel32.GetCurrentProcessorNumber
-@ stub GetCurrentProcessorNumberEx
+@ stdcall GetCurrentProcessorNumberEx(ptr) kernel32.GetCurrentProcessorNumberEx
 @ stdcall -norelay GetCurrentThread() kernel32.GetCurrentThread
 @ stdcall -norelay GetCurrentThreadId() kernel32.GetCurrentThreadId
 @ stub GetCurrentThreadStackLimits
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index bda7c9d..e0cb154 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -632,7 +632,7 @@
 @ stdcall -norelay GetCurrentProcess()
 @ stdcall -norelay GetCurrentProcessId()
 @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber
-# @ stub GetCurrentProcessorNumberEx
+@ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx
 @ stdcall -norelay GetCurrentThread()
 @ stdcall -norelay GetCurrentThreadId()
 # @ stub -arch=x86_64 GetCurrentUmsThread
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 7f07b14..40d3df5 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -627,6 +627,7 @@
 @ stdcall RtlGetControlSecurityDescriptor(ptr ptr ptr)
 @ stdcall RtlGetCurrentDirectory_U(long ptr)
 @ stdcall RtlGetCurrentPeb()
+@ stdcall RtlGetCurrentProcessorNumberEx(ptr)
 @ stdcall RtlGetCurrentTransaction()
 @ stdcall RtlGetDaclSecurityDescriptor(ptr ptr ptr ptr)
 @ stub RtlGetElementGenericTable
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index d20a098..8eb3e9f 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -1584,3 +1584,14 @@ BOOL WINAPI RtlSetCurrentTransaction(HANDLE new_transaction)
     FIXME("(%p) :stub\n", new_transaction);
     return FALSE;
 }
+
+/**********************************************************************
+ *           RtlGetCurrentProcessorNumberEx [NTDLL.@]
+ */
+void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor)
+{
+    FIXME("(%p) :semi-stub\n", processor);
+    processor->Group = 0;
+    processor->Number = NtGetCurrentProcessorNumber();
+    processor->Reserved = 0;
+}
diff --git a/include/winternl.h b/include/winternl.h
index e76114e..61b144a 100644
--- a/include/winternl.h
+++ b/include/winternl.h
@@ -2143,6 +2143,7 @@ NTSYSAPI NTSTATUS  WINAPI NtFlushWriteBuffer(VOID);
 NTSYSAPI NTSTATUS  WINAPI NtFreeVirtualMemory(HANDLE,PVOID*,SIZE_T*,ULONG);
 NTSYSAPI NTSTATUS  WINAPI NtFsControlFile(HANDLE,HANDLE,PIO_APC_ROUTINE,PVOID,PIO_STATUS_BLOCK,ULONG,PVOID,ULONG,PVOID,ULONG);
 NTSYSAPI NTSTATUS  WINAPI NtGetContextThread(HANDLE,CONTEXT*);
+NTSYSAPI ULONG     WINAPI NtGetCurrentProcessorNumber(void);
 NTSYSAPI NTSTATUS  WINAPI NtGetPlugPlayEvent(ULONG,ULONG,PVOID,ULONG);
 NTSYSAPI ULONG     WINAPI NtGetTickCount(VOID);
 NTSYSAPI NTSTATUS  WINAPI NtGetWriteWatch(HANDLE,ULONG,PVOID,SIZE_T,PVOID*,ULONG_PTR*,ULONG*);