mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch to forward CreateTypeLib to CreateTypeLib2.
This commit is contained in:
parent
f6a285ccfc
commit
7a8203d691
@ -0,0 +1,43 @@
|
||||
From c82a7265f3a5fa9114c7881fba3047aae960340a Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Wed, 2 Sep 2015 13:09:34 +1000
|
||||
Subject: oleaut32: Implement semi-stub for CreateTypeLib.
|
||||
|
||||
---
|
||||
dlls/oleaut32/typelib.c | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
|
||||
index 2a24b79..4066d03 100644
|
||||
--- a/dlls/oleaut32/typelib.c
|
||||
+++ b/dlls/oleaut32/typelib.c
|
||||
@@ -424,11 +424,21 @@ HRESULT WINAPI QueryPathOfRegTypeLib( REFGUID guid, WORD wMaj, WORD wMin, LCID l
|
||||
* Success: S_OK
|
||||
* Failure: Status
|
||||
*/
|
||||
-HRESULT WINAPI CreateTypeLib(
|
||||
- SYSKIND syskind, LPCOLESTR szFile, ICreateTypeLib** ppctlib
|
||||
-) {
|
||||
- FIXME("(%d,%s,%p), stub!\n",syskind,debugstr_w(szFile),ppctlib);
|
||||
- return E_FAIL;
|
||||
+HRESULT WINAPI CreateTypeLib(SYSKIND syskind, LPCOLESTR file, ICreateTypeLib **ctlib)
|
||||
+{
|
||||
+ ICreateTypeLib2 *typelib2;
|
||||
+ HRESULT hres;
|
||||
+
|
||||
+ FIXME("(%d, %s, %p): forwarding to CreateTypeLib2\n", syskind, debugstr_w(file), ctlib);
|
||||
+
|
||||
+ hres = CreateTypeLib2(syskind, file, &typelib2);
|
||||
+ if(SUCCEEDED(hres))
|
||||
+ {
|
||||
+ hres = ICreateTypeLib2_QueryInterface(typelib2, &IID_ICreateTypeLib, (void **)&ctlib);
|
||||
+ ICreateTypeLib2_Release(typelib2);
|
||||
+ }
|
||||
+
|
||||
+ return hres;
|
||||
}
|
||||
|
||||
/******************************************************************************
|
||||
--
|
||||
2.7.0
|
||||
|
1
patches/oleaut32-CreateTypeLib/definition
Normal file
1
patches/oleaut32-CreateTypeLib/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: [!8780] Forward CreateTypeLib to CreateTypeLib2
|
@ -240,6 +240,7 @@ patch_enable_all ()
|
||||
enable_nvcuvid_CUDA_Video_Support="$1"
|
||||
enable_nvencodeapi_Video_Encoder="$1"
|
||||
enable_ole32_CoGetApartmentType="$1"
|
||||
enable_oleaut32_CreateTypeLib="$1"
|
||||
enable_oleaut32_TKIND_COCLASS="$1"
|
||||
enable_oleaut32_x86_64_Marshaller="$1"
|
||||
enable_openal32_EFX_Extension="$1"
|
||||
@ -861,6 +862,9 @@ patch_enable ()
|
||||
ole32-CoGetApartmentType)
|
||||
enable_ole32_CoGetApartmentType="$2"
|
||||
;;
|
||||
oleaut32-CreateTypeLib)
|
||||
enable_oleaut32_CreateTypeLib="$2"
|
||||
;;
|
||||
oleaut32-TKIND_COCLASS)
|
||||
enable_oleaut32_TKIND_COCLASS="$2"
|
||||
;;
|
||||
@ -5206,6 +5210,21 @@ if test "$enable_nvencodeapi_Video_Encoder" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset oleaut32-CreateTypeLib
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#8780] Forward CreateTypeLib to CreateTypeLib2
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/oleaut32/typelib.c
|
||||
# |
|
||||
if test "$enable_oleaut32_CreateTypeLib" -eq 1; then
|
||||
patch_apply oleaut32-CreateTypeLib/0001-oleaut32-Implement-semi-stub-for-CreateTypeLib.patch
|
||||
(
|
||||
echo '+ { "Alistair Leslie-Hughes", "oleaut32: Implement semi-stub for CreateTypeLib.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset oleaut32-TKIND_COCLASS
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
Reference in New Issue
Block a user