wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added patch for shcore and api-ms-win-shcore-obsolete-l1-1-0 dll.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-17 20:29:08 +01:00
parent ef3ea8cfc5
commit d98e6ed067
4 changed files with 207 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
patches/api-ms-win-Stub_DLLs/0014-shcore-Add-dll.patch Normal file
View File

@ -0,0 +1,137 @@
From ab1311d99afbf534dca6a94aabec3ccc1b07eb89 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 17 Jan 2016 20:17:46 +0100
Subject: shcore: Add dll.
---
configure.ac | 1 +
dlls/shcore/Makefile.in | 1 +
dlls/shcore/shcore.spec | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
tools/make_specfiles | 1 +
4 files changed, 86 insertions(+)
create mode 100644 dlls/shcore/Makefile.in
create mode 100644 dlls/shcore/shcore.spec
diff --git a/configure.ac b/configure.ac
index 893f176..fadad67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3229,6 +3229,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests)
WINE_CONFIG_DLL(setupx.dll16,enable_win16)
WINE_CONFIG_DLL(sfc,,[implib])
WINE_CONFIG_DLL(sfc_os,,[implib])
+WINE_CONFIG_DLL(shcore)
WINE_CONFIG_DLL(shdoclc,,[po])
WINE_CONFIG_DLL(shdocvw,,[clean,implib])
WINE_CONFIG_TEST(dlls/shdocvw/tests)
diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in
new file mode 100644
index 0000000..dd5f08f
--- /dev/null
+++ b/dlls/shcore/Makefile.in
@@ -0,0 +1 @@
+MODULE = shcore.dll
diff --git a/dlls/shcore/shcore.spec b/dlls/shcore/shcore.spec
new file mode 100644
index 0000000..f62efae
--- /dev/null
+++ b/dlls/shcore/shcore.spec
@@ -0,0 +1,83 @@
+@ stdcall CommandLineToArgvW(wstr ptr) shell32.CommandLineToArgvW
+@ stub CreateRandomAccessStreamOnFile
+@ stub CreateRandomAccessStreamOverStream
+@ stub CreateStreamOverRandomAccessStream
+@ stdcall -private DllCanUnloadNow() shell32.DllCanUnloadNow
+@ stub DllGetActivationFactory
+@ stdcall -private DllGetClassObject(ptr ptr ptr) shell32.DllGetClassObject
+@ stdcall GetCurrentProcessExplicitAppUserModelID(ptr) shell32.GetCurrentProcessExplicitAppUserModelID
+@ stub GetDpiForMonitor
+@ stub GetDpiForShellUIComponent
+@ stub GetProcessDpiAwareness
+@ stub GetProcessReference
+@ stub GetScaleFactorForDevice
+@ stub GetScaleFactorForMonitor
+@ stub IStream_Copy
+@ stub IStream_Read
+@ stub IStream_ReadStr
+@ stub IStream_Reset
+@ stub IStream_Size
+@ stub IStream_Write
+@ stub IStream_WriteStr
+@ stub IUnknown_AtomicRelease
+@ stub IUnknown_GetSite
+@ stub IUnknown_QueryService
+@ stub IUnknown_Set
+@ stub IUnknown_SetSite
+@ stub IsOS
+@ stub RegisterScaleChangeEvent
+@ stub RegisterScaleChangeNotifications
+@ stub RevokeScaleChangeNotifications
+@ stub SHAnsiToAnsi
+@ stub SHAnsiToUnicode
+@ stub SHCopyKeyA
+@ stub SHCopyKeyW
+@ stub SHCreateMemStream
+@ stub SHCreateStreamOnFileA
+@ stub SHCreateStreamOnFileEx
+@ stub SHCreateStreamOnFileW
+@ stub SHCreateThread
+@ stub SHCreateThreadRef
+@ stub SHCreateThreadWithHandle
+@ stub SHDeleteEmptyKeyA
+@ stub SHDeleteEmptyKeyW
+@ stub SHDeleteKeyA
+@ stub SHDeleteKeyW
+@ stub SHDeleteValueA
+@ stub SHDeleteValueW
+@ stub SHEnumKeyExA
+@ stub SHEnumKeyExW
+@ stub SHEnumValueA
+@ stub SHEnumValueW
+@ stub SHGetThreadRef
+@ stub SHGetValueA
+@ stub SHGetValueW
+@ stub SHOpenRegStream2A
+@ stub SHOpenRegStream2W
+@ stub SHOpenRegStreamA
+@ stub SHOpenRegStreamW
+@ stub SHQueryInfoKeyA
+@ stub SHQueryInfoKeyW
+@ stub SHQueryValueExA
+@ stub SHQueryValueExW
+@ stub SHRegDuplicateHKey
+@ stub SHRegGetIntW
+@ stub SHRegGetPathA
+@ stub SHRegGetPathW
+@ stub SHRegGetValueA
+@ stub SHRegGetValueFromHKCUHKLM
+@ stub SHRegGetValueW
+@ stub SHRegSetPathA
+@ stub SHRegSetPathW
+@ stub SHReleaseThreadRef
+@ stub SHSetThreadRef
+@ stub SHSetValueA
+@ stub SHSetValueW
+@ stub SHStrDupA
+@ stub SHStrDupW
+@ stub SHUnicodeToAnsi
+@ stub SHUnicodeToUnicode
+@ stdcall SetCurrentProcessExplicitAppUserModelID(wstr) shell32.SetCurrentProcessExplicitAppUserModelID
+@ stub SetProcessDpiAwareness
+@ stub SetProcessReference
+@ stub UnregisterScaleChangeEvent
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 0a5851d..9c7286d 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -243,6 +243,7 @@ my @dll_groups =
],
[
"shell32",
+ "shcore",
"api-ms-win-downlevel-shell32-l1-1-0",
],
[
--
2.6.4

60
patches/api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch Normal file
View File

@ -0,0 +1,60 @@
From 989661cb023b39323521a74c0fc1e9e6fee0ab40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:02:41 +0100
Subject: api-ms-win-shcore-obsolete-l1-1-0: Add dll.
---
configure.ac | 1 +
dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in | 1 +
.../api-ms-win-shcore-obsolete-l1-1-0.spec | 3 +++
tools/make_specfiles | 4 ++++
4 files changed, 9 insertions(+)
create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index fadad67..1ac07ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2728,6 +2728,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0)
+WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0)
WINE_CONFIG_DLL(apphelp)
WINE_CONFIG_TEST(dlls/apphelp/tests)
WINE_CONFIG_DLL(appwiz.cpl,,[po])
diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
new file mode 100644
index 0000000..6588d13
--- /dev/null
+++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in
@@ -0,0 +1 @@
+MODULE = api-ms-win-shcore-obsolete-l1-1-0.dll
diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
new file mode 100644
index 0000000..601309c
--- /dev/null
+++ b/dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec
@@ -0,0 +1,3 @@
+@ stdcall CommandLineToArgvW(wstr ptr) shcore.CommandLineToArgvW
+@ stub SHStrDupA
+@ stub SHStrDupW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 9c7286d..4bddab2 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -247,6 +247,10 @@ my @dll_groups =
"api-ms-win-downlevel-shell32-l1-1-0",
],
[
+ "shcore",
+ "api-ms-win-shcore-obsolete-l1-1-0",
+ ],
+ [
"shlwapi",
"api-ms-win-downlevel-shlwapi-l1-1-0",
"api-ms-win-downlevel-shlwapi-l2-1-0",
--
2.6.4

2
patches/api-ms-win-Stub_DLLs/definition
View File

@ -9,8 +9,10 @@ Fixes: Add api-ms-win-core-kernel32-legacy-l1-1-1 dll
Fixes: Add api-ms-win-core-heap-l2-1-0 dll
Fixes: Add api-ms-win-eventing-classicprovider-l1-1-0 dll
Fixes: Add api-ms-win-core-winrt-registration-l1-1-0 dll
Fixes: Add api-ms-win-shcore-obsolete-l1-1-0 dll
Fixes: Add kernelbase dll
Fixes: Add iertutil dll
Fixes: Add shcore dll
Depends: ole32-CoGetApartmentType
Depends: kernel32-GetFinalPathNameByHandle
Depends: kernel32-FreeUserPhysicalPages

11
patches/patchinstall.sh
View File

@ -2532,9 +2532,10 @@ fi
# | dlls/api-ms-win-core-winrt-registration-l1-1-0/Makefile.in, dlls/api-ms-win-core-winrt-registration-l1-1-0/api-ms-win-
# | core-winrt-registration-l1-1-0.spec, dlls/api-ms-win-crt-heap-l1-1-0/api-ms-win-crt-heap-l1-1-0.spec, dlls/api-ms-win-
# | eventing-classicprovider-l1-1-0/Makefile.in, dlls/api-ms-win-eventing-classicprovider-l1-1-0/api-ms-win-eventing-
# | classicprovider-l1-1-0.spec, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c,
# | dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/ucrtbase/ucrtbase.spec,
# | tools/make_specfiles
# | classicprovider-l1-1-0.spec, dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-obsolete-l1-1-0
# | /api-ms-win-shcore-obsolete-l1-1-0.spec, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c,
# | dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in,
# | dlls/shcore/shcore.spec, dlls/ucrtbase/ucrtbase.spec, tools/make_specfiles
# |
if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
patch_apply api-ms-win-Stub_DLLs/0001-ucrtbase-Hook-up-some-functions-with-new-names-to-ex.patch
@ -2550,6 +2551,8 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
patch_apply api-ms-win-Stub_DLLs/0011-api-ms-win-eventing-classicprovider-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0012-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
patch_apply api-ms-win-Stub_DLLs/0013-api-ms-win-core-winrt-registration-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0014-shcore-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0015-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch
(
echo '+ { "Martin Storsjo", "ucrtbase: Hook up some functions with new names to existing implementations.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-core-com-l1-1-1: Add dll.", 1 },';
@ -2564,6 +2567,8 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
echo '+ { "Michael Müller", "api-ms-win-eventing-classicprovider-l1-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "iertutil: Add dll and add stub for ordinal 811.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-core-winrt-registration-l1-1-0: Add dll.", 1 },';
echo '+ { "Sebastian Lackner", "shcore: Add dll.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-shcore-obsolete-l1-1-0: Add dll.", 1 },';
) >> "$patchlist"
fi