From b682f11906e2f0b9d219dfdbc910499516e4b71c Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 25 Apr 2024 16:57:40 -0500 Subject: [PATCH] Rebase against c81c6fca50fcbd93fb54f4a3417630bb081578ff. --- ...le32.tlb-Compile-typelib-with-oldtlb.patch | 22 -------------- patches/stdole32.tlb-SLTG_Typelib/definition | 4 --- ...te-a-candidate-window-s-position-wit.patch | 30 +++++++++---------- ...ameter-check-in-WTHelperGetProvCertF.patch | 19 ++++++------ staging/upstream-commit | 2 +- 5 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 patches/stdole32.tlb-SLTG_Typelib/0020-stdole32.tlb-Compile-typelib-with-oldtlb.patch delete mode 100644 patches/stdole32.tlb-SLTG_Typelib/definition diff --git a/patches/stdole32.tlb-SLTG_Typelib/0020-stdole32.tlb-Compile-typelib-with-oldtlb.patch b/patches/stdole32.tlb-SLTG_Typelib/0020-stdole32.tlb-Compile-typelib-with-oldtlb.patch deleted file mode 100644 index e5cf77ec..00000000 --- a/patches/stdole32.tlb-SLTG_Typelib/0020-stdole32.tlb-Compile-typelib-with-oldtlb.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 3b5acd9461f17303e745f6d90b39603beb62df01 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Thu, 21 Jan 2016 02:53:22 +0100 -Subject: [PATCH] stdole32.tlb: Compile typelib with --oldtlb. - ---- - dlls/stdole32.tlb/Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dlls/stdole32.tlb/Makefile.in b/dlls/stdole32.tlb/Makefile.in -index 9fc649ee5a4..216760922b6 100644 ---- a/dlls/stdole32.tlb/Makefile.in -+++ b/dlls/stdole32.tlb/Makefile.in -@@ -1,4 +1,5 @@ - MODULE = stdole32.tlb -+EXTRAIDLFLAGS = --oldtlb - - EXTRADLLFLAGS = -Wb,--data-only - --- -2.34.1 - diff --git a/patches/stdole32.tlb-SLTG_Typelib/definition b/patches/stdole32.tlb-SLTG_Typelib/definition deleted file mode 100644 index 7ffb51ca..00000000 --- a/patches/stdole32.tlb-SLTG_Typelib/definition +++ /dev/null @@ -1,4 +0,0 @@ -Fixes: [3689] Compile stdole32.tlb in SLTG typelib format -Depends: widl-SLTG_Typelib_Support -# Disabled dependency. -Disabled: true diff --git a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch index 7650a45c..14ac2e74 100644 --- a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch +++ b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch @@ -1,4 +1,4 @@ -From 1f6f25d59452ac969c5cf78cfb472409e303d9d8 Mon Sep 17 00:00:00 2001 +From bc61fb352dd93ec249aecd7f57bd7b712d1ba651 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Tue, 23 Sep 2014 23:22:17 +0800 Subject: [PATCH] winex11.drv: Update a candidate window's position with @@ -26,10 +26,10 @@ received a lot of help from Sebastian Lackner. 6 files changed, 85 insertions(+) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index 04192aae309..d5dc16e1cb8 100644 +index e22a457d6d6..1b47c285787 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -929,6 +929,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version ) +@@ -907,6 +907,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version ) return (void *)-1; } @@ -41,7 +41,7 @@ index 04192aae309..d5dc16e1cb8 100644 static void nulldrv_ThreadDetach( void ) { } -@@ -1310,6 +1315,7 @@ static const struct user_driver_funcs lazy_load_driver = +@@ -1287,6 +1292,7 @@ static const struct user_driver_funcs lazy_load_driver = loaderdrv_VulkanInit, /* opengl support */ nulldrv_wine_get_wgl_driver, @@ -49,7 +49,7 @@ index 04192aae309..d5dc16e1cb8 100644 /* thread management */ nulldrv_ThreadDetach, }; -@@ -1394,6 +1400,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version +@@ -1370,6 +1376,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(SystemParametersInfo); SET_USER_FUNC(VulkanInit); SET_USER_FUNC(wine_get_wgl_driver); @@ -58,10 +58,10 @@ index 04192aae309..d5dc16e1cb8 100644 #undef SET_USER_FUNC diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index 9e764a335f5..532cab0e8e6 100644 +index 04532e7d015..43257ccf947 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c -@@ -2334,6 +2334,8 @@ BOOL set_caret_pos( int x, int y ) +@@ -2340,6 +2340,8 @@ BOOL set_caret_pos( int x, int y ) r.left = x; r.top = y; display_caret( hwnd, &r ); @@ -70,7 +70,7 @@ index 9e764a335f5..532cab0e8e6 100644 NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, caret.timeout ); } return ret; -@@ -2371,6 +2373,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd ) +@@ -2377,6 +2379,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd ) if (ret && hidden == 1) /* hidden was 1 so it's now 0 */ { display_caret( hwnd, &r ); @@ -80,10 +80,10 @@ index 9e764a335f5..532cab0e8e6 100644 } return ret; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index f9a331c5619..c5f92342e18 100644 +index e3b3a3e2557..b30f4e48144 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c -@@ -434,6 +434,7 @@ static const struct user_driver_funcs x11drv_funcs = +@@ -427,6 +427,7 @@ static const struct user_driver_funcs x11drv_funcs = .pSystemParametersInfo = X11DRV_SystemParametersInfo, .pVulkanInit = X11DRV_VulkanInit, .pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver, @@ -92,10 +92,10 @@ index f9a331c5619..c5f92342e18 100644 }; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index bab633c5613..424df92c48c 100644 +index c308f54adb3..030dca910b8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -257,6 +257,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag +@@ -253,6 +253,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag struct window_surface *surface ); extern BOOL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param, UINT flags ); @@ -199,11 +199,11 @@ index c6a93eb5e16..786a089160f 100644 } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index d0ba6ee5f85..f33370bac93 100644 +index 61c9342d50f..4bed824e437 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -352,6 +352,8 @@ struct user_driver_funcs - UINT (*pVulkanInit)(UINT,void *,struct vulkan_funcs *); +@@ -344,6 +344,8 @@ struct user_driver_funcs + UINT (*pVulkanInit)(UINT,void *,const struct vulkan_driver_funcs **); /* opengl support */ struct opengl_funcs * (*pwine_get_wgl_driver)(UINT); + /* IME functions */ diff --git a/patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch b/patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch index 2490e96e..bc591794 100644 --- a/patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch +++ b/patches/wintrust-WTHelperGetProvCertFromChain/0001-wintrust-Add-parameter-check-in-WTHelperGetProvCertF.patch @@ -1,4 +1,4 @@ -From 452d18312589f22e6dcfcba61b4901ae30537540 Mon Sep 17 00:00:00 2001 +From 23c86326fda0da27cd7c876ba6a63ab05f23c299 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Wed, 18 Apr 2018 03:55:16 +0000 Subject: [PATCH] wintrust: Add parameter check in WTHelperGetProvCertFromChain @@ -7,14 +7,14 @@ Signed-off-by: Alistair Leslie-Hughes --- dlls/wintrust/tests/softpub.c | 9 +++++++++ dlls/wintrust/wintrust_main.c | 2 +- - 3 files changed, 11 insertions(+), 2 deletions(-) + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c -index 77e15b2feb4..219fd8dc26f 100644 +index 9654c296a78..44c92f91f08 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c -@@ -1892,6 +1892,14 @@ static void test_multiple_signatures(void) - DeleteFileW(pathW); +@@ -1925,6 +1925,14 @@ static void test_pe_image_hash(void) + DeleteFileW(path); } +static void test_WTHelperGetProvCertFromChain(void) @@ -28,18 +28,19 @@ index 77e15b2feb4..219fd8dc26f 100644 START_TEST(softpub) { InitFunctionPtrs(); -@@ -1900,5 +1908,6 @@ START_TEST(softpub) +@@ -1933,6 +1941,7 @@ START_TEST(softpub) test_wintrust(); test_wintrust_digest(); test_get_known_usages(); + test_WTHelperGetProvCertFromChain(); test_multiple_signatures(); + test_pe_image_hash(); } diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c -index 925ae7ca85a..c48dbbfe2d8 100644 +index a5c5706388a..8847115946a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c -@@ -786,7 +786,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( +@@ -765,7 +765,7 @@ CRYPT_PROVIDER_CERT * WINAPI WTHelperGetProvCertFromChain( TRACE("(%p %ld)\n", pSgnr, idxCert); @@ -49,5 +50,5 @@ index 925ae7ca85a..c48dbbfe2d8 100644 cert = &pSgnr->pasCertChain[idxCert]; TRACE("returning %p\n", cert); -- -2.37.2 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 29c81ceb..d916d4c2 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -d07019e4d174fd1b5d8b74ff2a36e900c07d96d7 +c81c6fca50fcbd93fb54f4a3417630bb081578ff