From c542f2432d35776959f59b1c10b3e3242a62a42e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Tue, 9 May 2017 05:33:36 +0200 Subject: [PATCH] Rebase against b6a4b2f593503a105dde01e7bd11ffdde243117a. --- ...d-stub-for-ApiSetQueryApiSetPresence.patch | 12 +++--- patches/patchinstall.sh | 2 +- ...-some-tests-to-see-when-MessageBox-g.patch | 42 +++++++++---------- ...user32-Add-support-for-PNG-icons.-v4.patch | 26 ++++++------ ...-a-test-for-custom-dialog-control-da.patch | 12 +++--- .../wined3d-CSMT_Main/9999-IfDefined.patch | 16 +++---- 6 files changed, 54 insertions(+), 56 deletions(-) diff --git a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch index 5157bf6e..8b07d2b1 100644 --- a/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch +++ b/patches/ntdll-ApiSetQueryApiSetPresence/0001-ntdll-Add-stub-for-ApiSetQueryApiSetPresence.patch @@ -1,4 +1,4 @@ -From 07428b41767dfbbc3de78e32690527a9bc154260 Mon Sep 17 00:00:00 2001 +From 69a28da617c7d5c361eae5ed056cac7984b4177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:17:31 +0100 Subject: ntdll: Add stub for ApiSetQueryApiSetPresence. @@ -17,12 +17,12 @@ index 6d63b5bf43..1d99dd7132 100644 -@ stub ApiSetQueryApiSetPresence +@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index f6d95b7802..c20d0812d8 100644 +index 8f0c51cea9..1a0087ae14 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c -@@ -474,3 +474,14 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri - FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor); - return FALSE; +@@ -476,3 +476,14 @@ ULONG WINAPI EtwEventWrite( REGHANDLE handle, const EVENT_DESCRIPTOR *descriptor + FIXME("(%s, %p, %u, %p): stub\n", wine_dbgstr_longlong(handle), descriptor, count, data); + return ERROR_SUCCESS; } + +/********************************************************************* @@ -36,7 +36,7 @@ index f6d95b7802..c20d0812d8 100644 + return TRUE; +} diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index f8b139a458..59c9978986 100644 +index 9adf1edd4a..adfb2fc7ef 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -3,6 +3,7 @@ diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d4cef263..c8d0404b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9f55292085392579568ff81b8adb926b32a8d99a" + echo "b6a4b2f593503a105dde01e7bd11ffdde243117a" } # Show version information diff --git a/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch b/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch index a265f1a2..7d333bb4 100644 --- a/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch +++ b/patches/user32-MessageBox_WS_EX_TOPMOST/0001-user32-tests-Add-some-tests-to-see-when-MessageBox-g.patch @@ -1,19 +1,19 @@ -From 7a0cb3382e4d57adf72203c381105340d893d21b Mon Sep 17 00:00:00 2001 +From b61dd32eb804c9ce027247d15e92b35c59010f6a Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 18 Feb 2016 10:17:46 +0800 Subject: user32/tests: Add some tests to see when MessageBox gains WS_EX_TOPMOST style. --- - dlls/user32/tests/dialog.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 113 insertions(+) + dlls/user32/tests/dialog.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 108 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index 4289b3f..945d971 100644 +index b8eea98b6e..de6aa463e9 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c -@@ -1508,12 +1508,125 @@ static void test_dialog_custom_data(void) - DialogBoxA(g_hinst, "CUSTOM_TEST_DIALOG", NULL, custom_test_dialog_proc); +@@ -1573,8 +1573,69 @@ static LRESULT CALLBACK msgbox_hook_proc(INT code, WPARAM wParam, LPARAM lParam) + return CallNextHookEx(NULL, code, wParam, lParam); } +struct create_window_params @@ -64,8 +64,8 @@ index 4289b3f..945d971 100644 + return hwnd; +} + -+static void test_MessageBox(void) -+{ + static void test_MessageBox(void) + { + static const struct + { + DWORD mb_style; @@ -76,9 +76,16 @@ index 4289b3f..945d971 100644 + { MB_OK | MB_TASKMODAL, 0 }, + { MB_OK | MB_SYSTEMMODAL, WS_EX_TOPMOST }, + }; -+ DWORD tid, i; -+ HANDLE thread; + struct create_window_params params; ++ HANDLE thread; ++ DWORD tid, i; + HHOOK hook; + int ret; + +@@ -1584,6 +1645,53 @@ static void test_MessageBox(void) + ok(ret == IDCANCEL, "got %d\n", ret); + + UnhookWindowsHookEx(hook); + + sprintf(params.caption, "pid %08x, tid %08x, time %08x", + GetCurrentProcessId(), GetCurrentThreadId(), GetCurrentTime()); @@ -126,18 +133,9 @@ index 4289b3f..945d971 100644 + ok(WaitForSingleObject(thread, 5000) != WAIT_TIMEOUT, "thread failed to terminate\n"); + CloseHandle(thread); + } -+} -+ - START_TEST(dialog) - { - g_hinst = GetModuleHandleA (0); + } - if (!RegisterWindowClasses()) assert(0); - -+ test_MessageBox(); - test_dialog_custom_data(); - test_GetNextDlgItem(); - test_IsDialogMessage(); + static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) -- -2.7.1 +2.12.2 diff --git a/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch b/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch index c0ff1b92..0f9b2c62 100644 --- a/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch +++ b/patches/user32-PNG_Support/0001-user32-Add-support-for-PNG-icons.-v4.patch @@ -1,4 +1,4 @@ -From 8e718993307d5ea6c415e4d169b3e37f0d85e5fd Mon Sep 17 00:00:00 2001 +From 063b754b9246809133a5608a38626a13a6488070 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Thu, 7 Apr 2016 21:18:44 +0800 Subject: user32: Add support for PNG icons. (v5) @@ -9,7 +9,7 @@ Subject: user32: Add support for PNG icons. (v5) 2 files changed, 335 insertions(+), 5 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in -index b5c80a8..d0381f3 100644 +index b5c80a84b3..d0381f301e 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -2,6 +2,7 @@ EXTRADEFS = -D_USER32_ -D_WINABLE_ @@ -21,7 +21,7 @@ index b5c80a8..d0381f3 100644 C_SRCS = \ diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c -index 4f93195..3899854 100644 +index 33ce5cb2e4..1b0de9bdd3 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -6,6 +6,8 @@ @@ -58,12 +58,12 @@ index 4f93195..3899854 100644 + ( (DWORD)(BYTE)(c2) << 16 ) | ( (DWORD)(BYTE)(c3) << 24 ) ) +#define PNG_SIGN RIFF_FOURCC(0x89,'P','N','G') + - static HDC screen_dc; + static struct list icon_cache = LIST_INIT( icon_cache ); - static const WCHAR DISPLAYW[] = {'D','I','S','P','L','A','Y',0}; -@@ -96,6 +107,307 @@ struct animated_cursoricon_object - HICON frames[1]; /* list of animated cursor frames */ - }; + /********************************************************************** +@@ -103,6 +114,307 @@ static HDC get_screen_dc(void) + return screen_dc; + } +#ifdef SONAME_LIBPNG + @@ -369,7 +369,7 @@ index 4f93195..3899854 100644 static HICON alloc_icon_handle( BOOL is_ani, UINT num_steps ) { struct cursoricon_object *obj; -@@ -511,6 +823,8 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_en +@@ -518,6 +830,8 @@ static int CURSORICON_FindBestIcon( LPCVOID dir, DWORD size, fnGetCIEntry get_en /* Find Best Colors for Best Fit */ for ( i = 0; get_entry( dir, size, i, &cx, &cy, &bits ); i++ ) { @@ -378,7 +378,7 @@ index 4f93195..3899854 100644 if(abs(width - cx) == iXDiff && abs(height - cy) == iYDiff) { iTempColorDiff = abs(depth - bits); -@@ -655,7 +969,11 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, +@@ -662,7 +976,11 @@ static BOOL CURSORICON_GetFileEntry( LPCVOID dir, DWORD size, int n, return FALSE; entry = &filedir->idEntries[n]; info = (const BITMAPINFOHEADER *)((const char *)dir + entry->dwDIBOffset); @@ -391,7 +391,7 @@ index 4f93195..3899854 100644 { if ((const char *)(info + 1) - (const char *)dir > size) return FALSE; *bits = info->biBitCount; -@@ -799,6 +1117,21 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE +@@ -807,6 +1125,21 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE /* Check bitmap header */ @@ -413,7 +413,7 @@ index 4f93195..3899854 100644 if (maxsize < sizeof(BITMAPCOREHEADER)) { WARN( "invalid size %u\n", maxsize ); -@@ -980,10 +1313,6 @@ done: +@@ -987,10 +1320,6 @@ done: /********************************************************************** * .ANI cursor support */ @@ -425,5 +425,5 @@ index 4f93195..3899854 100644 #define ANI_LIST_ID RIFF_FOURCC('L', 'I', 'S', 'T') #define ANI_ACON_ID RIFF_FOURCC('A', 'C', 'O', 'N') -- -2.8.0 +2.12.2 diff --git a/patches/user32-lpCreateParams/0001-user32-tests-Add-a-test-for-custom-dialog-control-da.patch b/patches/user32-lpCreateParams/0001-user32-tests-Add-a-test-for-custom-dialog-control-da.patch index 55a4f3d0..313ab899 100644 --- a/patches/user32-lpCreateParams/0001-user32-tests-Add-a-test-for-custom-dialog-control-da.patch +++ b/patches/user32-lpCreateParams/0001-user32-tests-Add-a-test-for-custom-dialog-control-da.patch @@ -1,4 +1,4 @@ -From a0fec83a02fde13d4486ee1ea7ff61513b6f4fc1 Mon Sep 17 00:00:00 2001 +From 5d4889932af882323b5a3199abf73a1b4166360c Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 15 Mar 2016 12:31:22 +0800 Subject: user32/tests: Add a test for custom dialog control data. @@ -9,7 +9,7 @@ Subject: user32/tests: Add a test for custom dialog control data. 2 files changed, 47 insertions(+) diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c -index a6cd1be..2715b6b 100644 +index 6b9d7046aa..e901e27b97 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -539,6 +539,27 @@ static LRESULT CALLBACK testDlgWinProc (HWND hwnd, UINT uiMsg, WPARAM wParam, @@ -51,8 +51,8 @@ index a6cd1be..2715b6b 100644 if (!RegisterClassA (&cls)) return FALSE; GetClassInfoA(0, "#32770", &cls); -@@ -1472,12 +1496,26 @@ static void test_timer_message(void) - DialogBoxA(g_hinst, "RADIO_TEST_DIALOG", NULL, timer_message_dlg_proc); +@@ -1563,12 +1587,26 @@ static void test_MessageBox(void) + UnhookWindowsHookEx(hook); } +static INT_PTR CALLBACK custom_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) @@ -79,7 +79,7 @@ index a6cd1be..2715b6b 100644 test_IsDialogMessage(); test_WM_NEXTDLGCTL(); diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc -index f116b85..bfe8b9c 100644 +index f116b85825..bfe8b9c5fd 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -200,6 +200,15 @@ FONT 8, "MS Shell Dlg" @@ -99,5 +99,5 @@ index f116b85..bfe8b9c 100644 100 BITMAP test_mono.bmp -- -2.7.1 +2.12.2 diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index b5380147..a421593b 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -854,7 +854,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c wined3d_device_delete_opengl_contexts(device); if (device->fb.depth_stencil) -@@ -4222,6 +4225,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4229,6 +4232,7 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev return WINED3DERR_INVALIDCALL; } @@ -862,7 +862,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c if (dst_texture->sub_resources[dst_sub_resource_idx].map_count) { WARN("Destination sub-resource %u is mapped.\n", dst_sub_resource_idx); -@@ -4232,6 +4236,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev +@@ -4239,6 +4243,19 @@ HRESULT CDECL wined3d_device_copy_sub_resource_region(struct wined3d_device *dev { WARN("Source sub-resource %u is mapped.\n", src_sub_resource_idx); return WINED3DERR_INVALIDCALL; @@ -882,7 +882,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c } if (!src_box) -@@ -5265,3 +5282,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -5272,3 +5289,58 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL else return CallWindowProcA(proc, window, message, wparam, lparam); } @@ -1291,7 +1291,7 @@ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h -@@ -2648,6 +2648,16 @@ struct wined3d_state +@@ -2649,6 +2649,16 @@ struct wined3d_state struct wined3d_rasterizer_state *rasterizer_state; }; @@ -1308,7 +1308,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h #define WINED3D_UNMAPPED_STAGE ~0u /* Multithreaded flag. Removed from the public header to signal that -@@ -2759,6 +2769,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL +@@ -2760,6 +2770,12 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; @@ -1321,7 +1321,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state) { -@@ -2945,7 +2961,11 @@ struct wined3d_texture +@@ -2946,7 +2962,11 @@ struct wined3d_texture unsigned int map_count; DWORD locations; @@ -1333,7 +1333,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -3253,7 +3273,12 @@ struct wined3d_cs_queue +@@ -3254,7 +3274,12 @@ struct wined3d_cs_queue struct wined3d_cs_ops { @@ -1346,7 +1346,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h void (*submit)(struct wined3d_cs *cs); void (*finish)(struct wined3d_cs *cs); void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, -@@ -3270,7 +3295,13 @@ struct wined3d_cs +@@ -3271,7 +3296,13 @@ struct wined3d_cs HANDLE thread; DWORD thread_id;