wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against eb5339edaca1c09d76b4afa32bdb07c1549e6650.

Browse Source 
[api-ms-win-Stub_DLLs]
Removed some stub dlls (accepted upstream).

[wmic-Query_Path]
Removed patch to improve cmd line parser and add support for path command
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-10-15 03:50:51 +02:00
parent 70bc9a4e63
commit dd53426bfd
14 changed files with 104 additions and 396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
patches/kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
View File

@@ -1,16 +1,30 @@
From b94bb9fb468540cc3482c6009d92600b0c1e37ed Mon Sep 17 00:00:00 2001
From 1696ec4c67d39495d63673137e25d11878c44c8c 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(+)
.../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +-
dlls/kernel32/kernel32.spec | 35 ++++++++++++++++++++++
dlls/kernel32/version.c | 9 ++++++
3 files changed, 45 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
--- 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 @@
@ stub FormatApplicationUserModelId
@ stub GetApplicationUserModelId
@ stub GetCurrentApplicationUserModelId
-@ stub GetCurrentPackageFamilyName
+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
@ stub GetCurrentPackageFullName
@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
@ stub GetCurrentPackageInfo
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
index a28f8e8..c368780 100644
index 3c25286..3c1cb23 100644
--- a/dlls/kernel32/kernel32.spec
+++ b/dlls/kernel32/kernel32.spec
@@ -225,6 +225,7 @@
@@ -89,7 +103,7 @@ index a28f8e8..c368780 100644
@ stdcall GetStartupInfoA(ptr)
@ stdcall GetStartupInfoW(ptr)
@ stdcall GetStdHandle(long)
@@ -1117,6 +1139,8 @@
@@ -1118,6 +1140,8 @@
@ stdcall OpenJobObjectW(long long wstr)
@ stdcall OpenMutexA(long long str)
@ stdcall OpenMutexW(long long wstr)
@@ -98,7 +112,7 @@ index a28f8e8..c368780 100644
# @ stub OpenPrivateNamespaceA
# @ stub OpenPrivateNamespaceW
@ stdcall OpenProcess(long long long)
@@ -1131,6 +1155,12 @@
@@ -1132,6 +1156,12 @@
@ stdcall OpenWaitableTimerW(long long wstr)
@ stdcall OutputDebugStringA(str)
@ stdcall OutputDebugStringW(wstr)
@@ -111,7 +125,7 @@ index a28f8e8..c368780 100644
@ stdcall PeekConsoleInputA(ptr ptr long ptr)
@ stdcall PeekConsoleInputW(ptr ptr long ptr)
@ stdcall PeekNamedPipe(long ptr long ptr ptr ptr)
@@ -1547,7 +1577,12 @@
@@ -1548,7 +1578,12 @@
@ stdcall VerLanguageNameA(long str long)
@ stdcall VerLanguageNameW(long wstr long)
@ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask
@@ -142,5 +156,5 @@ index b9d13e4..53f594e 100644
+ return APPMODEL_ERROR_NO_PACKAGE;
+}
--
2.6.4
2.9.0