mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Added patch with stub for kernel32.GetCurrentPackageFamilyName.
This commit is contained in:
Sebastian Lackner
parent
695cdd6899
commit
2d23402047
@ -0,0 +1,146 @@
|
||||
From b94bb9fb468540cc3482c6009d92600b0c1e37ed 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:23:02 +0100
|
||||
Subject: kernel32: Add stub for GetCurrentPackageFamilyName and add related
|
||||
functions to spec file.
|
||||
|
||||
---
|
||||
dlls/kernel32/kernel32.spec | 35 +++++++++++++++++++++++++++++++++++
|
||||
dlls/kernel32/version.c | 9 +++++++++
|
||||
2 files changed, 44 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index a28f8e8..c368780 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -225,6 +225,7 @@
|
||||
@ stdcall ClearCommError(long ptr ptr)
|
||||
@ stdcall CloseConsoleHandle(long)
|
||||
@ stdcall CloseHandle(long)
|
||||
+@ stub ClosePackageInfo
|
||||
# @ stub ClosePrivateNamespace
|
||||
@ stdcall CloseProfileUserMapping()
|
||||
@ stub CloseSystemHandle
|
||||
@@ -506,6 +507,7 @@
|
||||
@ stdcall FindNextVolumeW(long ptr long)
|
||||
# @ stub FindNLSString
|
||||
# @ stub FindNLSStringEx
|
||||
+@ stub FindPackagesByPackageFamily
|
||||
@ stdcall FindResourceA(long str str)
|
||||
@ stdcall FindResourceExA(long str str long)
|
||||
@ stdcall FindResourceExW(long wstr wstr long)
|
||||
@@ -524,6 +526,7 @@
|
||||
@ stdcall FlushViewOfFile(ptr long)
|
||||
@ stdcall FoldStringA(long str long ptr long)
|
||||
@ stdcall FoldStringW(long wstr long ptr long)
|
||||
+@ stub FormatApplicationUserModelId
|
||||
@ stdcall FormatMessageA(long ptr long long ptr long ptr)
|
||||
@ stdcall FormatMessageW(long ptr long long ptr long ptr)
|
||||
@ stdcall FreeConsole()
|
||||
@@ -544,6 +547,8 @@
|
||||
# @ stub GetActiveProcessorGroupCount
|
||||
# @ stub GetApplicationRecoveryCallback
|
||||
# @ stub GetApplicationRestartSettings
|
||||
+@ stub GetApplicationUserModelId
|
||||
+@ stub GetApplicationUserModelIdFromToken
|
||||
@ stdcall GetAtomNameA(long ptr long)
|
||||
@ stdcall GetAtomNameW(long ptr long)
|
||||
@ stdcall GetBinaryType(str ptr) GetBinaryTypeA
|
||||
@@ -624,11 +629,16 @@
|
||||
# @ stub GetCurrencyFormatEx
|
||||
@ stdcall GetCurrencyFormatW(long long str ptr str long)
|
||||
@ stdcall GetCurrentActCtx(ptr)
|
||||
+@ stub GetCurrentApplicationUserModelId
|
||||
@ stdcall GetCurrentConsoleFont(long long ptr)
|
||||
# @ stub GetCurrentConsoleFontEx
|
||||
@ stdcall GetCurrentDirectoryA(long ptr)
|
||||
@ stdcall GetCurrentDirectoryW(long ptr)
|
||||
+@ stdcall GetCurrentPackageFamilyName(ptr ptr)
|
||||
+@ stub GetCurrentPackageFullName
|
||||
@ stdcall GetCurrentPackageId(ptr ptr)
|
||||
+@ stub GetCurrentPackageInfo
|
||||
+@ stub GetCurrentPackagePath
|
||||
@ stdcall -norelay GetCurrentProcess()
|
||||
@ stdcall -norelay GetCurrentProcessId()
|
||||
@ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber
|
||||
@@ -759,6 +769,16 @@
|
||||
@ stdcall GetOEMCP()
|
||||
@ stdcall GetOverlappedResult(long ptr ptr long)
|
||||
@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr)
|
||||
+@ stub GetPackageApplicationIds
|
||||
+@ stub GetPackageFamilyName
|
||||
+@ stub GetPackageFamilyNameFromToken
|
||||
+@ stub GetPackageFullName
|
||||
+@ stub GetPackageFullNameFromToken
|
||||
+@ stub GetPackageId
|
||||
+@ stub GetPackageInfo
|
||||
+@ stub GetPackagePath
|
||||
+@ stub GetPackagePathByFullName
|
||||
+@ stub GetPackagesByPackageFamily
|
||||
@ stdcall GetPhysicallyInstalledSystemMemory(ptr)
|
||||
@ stdcall GetPriorityClass(long)
|
||||
@ stdcall GetPrivateProfileIntA(str str long str)
|
||||
@@ -805,6 +825,8 @@
|
||||
@ stub -i386 GetSLCallbackTemplate
|
||||
@ stdcall GetShortPathNameA(str ptr long)
|
||||
@ stdcall GetShortPathNameW(wstr ptr long)
|
||||
+@ stub GetStagedPackageOrigin
|
||||
+@ stub GetStagedPackagePathByFullName
|
||||
@ stdcall GetStartupInfoA(ptr)
|
||||
@ stdcall GetStartupInfoW(ptr)
|
||||
@ stdcall GetStdHandle(long)
|
||||
@@ -1117,6 +1139,8 @@
|
||||
@ stdcall OpenJobObjectW(long long wstr)
|
||||
@ stdcall OpenMutexA(long long str)
|
||||
@ stdcall OpenMutexW(long long wstr)
|
||||
+@ stub OpenPackageInfoByFullName
|
||||
+@ stub OpenPackageInfoByFullNameForUser
|
||||
# @ stub OpenPrivateNamespaceA
|
||||
# @ stub OpenPrivateNamespaceW
|
||||
@ stdcall OpenProcess(long long long)
|
||||
@@ -1131,6 +1155,12 @@
|
||||
@ stdcall OpenWaitableTimerW(long long wstr)
|
||||
@ stdcall OutputDebugStringA(str)
|
||||
@ stdcall OutputDebugStringW(wstr)
|
||||
+@ stub PackageFamilyNameFromFullName
|
||||
+@ stub PackageFamilyNameFromId
|
||||
+@ stub PackageFullNameFromId
|
||||
+@ stub PackageIdFromFullName
|
||||
+@ stub PackageNameAndPublisherIdFromFamilyName
|
||||
+@ stub ParseApplicationUserModelId
|
||||
@ stdcall PeekConsoleInputA(ptr ptr long ptr)
|
||||
@ stdcall PeekConsoleInputW(ptr ptr long ptr)
|
||||
@ stdcall PeekNamedPipe(long ptr long ptr ptr ptr)
|
||||
@@ -1547,7 +1577,12 @@
|
||||
@ stdcall VerLanguageNameA(long str long)
|
||||
@ stdcall VerLanguageNameW(long wstr long)
|
||||
@ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask
|
||||
+@ stub VerifyApplicationUserModelId
|
||||
@ stdcall VerifyConsoleIoHandle(long)
|
||||
+@ stub VerifyPackageFamilyName
|
||||
+@ stub VerifyPackageFullName
|
||||
+@ stub VerifyPackageId
|
||||
+@ stub VerifyPackageRelativeApplicationId
|
||||
# @ stub VerifyScripts
|
||||
@ stdcall VerifyVersionInfoA(long long int64)
|
||||
@ stdcall VerifyVersionInfoW(long long int64)
|
||||
diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
|
||||
index b9d13e4..53f594e 100644
|
||||
--- a/dlls/kernel32/version.c
|
||||
+++ b/dlls/kernel32/version.c
|
||||
@@ -207,3 +207,12 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer)
|
||||
FIXME("(%p %p): stub\n", len, buffer);
|
||||
return APPMODEL_ERROR_NO_PACKAGE;
|
||||
}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * GetCurrentPackageFamilyName (KERNEL32.@)
|
||||
+ */
|
||||
+LONG WINAPI GetCurrentPackageFamilyName(UINT32 *length, PWSTR name)
|
||||
+{
|
||||
+ FIXME("(%p %p): stub\n", length, name);
|
||||
+ return APPMODEL_ERROR_NO_PACKAGE;
|
||||
+}
|
||||
--
|
||||
2.6.4
|
||||
|
||||
1
patches/kernel32-GetCurrentPackageFamilyName/definition
Normal file
1
patches/kernel32-GetCurrentPackageFamilyName/definition
Normal file
@ -0,0 +1 @@
|
||||
Fixes: Add stub for kernel32.GetCurrentPackageFamilyName
|
||||
@ -156,6 +156,7 @@ patch_enable_all ()
|
||||
enable_kernel32_CopyFileEx="$1"
|
||||
enable_kernel32_Cwd_Startup_Info="$1"
|
||||
enable_kernel32_FreeUserPhysicalPages="$1"
|
||||
enable_kernel32_GetCurrentPackageFamilyName="$1"
|
||||
enable_kernel32_GetFinalPathNameByHandle="$1"
|
||||
enable_kernel32_InterlockedPushListSList="$1"
|
||||
enable_kernel32_LocaleNameToLCID="$1"
|
||||
@ -595,6 +596,9 @@ patch_enable ()
|
||||
kernel32-FreeUserPhysicalPages)
|
||||
enable_kernel32_FreeUserPhysicalPages="$2"
|
||||
;;
|
||||
kernel32-GetCurrentPackageFamilyName)
|
||||
enable_kernel32_GetCurrentPackageFamilyName="$2"
|
||||
;;
|
||||
kernel32-GetFinalPathNameByHandle)
|
||||
enable_kernel32_GetFinalPathNameByHandle="$2"
|
||||
;;
|
||||
@ -3638,6 +3642,18 @@ 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:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user