From 49aafeb17b566b771f2e6a808d1922e1b6508a5f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 30 Aug 2019 17:36:34 -0500 Subject: [PATCH] Rebase against a4aaf3f3d184c2cdad8c4bf06dc10980744a9d15. --- ...MonitorInfo-give-a-different-device-.patch | 42 ---------- patches/gdi32-MultiMonitor/definition | 3 - ...-httpapi-Add-CreateRequestQueue-stub.patch | 60 -------------- ...httpapi-Add-SetUrlGroupProperty-stub.patch | 78 ------------------- ...06-httpapi-Add-AddUrlToUrlGroup-stub.patch | 55 ------------- .../definition | 4 - patches/patchinstall.sh | 46 +---------- 7 files changed, 1 insertion(+), 287 deletions(-) delete mode 100644 patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch delete mode 100644 patches/gdi32-MultiMonitor/definition delete mode 100644 patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch delete mode 100644 patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch delete mode 100644 patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch delete mode 100644 patches/httpapi-HttpCreateServerSession/definition diff --git a/patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch b/patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch deleted file mode 100644 index 0af703a1..00000000 --- a/patches/gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 804021e621413998b319f887eed3f754df784fcd Mon Sep 17 00:00:00 2001 -From: Ken Thomases -Date: Thu, 27 Mar 2014 18:18:46 -0500 -Subject: winemac: Make GetMonitorInfo() give a different device name - (\\.\DISPLAY) 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 - diff --git a/patches/gdi32-MultiMonitor/definition b/patches/gdi32-MultiMonitor/definition deleted file mode 100644 index 1f32e1a0..00000000 --- a/patches/gdi32-MultiMonitor/definition +++ /dev/null @@ -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 diff --git a/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch b/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch deleted file mode 100644 index d57bd6a7..00000000 --- a/patches/httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d7e73fff448bdb04e986eeb5c4613aa393c0ef49 Mon Sep 17 00:00:00 2001 -From: Esdras Tarsis -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 | 11 +++++++++++ - include/http.h | 1 + - 3 files changed, 13 insertions(+) - -diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec -index aad5d58437c..9e2f151be93 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 HttpCloseServerSession(int64) - @ stdcall HttpCloseUrlGroup(int64) -diff --git a/dlls/httpapi/httpapi_main.c b/dlls/httpapi/httpapi_main.c -index c7d95c9fbad..93822cf8c76 100644 ---- a/dlls/httpapi/httpapi_main.c -+++ b/dlls/httpapi/httpapi_main.c -@@ -557,6 +557,17 @@ ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id) - return ERROR_SUCCESS; - } - -+/*********************************************************************** -+ * 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; -+} -+ - /*********************************************************************** - * HttpCreateUrlGroup (HTTPAPI.@) - */ -diff --git a/include/http.h b/include/http.h -index b07c3b03f93..d2f45497fc4 100644 ---- a/include/http.h -+++ b/include/http.h -@@ -401,6 +401,7 @@ ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); - ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); - ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); - ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); -+ULONG WINAPI HttpCreateRequestQueue(HTTPAPI_VERSION,PCWSTR,PSECURITY_ATTRIBUTES,ULONG,PHANDLE); - ULONG WINAPI HttpCreateServerSession(HTTPAPI_VERSION,PHTTP_SERVER_SESSION_ID,ULONG); - ULONG WINAPI HttpCreateUrlGroup(HTTP_SERVER_SESSION_ID session_id, HTTP_URL_GROUP_ID *group_id, ULONG reserved); - ULONG WINAPI HttpDeleteServiceConfiguration(HANDLE,HTTP_SERVICE_CONFIG_ID,PVOID,ULONG,LPOVERLAPPED); --- -2.17.1 - diff --git a/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch b/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch deleted file mode 100644 index efa56867..00000000 --- a/patches/httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e562c6f0cc0548bcccf7eeb5f805467905dafecb Mon Sep 17 00:00:00 2001 -From: Esdras Tarsis -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 | 14 ++++++++++++++ - 3 files changed, 25 insertions(+) - -diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec -index 9e2f151be93..53c993d2161 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 93822cf8c76..171c950696f 100644 ---- a/dlls/httpapi/httpapi_main.c -+++ b/dlls/httpapi/httpapi_main.c -@@ -609,3 +609,13 @@ ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id) - - return ERROR_SUCCESS; - } -+ -+/*********************************************************************** -+ * 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 d2f45497fc4..186d6cb5015 100644 ---- a/include/http.h -+++ b/include/http.h -@@ -65,8 +65,21 @@ typedef enum _HTTP_SERVICE_CONFIG_ID - HttpServiceConfigMax - } HTTP_SERVICE_CONFIG_ID, *PHTTP_SERVICE_CONFIG_ID; - -+ - #define HTTP_NULL_ID ((ULONGLONG)0) - -+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_CONNECTION_ID, *PHTTP_CONNECTION_ID; - typedef HTTP_OPAQUE_ID HTTP_RAW_CONNECTION_ID, *PHTTP_RAW_CONNECTION_ID; -@@ -412,6 +425,7 @@ ULONG WINAPI HttpReceiveHttpRequest(HANDLE queue, HTTP_REQUEST_ID id, ULONG flag - ULONG WINAPI HttpRemoveUrl(HANDLE queue, const WCHAR *url); - ULONG WINAPI HttpSendHttpResponse(HANDLE queue, HTTP_REQUEST_ID id, ULONG flags, HTTP_RESPONSE *response, HTTP_CACHE_POLICY *cache_policy, ULONG *ret_size, void *reserved1, ULONG reserved2, OVERLAPPED *ovl, HTTP_LOG_DATA *log_data); - 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 - } --- -2.17.1 - diff --git a/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch b/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch deleted file mode 100644 index 0531b263..00000000 --- a/patches/httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch +++ /dev/null @@ -1,55 +0,0 @@ -From f1be93e6d88e4bb92b9ba335f5b6d5ca1aa0caa9 Mon Sep 17 00:00:00 2001 -From: Esdras Tarsis -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 | 1 + - 3 files changed, 11 insertions(+) - -diff --git a/dlls/httpapi/httpapi.spec b/dlls/httpapi/httpapi.spec -index 53c993d2161..886ccb4ce6c 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 171c950696f..ad7ef1d9bb1 100644 ---- a/dlls/httpapi/httpapi_main.c -+++ b/dlls/httpapi/httpapi_main.c -@@ -619,3 +619,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 186d6cb5015..9d0498f8019 100644 ---- a/include/http.h -+++ b/include/http.h -@@ -411,6 +411,7 @@ typedef struct _HTTP_LOG_DATA - } HTTP_LOG_DATA, *PHTTP_LOG_DATA; - - ULONG WINAPI HttpAddUrl(HANDLE,PCWSTR,PVOID); -+ULONG WINAPI HttpAddUrlToUrlGroup(HTTP_URL_GROUP_ID,PCWSTR,HTTP_URL_CONTEXT,ULONG); - ULONG WINAPI HttpCloseServerSession(HTTP_SERVER_SESSION_ID id); - ULONG WINAPI HttpCloseUrlGroup(HTTP_URL_GROUP_ID id); - ULONG WINAPI HttpCreateHttpHandle(PHANDLE,ULONG); --- -2.17.1 - diff --git a/patches/httpapi-HttpCreateServerSession/definition b/patches/httpapi-HttpCreateServerSession/definition deleted file mode 100644 index e83c2bba..00000000 --- a/patches/httpapi-HttpCreateServerSession/definition +++ /dev/null @@ -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 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 997c6b2c..0328e2c0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "e54f1cf9fba1ae8748e8e5c577530138baaf9e3d" + echo "a4aaf3f3d184c2cdad8c4bf06dc10980744a9d15" } # Show version information @@ -147,10 +147,8 @@ patch_enable_all () enable_fonts_Missing_Fonts="$1" enable_fsutil_Stub_Program="$1" enable_gdi32_Lazy_Font_Initialization="$1" - enable_gdi32_MultiMonitor="$1" enable_gdi32_rotation="$1" enable_gdiplus_Performance_Improvements="$1" - enable_httpapi_HttpCreateServerSession="$1" enable_imagehlp_BindImageEx="$1" enable_imm32_message_on_focus="$1" enable_include_winsock="$1" @@ -569,18 +567,12 @@ patch_enable () gdi32-Lazy_Font_Initialization) enable_gdi32_Lazy_Font_Initialization="$2" ;; - gdi32-MultiMonitor) - enable_gdi32_MultiMonitor="$2" - ;; gdi32-rotation) enable_gdi32_rotation="$2" ;; gdiplus-Performance-Improvements) enable_gdiplus_Performance_Improvements="$2" ;; - httpapi-HttpCreateServerSession) - enable_httpapi_HttpCreateServerSession="$2" - ;; imagehlp-BindImageEx) enable_imagehlp_BindImageEx="$2" ;; @@ -3982,23 +3974,6 @@ if test "$enable_gdi32_Lazy_Font_Initialization" -eq 1; then ) >> "$patchlist" fi -# Patchset gdi32-MultiMonitor -# | -# | This patchset fixes the following Wine bugs: -# | * [#34978] Multiple applications need EnumDisplayDevicesW implementation -# | * [#37709] GetMonitorInfo returns the same name for all monitors -# | * [#41258] Return a more reasonable display DeviceID -# | -# | Modified files: -# | * dlls/winemac.drv/display.c -# | -if test "$enable_gdi32_MultiMonitor" -eq 1; then - patch_apply gdi32-MultiMonitor/0004-winemac-Make-GetMonitorInfo-give-a-different-device-.patch - ( - printf '%s\n' '+ { "Ken Thomases", "winemac: Make GetMonitorInfo() give a different device name (\\\\.\\DISPLAY) to each monitor.", 1 },'; - ) >> "$patchlist" -fi - # Patchset gdi32-rotation # | # | This patchset fixes the following Wine bugs: @@ -4035,25 +4010,6 @@ if test "$enable_gdiplus_Performance_Improvements" -eq 1; then ) >> "$patchlist" fi -# Patchset httpapi-HttpCreateServerSession -# | -# | This patchset fixes the following Wine bugs: -# | * [#46549] httpapi: Fake success from HttpCreateServerSession -# | -# | Modified files: -# | * dlls/httpapi/httpapi.spec, dlls/httpapi/httpapi_main.c, include/http.h -# | -if test "$enable_httpapi_HttpCreateServerSession" -eq 1; then - patch_apply httpapi-HttpCreateServerSession/0004-httpapi-Add-CreateRequestQueue-stub.patch - patch_apply httpapi-HttpCreateServerSession/0005-httpapi-Add-SetUrlGroupProperty-stub.patch - patch_apply httpapi-HttpCreateServerSession/0006-httpapi-Add-AddUrlToUrlGroup-stub.patch - ( - printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add CreateRequestQueue stub.", 1 },'; - printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add SetUrlGroupProperty stub.", 1 },'; - printf '%s\n' '+ { "Esdras Tarsis", "httpapi: Add AddUrlToUrlGroup stub.", 1 },'; - ) >> "$patchlist" -fi - # Patchset imagehlp-BindImageEx # | # | This patchset fixes the following Wine bugs: