From bbbe9cbbc76c46bc07050f291711e242745c9fa4 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 1 Aug 2023 09:59:38 +1000 Subject: [PATCH] Rebase against b80ea4153b096970514f86f385a37c9ceaceada2. --- ...xml3-Implement-FreeThreadedXMLHTTP60.patch | 30 ++++++++--------- ...ort-for-setting-getting-PREFERREDDRO.patch | 26 +++++++-------- ...plement-NewMenu-with-new-folder-item.patch | 32 +++++++++---------- staging/upstream-commit | 2 +- 4 files changed, 45 insertions(+), 45 deletions(-) diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch index f62e0075..1acefeb4 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From 605c054026a8f871f28292425f1634895a9d3057 Mon Sep 17 00:00:00 2001 +From 19c928c1e4b5737956a694fed6ab2b244365b0f0 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. @@ -49,10 +49,10 @@ 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 cc384a380e5..98dd23c9fbb 100644 +index 459466a1234..d059c20ae81 100644 --- a/dlls/msxml3/httprequest.c +++ b/dlls/msxml3/httprequest.c -@@ -38,10 +38,12 @@ +@@ -37,10 +37,12 @@ #include "shlwapi.h" #include "msxml_dispex.h" @@ -66,7 +66,7 @@ index cc384a380e5..98dd23c9fbb 100644 static const WCHAR colspaceW[] = {':',' ',0}; static const WCHAR crlfW[] = {'\r','\n',0}; -@@ -2058,6 +2060,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = +@@ -2057,6 +2059,468 @@ static const struct IServerXMLHTTPRequestVtbl ServerXMLHTTPRequestVtbl = ServerXMLHTTPRequest_setOption }; @@ -535,7 +535,7 @@ index cc384a380e5..98dd23c9fbb 100644 static void init_httprequest(httprequest *req) { req->IXMLHTTPRequest_iface.lpVtbl = &XMLHTTPRequestVtbl; -@@ -2107,6 +2571,35 @@ HRESULT XMLHTTPRequest_create(void **obj) +@@ -2106,6 +2570,35 @@ HRESULT XMLHTTPRequest_create(void **obj) return S_OK; } @@ -572,17 +572,17 @@ index cc384a380e5..98dd23c9fbb 100644 { serverhttp *req; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h -index 8003c1a9650..59b8c29845d 100644 +index 449a86df5e8..3e5181fa6d8 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h -@@ -367,6 +367,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN; - extern HRESULT SAXXMLReader_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; - extern HRESULT SAXAttributes_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; - extern HRESULT XMLHTTPRequest_create(void **) DECLSPEC_HIDDEN; -+extern HRESULT XMLHTTPRequest2_create(void **) DECLSPEC_HIDDEN; - extern HRESULT ServerXMLHTTP_create(void **) DECLSPEC_HIDDEN; - extern HRESULT XSLTemplate_create(void**) DECLSPEC_HIDDEN; - extern HRESULT MXWriter_create(MSXML_VERSION, void**) DECLSPEC_HIDDEN; +@@ -344,6 +344,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 **); ++extern HRESULT XMLHTTPRequest2_create(void **); + extern HRESULT ServerXMLHTTP_create(void **); + extern HRESULT XSLTemplate_create(void**); + extern HRESULT MXWriter_create(MSXML_VERSION, void**); diff --git a/dlls/msxml3/tests/httpreq.c b/dlls/msxml3/tests/httpreq.c index bccfbaf582a..23d7680d196 100644 --- a/dlls/msxml3/tests/httpreq.c @@ -1060,5 +1060,5 @@ index 333d4f3d3c7..1b4f0452c5f 100644 /* * Note that because of a #define in msxml2.h, we end up initializing -- -2.35.1 +2.40.1 diff --git a/patches/shell32-Context_Menu/0005-shell32-Add-support-for-setting-getting-PREFERREDDRO.patch b/patches/shell32-Context_Menu/0005-shell32-Add-support-for-setting-getting-PREFERREDDRO.patch index 8d6ddccc..21980675 100644 --- a/patches/shell32-Context_Menu/0005-shell32-Add-support-for-setting-getting-PREFERREDDRO.patch +++ b/patches/shell32-Context_Menu/0005-shell32-Add-support-for-setting-getting-PREFERREDDRO.patch @@ -1,20 +1,20 @@ -From c7ab99f5961daaf0c81a710d332dca5fc79528c0 Mon Sep 17 00:00:00 2001 +From 81651a2975b37adfbdc393753804fd9d84f43442 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 2 Apr 2016 04:15:02 +0200 Subject: [PATCH] shell32: Add support for setting/getting PREFERREDDROPEFFECT in IDataObject. --- - dlls/shell32/clipboard.c | 40 +++++++++++++++++++++++++++++++++++++ - dlls/shell32/dataobject.c | 24 +++++++++++++++++++--- + dlls/shell32/clipboard.c | 38 +++++++++++++++++++++++++++++++++++++ + dlls/shell32/dataobject.c | 24 ++++++++++++++++++++--- dlls/shell32/shell32_main.h | 2 ++ - 3 files changed, 63 insertions(+), 3 deletions(-) + 3 files changed, 61 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/clipboard.c b/dlls/shell32/clipboard.c -index 2f5c63bed9d..27c3421cf28 100644 +index 487fd0dcf8c..68b671414a6 100644 --- a/dlls/shell32/clipboard.c +++ b/dlls/shell32/clipboard.c -@@ -212,3 +214,41 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) +@@ -212,3 +212,41 @@ HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) return hGlobal; } @@ -57,7 +57,7 @@ index 2f5c63bed9d..27c3421cf28 100644 + return result; +} diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c -index 3cd86845c42..cc7ab601bac 100644 +index 3cd86845c42..202cd2dc0d1 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -193,7 +193,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) @@ -133,18 +133,18 @@ index 3cd86845c42..cc7ab601bac 100644 TRACE("(%p)->(apidl=%p cidl=%u)\n",dto, apidl, cidl); diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h -index f9607585184..56f0a631d08 100644 +index 5571da9f632..de6e8dfa9e6 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h -@@ -141,6 +141,8 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECL - HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; - HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; - HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl) DECLSPEC_HIDDEN; +@@ -141,6 +141,8 @@ HGLOBAL RenderHDROP(LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); + HGLOBAL RenderSHELLIDLIST (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); + HGLOBAL RenderFILENAMEA (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); + HGLOBAL RenderFILENAMEW (LPITEMIDLIST pidlRoot, LPITEMIDLIST * apidl, UINT cidl); +HGLOBAL RenderPREFERREDDROPEFFECT (DWORD value); +HRESULT GetPREFERREDDROPEFFECT (STGMEDIUM *pmedium, DWORD *value); /* Change Notification */ - void InitChangeNotifications(void) DECLSPEC_HIDDEN; + void InitChangeNotifications(void); -- 2.40.1 diff --git a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch index 0d6ec925..eeda4eeb 100644 --- a/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch +++ b/patches/shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch @@ -1,4 +1,4 @@ -From 69b8c9461157d1b988ec039c4f7e7a467cb9e951 Mon Sep 17 00:00:00 2001 +From d061f8ebe8c9858a249e0129350d8b7c59ceaee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 16 Aug 2015 17:34:22 +0200 Subject: [PATCH] shell32: Implement NewMenu with new folder item. @@ -21,10 +21,10 @@ Correct header issue when compiling i386 (var_arg) create mode 100644 dlls/shell32/shellnew.c diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index 9e2395126fc..3bba1b0e3fd 100644 +index 8efcbfb4dbf..7f5586ad6a5 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in -@@ -28,6 +28,7 @@ C_SRCS = \ +@@ -29,6 +29,7 @@ C_SRCS = \ shelldispatch.c \ shellitem.c \ shelllink.c \ @@ -49,16 +49,16 @@ index dc65ed3728d..c5f4215196f 100644 threading(apartment), uuid(00bb2763-6a77-11d0-a535-00c04fd7d062) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h -index 7bb26e46a6e..f539a1b1e00 100644 +index de6e8dfa9e6..12d2d84224a 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -101,6 +101,7 @@ HRESULT WINAPI RecycleBin_Constructor(IUnknown * pUnkOuter, REFIID riif, LPVOID - HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput) DECLSPEC_HIDDEN; - HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; -+HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv) DECLSPEC_HIDDEN; - HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out) DECLSPEC_HIDDEN; - HRESULT WINAPI ActiveDesktop_Constructor(IUnknown *outer, REFIID riid, void **out) DECLSPEC_HIDDEN; + HRESULT WINAPI QueryAssociations_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppOutput); + HRESULT WINAPI ExplorerBrowser_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); + HRESULT WINAPI KnownFolderManager_Constructor(IUnknown *pUnkOuter, REFIID riid, LPVOID *ppv); ++HRESULT WINAPI NewMenu_Constructor(IUnknown *outer, REFIID riid, LPVOID *ppv); + HRESULT WINAPI IFileOperation_Constructor(IUnknown *outer, REFIID riid, void **out); + HRESULT WINAPI ActiveDesktop_Constructor(IUnknown *outer, REFIID riid, void **out); diff --git a/dlls/shell32/shellnew.c b/dlls/shell32/shellnew.c new file mode 100644 @@ -564,10 +564,10 @@ index 00000000000..ba31b3787f8 + return hr; +} diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c -index 589e5c5170a..2984e691c17 100644 +index 52123ac0004..256f6e45122 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c -@@ -72,6 +72,7 @@ static const struct { +@@ -70,6 +70,7 @@ static const struct { {&CLSID_MyComputer, ISF_MyComputer_Constructor}, {&CLSID_MyDocuments, MyDocuments_Constructor}, {&CLSID_NetworkPlaces, ISF_NetworkPlaces_Constructor}, @@ -576,10 +576,10 @@ index 589e5c5170a..2984e691c17 100644 {&CLSID_QueryAssociations, QueryAssociations_Constructor}, {&CLSID_RecycleBin, RecycleBin_Constructor}, diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c -index a83f3137509..2781c2152f9 100644 +index 89ff2e71eb0..2bfe543b61a 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c -@@ -1478,7 +1478,6 @@ static void test_newmenu(void) +@@ -1482,7 +1482,6 @@ static void test_newmenu(void) HRESULT hr; hr = CoCreateInstance(&CLSID_NewMenu, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); @@ -587,7 +587,7 @@ index a83f3137509..2781c2152f9 100644 ok(hr == S_OK, "Failed to create NewMenu object, hr %#lx.\n", hr); if (hr != S_OK) { -@@ -1490,6 +1489,14 @@ static void test_newmenu(void) +@@ -1494,6 +1493,14 @@ static void test_newmenu(void) ok(hr == S_OK, "Failed to get IShellExtInit, hr %#lx.\n", hr); IUnknown_Release(unk2); @@ -603,5 +603,5 @@ index a83f3137509..2781c2152f9 100644 ok(hr == S_OK, "Failed to get IContextMenu3, hr %#lx.\n", hr); IUnknown_Release(unk2); -- -2.35.1 +2.40.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 7c814998..32f276c2 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -fddb79776871ee00adf4d78583135a5d96ca8c06 +b80ea4153b096970514f86f385a37c9ceaceada2