Merge branch 'Tests-NT6Experiment' of https://github.com/DarkFire01/r…

…eactos into Tests-NT6Experiment
DarkFire01 · Sep 16, 2023 · 3637446 · 3637446
2 parents 4a5f12b + 26acd2d
commit 3637446
Show file tree

Hide file tree

Showing 9 changed files with 2,054 additions and 521 deletions.
diff --git a/base/applications/cmdutils/wscript/widl.q0aaaa b/base/applications/cmdutils/wscript/widl.q0aaaa
diff --git a/dll/directx/wine/wined3d/context.c b/dll/directx/wine/wined3d/context.c
@@ -5660,7 +5660,7 @@ void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl,
         GL_EXTCALL(glBufferData(GL_ARRAY_BUFFER, sizeof(quad), quad, GL_STREAM_DRAW));
         GL_EXTCALL(glVertexAttribPointer(0, 2, GL_FLOAT, FALSE, sizeof(*quad), NULL));
         GL_EXTCALL(glVertexAttribPointer(1, 3, GL_FLOAT, FALSE, sizeof(*quad),
-                (void *)FIELD_OFFSET(struct blit_vertex, texcoord)));
+            (PVOID)(ULONG_PTR)FIELD_OFFSET(struct blit_vertex, texcoord)));
 
         GL_EXTCALL(glEnableVertexAttribArray(0));
         GL_EXTCALL(glEnableVertexAttribArray(1));

diff --git a/dll/win32/kernel32/kernel32.spec b/dll/win32/kernel32/kernel32.spec
@@ -715,7 +715,7 @@
 @ stdcall InitializeCriticalSection(ptr)
 @ stdcall InitializeCriticalSectionAndSpinCount(ptr long)
 @ stdcall -version=0x600+ InitializeCriticalSectionEx(ptr long long)
-@ stdcall -stub -version=0x600+ InitializeProcThreadAttributeList(ptr long long ptr)
+@ stdcall -version=0x600+ InitializeProcThreadAttributeList(ptr long long ptr)
 @ stdcall InitializeSListHead(ptr) ntdll.RtlInitializeSListHead
 @ stdcall -version=0x600+ InitializeSRWLock(ptr) ntdll.RtlInitializeSRWLock
 @ stdcall -arch=i386 -ret64 InterlockedCompareExchange64(ptr double double) ntdll.RtlInterlockedCompareExchange64
@@ -1286,8 +1286,6 @@
 @ stdcall -version=0x600+ K32QueryWorkingSet(ptr ptr long)
 @ stdcall -version=0x600+ K32QueryWorkingSetEx(ptr ptr long)
 @ stdcall -version=0x600+ K32GetMappedFileNameW(ptr ptr ptr long)
-@ stdcall -stub -version=0x600+ K32GetProcessImageFileNameW(ptr ptr long)
-
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 #Vista Functions

diff --git a/dll/win32/kernel32/kernel32_vista/k32.c b/dll/win32/kernel32/kernel32_vista/k32.c
@@ -671,51 +671,6 @@ BOOL WINAPI K32GetModuleInformation(HANDLE process, HMODULE module,
 }
 
 
-
-/***********************************************************************
- *           K32EnumProcesses (KERNEL32.@)
- */
-BOOL WINAPI K32EnumProcesses(DWORD *lpdwProcessIDs, DWORD cb, DWORD *lpcbUsed)
-{
-    SYSTEM_PROCESS_INFORMATION *spi;
-    ULONG size = 0x4000;
-    void *buf = NULL;
-    NTSTATUS status;
-
-    do {
-        size *= 2;
-        HeapFree(GetProcessHeap(), 0, buf);
-        buf = HeapAlloc(GetProcessHeap(), 0, size);
-        if (!buf)
-            return FALSE;
-
-        status = NtQuerySystemInformation(SystemProcessInformation, buf, size, NULL);
-    } while(status == STATUS_INFO_LENGTH_MISMATCH);
-
-    if (status != STATUS_SUCCESS)
-    {
-        HeapFree(GetProcessHeap(), 0, buf);
-        SetLastError(RtlNtStatusToDosError(status));
-        return FALSE;
-    }
-
-    spi = buf;
-
-    for (*lpcbUsed = 0; cb >= sizeof(DWORD); cb -= sizeof(DWORD))
-    {
-        *lpdwProcessIDs++ = HandleToUlong(spi->UniqueProcessId);
-        *lpcbUsed += sizeof(DWORD);
-
-        if (spi->NextEntryOffset == 0)
-            break;
-
-        spi = (SYSTEM_PROCESS_INFORMATION *)(((PCHAR)spi) + spi->NextEntryOffset);
-    }
-
-    HeapFree(GetProcessHeap(), 0, buf);
-    return TRUE;
-}
-
 typedef struct _PROCESS_MEMORY_COUNTERS {
   DWORD  cb;
   DWORD  PageFaultCount;
@@ -730,49 +685,6 @@ typedef struct _PROCESS_MEMORY_COUNTERS {
 } PROCESS_MEMORY_COUNTERS;
 typedef PROCESS_MEMORY_COUNTERS *PPROCESS_MEMORY_COUNTERS;
 
-/***********************************************************************
- *           K32GetProcessMemoryInfo (KERNEL32.@)
- *
- * Retrieve memory usage information for a given process
- *
- */
-BOOL WINAPI K32GetProcessMemoryInfo(HANDLE process,
-                                    PPROCESS_MEMORY_COUNTERS pmc, DWORD cb)
-{
-    NTSTATUS status;
-    VM_COUNTERS vmc;
-
-    if (cb < sizeof(PROCESS_MEMORY_COUNTERS))
-    {
-        SetLastError(ERROR_INSUFFICIENT_BUFFER);
-        return FALSE;
-    }
-
-    status = NtQueryInformationProcess(process, ProcessVmCounters,
-                                       &vmc, sizeof(vmc), NULL);
-
-    if (status)
-    {
-        SetLastError(RtlNtStatusToDosError(status));
-        return FALSE;
-    }
-
-    pmc->cb = sizeof(PROCESS_MEMORY_COUNTERS);
-    pmc->PageFaultCount = vmc.PageFaultCount;
-    pmc->PeakWorkingSetSize = vmc.PeakWorkingSetSize;
-    pmc->WorkingSetSize = vmc.WorkingSetSize;
-    pmc->QuotaPeakPagedPoolUsage = vmc.QuotaPeakPagedPoolUsage;
-    pmc->QuotaPagedPoolUsage = vmc.QuotaPagedPoolUsage;
-    pmc->QuotaPeakNonPagedPoolUsage = vmc.QuotaPeakNonPagedPoolUsage;
-    pmc->QuotaNonPagedPoolUsage = vmc.QuotaNonPagedPoolUsage;
-    pmc->PagefileUsage = vmc.PagefileUsage;
-    pmc->PeakPagefileUsage = vmc.PeakPagefileUsage;
-
-    return TRUE;
-}
-
-
-
 /***********************************************************************
  *           InitializeProcThreadAttributeList   (kernelbase.@)
  */
@@ -792,25 +704,3 @@ struct _PROC_THREAD_ATTRIBUTE_LIST
     struct proc_thread_attr attrs[10];
 };
 
-
-BOOL
-K32QueryWorkingSet(
-        HANDLE hProcess,
-        PVOID  pv,
-        DWORD  cb
-)
-{
-    UNIMPLEMENTED;
-    return TRUE;
-}
-
-BOOL
-K32QueryWorkingSetEx(
-        HANDLE hProcess,
-        PVOID  pv,
-        DWORD  cb
-)
-{
-    UNIMPLEMENTED;
-    return TRUE;
-}
diff --git a/dll/win32/ole32/ole32.spec b/dll/win32/ole32/ole32.spec
@@ -73,7 +73,6 @@
 @ stdcall CoIsOle1Class (ptr)
 @ stdcall CoLoadLibrary(wstr long)
 @ stdcall CoLockObjectExternal(ptr long long)
-@ stdcall -version=0x600+ CoGetApartmentType(ptr ptr)
 @ stdcall CoMarshalHresult(ptr long)
 @ stdcall CoMarshalInterThreadInterfaceInStream(ptr ptr ptr)
 @ stdcall CoMarshalInterface(ptr ptr ptr long ptr long)

diff --git a/dll/win32_vista/shcore/main.c b/dll/win32_vista/shcore/main.c
@@ -70,20 +70,20 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
 
 HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *value)
 {
-    if (GetProcessDpiAwarenessInternal( process, (DPI_AWARENESS *)value )) return S_OK;
-    return HRESULT_FROM_WIN32( GetLastError() );
+   // if (GetProcessDpiAwarenessInternal( process, (DPI_AWARENESS *)value )) return S_OK;
+    return 0;//HRESULT_FROM_WIN32( GetLastError() );
 }
 
 HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value)
 {
-    if (SetProcessDpiAwarenessInternal( value )) return S_OK;
-    return HRESULT_FROM_WIN32( GetLastError() );
+   // if (SetProcessDpiAwarenessInternal( value )) return S_OK;
+    return 0;//HRESULT_FROM_WIN32( GetLastError() );
 }
 
 HRESULT WINAPI GetDpiForMonitor(HMONITOR monitor, MONITOR_DPI_TYPE type, UINT *x, UINT *y)
 {
-    if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK;
-    return HRESULT_FROM_WIN32( GetLastError() );
+  //  if (GetDpiForMonitorInternal( monitor, type, x, y )) return S_OK;
+    return 1;//HRESULT_FROM_WIN32( GetLastError() );
 }
 
 HRESULT