mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
combase-RoApi: Add changes for api-ms-win-core-winrt-l1-1-0.spec.
This commit is contained in:
Sebastian Lackner
parent
db05f9a14d
commit
3095f1635e
@ -1,13 +1,24 @@
|
||||
From 822a4ee7b6ac2923a96393b934e1c51e3204d45c Mon Sep 17 00:00:00 2001
|
||||
From c78968d3484d613945a0ee33eeb4df5d96a7c406 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.
|
||||
|
||||
---
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 20 ++++++++++++++++++++
|
||||
2 files changed, 21 insertions(+), 1 deletion(-)
|
||||
.../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(-)
|
||||
|
||||
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
|
||||
--- 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,4 +1,4 @@
|
||||
-@ stub RoActivateInstance
|
||||
+@ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance
|
||||
@ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory
|
||||
@ stub RoGetApartmentIdentifier
|
||||
@ stdcall RoInitialize(long) combase.RoInitialize
|
||||
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
|
||||
index 5082f39..9b1ab30 100644
|
||||
--- a/dlls/combase/combase.spec
|
||||
|
||||
@ -1,13 +1,26 @@
|
||||
From 5b266003834315ef007372bccfa77f563e1e70bc Mon Sep 17 00:00:00 2001
|
||||
From 493d757c594d0eccce55e29fc6e5ef574fc7446f 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.
|
||||
|
||||
---
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 14 ++++++++++++++
|
||||
2 files changed, 15 insertions(+), 1 deletion(-)
|
||||
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 14 ++++++++++++++
|
||||
3 files changed, 16 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 978c3dc..88139fb 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,6 +1,6 @@
|
||||
@ stdcall RoActivateInstance(ptr ptr) combase.RoActivateInstance
|
||||
@ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory
|
||||
-@ stub RoGetApartmentIdentifier
|
||||
+@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier
|
||||
@ stdcall RoInitialize(long) combase.RoInitialize
|
||||
@ stub RoRegisterActivationFactories
|
||||
@ stub RoRegisterForApartmentShutdown
|
||||
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
|
||||
index 9b1ab30..3bf0bf2 100644
|
||||
--- a/dlls/combase/combase.spec
|
||||
|
||||
@ -1,13 +1,27 @@
|
||||
From 01ba1b422251cc4a326063f8500afd1cbdce2aa6 Mon Sep 17 00:00:00 2001
|
||||
From c57255b7bcbe0b456e4934de9fb0efa123e369ef 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.
|
||||
|
||||
---
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 18 ++++++++++++++++++
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
.../api-ms-win-core-winrt-l1-1-0.spec | 2 +-
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 18 ++++++++++++++++++
|
||||
3 files changed, 20 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 88139fb..d27130c 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
|
||||
@@ -3,7 +3,7 @@
|
||||
@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier
|
||||
@ stdcall RoInitialize(long) combase.RoInitialize
|
||||
@ stub RoRegisterActivationFactories
|
||||
-@ stub RoRegisterForApartmentShutdown
|
||||
+@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown
|
||||
@ stub RoRevokeActivationFactories
|
||||
@ stdcall RoUninitialize() combase.RoUninitialize
|
||||
@ stub RoUnregisterForApartmentShutdown
|
||||
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
|
||||
index 3bf0bf2..7ae1f6e 100644
|
||||
--- a/dlls/combase/combase.spec
|
||||
|
||||
@ -1,13 +1,27 @@
|
||||
From 0d666ea4fd520d641ad108be069710c14d124f14 Mon Sep 17 00:00:00 2001
|
||||
From b13790d7bcd47d1bf1985258cc3ea6c4edb96d1f 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.
|
||||
|
||||
---
|
||||
dlls/combase/combase.spec | 2 +-
|
||||
dlls/combase/roapi.c | 16 ++++++++++++++++
|
||||
2 files changed, 17 insertions(+), 1 deletion(-)
|
||||
.../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(-)
|
||||
|
||||
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
|
||||
--- 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
|
||||
@@ -2,7 +2,7 @@
|
||||
@ stdcall RoGetActivationFactory(ptr ptr ptr) combase.RoGetActivationFactory
|
||||
@ stdcall RoGetApartmentIdentifier(ptr) combase.RoGetApartmentIdentifier
|
||||
@ stdcall RoInitialize(long) combase.RoInitialize
|
||||
-@ stub RoRegisterActivationFactories
|
||||
+@ stdcall RoRegisterActivationFactories(ptr ptr long ptr) combase.RoRegisterActivationFactories
|
||||
@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr) combase.RoRegisterForApartmentShutdown
|
||||
@ stub RoRevokeActivationFactories
|
||||
@ stdcall RoUninitialize() combase.RoUninitialize
|
||||
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
|
||||
index 3a17e4a..7a0decd 100644
|
||||
--- a/dlls/combase/combase.spec
|
||||
|
||||
@ -2612,8 +2612,9 @@ fi
|
||||
# Patchset combase-RoApi
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/combase/Makefile.in, dlls/combase/combase.spec, dlls/combase/roapi.c, include/Makefile.in, include/activation.idl,
|
||||
# | include/objidl.idl, include/roapi.h
|
||||
# | * dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec, dlls/combase/Makefile.in,
|
||||
# | dlls/combase/combase.spec, dlls/combase/roapi.c, include/Makefile.in, include/activation.idl, include/objidl.idl,
|
||||
# | include/roapi.h
|
||||
# |
|
||||
if test "$enable_combase_RoApi" -eq 1; then
|
||||
patch_apply combase-RoApi/0001-include-Add-activation.idl-with-IActivationFactory-i.patch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user