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 1d3b312f225f79bec74d3d265128ead455467e2a.

Browse Source
This commit is contained in:
Zebediah Figura
2024-02-29 18:06:56 -06:00
parent 34eb04e7cc
commit e768e46a86
5 changed files with 22 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/oleaut32-OLEPictureImpl_SaveAsFile/0002-oleaut32-Implement-a-better-stub-for-IPicture-SaveAs.patch
View File

@@ -1,4 +1,4 @@
From a9c768a74e8ecbe857dfb851e35c62d5447f8d10 Mon Sep 17 00:00:00 2001
From 7b40ae4316f61b52e0ad740bb1ba0a32e6545a40 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Tue, 24 Nov 2015 17:22:02 +0800
Subject: [PATCH] oleaut32: Implement a better stub for IPicture::SaveAsFile.
@@ -12,10 +12,10 @@ For bug 8532.
2 files changed, 79 insertions(+), 22 deletions(-)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index bbc5e2aa9c8..0410d2b3cad 100644
index 6e0db65a101..48d7ae13846 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -832,19 +832,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
@@ -819,19 +819,6 @@ static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
return S_OK;
}
@@ -35,8 +35,8 @@ index bbc5e2aa9c8..0410d2b3cad 100644
/************************************************************************
* OLEPictureImpl_get_Attributes
*/
@@ -1887,6 +1874,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(
return E_NOTIMPL;
@@ -1891,6 +1878,85 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(IPersistStream *iface, ULARGE_IN
return hr;
}
+/************************************************************************
@@ -122,10 +122,10 @@ index bbc5e2aa9c8..0410d2b3cad 100644
/************************************************************************
* IDispatch
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index beafb98b28f..e0fb3bb3cd8 100644
index a269491fd3f..97c80027b99 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -1178,18 +1178,14 @@ static void test_load_save_bmp(void)
@@ -1231,18 +1231,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 %#lx\n", hr);
@@ -144,7 +144,7 @@ index beafb98b28f..e0fb3bb3cd8 100644
ok(size == -1, "expected -1, got %ld\n", size);
offset.QuadPart = 0;
@@ -1256,15 +1252,12 @@ static void test_load_save_icon(void)
@@ -1317,15 +1313,12 @@ static void test_load_save_icon(void)
todo_wine
ok(size == 766, "expected 766, got %ld\n", size);
mem = GlobalLock(hmem);
@@ -160,7 +160,7 @@ index beafb98b28f..e0fb3bb3cd8 100644
ok(size == -1, "expected -1, got %ld\n", size);
offset.QuadPart = 0;
@@ -1330,13 +1323,11 @@ static void test_load_save_empty_picture(void)
@@ -1399,13 +1392,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 %#lx\n", hr);
@@ -175,5 +175,5 @@ index beafb98b28f..e0fb3bb3cd8 100644
hr = IPicture_QueryInterface(pic, &IID_IPersistStream, (void **)&src_stream);
--
2.35.1
2.43.0