[PATCH 0/1] MR7446: oleaut32: Implement OleLoadPictureFileEx()

[Edward OC (＠funfunctor)]

As per documentation.

Signed-off-by: Edward O'Callaghan <edward(a)antitrust.cc>

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

[PATCH 1/1] oleaut32: Implement OleLoadPictureFileEx()

[Edward O'Callaghan]

From: Edward O'Callaghan <edward(a)antitrust.cc>

Signed-off-by: Edward O'Callaghan <edward(a)antitrust.cc>
---
 dlls/oleaut32/oleaut32.spec |  2 +-
 dlls/oleaut32/olepicture.c  | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec
index 21b52f1f06e..8dc3142dfd0 100644
--- a/dlls/oleaut32/oleaut32.spec
+++ b/dlls/oleaut32/oleaut32.spec
@@ -378,7 +378,7 @@
 398 stub UserMSG_free_inst
 399 stub UserMSG_free_local
 401 stdcall OleLoadPictureEx(ptr long long ptr long long long ptr)
-402 stub OleLoadPictureFileEx
+402 stdcall OleLoadPictureFileEx(int128 long long long ptr) OleLoadPictureFileEx
 411 stdcall SafeArrayCreateVector(long long long)
 412 stdcall SafeArrayCopyData(ptr ptr)
 413 stdcall VectorFromBstr(ptr ptr)
diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index d7059382a3d..824435b5cee 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -2523,6 +2523,38 @@ static HRESULT create_stream(const WCHAR *filename, IStream **stream)
     return hr;
 }
 
+/***********************************************************************
+ * OleLoadPictureFileEx (OLEAUT32.402)
+ */
+HRESULT WINAPI OleLoadPictureFileEx(
+        VARIANT    varFileName,
+        DWORD      xSizeDesired,
+        DWORD      ySizeDesired,
+        DWORD      dwFlags,
+        LPDISPATCH *lplpdispPicture /* out */)
+{
+    IStream *stream;
+    HRESULT hr;
+
+    TRACE("(%s,%p)\n", wine_dbgstr_variant(&varFileName), lplpdispPicture);
+
+    if (V_VT(&varFileName) != VT_BSTR)
+        return CTL_E_FILENOTFOUND;
+
+    hr = create_stream(V_BSTR(&varFileName), &stream);
+    if (hr != S_OK) {
+        if (hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND))
+            return CTL_E_FILENOTFOUND;
+
+        return CTL_E_PATHFILEACCESSERROR;
+    }
+
+    hr = OleLoadPictureEx(stream, 0, FALSE,
+            &IID_IDispatch, xSizeDesired, ySizeDesired, dwFlags, (void **)lplpdispPicture);
+    IStream_Release(stream);
+    return hr;
+}
+
 /***********************************************************************
  * OleLoadPictureFile (OLEAUT32.422)
  */
-- 
GitLab

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

[Nikolay Sivov (＠nsivov)]

This needs at least some basic tests, and a minor cleanup. Do you have an application that's using this?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/7446#note_115251