[PSDK][INCLUDE/WINE] Header changes needed for iphlpapi, shlwapi, advapi32, and kernel32 winetest syncs (reactos#8317)

- [INCLUDE/WINE] Add synced Wine headers for the iphlpapi winetest to use. This helps us slowly decouple our headers and wine's headers.
- [PSDK] Add definitions we are missing for other winetest syncs.
- [WINETESTS][APITESTS] Fix breaking changes, remove duplicate definitions for debugstr_guid.

Author: cbialorucki

dll/win32/kernelbase/wine/main.c

@@ -178,8 +178,13 @@ static struct perf_provider *perf_provider_from_handle(HANDLE prov)
 /***********************************************************************
  *           PerfCreateInstance   (KERNELBASE.@)
  */
+#ifdef __REACTOS__
+PERF_COUNTERSET_INSTANCE * WINAPI PerfCreateInstance( HANDLE handle, const GUID *guid,
+                                                     const WCHAR *name, ULONG id )
+#else
 PERF_COUNTERSET_INSTANCE WINAPI *PerfCreateInstance( HANDLE handle, const GUID *guid,
                                                      const WCHAR *name, ULONG id )
+#endif
 {
     struct perf_provider *prov = perf_provider_from_handle( handle );
     struct counterset_template *template;

dll/win32/wbemprox/builtin.c

@@ -3375,11 +3375,11 @@ static enum fill_status fill_networkadapterconfig( struct table *table, const st
     DWORD size = 0, ret;
     enum fill_status status = FILL_STATUS_UNFILTERED;
 
-    ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, NULL, &size );
+    ret = GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &size );
     if (ret != ERROR_BUFFER_OVERFLOW) return FILL_STATUS_FAILED;
 
     if (!(buffer = heap_alloc( size ))) return FILL_STATUS_FAILED;
-    if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_ALL_GATEWAYS, NULL, buffer, &size ))
+    if (GetAdaptersAddresses( AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, buffer, &size ))
     {
         heap_free( buffer );
         return FILL_STATUS_FAILED;

modules/rostests/apitests/setupapi/devclass.c

@@ -39,26 +39,6 @@
 static GUID test_class_guid = { 0x4d36e967, 0xe325, 0x11ce, { 0xbf, 0xc1, 0x08, 0x00, 0x2b, 0xe1, 0x03, 0x18 } };
 static char test_class_name[MAX_CLASS_NAME_LEN] = "DiskDrive";
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    static char guidSTR1[39];
-    static char guidSTR2[39];
-    char* guidSTR;
-    static BOOL index;
-
-    if (!guid) return NULL;
-
-    index = !index;
-    guidSTR = index ? guidSTR1 : guidSTR2;
-
-    snprintf(guidSTR, sizeof(guidSTR1),
-     "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
-     guid->Data1, guid->Data2, guid->Data3,
-     guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3],
-     guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7]);
-    return guidSTR;
-}
-
 static void test_SetupDiBuildClassInfoList(void)
 {
     LPGUID guid_list = NULL;

modules/rostests/winetests/mscoree/debugging.c

@@ -36,21 +36,6 @@ static HRESULT (WINAPI *pCreateDebuggingInterfaceFromVersion)(int, LPCWSTR, IUnk
 
 const WCHAR v2_0[] = {'v','2','.','0','.','5','0','7','2','7',0};
 
-static const char *debugstr_guid(REFIID riid)
-{
-    static char buf[50];
-
-    if(!riid)
-        return "(null)";
-
-    sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-            riid->Data1, riid->Data2, riid->Data3, riid->Data4[0],
-            riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4],
-            riid->Data4[5], riid->Data4[6], riid->Data4[7]);
-
-    return buf;
-}
-
 static HRESULT WINAPI ManagedCallback2_QueryInterface(ICorDebugManagedCallback2 *iface, REFIID riid, void **ppv)
 {
     if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ICorDebugManagedCallback2, riid))

modules/rostests/winetests/ole32/ole_server.c

@@ -60,21 +60,6 @@ static const struct
 
 static LONG obj_ref, class_ref, server_locks;
 
-static const char *debugstr_guid(const GUID *guid)
-{
-    int i;
-
-    if (!guid) return "(null)";
-
-    for (i = 0; i < ARRAY_SIZE(guid_name); i++)
-    {
-        if (IsEqualIID(guid, guid_name[i].guid))
-            return guid_name[i].name;
-    }
-
-    return wine_dbgstr_guid(guid);
-}
-
 /******************************* OLE server *******************************/
 typedef struct
 {

sdk/include/psdk/accctrl.h

@@ -168,7 +168,8 @@ typedef enum _SE_OBJECT_TYPE
     SE_DS_OBJECT_ALL,
     SE_PROVIDER_DEFINED_OBJECT,
     SE_WMIGUID_OBJECT,
-    SE_REGISTRY_WOW64_32KEY
+    SE_REGISTRY_WOW64_32KEY,
+    SE_REGISTRY_WOW64_64KEY
 } SE_OBJECT_TYPE;
 
 typedef enum _TRUSTEE_TYPE

sdk/include/psdk/appmodel.h

@@ -37,6 +37,32 @@ typedef enum AppPolicyWindowingModel
     AppPolicyWindowingModel_ClassicPhone = 3
 } AppPolicyWindowingModel;
 
+typedef struct PACKAGE_VERSION
+{
+    union
+    {
+        UINT64 Version;
+        struct
+        {
+            USHORT Revision;
+            USHORT Build;
+            USHORT Minor;
+            USHORT Major;
+        } DUMMYSTRUCTNAME;
+    } DUMMYUNIONNAME;
+} PACKAGE_VERSION;
+
+typedef struct PACKAGE_ID
+{
+    UINT32 reserved;
+    UINT32 processorArchitecture;
+    PACKAGE_VERSION version;
+    PWSTR name;
+    PWSTR publisher;
+    PWSTR resourceId;
+    PWSTR publisherId;
+} PACKAGE_ID;
+
 WINBASEAPI
 _Check_return_
 _Success_(return == ERROR_SUCCESS)

sdk/include/psdk/delayloadhandler.h

@@ -47,6 +47,7 @@ typedef struct _DELAYLOAD_INFO
 } DELAYLOAD_INFO, *PDELAYLOAD_INFO;
 
 typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_DLL_CALLBACK)(ULONG, PDELAYLOAD_INFO);
+typedef PVOID (WINAPI *PDELAYLOAD_FAILURE_SYSTEM_ROUTINE)(LPCSTR, LPCSTR);
 
 #ifdef __cplusplus
 }