[PATCH 4/5] kernelbase: refactor GetNumaHighestNodeNumber to use SystemNumaProximityNodeInformation

[wasertech]

From: wasertech

---
 dlls/kernelbase/memory.c | 43 +++++++---------------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c
index dfa4c434d2b..d1f828114dd 100644
--- a/dlls/kernelbase/memory.c
+++ b/dlls/kernelbase/memory.c
@@ -1582,46 +1582,17 @@ BOOL WINAPI SetProcessDefaultCpuSets(HANDLE process, const ULONG *cpu_set_ids, U
  */
 BOOL WINAPI DECLSPEC_HOTPATCH GetNumaHighestNodeNumber( ULONG *node )
 {
-    NTSTATUS nts;
-    DWORD rel = RelationNumaNode;
-    DWORD iex_len = 0;
-    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *iex = NULL;
-    unsigned int i;
+    FILE_NUMA_NODE_INFORMATION ni;

if (!node) { SetLastError( ERROR_INVALID_PARAMETER ); return FALSE; }
-    *node = 0;
-
-    set_ntstatus( NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, 
-        &rel, sizeof(rel), NULL, 0, &iex_len ) );
-    if (!iex_len)
-    { FIXME( "stub: iex_len %lu, node %lu\n", iex_len, *node ); return TRUE; }
-
-    iex = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, iex_len );
-    if (!iex) { FIXME( "stub: iex %p, node %lu\n", iex, *node ); return TRUE; }
-    
-    nts = set_ntstatus( NtQuerySystemInformationEx( SystemLogicalProcessorInformationEx, 
-            &rel, sizeof(rel), iex, iex_len, &iex_len ) );
-    if (!nts)
-    {
-        FIXME( "stub: nts %lu, node %lu\n", nts, *node );
-        RtlFreeHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, iex );
-        return TRUE;
-    }

-    for ( i = 0; i < iex_len; )
-    {
-        SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *ex = ( SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX * )
-            ( (char *)iex + i );
-        if (!ex->Size) break;
-        if (ex->Relationship == RelationNumaNode)
-        {
-            if (ex->NumaNode.NodeNumber > *node)
-                *node = ex->NumaNode.NodeNumber;
-        }
-        i += ex->Size;
-    }
+    if (
+        !set_ntstatus( NtQuerySystemInformationEx( SystemNumaProximityNodeInformation,
+            NULL, 0, &ni, sizeof(ni), NULL ))
+        )
+        return FALSE;

-    RtlFreeHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, iex );
+    *node = ni.HighestNodeNumber;
     return TRUE;
 }