Rebase against 540c48b91175b11c7b8646d0a036b20c46425080

This commit is contained in:
Alistair Leslie-Hughes 2018-05-05 09:01:04 +10:00
parent 3c3993fdfa
commit eaebccd0b8
8 changed files with 3 additions and 327 deletions

View File

@ -19,4 +19,3 @@ Fixes: Add ext-ms-win-kernel32-package-current-l1-1-0 dll
Fixes: Add iertutil dll
Fixes: Add shcore dll
Fixes: [40451] Add feclient dll
Depends: combase-RoApi

View File

@ -1,61 +0,0 @@
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: [PATCH 3/7] combase: Add stub for RoGetApartmentIdentifier.
---
.../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 f42bdae..ff89232 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -250,7 +250,7 @@
@ stub RoGetActivatableClassRegistration
@ stdcall RoGetActivationFactory(ptr ptr ptr)
@ stub RoGetAgileReference
-@ stub RoGetApartmentIdentifier
+@ stdcall RoGetApartmentIdentifier(ptr)
@ stub RoGetErrorReportingFlags
@ stub RoGetMatchingRestrictedErrorInfo
@ stdcall RoGetParameterizedTypeInstanceIID(long ptr ptr ptr ptr)
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index a272d2c..1c0b373 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -91,3 +91,17 @@ HRESULT WINAPI RoActivateInstance(HSTRING classid, IInspectable **instance)
return hr;
}
+
+/***********************************************************************
+ * RoGetApartmentIdentifier (combase.@)
+ */
+HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier)
+{
+ FIXME("(%p): stub\n", identifier);
+
+ if (!identifier)
+ return E_INVALIDARG;
+
+ *identifier = 0xdeadbeef;
+ return S_OK;
+}
--
1.9.1

View File

@ -1,66 +0,0 @@
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: [PATCH 4/7] combase: Add stub for RoRegisterForApartmentShutdown.
---
.../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 ff89232..ec4a6cd 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -263,7 +263,7 @@
@ stub RoOriginateLanguageException
@ stub RoParameterizedTypeExtraGetTypeSignature
@ stub RoRegisterActivationFactories
-@ stub RoRegisterForApartmentShutdown
+@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
@ stub RoReportCapabilityCheckFailure
@ stub RoReportFailedDelegate
@ stub RoReportUnhandledError
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 1c0b373..d56ceb1 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -105,3 +105,21 @@ HRESULT WINAPI RoGetApartmentIdentifier(UINT64 *identifier)
*identifier = 0xdeadbeef;
return S_OK;
}
+
+/***********************************************************************
+ * RoRegisterForApartmentShutdown (combase.@)
+ */
+HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback,
+ UINT64 *identifier, APARTMENT_SHUTDOWN_REGISTRATION_COOKIE *cookie)
+{
+ HRESULT hr;
+
+ FIXME("(%p, %p, %p): stub\n", callback, identifier, cookie);
+
+ hr = RoGetApartmentIdentifier(identifier);
+ if (FAILED(hr))
+ return hr;
+
+ *cookie = (void *)0xcafecafe;
+ return S_OK;
+}
--
1.9.1

View File

@ -1,54 +0,0 @@
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: [PATCH 5/7] combase: Add stub for RoGetServerActivatableClasses.
---
.../api-ms-win-core-winrt-registration-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-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
index 350ac04..20c8d9c 100644
--- a/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
+++ b/dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-core-winrt-registration-l1-1-0.spec
@@ -1,2 +1,2 @@
@ stub RoGetActivatableClassRegistration
-@ stub RoGetServerActivatableClasses
+@ stdcall RoGetServerActivatableClasses(ptr ptr ptr) combase.RoGetServerActivatableClasses
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index ec4a6cd..c721f43 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -254,7 +254,7 @@
@ stub RoGetErrorReportingFlags
@ stub RoGetMatchingRestrictedErrorInfo
@ 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 d56ceb1..2a228ce 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -123,3 +123,14 @@ HRESULT WINAPI RoRegisterForApartmentShutdown(IApartmentShutdown *callback,
*cookie = (void *)0xcafecafe;
return S_OK;
}
+
+/***********************************************************************
+ * RoGetServerActivatableClasses (combase.@)
+ */
+HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DWORD *count)
+{
+ FIXME("(%p, %p, %p): stub\n", name, classes, count);
+
+ *count = 0;
+ return S_OK;
+}
--
1.9.1

View File

@ -1,59 +0,0 @@
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: [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 | 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
--- 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 c721f43..72a7eb5 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -262,7 +262,7 @@
@ stub RoOriginateErrorW
@ stub RoOriginateLanguageException
@ stub RoParameterizedTypeExtraGetTypeSignature
-@ stub RoRegisterActivationFactories
+@ stdcall RoRegisterActivationFactories(ptr ptr long ptr)
@ stdcall RoRegisterForApartmentShutdown(ptr ptr ptr)
@ stub RoReportCapabilityCheckFailure
@ stub RoReportFailedDelegate
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index 2a228ce..ae063a2 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -134,3 +134,14 @@ HRESULT WINAPI RoGetServerActivatableClasses(HSTRING name, HSTRING **classes, DW
*count = 0;
return S_OK;
}
+
+/***********************************************************************
+ * RoRegisterActivationFactories (combase.@)
+ */
+HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONFACTORY *callbacks,
+ UINT32 count, RO_REGISTRATION_COOKIE *cookie)
+{
+ FIXME("(%p, %p, %d, %p): stub\n", classes, callbacks, count, cookie);
+
+ return S_OK;
+}
--
1.9.1

View File

@ -1,42 +0,0 @@
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: [PATCH 7/7] combase: Add stub for CleanupTlsOleState.
---
dlls/combase/combase.spec | 2 +-
dlls/combase/roapi.c | 8 ++++++++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec
index 72a7eb5..c8a8dee 100644
--- a/dlls/combase/combase.spec
+++ b/dlls/combase/combase.spec
@@ -66,7 +66,7 @@
@ stdcall CLSIDFromProgID(wstr ptr) ole32.CLSIDFromProgID
@ stdcall CLSIDFromString(wstr ptr) ole32.CLSIDFromString
@ stub CleanupOleStateInAllTls
-@ stub CleanupTlsOleState
+@ stdcall CleanupTlsOleState(ptr)
@ stub ClearCleanupFlag
@ stdcall CoAddRefServerProcess() ole32.CoAddRefServerProcess
@ stub CoAllowUnmarshalerCLSID
diff --git a/dlls/combase/roapi.c b/dlls/combase/roapi.c
index ae063a2..3a81fb4 100644
--- a/dlls/combase/roapi.c
+++ b/dlls/combase/roapi.c
@@ -145,3 +145,11 @@ HRESULT WINAPI RoRegisterActivationFactories(HSTRING *classes, PFNGETACTIVATIONF
return S_OK;
}
+
+/***********************************************************************
+ * CleanupTlsOleState (combase.@)
+ */
+void WINAPI CleanupTlsOleState(void *unknown)
+{
+ FIXME("(%p): stub\n", unknown);
+}
--
1.9.1

View File

@ -1,3 +0,0 @@
Fixes: [44399] Implement semi-stub for RoGetActivationFactory
Fixes: Implement semi-stub for RoActivateInstance
Fixes: Implement stubs for further combase Ro* functions

View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "e637a6f0bf1eeba3e6be62c4e1c5688bb8f6102e"
echo "540c48b91175b11c7b8646d0a036b20c46425080"
}
# Show version information
@ -99,7 +99,6 @@ patch_enable_all ()
enable_avifile_dll16_AVIStreamGetFrame="$1"
enable_bcrypt_BCryptDeriveKeyPBKDF2="$1"
enable_browseui_Progress_Dialog="$1"
enable_combase_RoApi="$1"
enable_comctl32_Listview_DrawItem="$1"
enable_comdlg32_lpstrFileTitle="$1"
enable_configure_Absolute_RPATH="$1"
@ -486,9 +485,6 @@ patch_enable ()
browseui-Progress_Dialog)
enable_browseui_Progress_Dialog="$2"
;;
combase-RoApi)
enable_combase_RoApi="$2"
;;
comctl32-Listview_DrawItem)
enable_comctl32_Listview_DrawItem="$2"
;;
@ -2352,13 +2348,6 @@ if test "$enable_bcrypt_BCryptDeriveKeyPBKDF2" -eq 1; then
enable_crypt32_ECDSA_Cert_Chains=1
fi
if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
if test "$enable_combase_RoApi" -gt 1; then
abort "Patchset combase-RoApi disabled, but api-ms-win-Stub_DLLs depends on that."
fi
enable_combase_RoApi=1
fi
if test "$enable_advapi32_Token_Integrity_Level" -eq 1; then
if test "$enable_Staging" -gt 1; then
abort "Patchset Staging disabled, but advapi32-Token_Integrity_Level depends on that."
@ -2735,35 +2724,8 @@ if test "$enable_advapi32_WinBuiltinAnyPackageSid" -eq 1; then
) >> "$patchlist"
fi
# Patchset combase-RoApi
# |
# | This patchset fixes the following Wine bugs:
# | * [#44399] Implement semi-stub for RoGetActivationFactory
# |
# | Modified files:
# | * dlls/api-ms-win-core-winrt-l1-1-0/api-ms-win-core-winrt-l1-1-0.spec, dlls/api-ms-win-core-winrt-registration-l1-1-0/api-
# | ms-win-core-winrt-registration-l1-1-0.spec, dlls/combase/combase.spec, dlls/combase/roapi.c
# |
if test "$enable_combase_RoApi" -eq 1; then
patch_apply combase-RoApi/0005-combase-Add-stub-for-RoGetApartmentIdentifier.patch
patch_apply combase-RoApi/0007-combase-Add-stub-for-RoRegisterForApartmentShutdown.patch
patch_apply combase-RoApi/0008-combase-Add-stub-for-RoGetServerActivatableClasses.patch
patch_apply combase-RoApi/0009-combase-Add-stub-for-RoRegisterActivationFactories.patch
patch_apply combase-RoApi/0010-combase-Add-stub-for-CleanupTlsOleState.patch
(
printf '%s\n' '+ { "Michael Müller", "combase: Add stub for RoGetApartmentIdentifier.", 1 },';
printf '%s\n' '+ { "Michael Müller", "combase: Add stub for RoRegisterForApartmentShutdown.", 1 },';
printf '%s\n' '+ { "Michael Müller", "combase: Add stub for RoGetServerActivatableClasses.", 1 },';
printf '%s\n' '+ { "Michael Müller", "combase: Add stub for RoRegisterActivationFactories.", 1 },';
printf '%s\n' '+ { "Michael Müller", "combase: Add stub for CleanupTlsOleState.", 1 },';
) >> "$patchlist"
fi
# Patchset api-ms-win-Stub_DLLs
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * combase-RoApi
# |
# | This patchset fixes the following Wine bugs:
# | * [#40451] Add feclient dll
# |
@ -4469,7 +4431,7 @@ fi
# Patchset kernel32-Processor_Group
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * combase-RoApi, api-ms-win-Stub_DLLs
# | * api-ms-win-Stub_DLLs
# |
# | Modified files:
# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/cpu.c,
@ -6731,7 +6693,7 @@ fi
# |
# | Modified files:
# | * dlls/shell32/Makefile.in, dlls/shell32/shell32_classes.idl, dlls/shell32/shell32_main.h, dlls/shell32/shellnew.c,
# | dlls/shell32/shellole.c
# | dlls/shell32/shellole.c, dlls/shell32/tests/shlview.c
# |
if test "$enable_shell32_NewMenu_Interface" -eq 1; then
patch_apply shell32-NewMenu_Interface/0001-shell32-Implement-NewMenu-with-new-folder-item.patch