From dd22e6eb1de7852680a2f95f2b247ac26bc2cf6f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Fri, 1 Mar 2024 19:19:58 -0600 Subject: [PATCH] Rebase against 0fb7c99c33507ac494c9c35e15fb6df8b000cdd2. --- ...-versions-of-RtlEnterCriticalSection.patch | 10 ++-- ...port-for-loading-and-saving-EMF-to-I.patch | 48 ++++++++++--------- ...-context-menu-handler-entry-for-dire.patch | 24 ---------- .../definition | 1 - staging/upstream-commit | 2 +- 5 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 patches/wine.inf-Directory_ContextMenuHandlers/0001-wine.inf-Add-New-context-menu-handler-entry-for-dire.patch delete mode 100644 patches/wine.inf-Directory_ContextMenuHandlers/definition diff --git a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch index d65be1bd..1940cc72 100644 --- a/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch +++ b/patches/ntdll-CriticalSection/0002-ntdll-Add-inline-versions-of-RtlEnterCriticalSection.patch @@ -1,4 +1,4 @@ -From 7e6c4ffa4bcf4e008a2cf4ed75c279058d002aac Mon Sep 17 00:00:00 2001 +From 49fa193ec777f68372b549752482ef82fb63a7b7 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 5 Aug 2017 03:38:38 +0200 Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / @@ -9,18 +9,18 @@ Subject: [PATCH] ntdll: Add inline versions of RtlEnterCriticalSection / 1 file changed, 34 insertions(+) diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h -index 24c583dd159..cffe27d847c 100644 +index 171ded98c67..54a65e3bae5 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h -@@ -28,6 +28,7 @@ - #include "winnt.h" +@@ -29,6 +29,7 @@ #include "winternl.h" + #include "rtlsupportapi.h" #include "unixlib.h" +#include "wine/debug.h" #include "wine/asm.h" #define MAX_NT_PATH_LENGTH 277 -@@ -105,6 +106,39 @@ extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void * +@@ -106,6 +107,39 @@ extern void (FASTCALL *pBaseThreadInitThunk)(DWORD,LPTHREAD_START_ROUTINE,void * extern struct _KUSER_SHARED_DATA *user_shared_data; diff --git a/patches/oleaut32-Load_Save_EMF/0002-oleaut32-Add-support-for-loading-and-saving-EMF-to-I.patch b/patches/oleaut32-Load_Save_EMF/0002-oleaut32-Add-support-for-loading-and-saving-EMF-to-I.patch index 1da43784..e83854ab 100644 --- a/patches/oleaut32-Load_Save_EMF/0002-oleaut32-Add-support-for-loading-and-saving-EMF-to-I.patch +++ b/patches/oleaut32-Load_Save_EMF/0002-oleaut32-Add-support-for-loading-and-saving-EMF-to-I.patch @@ -1,4 +1,4 @@ -From c0c14c70039d65f61a73d37950f72d8c66bbc2f0 Mon Sep 17 00:00:00 2001 +From 92c5616bf7048e9d69010a473fa5fd65db43a6fc Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 26 Apr 2016 13:15:41 +0800 Subject: [PATCH] oleaut32: Add support for loading and saving EMF to IPicture @@ -6,15 +6,15 @@ Subject: [PATCH] oleaut32: Add support for loading and saving EMF to IPicture For bug #40523. --- - dlls/oleaut32/olepicture.c | 51 ++++++++++++++++++++++++++++++++++++---- - dlls/oleaut32/tests/olepicture.c | 5 +--- - 2 files changed, 47 insertions(+), 9 deletions(-) + dlls/oleaut32/olepicture.c | 53 +++++++++++++++++++++++++++++--- + dlls/oleaut32/tests/olepicture.c | 5 +-- + 2 files changed, 49 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c -index a2a54bd..3fd7638 100644 +index 78fd3fc5681..91327f78eef 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c -@@ -266,6 +266,18 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) +@@ -256,6 +256,18 @@ static void OLEPictureImpl_SetIcon(OLEPictureImpl * This) } } @@ -33,7 +33,7 @@ index a2a54bd..3fd7638 100644 /************************************************************************ * OLEPictureImpl_Construct * -@@ -349,8 +361,7 @@ static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictu +@@ -339,8 +351,7 @@ static HRESULT OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn, OLEPictu break; case PICTYPE_ENHMETAFILE: @@ -43,25 +43,30 @@ index a2a54bd..3fd7638 100644 break; default: -@@ -1758,6 +1769,17 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) +@@ -1760,6 +1771,22 @@ static BOOL serializeIcon(HICON hIcon, void ** ppBuffer, unsigned int * pLength) return success; } -+static BOOL serializeEMF(HENHMETAFILE hemf, void **buf, unsigned *size) ++static HRESULT serializeEMF(HENHMETAFILE hemf, void **buf, unsigned *size) +{ -+ *size = GetEnhMetaFileBits(hemf, 0, NULL); -+ if (!*size) return FALSE; ++ if (!(*size = GetEnhMetaFileBits(hemf, 0, NULL))) ++ return E_FAIL; + -+ *buf = HeapAlloc(GetProcessHeap(), 0, *size); -+ if (!*buf) return FALSE; ++ if (!(*buf = HeapAlloc(GetProcessHeap(), 0, *size))) ++ return E_OUTOFMEMORY; + -+ return GetEnhMetaFileBits(hemf, *size, *buf) != 0; ++ if (!GetEnhMetaFileBits(hemf, *size, *buf)) ++ { ++ HeapFree(GetProcessHeap(), 0, *buf); ++ return E_FAIL; ++ } ++ return S_OK; +} + static HRESULT WINAPI OLEPictureImpl_Save( IPersistStream* iface,IStream*pStm,BOOL fClearDirty) { -@@ -1833,12 +1855,31 @@ static HRESULT WINAPI OLEPictureImpl_Save( +@@ -1831,12 +1858,28 @@ static HRESULT WINAPI OLEPictureImpl_Save( IStream_Write(pStm, This->data, This->datalen, &dummy); hResult = S_OK; break; @@ -69,12 +74,9 @@ index a2a54bd..3fd7638 100644 + case PICTYPE_ENHMETAFILE: + if (This->bIsDirty || !This->data) + { -+ serializeResult = serializeEMF(This->desc.emf.hemf, &pIconData, &iDataSize); -+ if (!serializeResult) -+ { -+ hResult = E_FAIL; ++ hResult = serializeEMF(This->desc.emf.hemf, &pIconData, &iDataSize); ++ if (hResult != S_OK) + break; -+ } + + HeapFree(GetProcessHeap(), 0, This->data); + This->data = pIconData; @@ -97,10 +99,10 @@ index a2a54bd..3fd7638 100644 FIXME("(%p,%p,%d), [unknown type] not implemented!\n",This,pStm,fClearDirty); break; diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c -index 2498910..dcbd088 100644 +index af2c9255e3c..f19ef01c773 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c -@@ -1471,21 +1471,18 @@ todo_wine +@@ -1546,21 +1546,18 @@ todo_wine ok(hr == S_OK, "QueryInterface error %#x\n", hr); hr = IPersistStream_Save(src_stream, dst_stream, TRUE); @@ -124,5 +126,5 @@ index 2498910..dcbd088 100644 GlobalFree(hmem); -- -1.9.1 +2.43.0 diff --git a/patches/wine.inf-Directory_ContextMenuHandlers/0001-wine.inf-Add-New-context-menu-handler-entry-for-dire.patch b/patches/wine.inf-Directory_ContextMenuHandlers/0001-wine.inf-Add-New-context-menu-handler-entry-for-dire.patch deleted file mode 100644 index 96994f50..00000000 --- a/patches/wine.inf-Directory_ContextMenuHandlers/0001-wine.inf-Add-New-context-menu-handler-entry-for-dire.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 868466d81e1b64dd88e8cbdc7a878202829f452e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Thu, 31 Mar 2016 23:23:09 +0200 -Subject: wine.inf: Add 'New' context menu handler entry for directories. - ---- - loader/wine.inf.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index d22b29b..88b088a 100644 ---- a/loader/wine.inf.in -+++ b/loader/wine.inf.in -@@ -182,6 +182,7 @@ HKCR,chm.file\shell\open\command,,2,"%10%\hh.exe %1" - HKCR,cplfile,,2,"Control Panel Item" - HKCR,cplfile\shell\cplopen,,2,"Open with Control Panel" - HKCR,cplfile\shell\cplopen\command,,2,"rundll32.exe shell32.dll,Control_RunDLL ""%1"",%*" -+HKCR,Directory\Background\shellex\ContextMenuHandlers\New,,16 - HKCR,DirectShow,,16 - HKCR,exefile,,2,"Application" - HKCR,exefile\DefaultIcon,,2,"%1" --- -2.7.1 - diff --git a/patches/wine.inf-Directory_ContextMenuHandlers/definition b/patches/wine.inf-Directory_ContextMenuHandlers/definition deleted file mode 100644 index d719f395..00000000 --- a/patches/wine.inf-Directory_ContextMenuHandlers/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [29523] Add 'New' context menu handler entry for directories diff --git a/staging/upstream-commit b/staging/upstream-commit index 6caad71f..66edf653 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -1d3b312f225f79bec74d3d265128ead455467e2a +0fb7c99c33507ac494c9c35e15fb6df8b000cdd2