From d205b5f8e94524630fc675f54b478e78bf82316c Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 28 Aug 2018 08:27:10 +1000 Subject: [PATCH] Rebase against 96a6053feda4e16480c21d01b3688a8d38e5ad6d --- patches/patchinstall.sh | 2 +- ...d-toolbar-bitmaps-compatible-with-IE6.patch | 16 ++++++++-------- ...pport-for-a-layered-window-region.-v2.patch | 18 +++++++++--------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index ac560441..4eda6689 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "70fbfa2cb8198f86efa19eda91cf769056b7da2c" + echo "96a6053feda4e16480c21d01b3688a8d38e5ad6d" } # Show version information 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 85875dd0..adec03cc 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 0c8d61b9ee9c775d8a86900482a841d1373e8f46 Mon Sep 17 00:00:00 2001 +From b8e6db45765947ef23bbbbb080cd487170f4bbd6 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. @@ -21,18 +21,18 @@ 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 8bac590..737c8c1 100644 +index 0664c85..9c15a71 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in -@@ -73,6 +73,8 @@ SVG_SRCS = \ +@@ -76,6 +76,8 @@ SVG_SRCS = \ resources/folder.svg \ resources/folder_open.svg \ resources/help.svg \ + resources/ietoolbar.svg \ + resources/ietoolbar_small.svg \ resources/internet.svg \ - resources/menu.svg \ - resources/mycomputer.svg \ + resources/lock.svg \ + resources/log_off.svg \ diff --git a/dlls/shell32/resources/ietoolbar.bmp b/dlls/shell32/resources/ietoolbar.bmp new file mode 100644 index 0000000000000000000000000000000000000000..b46d056f54f6b6bc5bd390d0afbb835b824e2241 @@ -3841,10 +3841,10 @@ index 0000000..2aa52cd + + diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc -index 2333e39..5448db0 100644 +index d586a05..dcb8f0a 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc -@@ -581,6 +581,14 @@ IDB_TB_SMALL_LIGHT BITMAP resources/idb_tb_small.bmp +@@ -698,6 +698,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 2333e39..5448db0 100644 IDR_AVI_SEARCHING AVI resources/searching.avi -- -2.7.4 +1.9.1 diff --git a/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch b/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch index 3daadb8c..a3d7e007 100644 --- a/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch +++ b/patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch @@ -1,4 +1,4 @@ -From 8d68c50ae8593769c5f5281b4895fae0b467a890 Mon Sep 17 00:00:00 2001 +From bd18d7e21494557615c398244a4e180e44a11e25 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 17 May 2017 23:55:55 +0800 Subject: [PATCH] server: Add support for a layered window region. (v3) @@ -106,10 +106,10 @@ index 0343d96..b07c9be 100644 #endif } diff --git a/server/protocol.def b/server/protocol.def -index b87c69e..506d2e2 100644 +index f48fd00..f3aa6f1 100644 --- a/server/protocol.def +++ b/server/protocol.def -@@ -2762,6 +2762,13 @@ enum coords_relative +@@ -2775,6 +2775,13 @@ enum coords_relative @END @@ -124,7 +124,7 @@ index b87c69e..506d2e2 100644 @REQ(get_update_region) user_handle_t window; /* handle to the window */ diff --git a/server/window.c b/server/window.c -index e58d7e4..682c7db 100644 +index c9b131c..766bf51 100644 --- a/server/window.c +++ b/server/window.c @@ -73,6 +73,7 @@ struct window @@ -143,9 +143,9 @@ index e58d7e4..682c7db 100644 win->update_region = NULL; win->style = 0; win->ex_style = 0; -@@ -671,6 +673,9 @@ static inline int is_point_in_window( struct window *win, int x, int y ) +@@ -723,6 +725,9 @@ static int is_point_in_window( struct window *win, int *x, int *y, unsigned int if (win->win_region && - !point_in_region( win->win_region, x - win->window_rect.left, y - win->window_rect.top )) + !point_in_region( win->win_region, *x - win->window_rect.left, *y - win->window_rect.top )) return 0; /* not in window region */ + if (win->layer_region && + !point_in_region( win->layer_region, x - win->window_rect.left, y - win->window_rect.top )) @@ -153,7 +153,7 @@ index e58d7e4..682c7db 100644 return 1; } -@@ -1820,6 +1825,14 @@ static void set_window_region( struct window *win, struct region *region, int re +@@ -1868,6 +1873,14 @@ static void set_window_region( struct window *win, struct region *region, int re } @@ -168,7 +168,7 @@ index e58d7e4..682c7db 100644 /* destroy a window */ void destroy_window( struct window *win ) { -@@ -1868,6 +1881,7 @@ void destroy_window( struct window *win ) +@@ -1916,6 +1929,7 @@ void destroy_window( struct window *win ) detach_window_thread( win ); if (win->win_region) free_region( win->win_region ); @@ -176,7 +176,7 @@ index e58d7e4..682c7db 100644 if (win->update_region) free_region( win->update_region ); if (win->class) release_class( win->class ); free( win->text ); -@@ -2527,6 +2541,24 @@ DECL_HANDLER(set_window_region) +@@ -2569,6 +2583,24 @@ DECL_HANDLER(set_window_region) }