wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9faa5eeddd24a057d9ff522259c9dbdc6203c098.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-11-27 11:25:44 +11:00
parent b9d3415f29
commit 3b0de86bf9
11 changed files with 103 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/oleaut32-OleLoadPictureFile/0001-oleaut32-Do-not-reimplement-OleLoadPicture-in-OleLoa.patch
View File

@@ -1,25 +1,19 @@
From 1d3c7baaddc652049995ffc1fbb41e3950dcd8dc Mon Sep 17 00:00:00 2001
From 89935f2a91305a577da2b08f80ac74235235a0d2 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sun, 27 Mar 2016 12:30:00 +0800
Subject: oleaut32: Do not reimplement OleLoadPicture in OleLoadPicturePath.
Subject: [PATCH] oleaut32: Do not reimplement OleLoadPicture in
OleLoadPicturePath.
punkCaller is ignored by StdPicture ClassFactory implementation anyway.
---
dlls/oleaut32/olepicture.c | 27 +--------------------------
1 file changed, 1 insertion(+), 26 deletions(-)
dlls/oleaut32/olepicture.c | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 44157de..285afba 100644
index 7312adac1dc..373ccd61724 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -2332,16 +2332,13 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
LPVOID *ppvRet )
{
static const WCHAR file[] = { 'f','i','l','e',':',0 };
- IPicture *ipicture;
HANDLE hFile;
DWORD dwFileSize;
HGLOBAL hGlobal = NULL;
@@ -2447,9 +2447,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
DWORD dwBytesRead;
IStream *stream;
BOOL bRead;
@@ -29,7 +23,7 @@ index 44157de..285afba 100644
WCHAR *file_candidate;
WCHAR path_buf[MAX_PATH];
@@ -2418,32 +2415,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
@@ -2526,32 +2524,10 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
return hRes;
}
@@ -64,5 +58,5 @@ index 44157de..285afba 100644
}
--
2.7.1
2.29.2

27
patches/oleaut32-OleLoadPictureFile/0002-oleaut32-Factor-out-stream-creation-from-OleLoadPict.patch
View File

@@ -1,17 +1,17 @@
From 5032303d405720a099c0279127148d2d6e278b7b Mon Sep 17 00:00:00 2001
From eb6e03432154b75d068cd42dfc8c8e1ba6318fa4 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sun, 27 Mar 2016 16:26:47 +0800
Subject: oleaut32: Factor out stream creation from OleLoadPicturePath.
Subject: [PATCH] oleaut32: Factor out stream creation from OleLoadPicturePath.
---
dlls/oleaut32/olepicture.c | 75 +++++++++++++++++++++++++---------------------
1 file changed, 41 insertions(+), 34 deletions(-)
dlls/oleaut32/olepicture.c | 71 ++++++++++++++++++++++----------------
1 file changed, 41 insertions(+), 30 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index eeb3269..765711d 100644
index 373ccd61724..ab242b7d798 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -2324,6 +2324,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture)
@@ -2424,6 +2424,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture)
return E_NOTIMPL;
}
@@ -57,20 +57,15 @@ index eeb3269..765711d 100644
/***********************************************************************
* OleSavePictureFile (OLEAUT32.423)
*/
@@ -2341,12 +2380,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
LPVOID *ppvRet )
{
static const WCHAR file[] = { 'f','i','l','e',':',0 };
- HANDLE hFile;
- DWORD dwFileSize;
- HGLOBAL hGlobal = NULL;
- DWORD dwBytesRead;
@@ -2446,7 +2485,6 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
HGLOBAL hGlobal = NULL;
DWORD dwBytesRead;
IStream *stream;
- BOOL bRead;
HRESULT hRes;
WCHAR *file_candidate;
WCHAR path_buf[MAX_PATH];
@@ -2375,36 +2409,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
@@ -2475,36 +2513,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
/* Handle candidate DOS paths separately. */
if (file_candidate[1] == ':') {
@@ -110,5 +105,5 @@ index eeb3269..765711d 100644
IMoniker *pmnk;
IBindCtx *pbc;
--
2.7.1
2.29.2