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 f9181daa1ddc2c10d3b6ddd4610bc1421cfd0f42

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-02-07 11:19:05 +11:00
parent 90679f2faf
commit b6035fb652
20 changed files with 104 additions and 1108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
patches/combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
View File

@@ -1,62 +0,0 @@
From dd6fc285ffa83e8eb9dce0aa482df44288faa2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 01:36:08 +0100
Subject: include: Add activation.idl with IActivationFactory interface.
---
include/Makefile.in | 1 +
include/activation.idl | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
create mode 100644 include/activation.idl
diff --git a/include/Makefile.in b/include/Makefile.in
index 129ff6d..14e934c 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -1,5 +1,6 @@
IDL_SRCS = \
access.idl \
+ activation.idl \
activaut.idl \
activdbg.idl \
activscp.idl \
diff --git a/include/activation.idl b/include/activation.idl
new file mode 100644
index 0000000..b86c9f6
--- /dev/null
+++ b/include/activation.idl
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2016 Michael Müller
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifndef DO_NO_IMPORTS
+import "inspectable.idl";
+#endif
+
+[
+ object,
+ uuid(00000035-0000-0000-c000-000000000046),
+ pointer_default(unique)
+]
+interface IActivationFactory : IInspectable
+{
+ HRESULT ActivateInstance([out] IInspectable **instance);
+}
--
2.6.4

6
patches/combase-RoApi/0002-include-roapi.h-Add-further-typedefs.patch
View File

@@ -1,7 +1,7 @@
From ab3de1775fa8321218d5712b7562b8575a222a31 Mon Sep 17 00:00:00 2001
From 4e75102aea7a341d58ca1326639b3d4b795e82d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 01:37:09 +0100
Subject: include/roapi.h: Add further typedefs.
Subject: [PATCH 1/7] include/roapi.h: Add further typedefs.
---
include/roapi.h | 7 +++++++
@@ -39,5 +39,5 @@ index 0421fe9..f4154f8 100644
extern "C" {
#endif
--
2.6.4
1.9.1

190
patches/combase-RoApi/0003-combase-Implement-RoGetActivationFactory.patch
View File

@@ -1,190 +0,0 @@
From a197dcbcf3f89fecd23028760bdc57502e0c7633 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 01:42:05 +0100
Subject: combase: Implement RoGetActivationFactory.
---
dlls/combase/Makefile.in | 2 +-
dlls/combase/roapi.c | 137 +++++++++++++++++++++++++++++++++++++++++++++--
2 files changed, 134 insertions(+), 5 deletions(-)
diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index c5ab8d2..cf17a36 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -1,5 +1,5 @@
MODULE = combase.dll
-IMPORTS = ole32
+IMPORTS = advapi32 ole32
C_SRCS = \
roapi.c \
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index a2dfd54..6fd4df5 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -1,5 +1,6 @@
/*
* Copyright 2014 Martin Storsjo
+ * Copyright 2016 Michael Müller
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -17,13 +18,93 @@
*/
#include "objbase.h"
+#include "initguid.h"
+#define COBJMACROS
#include "roapi.h"
-#include "hstring.h"
+#include "winstring.h"
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(combase);
+static const char *debugstr_hstring(HSTRING hstr)
+{
+ const WCHAR *str;
+ UINT32 len;
+ if (hstr && !((ULONG_PTR)hstr >> 16)) return "(invalid)";
+ str = WindowsGetStringRawBuffer(hstr, &len);
+ return wine_dbgstr_wn(str, len);
+}
+
+static HRESULT get_library_for_classid(const WCHAR *classid, WCHAR **out)
+{
+ static const WCHAR classkeyW[] = {'S','o','f','t','w','a','r','e','\\',
+ 'M','i','c','r','o','s','o','f','t','\\',
+ 'W','i','n','d','o','w','s','R','u','n','t','i','m','e','\\',
+ 'A','c','t','i','v','a','t','a','b','l','e','C','l','a','s','s','I','d',0};
+ static const WCHAR dllpathW[] = {'D','l','l','P','a','t','h',0};
+ HKEY hkey_root, hkey_class;
+ DWORD type, size;
+ HRESULT hr;
+ WCHAR *buf = NULL;
+
+ *out = NULL;
+
+ /* load class registry key */
+ if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, classkeyW, 0, KEY_READ, &hkey_root))
+ return REGDB_E_READREGDB;
+ if (RegOpenKeyExW(hkey_root, classid, 0, KEY_READ, &hkey_class))
+ {
+ WARN("Class %s not found in registry\n", debugstr_w(classid));
+ RegCloseKey(hkey_root);
+ return REGDB_E_CLASSNOTREG;
+ }
+ RegCloseKey(hkey_root);
+
+ /* load (and expand) DllPath registry value */
+ if (RegQueryValueExW(hkey_class, dllpathW, NULL, &type, NULL, &size))
+ {
+ hr = REGDB_E_READREGDB;
+ goto done;
+ }
+ if (type != REG_SZ && type != REG_EXPAND_SZ)
+ {
+ hr = REGDB_E_READREGDB;
+ goto done;
+ }
+ if (!(buf = HeapAlloc(GetProcessHeap(), 0, size)))
+ {
+ hr = E_OUTOFMEMORY;
+ goto done;
+ }
+ if (RegQueryValueExW(hkey_class, dllpathW, NULL, NULL, (BYTE *)buf, &size))
+ {
+ hr = REGDB_E_READREGDB;
+ goto done;
+ }
+ if (type == REG_EXPAND_SZ)
+ {
+ WCHAR *expanded;
+ DWORD len = ExpandEnvironmentStringsW(buf, NULL, 0);
+ if (!(expanded = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
+ {
+ hr = E_OUTOFMEMORY;
+ goto done;
+ }
+ ExpandEnvironmentStringsW(buf, expanded, len);
+ HeapFree(GetProcessHeap(), 0, buf);
+ buf = expanded;
+ }
+
+ *out = buf;
+ return S_OK;
+
+done:
+ HeapFree(GetProcessHeap(), 0, buf);
+ RegCloseKey(hkey_class);
+ return hr;
+}
+
/***********************************************************************
* RoInitialize (combase.@)
*/
@@ -50,8 +131,56 @@ void WINAPI RoUninitialize(void)
/***********************************************************************
* RoGetActivationFactory (combase.@)
*/
-HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **factory)
+HRESULT WINAPI RoGetActivationFactory(HSTRING classid, REFIID iid, void **class_factory)
{
- FIXME("stub: %p %p %p\n", classid, iid, factory);
- return E_NOTIMPL;
+ PFNGETACTIVATIONFACTORY pDllGetActivationFactory;
+ IActivationFactory *factory;
+ WCHAR *library;
+ HMODULE module;
+ HRESULT hr;
+
+ FIXME("(%s, %s, %p): semi-stub\n", debugstr_hstring(classid), debugstr_guid(iid), class_factory);
+
+ if (!iid || !class_factory)
+ return E_INVALIDARG;
+
+ hr = get_library_for_classid(WindowsGetStringRawBuffer(classid, NULL), &library);
+ if (FAILED(hr))
+ {
+ ERR("Failed to find library for %s\n", debugstr_hstring(classid));
+ return hr;
+ }
+
+ if (!(module = LoadLibraryW(library)))
+ {
+ ERR("Failed to load module %s\n", debugstr_w(library));
+ hr = HRESULT_FROM_WIN32(GetLastError());
+ goto done;
+ }
+
+ if (!(pDllGetActivationFactory = (void *)GetProcAddress(module, "DllGetActivationFactory")))
+ {
+ ERR("Module %s does not implement DllGetActivationFactory\n", debugstr_w(library));
+ hr = E_FAIL;
+ goto done;
+ }
+
+ TRACE("Found library %s for class %s\n", debugstr_w(library), debugstr_hstring(classid));
+
+ hr = pDllGetActivationFactory(classid, &factory);
+ if (SUCCEEDED(hr))
+ {
+ hr = IActivationFactory_QueryInterface(factory, iid, class_factory);
+ if (SUCCEEDED(hr))
+ {
+ TRACE("Created interface %p\n", *class_factory);
+ module = NULL;
+ }
+ IActivationFactory_Release(factory);
+ }
+
+done:
+ HeapFree(GetProcessHeap(), 0, library);
+ if (module) FreeLibrary(module);
+ return hr;
}
--
2.6.4

42
patches/combase-RoApi/0004-combase-Implement-RoActivateInstance.patch
View File

@@ -1,13 +1,13 @@
From c78968d3484d613945a0ee33eeb4df5d96a7c406 Mon Sep 17 00:00:00 2001
From 8274b8bb8f25d89c2f01b1724aed7e9e2eb5614b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 01:45:30 +0100
Subject: combase: Implement RoActivateInstance.
Subject: [PATCH 2/7] combase: Implement RoActivateInstance.
---
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
dlls/combase/combase.spec | 2 +-
dlls/combase/roapi.c | 20 ++++++++++++++++++++
3 files changed, 22 insertions(+), 2 deletions(-)
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
dlls/combase/combase.spec | 2 +-
dlls/combase/roapi.c | 24 +++++++++++++++++++++-
3 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec
index 74c9d27..978c3dc 100644
@@ -20,7 +20,7 @@ index 74c9d27..978c3dc 100644
@ stub RoGetApartmentIdentifier
@ stdcall RoInitialize(long) combase.RoInitialize
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 5082f39..9b1ab30 100644
index c238eb8..f42bdae 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -242,7 +242,7 @@
@@ -33,12 +33,28 @@ index 5082f39..9b1ab30 100644
@ stub RoClearError
@ stub RoFailFastWithErrorContext
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 6fd4df5..695b6fd 100644
index a2d62520..a272d2c 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -184,3 +184,23 @@ done:
if (module) FreeLibrary(module);
return hr;
@@ -15,12 +15,14 @@
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-
+#define COBJMACROS
#include "objbase.h"
+#include "initguid.h"
#include "roapi.h"
#include "roparameterizediid.h"
#include "hstring.h"
+
#include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(combase);
@@ -69,3 +71,23 @@ HRESULT WINAPI RoGetParameterizedTypeInstanceIID(UINT32 name_element_count, cons
if (hiid) *hiid = INVALID_HANDLE_VALUE;
return E_NOTIMPL;
}
+
+/***********************************************************************
@@ -49,7 +65,7 @@ index 6fd4df5..695b6fd 100644
+ IActivationFactory *factory;
+ HRESULT hr;
+
+ FIXME("(%s, %p): semi-stub\n", debugstr_hstring(classid), instance);
+ FIXME("(%p, %p): semi-stub\n", classid, instance);
+
+ hr = RoGetActivationFactory(classid, &IID_IActivationFactory, (void **)&factory);
+ if (SUCCEEDED(hr))
@@ -61,5 +77,5 @@ index 6fd4df5..695b6fd 100644
+ return hr;
+}
--
2.6.4
1.9.1

14
patches/combase-RoApi/0005-combase-Add-stub-for-RoGetApartmentIdentifier.patch
View File

@@ -1,7 +1,7 @@
From 493d757c594d0eccce55e29fc6e5ef574fc7446f Mon Sep 17 00:00:00 2001
From 15be870f14039bb8c2d276640b4b40c558ddcc32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 01:47:08 +0100
Subject: combase: Add stub for RoGetApartmentIdentifier.
Subject: [PATCH 3/7] combase: Add stub for RoGetApartmentIdentifier.
---
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
@@ -22,7 +22,7 @@ index 978c3dc..88139fb 100644
@ stub RoRegisterActivationFactories
@ stub RoRegisterForApartmentShutdown
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 9b1ab30..3bf0bf2 100644
index f42bdae..ff89232 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -250,7 +250,7 @@
@@ -33,12 +33,12 @@ index 9b1ab30..3bf0bf2 100644
+@ stdcall RoGetApartmentIdentifier(ptr)
@ stub RoGetErrorReportingFlags
@ stub RoGetMatchingRestrictedErrorInfo
@ stub RoGetParameterizedTypeInstanceIID
@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr)
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 695b6fd..cd545f1 100644
index a272d2c..1c0b373 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -204,3 +204,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance)
@@ -91,3 +91,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance)
return hr;
}
@@ -57,5 +57,5 @@ index 695b6fd..cd545f1 100644
+ return S_OK;
+}
--
2.6.4
1.9.1

34
patches/combase-RoApi/0006-include-objidl.idl-Add-IApartmentShutdown-interface.patch
View File

@@ -1,34 +0,0 @@
From 2ad226c2f25a9bd0130f5ae8393e719b37a36afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 02:00:04 +0100
Subject: include/objidl.idl: Add IApartmentShutdown interface.
---
include/objidl.idl | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/include/objidl.idl b/include/objidl.idl
index c18442f..4388bab 100644
--- a/include/objidl.idl
+++ b/include/objidl.idl
@@ -2451,6 +2451,17 @@ interface IDummyHICONIncluder : IUnknown
HRESULT Dummy([in] HICON hIcon, [in] HDC hdc);
}
+[
+ object,
+ local,
+ pointer_default(unique),
+ uuid(a2f05a09-27a2-42b5-bc0e-ac163ef49d9b)
+]
+interface IApartmentShutdown : IUnknown
+{
+ void OnUninitialize([in] UINT64 identifier);
+}
+
cpp_quote("#ifdef USE_COM_CONTEXT_DEF")
typedef DWORD CPFLAGS;
--
2.6.4

12
patches/combase-RoApi/0007-combase-Add-stub-for-RoRegisterForApartmentShutdown.patch
View File

@@ -1,7 +1,7 @@
From c57255b7bcbe0b456e4934de9fb0efa123e369ef Mon Sep 17 00:00:00 2001
From fe7c55c675e474efd68fcf04ce18ae4c5891d38c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 02:01:59 +0100
Subject: combase: Add stub for RoRegisterForApartmentShutdown.
Subject: [PATCH 4/7] combase: Add stub for RoRegisterForApartmentShutdown.
---
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
@@ -23,7 +23,7 @@ index 88139fb..d27130c 100644
@ stdcall RoUninitialize() combase.RoUninitialize
@ stub RoUnregisterForApartmentShutdown
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 3bf0bf2..7ae1f6e 100644
index ff89232..ec4a6cd 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -263,7 +263,7 @@
@@ -36,10 +36,10 @@ index 3bf0bf2..7ae1f6e 100644
@ stub RoReportFailedDelegate
@ stub RoReportUnhandledError
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index cd545f1..035fa47 100644
index 1c0b373..d56ceb1 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -218,3 +218,21 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier)
@@ -105,3 +105,21 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier)
*identifier = 0xdeadbeef;
return S_OK;
}
@@ -62,5 +62,5 @@ index cd545f1..035fa47 100644
+ return S_OK;
+}
--
2.6.4
1.9.1

16
patches/combase-RoApi/0008-combase-Add-stub-for-RoGetServerActivatableClasses.patch
View File

@@ -1,7 +1,7 @@
From fa4ada9e3f3797b704cd8c033fff8f1a8bb25bac Mon Sep 17 00:00:00 2001
From e3c49d6a259d63f43103174d78e1f90316fa27a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 02:03:47 +0100
Subject: combase: Add stub for RoGetServerActivatableClasses.
Subject: [PATCH 5/7] combase: Add stub for RoGetServerActivatableClasses.
---
.../api-ms-win-core-winrt-registration-l1-1-0.spec | 2 +-
@@ -18,23 +18,23 @@ index 350ac04..20c8d9c 100644
-@ stub RoGetServerActivatableClasses
+@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 0405a0e..fca0b2c 100644
index ec4a6cd..c721f43 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -254,7 +254,7 @@
@ stub RoGetErrorReportingFlags
@ stub RoGetMatchingRestrictedErrorInfo
@ stub RoGetParameterizedTypeInstanceIID
@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr)
-@ stub RoGetServerActivatableClasses
+@ stdcall RoGetServerActivatableClasses(ptr ptr ptr)
@ stdcall RoInitialize(long)
@ stub RoInspectCapturedStackBackTrace
@ stub RoInspectThreadErrorInfo
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 035fa47..832ec67 100644
index d56ceb1..2a228ce 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -236,3 +236,14 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback,
@@ -123,3 +123,14 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback,
*cookie = (void *)0xcafecafe;
return S_OK;
}
@@ -44,11 +44,11 @@ index 035fa47..832ec67 100644
+ */
+HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count)
+{
+ FIXME("(%s, %p, %p): stub\n", debugstr_hstring(name), classes, count);
+ FIXME("(%p, %p, %p): stub\n", name, classes, count);
+
+ *count = 0;
+ return S_OK;
+}
--
2.7.1
1.9.1

25
patches/combase-RoApi/0009-combase-Add-stub-for-RoRegisterActivationFactories.patch
View File

@@ -1,13 +1,13 @@
From b13790d7bcd47d1bf1985258cc3ea6c4edb96d1f Mon Sep 17 00:00:00 2001
From 30ad6da4756f20339d4f52b959a128fb231dbf14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 02:20:39 +0100
Subject: combase: Add stub for RoRegisterActivationFactories.
Subject: [PATCH 6/7] combase: Add stub for RoRegisterActivationFactories.
---
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
dlls/combase/combase.spec | 2 +-
dlls/combase/roapi.c | 16 ++++++++++++++++
3 files changed, 18 insertions(+), 2 deletions(-)
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
dlls/combase/combase.spec | 2 +-
dlls/combase/roapi.c | 11 +++++++++++
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec b/dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec
index d27130c..32b9474 100644
@@ -23,7 +23,7 @@ index d27130c..32b9474 100644
@ stub RoRevokeActivationFactories
@ stdcall RoUninitialize() combase.RoUninitialize
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 3a17e4a..7a0decd 100644
index c721f43..72a7eb5 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -262,7 +262,7 @@
@@ -36,10 +36,10 @@ index 3a17e4a..7a0decd 100644
@ stub RoReportCapabilityCheckFailure
@ stub RoReportFailedDelegate
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 832ec67..e8629cd 100644
index 2a228ce..ae063a2 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -247,3 +247,19 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW
@@ -134,3 +134,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW
*count = 0;
return S_OK;
}
@@ -50,15 +50,10 @@ index 832ec67..e8629cd 100644
+HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks,
+ UINT32 count, RO_REGISTRATION_COOKIE *cookie)
+{
+ UINT32 i;
+
+ FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie);
+
+ for (i = 0; i < count; i++)
+ FIXME(" %s\n", debugstr_hstring(classes[i]));
+
+ return S_OK;
+}
--
2.6.4
1.9.1

12
patches/combase-RoApi/0010-combase-Add-stub-for-CleanupTlsOleState.patch
View File

@@ -1,7 +1,7 @@
From 718d3be80d5d8d89f3a120ee6c0a5977390cc26d Mon Sep 17 00:00:00 2001
From a336f80cc6d83ae000d676ce641d1f3844229db1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 02:21:48 +0100
Subject: combase: Add stub for CleanupTlsOleState.
Subject: [PATCH 7/7] combase: Add stub for CleanupTlsOleState.
---
dlls/combase/combase.spec | 2 +-
@@ -9,7 +9,7 @@ Subject: combase: Add stub for CleanupTlsOleState.
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 7a0decd..d03287b 100644
index 72a7eb5..c8a8dee 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -66,7 +66,7 @@
@@ -22,10 +22,10 @@ index 7a0decd..d03287b 100644
@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess
@ stub CoAllowUnmarshalerCLSID
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index e8629cd..e838412 100644
index ae063a2..3a81fb4 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -263,3 +263,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
@@ -145,3 +145,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
return S_OK;
}
@@ -38,5 +38,5 @@ index e8629cd..e838412 100644
+ FIXME("(%p): stub\n", unknown);
+}
--
2.6.4
1.9.1