wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17: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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
patches/api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch
View File

@ -1,90 +0,0 @@
From e08bd12d12e5e3159ce9efa848cad6118951ff5e 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:37:26 +0100
Subject: api-ms-win-appmodel-runtime-l1-1-1: Add new dll.
---
configure.ac | 1 +
.../api-ms-win-appmodel-runtime-l1-1-1/Makefile.in | 1 +
.../api-ms-win-appmodel-runtime-l1-1-1.spec | 36 ++++++++++++++++++++++
tools/make_specfiles | 1 +
4 files changed, 39 insertions(+)
create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
create mode 100644 dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
diff --git a/configure.ac b/configure.ac
index 6d51b3f..9be829f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2650,6 +2650,7 @@ WINE_CONFIG_DLL(advpack,,[implib])
WINE_CONFIG_TEST(dlls/advpack/tests)
WINE_CONFIG_DLL(amstream,,[clean])
WINE_CONFIG_TEST(dlls/amstream/tests)
+WINE_CONFIG_DLL(api-ms-win-appmodel-runtime-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0)
WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1)
WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0)
diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
new file mode 100644
index 0000000..289d96f
--- /dev/null
+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in
@@ -0,0 +1 @@
+MODULE = api-ms-win-appmodel-runtime-l1-1-1.dll
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
new file mode 100644
index 0000000..2e5fbf1
--- /dev/null
+++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec
@@ -0,0 +1,36 @@
+@ stub ClosePackageInfo
+@ stub FindPackagesByPackageFamily
+@ stub FormatApplicationUserModelId
+@ stub GetApplicationUserModelId
+@ stub GetApplicationUserModelIdFromToken
+@ stub GetCurrentApplicationUserModelId
+@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernel32.GetCurrentPackageFamilyName
+@ stub GetCurrentPackageFullName
+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
+@ stub GetCurrentPackageInfo
+@ stub GetCurrentPackagePath
+@ stub GetPackageApplicationIds
+@ stub GetPackageFamilyName
+@ stub GetPackageFamilyNameFromToken
+@ stub GetPackageFullName
+@ stub GetPackageFullNameFromToken
+@ stub GetPackageId
+@ stub GetPackageInfo
+@ stub GetPackagePath
+@ stub GetPackagePathByFullName
+@ stub GetPackagesByPackageFamily
+@ stub GetStagedPackageOrigin
+@ stub GetStagedPackagePathByFullName
+@ stub OpenPackageInfoByFullName
+@ stub OpenPackageInfoByFullNameForUser
+@ stub PackageFamilyNameFromFullName
+@ stub PackageFamilyNameFromId
+@ stub PackageFullNameFromId
+@ stub PackageIdFromFullName
+@ stub PackageNameAndPublisherIdFromFamilyName
+@ stub ParseApplicationUserModelId
+@ stub VerifyApplicationUserModelId
+@ stub VerifyPackageFamilyName
+@ stub VerifyPackageFullName
+@ stub VerifyPackageId
+@ stub VerifyPackageRelativeApplicationId
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 3316f76..5a58eed 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -137,6 +137,7 @@ my @dll_groups =
],
[
"kernel32",
+ "api-ms-win-appmodel-runtime-l1-1-1",
"api-ms-win-downlevel-normaliz-l1-1-0",
"api-ms-win-core-processthreads-l1-1-0",
"api-ms-win-core-appcompat-l1-1-1",
--
2.9.0

10
patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch
View File

@ -1,4 +1,4 @@
From 26c9cf2b9b71306ebb6c19c6b0838a8ca91f3613 Mon Sep 17 00:00:00 2001
From faddf206cfe8bb34fb7f56c881723229b0d3e8e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:07:35 +0100
Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
@ -15,13 +15,13 @@ Subject: ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for
create mode 100644 dlls/ext-ms-win-xaml-pal-l1-1-0/main.c
diff --git a/configure.ac b/configure.ac
index 1ac07ff..049de86 100644
index 999a457..d099029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2929,6 +2929,7 @@ WINE_CONFIG_DLL(evr)
WINE_CONFIG_DLL(explorerframe,,[clean])
@@ -3008,6 +3008,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
WINE_CONFIG_TEST(dlls/explorerframe/tests)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
WINE_CONFIG_DLL(faultrep,,[implib])
WINE_CONFIG_TEST(dlls/faultrep/tests)
@ -90,5 +90,5 @@ index 0000000..3e28275
+ return TRUE;
+}
--
2.6.4
2.9.0

10
patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch
View File

@ -1,4 +1,4 @@
From 16af0df00d70307dd90c7dd836de57376b185844 Mon Sep 17 00:00:00 2001
From 84ff59cbefcd2a4c5c5625a99fdbf06ebee7bba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 17:12:45 +0100
Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
@ -15,17 +15,17 @@ Subject: ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub for
create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c
diff --git a/configure.ac b/configure.ac
index 049de86..36924eb 100644
index d099029..e2d7b8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2928,6 +2928,7 @@ WINE_CONFIG_DLL(esent)
@@ -3006,6 +3006,7 @@ WINE_CONFIG_DLL(esent)
WINE_CONFIG_DLL(evr)
WINE_CONFIG_DLL(explorerframe,,[clean])
WINE_CONFIG_TEST(dlls/explorerframe/tests)
+WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
WINE_CONFIG_DLL(faultrep,,[implib])
diff --git a/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in b/dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in
new file mode 100644
index 0000000..16eee75
@ -87,5 +87,5 @@ index 0000000..7a9e75f
+ return S_OK;
+}
--
2.6.4
2.9.0

14
patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 75862379c05979ced69231fc1d69a6d7a750dfcb Mon Sep 17 00:00:00 2001
From 275174ba45b57fa9f65d2199700cab3a5cfea397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:00:39 +0100
Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
@ -13,13 +13,13 @@ Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index c46edf6..ff6de50 100644
index 4afa294..b4572d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2940,6 +2940,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
WINE_CONFIG_TEST(dlls/explorerframe/tests)
@@ -3012,6 +3012,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
WINE_CONFIG_DLL(faultrep,,[implib])
@ -43,10 +43,10 @@ index 0000000..22128a2
+@ stdcall SetCapture(long) user32.SetCapture
+@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 1b2c0bf..6e39ccc 100755
index 542e207..4b53feb 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -277,6 +277,7 @@ my @dll_groups =
@@ -283,6 +283,7 @@ my @dll_groups =
"api-ms-win-core-string-l2-1-0",
"api-ms-win-downlevel-user32-l1-1-0",
"api-ms-win-ntuser-dc-access-l1-1-0",
@ -55,5 +55,5 @@ index 1b2c0bf..6e39ccc 100755
[
"version",
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 1ee5402d4001e228e936b40ab7e3043c4e31c8b9 Mon Sep 17 00:00:00 2001
From 4af99f6f4d4e56d5cc7adfa52263b71232807f2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:02:52 +0100
Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
@ -13,12 +13,12 @@ Subject: ext-ms-win-uxtheme-themes-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 566b8f1..308f04e 100644
index b4572d3..20d799a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2938,6 +2938,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
@@ -3013,6 +3013,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0)
@ -62,10 +62,10 @@ index 0000000..0a96983
+@ stdcall OpenThemeDataEx(ptr wstr long) uxtheme.OpenThemeDataEx
+@ stdcall SetWindowTheme(ptr wstr wstr) uxtheme.SetWindowTheme
diff --git a/tools/make_specfiles b/tools/make_specfiles
index f9aea98..52d6583 100755
index 4b53feb..e7d6c74 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -300,6 +300,10 @@ my @dll_groups =
@@ -312,6 +312,10 @@ my @dll_groups =
"api-ms-win-core-winrt-string-l1-1-0",
],
[
@ -77,5 +77,5 @@ index f9aea98..52d6583 100755
"irprops.cpl",
],
--
2.7.1
2.9.0

14
patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 53a6d2753fe70e58d14e366c88dac1c8e65ea6aa Mon Sep 17 00:00:00 2001
From b2c7de654c69a9d0aedb4c1d40cd4218df1869bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:06:59 +0100
Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
@ -13,12 +13,12 @@ Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 9ee4464..f38d37a 100644
index 9a621f7..99cf576 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2939,6 +2939,7 @@ WINE_CONFIG_TEST(dlls/explorerframe/tests)
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
@@ -3014,6 +3014,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0)
@ -40,10 +40,10 @@ index 0000000..626c778
+@ stdcall GetSysColor(long) user32.GetSysColor
+@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors
diff --git a/tools/make_specfiles b/tools/make_specfiles
index c88a32c..a602e5d 100755
index 276e3b3..976dcb4 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -276,6 +276,7 @@ my @dll_groups =
@@ -285,6 +285,7 @@ my @dll_groups =
"api-ms-win-ntuser-dc-access-l1-1-0",
"api-ms-win-rtcore-ntuser-window-l1-1-0",
"ext-ms-win-ntuser-mouse-l1-1-0",
@ -52,5 +52,5 @@ index c88a32c..a602e5d 100755
[
"version",
--
2.6.4
2.9.0

14
patches/api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
View File

@ -1,4 +1,4 @@
From 06fc57e35f3424d17d8e3cb61692d594691674f4 Mon Sep 17 00:00:00 2001
From c8663fed050b92db5376d4b9892f783b3c3fa2de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:10:37 +0100
Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
@ -13,11 +13,11 @@ Subject: ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.
create mode 100644 dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index 4c803cc..bb63b0d 100644
index 9ff6713..0436524 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
@@ -3016,6 +3016,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
@ -58,10 +58,10 @@ index 0000000..ffb8f5b
+@ stdcall SystemParametersInfoA(long long ptr long) user32.SystemParametersInfoA
+@ stdcall SystemParametersInfoW(long long ptr long) user32.SystemParametersInfoW
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 43b8dc2..af88f8b 100755
index da114a5..758e4df 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -281,6 +281,7 @@ my @dll_groups =
@@ -287,6 +287,7 @@ my @dll_groups =
"api-ms-win-rtcore-ntuser-window-l1-1-0",
"ext-ms-win-ntuser-mouse-l1-1-0",
"ext-ms-win-rtcore-ntuser-syscolors-l1-1-0",
@ -70,5 +70,5 @@ index 43b8dc2..af88f8b 100755
[
"version",
--
2.7.1
2.9.0

56
patches/api-ms-win-Stub_DLLs/0021-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
View File

@ -1,56 +0,0 @@
From 5989f92d5a873732acb8cb9af4011ce7e145bbb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 23 Jan 2016 21:13:02 +0100
Subject: ext-ms-win-kernel32-package-current-l1-1-0: Add dll.
---
configure.ac | 1 +
dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in | 1 +
.../ext-ms-win-kernel32-package-current-l1-1-0.spec | 2 ++
tools/make_specfiles | 1 +
4 files changed, 5 insertions(+)
create mode 100644 dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
create mode 100644 dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
diff --git a/configure.ac b/configure.ac
index d2abe1d..dc1b078 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2958,6 +2958,7 @@ WINE_CONFIG_DLL(explorerframe,,[clean])
WINE_CONFIG_TEST(dlls/explorerframe/tests)
WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-gdi-devcaps-l1-1-0)
+WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-syscolors-l1-1-0)
WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0)
diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
new file mode 100644
index 0000000..c4699b1
--- /dev/null
+++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in
@@ -0,0 +1 @@
+MODULE = ext-ms-win-kernel32-package-current-l1-1-0.dll
diff --git a/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
new file mode 100644
index 0000000..2156c27
--- /dev/null
+++ b/dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-kernel32-package-current-l1-1-0.spec
@@ -0,0 +1,2 @@
+@ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId
+@ stub GetCurrentPackageInfo
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 1337fca..756ae00 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -180,6 +180,7 @@ my @dll_groups =
"api-ms-win-core-xstate-l2-1-0",
"api-ms-win-core-errorhandling-l1-1-2",
"api-ms-win-core-util-l1-1-0",
+ "ext-ms-win-kernel32-package-current-l1-1-0",
],
[
"kernel32",
--
2.9.0

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

8
patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch
View File

@ -1,4 +1,4 @@
From 4dfeafbe2c75253ecca37810fa7351e326e9e310 Mon Sep 17 00:00:00 2001
From 608383e76cb10d836433a2a7355a1e8e790a63e1 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Tue, 15 Sep 2015 17:44:33 -0600
Subject: msidb: Add stub tool for manipulating MSI databases.
@ -13,16 +13,16 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@wine-staging.com>
create mode 100644 programs/msidb/main.c
diff --git a/configure.ac b/configure.ac
index ac75845..71a245d 100644
index c624c9e..1bb859e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3522,6 +3522,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
@@ -3552,6 +3552,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install])
WINE_CONFIG_PROGRAM(lodctr,,[install])
WINE_CONFIG_PROGRAM(mofcomp,,[install])
WINE_CONFIG_PROGRAM(mshta,,[install])
+WINE_CONFIG_PROGRAM(msidb,,[install,installbin])
WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage])
WINE_CONFIG_PROGRAM(msinfo32,,[install])
WINE_CONFIG_PROGRAM(msinfo32,,[clean,install])
WINE_CONFIG_PROGRAM(net,,[clean,install])
diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in
new file mode 100644

57
patches/patchinstall.sh
View File

@ -52,7 +52,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "7ce384c4153112201aa263da6dee15fed21a4e06"
echo "eb5339edaca1c09d76b4afa32bdb07c1549e6650"
}
# Show version information
@ -397,7 +397,6 @@ patch_enable_all ()
enable_winmm_Delay_Import_Depends="$1"
enable_winmm_mciSendCommandA="$1"
enable_wintrust_WinVerifyTrust="$1"
enable_wmic_Query_Path="$1"
enable_wpcap_Dynamic_Linking="$1"
enable_wpcap_Several_Fixes="$1"
enable_ws2_32_APC_Performance="$1"
@ -1371,9 +1370,6 @@ patch_enable ()
wintrust-WinVerifyTrust)
enable_wintrust_WinVerifyTrust="$2"
;;
wmic-Query_Path)
enable_wmic_Query_Path="$2"
;;
wpcap-Dynamic_Linking)
enable_wpcap_Dynamic_Linking="$2"
;;
@ -2606,7 +2602,8 @@ fi
# Patchset kernel32-GetCurrentPackageFamilyName
# |
# | Modified files:
# | * dlls/kernel32/kernel32.spec, dlls/kernel32/version.c
# | * 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
# |
if test "$enable_kernel32_GetCurrentPackageFamilyName" -eq 1; then
patch_apply kernel32-GetCurrentPackageFamilyName/0001-kernel32-Add-stub-for-GetCurrentPackageFamilyName-an.patch
@ -2639,10 +2636,9 @@ fi
# | * [#40451] Add feclient dll
# |
# | Modified files:
# | * configure.ac, dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in, dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-
# | appmodel-runtime-l1-1-1.spec, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-
# | core-heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-
# | core-quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-shlwapi-
# | * configure.ac, dlls/api-ms-win-core-heap-l2-1-0/Makefile.in, dlls/api-ms-win-core-heap-l2-1-0/api-ms-win-core-
# | heap-l2-1-0.spec, dlls/api-ms-win-core-quirks-l1-1-0/Makefile.in, dlls/api-ms-win-core-quirks-l1-1-0/api-ms-win-core-
# | quirks-l1-1-0.spec, dlls/api-ms-win-core-shlwapi-obsolete-l1-2-0/Makefile.in, dlls/api-ms-win-core-shlwapi-
# | obsolete-l1-2-0/api-ms-win-core-shlwapi-obsolete-l1-2-0.spec, dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in,
# | dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec, dlls/api-ms-win-rtcore-ntuser-
# | window-l1-1-0/Makefile.in, dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec, dlls
@ -2651,24 +2647,22 @@ fi
# | shcore-stream-l1-1-0.spec, dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in, dlls/api-ms-win-shcore-thread-l1-1-0/api-
# | ms-win-shcore-thread-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/Makefile.in, dlls/ext-ms-win-appmodel-
# | usercontext-l1-1-0/ext-ms-win-appmodel-usercontext-l1-1-0.spec, dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c, dlls
# | /ext-ms-win-kernel32-package-current-l1-1-0/Makefile.in, dlls/ext-ms-win-kernel32-package-current-l1-1-0/ext-ms-win-
# | kernel32-package-current-l1-1-0.spec, dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-
# | mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-
# | ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-
# | sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-
# | sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-
# | win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-
# | xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec,
# | dlls/feclient/main.c, dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c,
# | dlls/kernelbase/Makefile.in, dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in,
# | dlls/shcore/main.c, dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, dlls/uiautomationcore/Makefile.in,
# | dlls/uiautomationcore/main.c, dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in,
# | include/shellscalingapi.h, include/uiautomationcoreapi.h, tools/make_specfiles
# | /ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in, dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec,
# | dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-
# | rtcore-ntuser-syscolors-l1-1-0.spec, dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0/Makefile.in, dlls/ext-ms-win-rtcore-
# | ntuser-sysparams-l1-1-0/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0.spec, dlls/ext-ms-win-uxtheme-
# | themes-l1-1-0/Makefile.in, dlls/ext-ms-win-uxtheme-themes-l1-1-0/ext-ms-win-uxtheme-themes-l1-1-0.spec, dlls/ext-ms-win-
# | xaml-pal-l1-1-0/Makefile.in, dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec, dlls/ext-ms-win-xaml-
# | pal-l1-1-0/main.c, dlls/feclient/Makefile.in, dlls/feclient/feclient.spec, dlls/feclient/main.c,
# | dlls/iertutil/Makefile.in, dlls/iertutil/iertutil.spec, dlls/iertutil/main.c, dlls/kernelbase/Makefile.in,
# | dlls/kernelbase/kernelbase.spec, dlls/kernelbase/misc.c, dlls/shcore/Makefile.in, dlls/shcore/main.c,
# | dlls/shcore/shcore.spec, dlls/shlwapi/shlwapi.spec, dlls/uiautomationcore/Makefile.in, dlls/uiautomationcore/main.c,
# | dlls/uiautomationcore/uiautomationcore.spec, include/Makefile.in, include/shellscalingapi.h,
# | include/uiautomationcoreapi.h, tools/make_specfiles
# |
if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
patch_apply api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
patch_apply api-ms-win-Stub_DLLs/0002-api-ms-win-core-quirks-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0003-api-ms-win-appmodel-runtime-l1-1-1-Add-new-dll.patch
patch_apply api-ms-win-Stub_DLLs/0005-api-ms-win-core-heap-l2-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch
patch_apply api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch
@ -2685,7 +2679,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
patch_apply api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0020-ext-ms-win-rtcore-ntuser-sysparams-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0021-ext-ms-win-kernel32-package-current-l1-1-0-Add-dll.patch
patch_apply api-ms-win-Stub_DLLs/0022-shcore-Add-SetProcessDpiAwareness-stub.patch
patch_apply api-ms-win-Stub_DLLs/0023-shcore-Implement-stub-for-GetDpiForMonitor.patch
patch_apply api-ms-win-Stub_DLLs/0024-kernelbase-Add-stub-for-QuirkIsEnabled3.patch
@ -2695,7 +2688,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
(
echo '+ { "Michael Müller", "kernelbase: Add dll and add stub for QuirkIsEnabled.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-core-quirks-l1-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-appmodel-runtime-l1-1-1: Add new dll.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-core-heap-l2-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "iertutil: Add dll and add stub for ordinal 811.", 1 },';
echo '+ { "Sebastian Lackner", "shcore: Add dll.", 1 },';
@ -2712,7 +2704,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
echo '+ { "Michael Müller", "ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "ext-ms-win-rtcore-ntuser-sysparams-l1-1-0: Add dll.", 1 },';
echo '+ { "Michael Müller", "ext-ms-win-kernel32-package-current-l1-1-0: Add dll.", 1 },';
echo '+ { "Sebastian Lackner", "shcore: Add SetProcessDpiAwareness stub.", 1 },';
echo '+ { "Sebastian Lackner", "shcore: Implement stub for GetDpiForMonitor.", 1 },';
echo '+ { "Michael Müller", "kernelbase: Add stub for QuirkIsEnabled3.", 1 },';
@ -8014,18 +8005,6 @@ if test "$enable_wintrust_WinVerifyTrust" -eq 1; then
) >> "$patchlist"
fi
# Patchset wmic-Query_Path
# |
# | Modified files:
# | * programs/wmic/main.c, programs/wmic/wmic.h, programs/wmic/wmic.rc
# |
if test "$enable_wmic_Query_Path" -eq 1; then
patch_apply wmic-Query_Path/0001-wmic-Improve-cmd-line-parser-and-add-support-for-pat.patch
(
echo '+ { "Michael Müller", "wmic: Improve cmd line parser and add support for path command.", 1 },';
) >> "$patchlist"
fi
# Patchset wpcap-Several_Fixes
# |
# | Modified files:

42
patches/wined3d-CSMT_Main/9999-IfDefined.patch
View File

@ -8186,7 +8186,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
UINT rt_count, const struct wined3d_fb_state *fb) DECLSPEC_HIDDEN;
BOOL context_apply_draw_state(struct wined3d_context *context,
const struct wined3d_device *device, const struct wined3d_state *state) DECLSPEC_HIDDEN;
@@ -2364,7 +2422,11 @@ struct wined3d_stream_state
@@ -2380,7 +2438,11 @@ struct wined3d_stream_state
struct wined3d_state
{
DWORD flags;
@ -8198,7 +8198,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_vertex_declaration *vertex_declaration;
struct wined3d_stream_output stream_output[MAX_STREAM_OUT];
@@ -2411,6 +2473,16 @@ struct wined3d_state
@@ -2427,6 +2489,16 @@ struct wined3d_state
struct wined3d_rasterizer_state *rasterizer_state;
};
@ -8215,7 +8215,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
#define WINED3D_UNMAPPED_STAGE ~0U
/* Multithreaded flag. Removed from the public header to signal that
@@ -2463,16 +2535,21 @@ struct wined3d_device
@@ -2479,16 +2551,21 @@ struct wined3d_device
struct wined3d_rendertarget_view *back_buffer_view;
struct wined3d_swapchain **swapchains;
UINT swapchain_count;
@ -8237,7 +8237,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* For rendering to a texture using glCopyTexImage */
GLuint depth_blt_texture;
@@ -2524,9 +2601,23 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
@@ -2540,9 +2617,23 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL
UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN;
void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -8261,7 +8261,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
static inline BOOL isStateDirty(const struct wined3d_context *context, DWORD state)
{
@@ -2571,7 +2662,11 @@ struct wined3d_resource
@@ -2587,7 +2678,11 @@ struct wined3d_resource
UINT depth;
UINT size;
DWORD priority;
@ -8273,7 +8273,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct list resource_list_entry;
LONG access_count;
@@ -2618,6 +2713,9 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI
@@ -2634,6 +2729,9 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HI
GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN;
BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
@ -8283,7 +8283,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN;
/* Tests show that the start address of resources is 32 byte aligned */
@@ -2679,6 +2777,9 @@ struct wined3d_texture
@@ -2695,6 +2793,9 @@ struct wined3d_texture
DWORD flags;
GLenum target;
DWORD update_map_binding;
@ -8293,7 +8293,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
GLuint rb_multisample;
GLuint rb_resolved;
@@ -2715,7 +2816,12 @@ struct wined3d_texture
@@ -2731,7 +2832,12 @@ struct wined3d_texture
unsigned int map_count;
DWORD locations;
@ -8306,7 +8306,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
} sub_resources[1];
};
@@ -2766,11 +2872,23 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
@@ -2782,11 +2888,23 @@ void wined3d_texture_bind(struct wined3d_texture *texture,
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
void wined3d_texture_bind_and_dirtify(struct wined3d_texture *texture,
struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN;
@ -8330,7 +8330,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_texture_sub_resource *wined3d_texture_get_sub_resource(struct wined3d_texture *texture,
unsigned int sub_resource_idx) DECLSPEC_HIDDEN;
void wined3d_texture_invalidate_location(struct wined3d_texture *texture,
@@ -2783,13 +2901,26 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size
@@ -2799,13 +2917,26 @@ void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size
const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) DECLSPEC_HIDDEN;
BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned int sub_resource_idx,
struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
@ -8357,7 +8357,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_texture_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx,
const struct wined3d_context *context, const struct wined3d_const_bo_address *data,
unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN;
@@ -2898,7 +3029,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru
@@ -2914,7 +3045,11 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru
unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN;
void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb,
struct wined3d_context *context) DECLSPEC_HIDDEN;
@ -8369,7 +8369,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN;
void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN;
void surface_set_compatible_renderbuffer(struct wined3d_surface *surface,
@@ -2909,6 +3044,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
@@ -2925,6 +3060,11 @@ HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const P
void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info,
const struct wined3d_format *format, const RECT *src_rect, UINT src_pitch, const POINT *dst_point,
BOOL srgb, const struct wined3d_const_bo_address *data) DECLSPEC_HIDDEN;
@ -8381,7 +8381,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context,
const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;
@@ -2923,6 +3063,12 @@ struct wined3d_sampler
@@ -2939,6 +3079,12 @@ struct wined3d_sampler
GLuint name;
};
@ -8394,7 +8394,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_vertex_declaration_element
{
const struct wined3d_format *format;
@@ -3018,6 +3164,7 @@ struct wined3d_stateblock
@@ -3034,6 +3180,7 @@ struct wined3d_stateblock
void stateblock_init_contained_states(struct wined3d_stateblock *stateblock) DECLSPEC_HIDDEN;
void state_cleanup(struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -8402,7 +8402,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb,
const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info,
DWORD flags) DECLSPEC_HIDDEN;
@@ -3031,54 +3178,150 @@ enum wined3d_push_constants
@@ -3047,54 +3194,150 @@ enum wined3d_push_constants
WINED3D_PUSH_CONSTANTS_PS_I,
WINED3D_PUSH_CONSTANTS_VS_B,
WINED3D_PUSH_CONSTANTS_PS_B,
@ -8553,7 +8553,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_set_rasterizer_state(struct wined3d_cs *cs,
struct wined3d_rasterizer_state *rasterizer_state) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs,
@@ -3108,6 +3351,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
@@ -3124,6 +3367,7 @@ void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform
void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs,
struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN;
void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN;
@ -8561,7 +8561,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN;
HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx,
struct wined3d_map_desc *map_desc, const struct wined3d_box *box, unsigned int flags) DECLSPEC_HIDDEN;
@@ -3119,6 +3363,24 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d
@@ -3135,6 +3379,24 @@ static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d
{
cs->ops->push_constants(cs, p, start_idx, count, constants);
}
@ -8586,7 +8586,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
/* TODO: Add tests and support for FLOAT16_4 POSITIONT, D3DCOLOR position, other
* fixed function semantics as D3DCOLOR or FLOAT16 */
@@ -3145,6 +3407,9 @@ struct wined3d_buffer
@@ -3161,6 +3423,9 @@ struct wined3d_buffer
GLenum buffer_object_usage;
GLenum buffer_type_hint;
DWORD flags;
@ -8596,7 +8596,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void *map_ptr;
struct wined3d_map_range *maps;
@@ -3169,11 +3434,19 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co
@@ -3185,11 +3450,19 @@ void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *co
BYTE *buffer_get_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN;
void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context,
const struct wined3d_state *state) DECLSPEC_HIDDEN;
@ -8616,7 +8616,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
struct wined3d_rendertarget_view
{
@@ -3235,7 +3508,12 @@ struct wined3d_unordered_access_view
@@ -3251,7 +3524,12 @@ struct wined3d_unordered_access_view
struct wined3d_swapchain_ops
{
void (*swapchain_present)(struct wined3d_swapchain *swapchain,
@ -8629,7 +8629,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
void (*swapchain_frontbuffer_updated)(struct wined3d_swapchain *swapchain);
};
@@ -3272,6 +3550,10 @@ struct wined3d_swapchain
@@ -3288,6 +3566,10 @@ struct wined3d_swapchain
void wined3d_swapchain_activate(struct wined3d_swapchain *swapchain, BOOL activate) DECLSPEC_HIDDEN;
struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN;

138
patches/wmic-Query_Path/0001-wmic-Improve-cmd-line-parser-and-add-support-for-pat.patch
View File

@ -1,138 +0,0 @@
From a672d372862991d9dbccdcff1b342b3965fd5e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 27 Apr 2016 00:41:08 +0200
Subject: wmic: Improve cmd line parser and add support for path command.
---
programs/wmic/main.c | 74 ++++++++++++++++++++++++++++++++++++++++++---------
programs/wmic/wmic.h | 1 +
programs/wmic/wmic.rc | 1 +
3 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/programs/wmic/main.c b/programs/wmic/main.c
index 5aee4c1..46c360f 100644
--- a/programs/wmic/main.c
+++ b/programs/wmic/main.c
@@ -162,7 +162,7 @@ static int output_message( int msg )
return output_string( fmtW, buffer );
}
-static int query_prop( const WCHAR *alias, const WCHAR *propname )
+static int query_prop( const WCHAR *class, const WCHAR *propname )
{
static const WCHAR select_allW[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',0};
static const WCHAR cimv2W[] = {'R','O','O','T','\\','C','I','M','V','2',0};
@@ -175,18 +175,12 @@ static int query_prop( const WCHAR *alias, const WCHAR *propname )
IEnumWbemClassObject *result = NULL;
LONG flags = WBEM_FLAG_RETURN_IMMEDIATELY | WBEM_FLAG_FORWARD_ONLY;
BSTR path = NULL, wql = NULL, query = NULL;
- const WCHAR *class;
WCHAR *prop = NULL;
BOOL first = TRUE;
int len, ret = -1;
- WINE_TRACE("%s, %s\n", debugstr_w(alias), debugstr_w(propname));
+ WINE_TRACE("%s, %s\n", debugstr_w(class), debugstr_w(propname));
- if (!(class = find_class( alias )))
- {
- output_message( STRING_ALIAS_NOT_FOUND );
- return -1;
- }
CoInitialize( NULL );
CoInitializeSecurity( NULL, -1, NULL, NULL, RPC_C_AUTHN_LEVEL_DEFAULT,
RPC_C_IMP_LEVEL_IMPERSONATE, NULL, EOAC_NONE, NULL );
@@ -253,11 +247,67 @@ done:
int wmain(int argc, WCHAR *argv[])
{
static const WCHAR getW[] = {'g','e','t',0};
+ static const WCHAR quitW[] = {'q','u','i','t',0};
+ static const WCHAR exitW[] = {'e','x','i','t',0};
+ static const WCHAR pathW[] = {'p','a','t','h',0};
+ static const WCHAR classW[] = {'c','l','a','s','s',0};
+ static const WCHAR contextW[] = {'c','o','n','t','e','x','t',0};
+
+ const WCHAR *class;
+ const WCHAR *value;
+ int i;
+
+ if (argc == 1)
+ goto not_supported;
- if (argc != 4 || strcmpiW( argv[2], getW ))
+ for (i = 1; i < argc && argv[i][0] == '/'; i++)
+ WINE_FIXME("command line switch %s not supported\n", debugstr_w(argv[i]));
+
+ if (i >= argc)
+ goto not_supported;
+
+ if (!strcmpiW( argv[i], quitW ) ||
+ !strcmpiW( argv[i], exitW ))
+ {
+ return 0;
+ }
+ else if (!strcmpiW( argv[i], classW) ||
+ !strcmpiW( argv[i], contextW))
{
- output_message( STRING_CMDLINE_NOT_SUPPORTED );
- return -1;
+ WINE_FIXME("command %s not supported\n", debugstr_w(argv[i]));
+ goto not_supported;
}
- return query_prop( argv[1], argv[3] );
+ else if (!strcmpiW( argv[i], pathW))
+ {
+ if (++i >= argc)
+ {
+ output_message( STRING_INVALID_PATH );
+ return 1;
+ }
+ class = argv[i];
+ }
+ else
+ {
+ class = find_class( argv[i] );
+ if (!class)
+ {
+ output_message( STRING_ALIAS_NOT_FOUND );
+ return 1;
+ }
+ }
+
+ if (++i >= argc)
+ goto not_supported;
+
+ if (!strcmpiW( argv[i], getW))
+ {
+ if (++i >= argc)
+ goto not_supported;
+ value = argv[i];
+ return query_prop( class, value );
+ }
+
+not_supported:
+ output_message( STRING_CMDLINE_NOT_SUPPORTED );
+ return 1;
}
diff --git a/programs/wmic/wmic.h b/programs/wmic/wmic.h
index ee56d8e..2727270 100644
--- a/programs/wmic/wmic.h
+++ b/programs/wmic/wmic.h
@@ -21,3 +21,4 @@
#define STRING_CMDLINE_NOT_SUPPORTED 101
#define STRING_ALIAS_NOT_FOUND 102
#define STRING_INVALID_QUERY 103
+#define STRING_INVALID_PATH 104
diff --git a/programs/wmic/wmic.rc b/programs/wmic/wmic.rc
index 54384fb..a530682 100644
--- a/programs/wmic/wmic.rc
+++ b/programs/wmic/wmic.rc
@@ -27,4 +27,5 @@ STRINGTABLE
STRING_CMDLINE_NOT_SUPPORTED, "Error: Command line not supported\n"
STRING_ALIAS_NOT_FOUND, "Error: Alias not found\n"
STRING_INVALID_QUERY, "Error: Invalid query\n"
+ STRING_INVALID_PATH, "Invalid syntax for PATH\n"
}
--
2.8.0

1
patches/wmic-Query_Path/definition
View File

@ -1 +0,0 @@
Fixes: Improve wmic cmd line parser and add support for path command