From 3dcb98363741e33396be94549ba075b9297a3f00 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 24 Aug 2018 17:37:59 -0500 Subject: [PATCH] Rebase against 70fbfa2cb8198f86efa19eda91cf769056b7da2c. --- patches/patchinstall.sh | 21 +------- patches/shell32-Placeholder_Icons/definition | 2 + ...-toolbar-bitmaps-compatible-with-IE6.patch | 20 +++---- ...w-to-select-default-display-frequenc.patch | 54 +++++++++++-------- ...nhttp-Fix-handling-of-Accept-headers.patch | 24 ++++----- 5 files changed, 56 insertions(+), 65 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index acb80949..a12f277c 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f0ad5b5c546d17b281aef13fde996cda08d0c14e" + echo "70fbfa2cb8198f86efa19eda91cf769056b7da2c" } # Show version information @@ -304,7 +304,6 @@ patch_enable_all () enable_shell32_ACE_Viewer="$1" enable_shell32_Context_Menu="$1" enable_shell32_NewMenu_Interface="$1" - enable_shell32_Placeholder_Icons="$1" enable_shell32_Progress_Dialog="$1" enable_shell32_SFGAO_HASSUBFOLDER="$1" enable_shell32_SHELL_execute="$1" @@ -1087,9 +1086,6 @@ patch_enable () shell32-NewMenu_Interface) enable_shell32_NewMenu_Interface="$2" ;; - shell32-Placeholder_Icons) - enable_shell32_Placeholder_Icons="$2" - ;; shell32-Progress_Dialog) enable_shell32_Progress_Dialog="$2" ;; @@ -6439,21 +6435,6 @@ if test "$enable_shell32_NewMenu_Interface" -eq 1; then ) >> "$patchlist" fi -# Patchset shell32-Placeholder_Icons -# | -# | This patchset fixes the following Wine bugs: -# | * [#30185] Add shell32 placeholder icons to match offsets with Windows -# | -# | Modified files: -# | * dlls/shell32/resources/placeholder.ico, dlls/shell32/shell32.rc, dlls/shell32/shresdef.h -# | -if test "$enable_shell32_Placeholder_Icons" -eq 1; then - patch_apply shell32-Placeholder_Icons/0001-shell32-Add-placeholder-icons-to-match-icon-offset-w.patch - ( - printf '%s\n' '+ { "Michael Müller", "shell32: Add placeholder icons to match icon offset with XP.", 1 },'; - ) >> "$patchlist" -fi - # Patchset shell32-SFGAO_HASSUBFOLDER # | # | This patchset fixes the following Wine bugs: diff --git a/patches/shell32-Placeholder_Icons/definition b/patches/shell32-Placeholder_Icons/definition index 48da54c8..25f4c2a6 100644 --- a/patches/shell32-Placeholder_Icons/definition +++ b/patches/shell32-Placeholder_Icons/definition @@ -1 +1,3 @@ Fixes: [30185] Add shell32 placeholder icons to match offsets with Windows +Disabled: true +# This patch is disabled until Alex Henrie is done. \ No newline at end of file diff --git a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch index 257eb7e1..85875dd0 100644 --- a/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch +++ b/patches/shell32-Toolbar_Bitmaps/0001-shell32-Add-toolbar-bitmaps-compatible-with-IE6.patch @@ -1,4 +1,4 @@ -From 9e65ab913d2995b3add1fad7ea3124b114fdd5af Mon Sep 17 00:00:00 2001 +From 0c8d61b9ee9c775d8a86900482a841d1373e8f46 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 2 Mar 2016 16:36:33 +0800 Subject: [PATCH] shell32: Add toolbar bitmaps compatible with IE6. @@ -10,9 +10,9 @@ ietoolbar_small.svg - 256x16 --- dlls/shell32/Makefile.in | 2 + dlls/shell32/resources/ietoolbar.bmp | Bin 0 -> 37002 bytes - dlls/shell32/resources/ietoolbar.svg | 1782 ++++++++++++++++++++ + dlls/shell32/resources/ietoolbar.svg | 1782 ++++++++++++++++++++++++++++ dlls/shell32/resources/ietoolbar_small.bmp | Bin 0 -> 16522 bytes - dlls/shell32/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++ + dlls/shell32/resources/ietoolbar_small.svg | 1782 ++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 8 + 6 files changed, 3574 insertions(+) create mode 100644 dlls/shell32/resources/ietoolbar.bmp @@ -21,7 +21,7 @@ ietoolbar_small.svg - 256x16 create mode 100644 dlls/shell32/resources/ietoolbar_small.svg diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index d7d1cc0b026..fb63f036b97 100644 +index 8bac590..737c8c1 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -73,6 +73,8 @@ SVG_SRCS = \ @@ -31,8 +31,8 @@ index d7d1cc0b026..fb63f036b97 100644 + resources/ietoolbar.svg \ + resources/ietoolbar_small.svg \ resources/internet.svg \ + resources/menu.svg \ resources/mycomputer.svg \ - resources/mydocs.svg \ diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241 @@ -182,7 +182,7 @@ HcmV?d00001 diff --git a/dlls/shell32/resources/ietoolbar.svg b/dlls/shell32/resources/ietoolbar.svg new file mode 100644 -index 00000000000..a49bd2e9096 +index 0000000..a49bd2e --- /dev/null +++ b/dlls/shell32/resources/ietoolbar.svg @@ -0,0 +1,1782 @@ @@ -2054,7 +2054,7 @@ HcmV?d00001 diff --git a/dlls/shell32/resources/ietoolbar_small.svg b/dlls/shell32/resources/ietoolbar_small.svg new file mode 100644 -index 00000000000..2aa52cdb3a0 +index 0000000..2aa52cd --- /dev/null +++ b/dlls/shell32/resources/ietoolbar_small.svg @@ -0,0 +1,1782 @@ @@ -3841,10 +3841,10 @@ index 00000000000..2aa52cdb3a0 + + diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index 6cb9afdf340..cff05c6be0d 100644 +index 2333e39..5448db0 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -742,6 +742,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp +@@ -581,6 +581,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp /* @makedep: resources/idb_tb_small.bmp */ IDB_TB_SMALL_DARK BITMAP resources/idb_tb_small.bmp @@ -3860,5 +3860,5 @@ index 6cb9afdf340..cff05c6be0d 100644 IDR_AVI_SEARCHING AVI resources/searching.avi -- -2.18.0 +2.7.4 diff --git a/patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch b/patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch index d59a9690..2bc72854 100644 --- a/patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch +++ b/patches/winex11-DefaultDisplayFrequency/0001-winex11.drv-Allow-to-select-default-display-frequenc.patch @@ -1,4 +1,4 @@ -From 695882d5939c00095d4ff903316dc56cc94b44f2 Mon Sep 17 00:00:00 2001 +From 07121577f503da242db989c9c78cffb7a86aafd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 5 Nov 2015 14:33:48 +0100 Subject: winex11.drv: Allow to select default display frequency in registry @@ -11,13 +11,13 @@ registry key (of type STRING) to select the default display frequency: HKCU\Software\Wine\X11 Driver\DefaultDisplayFrequency --- - dlls/winex11.drv/settings.c | 51 +++++++++++++++++++++++++++++------------- + dlls/winex11.drv/settings.c | 58 +++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 1 + - dlls/winex11.drv/x11drv_main.c | 4 ++++ - 3 files changed, 40 insertions(+), 16 deletions(-) + dlls/winex11.drv/x11drv_main.c | 4 +++ + 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c -index afa26cf5433..33bcddc35c6 100644 +index 800b65d..fc9d29c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -342,7 +342,7 @@ static const char * _DM_fields(DWORD fields) @@ -28,8 +28,8 @@ index afa26cf5433..33bcddc35c6 100644 + DWORD i, mode, dwBpp = 0; DEVMODEW dm; BOOL def_mode = TRUE; - -@@ -387,6 +387,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, + char bpp_buffer[16], freq_buffer[18]; +@@ -388,6 +388,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_BADMODE; } @@ -37,7 +37,7 @@ index afa26cf5433..33bcddc35c6 100644 for (i = 0; i < dd_mode_count; i++) { if (devmode->dmFields & DM_BITSPERPEL) -@@ -404,27 +405,45 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, +@@ -405,32 +406,49 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, if (devmode->dmPelsHeight != dd_modes[i].height) continue; } @@ -75,18 +75,25 @@ index afa26cf5433..33bcddc35c6 100644 - return DISP_CHANGE_SUCCESSFUL; + if (mode == ENUM_CURRENT_SETTINGS) + { -+ /* no valid modes found */ -+ ERR("No matching mode found %ux%ux%u @%u! (%s)\n", -+ devmode->dmPelsWidth, devmode->dmPelsHeight, -+ devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); ++ /* no valid modes found, only print the fields we were trying to matching against */ ++ bpp_buffer[0] = freq_buffer[0] = 0; ++ if (devmode->dmFields & DM_BITSPERPEL) ++ sprintf(bpp_buffer, "bpp=%u ", devmode->dmBitsPerPel); ++ if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) ++ sprintf(freq_buffer, "freq=%u ", devmode->dmDisplayFrequency); ++ ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", ++ devmode->dmPelsWidth, devmode->dmPelsHeight, bpp_buffer, freq_buffer, handler_name); + return DISP_CHANGE_BADMODE; } -- /* no valid modes found */ -- ERR("No matching mode found %ux%ux%u @%u! (%s)\n", -- devmode->dmPelsWidth, devmode->dmPelsHeight, -- devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); -- return DISP_CHANGE_BADMODE; +- /* no valid modes found, only print the fields we were trying to matching against */ +- bpp_buffer[0] = freq_buffer[0] = 0; +- if (devmode->dmFields & DM_BITSPERPEL) +- sprintf(bpp_buffer, "bpp=%u ", devmode->dmBitsPerPel); +- if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) +- sprintf(freq_buffer, "freq=%u ", devmode->dmDisplayFrequency); +- ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", +- devmode->dmPelsWidth, devmode->dmPelsHeight, bpp_buffer, freq_buffer, handler_name); + /* we have a valid mode */ + TRACE("Requested display settings match mode %d (%s)\n", mode, handler_name); + @@ -95,14 +102,15 @@ index afa26cf5433..33bcddc35c6 100644 + + if (!(flags & (CDS_TEST | CDS_NORESET))) + return pSetCurrentMode(mode); -+ + +- return DISP_CHANGE_BADMODE; + return DISP_CHANGE_SUCCESSFUL; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 721c082ed10..0e31c337212 100644 +index a0308b0..0e932e4 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -393,6 +393,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN; +@@ -400,6 +400,7 @@ extern BOOL private_color_map DECLSPEC_HIDDEN; extern int primary_monitor DECLSPEC_HIDDEN; extern int copy_default_colors DECLSPEC_HIDDEN; extern int alloc_system_colors DECLSPEC_HIDDEN; @@ -111,7 +119,7 @@ index 721c082ed10..0e31c337212 100644 extern HMODULE x11drv_module DECLSPEC_HIDDEN; extern char *process_name DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c -index 65ef59b0c1b..8244abf1bef 100644 +index e67a3c0..9ff285e 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -82,6 +82,7 @@ BOOL client_side_with_render = TRUE; @@ -122,7 +130,7 @@ index 65ef59b0c1b..8244abf1bef 100644 DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; int xrender_error_base = 0; HMODULE x11drv_module = 0; -@@ -412,6 +413,9 @@ static void setup_options(void) +@@ -413,6 +414,9 @@ static void setup_options(void) if (!get_config_key( hkey, appkey, "AllocSystemColors", buffer, sizeof(buffer) )) alloc_system_colors = atoi(buffer); @@ -133,5 +141,5 @@ index 65ef59b0c1b..8244abf1bef 100644 if (appkey) RegCloseKey( appkey ); -- -2.13.1 +2.7.4 diff --git a/patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch b/patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch index 1d45d19c..ae8d3e40 100644 --- a/patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch +++ b/patches/winhttp-Accept_Headers/0001-winhttp-Fix-handling-of-Accept-headers.patch @@ -1,4 +1,4 @@ -From 8f902d761567ba0a7972ad998ebb0ccfa5db537d Mon Sep 17 00:00:00 2001 +From 1ee165b875ae718219406b1d8829986a16e3d841 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 21 Dec 2016 00:54:37 +0100 Subject: winhttp: Fix handling of Accept headers. @@ -10,10 +10,10 @@ Subject: winhttp: Fix handling of Accept headers. 3 files changed, 7 insertions(+), 32 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c -index 47cc9066f89..aaa6a5e7905 100644 +index 6f6de7c..b81c49d 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c -@@ -401,7 +401,7 @@ static BOOL delete_header( request_t *request, DWORD index ) +@@ -402,7 +402,7 @@ static BOOL delete_header( request_t *request, DWORD index ) return TRUE; } @@ -22,7 +22,7 @@ index 47cc9066f89..aaa6a5e7905 100644 { int index; header_t hdr; -@@ -1521,16 +1521,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len +@@ -2080,16 +2080,11 @@ static BOOL send_request( request_t *request, LPCWSTR headers, DWORD headers_len WCHAR *req = NULL; char *req_ascii; int bytes_sent; @@ -41,10 +41,10 @@ index 47cc9066f89..aaa6a5e7905 100644 process_header( request, attr_user_agent, session->agent, WINHTTP_ADDREQ_FLAG_ADD_IF_NEW, TRUE ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c -index 877794af45b..c4351a83b8a 100644 +index 8da09a2..c94325a 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c -@@ -599,8 +599,6 @@ static void request_destroy( object_header_t *hdr ) +@@ -612,8 +612,6 @@ static void request_destroy( object_header_t *hdr ) heap_free( request->headers[i].value ); } heap_free( request->headers ); @@ -53,7 +53,7 @@ index 877794af45b..c4351a83b8a 100644 for (i = 0; i < TARGET_MAX; i++) { for (j = 0; j < SCHEME_MAX; j++) -@@ -1026,32 +1024,14 @@ static const object_vtbl_t request_vtbl = +@@ -1048,32 +1046,14 @@ static const object_vtbl_t request_vtbl = static BOOL store_accept_types( request_t *request, const WCHAR **accept_types ) { @@ -90,10 +90,10 @@ index 877794af45b..c4351a83b8a 100644 } return TRUE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h -index dd8c4efd938..180b1c4ba74 100644 +index 7b92afc..3e3c7bd 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h -@@ -220,8 +220,6 @@ typedef struct +@@ -227,8 +227,6 @@ typedef struct char read_buf[8192]; /* buffer for already read but not returned data */ header_t *headers; DWORD num_headers; @@ -102,9 +102,9 @@ index dd8c4efd938..180b1c4ba74 100644 struct authinfo *authinfo; struct authinfo *proxy_authinfo; HANDLE task_wait; -@@ -316,6 +314,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; - +@@ -324,6 +322,8 @@ void destroy_authinfo( struct authinfo * ) DECLSPEC_HIDDEN; void release_host( hostdata_t *host ) DECLSPEC_HIDDEN; + DWORD escape_string( WCHAR *, const WCHAR *, DWORD ) DECLSPEC_HIDDEN; +BOOL process_header( request_t *request, LPCWSTR field, LPCWSTR value, DWORD flags, BOOL request_only ) DECLSPEC_HIDDEN; + @@ -112,5 +112,5 @@ index dd8c4efd938..180b1c4ba74 100644 void release_typelib( void ) DECLSPEC_HIDDEN; -- -2.13.1 +2.7.4