wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

api-ms-win-crt-Stub_DLLs: Add dependency on kernel32-GetCurrentPackageFamilyName patchset.

Browse Source
This commit is contained in:
Sebastian Lackner 2016-01-16 08:20:51 +01:00
parent 1e339a28fb
commit 09f42d752f
3 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api-ms-win-crt-Stub_DLLs/0003-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
View File

@ -1,4 +1,4 @@
From a06bc3db0a74f77d2c9b9e0b659b2eb18b1a2458 Mon Sep 17 00:00:00 2001
From 8e154a3b69922a0c124d4a6a6f0e9913bacee80c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 Jan 2016 13:01:15 +0100
Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
@ -15,10 +15,10 @@ Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
create mode 100644 dlls/kernelbase/misc.c
diff --git a/configure.ac b/configure.ac
index 86aaee5..7374b74 100644
index 6b6965e..9e98cc0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3042,6 +3042,7 @@ WINE_CONFIG_TEST(dlls/jscript/tests)
@@ -2978,6 +2978,7 @@ WINE_CONFIG_TEST(dlls/jscript/tests)
WINE_CONFIG_DLL(jsproxy,,[implib])
WINE_CONFIG_DLL(kernel32,,[clean,implib,mc])
WINE_CONFIG_TEST(dlls/kernel32/tests)
@ -38,7 +38,7 @@ index 0000000..2beb34b
+ misc.c
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
new file mode 100644
index 0000000..1a4e115
index 0000000..f2d6423
--- /dev/null
+++ b/dlls/kernelbase/kernelbase.spec
@@ -0,0 +1,1726 @@
@ -483,7 +483,7 @@ index 0000000..1a4e115
+@ stub GetCurrentPackageApplicationContext
+@ stub GetCurrentPackageApplicationResourcesContext
+@ stub GetCurrentPackageContext
+@ stub GetCurrentPackageFamilyName
+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
+@ stub GetCurrentPackageFullName
+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
+@ stub GetCurrentPackageInfo

1
patches/api-ms-win-crt-Stub_DLLs/definition
View File

@ -7,3 +7,4 @@ Depends: ole32-CoGetApartmentType
Depends: kernel32-GetFinalPathNameByHandle
Depends: kernel32-FreeUserPhysicalPages
Depends: kernel32-InterlockedPushListSList
Depends: kernel32-GetCurrentPackageFamilyName

32
patches/patchinstall.sh
View File

@ -2130,6 +2130,9 @@ if test "$enable_api_ms_win_crt_Stub_DLLs" -eq 1; then
if test "$enable_kernel32_FreeUserPhysicalPages" -gt 1; then
abort "Patchset kernel32-FreeUserPhysicalPages disabled, but api-ms-win-crt-Stub_DLLs depends on that."
fi
if test "$enable_kernel32_GetCurrentPackageFamilyName" -gt 1; then
abort "Patchset kernel32-GetCurrentPackageFamilyName disabled, but api-ms-win-crt-Stub_DLLs depends on that."
fi
if test "$enable_kernel32_GetFinalPathNameByHandle" -gt 1; then
abort "Patchset kernel32-GetFinalPathNameByHandle disabled, but api-ms-win-crt-Stub_DLLs depends on that."
fi
@ -2140,6 +2143,7 @@ if test "$enable_api_ms_win_crt_Stub_DLLs" -eq 1; then
abort "Patchset ole32-CoGetApartmentType disabled, but api-ms-win-crt-Stub_DLLs depends on that."
fi
enable_kernel32_FreeUserPhysicalPages=1
enable_kernel32_GetCurrentPackageFamilyName=1
enable_kernel32_GetFinalPathNameByHandle=1
enable_kernel32_InterlockedPushListSList=1
enable_ole32_CoGetApartmentType=1
@ -2425,6 +2429,18 @@ if test "$enable_kernel32_FreeUserPhysicalPages" -eq 1; then
) >> "$patchlist"
fi
# Patchset kernel32-GetCurrentPackageFamilyName
# |
# | Modified files:
# | * dlls/kernel32/kernel32.spec, dlls/kernel32/version.c
# |
if test "$enable_kernel32_GetCurrentPackageFamilyName" -eq 1; then
patch_apply kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
(
echo '+ { "Michael Müller", "kernel32: Add stub for GetCurrentPackageFamilyName and add related functions to spec file.", 1 },';
) >> "$patchlist"
fi
# Patchset kernel32-GetFinalPathNameByHandle
# |
# | This patchset fixes the following Wine bugs:
@ -2470,8 +2486,8 @@ fi
# Patchset api-ms-win-crt-Stub_DLLs
# |
# | This patchset has the following (direct or indirect) dependencies:
# | * kernel32-FreeUserPhysicalPages, kernel32-GetFinalPathNameByHandle, kernel32-InterlockedPushListSList,
# | ole32-CoGetApartmentType
# | * kernel32-FreeUserPhysicalPages, kernel32-GetCurrentPackageFamilyName, kernel32-GetFinalPathNameByHandle,
# | kernel32-InterlockedPushListSList, ole32-CoGetApartmentType
# |
# | Modified files:
# | * configure.ac, dlls/api-ms-win-core-com-l1-1-1/Makefile.in, dlls/api-ms-win-core-com-l1-1-1/api-ms-win-core-
@ -3646,18 +3662,6 @@ if test "$enable_kernel32_Cwd_Startup_Info" -eq 1; then
) >> "$patchlist"
fi
# Patchset kernel32-GetCurrentPackageFamilyName
# |
# | Modified files:
# | * dlls/kernel32/kernel32.spec, dlls/kernel32/version.c
# |
if test "$enable_kernel32_GetCurrentPackageFamilyName" -eq 1; then
patch_apply kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
(
echo '+ { "Michael Müller", "kernel32: Add stub for GetCurrentPackageFamilyName and add related functions to spec file.", 1 },';
) >> "$patchlist"
fi
# Patchset kernel32-LocaleNameToLCID
# |
# | This patchset fixes the following Wine bugs: