From 126e7db0e0e400a128a91e4f4411fab72b0fea1e Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 23 Mar 2024 17:27:34 +1100 Subject: [PATCH] Rebase against 7c5b9304a62b794ba07110e15eef6aec3a46ef0a. --- ...user32-Improve-GetKeyboardLayoutList.patch | 20 +++--- ...nterfaces-already-define-in-msxml6.i.patch | 61 ++++++++----------- ...xml3-Implement-FreeThreadedXMLHTTP60.patch | 28 ++++----- ...er32-Added-LoadKeyboardLayoutEx-stub.patch | 47 -------------- ...te-a-candidate-window-s-position-wit.patch | 44 ++++++------- staging/upstream-commit | 2 +- 6 files changed, 74 insertions(+), 128 deletions(-) delete mode 100644 patches/user32-LoadKeyboardLayoutEx/0001-user32-Added-LoadKeyboardLayoutEx-stub.patch diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch index 3a18bf8e..a5cdf2d9 100644 --- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch +++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch @@ -1,4 +1,4 @@ -From d4f9fa0c33b6a414fe3b6c604f3039e98d416263 Mon Sep 17 00:00:00 2001 +From a808aeb6fbb9c7cace366a262715607379ca1b58 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 9 Jul 2019 14:13:28 +1000 Subject: [PATCH] user32: Do not enumerate the registry in @@ -13,10 +13,10 @@ not the complete list from the registry. 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c -index 1fff29c7f87..9bf65573d87 100644 +index 00337aa72b7..375ca3abee3 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c -@@ -486,7 +486,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) +@@ -497,7 +497,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) return FALSE; } @@ -25,11 +25,11 @@ index 1fff29c7f87..9bf65573d87 100644 { SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c -index 350baff600d..27066fc46f4 100644 +index b92e59396ac..364afc08b26 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c -@@ -5542,6 +5542,40 @@ static void test_keyboard_ll_hook_blocking(void) - ok_ret( 1, DestroyWindow( hwnd ) ); +@@ -5637,6 +5637,40 @@ static void test_LoadKeyboardLayoutEx(void) + ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" ); } +static void test_GetKeyboardLayoutList(void) @@ -69,7 +69,7 @@ index 350baff600d..27066fc46f4 100644 /* run the tests in a separate desktop to avoid interaction with other * tests, current desktop state, or user actions. */ static void test_input_desktop( char **argv ) -@@ -5633,6 +5667,7 @@ START_TEST(input) +@@ -5730,6 +5764,7 @@ START_TEST(input) test_GetKeyState(); test_OemKeyScan(); test_rawinput(argv[0]); @@ -78,10 +78,10 @@ index 350baff600d..27066fc46f4 100644 if(pGetMouseMovePointsEx) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index ef8d564c264..9a7c58f359d 100644 +index 1886ff979d7..1834ae40441 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c -@@ -1267,11 +1267,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) +@@ -1266,11 +1266,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags ) */ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) { @@ -94,7 +94,7 @@ index ef8d564c264..9a7c58f359d 100644 HKL layout; TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts ); -@@ -1285,33 +1281,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) +@@ -1284,33 +1280,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts ) if (size && layouts) { layouts[count - 1] = layout; diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch index fc01a3d7..fab834e3 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0001-include-Remove-interfaces-already-define-in-msxml6.i.patch @@ -1,20 +1,20 @@ -From aba54e8536ab5423e8293452db6462dcca0bea0b Mon Sep 17 00:00:00 2001 +From d683f0129b0df79227b23133874960284b76baa8 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 11 Sep 2020 17:55:59 +1000 Subject: [PATCH] include: Remove interfaces already define in msxml6.idl Signed-off-by: Alistair Leslie-Hughes --- - dlls/msxml3/factory.c | 1 + + dlls/msxml3/factory.c | 3 +- dlls/msxml3/tests/saxreader.c | 1 + dlls/msxml3/tests/schema.c | 5 ++ - dlls/msxml3/uuid.c | 11 ++++ - include/msxml2.idl | 109 ---------------------------------- + dlls/msxml3/uuid.c | 10 ++++ + include/msxml2.idl | 101 ---------------------------------- include/msxml6.idl | 24 ++++---- - 6 files changed, 30 insertions(+), 121 deletions(-) + 6 files changed, 29 insertions(+), 115 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index c2d3cd30c60..243ee379712 100644 +index e91666c6d79..e35839db2a3 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -31,6 +31,7 @@ @@ -25,6 +25,15 @@ index c2d3cd30c60..243ee379712 100644 #include "xmlparser.h" /* undef the #define in msxml2 so that we can access the v.2 version +@@ -43,8 +44,6 @@ + + WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +-extern GUID CLSID_XMLSchemaCache60; +- + typedef HRESULT (*ClassFactoryCreateInstanceFunc)(void**); + typedef HRESULT (*DOMFactoryCreateInstanceFunc)(MSXML_VERSION, void**); + diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index e123d4eba5a..48cfa8f5593 100644 --- a/dlls/msxml3/tests/saxreader.c @@ -38,7 +47,7 @@ index e123d4eba5a..48cfa8f5593 100644 #include "ocidl.h" #include "dispex.h" diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c -index efc3a8e56e3..a4fe29aca02 100644 +index 50e5a743b82..c83e72e136a 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -32,6 +32,11 @@ @@ -52,12 +61,12 @@ index efc3a8e56e3..a4fe29aca02 100644 + #include "wine/test.h" - #define check_interface(a, b, c) check_interface_(__LINE__, a, b, c) + static const WCHAR xdr_schema1_uri[] = L"x-schema:test1.xdr"; diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c -index 4abbe5e4763..333d4f3d3c7 100644 +index 7e50b439146..7214d23c5dc 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c -@@ -41,6 +41,17 @@ +@@ -41,6 +41,16 @@ #include "initguid.h" #include "msxml2.h" @@ -69,14 +78,13 @@ index 4abbe5e4763..333d4f3d3c7 100644 +DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); -+DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); + /* * Note that because of a #define in msxml2.h, we end up initializing * CLSID_DOMDocument2 to be the v.3 version independent DOMDocument diff --git a/include/msxml2.idl b/include/msxml2.idl -index ede4113ecbf..85bb6a5b0cb 100644 +index 848bc13952a..85bb6a5b0cb 100644 --- a/include/msxml2.idl +++ b/include/msxml2.idl @@ -1612,15 +1612,6 @@ coclass FreeThreadedDOMDocument40 @@ -125,22 +133,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("Server XML HTTP"), progid("Msxml2.ServerXMLHTTP"), -@@ -1750,14 +1725,6 @@ coclass XMLSchemaCache40 - [default] interface IXMLDOMSchemaCollection2; - } - --[ -- uuid(88d96a07-f192-11d4-a65f-0040963251e5) --] --coclass XMLSchemaCache60 --{ -- [default] interface IXMLDOMSchemaCollection2; --} -- - [ - helpstring("XML Schema Cache"), - progid("Msxml2.XMLSchemaCache"), -@@ -1798,14 +1765,6 @@ coclass XSLTemplate40 +@@ -1790,14 +1765,6 @@ coclass XSLTemplate40 [default] interface IXSLTemplate; } @@ -155,7 +148,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("XSL Template"), progid("Msxml2.XSLTemplate"), -@@ -3297,15 +3256,6 @@ coclass SAXXMLReader40 +@@ -3289,15 +3256,6 @@ coclass SAXXMLReader40 interface ISAXXMLReader; } @@ -171,7 +164,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("SAX XML Reader"), progid("Msxml2.SAXXMLReader"), -@@ -3380,26 +3330,6 @@ coclass MXHTMLWriter40 +@@ -3372,26 +3330,6 @@ coclass MXHTMLWriter40 interface IVBSAXLexicalHandler; } @@ -198,7 +191,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("MXXMLWriter 3.0"), progid("Msxml2.MXXMLWriter.3.0"), -@@ -3444,26 +3374,6 @@ coclass MXXMLWriter40 +@@ -3436,26 +3374,6 @@ coclass MXXMLWriter40 interface IVBSAXLexicalHandler; } @@ -225,7 +218,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("MXXMLWriter"), progid("Msxml2.MXXMLWriter"), -@@ -3506,15 +3416,6 @@ coclass MXNamespaceManager40 +@@ -3498,15 +3416,6 @@ coclass MXNamespaceManager40 interface IMXNamespaceManager; } @@ -241,7 +234,7 @@ index ede4113ecbf..85bb6a5b0cb 100644 [ helpstring("SAXAttributes 3.0"), progid("Msxml2.SAXAttributes.3.0"), -@@ -3539,16 +3440,6 @@ coclass SAXAttributes40 +@@ -3531,16 +3440,6 @@ coclass SAXAttributes40 interface ISAXAttributes; } @@ -301,5 +294,5 @@ index d4a5c490243..7396826a1f6 100644 helpstring("XML HTTP 6.0"), progid("Msxml2.XMLHTTP.6.0"), -- -2.41.0 +2.43.0 diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch index 1c6b49c2..bb791c4a 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From b26ba4d86df312d28bc2422ed1e544b058e4aacd Mon Sep 17 00:00:00 2001 +From c4694f8dfffa56648976c1a05bb4788262a8677b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Bernon?= Date: Tue, 8 Sep 2020 18:43:52 +0200 Subject: [PATCH] msxml3: Implement FreeThreadedXMLHTTP60. @@ -27,10 +27,10 @@ index 7e59a223143..5044c4e2c79 100644 SOURCES = \ diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c -index 243ee379712..323c7b49848 100644 +index 218ba87c4a8..ed14bd63a87 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c -@@ -279,6 +279,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv +@@ -281,6 +281,7 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create }; static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; @@ -38,7 +38,7 @@ index 243ee379712..323c7b49848 100644 static ClassFactory serverhttp = { { &ClassFactoryVtbl }, ServerXMLHTTP_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; -@@ -340,6 +341,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) +@@ -342,6 +343,10 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { cf = &httpreqcf.IClassFactory_iface; } @@ -50,7 +50,7 @@ index 243ee379712..323c7b49848 100644 IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP30 ) || IsEqualCLSID( rclsid, &CLSID_ServerXMLHTTP40 ) || diff --git a/dlls/msxml3/httprequest.c b/dlls/msxml3/httprequest.c -index 459466a1234..d059c20ae81 100644 +index 6e4ab4c6519..412958a2a40 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c @@ -37,10 +37,12 @@ @@ -67,7 +67,7 @@ index 459466a1234..d059c20ae81 100644 static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; -@@ -2057,6 +2059,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = +@@ -2054,6 +2056,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = ServerXMLHTTPRequest_setOption }; @@ -536,7 +536,7 @@ index 459466a1234..d059c20ae81 100644 static void init_httprequest(httprequest *req) { req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl; -@@ -2106,6 +2570,35 @@ HRESULT XMLHTTPRequest_create(void **obj) +@@ -2103,6 +2567,35 @@ HRESULT XMLHTTPRequest_create(void **obj) return S_OK; } @@ -573,10 +573,10 @@ index 459466a1234..d059c20ae81 100644 { serverhttp *req; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h -index 449a86df5e8..3e5181fa6d8 100644 +index 54f54995c76..6188414c5ce 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h -@@ -344,6 +344,7 @@ extern HRESULT XMLDocument_create(void**); +@@ -343,6 +343,7 @@ extern HRESULT XMLDocument_create(void**); extern HRESULT SAXXMLReader_create(MSXML_VERSION, void**); extern HRESULT SAXAttributes_create(MSXML_VERSION, void**); extern HRESULT XMLHTTPRequest_create(void **); @@ -1017,7 +1017,7 @@ index bccfbaf582a..23d7680d196 100644 CoUninitialize(); } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c -index a4fe29aca02..fd244ee2e1c 100644 +index c83e72e136a..c896f1e6a04 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -32,10 +32,16 @@ @@ -1038,7 +1038,7 @@ index a4fe29aca02..fd244ee2e1c 100644 #include "wine/test.h" diff --git a/dlls/msxml3/uuid.c b/dlls/msxml3/uuid.c -index 333d4f3d3c7..1b4f0452c5f 100644 +index 7214d23c5dc..320a7e04fa3 100644 --- a/dlls/msxml3/uuid.c +++ b/dlls/msxml3/uuid.c @@ -43,6 +43,7 @@ @@ -1049,9 +1049,9 @@ index 333d4f3d3c7..1b4f0452c5f 100644 DEFINE_GUID(CLSID_MXNamespaceManager60, 0x88d96a11, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); DEFINE_GUID(CLSID_MXXMLWriter60, 0x88d96a0f, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); DEFINE_GUID(CLSID_SAXAttributes60, 0x88d96a0e, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); -@@ -51,6 +52,10 @@ DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0 +@@ -50,6 +51,10 @@ DEFINE_GUID(CLSID_SAXXMLReader60, 0x88d96a0c, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x + DEFINE_GUID(CLSID_ServerXMLHTTP60, 0x88d96a0b, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); DEFINE_GUID(CLSID_XMLHTTP60, 0x88d96a0a, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); - DEFINE_GUID(CLSID_XMLSchemaCache60, 0x88d96a07, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); DEFINE_GUID(CLSID_XSLTemplate60, 0x88d96a08, 0xf192, 0x11d4, 0xa6,0x5f, 0x00,0x40,0x96,0x32,0x51,0xe5); +DEFINE_GUID(IID_IXMLHTTPRequest2, 0xe5d37dc0, 0x552a, 0x4d52, 0x9c,0xc0, 0xa1,0x4d,0x54,0x6f,0xbd,0x04); +DEFINE_GUID(IID_IXMLHTTPRequest3, 0xa1c9feee, 0x0617, 0x4f23, 0x9d,0x58, 0x89,0x61,0xea,0x43,0x56,0x7c); @@ -1101,5 +1101,5 @@ index 7396826a1f6..b2d8bd3b337 100644 helpstring("XML DOM Document 6.0"), progid("Msxml2.DOMDocument.6.0"), -- -2.42.0 +2.43.0 diff --git a/patches/user32-LoadKeyboardLayoutEx/0001-user32-Added-LoadKeyboardLayoutEx-stub.patch b/patches/user32-LoadKeyboardLayoutEx/0001-user32-Added-LoadKeyboardLayoutEx-stub.patch deleted file mode 100644 index 5fff863c..00000000 --- a/patches/user32-LoadKeyboardLayoutEx/0001-user32-Added-LoadKeyboardLayoutEx-stub.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4e0be5a53f3a87285973ca032358b81c0c3126c5 Mon Sep 17 00:00:00 2001 -From: Austin English -Date: Mon, 1 Jul 2019 09:17:31 +1000 -Subject: [PATCH] user32: Added LoadKeyboardLayoutEx stub. - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=28170 ---- - dlls/user32/input.c | 9 +++++++++ - dlls/user32/user32.spec | 2 +- - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/dlls/user32/input.c b/dlls/user32/input.c -index 8b2ae805aa..a789108a86 100644 ---- a/dlls/user32/input.c -+++ b/dlls/user32/input.c -@@ -1017,6 +1017,15 @@ HKL WINAPI LoadKeyboardLayoutA(LPCSTR pwszKLID, UINT Flags) - return ret; - } - -+/*********************************************************************** -+ * LoadKeyboardLayoutEx (USER32.@) -+ */ -+HKL WINAPI LoadKeyboardLayoutEx(DWORD unknown, const WCHAR *locale, UINT flags) -+{ -+ FIXME("(%ld, %s, %x) semi-stub!\n", unknown, debugstr_w(locale), flags); -+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); -+ return LoadKeyboardLayoutW(locale, flags); -+} - - /*********************************************************************** - * UnloadKeyboardLayout (USER32.@) -diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec -index f9a4ae26df..6d70df366e 100644 ---- a/dlls/user32/user32.spec -+++ b/dlls/user32/user32.spec -@@ -496,7 +496,7 @@ - @ stdcall LoadImageA(long str long long long long) - @ stdcall LoadImageW(long wstr long long long long) - @ stdcall LoadKeyboardLayoutA(str long) --# @ stub LoadKeyboardLayoutEx -+@ stdcall LoadKeyboardLayoutEx(long wstr long) - @ stdcall LoadKeyboardLayoutW(wstr long) - @ stdcall LoadLocalFonts() - @ stdcall LoadMenuA(long str) --- -2.17.1 - 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 3bc63b35..7650a45c 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 d72fa6e8e3d4188d3b6b6da92cad5a785cc2c839 Mon Sep 17 00:00:00 2001 +From 1f6f25d59452ac969c5cf78cfb472409e303d9d8 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 e6a24d1a46c..672b6571671 100644 +index 04192aae309..d5dc16e1cb8 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -923,6 +923,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version ) +@@ -929,6 +929,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version ) return (void *)-1; } @@ -41,27 +41,27 @@ index e6a24d1a46c..672b6571671 100644 static void nulldrv_ThreadDetach( void ) { } -@@ -1261,6 +1266,7 @@ static const struct user_driver_funcs lazy_load_driver = - loaderdrv_wine_get_vulkan_driver, +@@ -1310,6 +1315,7 @@ static const struct user_driver_funcs lazy_load_driver = + loaderdrv_VulkanInit, /* opengl support */ nulldrv_wine_get_wgl_driver, + nulldrv_UpdateCandidatePos, /* thread management */ nulldrv_ThreadDetach, }; -@@ -1337,6 +1343,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version +@@ -1394,6 +1400,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(SystemParametersInfo); - SET_USER_FUNC(wine_get_vulkan_driver); + SET_USER_FUNC(VulkanInit); SET_USER_FUNC(wine_get_wgl_driver); + SET_USER_FUNC(UpdateCandidatePos); SET_USER_FUNC(ThreadDetach); #undef SET_USER_FUNC diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index 3e6e440de93..ac19b5146a9 100644 +index 9e764a335f5..532cab0e8e6 100644 --- a/dlls/win32u/input.c +++ b/dlls/win32u/input.c -@@ -2330,6 +2330,8 @@ BOOL set_caret_pos( int x, int y ) +@@ -2334,6 +2334,8 @@ BOOL set_caret_pos( int x, int y ) r.left = x; r.top = y; display_caret( hwnd, &r ); @@ -70,7 +70,7 @@ index 3e6e440de93..ac19b5146a9 100644 NtUserSetSystemTimer( hwnd, SYSTEM_TIMER_CARET, caret.timeout ); } return ret; -@@ -2367,6 +2369,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd ) +@@ -2371,6 +2373,8 @@ BOOL WINAPI NtUserShowCaret( HWND hwnd ) if (ret && hidden == 1) /* hidden was 1 so it's now 0 */ { display_caret( hwnd, &r ); @@ -80,22 +80,22 @@ index 3e6e440de93..ac19b5146a9 100644 } return ret; diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c -index c3d54da1d4d..8e277ba0003 100644 +index f9a331c5619..c5f92342e18 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c -@@ -437,6 +437,7 @@ static const struct user_driver_funcs x11drv_funcs = +@@ -434,6 +434,7 @@ static const struct user_driver_funcs x11drv_funcs = .pSystemParametersInfo = X11DRV_SystemParametersInfo, - .pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver, + .pVulkanInit = X11DRV_VulkanInit, .pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver, + .pUpdateCandidatePos = X11DRV_UpdateCandidatePos, .pThreadDetach = X11DRV_ThreadDetach, }; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 2917579927c..8e8ca22a2db 100644 +index bab633c5613..424df92c48c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -256,6 +256,7 @@ extern void X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flag +@@ -257,6 +257,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 ); @@ -104,7 +104,7 @@ index 2917579927c..8e8ca22a2db 100644 /* X11 driver internal functions */ diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c -index 209d63f0402..32e5fef58db 100644 +index c6a93eb5e16..786a089160f 100644 --- a/dlls/winex11.drv/xim.c +++ b/dlls/winex11.drv/xim.c @@ -36,6 +36,7 @@ @@ -115,7 +115,7 @@ index 209d63f0402..32e5fef58db 100644 WINE_DEFAULT_DEBUG_CHANNEL(xim); -@@ -438,6 +439,49 @@ void xim_thread_attach( struct x11drv_thread_data *data ) +@@ -410,6 +411,49 @@ void xim_thread_attach( struct x11drv_thread_data *data ) XRegisterIMInstantiateCallback( display, NULL, NULL, NULL, xim_open, (XPointer)data ); } @@ -165,7 +165,7 @@ index 209d63f0402..32e5fef58db 100644 static BOOL xic_destroy( XIC xic, XPointer user, XPointer arg ) { struct x11drv_win_data *data; -@@ -491,6 +535,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win ) +@@ -463,6 +507,32 @@ static XIC xic_create( XIM xim, HWND hwnd, Window win ) XFree( preedit ); XFree( status ); @@ -199,11 +199,11 @@ index 209d63f0402..32e5fef58db 100644 } diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index aa59a256482..1c0abebed3b 100644 +index d0ba6ee5f85..f33370bac93 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -343,6 +343,8 @@ struct user_driver_funcs - const struct vulkan_funcs * (*pwine_get_vulkan_driver)(UINT); +@@ -352,6 +352,8 @@ struct user_driver_funcs + UINT (*pVulkanInit)(UINT,void *,struct vulkan_funcs *); /* opengl support */ struct opengl_funcs * (*pwine_get_wgl_driver)(UINT); + /* IME functions */ @@ -212,5 +212,5 @@ index aa59a256482..1c0abebed3b 100644 void (*pThreadDetach)(void); }; -- -2.42.0 +2.43.0 diff --git a/staging/upstream-commit b/staging/upstream-commit index 0a6c3dd5..a1f6d1d5 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -b053e924e8e13b3637f2a5a8ffe88d84c2d17075 +7c5b9304a62b794ba07110e15eef6aec3a46ef0a