[PATCH 06/10] api-ms-win-core-winrt-l1-1-0: Move implementations into combase.
Martin Storsjo
martin at martin.st
Sun Dec 7 16:13:31 CST 2014
---
dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in | 4 --
.../api-ms-win-core-winrt-l1-1-0.spec | 4 +-
dlls/api-ms-win-core-winrt-l1-1-0/main.c | 46 ---------------------
dlls/combase/Makefile.in | 4 ++
dlls/combase/combase.spec | 4 +-
dlls/combase/roapi.c | 47 ++++++++++++++++++++++
tools/make_specfiles | 4 ++
7 files changed, 59 insertions(+), 54 deletions(-)
delete mode 100644 dlls/api-ms-win-core-winrt-l1-1-0/main.c
create mode 100644 dlls/combase/roapi.c
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
index 7ce8241..1660441 100644
--- a/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
+++ b/dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in
@@ -1,5 +1 @@
MODULE = api-ms-win-core-winrt-l1-1-0.dll
-IMPORTS = ole32
-
-C_SRCS = \
- main.c
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 344265a..0749ac0 100644
--- 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
@@ -1,9 +1,9 @@
@ stub RoActivateInstance
@ stub RoGetActivationFactory
@ stub RoGetApartmentIdentifier
-@ stdcall RoInitialize(long)
+@ stdcall RoInitialize(long) combase.RoInitialize
@ stub RoRegisterActivationFactories
@ stub RoRegisterForApartmentShutdown
@ stub RoRevokeActivationFactories
-@ stdcall RoUninitialize()
+@ stdcall RoUninitialize() combase.RoUninitialize
@ stub RoUnregisterForApartmentShutdown
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/api-ms-win-core-winrt-l1-1-0/main.c
deleted file mode 100644
index 674d21d..0000000
--- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2014 Martin Storsjo
- *
- * 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
- */
-#include "objbase.h"
-#include "roapi.h"
-
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(winrt);
-
-/***********************************************************************
- * RoInitialize (api-ms-win-core-winrt-l1-1-0.@)
- */
-HRESULT WINAPI RoInitialize(RO_INIT_TYPE type)
-{
- switch (type) {
- case RO_INIT_SINGLETHREADED:
- return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
- default:
- FIXME("type %d\n", type);
- case RO_INIT_MULTITHREADED:
- return CoInitializeEx(NULL, COINIT_MULTITHREADED);
- }
-}
-
-/***********************************************************************
- * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@)
- */
-void WINAPI RoUninitialize(void)
-{
- CoUninitialize();
-}
diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index 8b1099d..79d22a1 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -1 +1,5 @@
MODULE = combase.dll
+IMPORTS = ole32
+
+C_SRCS = \
+ roapi.c
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index e362186..8ef047e 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -306,7 +306,7 @@
@ stub RoGetMatchingRestrictedErrorInfo
@ stub RoGetParameterizedTypeInstanceIID
@ stub RoGetServerActivatableClasses
-@ stub RoInitialize
+@ stdcall RoInitialize(long)
@ stub RoInspectCapturedStackBackTrace
@ stub RoInspectThreadErrorInfo
@ stub RoOriginateError
@@ -323,7 +323,7 @@
@ stub RoSetErrorReportingFlags
@ stub RoTransformError
@ stub RoTransformErrorW
-@ stub RoUninitialize
+@ stdcall RoUninitialize()
@ stub RoUnregisterForApartmentShutdown
@ stub SetCleanupFlag
@ stub SetErrorInfo
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
new file mode 100644
index 0000000..aa7ef60
--- /dev/null
+++ b/dlls/combase/roapi.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014 Martin Storsjo
+ *
+ * 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
+ */
+
+#include "objbase.h"
+#include "roapi.h"
+
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(combase);
+
+/***********************************************************************
+ * RoInitialize (api-ms-win-core-winrt-l1-1-0.@)
+ */
+HRESULT WINAPI RoInitialize(RO_INIT_TYPE type)
+{
+ switch (type) {
+ case RO_INIT_SINGLETHREADED:
+ return CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+ default:
+ FIXME("type %d\n", type);
+ case RO_INIT_MULTITHREADED:
+ return CoInitializeEx(NULL, COINIT_MULTITHREADED);
+ }
+}
+
+/***********************************************************************
+ * RoUninitialize (api-ms-win-core-winrt-l1-1-0.@)
+ */
+void WINAPI RoUninitialize(void)
+{
+ CoUninitialize();
+}
diff --git a/tools/make_specfiles b/tools/make_specfiles
index b2d0f6b..38ba742 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -211,6 +211,10 @@ my @dll_groups =
"gdi32",
"ext-ms-win-gdi-devcaps-l1-1-0",
],
+ [
+ "combase",
+ "api-ms-win-core-winrt-l1-1-0",
+ ],
);
my $update_flags = 0;
--
1.8.1.2
More information about the wine-patches
mailing list