[PATCH 0/2] MR5303: oleaut32: Return success from GetSizeMax if not dirty.

[Daniel Lehman (＠dlehman25)]

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/5303

[PATCH 1/2] oleaut32/tests: Add tests for GetSizeMax after dirty flag cleared.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/oleaut32/tests/olepicture.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 0384a43967b..66cc41646c5 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -1260,6 +1260,12 @@ static void test_load_save_bmp(void)
     hr = IPersistStream_Save(src_stream, dst_stream, TRUE);
     ok(hr == S_OK, "Save error %#lx\n", hr);
 
+    maxsize.QuadPart = 0;
+    hr = IPersistStream_GetSizeMax(src_stream, &maxsize);
+    todo_wine
+    ok(hr == S_OK, "GetSizeMax error %#lx\n", hr);
+    ok(maxsize.QuadPart == 74, "expected 74, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart));
+
     IPersistStream_Release(src_stream);
     IStream_Release(dst_stream);
 
@@ -1343,6 +1349,13 @@ static void test_load_save_icon(void)
     hr = IPersistStream_Save(src_stream, dst_stream, TRUE);
     ok(hr == S_OK, "Saveerror %#lx\n", hr);
 
+    maxsize.QuadPart = 0;
+    hr = IPersistStream_GetSizeMax(src_stream, &maxsize);
+    todo_wine
+    ok(hr == S_OK, "GetSizeMax error %#lx\n", hr);
+    todo_wine
+    ok(maxsize.QuadPart == 774, "expected 774, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart));
+
     IPersistStream_Release(src_stream);
     IStream_Release(dst_stream);
 
@@ -1420,6 +1433,11 @@ static void test_load_save_empty_picture(void)
     hr = IPersistStream_Save(src_stream, dst_stream, TRUE);
     ok(hr == S_OK, "Save error %#lx\n", hr);
 
+    maxsize.QuadPart = 0;
+    hr = IPersistStream_GetSizeMax(src_stream, &maxsize);
+    ok(hr == S_OK, "GetSizeMax error %#lx\n", hr);
+    ok(maxsize.QuadPart == 8, "expected 8, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart));
+
     mem = GlobalLock(hmem);
     ok(!memcmp(mem, "lt\0\0", 4), "got wrong stream header %04lx\n", mem[0]);
     ok(mem[1] == 0, "expected stream size 0, got %lu\n", mem[1]);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/5303

[PATCH 2/2] oleaut32: Return success from GetSizeMax if not dirty.

[Daniel Lehman]

From: Daniel Lehman <dlehman25(a)gmail.com>

---
 dlls/oleaut32/olepicture.c       | 3 ++-
 dlls/oleaut32/tests/olepicture.c | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 78fd3fc5681..e4bfafe6fd0 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -1882,7 +1882,8 @@ static HRESULT WINAPI OLEPictureImpl_GetSizeMax(IPersistStream *iface, ULARGE_IN
                 FIXME("(%p), PICTYPE_BITMAP (format UNKNOWN, using BMP?) not implemented!\n",This);
                 break;
             }
-        }
+        } else hr = S_OK;
+
         break;
     case PICTYPE_METAFILE:
         FIXME("(%p), PICTYPE_METAFILE not implemented!\n",This);
diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c
index 66cc41646c5..07d9ba98f1b 100644
--- a/dlls/oleaut32/tests/olepicture.c
+++ b/dlls/oleaut32/tests/olepicture.c
@@ -1262,7 +1262,6 @@ static void test_load_save_bmp(void)
 
     maxsize.QuadPart = 0;
     hr = IPersistStream_GetSizeMax(src_stream, &maxsize);
-    todo_wine
     ok(hr == S_OK, "GetSizeMax error %#lx\n", hr);
     ok(maxsize.QuadPart == 74, "expected 74, got %s\n", wine_dbgstr_longlong(maxsize.QuadPart));
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/5303

[PATCH 2/2] oleaut32: Return success from GetSizeMax if not dirty.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=144048

Your paranoid android.


=== debian11b (64 bit WoW report) ===

d3dx10_34:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239D20.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C3C30.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B6E80.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B7050.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B7220.

d3dx10_35:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D1B30.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011D5530.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D18E0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5530.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011BD790.

d3dx10_36:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239E20.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5FE0.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001194020.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011941F0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 0000000001195910.

d3dx10_37:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 0000000001195960.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011C1820.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D74A0.

d3dx10_38:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239EB0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B5F60.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5F60.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D2B80.

d3dx10_39:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D5930.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BE790.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D3A50.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BE790.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5D90.

d3dx10_40:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011D7330.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011BC970.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011D5530.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D5700.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D5530.

d3dx10_41:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011C3B80.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011A4A80.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011D58B0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011D58B0.

d3dx10_42:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 00000000011BB660.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011C0A40.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011C3970.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011BB560.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011959B0.

d3dx10_43:
d3dx10.c:4380: Test succeeded inside todo block: Got unexpected effect 0000000001239DC0.
d3dx10.c:4470: Test succeeded inside todo block: Got unexpected effect 00000000011B4D80.
d3dx10.c:4480: Test succeeded inside todo block: Got unexpected effect 00000000011B5AE0.
d3dx10.c:4589: Test succeeded inside todo block: Got unexpected effect 00000000011B5CB0.
d3dx10.c:4599: Test succeeded inside todo block: Got unexpected effect 00000000011B5E80.