Rebase against 5bd1b2652c844a2522131bd26feb95231f718986

patches/patchinstall.sh

@@ -52,7 +52,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "6e3f39a4c59fd529c7b532dcde1bb8c37c467b35"
+	echo "5bd1b2652c844a2522131bd26feb95231f718986"
 }
 
 # Show version information
@@ -290,7 +290,6 @@ patch_enable_all ()
 	enable_user32_DrawMenuItem="$1"
 	enable_user32_DrawTextExW="$1"
 	enable_user32_FlashWindowEx="$1"
-	enable_user32_GetPointerType="$1"
 	enable_user32_GetSystemMetrics="$1"
 	enable_user32_Implement_CascadeWindows="$1"
 	enable_user32_LR_LOADFROMFILE="$1"
@@ -305,7 +304,6 @@ patch_enable_all ()
 	enable_uxtheme_GTK_Theming="$1"
 	enable_version_VerFindFileA="$1"
 	enable_version_VerQueryValue="$1"
-	enable_virtdisk_OpenVirtualDisk="$1"
 	enable_widl_SLTG_Typelib_Support="$1"
 	enable_windowscodecs_GIF_Encoder="$1"
 	enable_windowscodecs_IMILBitmapSource="$1"
@@ -1008,9 +1006,6 @@ patch_enable ()
 		user32-FlashWindowEx)
 			enable_user32_FlashWindowEx="$2"
 			;;
-		user32-GetPointerType)
-			enable_user32_GetPointerType="$2"
-			;;
 		user32-GetSystemMetrics)
 			enable_user32_GetSystemMetrics="$2"
 			;;
@@ -1053,9 +1048,6 @@ patch_enable ()
 		version-VerQueryValue)
 			enable_version_VerQueryValue="$2"
 			;;
-		virtdisk-OpenVirtualDisk)
-			enable_virtdisk_OpenVirtualDisk="$2"
-			;;
 		widl-SLTG_Typelib_Support)
 			enable_widl_SLTG_Typelib_Support="$2"
 			;;
@@ -1707,13 +1699,6 @@ if test "$enable_windowscodecs_TIFF_Support" -eq 1; then
 	enable_windowscodecs_GIF_Encoder=1
 fi
 
-if test "$enable_user32_GetPointerType" -eq 1; then
-	if test "$enable_user32_Mouse_Message_Hwnd" -gt 1; then
-		abort "Patchset user32-Mouse_Message_Hwnd disabled, but user32-GetPointerType depends on that."
-	fi
-	enable_user32_Mouse_Message_Hwnd=1
-fi
-
 if test "$enable_stdole32_tlb_SLTG_Typelib" -eq 1; then
 	if test "$enable_widl_SLTG_Typelib_Support" -gt 1; then
 		abort "Patchset widl-SLTG_Typelib_Support disabled, but stdole32.tlb-SLTG_Typelib depends on that."
@@ -6180,50 +6165,6 @@ if test "$enable_user32_FlashWindowEx" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset user32-Mouse_Message_Hwnd
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#22458] Fix issues with inserting symbols by clicking on center in Word 2007 & 2010
-# |   *	[#12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0
-# |   *	[#9512] Make sure popups don't block access to objects underneath in DVDPro
-# |
-# | Modified files:
-# |   *	dlls/user32/message.c, dlls/user32/tests/input.c, dlls/winex11.drv/bitblt.c, server/protocol.def, server/window.c
-# |
-if test "$enable_user32_Mouse_Message_Hwnd" -eq 1; then
-	patch_apply user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
-	patch_apply user32-Mouse_Message_Hwnd/0002-user32-tests-Add-tests-for-clicking-through-layered-.patch
-	patch_apply user32-Mouse_Message_Hwnd/0003-user32-tests-Add-tests-for-window-region-of-layered-.patch
-	patch_apply user32-Mouse_Message_Hwnd/0004-user32-tests-Add-tests-for-DC-region.patch
-	patch_apply user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch
-	(
-		printf '%s\n' '+    { "Dmitry Timoshkov", "user32: Try harder to find a target for mouse messages.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for clicking through layered window.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for window region of layered windows.", 1 },';
-		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for DC region.", 1 },';
-		printf '%s\n' '+    { "Dmitry Timoshkov", "server: Add support for a layered window region.", 3 },';
-	) >> "$patchlist"
-fi
-
-# Patchset user32-GetPointerType
-# |
-# | This patchset has the following (direct or indirect) dependencies:
-# |   *	user32-Mouse_Message_Hwnd
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#45765] Added GetPointerType stub
-# |
-# | Modified files:
-# |   *	dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec, dlls/user32/misc.c,
-# | 	dlls/user32/tests/input.c, dlls/user32/user32.spec, include/winuser.h
-# |
-if test "$enable_user32_GetPointerType" -eq 1; then
-	patch_apply user32-GetPointerType/0001-user32-Added-GetPointerType-stub.patch
-	(
-		printf '%s\n' '+    { "Louis Lenders", "user32: Added GetPointerType stub.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset user32-GetSystemMetrics
 # |
 # | This patchset fixes the following Wine bugs:
@@ -6298,6 +6239,31 @@ if test "$enable_user32_MessageBox_WS_EX_TOPMOST" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset user32-Mouse_Message_Hwnd
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#22458] Fix issues with inserting symbols by clicking on center in Word 2007 & 2010
+# |   *	[#12007] Fix issues with dragging layers between images in Adobe Photoshop 7.0
+# |   *	[#9512] Make sure popups don't block access to objects underneath in DVDPro
+# |
+# | Modified files:
+# |   *	dlls/user32/message.c, dlls/user32/tests/input.c, dlls/winex11.drv/bitblt.c, server/protocol.def, server/window.c
+# |
+if test "$enable_user32_Mouse_Message_Hwnd" -eq 1; then
+	patch_apply user32-Mouse_Message_Hwnd/0001-user32-Try-harder-to-find-a-target-for-mouse-message.patch
+	patch_apply user32-Mouse_Message_Hwnd/0002-user32-tests-Add-tests-for-clicking-through-layered-.patch
+	patch_apply user32-Mouse_Message_Hwnd/0003-user32-tests-Add-tests-for-window-region-of-layered-.patch
+	patch_apply user32-Mouse_Message_Hwnd/0004-user32-tests-Add-tests-for-DC-region.patch
+	patch_apply user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch
+	(
+		printf '%s\n' '+    { "Dmitry Timoshkov", "user32: Try harder to find a target for mouse messages.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for clicking through layered window.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for window region of layered windows.", 1 },';
+		printf '%s\n' '+    { "Sebastian Lackner", "user32/tests: Add tests for DC region.", 1 },';
+		printf '%s\n' '+    { "Dmitry Timoshkov", "server: Add support for a layered window region.", 3 },';
+	) >> "$patchlist"
+fi
+
 # Patchset user32-Refresh_MDI_Menus
 # |
 # | This patchset fixes the following Wine bugs:
@@ -6421,21 +6387,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset virtdisk-OpenVirtualDisk
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#45947] virtdisk: Stub OpenVirtualDisk
-# |
-# | Modified files:
-# |   *	dlls/virtdisk/virtdisk.spec, dlls/virtdisk/virtdisk_main.c, include/virtdisk.h
-# |
-if test "$enable_virtdisk_OpenVirtualDisk" -eq 1; then
-	patch_apply virtdisk-OpenVirtualDisk/0001-virtdisk-Add-stub-for-OpenVirtualDisk.patch
-	(
-		printf '%s\n' '+    { "Louis Lenders", "virtdisk: Add stub for OpenVirtualDisk.", 1 },';
-	) >> "$patchlist"
-fi
-
 # Patchset windowscodecs-GIF_Encoder
 # |
 # | Modified files:

patches/user32-GetPointerType/0001-user32-Added-GetPointerType-stub.patch

@@ -1,124 +0,0 @@
-From 14c6fa09988e5d52e8f26bc6a05cff3860cb1887 Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Mon, 17 Sep 2018 17:26:21 +0200
-Subject: [PATCH] user32: Added GetPointerType stub
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45765
----
- ...i-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec |  2 +-
- dlls/user32/misc.c                              | 12 ++++++++++++
- dlls/user32/tests/input.c                       | 17 +++++++++++++++++
- dlls/user32/user32.spec                         |  1 +
- include/winuser.h                               |  1 +
- 5 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
-index 93ecc1b3e..c58d51a47 100644
---- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
-+++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
-@@ -17,7 +17,7 @@
- @ stub GetPointerPenInfoHistory
- @ stub GetPointerTouchInfo
- @ stub GetPointerTouchInfoHistory
--@ stub GetPointerType
-+@ stdcall GetPointerType(long ptr) user32.GetPointerType
- @ stub GetRawPointerDeviceData
- @ stub InitializeTouchInjection
- @ stub InjectTouchInput
-diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
-index d28cd9fd0..058f47af3 100644
---- a/dlls/user32/misc.c
-+++ b/dlls/user32/misc.c
-@@ -664,6 +664,18 @@ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value)
-     return TRUE;
- }
- 
-+/**********************************************************************
-+ * GetPointerType [USER32.@]
-+ */
-+BOOL WINAPI GetPointerType(UINT32 id, POINTER_INPUT_TYPE *type)
-+{
-+    FIXME("(%d %p): stub\n", id, type);
-+    if(!type)
-+        return FALSE;
-+
-+    *type = PT_MOUSE;
-+    return TRUE;
-+}
- 
- static const WCHAR imeW[] = {'I','M','E',0};
- const struct builtin_class_descr IME_builtin_class =
-diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index 1f02654b3..af4c5573e 100644
---- a/dlls/user32/tests/input.c
-+++ b/dlls/user32/tests/input.c
-@@ -79,6 +79,7 @@ static struct {
- 
- static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t);
- static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source );
-+static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*);
- static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD);
- static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT);
- static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *);
-@@ -167,6 +168,7 @@ static void init_function_pointers(void)
-     GET_PROC(SendInput);
-     GET_PROC(GetCurrentInputMessageSource);
-     GET_PROC(GetMouseMovePointsEx);
-+    GET_PROC(GetPointerType);
-     GET_PROC(GetRawInputDeviceList);
-     GET_PROC(GetRawInputDeviceInfoW);
-     GET_PROC(GetRawInputDeviceInfoA);
-@@ -3065,6 +3067,16 @@ static void test_input_message_source(void)
-     UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) );
- }
- 
-+static void test_GetPointerType(void)
-+{
-+    BOOL ret;
-+    POINTER_INPUT_TYPE type = -1;
-+
-+    ret = pGetPointerType(1, &type);
-+    ok(ret, "GetPointerType failed, got type %d for 1\n", type );
-+    ok(type != -1, " type %d\n", type );
-+}
-+
- START_TEST(input)
- {
-     POINT pos;
-@@ -3110,4 +3122,9 @@ START_TEST(input)
-         win_skip("GetCurrentInputMessageSource is not available\n");
- 
-     SetCursorPos( pos.x, pos.y );
-+
-+    if(pGetPointerType)
-+        test_GetPointerType();
-+    else
-+        win_skip("GetPointerType is not available\n");
- }
-diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
-index d5b8597d8..f9a4ae26d 100644
---- a/dlls/user32/user32.spec
-+++ b/dlls/user32/user32.spec
-@@ -356,6 +356,7 @@
- @ stdcall GetParent(long)
- @ stdcall GetPhysicalCursorPos(ptr)
- @ stdcall GetPointerDevices(ptr ptr)
-+@ stdcall GetPointerType(long ptr)
- @ stdcall GetPriorityClipboardFormat(ptr long)
- @ stdcall GetProcessDefaultLayout(ptr)
- @ stdcall GetProcessDpiAwarenessInternal(long ptr)
-diff --git a/include/winuser.h b/include/winuser.h
-index 6300cc9a3..8c9305467 100644
---- a/include/winuser.h
-+++ b/include/winuser.h
-@@ -3831,6 +3831,7 @@ WINUSERAPI HWND        WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
- WINUSERAPI HWND        WINAPI GetOpenClipboardWindow(void);
- WINUSERAPI HWND        WINAPI GetParent(HWND);
- WINUSERAPI BOOL        WINAPI GetPhysicalCursorPos(POINT*);
-+WINUSERAPI BOOL        WINAPI GetPointerType(UINT32,POINTER_INPUT_TYPE *);
- WINUSERAPI INT         WINAPI GetPriorityClipboardFormat(UINT*,INT);
- WINUSERAPI BOOL        WINAPI GetProcessDefaultLayout(DWORD*);
- WINUSERAPI BOOL        WINAPI GetProcessDpiAwarenessInternal(HANDLE,DPI_AWARENESS*);
--- 
-2.20.1
-

patches/user32-GetPointerType/definition

@@ -1,2 +0,0 @@
-Fixes: [45765] Added GetPointerType stub
-Depends: user32-Mouse_Message_Hwnd

patches/virtdisk-OpenVirtualDisk/0001-virtdisk-Add-stub-for-OpenVirtualDisk.patch

@@ -1,113 +0,0 @@
-From 5ae0479976a8475b9bd9ed59c01a7bb204cf0bdc Mon Sep 17 00:00:00 2001
-From: Louis Lenders <xerox.xerox2000x@gmail.com>
-Date: Sun, 14 Oct 2018 10:30:20 +0200
-Subject: [PATCH] virtdisk: Add stub for OpenVirtualDisk
-
-Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45947
-Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
----
- dlls/virtdisk/virtdisk.spec   |  2 +-
- dlls/virtdisk/virtdisk_main.c |  7 +++++++
- include/virtdisk.h            | 44 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 52 insertions(+), 1 deletion(-)
-
-diff --git a/dlls/virtdisk/virtdisk.spec b/dlls/virtdisk/virtdisk.spec
-index 6bd5f14..f35b8df 100644
---- a/dlls/virtdisk/virtdisk.spec
-+++ b/dlls/virtdisk/virtdisk.spec
-@@ -15,7 +15,7 @@
- @ stub GetVirtualDiskPhysicalPath
- @ stub MergeVirtualDisk
- @ stub MirrorVirtualDisk
--@ stub OpenVirtualDisk
-+@ stdcall OpenVirtualDisk(ptr wstr long long ptr ptr)
- @ stub ResizeVirtualDisk
- @ stub SetVirtualDiskInformation
- @ stub SetVirtualDiskMetadata
-diff --git a/dlls/virtdisk/virtdisk_main.c b/dlls/virtdisk/virtdisk_main.c
-index 3e6c5c1..1523fd4 100644
---- a/dlls/virtdisk/virtdisk_main.c
-+++ b/dlls/virtdisk/virtdisk_main.c
-@@ -65,3 +65,10 @@ DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_
- 
-     return ERROR_SUCCESS;
- }
-+
-+DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags,
-+                             OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle)
-+{
-+    FIXME("(%p, %s, %d, 0x%x, %p, %p): stub\n", type, wine_dbgstr_w(path), mask, flags, param, handle);
-+    return ERROR_CALL_NOT_IMPLEMENTED;
-+}
-diff --git a/include/virtdisk.h b/include/virtdisk.h
-index b4c07f3..7c207dd 100644
---- a/include/virtdisk.h
-+++ b/include/virtdisk.h
-@@ -37,6 +37,26 @@ typedef enum _ATTACH_VIRTUAL_DISK_FLAG {
-     ATTACH_VIRTUAL_DISK_FLAG_NO_SECURITY_DESCRIPTOR = 0x10
- } ATTACH_VIRTUAL_DISK_FLAG;
- 
-+typedef enum _OPEN_VIRTUAL_DISK_FLAG {
-+    OPEN_VIRTUAL_DISK_FLAG_NONE                           = 0x00,
-+    OPEN_VIRTUAL_DISK_FLAG_NO_PARENTS                     = 0x01,
-+    OPEN_VIRTUAL_DISK_FLAG_BLANK_FILE                     = 0x02,
-+    OPEN_VIRTUAL_DISK_FLAG_BOOT_DRIVE                     = 0x04,
-+    OPEN_VIRTUAL_DISK_FLAG_CACHED_IO                      = 0x08,
-+    OPEN_VIRTUAL_DISK_FLAG_CUSTOM_DIFF_CHAIN              = 0x10,
-+    OPEN_VIRTUAL_DISK_FLAG_PARENT_CACHED_IO               = 0x20,
-+    OPEN_VIRTUAL_DISK_FLAG_VHDSET_FILE_ONLY               = 0x40,
-+    OPEN_VIRTUAL_DISK_FLAG_IGNORE_RELATIVE_PARENT_LOCATOR = 0x80,
-+    OPEN_VIRTUAL_DISK_FLAG_NO_WRITE_HARDENING             = 0x100
-+} OPEN_VIRTUAL_DISK_FLAG;
-+
-+typedef enum _OPEN_VIRTUAL_DISK_VERSION {
-+    OPEN_VIRTUAL_DISK_VERSION_UNSCPECIFIED,
-+    OPEN_VIRTUAL_DISK_VERSION_1,
-+    OPEN_VIRTUAL_DISK_VERSION_2,
-+    OPEN_VIRTUAL_DISK_VERSION_3
-+} OPEN_VIRTUAL_DISK_VERSION;
-+
- typedef enum _ATTACH_VIRTUAL_DISK_VERSION {
-     ATTACH_VIRTUAL_DISK_VERSION_UNSPECIFIED,
-     ATTACH_VIRTUAL_DISK_VERSION_1
-@@ -156,6 +176,27 @@ typedef struct _EXPAND_VIRTUAL_DISK_PARAMETERS {
-     } DUMMYUNIONNAME;
- } EXPAND_VIRTUAL_DISK_PARAMETERS, *PEXPAND_VIRTUAL_DISK_PARAMETERS;
- 
-+typedef struct _OPEN_VIRTUAL_DISK_PARAMETERS
-+{
-+    OPEN_VIRTUAL_DISK_VERSION Version;
-+    __C89_NAMELESS union {
-+        struct {
-+	    ULONG RWDepth;
-+        } Version1;
-+        struct {
-+	    BOOL GetInfoOnly;
-+            BOOL ReadOnly;
-+            GUID ResiliencyGuid;
-+        } Version2;
-+        struct {
-+	    BOOL GetInfoOnly;
-+            BOOL ReadOnly;
-+            GUID ResiliencyGuid;
-+            GUID SnapshotId;
-+        } Version3;
-+    } DUMMYUNIONNAME;
-+} OPEN_VIRTUAL_DISK_PARAMETERS, *POPEN_VIRTUAL_DISK_PARAMETERS;
-+
- typedef struct _STORAGE_DEPENDENCY_INFO_TYPE_1
- {
-     DEPENDENT_DISK_FLAG  DependencyTypeFlags;
-@@ -196,6 +237,9 @@ typedef struct _VIRTUAL_DISK_PROGRESS {
- 
- DWORD WINAPI GetStorageDependencyInformation(HANDLE obj, GET_STORAGE_DEPENDENCY_FLAG flags, ULONG size, STORAGE_DEPENDENCY_INFO *info, ULONG *used);
- 
-+DWORD WINAPI OpenVirtualDisk(VIRTUAL_STORAGE_TYPE *type, const WCHAR *path, VIRTUAL_DISK_ACCESS_MASK mask, OPEN_VIRTUAL_DISK_FLAG flags,
-+                             OPEN_VIRTUAL_DISK_PARAMETERS *param, HANDLE *handle);
-+
- #ifdef __cplusplus
- }
- #endif
--- 
-1.9.1
-

patches/virtdisk-OpenVirtualDisk/definition

@@ -1 +0,0 @@
-Fixes: [45947] virtdisk: Stub OpenVirtualDisk