From cafb155af52646ee43b19bc9cd1569a76672a731 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 28 Jan 2022 12:48:29 +1100 Subject: [PATCH] Rebase against 85cb1ff91ed4d48559c5500e2ccb0b15801edc05. --- ...plement-D3DX11GetImageInfoFromMemory.patch | 12 ++--- ...lement-D3DX11CreateTextureFromMemory.patch | 10 ++-- ...ys-check-for-debug-symbols-in-BINDIR.patch | 14 +++--- ...-FltBuildDefaultSecurityDescriptor-t.patch | 10 ++-- ...nt-CIF-reader-and-download-functions.patch | 9 ++-- ...xml3-Implement-FreeThreadedXMLHTTP60.patch | 13 ++--- ...basic-tests-for-RtlQueryPackageIdent.patch | 15 +++--- ...nt-a-better-stub-for-IPicture-SaveAs.patch | 48 +++++++++---------- .../0001-packager-Prefer-native-version.patch | 8 ++-- patches/patchinstall.sh | 2 +- ...02-shell32-Add-security-property-tab.patch | 8 ++-- ...itialize-proxy-settings-registry-key.patch | 9 ++-- ...Create-desktop-shortcuts-with-absolu.patch | 15 +++--- ...ne3_7-tests-Add-Global-settings-test.patch | 11 +++-- staging/upstream-commit | 2 +- 15 files changed, 96 insertions(+), 90 deletions(-) diff --git a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch index c21a44d0..8a33821d 100644 --- a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch +++ b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0001-d3dx11_43-Implement-D3DX11GetImageInfoFromMemory.patch @@ -1,4 +1,4 @@ -From e3a6b75cbce69e18742135fdd8e105132d8ca9dd Mon Sep 17 00:00:00 2001 +From ea3579b5b3d701647f5c7f16de658f1cd7fe876d Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Fri, 30 Jul 2021 15:57:29 +1000 Subject: [PATCH] d3dx11_43: Implement D3DX11GetImageInfoFromMemory @@ -38,7 +38,7 @@ index ccd4319ace2..6854c73ebcb 100644 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/d3dx11_43/main.c b/dlls/d3dx11_43/main.c -index 950f6d76f5c..00c1db35e42 100644 +index 5dad027864f..00c1db35e42 100644 --- a/dlls/d3dx11_43/main.c +++ b/dlls/d3dx11_43/main.c @@ -66,12 +66,3 @@ HRESULT WINAPI D3DX11GetImageInfoFromFileW(const WCHAR *filename, ID3DX11ThreadP @@ -49,13 +49,13 @@ index 950f6d76f5c..00c1db35e42 100644 -HRESULT WINAPI D3DX11GetImageInfoFromMemory(const void *src_data, SIZE_T src_data_size, ID3DX11ThreadPump *pump, - D3DX11_IMAGE_INFO *img_info, HRESULT *hresult) -{ -- FIXME("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p stub!\n", +- FIXME("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p stub!\n", - src_data, src_data_size, pump, img_info, hresult); - - return E_NOTIMPL; -} diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c -index ee6808d76d6..8addf4f84d3 100644 +index 81ac8ee6db7..6881eec107d 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -15,14 +15,190 @@ @@ -155,7 +155,7 @@ index ee6808d76d6..8addf4f84d3 100644 + GUID container_format; + HRESULT hr; + -+ TRACE("src_data %p, src_data_size %lu, pump %p, img_info %p, hresult %p.\n", ++ TRACE("src_data %p, src_data_size %Iu, pump %p, img_info %p, hresult %p.\n", + src_data, src_data_size, pump, img_info, hresult); + + if (!src_data || !src_data_size || !img_info) @@ -250,5 +250,5 @@ index ee6808d76d6..8addf4f84d3 100644 SIZE_T data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11ShaderResourceView **view, HRESULT *hresult) -- -2.33.0 +2.34.1 diff --git a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch index ee362918..5861e406 100644 --- a/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch +++ b/patches/d3dx11_43-D3DX11CreateTextureFromMemory/0002-d3dx11_42-Implement-D3DX11CreateTextureFromMemory.patch @@ -1,4 +1,4 @@ -From 2f65959901f62bfc6a48c683e6eaa5d6ed5f7416 Mon Sep 17 00:00:00 2001 +From 5be34c9e347d4379179eeba742b25986152d4e4f Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 3 Aug 2021 11:13:18 +1000 Subject: [PATCH] d3dx11_42: Implement D3DX11CreateTextureFromMemory @@ -9,7 +9,7 @@ Signed-off-by: Alistair Leslie-Hughes 1 file changed, 342 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx11_43/texture.c b/dlls/d3dx11_43/texture.c -index 8addf4f84d3..f47b8583c6c 100644 +index 6881eec107d..b91bd8d881a 100644 --- a/dlls/d3dx11_43/texture.c +++ b/dlls/d3dx11_43/texture.c @@ -22,6 +22,7 @@ @@ -239,7 +239,7 @@ index 8addf4f84d3..f47b8583c6c 100644 + SIZE_T src_data_size, D3DX11_IMAGE_LOAD_INFO *load_info, ID3DX11ThreadPump *pump, ID3D11Resource **texture, HRESULT *hresult) { -- FIXME("device %p, data %p, data_size %lu, load_info %p, pump %p, texture %p, hresult %p stub.\n", +- FIXME("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p stub.\n", - device, data, data_size, load_info, pump, texture, hresult); + unsigned int frame_count, width, height, stride, frame_size; + IWICFormatConverter *converter = NULL; @@ -259,7 +259,7 @@ index 8addf4f84d3..f47b8583c6c 100644 + HRESULT hr; - return E_NOTIMPL; -+ TRACE("device %p, src_data %p, src_data_size %lu, load_info %p, pump %p, texture %p, hresult %p.\n", ++ TRACE("device %p, data %p, data_size %Iu, load_info %p, pump %p, texture %p, hresult %p.\n", + device, src_data, src_data_size, load_info, pump, texture, hresult); + + if (!src_data || !src_data_size || !texture) @@ -391,5 +391,5 @@ index 8addf4f84d3..f47b8583c6c 100644 HRESULT WINAPI D3DX11SaveTextureToFileW(ID3D11DeviceContext *context, ID3D11Resource *texture, -- -2.30.2 +2.34.1 diff --git a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch index ea6e663e..6414e6c8 100644 --- a/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch +++ b/patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch @@ -1,4 +1,4 @@ -From b094a7cf3f804ea40e5bd05ad738c48b5464e0bb Mon Sep 17 00:00:00 2001 +From ec5d4d8435795cb193909159ed2e692d330f2f1a Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 6 Oct 2014 05:06:06 +0200 Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR. @@ -9,23 +9,23 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR. 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in -index 22be2612eeb..f3f31eb3671 100644 +index abb440ffbe6..d200e891c8e 100644 --- a/dlls/dbghelp/Makefile.in +++ b/dlls/dbghelp/Makefile.in @@ -2,7 +2,7 @@ MODULE = dbghelp.dll IMPORTLIB = dbghelp IMPORTS = $(ZLIB_PE_LIBS) EXTRAINCL = $(ZLIB_PE_CFLAGS) --EXTRADEFS = -D_IMAGEHLP_SOURCE_ -+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\"" +-EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ ++EXTRADEFS = -DWINE_NO_LONG_TYPES -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\"" DELAYIMPORTS = version C_SRCS = \ diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c -index 553b212c526..3584a27953e 100644 +index def8b444e4e..7e664f8074a 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c -@@ -1451,6 +1451,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, +@@ -1445,6 +1445,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename, load_elf.elf_info = elf_info; ret = search_unix_path(filename, process_getenv(pcs, L"LD_LIBRARY_PATH"), elf_load_file_cb, &load_elf) @@ -34,5 +34,5 @@ index 553b212c526..3584a27953e 100644 } -- -2.33.0 +2.34.1 diff --git a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch index 0d520c80..f37f2789 100644 --- a/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch +++ b/patches/fltmgr.sys-FltBuildDefaultSecurityDescriptor/0003-ntoskrnl.exe-Add-FltBuildDefaultSecurityDescriptor-t.patch @@ -1,4 +1,4 @@ -From 1dc7cd6e5621505199c8ff8ad8f4e67845c478e3 Mon Sep 17 00:00:00 2001 +From ba211cf9d8ca7a462c24a62334813c68d41b3fc0 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Mon, 30 Aug 2021 15:16:06 +1000 Subject: [PATCH] ntoskrnl.exe: Add FltBuildDefaultSecurityDescriptor test @@ -10,10 +10,10 @@ Signed-off-by: Alistair Leslie-Hughes 2 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/tests/Makefile.in b/dlls/ntoskrnl.exe/tests/Makefile.in -index ab1db85adbb..9c89e44e70a 100644 +index 052a8618a81..9028a392002 100644 --- a/dlls/ntoskrnl.exe/tests/Makefile.in +++ b/dlls/ntoskrnl.exe/tests/Makefile.in -@@ -1,7 +1,7 @@ +@@ -2,7 +2,7 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntoskrnl.exe IMPORTS = advapi32 crypt32 newdev setupapi user32 wintrust ws2_32 hid @@ -23,7 +23,7 @@ index ab1db85adbb..9c89e44e70a 100644 driver2_IMPORTS = winecrt0 ntoskrnl hal driver2_EXTRADLLFLAGS = -nodefaultlibs -nostartfiles -Wl,--subsystem,native diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c -index deccc04bc2b..90f5b0ec965 100644 +index dabb3b73f15..187f00c8bcb 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -32,6 +32,7 @@ @@ -113,5 +113,5 @@ index deccc04bc2b..90f5b0ec965 100644 IoMarkIrpPending(irp); IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp); -- -2.33.0 +2.34.1 diff --git a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch index 44d27765..c687eddd 100644 --- a/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch +++ b/patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch @@ -1,4 +1,4 @@ -From eee60c1777c710cfcb4283922990a306361548ba Mon Sep 17 00:00:00 2001 +From 088f9f0bf9b30749221e28d51d88d910ed458d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Sep 2016 15:31:29 +0200 Subject: [PATCH] inseng: Implement CIF reader and download functions. @@ -18,10 +18,11 @@ FIXME: Needs splitting. create mode 100644 dlls/inseng/inseng_private.h diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in -index 0217203791a..ba2388c97ed 100644 +index f4b1d4b915f..79121e16c94 100644 --- a/dlls/inseng/Makefile.in +++ b/dlls/inseng/Makefile.in -@@ -1,8 +1,11 @@ +@@ -1,9 +1,12 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = inseng.dll -IMPORTS = uuid ole32 advapi32 +IMPORTS = uuid ole32 advapi32 urlmon shlwapi @@ -3862,5 +3863,5 @@ index 8a3f4c4d270..82927418a99 100644 +cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);") +cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);") -- -2.33.0 +2.34.1 diff --git a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch index a93e50a0..2e7e2934 100644 --- a/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch +++ b/patches/msxml3-FreeThreadedXMLHTTP60/0003-msxml3-Implement-FreeThreadedXMLHTTP60.patch @@ -1,4 +1,4 @@ -From f1500a8dcd6e90680d69fb04ff4f01c1ea4f9fae Mon Sep 17 00:00:00 2001 +From c1208e9a19cb0d0752c8d76d6a17f8b848ff0728 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. @@ -15,10 +15,11 @@ Update from Gijs Vermeulen 7 files changed, 905 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in -index 2bf789732da..e2d737599b1 100644 +index 7e3eccc0139..b14723d60fd 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = msxml3.dll -IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 +IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 rtworkq @@ -577,10 +578,10 @@ index 934d580064f..65232bbc8af 100644 } + diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h -index 07ed09fb480..6b45cc63a9e 100644 +index 8003c1a9650..59b8c29845d 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h -@@ -365,6 +365,7 @@ extern HRESULT XMLDocument_create(void**) DECLSPEC_HIDDEN; +@@ -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; @@ -1065,5 +1066,5 @@ index 333d4f3d3c7..1b4f0452c5f 100644 /* * Note that because of a #define in msxml2.h, we end up initializing -- -2.33.0 +2.34.1 diff --git a/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch b/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch index fe22904a..c83abb08 100644 --- a/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch +++ b/patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch @@ -1,4 +1,4 @@ -From 8250683de1ca5e4c1c975e6365f7a817b33461b4 Mon Sep 17 00:00:00 2001 +From 62e3109b6bd1b3324827063531ae0826571c751b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 00:50:50 +0100 Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity. @@ -9,10 +9,11 @@ Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity. 2 files changed, 81 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in -index ed15c51339f..e4ae568532e 100644 +index 7e0272498fa..a2c716d11d4 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in -@@ -1,5 +1,5 @@ +@@ -1,6 +1,6 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = ntdll.dll -IMPORTS = user32 advapi32 +IMPORTS = user32 ole32 advapi32 @@ -20,7 +21,7 @@ index ed15c51339f..e4ae568532e 100644 C_SRCS = \ atom.c \ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c -index 897be4fcd12..e7fef1a79ad 100644 +index c0168884a0a..c25a9185fad 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,9 @@ @@ -53,7 +54,7 @@ index 897be4fcd12..e7fef1a79ad 100644 pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); } -@@ -3664,6 +3673,76 @@ static void test_RtlDestroyHeap(void) +@@ -3682,6 +3691,76 @@ static void test_RtlDestroyHeap(void) RtlRemoveVectoredExceptionHandler( handler ); } @@ -130,7 +131,7 @@ index 897be4fcd12..e7fef1a79ad 100644 START_TEST(rtl) { InitFunctionPtrs(); -@@ -3702,6 +3781,7 @@ START_TEST(rtl) +@@ -3721,6 +3800,7 @@ START_TEST(rtl) test_RtlInitializeCriticalSectionEx(); test_RtlLeaveCriticalSection(); test_LdrEnumerateLoadedModules(); @@ -139,5 +140,5 @@ index 897be4fcd12..e7fef1a79ad 100644 test_LdrRegisterDllNotification(); test_DbgPrint(); -- -2.29.2 +2.34.1 diff --git a/patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch b/patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch index 225a39ef..f27f399d 100644 --- a/patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch +++ b/patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch @@ -1,24 +1,25 @@ -From bbb052887041a94a770154f5b9e266b17876fe9a Mon Sep 17 00:00:00 2001 +From 209317c803637eda7411ec3094dfb3cfa3ada93a Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 24 Nov 2015 17:22:02 +0800 -Subject: oleaut32: Implement a better stub for IPicture::SaveAsFile. +Subject: [PATCH] oleaut32: Implement a better stub for IPicture::SaveAsFile. Based on OLEPictureImpl_Save implementation. For bug 8532. --- - dlls/oleaut32/olepicture.c | 92 ++++++++++++++++++++++++++++++++++------ + dlls/oleaut32/olepicture.c | 92 +++++++++++++++++++++++++++----- dlls/oleaut32/tests/olepicture.c | 9 ---- 2 files changed, 79 insertions(+), 22 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index 44157de..c57b878 100644 +index a3bbdc52a0f..ad4aff2aecc 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -834,19 +834,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) +@@ -859,19 +859,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface) + return S_OK; } - /************************************************************************ +-/************************************************************************ - * OLEPictureImpl_SaveAsFile - */ -static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface, @@ -31,11 +32,10 @@ index 44157de..c57b878 100644 - return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize); -} - --/************************************************************************ + /************************************************************************ * OLEPictureImpl_get_Attributes */ - static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface, -@@ -1859,6 +1846,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( +@@ -1915,6 +1902,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax( return E_NOTIMPL; } @@ -122,58 +122,58 @@ index 44157de..c57b878 100644 /************************************************************************ * IDispatch diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c -index 0903298..0c69cbd 100644 +index 0582bd2266e..ce87dd3d4d4 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c -@@ -1079,18 +1079,14 @@ static void test_load_save_bmp(void) +@@ -1178,18 +1178,14 @@ static void test_load_save_bmp(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); --todo_wine +- todo_wine ok(size == 66, "expected 66, got %d\n", size); mem = GlobalLock(hmem); --todo_wine +- todo_wine ok(!memcmp(&mem[0], "BM", 2), "got wrong bmp header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); --todo_wine +- todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); --todo_wine +- todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; -@@ -1157,15 +1153,12 @@ static void test_load_save_icon(void) - todo_wine +@@ -1256,15 +1252,12 @@ static void test_load_save_icon(void) + todo_wine ok(size == 766, "expected 766, got %d\n", size); mem = GlobalLock(hmem); --todo_wine +- todo_wine ok(mem[0] == 0x00010000, "got wrong icon header %04x\n", mem[0]); GlobalUnlock(hmem); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); --todo_wine +- todo_wine ok(hr == E_FAIL, "expected E_FAIL, got %#x\n", hr); --todo_wine +- todo_wine ok(size == -1, "expected -1, got %d\n", size); offset.QuadPart = 0; -@@ -1231,13 +1224,11 @@ static void test_load_save_empty_picture(void) +@@ -1330,13 +1323,11 @@ static void test_load_save_empty_picture(void) size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, TRUE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); --todo_wine +- todo_wine ok(size == -1, "expected -1, got %d\n", size); size = -1; hr = IPicture_SaveAsFile(pic, dst_stream, FALSE, &size); ok(hr == S_OK, "IPicture_SaveasFile error %#x\n", hr); --todo_wine +- todo_wine ok(size == -1, "expected -1, got %d\n", size); hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream); -- -2.7.1 +2.34.1 diff --git a/patches/packager-DllMain/0001-packager-Prefer-native-version.patch b/patches/packager-DllMain/0001-packager-Prefer-native-version.patch index 93458773..6ba9b065 100644 --- a/patches/packager-DllMain/0001-packager-Prefer-native-version.patch +++ b/patches/packager-DllMain/0001-packager-Prefer-native-version.patch @@ -1,4 +1,4 @@ -From b8164026e54c8bb9e9401d4952ebe07d3811bc45 Mon Sep 17 00:00:00 2001 +From cea29373b287ae84e28adca9834ffdbb97844ffe Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 6 Aug 2017 02:50:23 +0200 Subject: [PATCH] packager: Prefer native version. @@ -8,10 +8,10 @@ Subject: [PATCH] packager: Prefer native version. 1 file changed, 2 insertions(+) diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in -index a2b2daa0cea..55482167bc1 100644 +index f539cb6f095..faef8deb263 100644 --- a/dlls/packager/Makefile.in +++ b/dlls/packager/Makefile.in -@@ -1,6 +1,8 @@ +@@ -2,6 +2,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = packager.dll IMPORTS = uuid shell32 shlwapi user32 @@ -21,5 +21,5 @@ index a2b2daa0cea..55482167bc1 100644 packager_main.c -- -2.33.0 +2.34.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index eec0f1a5..833da140 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "9a4992173e165b04ff79d5283f81064f7585e7ad" + echo "85cb1ff91ed4d48559c5500e2ccb0b15801edc05" } # Show version information diff --git a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch index 34775d19..07febf3d 100644 --- a/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch +++ b/patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch @@ -1,4 +1,4 @@ -From ebc7c34335a94561564edb8af4dc2d606278d61f Mon Sep 17 00:00:00 2001 +From c414d9b1fa846d017e9749080645b3c0b201d242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 8 May 2017 23:33:45 +0200 Subject: [PATCH] shell32: Add security property tab. @@ -11,11 +11,11 @@ Subject: [PATCH] shell32: Add security property tab. 4 files changed, 438 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in -index eeb6cd63d60..7cc704e56b6 100644 +index e31c165ccff..bb03300f9c9 100644 --- a/dlls/shell32/Makefile.in +++ b/dlls/shell32/Makefile.in @@ -1,7 +1,7 @@ - EXTRADEFS = -D_SHELL32_ + EXTRADEFS = -DWINE_NO_LONG_TYPES -D_SHELL32_ MODULE = shell32.dll IMPORTLIB = shell32 -IMPORTS = uuid shlwapi user32 gdi32 advapi32 @@ -516,5 +516,5 @@ index 210046e729d..0f3a64f16d2 100644 #define IDS_RECYCLEBIN_FOLDER_NAME 8964 -- -2.33.0 +2.34.1 diff --git a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch index b8bcb498..5eaa9e29 100644 --- a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch +++ b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch @@ -1,4 +1,4 @@ -From 584eecc73a8cba537b8f50932769729a29fe7d3d Mon Sep 17 00:00:00 2001 +From 65da921b514b01640d2715e4c323fc9cf5626612 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 26 Dec 2016 16:37:40 +0100 Subject: [PATCH] wineboot: Initialize proxy settings registry key. @@ -9,10 +9,11 @@ Subject: [PATCH] wineboot: Initialize proxy settings registry key. 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in -index 667f8f48702..4a1747ad047 100644 +index 3b78729dce6..1a804595c1c 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in -@@ -1,6 +1,6 @@ +@@ -1,7 +1,7 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = wineboot.exe IMPORTS = uuid advapi32 ws2_32 kernelbase -DELAYIMPORTS = shell32 shlwapi version user32 setupapi newdev @@ -55,5 +56,5 @@ index 14943b005ef..9aab3b68e5b 100644 ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE ); -- -2.33.0 +2.34.1 diff --git a/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch b/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch index 690aaa9b..7257842b 100644 --- a/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch +++ b/patches/winemenubuilder-Desktop_Icon_Path/0001-winemenubuilder-Create-desktop-shortcuts-with-absolu.patch @@ -1,4 +1,4 @@ -From e0a698c661327771d64c654ba562554b3fdb59a3 Mon Sep 17 00:00:00 2001 +From f5b6b42f348c34ae3a507949900ff5fd12ebea4a Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 24 Sep 2014 21:13:59 +0200 Subject: [PATCH] winemenubuilder: Create desktop shortcuts with absolute wine @@ -15,10 +15,11 @@ wine, and so on ...). 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/programs/winemenubuilder/Makefile.in b/programs/winemenubuilder/Makefile.in -index 12326d1e4e2..07191b56d82 100644 +index fe144efc53d..6aded38c4c4 100644 --- a/programs/winemenubuilder/Makefile.in +++ b/programs/winemenubuilder/Makefile.in -@@ -1,5 +1,6 @@ +@@ -1,6 +1,7 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES MODULE = winemenubuilder.exe IMPORTS = uuid windowscodecs shell32 shlwapi ole32 user32 advapi32 +EXTRADEFS = -DBINDIR="\"${bindir}\"" @@ -26,7 +27,7 @@ index 12326d1e4e2..07191b56d82 100644 EXTRADLLFLAGS = -mwindows -municode diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c -index e02d7bd787f..6d157305135 100644 +index 16dc32a8859..b3994837fa3 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -97,6 +97,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(menubuilder); @@ -44,7 +45,7 @@ index e02d7bd787f..6d157305135 100644 /* link file formats */ #include "pshpack1.h" -@@ -1418,7 +1426,7 @@ static BOOL write_desktop_entry(const WCHAR *link, const WCHAR *location, const +@@ -1275,7 +1283,7 @@ static BOOL write_desktop_entry(const WCHAR *link, const WCHAR *location, const fprintf(file, "env WINEPREFIX=\"%s\" ", path); heap_free( path ); } @@ -53,7 +54,7 @@ index e02d7bd787f..6d157305135 100644 if (args) fprintf(file, " %s", escape(args) ); fputc( '\n', file ); fprintf(file, "Type=Application\n"); -@@ -2123,7 +2131,7 @@ static BOOL write_freedesktop_association_entry(const WCHAR *desktopPath, const +@@ -1985,7 +1993,7 @@ static BOOL write_freedesktop_association_entry(const WCHAR *desktopPath, const if (prefix) { char *path = wine_get_unix_file_name( prefix ); @@ -63,5 +64,5 @@ index e02d7bd787f..6d157305135 100644 } else -- -2.33.0 +2.34.1 diff --git a/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch b/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch index 2366af40..1d8a940c 100644 --- a/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch +++ b/patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch @@ -1,4 +1,4 @@ -From c0a97e116da7c6868b74b66a19b65855521bf827 Mon Sep 17 00:00:00 2001 +From 577f073b38a77cdcd35769cc2c60bd227d0a8314 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 1 Oct 2020 18:34:23 +1000 Subject: [PATCH] xactengine3_7/tests: Add Global settings test @@ -13,10 +13,11 @@ Subject: [PATCH] xactengine3_7/tests: Add Global settings test create mode 100644 dlls/xactengine3_7/tests/rsrc.rc diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in -index c32b2562546..0da28c85922 100644 +index 693c3687728..fbcb357524c 100644 --- a/dlls/xactengine3_7/tests/Makefile.in +++ b/dlls/xactengine3_7/tests/Makefile.in -@@ -1,5 +1,8 @@ +@@ -1,6 +1,9 @@ + EXTRADEFS = -DWINE_NO_LONG_TYPES TESTDLL = xactengine3_7.dll -IMPORTS = ole32 +IMPORTS = ole32 x3daudio1_7 @@ -70,7 +71,7 @@ index 00000000000..2c1961c727a +/* @makedep: globals.xgs*/ +globals.xgs RCDATA "globals.xgs" diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c -index 9b0d3defb09..8709ac18910 100644 +index 6b04c36a9f0..7840764726e 100644 --- a/dlls/xactengine3_7/tests/xact3.c +++ b/dlls/xactengine3_7/tests/xact3.c @@ -90,11 +90,71 @@ static void test_interfaces(void) @@ -146,5 +147,5 @@ index 9b0d3defb09..8709ac18910 100644 CoUninitialize(); } -- -2.28.0 +2.34.1 diff --git a/staging/upstream-commit b/staging/upstream-commit index 8bcd33c9..f86f3175 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -9a4992173e165b04ff79d5283f81064f7585e7ad +85cb1ff91ed4d48559c5500e2ccb0b15801edc05