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

Fixed compile errors when building with -Werror

Browse Source 
NOTE: Tests are skipped.
This commit is contained in:
Alistair Leslie-Hughes
2021-06-08 09:15:19 +10:00
parent 8a3554ad85
commit daec2e3662
18 changed files with 373 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,17 +1,17 @@
From eb6e03432154b75d068cd42dfc8c8e1ba6318fa4 Mon Sep 17 00:00:00 2001
From b6a510e5397091c59d9fb3a29bf75bc709727cb1 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Sun, 27 Mar 2016 16:26:47 +0800
Subject: [PATCH] oleaut32: Factor out stream creation from OleLoadPicturePath.
---
dlls/oleaut32/olepicture.c | 71 ++++++++++++++++++++++----------------
1 file changed, 41 insertions(+), 30 deletions(-)
dlls/oleaut32/olepicture.c | 76 ++++++++++++++++++++------------------
1 file changed, 41 insertions(+), 35 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 373ccd61724..ab242b7d798 100644
index 3758b785341..ef564e98164 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -2424,6 +2424,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture)
@@ -2336,6 +2336,45 @@ HRESULT WINAPI OleLoadPictureFile(VARIANT file, LPDISPATCH *picture)
return E_NOTIMPL;
}
@@ -57,15 +57,21 @@ index 373ccd61724..ab242b7d798 100644
/***********************************************************************
* OleSavePictureFile (OLEAUT32.423)
*/
@@ -2446,7 +2485,6 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
HGLOBAL hGlobal = NULL;
DWORD dwBytesRead;
@@ -2352,13 +2391,7 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
DWORD dwReserved, OLE_COLOR clrReserved, REFIID riid,
LPVOID *ppvRet )
{
- IPicture *ipicture;
- HANDLE hFile;
- DWORD dwFileSize;
- HGLOBAL hGlobal = NULL;
- DWORD dwBytesRead;
IStream *stream;
- BOOL bRead;
HRESULT hRes;
WCHAR *file_candidate;
WCHAR path_buf[MAX_PATH];
@@ -2475,36 +2513,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
@@ -2387,36 +2420,9 @@ HRESULT WINAPI OleLoadPicturePath( LPOLESTR szURLorPath, LPUNKNOWN punkCaller,
/* Handle candidate DOS paths separately. */
if (file_candidate[1] == ':') {
@@ -105,5 +111,5 @@ index 373ccd61724..ab242b7d798 100644
IMoniker *pmnk;
IBindCtx *pbc;
--
2.29.2
2.30.2