From 8281fca8dcc543048d68165d6a5b502bd3ecfabc Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 24 Jun 2016 12:00:24 +0200 Subject: [PATCH] Added patch to implement ole32.OleGetIconOfFile stub. --- ...-ole32-Add-stub-for-OleGetIconOfFile.patch | 44 +++++++++++++++++++ patches/ole32-OleGetIconOfFile/definition | 1 + patches/patchinstall.sh | 16 +++++++ 3 files changed, 61 insertions(+) create mode 100644 patches/ole32-OleGetIconOfFile/0001-ole32-Add-stub-for-OleGetIconOfFile.patch create mode 100644 patches/ole32-OleGetIconOfFile/definition diff --git a/patches/ole32-OleGetIconOfFile/0001-ole32-Add-stub-for-OleGetIconOfFile.patch b/patches/ole32-OleGetIconOfFile/0001-ole32-Add-stub-for-OleGetIconOfFile.patch new file mode 100644 index 00000000..10b83fdb --- /dev/null +++ b/patches/ole32-OleGetIconOfFile/0001-ole32-Add-stub-for-OleGetIconOfFile.patch @@ -0,0 +1,44 @@ +From ab4519d42ee66a6e0c67ecc1d05e1b77ed35fd7f Mon Sep 17 00:00:00 2001 +From: Zhenbo Li +Date: Tue, 21 Jun 2016 13:23:19 +0800 +Subject: ole32: Add stub for OleGetIconOfFile. + +Signed-off-by: Zhenbo Li +--- + dlls/ole32/ole2stubs.c | 9 +++++++++ + dlls/ole32/ole32.spec | 2 +- + 2 files changed, 10 insertions(+), 1 deletion(-) + +diff --git a/dlls/ole32/ole2stubs.c b/dlls/ole32/ole2stubs.c +index 90862d0..8289473 100644 +--- a/dlls/ole32/ole2stubs.c ++++ b/dlls/ole32/ole2stubs.c +@@ -83,3 +83,12 @@ HRESULT WINAPI CoGetCallerTID(LPDWORD lpdwTID) + FIXME("stub!\n"); + return E_NOTIMPL; + } ++ ++/*********************************************************************** ++ * OleGetIconOfFile [OLE32.@] ++ */ ++HGLOBAL WINAPI OleGetIconOfFile(LPOLESTR path, BOOL use_file_as_label) ++{ ++ FIXME("(%p, %d), stub!\n", path, use_file_as_label); ++ return NULL; ++} +diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec +index eab8664..b5bf219 100644 +--- a/dlls/ole32/ole32.spec ++++ b/dlls/ole32/ole32.spec +@@ -207,7 +207,7 @@ + @ stdcall OleGetAutoConvert(ptr ptr) + @ stdcall OleGetClipboard(ptr) + @ stdcall OleGetIconOfClass(ptr ptr long) +-@ stub OleGetIconOfFile ++@ stdcall OleGetIconOfFile(ptr long) + @ stdcall OleInitialize(ptr) + @ stdcall OleInitializeWOW(long long) + @ stdcall OleIsCurrentClipboard(ptr) +-- +2.8.0 + diff --git a/patches/ole32-OleGetIconOfFile/definition b/patches/ole32-OleGetIconOfFile/definition new file mode 100644 index 00000000..7bd06653 --- /dev/null +++ b/patches/ole32-OleGetIconOfFile/definition @@ -0,0 +1 @@ +Fixes: Add stub for ole32.OleGetIconOfFile diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 296c8bf3..881cc33d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -253,6 +253,7 @@ patch_enable_all () enable_nvcuvid_CUDA_Video_Support="$1" enable_nvencodeapi_Video_Encoder="$1" enable_ole32_HGLOBALStream="$1" + enable_ole32_OleGetIconOfFile="$1" enable_oleaut32_CreateTypeLib="$1" enable_oleaut32_Load_Save_EMF="$1" enable_oleaut32_OLEPictureImpl_SaveAsFile="$1" @@ -937,6 +938,9 @@ patch_enable () ole32-HGLOBALStream) enable_ole32_HGLOBALStream="$2" ;; + ole32-OleGetIconOfFile) + enable_ole32_OleGetIconOfFile="$2" + ;; oleaut32-CreateTypeLib) enable_oleaut32_CreateTypeLib="$2" ;; @@ -5575,6 +5579,18 @@ if test "$enable_ole32_HGLOBALStream" -eq 1; then ) >> "$patchlist" fi +# Patchset ole32-OleGetIconOfFile +# | +# | Modified files: +# | * dlls/ole32/ole2stubs.c, dlls/ole32/ole32.spec +# | +if test "$enable_ole32_OleGetIconOfFile" -eq 1; then + patch_apply ole32-OleGetIconOfFile/0001-ole32-Add-stub-for-OleGetIconOfFile.patch + ( + echo '+ { "Zhenbo Li", "ole32: Add stub for OleGetIconOfFile.", 1 },'; + ) >> "$patchlist" +fi + # Patchset oleaut32-CreateTypeLib # | # | This patchset fixes the following Wine bugs: