wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 40b0ede26e317bb994bf0b85ea37c7dab074e9f1.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2025-02-04 10:22:36 +11:00
parent 667ee8a4ff
commit 7fda13a16d
3 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/user32-msgbox-Support-WM_COPY-mesg/0002-user32-msgbox-Use-a-windows-hook-to-trap-Ctrl-C.patch
View File

@ -1,14 +1,14 @@
From 7e889b2ef650e4805128220aa3b56fbf5a0514b1 Mon Sep 17 00:00:00 2001
From 213514e0cfc73abd3be2f9707f53688fbf28669e Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 6 Mar 2024 20:21:36 +1100
Subject: [PATCH 2/2] user32/msgbox: Use a windows hook to trap Ctrl+C
Subject: [PATCH] user32/msgbox: Use a windows hook to trap Ctrl+C
---
dlls/user32/msgbox.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c
index 6b5d867eb1f..bf28413f39d 100644
index e7fd704ea28..8d9adce8bd6 100644
--- a/dlls/user32/msgbox.c
+++ b/dlls/user32/msgbox.c
@@ -391,6 +391,22 @@ static void MSGBOX_CopyToClipbaord( HWND hwnd )
@ -35,7 +35,7 @@ index 6b5d867eb1f..bf28413f39d 100644
* MSGBOX_DlgProc
*
@@ -406,6 +422,7 @@ static INT_PTR CALLBACK MSGBOX_DlgProc( HWND hwnd, UINT message,
SetWindowContextHelpId(hwnd, mbp->dwContextHelpId);
NtUserSetWindowContextHelpId(hwnd, mbp->dwContextHelpId);
MSGBOX_OnInit(hwnd, mbp);
SetPropA(hwnd, "WINE_MSGBOX_HELPCALLBACK", mbp->lpfnMsgBoxCallback);
+ msghook_handle = SetWindowsHookExA(WH_MSGFILTER, msg_hook_proc, NULL, GetCurrentThreadId());
@ -53,5 +53,5 @@ index 6b5d867eb1f..bf28413f39d 100644
case WM_COMMAND:
switch (LOWORD(wParam))
--
2.43.0
2.47.2

35
patches/windowscodecs-TIFF_Support/0015-windowscodecs-Tolerate-partial-reads-in-the-IFD-meta.patch
View File

@ -1,27 +1,18 @@
From 17a42ea7b9cf8a29fee0e7bac01724b512c2bf76 Mon Sep 17 00:00:00 2001
From e077ea2bfbd18f30ead3f9101aae92b2784efe7a Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Fri, 16 Dec 2016 18:08:51 +0800
Subject: [PATCH] windowscodecs: Tolerate partial reads in the IFD metadata
loader.
---
dlls/windowscodecs/metadatahandler.c | 37 +++++++++++-----------------
1 file changed, 15 insertions(+), 22 deletions(-)
dlls/windowscodecs/metadatahandler.c | 35 +++++++++++-----------------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/dlls/windowscodecs/metadatahandler.c b/dlls/windowscodecs/metadatahandler.c
index 7618d8cd6aa..10233236f7f 100644
index 1969d6288ba..2c86bb79d5c 100644
--- a/dlls/windowscodecs/metadatahandler.c
+++ b/dlls/windowscodecs/metadatahandler.c
@@ -791,7 +791,7 @@ static int tag_to_vt(SHORT tag)
static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
MetadataItem *item, BOOL native_byte_order)
{
- ULONG count, value, i, bytesread;
+ ULONG count, value, i;
SHORT type;
LARGE_INTEGER pos;
HRESULT hr;
@@ -843,9 +843,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -916,9 +916,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.caub.pElems);
return hr;
}
@ -33,7 +24,7 @@ index 7618d8cd6aa..10233236f7f 100644
{
CoTaskMemFree(item->value.caub.pElems);
return hr;
@@ -878,7 +877,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -951,7 +950,7 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
item->value.vt |= VT_VECTOR;
item->value.caui.cElems = count;
@ -42,7 +33,7 @@ index 7618d8cd6aa..10233236f7f 100644
if (!item->value.caui.pElems) return E_OUTOFMEMORY;
pos.QuadPart = value;
@@ -888,9 +887,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -961,9 +960,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.caui.pElems);
return hr;
}
@ -54,7 +45,7 @@ index 7618d8cd6aa..10233236f7f 100644
{
CoTaskMemFree(item->value.caui.pElems);
return hr;
@@ -921,9 +919,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -994,9 +992,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.caul.pElems);
return hr;
}
@ -66,7 +57,7 @@ index 7618d8cd6aa..10233236f7f 100644
{
CoTaskMemFree(item->value.caul.pElems);
return hr;
@@ -949,8 +946,7 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -1022,8 +1019,7 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
hr = IStream_Seek(input, pos, STREAM_SEEK_SET, NULL);
if (FAILED(hr)) return hr;
@ -76,7 +67,7 @@ index 7618d8cd6aa..10233236f7f 100644
if (hr != S_OK) return hr;
item->value.uhVal.QuadPart = ull;
@@ -978,9 +974,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -1051,9 +1047,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.cauh.pElems);
return hr;
}
@ -88,7 +79,7 @@ index 7618d8cd6aa..10233236f7f 100644
{
CoTaskMemFree(item->value.cauh.pElems);
return hr;
@@ -1016,9 +1011,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -1089,9 +1084,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.pszVal);
return hr;
}
@ -100,7 +91,7 @@ index 7618d8cd6aa..10233236f7f 100644
{
CoTaskMemFree(item->value.pszVal);
return hr;
@@ -1052,9 +1046,8 @@ static HRESULT load_IFD_entry(IStream *input, const struct IFD_entry *entry,
@@ -1125,9 +1119,8 @@ static HRESULT load_IFD_entry(IStream *input, const GUID *vendor, DWORD options,
CoTaskMemFree(item->value.blob.pBlobData);
return hr;
}
@ -113,5 +104,5 @@ index 7618d8cd6aa..10233236f7f 100644
CoTaskMemFree(item->value.blob.pBlobData);
return hr;
--
2.45.2
2.47.2

2
staging/upstream-commit
View File

@ -1 +1 @@
ff2de2a73b830a601cfe26aca5feeafb309fbff5
40b0ede26e317bb994bf0b85ea37c7dab074e9f1