You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 3f50319ec384730360d16dd79d703adafaa953fc.
This commit is contained in:
Sebastian Lackner
@@ -1,4 +1,4 @@
|
||||
From 1696ec4c67d39495d63673137e25d11878c44c8c Mon Sep 17 00:00:00 2001
|
||||
From e2c6e94c6dd1312f467e5528fa2767b7da6eaca4 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
|
||||
@@ -6,12 +6,12 @@ Subject: kernel32: Add stub for GetCurrentPackageFamilyName and add related
|
||||
|
||||
---
|
||||
.../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/kernel32.spec | 35 ++++++++++++++++++++++
|
||||
dlls/kernel32/kernel32.spec | 34 ++++++++++++++++++++++
|
||||
dlls/kernel32/version.c | 9 ++++++
|
||||
3 files changed, 45 insertions(+), 1 deletion(-)
|
||||
3 files changed, 44 insertions(+), 1 deletion(-)
|
||||
|
||||
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 1eb8327..af7774d 100644
|
||||
index 2c5cf9e5bda..50f8594785f 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
|
||||
@@ -3,7 +3,7 @@
|
||||
@@ -20,11 +20,11 @@ index 1eb8327..af7774d 100644
|
||||
@ stub GetCurrentApplicationUserModelId
|
||||
-@ stub GetCurrentPackageFamilyName
|
||||
+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
|
||||
@ stub GetCurrentPackageFullName
|
||||
@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName
|
||||
@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
|
||||
@ stub GetCurrentPackageInfo
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index 3c25286..3c1cb23 100644
|
||||
index 59e39a74917..e01e8605d53 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -225,6 +225,7 @@
|
||||
@@ -60,7 +60,7 @@ index 3c25286..3c1cb23 100644
|
||||
@ stdcall GetAtomNameA(long ptr long)
|
||||
@ stdcall GetAtomNameW(long ptr long)
|
||||
@ stdcall GetBinaryType(str ptr) GetBinaryTypeA
|
||||
@@ -624,11 +629,16 @@
|
||||
@@ -624,12 +629,16 @@
|
||||
# @ stub GetCurrencyFormatEx
|
||||
@ stdcall GetCurrencyFormatW(long long str ptr str long)
|
||||
@ stdcall GetCurrentActCtx(ptr)
|
||||
@@ -70,14 +70,14 @@ index 3c25286..3c1cb23 100644
|
||||
@ stdcall GetCurrentDirectoryA(long ptr)
|
||||
@ stdcall GetCurrentDirectoryW(long ptr)
|
||||
+@ stdcall GetCurrentPackageFamilyName(ptr ptr)
|
||||
+@ stub GetCurrentPackageFullName
|
||||
@ stdcall GetCurrentPackageId(ptr ptr)
|
||||
@ stdcall GetCurrentPackageFullName(ptr ptr)
|
||||
+@ stub GetCurrentPackageInfo
|
||||
+@ stub GetCurrentPackagePath
|
||||
@ stdcall -norelay GetCurrentProcess()
|
||||
@ stdcall -norelay GetCurrentProcessId()
|
||||
@ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber
|
||||
@@ -759,6 +769,16 @@
|
||||
@@ -760,6 +769,16 @@
|
||||
@ stdcall GetOEMCP()
|
||||
@ stdcall GetOverlappedResult(long ptr ptr long)
|
||||
@ stdcall GetUserPreferredUILanguages(long ptr ptr ptr)
|
||||
@@ -94,7 +94,7 @@ index 3c25286..3c1cb23 100644
|
||||
@ stdcall GetPhysicallyInstalledSystemMemory(ptr)
|
||||
@ stdcall GetPriorityClass(long)
|
||||
@ stdcall GetPrivateProfileIntA(str str long str)
|
||||
@@ -805,6 +825,8 @@
|
||||
@@ -806,6 +825,8 @@
|
||||
@ stub -i386 GetSLCallbackTemplate
|
||||
@ stdcall GetShortPathNameA(str ptr long)
|
||||
@ stdcall GetShortPathNameW(wstr ptr long)
|
||||
@@ -103,7 +103,7 @@ index 3c25286..3c1cb23 100644
|
||||
@ stdcall GetStartupInfoA(ptr)
|
||||
@ stdcall GetStartupInfoW(ptr)
|
||||
@ stdcall GetStdHandle(long)
|
||||
@@ -1118,6 +1140,8 @@
|
||||
@@ -1119,6 +1140,8 @@
|
||||
@ stdcall OpenJobObjectW(long long wstr)
|
||||
@ stdcall OpenMutexA(long long str)
|
||||
@ stdcall OpenMutexW(long long wstr)
|
||||
@@ -112,7 +112,7 @@ index 3c25286..3c1cb23 100644
|
||||
# @ stub OpenPrivateNamespaceA
|
||||
# @ stub OpenPrivateNamespaceW
|
||||
@ stdcall OpenProcess(long long long)
|
||||
@@ -1132,6 +1156,12 @@
|
||||
@@ -1133,6 +1156,12 @@
|
||||
@ stdcall OpenWaitableTimerW(long long wstr)
|
||||
@ stdcall OutputDebugStringA(str)
|
||||
@ stdcall OutputDebugStringW(wstr)
|
||||
@@ -125,7 +125,7 @@ index 3c25286..3c1cb23 100644
|
||||
@ stdcall PeekConsoleInputA(ptr ptr long ptr)
|
||||
@ stdcall PeekConsoleInputW(ptr ptr long ptr)
|
||||
@ stdcall PeekNamedPipe(long ptr long ptr ptr ptr)
|
||||
@@ -1548,7 +1578,12 @@
|
||||
@@ -1549,7 +1578,12 @@
|
||||
@ stdcall VerLanguageNameA(long str long)
|
||||
@ stdcall VerLanguageNameW(long wstr long)
|
||||
@ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask
|
||||
@@ -139,11 +139,11 @@ index 3c25286..3c1cb23 100644
|
||||
@ 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
|
||||
index cf783af6195..aabc9bc2c64 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);
|
||||
@@ -216,3 +216,12 @@ LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name)
|
||||
FIXME("(%p %p): stub\n", length, name);
|
||||
return APPMODEL_ERROR_NO_PACKAGE;
|
||||
}
|
||||
+
|
||||
@@ -156,5 +156,5 @@ index b9d13e4..53f594e 100644
|
||||
+ return APPMODEL_ERROR_NO_PACKAGE;
|
||||
+}
|
||||
--
|
||||
2.9.0
|
||||
2.11.0
|
||||
|
||||
|
||||
@@ -1,60 +0,0 @@
|
||||
From bcbbde0daf2dd0fed6f41a455dae61b2aac6e376 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Sat, 4 Mar 2017 11:05:52 +0100
|
||||
Subject: kernel32: add stub for GetCurrentPackageFullName
|
||||
|
||||
See bug https://bugs.winehq.org/show_bug.cgi?id=42586
|
||||
|
||||
Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
---
|
||||
.../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/version.c | 9 +++++++++
|
||||
3 files changed, 11 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 af7774d3679..50f8594785f 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
|
||||
@@ -4,7 +4,7 @@
|
||||
@ stub GetApplicationUserModelId
|
||||
@ stub GetCurrentApplicationUserModelId
|
||||
@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
|
||||
-@ stub GetCurrentPackageFullName
|
||||
+@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName
|
||||
@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
|
||||
@ stub GetCurrentPackageInfo
|
||||
@ stub GetCurrentPackagePath
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index be514a32371..c240d1fb9ea 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -635,7 +635,7 @@
|
||||
@ stdcall GetCurrentDirectoryA(long ptr)
|
||||
@ stdcall GetCurrentDirectoryW(long ptr)
|
||||
@ stdcall GetCurrentPackageFamilyName(ptr ptr)
|
||||
-@ stub GetCurrentPackageFullName
|
||||
+@ stdcall GetCurrentPackageFullName(ptr ptr)
|
||||
@ stdcall GetCurrentPackageId(ptr ptr)
|
||||
@ stub GetCurrentPackageInfo
|
||||
@ stub GetCurrentPackagePath
|
||||
diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c
|
||||
index 53f594eccab..ddaccacbaa7 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;
|
||||
}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * GetCurrentPackageFullName (KERNEL32.@)
|
||||
+ */
|
||||
+LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name)
|
||||
+{
|
||||
+ FIXME("(%p %p): stub\n", length, name);
|
||||
+ return APPMODEL_ERROR_NO_PACKAGE;
|
||||
+}
|
||||
--
|
||||
2.11.0
|
||||
|
||||
Reference in New Issue
Block a user