Rebase against 63bcfa3354edd910ee52b8134af191f7a774b701.

This commit is contained in:
Sebastian Lackner
2017-04-04 03:59:24 +02:00
parent e2750d967a
commit 3a8de0f3f4
13 changed files with 170 additions and 1849 deletions

View File

@@ -1,4 +1,4 @@
From 594e57c855592fe07e73003926c09520bc357416 Mon Sep 17 00:00:00 2001
From d8b434940cd2206dd8c6c731c1ce2d331e0b0d50 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.
@@ -11,7 +11,7 @@ Subject: kernel32: Add stub for GetPackageFullName.
4 files changed, 12 insertions(+), 2 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 50f8594785f..4d2edd60f5a 100644
index 50f8594785..4d2edd60f5 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 @@
@@ -24,7 +24,7 @@ index 50f8594785f..4d2edd60f5a 100644
@ stub GetPackageInfo
@ stub GetPackagePath
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index 2668386bf84..f2fcf109715 100644
index 819b52dbb9..4dcc40ea5d 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -761,6 +761,7 @@
@@ -36,7 +36,7 @@ index 2668386bf84..f2fcf109715 100644
@ stdcall GetPriorityClass(long)
@ stdcall GetPrivateProfileIntA(str str long str)
diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
index 5a233efe56f..3cca2ae68ee 100644
index 5a233efe56..3cca2ae68e 100644
--- a/dlls/kernel32/version.c
+++ b/dlls/kernel32/version.c
@@ -228,3 +228,12 @@ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name)
@@ -53,18 +53,18 @@ index 5a233efe56f..3cca2ae68ee 100644
+ return APPMODEL_ERROR_NO_PACKAGE;
+}
diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
index 12f36c5ede3..daba198bec5 100644
index 9fba5803b2..d040ba00a8 100644
--- a/dlls/kernelbase/kernelbase.spec
+++ b/dlls/kernelbase/kernelbase.spec
@@ -569,7 +569,7 @@
@ stub GetPackageContext
@ stub GetPackageFamilyName
@ stub GetPackageFamilyNameFromToken
-@ stub GetPackageFullName
@@ -593,7 +593,7 @@
# @ stub GetPackageContext
# @ stub GetPackageFamilyName
# @ stub GetPackageFamilyNameFromToken
-# @ stub GetPackageFullName
+@ stdcall GetPackageFullName(long ptr ptr) kernel32.GetPackageFullName
@ stub GetPackageFullNameFromToken
@ stub GetPackageId
@ stub GetPackageInfo
# @ stub GetPackageFullNameFromToken
# @ stub GetPackageId
# @ stub GetPackageInfo
--
2.11.0