Martin Storsjo : api-ms-win-core-winrt-l1-1-0: Move implementations into combase.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 13a101707a1793d777f5a30063ff9d19178cfbca
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=13a101707a1793d777f5a30063ff9d19178cfbca

Author: Martin Storsjo <martin at martin.st>
Date:   Tue Dec  9 10:36:46 2014 +0200

api-ms-win-core-winrt-l1-1-0: Move implementations into combase.

---

 dlls/api-ms-win-core-winrt-l1-1-0/Makefile.in                      | 4 ----
 .../api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec | 4 ++--
 dlls/combase/Makefile.in                                           | 4 ++++
 dlls/combase/combase.spec                                          | 4 ++--
 dlls/{api-ms-win-core-winrt-l1-1-0/main.c => combase/roapi.c}      | 7 ++++---
 tools/make_specfiles                                               | 4 ++++
 6 files changed, 16 insertions(+), 11 deletions(-)

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/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 daa0bbb..652eff6 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -255,7 +255,7 @@
 @ stub RoGetMatchingRestrictedErrorInfo
 @ stub RoGetParameterizedTypeInstanceIID
 @ stub RoGetServerActivatableClasses
-@ stub RoInitialize
+@ stdcall RoInitialize(long)
 @ stub RoInspectCapturedStackBackTrace
 @ stub RoInspectThreadErrorInfo
 @ stub RoOriginateError
@@ -272,7 +272,7 @@
 @ stub RoSetErrorReportingFlags
 @ stub RoTransformError
 @ stub RoTransformErrorW
-@ stub RoUninitialize
+@ stdcall RoUninitialize()
 @ stub RoUnregisterForApartmentShutdown
 @ stub SetCleanupFlag
 @ stdcall SetErrorInfo(long ptr) ole32.SetErrorInfo
diff --git a/dlls/api-ms-win-core-winrt-l1-1-0/main.c b/dlls/combase/roapi.c
similarity index 90%
rename from dlls/api-ms-win-core-winrt-l1-1-0/main.c
rename to dlls/combase/roapi.c
index 674d21d..a2c17db 100644
--- a/dlls/api-ms-win-core-winrt-l1-1-0/main.c
+++ b/dlls/combase/roapi.c
@@ -15,15 +15,16 @@
  * 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);
+WINE_DEFAULT_DEBUG_CHANNEL(combase);
 
 /***********************************************************************
- *      RoInitialize (api-ms-win-core-winrt-l1-1-0.@)
+ *      RoInitialize (combase.@)
  */
 HRESULT WINAPI RoInitialize(RO_INIT_TYPE type)
 {
@@ -38,7 +39,7 @@ HRESULT WINAPI RoInitialize(RO_INIT_TYPE type)
 }
 
 /***********************************************************************
- *      RoUninitialize (api-ms-win-core-winrt-l1-1-0.@)
+ *      RoUninitialize (combase.@)
  */
 void WINAPI RoUninitialize(void)
 {
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 0bbd826..6e2f3d7 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -204,6 +204,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;