Added macos-compile patchset

This is currently causing a regression in Overwatch.
Disabled until an updated patch corrects the regression found.

patches/Compiler_Warnings/definition

@@ -1,2 +1,2 @@
 Fixes: Fixes compile warnings.
-Depends: mailing-list-patches
+#Depends: mailing-list-patches

patches/cryptext-CryptExtOpenCER/definition

@@ -0,0 +1,2 @@
+# Taken from the mailing list - July 2019.
+Fixes: cryptext: Implement CryptExtOpenCER.

patches/dbgeng-IDebugClient7/definition

@@ -1 +0,0 @@
-Fixes: [44958] dbgeng: Support IDebugClient7 interface.

patches/ddraw-Texture_Wrong_Caps/0001-ddraw-Allow-setting-texture-without-DDSCAPS_TEXTURE-.patch

@@ -237,7 +237,7 @@ index bc58c1817c..3c643afe15 100644
 +    DestroyWindow(window);
 +}
 +
-+static void test_texture_wrong_caps()
++static void test_texture_wrong_caps(void)
 +{
 +    trace("Hardware device.\n");
 +    test_texture_wrong_caps_(FALSE);

patches/directmanipulation-new-dll/0012-directmanipulation-tests-Initial-tests.patch

@@ -81,7 +81,7 @@ index 0000000000..9ecc3d54be
 +
 +#include "wine/test.h"
 +
-+static void test_IDirectManipulationManager2()
++static void test_IDirectManipulationManager2(void)
 +{
 +    IDirectManipulationManager2 *manager2;
 +    IDirectManipulationUpdateManager *update;

patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch

@@ -1,42 +0,0 @@
-From 804021e621413998b319f887eed3f754df784fcd Mon Sep 17 00:00:00 2001
-From: Ken Thomases <ken@codeweavers.com>
-Date: Thu, 27 Mar 2014 18:18:46 -0500
-Subject: winemac: Make GetMonitorInfo() give a different device name
- (\\.\DISPLAY<n>) to each monitor.
-
----
- dlls/winemac.drv/display.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c
-index e1357d8..f82289d 100644
---- a/dlls/winemac.drv/display.c
-+++ b/dlls/winemac.drv/display.c
-@@ -1210,7 +1210,7 @@ done:
-  */
- BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
- {
--    static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','1',0 };
-+    static const WCHAR adapter_name[] = { '\\','\\','.','\\','D','I','S','P','L','A','Y','%','d',0 };
-     struct macdrv_display *displays;
-     int num_displays;
-     CGDirectDisplayID display_id;
-@@ -1240,10 +1240,12 @@ BOOL CDECL macdrv_GetMonitorInfo(HMONITOR monitor, LPMONITORINFO info)
-         info->dwFlags = (i == 0) ? MONITORINFOF_PRIMARY : 0;
- 
-         if (info->cbSize >= sizeof(MONITORINFOEXW))
--            lstrcpyW(((MONITORINFOEXW*)info)->szDevice, adapter_name);
-+            snprintfW(((MONITORINFOEXW*)info)->szDevice, sizeof(((MONITORINFOEXW*)info)->szDevice) / sizeof(WCHAR),
-+                      adapter_name, i + 1);
- 
--        TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x\n", wine_dbgstr_rect(&info->rcMonitor),
--              wine_dbgstr_rect(&info->rcWork), info->dwFlags);
-+        TRACE(" -> rcMonitor %s rcWork %s dwFlags %08x szDevice %s\n", wine_dbgstr_rect(&info->rcMonitor),
-+              wine_dbgstr_rect(&info->rcWork), info->dwFlags,
-+              info->cbSize >= sizeof(MONITORINFOEXW) ? debugstr_w(((MONITORINFOEXW*)info)->szDevice) : "n/a");
-     }
-     else
-     {
--- 
-2.6.1
-

patches/gdi32-MultiMonitor/definition

@@ -1,3 +0,0 @@
-Fixes: [34978] Multiple applications need EnumDisplayDevicesW implementation
-Fixes: [37709] GetMonitorInfo returns the same name for all monitors
-Fixes: [41258] Return a more reasonable display DeviceID

patches/httpapi-HttpCreateServerSession/0001-httpapi-Fake-success-from-HttpCreateServerSession.patch

@@ -1,78 +0,0 @@
-From 81d946aef87b60fa5a013eda5656c10726c5bd0a Mon Sep 17 00:00:00 2001
-From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
-Date: Wed, 30 Jan 2019 16:23:25 +1100
-Subject: [PATCH] httpapi: Fake success from HttpCreateServerSession
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46549
----
- dlls/httpapi/httpapi_main.c  | 10 +++++++++-
- dlls/httpapi/tests/httpapi.c | 10 +++++-----
- 2 files changed, 14 insertions(+), 6 deletions(-)
-
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 3ab03995e4..44e72c6f41 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -190,7 +190,15 @@ ULONG WINAPI HttpAddUrl( HANDLE handle, PCWSTR url, PVOID reserved )
- ULONG WINAPI HttpCreateServerSession( HTTPAPI_VERSION version, HTTP_SERVER_SESSION_ID *id, ULONG reserved )
- {
-     FIXME( "({%d,%d}, %p, %d): stub!\n", version.HttpApiMajorVersion, version.HttpApiMinorVersion, id, reserved );
--    return ERROR_ACCESS_DENIED;
-+
-+    if(!id || reserved)
-+        return ERROR_INVALID_PARAMETER;
-+    if((version.HttpApiMajorVersion != 1 && version.HttpApiMajorVersion != 2)  || version.HttpApiMinorVersion != 0)
-+        return ERROR_REVISION_MISMATCH;
-+
-+    *id = 0xabcdefff;
-+
-+    return NO_ERROR;
- }
- 
- /***********************************************************************
-diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c
-index e1437552a8..e090390b89 100644
---- a/dlls/httpapi/tests/httpapi.c
-+++ b/dlls/httpapi/tests/httpapi.c
-@@ -92,25 +92,26 @@ static void test_HttpCreateServerSession(void)
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, NULL, 0);
--todo_wine
-+    ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
-+
-+    version.HttpApiMajorVersion = 1;
-+    version.HttpApiMinorVersion = 0;
-+    ret = pHttpCreateServerSession(version, &session, 1);
-     ok(ret == ERROR_INVALID_PARAMETER, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 1;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 3;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(ret == ERROR_REVISION_MISMATCH, "Unexpected return value %u.\n", ret);
- 
-     version.HttpApiMajorVersion = 2;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(!ret, "Unexpected return value %u.\n", ret);
-     ret = pHttpCloseServerSession(session);
- todo_wine
-@@ -119,7 +120,6 @@ todo_wine
-     version.HttpApiMajorVersion = 1;
-     version.HttpApiMinorVersion = 0;
-     ret = pHttpCreateServerSession(version, &session, 0);
--todo_wine
-     ok(!ret, "Unexpected return value %u.\n", ret);
-     ret = pHttpCloseServerSession(session);
- todo_wine
--- 
-2.20.1
-

patches/httpapi-HttpCreateServerSession/0002-httpapi-Add-CreateUrlGroup-stub.patch

@@ -1,59 +0,0 @@
-From fd6e709fad9b70a8d19ed6521e3375658c2c951f Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sat, 30 Mar 2019 18:59:05 -0300
-Subject: [PATCH] httpapi: Add CreateUrlGroup stub.
-
----
- dlls/httpapi/httpapi.spec   |  1 +
- dlls/httpapi/httpapi_main.c | 12 ++++++++++++
- include/http.h              |  1 +
- 3 files changed, 14 insertions(+)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index 1d8fcd8..bcd09e7 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -7,6 +7,7 @@
- @ stub HttpCreateFilter
- @ stdcall HttpCreateHttpHandle(ptr long)
- @ stdcall HttpCreateServerSession(long ptr long)
-+@ stdcall HttpCreateUrlGroup(int64 ptr long)
- @ stdcall HttpCloseServerSession(int64)
- @ stub HttpDeleteConfigGroup
- @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr)
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 3ab0399..9280fc1 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -201,3 +201,15 @@ ULONG WINAPI HttpCloseServerSession( HTTP_SERVER_SESSION_ID id )
-     FIXME( "(%s): stub!\n", wine_dbgstr_longlong(id));
-     return ERROR_INVALID_PARAMETER;
- }
-+
-+/***********************************************************************
-+ *        HttpCreateUrlGroup     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *urlgroupid, ULONG reserved )
-+{
-+    FIXME( "(%s, %p, %d): stub!\n", wine_dbgstr_longlong(id), urlgroupid, reserved );
-+
-+    *urlgroupid = 0xdeadbeef;
-+
-+    return NO_ERROR;
-+}
-\ No newline at end of file
-diff --git a/include/http.h b/include/http.h
-index 8f284a8..50a10f8 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -59,6 +59,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID);
- 
- ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
- ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
-+ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
- ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG);
- ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
- ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
--- 
-1.9.1
-

patches/httpapi-HttpCreateServerSession/0003-httpapi-Add-CloseUrlGroup-stub.patch

@@ -1,57 +0,0 @@
-From 1b3f783460eb8aa93e6a8da583dfc8edd3d6de9e Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sat, 30 Mar 2019 19:07:39 -0300
-Subject: [PATCH] httpapi: Add CloseUrlGroup stub.
-
----
- dlls/httpapi/httpapi.spec   | 1 +
- dlls/httpapi/httpapi_main.c | 9 +++++++++
- include/http.h              | 1 +
- 3 files changed, 11 insertions(+)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index bcd09e7..b7d3705 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -8,6 +8,7 @@
- @ stdcall HttpCreateHttpHandle(ptr long)
- @ stdcall HttpCreateServerSession(long ptr long)
- @ stdcall HttpCreateUrlGroup(int64 ptr long)
-+@ stdcall HttpCloseUrlGroup(int64)
- @ stdcall HttpCloseServerSession(int64)
- @ stub HttpDeleteConfigGroup
- @ stdcall HttpDeleteServiceConfiguration(ptr long ptr long ptr)
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 9280fc1..eca3b00 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -212,4 +212,13 @@ ULONG WINAPI HttpCreateUrlGroup( HTTP_SERVER_SESSION_ID id, HTTP_URL_GROUP_ID *u
-     *urlgroupid = 0xdeadbeef;
- 
-     return NO_ERROR;
-+}
-+
-+/***********************************************************************
-+ *        HttpCloseUrlGroup     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid )
-+{
-+    FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid));
-+    return NO_ERROR;
- }
-\ No newline at end of file
-diff --git a/include/http.h b/include/http.h
-index 50a10f8..aa490dc 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -61,6 +61,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
- ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
- ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
- ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG);
-+ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID);
- ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
- ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
- ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);
--- 
-1.9.1
-

patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch

@@ -1,60 +0,0 @@
-From 13541d8ff0af57d8b3bc1dfbcb83bbd1020084f9 Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sun, 31 Mar 2019 06:18:21 -0300
-Subject: [PATCH] httpapi: Add CreateRequestQueue stub.
-
----
- dlls/httpapi/httpapi.spec   |  1 +
- dlls/httpapi/httpapi_main.c | 13 ++++++++++++-
- include/http.h              |  1 +
- 3 files changed, 14 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index b7d3705..235c4ac 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -7,6 +7,7 @@
- @ stub HttpCreateFilter
- @ stdcall HttpCreateHttpHandle(ptr long)
- @ stdcall HttpCreateServerSession(long ptr long)
-+@ stdcall HttpCreateRequestQueue(long wstr ptr long ptr)
- @ stdcall HttpCreateUrlGroup(int64 ptr long)
- @ stdcall HttpCloseUrlGroup(int64)
- @ stdcall HttpCloseServerSession(int64)
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index eca3b00..7c83f81 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -221,4 +221,15 @@ ULONG WINAPI HttpCloseUrlGroup( HTTP_URL_GROUP_ID urlgroupid )
- {
-     FIXME( "(%s): stub!\n", wine_dbgstr_longlong(urlgroupid));
-     return NO_ERROR;
--}
-\ No newline at end of file
-+}
-+
-+/***********************************************************************
-+ *        HttpCreateRequestQueue     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECURITY_ATTRIBUTES security, ULONG flags, PHANDLE request )
-+{
-+    FIXME( "({%d,%d}, %s, %p, 0x%x, %p): stub!\n",version.HttpApiMajorVersion,version.HttpApiMinorVersion,debugstr_w(name),security,flags,request ); 
-+
-+    *request = (HANDLE)0xbeefdead;
-+    return NO_ERROR;
-+}
-diff --git a/include/http.h b/include/http.h
-index aa490dc..9ad7e10 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -60,6 +60,7 @@ ULONG WINAPI HttpTerminate(ULONG,PVOID);
- ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
- ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
- ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
-+ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE);
- ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG);
- ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID);
- ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
--- 
-1.9.1
-

patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch

@@ -1,75 +0,0 @@
-From 017787e85014a96f76f0a2a02b577d489e35f08d Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sun, 31 Mar 2019 07:17:26 -0300
-Subject: [PATCH] httpapi: Add SetUrlGroupProperty stub.
-
----
- dlls/httpapi/httpapi.spec   |  1 +
- dlls/httpapi/httpapi_main.c | 10 ++++++++++
- include/http.h              | 13 +++++++++++++
- 3 files changed, 24 insertions(+)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index 235c4ac..c1d3b6e 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -50,6 +50,7 @@
- @ stub HttpSetControlChannelInformation
- @ stub HttpSetServerContextInformation
- @ stdcall HttpSetServiceConfiguration(ptr long ptr long ptr)
-+@ stdcall HttpSetUrlGroupProperty(int64 long ptr long)
- @ stub HttpShutdownAppPool
- @ stub HttpShutdownFilter
- @ stdcall HttpTerminate(long ptr)
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 7c83f81..3cb349f 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -233,3 +233,13 @@ ULONG WINAPI HttpCreateRequestQueue( HTTPAPI_VERSION version, PCWSTR name, PSECU
-     *request = (HANDLE)0xbeefdead;
-     return NO_ERROR;
- }
-+
-+/***********************************************************************
-+ *        HttpSetUrlGroupProperty     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_PROPERTY property, void *property_info, ULONG property_info_length )
-+{
-+    FIXME( "(%s, %d, %p, %d): stub!\n", wine_dbgstr_longlong(urlgroupid), property, property_info, property_info_length );
-+    return NO_ERROR;
-+}
-+
-diff --git a/include/http.h b/include/http.h
-index 9ad7e10..9ac7309 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -50,6 +50,18 @@ typedef enum _HTTP_SERVICE_CONFIG_ID
-     HttpServiceConfigMax
- } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID;
- 
-+typedef enum _HTTP_SERVER_PROPERTY
-+{
-+    HttpServerAuthenticationProperty,
-+    HttpServerExtendedAuthenticationProperty,
-+    HttpServerQosProperty,
-+    HttpServerBindingProperty,
-+    HttpServerLoggingProperty,
-+    HttpServerStateProperty,
-+    HttpServerTimeoutsProperty,
-+    HttpServerChannelBindProperty
-+} HTTP_SERVER_PROPERTY, *PHTTP_SERVER_PROPERTY;
-+
- typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID;
- typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID;
- typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID;
-@@ -67,6 +79,7 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID);
- ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
- ULONG WINAPI HttpQueryServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,PVOID,ULONG,PULONG,LPOVERLAPPED);
- ULONG WINAPI HttpSetServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED);
-+ULONG WINAPI HttpSetUrlGroupProperty(HTTP_URL_GROUP_ID,HTTP_SERVER_PROPERTY,void *,ULONG);
- 
- #ifdef __cplusplus
- }
--- 
-1.9.1
-

patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch

@@ -1,62 +0,0 @@
-From 6c61664a2177dcd7ed63d217e9ec6e807d998d3a Mon Sep 17 00:00:00 2001
-From: Esdras Tarsis <esdrastarsis@gmail.com>
-Date: Sun, 31 Mar 2019 07:32:57 -0300
-Subject: [PATCH] httpapi: Add AddUrlToUrlGroup stub.
-
----
- dlls/httpapi/httpapi.spec   | 1 +
- dlls/httpapi/httpapi_main.c | 9 +++++++++
- include/http.h              | 3 ++-
- 3 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec
-index c1d3b6e..b337696 100644
---- a/dlls/httpapi/httpapi.spec
-+++ b/dlls/httpapi/httpapi.spec
-@@ -1,6 +1,7 @@
- @ stub HttpAddFragmentToCache
- @ stdcall HttpAddUrl(ptr wstr ptr)
- @ stub HttpAddUrlToConfigGroup
-+@ stdcall HttpAddUrlToUrlGroup(int64 wstr int64 long)
- @ stub HttpCancelHttpRequest
- @ stub HttpCreateAppPool
- @ stub HttpCreateConfigGroup
-diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c
-index 3cb349f..a844139 100644
---- a/dlls/httpapi/httpapi_main.c
-+++ b/dlls/httpapi/httpapi_main.c
-@@ -243,3 +243,12 @@ ULONG WINAPI HttpSetUrlGroupProperty( HTTP_URL_GROUP_ID urlgroupid, HTTP_SERVER_
-     return NO_ERROR;
- }
- 
-+/***********************************************************************
-+ *        HttpAddUrlToUrlGroup     (HTTPAPI.@)
-+ */
-+ULONG WINAPI HttpAddUrlToUrlGroup( HTTP_URL_GROUP_ID urlgroupid, PCWSTR name, HTTP_URL_CONTEXT urlcontext, ULONG reserved )
-+{
-+    FIXME( "(%s, %s, %s, %d): stub!\n", wine_dbgstr_longlong(urlgroupid), debugstr_w(name), wine_dbgstr_longlong(urlcontext), reserved );
-+    return NO_ERROR;
-+}
-+
-diff --git a/include/http.h b/include/http.h
-index 9ac7309..7d86b33 100644
---- a/include/http.h
-+++ b/include/http.h
-@@ -64,12 +64,13 @@ typedef enum _HTTP_SERVER_PROPERTY
- 
- typedef ULONGLONG HTTP_OPAQUE_ID, *PHTTP_OPAQUE_ID;
- typedef HTTP_OPAQUE_ID HTTP_SERVER_SESSION_ID, *PHTTP_SERVER_SESSION_ID;
--typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID;
-+typedef HTTP_OPAQUE_ID HTTP_URL_GROUP_ID, *PHTTP_URL_GROUP_ID, HTTP_URL_CONTEXT, *PHTTP_URL_CONTEXT;
- 
- ULONG WINAPI HttpInitialize(HTTPAPI_VERSION,ULONG,PVOID);
- ULONG WINAPI HttpTerminate(ULONG,PVOID);
- 
- ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID);
-+ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG);
- ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG);
- ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID,PHTTP_URL_GROUP_ID,ULONG);
- ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE);
--- 
-1.9.1
-

patches/httpapi-HttpCreateServerSession/definition

@@ -1,4 +0,0 @@
-# This is to see, if the return value of HttpCreateServerSession is causing
-# PUBG Lite to fail on Launch. The end solution maybe to implement a working
-# httpapi DLL.
-Fixes: [46549] httpapi: Fake success from HttpCreateServerSession

patches/kernel32-SetProcessDEPPolicy/0001-kernel32-Implement-SetProcessDEPPolicy.patch

@@ -32,7 +32,7 @@ index 992437047..e10bfd95a 100644
 +
 +    TRACE("(%d)\n", newDEP);
 +
-+    if (is_wow64 || system_DEP_policy != OptIn && system_DEP_policy != OptOut )
++    if (is_wow64 || (system_DEP_policy != OptIn && system_DEP_policy != OptOut) )
 +    {
 +        SetLastError(ERROR_ACCESS_DENIED);
 +        return FALSE;

patches/macos-compile/0001-configure-Don-t-link-to-libunwind-if-not-necessary.patch

@@ -0,0 +1,44 @@
+From 4b299b286d73648250fedd699f2ef98e73a5e1a8 Mon Sep 17 00:00:00 2001
+From: Alexandre Julliard <julliard@winehq.org>
+Date: Mon, 2 Sep 2019 20:44:56 +0200
+Subject: [PATCH] configure: Don't link to libunwind if not necessary.
+
+Signed-off-by: Alexandre Julliard <julliard@winehq.org>
+---
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index 0377509c60..e374edfdc5 100755
+--- a/configure
++++ b/configure
+@@ -14904,9 +14904,9 @@ rm -f core conftest.err conftest.$ac_objext \
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_have_libunwind_unw_getcontext" >&5
+ $as_echo "$wine_cv_have_libunwind_unw_getcontext" >&6; }
+-            test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS=""
+             LIBS=$save_libs
+         fi
++        test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS=""
+         if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono
+         then
+ 
+diff --git a/configure.ac b/configure.ac
+index d0af7ef4a1..ff81a172f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1697,9 +1697,9 @@ then
+                     [[unw_context_t context; unw_getcontext( &context );]])],
+                     [wine_cv_have_libunwind_unw_getcontext="yes"],
+                     [wine_cv_have_libunwind_unw_getcontext="no"])])
+-            test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS=""
+             LIBS=$save_libs
+         fi
++        test "$wine_cv_have_libunwind_unw_getcontext" = yes || UNWIND_LIBS=""
+         if test "x$wine_cv_have_unw_getcontext$wine_cv_have_libunwind_unw_getcontext" != xnono
+         then
+             AC_DEFINE(HAVE_LIBUNWIND,1,[Define to 1 if you have the `unwind' library (-lunwind).])
+-- 
+2.23.0.rc1
+

patches/macos-compile/0002-winemac.drv-Fix-build-with-older-macOS-SDKs.patch

@@ -0,0 +1,141 @@
+From 0d23ecd9ec8a0c24e5444e0fc9cf6933cc39c960 Mon Sep 17 00:00:00 2001
+From: Zhiyi Zhang <zzhang@codeweavers.com>
+Date: Mon, 2 Sep 2019 12:04:21 +0800
+Subject: [PATCH] winemac.drv: Fix build with older macOS SDKs.
+
+macOS SDKs older than 10.11 doesn't support Metal.
+macOS 10.11 and 10.12 SDK support Metal but don't
+support registryID in MTLDevice protocol. Recommend
+using 10.13+ SDK.
+
+Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
+Signed-off-by: Ken Thomases <ken@codeweavers.com>
+Signed-off-by: Alexandre Julliard <julliard@winehq.org>
+---
+ configure                        | 40 ++++++++++++++++++++++++++++++++
+ configure.ac                     | 12 ++++++++++
+ dlls/winemac.drv/cocoa_display.m |  5 ++--
+ include/config.h.in              |  3 +++
+ 4 files changed, 57 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index a52e346b68..0c54e27f5f 100755
+--- a/configure
++++ b/configure
+@@ -8952,6 +8952,46 @@ rm -f core conftest.err conftest.$ac_objext \
+     then
+         METAL_LIBS="-framework Metal -framework QuartzCore"
+ 
++    fi
++
++        if test "$ac_cv_header_Metal_Metal_h" = "yes"
++    then
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether MTLDevice protocol supports registryID property" >&5
++$as_echo_n "checking whether MTLDevice protocol supports registryID property... " >&6; }
++        ac_ext=m
++ac_cpp='$OBJCPP $CPPFLAGS'
++ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_objc_compiler_gnu
++
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <Metal/Metal.h>
++int
++main ()
++{
++id<MTLDevice> device; device.registryID;
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_objc_try_compile "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++$as_echo "#define HAVE_MTLDEVICE_REGISTRYID 1" >>confdefs.h
++
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++        ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
+     fi
+ 
+         if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
+diff --git a/configure.ac b/configure.ac
+index 1592812bf7..b39b6b2c90 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -859,6 +859,18 @@ case $host_os in
+         AC_SUBST(METAL_LIBS,"-framework Metal -framework QuartzCore")
+     fi
+ 
++    dnl Check for MTLDevice registryID property
++    if test "$ac_cv_header_Metal_Metal_h" = "yes"
++    then
++        AC_MSG_CHECKING([whether MTLDevice protocol supports registryID property])
++        AC_LANG_PUSH([Objective C])
++        AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <Metal/Metal.h>]], [[id<MTLDevice> device; device.registryID;]])],
++                              [AC_MSG_RESULT(yes)
++                               AC_DEFINE(HAVE_MTLDEVICE_REGISTRYID, 1, [Define if MTLDevice protocol has registryID property.])],
++                              [AC_MSG_RESULT(no)])
++        AC_LANG_POP([Objective C])
++    fi
++
+     dnl Enable Mac driver on Mac OS X 10.6 or later
+     if test "$ac_cv_header_ApplicationServices_ApplicationServices_h" = "yes"
+     then
+diff --git a/dlls/winemac.drv/cocoa_display.m b/dlls/winemac.drv/cocoa_display.m
+index 3863557d96..9d95eee99a 100644
+--- a/dlls/winemac.drv/cocoa_display.m
++++ b/dlls/winemac.drv/cocoa_display.m
+@@ -21,7 +21,7 @@
+ #include "config.h"
+ 
+ #import <AppKit/AppKit.h>
+-#ifdef HAVE_METAL_METAL_H
++#ifdef HAVE_MTLDEVICE_REGISTRYID
+ #import <Metal/Metal.h>
+ #endif
+ #include "macdrv_cocoa.h"
+@@ -234,7 +234,7 @@ static int macdrv_get_gpu_info_from_entry(struct macdrv_gpu* gpu, io_registry_en
+     return ret;
+ }
+ 
+-#ifdef HAVE_METAL_METAL_H
++#ifdef HAVE_MTLDEVICE_REGISTRYID
+ 
+ /***********************************************************************
+  *              macdrv_get_gpu_info_from_registry_id
+@@ -337,7 +337,6 @@ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
+ 
+ static int macdrv_get_gpus_from_metal(struct macdrv_gpu** new_gpus, int* count)
+ {
+-    TRACE("Metal support not compiled in\n");
+     return -1;
+ }
+ 
+diff --git a/include/config.h.in b/include/config.h.in
+index 924e11eac0..5f690df7b0 100644
+--- a/include/config.h.in
++++ b/include/config.h.in
+@@ -584,6 +584,9 @@
+ /* Define to 1 if you have the <mpg123.h> header file. */
+ #undef HAVE_MPG123_H
+ 
++/* Define if MTLDevice protocol has registryID property. */
++#undef HAVE_MTLDEVICE_REGISTRYID
++
+ /* Define to 1 if you have the <ncurses.h> header file. */
+ #undef HAVE_NCURSES_H
+ 
+-- 
+2.23.0.rc1
+