mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch with stub for kernel32.GetPackageFullName.
This commit is contained in:
parent
91eac1310f
commit
9392a75d90
@ -0,0 +1,71 @@
|
||||
From 21c71f172c52f18692e2601e40ae5e8d050de4a8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 2 Feb 2017 20:49:15 +0100
|
||||
Subject: kernel32: Add stub for GetPackageFullName.
|
||||
|
||||
---
|
||||
.../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/version.c | 9 +++++++++
|
||||
dlls/kernelbase/kernelbase.spec | 2 +-
|
||||
4 files changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
|
||||
index af7774d3679..066a674f8f5 100644
|
||||
--- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
|
||||
+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
|
||||
@@ -10,7 +10,7 @@
|
||||
@ stub GetCurrentPackagePath
|
||||
@ stub GetPackageApplicationIds
|
||||
@ stub GetPackageFamilyName
|
||||
-@ stub GetPackageFullName
|
||||
+@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName
|
||||
@ stub GetPackageId
|
||||
@ stub GetPackageInfo
|
||||
@ stub GetPackagePath
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 31811281e61..efb2bdddf32 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -772,7 +772,7 @@
|
||||
@ stub GetPackageApplicationIds
|
||||
@ stub GetPackageFamilyName
|
||||
@ stub GetPackageFamilyNameFromToken
|
||||
-@ stub GetPackageFullName
|
||||
+@ stdcall GetPackageFullName(long ptr ptr)
|
||||
@ stub GetPackageFullNameFromToken
|
||||
@ stub GetPackageId
|
||||
@ stub GetPackageInfo
|
||||
diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
|
||||
index 53f594eccab..72d1152d20f 100644
|
||||
--- a/dlls/kernel32/version.c
|
||||
+++ b/dlls/kernel32/version.c
|
||||
@@ -216,3 +216,12 @@ LONG WINAPI GetCurrentPackageFamilyName(UINT32 *length, PWSTR name)
|
||||
FIXME("(%p %p): stub\n", length, name);
|
||||
return APPMODEL_ERROR_NO_PACKAGE;
|
||||
}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * GetPackageFullName (KERNEL32.@)
|
||||
+ */
|
||||
+LONG WINAPI GetPackageFullName(HANDLE process, UINT32 *length, PWSTR name)
|
||||
+{
|
||||
+ FIXME("(%p %p %p): stub\n", process, length, name);
|
||||
+ return APPMODEL_ERROR_NO_PACKAGE;
|
||||
+}
|
||||
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
|
||||
index a4951f1baa3..bdfc067cf6d 100644
|
||||
--- a/dlls/kernelbase/kernelbase.spec
|
||||
+++ b/dlls/kernelbase/kernelbase.spec
|
||||
@@ -569,7 +569,7 @@
|
||||
@ stub GetPackageContext
|
||||
@ stub GetPackageFamilyName
|
||||
@ stub GetPackageFamilyNameFromToken
|
||||
-@ stub GetPackageFullName
|
||||
+@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName
|
||||
@ stub GetPackageFullNameFromToken
|
||||
@ stub GetPackageId
|
||||
@ stub GetPackageInfo
|
||||
--
|
||||
2.11.0
|
||||
|
3
patches/kernel32-GetPackageFullName/definition
Normal file
3
patches/kernel32-GetPackageFullName/definition
Normal file
@ -0,0 +1,3 @@
|
||||
Fixes: Add stub for kernel32.GetPackageFullName
|
||||
Depends: kernel32-GetCurrentPackageFamilyName
|
||||
Depends: api-ms-win-Stub_DLLs
|
@ -181,6 +181,7 @@ patch_enable_all ()
|
||||
enable_kernel32_Debugger="$1"
|
||||
enable_kernel32_FindFirstFile="$1"
|
||||
enable_kernel32_GetCurrentPackageFamilyName="$1"
|
||||
enable_kernel32_GetPackageFullName="$1"
|
||||
enable_kernel32_GetShortPathName="$1"
|
||||
enable_kernel32_LocaleNameToLCID="$1"
|
||||
enable_kernel32_Locale_Definitions="$1"
|
||||
@ -752,6 +753,9 @@ patch_enable ()
|
||||
kernel32-GetCurrentPackageFamilyName)
|
||||
enable_kernel32_GetCurrentPackageFamilyName="$2"
|
||||
;;
|
||||
kernel32-GetPackageFullName)
|
||||
enable_kernel32_GetPackageFullName="$2"
|
||||
;;
|
||||
kernel32-GetShortPathName)
|
||||
enable_kernel32_GetShortPathName="$2"
|
||||
;;
|
||||
@ -2280,6 +2284,17 @@ if test "$enable_kernel32_Named_Pipe" -eq 1; then
|
||||
enable_server_Desktop_Refcount=1
|
||||
fi
|
||||
|
||||
if test "$enable_kernel32_GetPackageFullName" -eq 1; then
|
||||
if test "$enable_api_ms_win_Stub_DLLs" -gt 1; then
|
||||
abort "Patchset api-ms-win-Stub_DLLs disabled, but kernel32-GetPackageFullName depends on that."
|
||||
fi
|
||||
if test "$enable_kernel32_GetCurrentPackageFamilyName" -gt 1; then
|
||||
abort "Patchset kernel32-GetCurrentPackageFamilyName disabled, but kernel32-GetPackageFullName depends on that."
|
||||
fi
|
||||
enable_api_ms_win_Stub_DLLs=1
|
||||
enable_kernel32_GetCurrentPackageFamilyName=1
|
||||
fi
|
||||
|
||||
if test "$enable_kernel32_CopyFileEx" -eq 1; then
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -gt 1; then
|
||||
abort "Patchset kernel32-SetFileInformationByHandle disabled, but kernel32-CopyFileEx depends on that."
|
||||
@ -4450,6 +4465,22 @@ if test "$enable_kernel32_FindFirstFile" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-GetPackageFullName
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * combase-RoApi, kernel32-GetCurrentPackageFamilyName, kernel32-UmsStubs, api-ms-win-Stub_DLLs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec, dlls/kernel32/kernel32.spec,
|
||||
# | dlls/kernel32/version.c, dlls/kernelbase/kernelbase.spec
|
||||
# |
|
||||
if test "$enable_kernel32_GetPackageFullName" -eq 1; then
|
||||
patch_apply kernel32-GetPackageFullName/0001-kernel32-Add-stub-for-GetPackageFullName.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Michael Müller", "kernel32: Add stub for GetPackageFullName.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-GetShortPathName
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
Reference in New Issue
Block a user