From fcca2476bf86c263f2d0a79cd2d8266db279ab01 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Tue, 6 Mar 2018 09:29:38 +1100 Subject: [PATCH] Rebase against acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0 --- ...asic-implementation-for-starting-pro.patch | 22 +- .../advapi32-Token_Integrity_Level/definition | 1 - ...Add-dll-and-add-stub-for-ordinal-811.patch | 22 +- ...s-win-shcore-obsolete-l1-1-0-Add-dll.patch | 24 +- ...pal-l1-1-0-Add-dll-and-add-stub-for-.patch | 22 +- ...del-usercontext-l1-1-0-Add-dll-and-a.patch | 20 +- ...-ms-win-shcore-thread-l1-1-0-Add-dll.patch | 32 +- ...pal-l1-1-0-Add-stub-for-GetThemeServ.patch | 6 +- ...-ms-win-shcore-stream-l1-1-0-Add-dll.patch | 32 +- ...t-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch | 32 +- ...ms-win-uxtheme-themes-l1-1-0-Add-dll.patch | 26 +- ...-rtcore-ntuser-window-l1-1-0-Add-dll.patch | 32 +- ...core-ntuser-syscolors-l1-1-0-Add-dll.patch | 32 +- ...in-rtcore-ntuser-draw-l1-1-0-Add-dll.patch | 24 +- .../0026-feclient-Add-stub-dll.patch | 22 +- ...core-Add-dll-and-stub-some-functions.patch | 14 +- patches/api-ms-win-Stub_DLLs/definition | 1 - ...ypt-tests-Add-tests-for-AES-GCM-mode.patch | 26 +- ...a-and-asymmetric-key-related-bcrypt-.patch | 28 +- ...-stub-for-ID3DXEffectImpl_CloneEffec.patch | 21 +- ...nt-ID3DXEffect_FindNextValidTechniqu.patch | 17 +- ...a2-tests-Add-tests-for-dxva2-decoder.patch | 22 +- ...rnel32-Add-a-bunch-of-kernel32-stubs.patch | 344 ------------------ patches/kernel32-UmsStubs/definition | 1 - ...-tool-for-manipulating-MSI-databases.patch | 22 +- ...ProcessImageFileNameWin32-in-NtQuery.patch | 117 ------ .../definition | 1 - .../0001-nvapi-First-implementation.patch | 26 +- .../0002-nvcuda-Add-stub-dll.patch | 20 +- .../0003-nvcuda-First-implementation.patch | 20 +- .../0001-nvcuvid-First-implementation.patch | 28 +- ...001-nvencodeapi-First-implementation.patch | 22 +- patches/patchinstall.sh | 71 +--- ...ror-code-in-SfcGetNextProtectedFile-.patch | 25 -- ...gtk-Add-configure-check-and-stub-dll.patch | 28 +- ...nd-dll-with-STAGING_CSMT-definition-.patch | 26 +- .../wined3d-CSMT_Main/9999-IfDefined.patch | 32 +- .../0001-win32k.sys-Add-stub-driver.patch | 26 +- .../0002-dxgkrnl.sys-Add-stub-driver.patch | 28 +- .../0003-dxgmms1.sys-Add-stub-driver.patch | 28 +- .../0001-wuauserv-Add-dummy-service.patch | 26 +- staging/VERSION | 2 +- 42 files changed, 395 insertions(+), 976 deletions(-) delete mode 100644 patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch delete mode 100644 patches/kernel32-UmsStubs/definition delete mode 100644 patches/ntdll-ProcessImageFileNameWin32/0001-ntdll-Implement-ProcessImageFileNameWin32-in-NtQuery.patch delete mode 100644 patches/ntdll-ProcessImageFileNameWin32/definition delete mode 100644 patches/sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch diff --git a/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch b/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch index f530be0c..4ffc1f25 100644 --- a/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch +++ b/patches/advapi32-Token_Integrity_Level/0014-programs-runas-Basic-implementation-for-starting-pro.patch @@ -1,4 +1,4 @@ -From 2a9bb71fbdf753e5e17e1b3bb4018bef9e4f21e0 Mon Sep 17 00:00:00 2001 +From 05b8bc95cff5742cf02b67afa3d6fc875d26e041 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 6 Aug 2017 03:15:34 +0200 Subject: [PATCH] programs/runas: Basic implementation for starting processes @@ -17,17 +17,17 @@ Subject: [PATCH] programs/runas: Basic implementation for starting processes create mode 100644 programs/runas/runas.rc diff --git a/configure.ac b/configure.ac -index 7b796ef..69f64b7 100644 +index cfc2080..5c97c1c 100644 --- a/configure.ac +++ b/configure.ac -@@ -3834,6 +3834,7 @@ WINE_CONFIG_TEST(programs/regedit/tests) - WINE_CONFIG_PROGRAM(regsvcs) - WINE_CONFIG_PROGRAM(regsvr32) - WINE_CONFIG_PROGRAM(rpcss) -+WINE_CONFIG_PROGRAM(runas) - WINE_CONFIG_PROGRAM(rundll.exe16,enable_win16) - WINE_CONFIG_PROGRAM(rundll32) - WINE_CONFIG_PROGRAM(sc) +@@ -3847,6 +3847,7 @@ WINE_CONFIG_MAKEFILE(programs/regedit/tests) + WINE_CONFIG_MAKEFILE(programs/regsvcs) + WINE_CONFIG_MAKEFILE(programs/regsvr32) + WINE_CONFIG_MAKEFILE(programs/rpcss) ++WINE_CONFIG_MAKEFILE(programs/runas) + WINE_CONFIG_MAKEFILE(programs/rundll.exe16,enable_win16) + WINE_CONFIG_MAKEFILE(programs/rundll32) + WINE_CONFIG_MAKEFILE(programs/sc) diff --git a/programs/runas/Makefile.in b/programs/runas/Makefile.in new file mode 100644 index 0000000..be9434b @@ -340,5 +340,5 @@ index 0000000..f9297a4 + %2!u!: %3\n" +} -- -2.7.4 +1.9.1 diff --git a/patches/advapi32-Token_Integrity_Level/definition b/patches/advapi32-Token_Integrity_Level/definition index 3de0bb3c..0e484bac 100644 --- a/patches/advapi32-Token_Integrity_Level/definition +++ b/patches/advapi32-Token_Integrity_Level/definition @@ -2,7 +2,6 @@ Fixes: [40613] Basic implementation for token integrity levels and UAC handling Fixes: [39262] Run explorer.exe as unevaluated process Depends: advapi32-CreateRestrictedToken Depends: kernel32-COMSPEC -Depends: kernel32-UmsStubs Depends: server-CreateProcess_ACLs Depends: server-Misc_ACL Depends: Staging diff --git a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch index 3952d142..dd680bb6 100644 --- a/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch +++ b/patches/api-ms-win-Stub_DLLs/0006-iertutil-Add-dll-and-add-stub-for-ordinal-811.patch @@ -1,4 +1,4 @@ -From 3aee4225a4ce8907cd7f907b1dc3191f96eee4a0 Mon Sep 17 00:00:00 2001 +From 19683a27eaaed9c23635e9b5fa768a6c120a2ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 01:11:46 +0100 Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811. @@ -14,17 +14,17 @@ Subject: [PATCH] iertutil: Add dll and add stub for ordinal 811. create mode 100644 dlls/iertutil/main.c diff --git a/configure.ac b/configure.ac -index 7b796ef..48656d1 100644 +index 5c97c1c..d70dcea 100644 --- a/configure.ac +++ b/configure.ac -@@ -3275,6 +3275,7 @@ WINE_CONFIG_DLL(icmp) - WINE_CONFIG_DLL(ieframe) - WINE_CONFIG_TEST(dlls/ieframe/tests) - WINE_CONFIG_DLL(ieproxy) -+WINE_CONFIG_DLL(iertutil) - WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) - WINE_CONFIG_DLL(imaadp32.acm) - WINE_CONFIG_DLL(imagehlp) +@@ -3286,6 +3286,7 @@ WINE_CONFIG_MAKEFILE(dlls/icmp) + WINE_CONFIG_MAKEFILE(dlls/ieframe) + WINE_CONFIG_MAKEFILE(dlls/ieframe/tests) + WINE_CONFIG_MAKEFILE(dlls/ieproxy) ++WINE_CONFIG_MAKEFILE(dlls/iertutil) + WINE_CONFIG_MAKEFILE(dlls/ifsmgr.vxd,enable_win16) + WINE_CONFIG_MAKEFILE(dlls/imaadp32.acm) + WINE_CONFIG_MAKEFILE(dlls/imagehlp) diff --git a/dlls/iertutil/Makefile.in b/dlls/iertutil/Makefile.in new file mode 100644 index 0000000..268026e @@ -617,5 +617,5 @@ index 0000000..2b993a4 + return FALSE; +} -- -2.7.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch index 2cd9b4f4..dd024f75 100644 --- a/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0008-api-ms-win-shcore-obsolete-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From f4e4c077ff51929c3550f1557b69970db5d5cacb Mon Sep 17 00:00:00 2001 +From 774d9a59e3b87919cf9fe06638606400078d3738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:02:41 +0100 Subject: [PATCH] api-ms-win-shcore-obsolete-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: [PATCH] api-ms-win-shcore-obsolete-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-shcore-obsolete-l1-1-0/api-ms-win-shcore-obsolete-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 4c8614c..7755acd 100644 +index d70dcea..7215237 100644 --- a/configure.ac +++ b/configure.ac -@@ -2994,6 +2994,7 @@ WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) - WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) -+WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) +@@ -3016,6 +3016,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-management-l2-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-private-l1-1-1) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) ++WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-obsolete-l1-1-0/Makefile.in new file mode 100644 index 0000000..6588d13 @@ -41,10 +41,10 @@ index 0000000..edb8143 +@ stdcall SHStrDupA(str ptr) shcore.SHStrDupA +@ stdcall SHStrDupW(wstr ptr) shcore.SHStrDupW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 6b59b32..f200e7c 100755 +index e9bc1f4..6c1c05d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -334,6 +334,10 @@ my @dll_groups = +@@ -339,6 +339,10 @@ my @dll_groups = "api-ms-win-shcore-scaling-l1-1-1", ], [ diff --git a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch index 81c24baf..278fb453 100644 --- a/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch +++ b/patches/api-ms-win-Stub_DLLs/0009-ext-ms-win-xaml-pal-l1-1-0-Add-dll-and-add-stub-for-.patch @@ -1,4 +1,4 @@ -From 3b3bb661ed74bea58b863601e1c7e5d21c854a1d Mon Sep 17 00:00:00 2001 +From 78679414663a0d7d5e90227ab58bc6b9f4db9634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:07:35 +0100 Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add dll and add stub for @@ -15,17 +15,17 @@ Subject: [PATCH] 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 7a48b00..321757c 100644 +index 7215237..4d7111a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3241,6 +3241,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0) -+WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0) - WINE_CONFIG_DLL(faultrep) - WINE_CONFIG_TEST(dlls/faultrep/tests) - WINE_CONFIG_DLL(fltlib) +@@ -3252,6 +3252,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) ++WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/faultrep) + WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) + WINE_CONFIG_MAKEFILE(dlls/fltlib) diff --git a/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in b/dlls/ext-ms-win-xaml-pal-l1-1-0/Makefile.in new file mode 100644 index 0000000..6382d85 @@ -90,5 +90,5 @@ index 0000000..3e28275 + return TRUE; +} -- -2.7.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch b/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch index 48823698..45cd38db 100644 --- a/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch +++ b/patches/api-ms-win-Stub_DLLs/0010-ext-ms-win-appmodel-usercontext-l1-1-0-Add-dll-and-a.patch @@ -1,4 +1,4 @@ -From 41b8290ff725b97b059468904eb7c351326617df Mon Sep 17 00:00:00 2001 +From 247c41da056d4a7da8506229e1cf7364297dd693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 17:12:45 +0100 Subject: [PATCH] ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub @@ -15,17 +15,17 @@ Subject: [PATCH] ext-ms-win-appmodel-usercontext-l1-1-0: Add dll and add stub create mode 100644 dlls/ext-ms-win-appmodel-usercontext-l1-1-0/main.c diff --git a/configure.ac b/configure.ac -index b94569c..42bbf8d 100644 +index 4d7111a..6857372 100644 --- a/configure.ac +++ b/configure.ac -@@ -3207,6 +3207,7 @@ WINE_CONFIG_DLL(evr) - WINE_CONFIG_TEST(dlls/evr/tests) - WINE_CONFIG_DLL(explorerframe) - WINE_CONFIG_TEST(dlls/explorerframe/tests) -+WINE_CONFIG_DLL(ext-ms-win-appmodel-usercontext-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-authz-context-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) +@@ -3229,6 +3229,7 @@ WINE_CONFIG_MAKEFILE(dlls/evr) + WINE_CONFIG_MAKEFILE(dlls/evr/tests) + WINE_CONFIG_MAKEFILE(dlls/explorerframe) + WINE_CONFIG_MAKEFILE(dlls/explorerframe/tests) ++WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-appmodel-usercontext-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-authz-context-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-domainjoin-netjoin-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-dc-create-l1-1-1) 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 diff --git a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch index 7247054e..3693d7fa 100644 --- a/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0011-api-ms-win-shcore-thread-l1-1-0-Add-dll.patch @@ -1,7 +1,7 @@ -From 19a4e40be4d9ef69c06b79185631f462f613c906 Mon Sep 17 00:00:00 2001 +From 63c585529e159d3bb2bed357e393060543f02f84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 19 Jan 2016 16:19:11 +0100 -Subject: api-ms-win-shcore-thread-l1-1-0: Add dll +Subject: [PATCH] api-ms-win-shcore-thread-l1-1-0: Add dll --- configure.ac | 1 + @@ -13,27 +13,27 @@ Subject: api-ms-win-shcore-thread-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 4f88873c57c..9efeb2fb02f 100644 +index 6857372..a919cf3 100644 --- a/configure.ac +++ b/configure.ac -@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) -+WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) - WINE_CONFIG_DLL(apphelp) +@@ -3018,6 +3018,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) ++WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/apphelp) diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..0a20ccf206f +index 0000000..0a20ccf --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-thread-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec new file mode 100644 -index 00000000000..15330050ded +index 0000000..1533005 --- /dev/null +++ b/dlls/api-ms-win-shcore-thread-l1-1-0/api-ms-win-shcore-thread-l1-1-0.spec @@ -0,0 +1,8 @@ @@ -46,10 +46,10 @@ index 00000000000..15330050ded +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles -index 00f70283d49..7abb3be32e6 100755 +index 6c1c05d..7d43479 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -333,6 +333,7 @@ my @dll_groups = +@@ -341,6 +341,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", @@ -58,5 +58,5 @@ index 00f70283d49..7abb3be32e6 100755 [ "user32", -- -2.14.2 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch b/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch index f3a349cf..73f8b7fe 100644 --- a/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch +++ b/patches/api-ms-win-Stub_DLLs/0012-ext-ms-win-xaml-pal-l1-1-0-Add-stub-for-GetThemeServ.patch @@ -1,7 +1,7 @@ -From fd2f3c0b9b2f46dd2e0e114d678c555b59adae8d Mon Sep 17 00:00:00 2001 +From 751d2904a1ac0831cab220eaedbbd01ba8a14356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 21 Jan 2016 00:40:29 +0100 -Subject: ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices. +Subject: [PATCH] ext-ms-win-xaml-pal-l1-1-0: Add stub for GetThemeServices. --- dlls/ext-ms-win-xaml-pal-l1-1-0/ext-ms-win-xaml-pal-l1-1-0.spec | 2 +- @@ -37,5 +37,5 @@ index 3e28275..45353ba 100644 + return E_NOTIMPL; +} -- -2.6.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch index e35aa67b..522fbda5 100644 --- a/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0014-api-ms-win-shcore-stream-l1-1-0-Add-dll.patch @@ -1,7 +1,7 @@ -From 56a35eb70c12ef297d1030e7a13f9a5f5746d057 Mon Sep 17 00:00:00 2001 +From c246661c91da09d805209c903b0be5a14e99bc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 20:56:53 +0100 -Subject: api-ms-win-shcore-stream-l1-1-0: Add dll +Subject: [PATCH] api-ms-win-shcore-stream-l1-1-0: Add dll --- configure.ac | 1 + @@ -13,27 +13,27 @@ Subject: api-ms-win-shcore-stream-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 9efeb2fb02f..115becf5aaf 100644 +index a919cf3..8f16d3f 100644 --- a/configure.ac +++ b/configure.ac -@@ -2941,6 +2941,7 @@ WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) - WINE_CONFIG_DLL(api-ms-win-shcore-obsolete-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shcore-scaling-l1-1-1) -+WINE_CONFIG_DLL(api-ms-win-shcore-stream-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shcore-thread-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-shell-shellfolders-l1-1-0) +@@ -3018,6 +3018,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-service-winsvc-l1-2-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-obsolete-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-scaling-l1-1-1) ++WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-stream-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shcore-thread-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellcom-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-shell-shellfolders-l1-1-0) diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..df2caadd38b +index 0000000..df2caad --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-shcore-stream-l1-1-0.dll diff --git a/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec new file mode 100644 -index 00000000000..1ee9dd335b6 +index 0000000..1ee9dd3 --- /dev/null +++ b/dlls/api-ms-win-shcore-stream-l1-1-0/api-ms-win-shcore-stream-l1-1-0.spec @@ -0,0 +1,15 @@ @@ -53,10 +53,10 @@ index 00000000000..1ee9dd335b6 +@ stdcall SHOpenRegStreamA(long str str long) shcore.SHOpenRegStreamA +@ stdcall SHOpenRegStreamW(long wstr wstr long) shcore.SHOpenRegStreamW diff --git a/tools/make_specfiles b/tools/make_specfiles -index 7abb3be32e6..86509aa7fb7 100755 +index 7d43479..67c8f13 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -334,6 +334,7 @@ my @dll_groups = +@@ -342,6 +342,7 @@ my @dll_groups = "shcore", "api-ms-win-shcore-obsolete-l1-1-0", "api-ms-win-shcore-thread-l1-1-0", @@ -65,5 +65,5 @@ index 7abb3be32e6..86509aa7fb7 100755 [ "user32", -- -2.14.2 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch index d917cb30..8a5e749f 100644 --- a/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0015-ext-ms-win-ntuser-mouse-l1-1-0-Add-dll.patch @@ -1,7 +1,7 @@ -From ac72ceb861a2f245f4a79e783cac404f613b40e4 Mon Sep 17 00:00:00 2001 +From 70aad2173a86bec18aa8ffd92a73c35061634bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:00:39 +0100 -Subject: ext-ms-win-ntuser-mouse-l1-1-0: Add dll. +Subject: [PATCH] ext-ms-win-ntuser-mouse-l1-1-0: Add dll. --- configure.ac | 1 + @@ -13,27 +13,27 @@ 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 f653064bce0..9ff3018ffa0 100644 +index 8f16d3f..17b6070 100644 --- a/configure.ac +++ b/configure.ac -@@ -3138,6 +3138,7 @@ WINE_CONFIG_DLL(ext-ms-win-gdi-render-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-kernel32-package-current-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-kernel32-package-l1-1-1) - WINE_CONFIG_DLL(ext-ms-win-ntuser-message-l1-1-1) -+WINE_CONFIG_DLL(ext-ms-win-ntuser-mouse-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-ntuser-private-l1-1-1) - WINE_CONFIG_DLL(ext-ms-win-ntuser-rectangle-ext-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-ntuser-uicontext-ext-l1-1-0) +@@ -3242,6 +3242,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-gdi-render-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-current-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-kernel32-package-l1-1-1) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-message-l1-1-1) ++WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-mouse-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-private-l1-1-1) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-rectangle-ext-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-ntuser-uicontext-ext-l1-1-0) diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..c408dbbe052 +index 0000000..c408dbb --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-ntuser-mouse-l1-1-0.dll diff --git a/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec new file mode 100644 -index 00000000000..22128a256f1 +index 0000000..22128a2 --- /dev/null +++ b/dlls/ext-ms-win-ntuser-mouse-l1-1-0/ext-ms-win-ntuser-mouse-l1-1-0.spec @@ -0,0 +1,5 @@ @@ -43,10 +43,10 @@ index 00000000000..22128a256f1 +@ stdcall SetCapture(long) user32.SetCapture +@ stdcall TrackMouseEvent(ptr) user32.TrackMouseEvent diff --git a/tools/make_specfiles b/tools/make_specfiles -index 48fae02c87f..4e5d114356c 100755 +index 67c8f13..680ade4 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -339,6 +339,7 @@ my @dll_groups = +@@ -352,6 +352,7 @@ my @dll_groups = "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", "ext-ms-win-ntuser-message-l1-1-1", @@ -55,5 +55,5 @@ index 48fae02c87f..4e5d114356c 100755 "ext-ms-win-ntuser-rectangle-ext-l1-1-0", "api-ms-win-ntuser-rectangle-l1-1-0", -- -2.14.1 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch index 8f2cb8f4..7681b4a8 100644 --- a/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0016-ext-ms-win-uxtheme-themes-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 18bd05629631a5d059f2c63402fa74581dfdef54 Mon Sep 17 00:00:00 2001 +From 3ac2d7e513ec9872239ff0113a047f9b0dae5b79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:02:52 +0100 Subject: [PATCH] ext-ms-win-uxtheme-themes-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: [PATCH] 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 9305559..4edebb1 100644 +index 17b6070..10a1804 100644 --- a/configure.ac +++ b/configure.ac -@@ -3245,6 +3245,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-security-cryptui-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) - WINE_CONFIG_DLL(faultrep) - WINE_CONFIG_TEST(dlls/faultrep/tests) +@@ -3256,6 +3256,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) ++WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/faultrep) + WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) diff --git a/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in b/dlls/ext-ms-win-uxtheme-themes-l1-1-0/Makefile.in new file mode 100644 index 0000000..576b6f6 @@ -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 7839542..2232de6 100755 +index 680ade4..2e092f2 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -403,6 +403,10 @@ my @dll_groups = +@@ -408,6 +408,10 @@ my @dll_groups = "api-ms-win-core-winrt-string-l1-1-0", ], [ @@ -77,5 +77,5 @@ index 7839542..2232de6 100755 "irprops.cpl", ], -- -2.7.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch index cda87ec3..7b5649e8 100644 --- a/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0017-api-ms-win-rtcore-ntuser-window-l1-1-0-Add-dll.patch @@ -1,7 +1,7 @@ -From 0e6a0ebdbdbf269d9520479d67fe601a606147cb Mon Sep 17 00:00:00 2001 +From 4f6ca51c0b7da427f86b230f2cbd79ae43cfaee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:05:14 +0100 -Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll +Subject: [PATCH] api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll --- configure.ac | 1 + @@ -13,27 +13,27 @@ Subject: api-ms-win-rtcore-ntuser-window-l1-1-0: Add dll create mode 100644 dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index f4e5b466269..b7f1bcb6b19 100644 +index 10a1804..95bbaec 100644 --- a/configure.ac +++ b/configure.ac -@@ -2857,6 +2857,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-audit-l1-1-1) - WINE_CONFIG_DLL(api-ms-win-security-base-l1-1-0) +@@ -2994,6 +2994,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) ++WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-audit-l1-1-1) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-base-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..9641c2a6dd1 +index 0000000..9641c2a --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-rtcore-ntuser-window-l1-1-0.dll diff --git a/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec new file mode 100644 -index 00000000000..b7575c6fa75 +index 0000000..b7575c6 --- /dev/null +++ b/dlls/api-ms-win-rtcore-ntuser-window-l1-1-0/api-ms-win-rtcore-ntuser-window-l1-1-0.spec @@ -0,0 +1,81 @@ @@ -119,10 +119,10 @@ index 00000000000..b7575c6fa75 +@ stdcall WaitMessage() user32.WaitMessage +@ stdcall WindowFromPoint(int64) user32.WindowFromPoint diff --git a/tools/make_specfiles b/tools/make_specfiles -index cf2563b8e79..27b0cead5b6 100755 +index 2e092f2..133f97b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -315,6 +315,7 @@ my @dll_groups = +@@ -351,6 +351,7 @@ my @dll_groups = "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", "api-ms-win-rtcore-ntuser-private-l1-1-0", @@ -131,5 +131,5 @@ index cf2563b8e79..27b0cead5b6 100755 "ext-ms-win-ntuser-mouse-l1-1-0", "ext-ms-win-ntuser-private-l1-1-1", -- -2.12.2 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch index dcae45a2..c34b62e7 100644 --- a/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0018-ext-ms-win-rtcore-ntuser-syscolors-l1-1-0-Add-dll.patch @@ -1,7 +1,7 @@ -From 6ea995be80a3f9ed89f1aad8a246bdd7923c42f3 Mon Sep 17 00:00:00 2001 +From 79ce94a2d0759aa94f7a7985930e3226093c622b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:06:59 +0100 -Subject: ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll. +Subject: [PATCH] ext-ms-win-rtcore-ntuser-syscolors-l1-1-0: Add dll. --- configure.ac | 1 + @@ -13,37 +13,37 @@ 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 99ef34fdda5..cb28b8af0ce 100644 +index 95bbaec..1869352 100644 --- a/configure.ac +++ b/configure.ac -@@ -3117,6 +3117,7 @@ WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-object-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-rtcore-gdi-rgn-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-rtcore-ntuser-dpi-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) - WINE_CONFIG_DLL(ext-ms-win-security-credui-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-security-cryptui-l1-1-0) +@@ -3254,6 +3254,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-object-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-gdi-rgn-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dc-access-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-dpi-l1-1-0) ++WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-rtcore-ntuser-sysparams-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-credui-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-security-cryptui-l1-1-0) diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in new file mode 100644 -index 00000000000..3e6b6e8f0e7 +index 0000000..3e6b6e8 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.dll diff --git a/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec new file mode 100644 -index 00000000000..626c778c49f +index 0000000..626c778 --- /dev/null +++ b/dlls/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0/ext-ms-win-rtcore-ntuser-syscolors-l1-1-0.spec @@ -0,0 +1,2 @@ +@ stdcall GetSysColor(long) user32.GetSysColor +@ stdcall SetSysColors(long ptr ptr) user32.SetSysColors diff --git a/tools/make_specfiles b/tools/make_specfiles -index 48d32b83629..556355234b3 100755 +index 133f97b..ab16e25 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -339,6 +339,7 @@ my @dll_groups = +@@ -362,6 +362,7 @@ my @dll_groups = "ext-ms-win-ntuser-window-l1-1-1", "ext-ms-win-rtcore-ntuser-dc-access-l1-1-0", "ext-ms-win-rtcore-ntuser-dpi-l1-1-0", @@ -52,5 +52,5 @@ index 48d32b83629..556355234b3 100755 ], [ -- -2.13.1 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch index 9d654e56..3d96b6b1 100644 --- a/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0019-api-ms-win-rtcore-ntuser-draw-l1-1-0-Add-dll.patch @@ -1,4 +1,4 @@ -From 2dde29c954187ccfc2bbbb9aad463c055392fda6 Mon Sep 17 00:00:00 2001 +From ad85a42b7931c5cf7b1f042e5cd306fa413d86df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 23 Jan 2016 21:08:48 +0100 Subject: [PATCH] api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: [PATCH] api-ms-win-rtcore-ntuser-draw-l1-1-0: Add dll. create mode 100644 dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/api-ms-win-rtcore-ntuser-draw-l1-1-0.spec diff --git a/configure.ac b/configure.ac -index 2096d84..fc35889 100644 +index 1869352..18fc8a8 100644 --- a/configure.ac +++ b/configure.ac -@@ -2971,6 +2971,7 @@ WINE_CONFIG_DLL(api-ms-win-ntuser-rectangle-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-perf-legacy-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) -+WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-draw-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-window-l1-1-0) - WINE_CONFIG_DLL(api-ms-win-security-activedirectoryclient-l1-1-0) +@@ -2993,6 +2993,7 @@ WINE_CONFIG_MAKEFILE(dlls/api-ms-win-ntuser-rectangle-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-perf-legacy-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-base-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-power-setting-l1-1-0) ++WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-private-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-rtcore-ntuser-window-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/api-ms-win-security-activedirectoryclient-l1-1-0) diff --git a/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in b/dlls/api-ms-win-rtcore-ntuser-draw-l1-1-0/Makefile.in new file mode 100644 index 0000000..956f2f3 @@ -39,10 +39,10 @@ index 0000000..59900a9 @@ -0,0 +1 @@ +@ stdcall RedrawWindow(long ptr long long) user32.RedrawWindow diff --git a/tools/make_specfiles b/tools/make_specfiles -index b10e199..b1fd1fc 100755 +index ab16e25..eac36ca 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -345,6 +345,7 @@ my @dll_groups = +@@ -350,6 +350,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", diff --git a/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch b/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch index 7c6a5a70..10ac0953 100644 --- a/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0026-feclient-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From d781adf58a895bfa34e1634c2f953dae45538f60 Mon Sep 17 00:00:00 2001 +From b03da4a4b66c303a58037d6a241c8326bb6057e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 12 Apr 2016 01:00:02 +0200 Subject: [PATCH] feclient: Add stub dll. @@ -14,17 +14,17 @@ Subject: [PATCH] feclient: Add stub dll. create mode 100644 dlls/feclient/main.c diff --git a/configure.ac b/configure.ac -index 8935eee..d8b240a 100644 +index 18fc8a8..fa783a6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3252,6 +3252,7 @@ WINE_CONFIG_DLL(ext-ms-win-uxtheme-themes-l1-1-0) - WINE_CONFIG_DLL(ext-ms-win-xaml-pal-l1-1-0) - WINE_CONFIG_DLL(faultrep) - WINE_CONFIG_TEST(dlls/faultrep/tests) -+WINE_CONFIG_DLL(feclient) - WINE_CONFIG_DLL(fltlib) - WINE_CONFIG_DLL(fltmgr.sys) - WINE_CONFIG_DLL(fntcache) +@@ -3263,6 +3263,7 @@ WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-uxtheme-themes-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/ext-ms-win-xaml-pal-l1-1-0) + WINE_CONFIG_MAKEFILE(dlls/faultrep) + WINE_CONFIG_MAKEFILE(dlls/faultrep/tests) ++WINE_CONFIG_MAKEFILE(dlls/feclient) + WINE_CONFIG_MAKEFILE(dlls/fltlib) + WINE_CONFIG_MAKEFILE(dlls/fltmgr.sys) + WINE_CONFIG_MAKEFILE(dlls/fntcache) diff --git a/dlls/feclient/Makefile.in b/dlls/feclient/Makefile.in new file mode 100644 index 0000000..d3eeefb @@ -129,5 +129,5 @@ index 0000000..91aed70 + return TRUE; +} -- -2.7.4 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch b/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch index 37d6c0f4..da450f72 100644 --- a/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch +++ b/patches/api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch @@ -1,7 +1,7 @@ -From 0c9c23711c9608551eebd1d60159e2fe523347f0 Mon Sep 17 00:00:00 2001 +From 562369cf1fc87ffd0f46b184f0e3f2492610f65b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 12 Apr 2016 01:02:34 +0200 -Subject: uiautomationcore: Add dll and stub some functions. +Subject: [PATCH] uiautomationcore: Add dll and stub some functions. --- dlls/uiautomationcore/Makefile.in | 1 + @@ -11,7 +11,7 @@ Subject: uiautomationcore: Add dll and stub some functions. 4 files changed, 61 insertions(+), 12 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in -index 78d6254a015..029fc2e4995 100644 +index 78d6254..029fc2e 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,4 +1,5 @@ @@ -21,7 +21,7 @@ index 78d6254a015..029fc2e4995 100644 C_SRCS = \ uia_main.c diff --git a/dlls/uiautomationcore/uia_main.c b/dlls/uiautomationcore/uia_main.c -index 31b7d3e7aa1..ff0506dc7d9 100644 +index 31b7d3e..ff0506d 100644 --- a/dlls/uiautomationcore/uia_main.c +++ b/dlls/uiautomationcore/uia_main.c @@ -1,4 +1,5 @@ @@ -134,7 +134,7 @@ index 31b7d3e7aa1..ff0506dc7d9 100644 } diff --git a/dlls/uiautomationcore/uiautomationcore.spec b/dlls/uiautomationcore/uiautomationcore.spec -index 48a06b2fdad..8e676adaae1 100644 +index 48a06b2..8e676ad 100644 --- a/dlls/uiautomationcore/uiautomationcore.spec +++ b/dlls/uiautomationcore/uiautomationcore.spec @@ -53,6 +53,8 @@ @@ -169,7 +169,7 @@ index 48a06b2fdad..8e676adaae1 100644 @ stub UiaRemoveEvent @ stdcall UiaReturnRawElementProvider(long long long ptr) diff --git a/include/uiautomationcoreapi.h b/include/uiautomationcoreapi.h -index 12c509fbec8..5ddf4b67e3d 100644 +index 12c509f..5ddf4b6 100644 --- a/include/uiautomationcoreapi.h +++ b/include/uiautomationcoreapi.h @@ -39,18 +39,19 @@ DECLARE_HANDLE(HUIAPATTERNOBJECT); @@ -197,5 +197,5 @@ index 12c509fbec8..5ddf4b67e3d 100644 HRESULT WINAPI UiaRaiseAutomationEvent(IRawElementProviderSimple *provider, EVENTID id); LRESULT WINAPI UiaReturnRawElementProvider(HWND hwnd, WPARAM wParam, LPARAM lParam, IRawElementProviderSimple *elprov); -- -2.12.2 +1.9.1 diff --git a/patches/api-ms-win-Stub_DLLs/definition b/patches/api-ms-win-Stub_DLLs/definition index 4488ce1e..9fe46087 100644 --- a/patches/api-ms-win-Stub_DLLs/definition +++ b/patches/api-ms-win-Stub_DLLs/definition @@ -20,4 +20,3 @@ Fixes: Add iertutil dll Fixes: Add shcore dll Fixes: [40451] Add feclient dll Depends: combase-RoApi -Depends: kernel32-UmsStubs diff --git a/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch b/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch index 199e19df..650261c8 100644 --- a/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch +++ b/patches/bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch @@ -1,16 +1,15 @@ -From 47562c6e22ad737b206b5a5632ba4da83ad86fe4 Mon Sep 17 00:00:00 2001 +From 82785fee09e7d5cfce76ca4cc08291ecba19d393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 26 Dec 2016 05:37:02 +0100 -Subject: [PATCH 11/36] bcrypt/tests: Add tests for AES GCM mode. +Subject: [PATCH] bcrypt/tests: Add tests for AES GCM mode. --- dlls/bcrypt/tests/bcrypt.c | 155 ++++++++++++++++++++++++++++++++++++++++++++- include/bcrypt.h | 24 ++++++- - include/ntstatus.h | 2 + - 3 files changed, 179 insertions(+), 2 deletions(-) + 2 files changed, 177 insertions(+), 2 deletions(-) diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c -index 6e283487b5..6cefe13226 100644 +index 6e28348..6cefe13 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -564,6 +564,8 @@ static void test_BCryptGenerateSymmetricKey(void) @@ -225,7 +224,7 @@ index 6e283487b5..6cefe13226 100644 ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } diff --git a/include/bcrypt.h b/include/bcrypt.h -index 1be9b8533e..d0b29c7cdd 100644 +index 1be9b85..d0b29c7 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -96,7 +96,29 @@ typedef struct __BCRYPT_KEY_LENGTHS_STRUCT @@ -259,19 +258,6 @@ index 1be9b8533e..d0b29c7cdd 100644 typedef struct _CRYPT_INTERFACE_REG { -diff --git a/include/ntstatus.h b/include/ntstatus.h -index 86dad85b43..7026de7f85 100644 ---- a/include/ntstatus.h -+++ b/include/ntstatus.h -@@ -990,6 +990,8 @@ - - #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) - -+#define STATUS_AUTH_TAG_MISMATCH ((NTSTATUS) 0xC000A002) -+ - #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001) - #define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS) 0xC0020002) - #define RPC_NT_INVALID_BINDING ((NTSTATUS) 0xC0020003) -- -2.16.1 +1.9.1 diff --git a/patches/bcrypt-Improvements/0031-include-Add-ecdsa-and-asymmetric-key-related-bcrypt-.patch b/patches/bcrypt-Improvements/0031-include-Add-ecdsa-and-asymmetric-key-related-bcrypt-.patch index f30c1f73..de9f42b0 100644 --- a/patches/bcrypt-Improvements/0031-include-Add-ecdsa-and-asymmetric-key-related-bcrypt-.patch +++ b/patches/bcrypt-Improvements/0031-include-Add-ecdsa-and-asymmetric-key-related-bcrypt-.patch @@ -1,16 +1,15 @@ -From 6cc2de819b2d72c282b130304f266fe37229c957 Mon Sep 17 00:00:00 2001 +From 9f12175593de82371bbd40c51f1cf4ea09378590 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 29 Sep 2017 18:49:09 +0200 -Subject: [PATCH 30/36] include: Add ecdsa and asymmetric key related bcrypt - definitions. +Subject: [PATCH] include: Add ecdsa and asymmetric key related + bcrypt definitions. --- - include/bcrypt.h | 28 ++++++++++++++++++++++++++++ - include/ntstatus.h | 2 ++ - 2 files changed, 30 insertions(+) + include/bcrypt.h | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) diff --git a/include/bcrypt.h b/include/bcrypt.h -index d0b29c7cdd..bf47576ab0 100644 +index d0b29c7..bf47576 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -61,6 +61,8 @@ typedef LONG NTSTATUS; @@ -69,19 +68,6 @@ index d0b29c7cdd..bf47576ab0 100644 #define BCRYPT_AUTHENTICATED_CIPHER_MODE_INFO_VERSION 1 #define BCRYPT_AUTH_MODE_CHAIN_CALLS_FLAG 0x00000001 -diff --git a/include/ntstatus.h b/include/ntstatus.h -index 7026de7f85..735b6c2c41 100644 ---- a/include/ntstatus.h -+++ b/include/ntstatus.h -@@ -990,6 +990,8 @@ - - #define STATUS_WOW_ASSERTION ((NTSTATUS) 0xC0009898) - -+#define STATUS_INVALID_SIGNATURE ((NTSTATUS) 0xC000A000) -+#define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS) 0xC000A001) - #define STATUS_AUTH_TAG_MISMATCH ((NTSTATUS) 0xC000A002) - - #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS) 0xC0020001) -- -2.16.1 +1.9.1 diff --git a/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch b/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch index 315fdd2c..2d82cef1 100644 --- a/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch +++ b/patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch @@ -1,24 +1,21 @@ -From 8577047f9cdde21a8eb190eed9cc794132155830 Mon Sep 17 00:00:00 2001 +From 9d0ef03a1986a1dc29ff6b509d21183725617e93 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Mon, 16 Mar 2015 08:18:33 +0100 -Subject: d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect. +Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect. --- - dlls/d3dx9_36/effect.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) + dlls/d3dx9_36/effect.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c -index 5b140fe..efbcb92 100644 +index 965caa8..5160f3a 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c -@@ -3906,7 +3906,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, - - FIXME("(%p)->(%p, %p): stub\n", This, device, effect); +@@ -4378,7 +4378,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface, + if (!device) + return D3DERR_INVALIDCALL; - return E_NOTIMPL; -+ if (!effect) -+ return D3DXERR_INVALIDDATA; -+ + iface->lpVtbl->AddRef(iface); + *effect = iface; + return S_OK; @@ -26,5 +23,5 @@ index 5b140fe..efbcb92 100644 #if _D3DX9_VER >= 27 -- -2.8.0 +1.9.1 diff --git a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch index 1e74eada..a0466ab7 100644 --- a/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch +++ b/patches/d3dx9_36-FindNextValidTechnique/0001-d3dx9_36-Implement-ID3DXEffect_FindNextValidTechniqu.patch @@ -1,7 +1,8 @@ -From 73498c6ee55422b032f7a0e3c2329254a810e5d3 Mon Sep 17 00:00:00 2001 +From f462b95015bf3ec86638dfad41ee219b2384f131 Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Fri, 19 Dec 2014 22:31:46 +0100 -Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests. +Subject: [PATCH] d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add + tests. --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++--- @@ -9,7 +10,7 @@ Subject: d3dx9_36: Implement ID3DXEffect_FindNextValidTechnique + add tests. 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c -index ce2e5d86e5f..0f2f9cfd2d7 100644 +index 5160f3a..707c52f 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -3984,13 +3984,41 @@ done: @@ -58,10 +59,10 @@ index ce2e5d86e5f..0f2f9cfd2d7 100644 static BOOL walk_parameter_dep(struct d3dx_parameter *param, walk_parameter_dep_func param_func, diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c -index 96b21f0454c..6b81582ab7e 100644 +index ced6c8e..a6fe609 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c -@@ -7281,6 +7281,65 @@ static void test_effect_null_shader(void) +@@ -7368,6 +7368,65 @@ if (hr == D3D_OK) DestroyWindow(window); } @@ -126,8 +127,8 @@ index 96b21f0454c..6b81582ab7e 100644 + START_TEST(effect) { - HWND wnd; -@@ -7333,6 +7392,7 @@ START_TEST(effect) + IDirect3DDevice9 *device; +@@ -7396,6 +7455,7 @@ START_TEST(effect) test_effect_large_address_aware_flag(device); test_effect_get_pass_desc(device); test_effect_skip_constants(device); @@ -136,5 +137,5 @@ index 96b21f0454c..6b81582ab7e 100644 refcount = IDirect3DDevice9_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); -- -2.14.1 +1.9.1 diff --git a/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch b/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch index 7d52ce61..e209a607 100644 --- a/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch +++ b/patches/dxva2-Video_Decoder/0006-dxva2-tests-Add-tests-for-dxva2-decoder.patch @@ -1,4 +1,4 @@ -From 48e3213aa30f783ebc6a1c099c374ae9a69a8697 Mon Sep 17 00:00:00 2001 +From c861c2026ec36ad285138e4036919874bd25c60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 22 Feb 2015 01:21:18 +0100 Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder. @@ -12,17 +12,17 @@ Subject: [PATCH] dxva2/tests: Add tests for dxva2 decoder. create mode 100644 dlls/dxva2/tests/dxva2.c diff --git a/configure.ac b/configure.ac -index 7b796ef..4a93549 100644 +index d719536..c6c7653 100644 --- a/configure.ac +++ b/configure.ac -@@ -3212,6 +3212,7 @@ WINE_CONFIG_DLL(dxgi) - WINE_CONFIG_TEST(dlls/dxgi/tests) - WINE_CONFIG_LIB(dxguid) - WINE_CONFIG_DLL(dxva2) -+WINE_CONFIG_TEST(dlls/dxva2/tests) - WINE_CONFIG_DLL(esent) - WINE_CONFIG_DLL(evr) - WINE_CONFIG_TEST(dlls/evr/tests) +@@ -3231,6 +3231,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxgi) + WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) + WINE_CONFIG_MAKEFILE(dlls/dxguid) + WINE_CONFIG_MAKEFILE(dlls/dxva2) ++WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) + WINE_CONFIG_MAKEFILE(dlls/esent) + WINE_CONFIG_MAKEFILE(dlls/evr) + WINE_CONFIG_MAKEFILE(dlls/evr/tests) diff --git a/dlls/dxva2/tests/Makefile.in b/dlls/dxva2/tests/Makefile.in new file mode 100644 index 0000000..10d6af5 @@ -412,5 +412,5 @@ index 0000000..dcbb990 + test_decoder_service(window); +} -- -2.7.4 +1.9.1 diff --git a/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch b/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch deleted file mode 100644 index fd7f4835..00000000 --- a/patches/kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch +++ /dev/null @@ -1,344 +0,0 @@ -From 382ce2af9afc78d09793854af6105bde6d7a8151 Mon Sep 17 00:00:00 2001 -From: Dmitry Timoshkov -Date: Thu, 16 Jun 2016 18:56:21 +0800 -Subject: [PATCH] kernel32: Add a bunch of kernel32 stubs. - -64-bit ACDSee Pro 9.0 on start up queries them with GetProcAddress() and -fails to start if any of these APIs is missing. ---- - dlls/kernel32/kernel32.spec | 26 ++++---- - dlls/kernel32/sync.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ - include/winbase.h | 17 ++++++ - include/winnt.h | 22 ++++++- - 4 files changed, 196 insertions(+), 14 deletions(-) - -diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec -index ee11c42..60809f4 100644 ---- a/dlls/kernel32/kernel32.spec -+++ b/dlls/kernel32/kernel32.spec -@@ -340,8 +340,8 @@ - @ stdcall CreateTimerQueue () - @ stdcall CreateTimerQueueTimer(ptr long ptr ptr long long long) - @ stdcall CreateToolhelp32Snapshot(long long) --# @ stub -arch=x86_64 CreateUmsCompletionList --# @ stub -arch=x86_64 CreateUmsThreadContext -+@ stdcall -arch=x86_64 CreateUmsCompletionList(ptr) -+@ stdcall -arch=x86_64 CreateUmsThreadContext(ptr) - @ stub CreateVirtualBuffer - @ stdcall CreateWaitableTimerA(ptr long str) - @ stdcall CreateWaitableTimerExA(ptr str long long) -@@ -373,11 +373,11 @@ - @ stdcall DeleteTimerQueue(long) - @ stdcall DeleteTimerQueueEx (long long) - @ stdcall DeleteTimerQueueTimer(long long long) --# @ stub -arch=x86_64 DeleteUmsCompletionList --# @ stub -arch=x86_64 DeleteUmsThreadContext -+@ stdcall -arch=x86_64 DeleteUmsCompletionList(ptr) -+@ stdcall -arch=x86_64 DeleteUmsThreadContext(ptr) - @ stdcall DeleteVolumeMountPointA(str) - @ stdcall DeleteVolumeMountPointW(wstr) --# @ stub -arch=x86_64 DequeueUmsCompletionListItems -+@ stdcall -arch=x86_64 DequeueUmsCompletionListItems(ptr long ptr) - @ stdcall DeviceIoControl(long long ptr long ptr long ptr ptr) - @ stdcall DisableThreadLibraryCalls(long) - @ stdcall DisconnectNamedPipe(long) -@@ -434,10 +434,10 @@ - @ stdcall EnumUILanguagesW(ptr long long) - # @ stub EnumerateLocalComputerNamesA - # @ stub EnumerateLocalComputerNamesW --# @ stub -arch=x86_64 EnterUmsSchedulingMode -+@ stdcall -arch=x86_64 EnterUmsSchedulingMode(ptr) - @ stdcall EraseTape(ptr long long) - @ stdcall EscapeCommFunction(long long) --# @ stub -arch=x86_64 ExecuteUmsThread -+@ stdcall -arch=x86_64 ExecuteUmsThread(ptr) - @ stdcall ExitProcess(long) - @ stdcall ExitThread(long) - @ stub ExitVDM -@@ -637,7 +637,7 @@ - @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx - @ stdcall -norelay GetCurrentThread() - @ stdcall -norelay GetCurrentThreadId() --# @ stub -arch=x86_64 GetCurrentUmsThread -+@ stdcall -arch=x86_64 GetCurrentUmsThread() - @ stdcall GetDateFormatA(long long ptr str ptr long) - @ stdcall GetDateFormatEx(wstr long ptr wstr ptr long wstr) - @ stdcall GetDateFormatW(long long ptr wstr ptr long) -@@ -735,7 +735,7 @@ - # @ stub GetNamedPipeServerProcessId - # @ stub GetNamedPipeServerSessionId - @ stdcall GetNativeSystemInfo(ptr) --# @ stub -arch=x86_64 GetNextUmsListItem -+@ stdcall -arch=x86_64 GetNextUmsListItem(ptr) - @ stub GetNextVDMCommand - @ stub GetNlsSectionName - # @ stub GetNLSVersion -@@ -866,7 +866,7 @@ - @ stdcall GetTimeZoneInformationForYear(long ptr ptr) - @ stdcall GetThreadUILanguage() - # @ stub GetUILanguageInfo --# @ stub -arch=x86_64 GetUmsCompletionListEvent -+@ stdcall -arch=x86_64 GetUmsCompletionListEvent(ptr ptr) - # @ stub -arch=x86_64 GetUmsSystemThreadInformation - @ stdcall GetUserDefaultLCID() - @ stdcall GetUserDefaultLangID() -@@ -1175,7 +1175,7 @@ - @ stdcall QueryThreadCycleTime(long ptr) - # @ stub QueryThreadProfiling - # @ stub QueryThreadpoolStackInformation --# @ stub -arch=x86_64 QueryUmsThreadInformation -+@ stdcall -arch=x86_64 QueryUmsThreadInformation(ptr long ptr long ptr) - @ stdcall QueryUnbiasedInterruptTime(ptr) - @ stub QueryWin31IniFilesMappedToRegistry - @ stdcall QueueUserAPC(ptr long long) -@@ -1464,7 +1464,7 @@ - @ stdcall SetThreadpoolWait(ptr long ptr) - @ stdcall SetTimeZoneInformation(ptr) - @ stub SetTimerQueueTimer --# @ stub -arch=x86_64 SetUmsThreadInformation -+@ stdcall -arch=x86_64 SetUmsThreadInformation(ptr long ptr long) - @ stdcall SetUnhandledExceptionFilter(ptr) - @ stdcall SetUserGeoID(long) - @ stub SetVDMCurrentDirectories -@@ -1524,7 +1524,7 @@ - # @ stub -arch=x86_64 uaw_wcsicmp - # @ stub -arch=x86_64 uaw_wcslen - # @ stub -arch=x86_64 uaw_wcsrchr --# @ stub -arch=x86_64 UmsThreadYield -+@ stdcall -arch=x86_64 UmsThreadYield(ptr) - # @ stub -arch=x86_64 __misaligned_access - @ stdcall -i386 -private UTRegister(long str str str ptr ptr ptr) krnl386.exe16.UTRegister - @ stdcall -i386 -private UTUnRegister(long) krnl386.exe16.UTUnRegister -diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c -index d3d46b7..b0ed3c5 100644 ---- a/dlls/kernel32/sync.c -+++ b/dlls/kernel32/sync.c -@@ -2454,3 +2454,148 @@ BOOL WINAPI SleepConditionVariableSRW( RTL_CONDITION_VARIABLE *variable, RTL_SRW - } - return TRUE; - } -+ -+ -+/*********************************************************************** -+ * CreateUmsCompletionList (KERNEL32.@) -+ */ -+BOOL WINAPI CreateUmsCompletionList( PUMS_COMPLETION_LIST *list ) -+{ -+ FIXME( "%p: stub\n", list ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * DequeueUmsCompletionListItems (KERNEL32.@) -+ */ -+BOOL WINAPI DequeueUmsCompletionListItems( void *list, DWORD timeout, PUMS_CONTEXT *ctx ) -+{ -+ FIXME( "%p,%08x,%p: stub\n", list, timeout, ctx ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * DeleteUmsCompletionList (KERNEL32.@) -+ */ -+BOOL WINAPI DeleteUmsCompletionList( PUMS_COMPLETION_LIST list ) -+{ -+ FIXME( "%p: stub\n", list ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * GetUmsCompletionListEvent (KERNEL32.@) -+ */ -+BOOL WINAPI GetUmsCompletionListEvent( PUMS_COMPLETION_LIST list, HANDLE *event ) -+{ -+ FIXME( "%p,%p: stub\n", list, event ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * CreateUmsThreadContext (KERNEL32.@) -+ */ -+BOOL WINAPI CreateUmsThreadContext( PUMS_CONTEXT *ctx ) -+{ -+ FIXME( "%p: stub\n", ctx ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * DeleteUmsThreadContext (KERNEL32.@) -+ */ -+BOOL WINAPI DeleteUmsThreadContext( PUMS_CONTEXT ctx ) -+{ -+ FIXME( "%p: stub\n", ctx ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * EnterUmsSchedulingMode (KERNEL32.@) -+ */ -+BOOL WINAPI EnterUmsSchedulingMode( UMS_SCHEDULER_STARTUP_INFO *info ) -+{ -+ FIXME( "%p: stub\n", info ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * ExecuteUmsThread (KERNEL32.@) -+ */ -+BOOL WINAPI ExecuteUmsThread( PUMS_CONTEXT ctx ) -+{ -+ FIXME( "%p: stub\n", ctx ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * GetCurrentUmsThread (KERNEL32.@) -+ */ -+PUMS_CONTEXT WINAPI GetCurrentUmsThread( void ) -+{ -+ FIXME( "stub\n" ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * GetNextUmsListItem (KERNEL32.@) -+ */ -+PUMS_CONTEXT WINAPI GetNextUmsListItem( PUMS_CONTEXT ctx ) -+{ -+ FIXME( "%p: stub\n", ctx ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return NULL; -+} -+ -+ -+/*********************************************************************** -+ * QueryUmsThreadInformation (KERNEL32.@) -+ */ -+BOOL WINAPI QueryUmsThreadInformation( PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, -+ void *buf, ULONG length, ULONG *ret_length ) -+{ -+ FIXME( "%p,%08x,%p,%08x,%p: stub\n", ctx, class, buf, length, ret_length ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * SetUmsThreadInformation (KERNEL32.@) -+ */ -+BOOL WINAPI SetUmsThreadInformation( PUMS_CONTEXT ctx, UMS_THREAD_INFO_CLASS class, -+ void *buf, ULONG length ) -+{ -+ FIXME( "%p,%08x,%p,%08x: stub\n", ctx, class, buf, length ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -+ -+ -+/*********************************************************************** -+ * UmsThreadYield (KERNEL32.@) -+ */ -+BOOL WINAPI UmsThreadYield( void *param ) -+{ -+ FIXME( "%p: stub\n", param ); -+ SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); -+ return FALSE; -+} -diff --git a/include/winbase.h b/include/winbase.h -index e47c87a..8d65d78 100644 ---- a/include/winbase.h -+++ b/include/winbase.h -@@ -1694,6 +1694,20 @@ typedef enum _PROC_THREAD_ATTRIBUTE_NUM - #define SYMBOLIC_LINK_FLAG_DIRECTORY (0x1) - #define VALID_SYMBOLIC_LINK_FLAGS SYMBOLIC_LINK_FLAG_DIRECTORY - -+typedef void *PUMS_CONTEXT; -+typedef void *PUMS_COMPLETION_LIST; -+typedef PRTL_UMS_SCHEDULER_ENTRY_POINT PUMS_SCHEDULER_ENTRY_POINT; -+typedef struct _UMS_SCHEDULER_STARTUP_INFO -+{ -+ ULONG UmsVersion; -+ PUMS_COMPLETION_LIST CompletionList; -+ PUMS_SCHEDULER_ENTRY_POINT SchedulerProc; -+ PVOID SchedulerParam; -+} UMS_SCHEDULER_STARTUP_INFO, *PUMS_SCHEDULER_STARTUP_INFO; -+ -+typedef enum _RTL_UMS_SCHEDULER_REASON UMS_SCHEDULER_REASON; -+typedef enum _RTL_UMS_THREAD_INFO_CLASS UMS_THREAD_INFO_CLASS, *PUMS_THREAD_INFO_CLASS; -+ - WINBASEAPI BOOL WINAPI ActivateActCtx(HANDLE,ULONG_PTR *); - WINADVAPI BOOL WINAPI AddAccessAllowedAce(PACL,DWORD,DWORD,PSID); - WINADVAPI BOOL WINAPI AddAccessAllowedAceEx(PACL,DWORD,DWORD,DWORD,PSID); -@@ -1862,6 +1876,8 @@ WINBASEAPI DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); - WINBASEAPI HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,SIZE_T,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); - WINBASEAPI HANDLE WINAPI CreateTimerQueue(void); - WINBASEAPI BOOL WINAPI CreateTimerQueueTimer(PHANDLE,HANDLE,WAITORTIMERCALLBACK,PVOID,DWORD,DWORD,ULONG); -+WINBASEAPI BOOL WINAPI CreateUmsCompletionList(PUMS_COMPLETION_LIST*); -+WINBASEAPI BOOL WINAPI CreateUmsThreadContext(PUMS_CONTEXT*); - WINBASEAPI HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); - WINBASEAPI HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); - #define CreateWaitableTimer WINELIB_NAME_AW(CreateWaitableTimer) -@@ -1920,6 +1936,7 @@ WINBASEAPI BOOL WINAPI EndUpdateResourceA(HANDLE,BOOL); - WINBASEAPI BOOL WINAPI EndUpdateResourceW(HANDLE,BOOL); - #define EndUpdateResource WINELIB_NAME_AW(EndUpdateResource) - WINBASEAPI void WINAPI EnterCriticalSection(CRITICAL_SECTION *lpCrit); -+WINBASEAPI BOOL WINAPI EnterUmsSchedulingMode(PUMS_SCHEDULER_STARTUP_INFO); - WINBASEAPI BOOL WINAPI EnumResourceLanguagesA(HMODULE,LPCSTR,LPCSTR,ENUMRESLANGPROCA,LONG_PTR); - WINBASEAPI BOOL WINAPI EnumResourceLanguagesW(HMODULE,LPCWSTR,LPCWSTR,ENUMRESLANGPROCW,LONG_PTR); - #define EnumResourceLanguages WINELIB_NAME_AW(EnumResourceLanguages) -diff --git a/include/winnt.h b/include/winnt.h -index 56b533c..6b598f3 100644 ---- a/include/winnt.h -+++ b/include/winnt.h -@@ -6120,9 +6120,29 @@ typedef VOID (CALLBACK *PTP_TIMER_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_TIME - typedef VOID (CALLBACK *PTP_WAIT_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PTP_WAIT,TP_WAIT_RESULT); - typedef VOID (CALLBACK *PTP_WIN32_IO_CALLBACK)(PTP_CALLBACK_INSTANCE,PVOID,PVOID,ULONG,ULONG_PTR,PTP_IO); - -- - NTSYSAPI BOOLEAN NTAPI RtlGetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD); - -+typedef enum _RTL_UMS_THREAD_INFO_CLASS -+{ -+ UmsThreadInvalidInfoClass, -+ UmsThreadUserContext, -+ UmsThreadPriority, -+ UmsThreadAffinity, -+ UmsThreadTeb, -+ UmsThreadIsSuspended, -+ UmsThreadIsTerminated, -+ UmsThreadMaxInfoClass -+} RTL_UMS_THREAD_INFO_CLASS, *PRTL_UMS_THREAD_INFO_CLASS; -+ -+typedef enum _RTL_UMS_SCHEDULER_REASON -+{ -+ UmsSchedulerStartup, -+ UmsSchedulerThreadBlocked, -+ UmsSchedulerThreadYield, -+} RTL_UMS_SCHEDULER_REASON, *PRTL_UMS_SCHEDULER_REASON; -+ -+typedef void (CALLBACK *PRTL_UMS_SCHEDULER_ENTRY_POINT)(RTL_UMS_SCHEDULER_REASON,ULONG_PTR,PVOID); -+ - #ifdef __cplusplus - } - #endif --- -1.9.1 - diff --git a/patches/kernel32-UmsStubs/definition b/patches/kernel32-UmsStubs/definition deleted file mode 100644 index 6fc91ac2..00000000 --- a/patches/kernel32-UmsStubs/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: [44619] Add stubs for user-mode scheduling functions diff --git a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch index df7ab43e..2c102620 100644 --- a/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch +++ b/patches/msidb-Implementation/0001-msidb-Add-stub-tool-for-manipulating-MSI-databases.patch @@ -1,4 +1,4 @@ -From ca5272000a739f6b249748b59c50c52ea8704d1e Mon Sep 17 00:00:00 2001 +From 1ef6c34bd97f4cb0bb9c2c8a0ac5e8f3f05460c7 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 15 Sep 2015 17:44:33 -0600 Subject: [PATCH] msidb: Add stub tool for manipulating MSI databases. @@ -13,17 +13,17 @@ Signed-off-by: Erich E. Hoover create mode 100644 programs/msidb/main.c diff --git a/configure.ac b/configure.ac -index 7b796ef..7c8d226 100644 +index 1f8ad92..9013441 100644 --- a/configure.ac +++ b/configure.ac -@@ -3813,6 +3813,7 @@ WINE_CONFIG_PROGRAM(ipconfig) - WINE_CONFIG_PROGRAM(lodctr) - WINE_CONFIG_PROGRAM(mofcomp) - WINE_CONFIG_PROGRAM(mshta) -+WINE_CONFIG_PROGRAM(msidb) - WINE_CONFIG_PROGRAM(msiexec) - WINE_CONFIG_PROGRAM(msinfo32) - WINE_CONFIG_PROGRAM(net) +@@ -3878,6 +3878,7 @@ WINE_CONFIG_MAKEFILE(programs/ipconfig) + WINE_CONFIG_MAKEFILE(programs/lodctr) + WINE_CONFIG_MAKEFILE(programs/mofcomp) + WINE_CONFIG_MAKEFILE(programs/mshta) ++WINE_CONFIG_MAKEFILE(programs/msidb) + WINE_CONFIG_MAKEFILE(programs/msiexec) + WINE_CONFIG_MAKEFILE(programs/msinfo32) + WINE_CONFIG_MAKEFILE(programs/net) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in new file mode 100644 index 0000000..dae699c @@ -198,5 +198,5 @@ index 0000000..43cc519 + return 0; +} -- -2.7.4 +1.9.1 diff --git a/patches/ntdll-ProcessImageFileNameWin32/0001-ntdll-Implement-ProcessImageFileNameWin32-in-NtQuery.patch b/patches/ntdll-ProcessImageFileNameWin32/0001-ntdll-Implement-ProcessImageFileNameWin32-in-NtQuery.patch deleted file mode 100644 index 305a9061..00000000 --- a/patches/ntdll-ProcessImageFileNameWin32/0001-ntdll-Implement-ProcessImageFileNameWin32-in-NtQuery.patch +++ /dev/null @@ -1,117 +0,0 @@ -From ce3e6afdf294cffd77b6a9ec3eb781d0d199e19e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Tue, 7 Mar 2017 01:57:42 +0100 -Subject: ntdll: Implement ProcessImageFileNameWin32 in - NtQueryInformationProcess. - ---- - dlls/kernel32/tests/process.c | 26 ++++++++++++++++---------- - dlls/ntdll/process.c | 1 + - include/winternl.h | 16 ++++++++++++++++ - 3 files changed, 33 insertions(+), 10 deletions(-) - -diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c -index c480a278c9..c83cbac3b9 100644 ---- a/dlls/kernel32/tests/process.c -+++ b/dlls/kernel32/tests/process.c -@@ -3085,23 +3085,23 @@ static void test_process_info(void) - sizeof(buf) /* ProcessHandleTracing */, - sizeof(ULONG) /* ProcessIoPriority */, - sizeof(ULONG) /* ProcessExecuteFlags */, --#if 0 /* FIXME: Add remaining classes */ -- ProcessResourceManagement, -- sizeof(ULONG) /* ProcessCookie */, -+ 0 /* FIXME: sizeof(?) ProcessTlsInformation */, -+ 0 /* FIXME: sizeof(?) ProcessCookie */, - sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, -- sizeof(PROCESS_CYCLE_TIME_INFORMATION) /* ProcessCycleTime */, -+ 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, - sizeof(ULONG) /* ProcessPagePriority */, - 40 /* ProcessInstrumentationCallback */, -- sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) /* ProcessThreadStackAllocation */, -- sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) /* ProcessWorkingSetWatchEx */, -+ 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, -+ 0 /* FIXME: sizeof(PROCESS_WS_WATCH_INFORMATION_EX[]) ProcessWorkingSetWatchEx */, - sizeof(buf) /* ProcessImageFileNameWin32 */, - sizeof(HANDLE) /* ProcessImageFileMapping */, -- sizeof(PROCESS_AFFINITY_UPDATE_MODE) /* ProcessAffinityUpdateMode */, -- sizeof(PROCESS_MEMORY_ALLOCATION_MODE) /* ProcessMemoryAllocationMode */, -- sizeof(USHORT[]) /* ProcessGroupInformation */, -+ 0 /* FIXME: sizeof(PROCESS_AFFINITY_UPDATE_MODE) ProcessAffinityUpdateMode */, -+ 0 /* FIXME: sizeof(PROCESS_MEMORY_ALLOCATION_MODE) ProcessMemoryAllocationMode */, -+ sizeof(USHORT) /* ProcessGroupInformation */, - sizeof(ULONG) /* ProcessTokenVirtualizationEnabled */, - sizeof(ULONG_PTR) /* ProcessConsoleHostProcess */, -- sizeof(PROCESS_WINDOW_INFORMATION) /* ProcessWindowInformation */, -+ 0 /* FIXME: sizeof(PROCESS_WINDOW_INFORMATION) ProcessWindowInformation */, -+#if 0 /* FIXME: Add remaining classes */ - sizeof(PROCESS_HANDLE_SNAPSHOT_INFORMATION) /* ProcessHandleInformation */, - sizeof(PROCESS_MITIGATION_POLICY_INFORMATION) /* ProcessMitigationPolicy */, - sizeof(ProcessDynamicFunctionTableInformation) /* ProcessDynamicFunctionTableInformation */, -@@ -3166,11 +3166,16 @@ static void test_process_info(void) - case ProcessDefaultHardErrorMode: - case ProcessHandleCount: - case ProcessImageFileName: -+ case ProcessImageInformation: -+ case ProcessPagePriority: -+ case ProcessImageFileNameWin32: - ok(status == STATUS_SUCCESS, "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; - - case ProcessAffinityMask: - case ProcessBreakOnTermination: -+ case ProcessGroupInformation: -+ case ProcessConsoleHostProcess: - ok(status == STATUS_ACCESS_DENIED /* before win8 */ || status == STATUS_SUCCESS /* win8 is less strict */, - "for info %u expected STATUS_SUCCESS, got %08x (ret_len %u)\n", i, status, ret_len); - break; -@@ -3183,6 +3188,7 @@ static void test_process_info(void) - case ProcessExecuteFlags: - case ProcessDebugPort: - case ProcessDebugFlags: -+ case ProcessCookie: - todo_wine - ok(status == STATUS_ACCESS_DENIED, "for info %u expected STATUS_ACCESS_DENIED, got %08x (ret_len %u)\n", i, status, ret_len); - break; -diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c -index 952225688c..bf8e4598a1 100644 ---- a/dlls/ntdll/process.c -+++ b/dlls/ntdll/process.c -@@ -501,6 +501,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( - case ProcessImageFileName: - /* FIXME: this will return a DOS path. Windows returns an NT path. Changing this would require also changing kernel32.QueryFullProcessImageName. - * The latter may be harder because of the lack of RtlNtPathNameToDosPathName. */ -+ case ProcessImageFileNameWin32: - SERVER_START_REQ(get_dll_info) - { - UNICODE_STRING *image_file_name_str = ProcessInformation; -diff --git a/include/winternl.h b/include/winternl.h -index 5cd1664f1f..3026e63adf 100644 ---- a/include/winternl.h -+++ b/include/winternl.h -@@ -824,6 +824,22 @@ typedef enum _PROCESSINFOCLASS { - ProcessDebugFlags = 31, - ProcessHandleTracing = 32, - ProcessExecuteFlags = 34, -+ ProcessTlsInformation = 35, -+ ProcessCookie = 36, -+ ProcessImageInformation = 37, -+ ProcessCycleTime = 38, -+ ProcessPagePriority = 39, -+ ProcessInstrumentationCallback = 40, -+ ProcessThreadStackAllocation = 41, -+ ProcessWorkingSetWatchEx = 42, -+ ProcessImageFileNameWin32 = 43, -+ ProcessImageFileMapping = 44, -+ ProcessAffinityUpdateMode = 45, -+ ProcessMemoryAllocationMode = 46, -+ ProcessGroupInformation = 47, -+ ProcessTokenVirtualizationEnabled = 48, -+ ProcessConsoleHostProcess = 49, -+ ProcessWindowInformation = 50, - MaxProcessInfoClass - } PROCESSINFOCLASS, PROCESS_INFORMATION_CLASS; - --- -2.12.2 - diff --git a/patches/ntdll-ProcessImageFileNameWin32/definition b/patches/ntdll-ProcessImageFileNameWin32/definition deleted file mode 100644 index 7c025c1c..00000000 --- a/patches/ntdll-ProcessImageFileNameWin32/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Implement ProcessImageFileNameWin32 info class diff --git a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch index 19515033..9bd39c06 100644 --- a/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch +++ b/patches/nvapi-Stub_DLL/0001-nvapi-First-implementation.patch @@ -1,4 +1,4 @@ -From 75d82d2ec02b8cef45c942e677824e5df4ddf135 Mon Sep 17 00:00:00 2001 +From 40cf610272e52f68631e9292342e1d020735b6a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 5 Jan 2015 18:11:53 +0100 Subject: [PATCH] nvapi: First implementation. @@ -25,10 +25,10 @@ Subject: [PATCH] nvapi: First implementation. create mode 100644 include/nvapi.h diff --git a/configure.ac b/configure.ac -index 87c507a..ce47cd0 100644 +index 55d8931..fbf0cce 100644 --- a/configure.ac +++ b/configure.ac -@@ -215,6 +215,12 @@ esac +@@ -216,6 +216,12 @@ esac dnl enable_win16 defaults to yes on x86, to no on other CPUs enable_win16=${enable_win16:-no} enable_win64=${enable_win64:-no} @@ -41,16 +41,16 @@ index 87c507a..ce47cd0 100644 dnl Disable winetest too if tests are disabled enable_winetest=${enable_winetest:-$enable_tests} -@@ -3543,6 +3549,9 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) - WINE_CONFIG_DLL(ntoskrnl.exe) - WINE_CONFIG_DLL(ntprint) - WINE_CONFIG_TEST(dlls/ntprint/tests) -+WINE_CONFIG_DLL(nvapi,enable_win32) -+WINE_CONFIG_TEST(dlls/nvapi/tests) -+WINE_CONFIG_DLL(nvapi64,enable_win64) - WINE_CONFIG_DLL(nvcuda) - WINE_CONFIG_TEST(dlls/nvcuda/tests) - WINE_CONFIG_DLL(objsel) +@@ -3554,6 +3560,9 @@ WINE_CONFIG_MAKEFILE(dlls/ntdsapi/tests) + WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) + WINE_CONFIG_MAKEFILE(dlls/ntprint) + WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) ++WINE_CONFIG_MAKEFILE(dlls/nvapi,enable_win32) ++WINE_CONFIG_MAKEFILE(dlls/nvapi/tests) ++WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64) + WINE_CONFIG_MAKEFILE(dlls/nvcuda) + WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) + WINE_CONFIG_MAKEFILE(dlls/objsel) diff --git a/dlls/nvapi/Makefile.in b/dlls/nvapi/Makefile.in new file mode 100644 index 0000000..606177f diff --git a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch index 6818d296..72e0947c 100644 --- a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch +++ b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch @@ -1,4 +1,4 @@ -From a62cf17f8a528ee62f75b2873d8d122f3259f4f2 Mon Sep 17 00:00:00 2001 +From 57fb98cda8eda7b8f42003a2ef44aabd7a8335f2 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 3 Jan 2015 03:32:12 +0100 Subject: [PATCH] nvcuda: Add stub dll. @@ -16,17 +16,17 @@ Subject: [PATCH] nvcuda: Add stub dll. create mode 100644 dlls/nvcuda/nvcuda.spec diff --git a/configure.ac b/configure.ac -index 91b3bdc..5da26eb 100644 +index efcfcfab..7b6f885 100644 --- a/configure.ac +++ b/configure.ac -@@ -3543,6 +3543,7 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests) - WINE_CONFIG_DLL(ntoskrnl.exe) - WINE_CONFIG_DLL(ntprint) - WINE_CONFIG_TEST(dlls/ntprint/tests) -+WINE_CONFIG_DLL(nvcuda) - WINE_CONFIG_DLL(objsel) - WINE_CONFIG_DLL(odbc32) - WINE_CONFIG_DLL(odbccp32) +@@ -3554,6 +3554,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntdsapi/tests) + WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) + WINE_CONFIG_MAKEFILE(dlls/ntprint) + WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) ++WINE_CONFIG_MAKEFILE(dlls/nvcuda) + WINE_CONFIG_MAKEFILE(dlls/objsel) + WINE_CONFIG_MAKEFILE(dlls/odbc32) + WINE_CONFIG_MAKEFILE(dlls/odbccp32) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in new file mode 100644 index 0000000..4b33278 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 686312ab..33af63f2 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -1,4 +1,4 @@ -From 78410816ed0347b61eccf018ab738e45cfc083ae Mon Sep 17 00:00:00 2001 +From 23dc0ba4777faeb635fbe3ae2f77dd64574d703a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 03:39:11 +0100 Subject: [PATCH] nvcuda: First implementation. (rev 2) @@ -23,17 +23,17 @@ Changes by Sebastian Lackner : create mode 100644 dlls/nvcuda/tests/nvcuda.c diff --git a/configure.ac b/configure.ac -index 5da26eb..87c507a 100644 +index 7b6f885..55d8931 100644 --- a/configure.ac +++ b/configure.ac -@@ -3544,6 +3544,7 @@ WINE_CONFIG_DLL(ntoskrnl.exe) - WINE_CONFIG_DLL(ntprint) - WINE_CONFIG_TEST(dlls/ntprint/tests) - WINE_CONFIG_DLL(nvcuda) -+WINE_CONFIG_TEST(dlls/nvcuda/tests) - WINE_CONFIG_DLL(objsel) - WINE_CONFIG_DLL(odbc32) - WINE_CONFIG_DLL(odbccp32) +@@ -3555,6 +3555,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) + WINE_CONFIG_MAKEFILE(dlls/ntprint) + WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) + WINE_CONFIG_MAKEFILE(dlls/nvcuda) ++WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) + WINE_CONFIG_MAKEFILE(dlls/objsel) + WINE_CONFIG_MAKEFILE(dlls/odbc32) + WINE_CONFIG_MAKEFILE(dlls/odbccp32) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in index 4b33278..0921ce6 100644 --- a/dlls/nvcuda/Makefile.in diff --git a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch index 16172fc3..c7cac751 100644 --- a/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch +++ b/patches/nvcuvid-CUDA_Video_Support/0001-nvcuvid-First-implementation.patch @@ -1,4 +1,4 @@ -From cee88b40a2b505c62f0253773085324a1d439187 Mon Sep 17 00:00:00 2001 +From f01ffa305cbc1f2150dbe5d08975a79eef5a7382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Tue, 6 Jan 2015 05:16:36 +0100 Subject: [PATCH] nvcuvid: First implementation. (rev 2) @@ -21,17 +21,17 @@ Changes by Sebastian Lackner : create mode 100644 include/nvcuvid.h diff --git a/configure.ac b/configure.ac -index 3ae50e9..e2a09d7 100644 +index fbf0cce..d1367f4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3477,6 +3477,7 @@ WINE_CONFIG_TEST(dlls/nvapi/tests) - WINE_CONFIG_DLL(nvapi64,enable_win64) - WINE_CONFIG_DLL(nvcuda) - WINE_CONFIG_TEST(dlls/nvcuda/tests) -+WINE_CONFIG_DLL(nvcuvid) - WINE_CONFIG_DLL(objsel) - WINE_CONFIG_DLL(odbc32) - WINE_CONFIG_DLL(odbccp32) +@@ -3565,6 +3565,7 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi/tests) + WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64) + WINE_CONFIG_MAKEFILE(dlls/nvcuda) + WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) ++WINE_CONFIG_MAKEFILE(dlls/nvcuvid) + WINE_CONFIG_MAKEFILE(dlls/objsel) + WINE_CONFIG_MAKEFILE(dlls/odbc32) + WINE_CONFIG_MAKEFILE(dlls/odbccp32) diff --git a/dlls/nvcuvid/Makefile.in b/dlls/nvcuvid/Makefile.in new file mode 100644 index 0000000..2c2dc8c @@ -616,10 +616,10 @@ index 0000000..433e7db +@ stdcall cuvidSetVideoSourceState(ptr long) wine_cuvidSetVideoSourceState +@ stdcall cuvidUnmapVideoFrame(ptr long) wine_cuvidUnmapVideoFrame diff --git a/include/Makefile.in b/include/Makefile.in -index 11244c0..da5a4f5 100644 +index b7bf57f..8b23127 100644 --- a/include/Makefile.in +++ b/include/Makefile.in -@@ -78,6 +78,7 @@ SOURCES = \ +@@ -79,6 +79,7 @@ SOURCES = \ ctxtcall.idl \ cuda.h \ custcntl.h \ @@ -627,7 +627,7 @@ index 11244c0..da5a4f5 100644 cvconst.h \ d2d1.idl \ d2d1_1.idl \ -@@ -475,6 +476,7 @@ SOURCES = \ +@@ -478,6 +479,7 @@ SOURCES = \ ntsecpkg.h \ ntstatus.h \ nvapi.h \ @@ -826,5 +826,5 @@ index 0000000..a192ef6 + +#endif /* __WINE_NVCUVID_H */ -- -2.7.4 +1.9.1 diff --git a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch index 3a4f10cd..623dd02c 100644 --- a/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch +++ b/patches/nvencodeapi-Video_Encoder/0001-nvencodeapi-First-implementation.patch @@ -1,4 +1,4 @@ -From 094c56e89abefa4d2d4064991b360bebd13be1eb Mon Sep 17 00:00:00 2001 +From 07350060c944e605824dc4a849bf320e5a41ab32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 8 Feb 2015 06:10:26 +0100 Subject: [PATCH] nvencodeapi: First implementation. @@ -21,18 +21,18 @@ Subject: [PATCH] nvencodeapi: First implementation. create mode 100644 include/nvencodeapi.h diff --git a/configure.ac b/configure.ac -index 70f9486..59d392a 100644 +index d1367f4..40f96df 100644 --- a/configure.ac +++ b/configure.ac -@@ -3555,6 +3555,8 @@ WINE_CONFIG_DLL(nvapi64,enable_win64) - WINE_CONFIG_DLL(nvcuda) - WINE_CONFIG_TEST(dlls/nvcuda/tests) - WINE_CONFIG_DLL(nvcuvid) -+WINE_CONFIG_DLL(nvencodeapi,enable_win32) -+WINE_CONFIG_DLL(nvencodeapi64,enable_win64) - WINE_CONFIG_DLL(objsel) - WINE_CONFIG_DLL(odbc32) - WINE_CONFIG_DLL(odbccp32) +@@ -3566,6 +3566,8 @@ WINE_CONFIG_MAKEFILE(dlls/nvapi64,enable_win64) + WINE_CONFIG_MAKEFILE(dlls/nvcuda) + WINE_CONFIG_MAKEFILE(dlls/nvcuda/tests) + WINE_CONFIG_MAKEFILE(dlls/nvcuvid) ++WINE_CONFIG_MAKEFILE(dlls/nvencodeapi,enable_win32) ++WINE_CONFIG_MAKEFILE(dlls/nvencodeapi64,enable_win64) + WINE_CONFIG_MAKEFILE(dlls/objsel) + WINE_CONFIG_MAKEFILE(dlls/odbc32) + WINE_CONFIG_MAKEFILE(dlls/odbccp32) diff --git a/dlls/nvencodeapi/Makefile.in b/dlls/nvencodeapi/Makefile.in new file mode 100644 index 0000000..a2e58ac diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 011b5e51..75ca291d 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,13 +52,13 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f17120d11b0e1272bb9742ad88eb526ac914d7da" + echo "acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0" } # Show version information version() { - echo "Wine Staging 3.3" + echo "Wine Staging 3.4 (Unreleased)" echo "Copyright (C) 2014-2018 the Wine Staging project authors." echo "Copyright (C) 2018 Alistair Leslie-Hughes" echo "" @@ -193,7 +193,6 @@ patch_enable_all () enable_kernel32_SCSI_Sysfs="$1" enable_kernel32_SetFileCompletionNotificationModes="$1" enable_kernel32_TimezoneInformation_Registry="$1" - enable_kernel32_UmsStubs="$1" enable_kernelbase_PathCchCombineEx="$1" enable_krnl386_exe16_GDT_LDT_Emulation="$1" enable_krnl386_exe16_Invalid_Console_Handles="$1" @@ -251,7 +250,6 @@ patch_enable_all () enable_ntdll_NtSetLdtEntries="$1" enable_ntdll_NtSuspendProcess="$1" enable_ntdll_Pipe_SpecialCharacters="$1" - enable_ntdll_ProcessImageFileNameWin32="$1" enable_ntdll_ProcessQuotaLimits="$1" enable_ntdll_Purist_Mode="$1" enable_ntdll_RtlCaptureStackBackTrace="$1" @@ -331,7 +329,6 @@ patch_enable_all () enable_setupapi_SP_COPY_IN_USE_NEEDS_REBOOT="$1" enable_setupapi_SetupDiGetDeviceInterfaceDetail="$1" enable_setupapi_SetupPromptForDisk="$1" - enable_sfc_SfcGetNextProtectedFile="$1" enable_shdocvw_ParseURLFromOutsideSource_Tests="$1" enable_shell32_ACE_Viewer="$1" enable_shell32_Context_Menu="$1" @@ -805,9 +802,6 @@ patch_enable () kernel32-TimezoneInformation_Registry) enable_kernel32_TimezoneInformation_Registry="$2" ;; - kernel32-UmsStubs) - enable_kernel32_UmsStubs="$2" - ;; kernelbase-PathCchCombineEx) enable_kernelbase_PathCchCombineEx="$2" ;; @@ -979,9 +973,6 @@ patch_enable () ntdll-Pipe_SpecialCharacters) enable_ntdll_Pipe_SpecialCharacters="$2" ;; - ntdll-ProcessImageFileNameWin32) - enable_ntdll_ProcessImageFileNameWin32="$2" - ;; ntdll-ProcessQuotaLimits) enable_ntdll_ProcessQuotaLimits="$2" ;; @@ -1219,9 +1210,6 @@ patch_enable () setupapi-SetupPromptForDisk) enable_setupapi_SetupPromptForDisk="$2" ;; - sfc-SfcGetNextProtectedFile) - enable_sfc_SfcGetNextProtectedFile="$2" - ;; shdocvw-ParseURLFromOutsideSource_Tests) enable_shdocvw_ParseURLFromOutsideSource_Tests="$2" ;; @@ -2577,11 +2565,7 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then if test "$enable_combase_RoApi" -gt 1; then abort "Patchset combase-RoApi disabled, but api-ms-win-Stub_DLLs depends on that." fi - if test "$enable_kernel32_UmsStubs" -gt 1; then - abort "Patchset kernel32-UmsStubs disabled, but api-ms-win-Stub_DLLs depends on that." - fi enable_combase_RoApi=1 - enable_kernel32_UmsStubs=1 fi if test "$enable_advapi32_Token_Integrity_Level" -eq 1; then @@ -2594,9 +2578,6 @@ if test "$enable_advapi32_Token_Integrity_Level" -eq 1; then if test "$enable_kernel32_COMSPEC" -gt 1; then abort "Patchset kernel32-COMSPEC disabled, but advapi32-Token_Integrity_Level depends on that." fi - if test "$enable_kernel32_UmsStubs" -gt 1; then - abort "Patchset kernel32-UmsStubs disabled, but advapi32-Token_Integrity_Level depends on that." - fi if test "$enable_server_CreateProcess_ACLs" -gt 1; then abort "Patchset server-CreateProcess_ACLs disabled, but advapi32-Token_Integrity_Level depends on that." fi @@ -2606,7 +2587,6 @@ if test "$enable_advapi32_Token_Integrity_Level" -eq 1; then enable_Staging=1 enable_advapi32_CreateRestrictedToken=1 enable_kernel32_COMSPEC=1 - enable_kernel32_UmsStubs=1 enable_server_CreateProcess_ACLs=1 enable_server_Misc_ACL=1 fi @@ -2914,25 +2894,10 @@ if test "$enable_kernel32_COMSPEC" -eq 1; then ) >> "$patchlist" fi -# Patchset kernel32-UmsStubs -# | -# | This patchset fixes the following Wine bugs: -# | * [#44619] Add stubs for user-mode scheduling functions -# | -# | Modified files: -# | * dlls/kernel32/kernel32.spec, dlls/kernel32/sync.c, include/winbase.h, include/winnt.h -# | -if test "$enable_kernel32_UmsStubs" -eq 1; then - patch_apply kernel32-UmsStubs/0001-kernel32-Add-a-bunch-of-kernel32-stubs.patch - ( - printf '%s\n' '+ { "Dmitry Timoshkov", "kernel32: Add a bunch of kernel32 stubs.", 1 },'; - ) >> "$patchlist" -fi - # Patchset advapi32-Token_Integrity_Level # | # | This patchset has the following (direct or indirect) dependencies: -# | * Staging, advapi32-CreateRestrictedToken, kernel32-COMSPEC, kernel32-UmsStubs, server-CreateProcess_ACLs, server-Misc_ACL +# | * Staging, advapi32-CreateRestrictedToken, kernel32-COMSPEC, server-CreateProcess_ACLs, server-Misc_ACL # | # | This patchset fixes the following Wine bugs: # | * [#40613] Basic implementation for token integrity levels and UAC handling @@ -3029,7 +2994,7 @@ fi # Patchset api-ms-win-Stub_DLLs # | # | This patchset has the following (direct or indirect) dependencies: -# | * combase-RoApi, kernel32-UmsStubs +# | * combase-RoApi # | # | This patchset fixes the following Wine bugs: # | * [#40451] Add feclient dll @@ -3136,7 +3101,7 @@ fi # | # | Modified files: # | * dlls/bcrypt/bcrypt.spec, dlls/bcrypt/bcrypt_main.c, dlls/bcrypt/tests/bcrypt.c, dlls/ncrypt/ncrypt.spec, -# | include/bcrypt.h, include/ntstatus.h +# | include/bcrypt.h # | if test "$enable_bcrypt_Improvements" -eq 1; then patch_apply bcrypt-Improvements/0011-bcrypt-tests-Add-tests-for-AES-GCM-mode.patch @@ -4877,7 +4842,7 @@ fi # Patchset kernel32-Processor_Group # | # | This patchset has the following (direct or indirect) dependencies: -# | * combase-RoApi, kernel32-UmsStubs, api-ms-win-Stub_DLLs +# | * combase-RoApi, api-ms-win-Stub_DLLs # | # | Modified files: # | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/kernel32/cpu.c, @@ -5958,18 +5923,6 @@ if test "$enable_ntdll_NtSuspendProcess" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-ProcessImageFileNameWin32 -# | -# | Modified files: -# | * dlls/kernel32/tests/process.c, dlls/ntdll/process.c, include/winternl.h -# | -if test "$enable_ntdll_ProcessImageFileNameWin32" -eq 1; then - patch_apply ntdll-ProcessImageFileNameWin32/0001-ntdll-Implement-ProcessImageFileNameWin32-in-NtQuery.patch - ( - printf '%s\n' '+ { "Michael Müller", "ntdll: Implement ProcessImageFileNameWin32 in NtQueryInformationProcess.", 1 },'; - ) >> "$patchlist" -fi - # Patchset ntdll-ProcessQuotaLimits # | # | Modified files: @@ -7260,18 +7213,6 @@ if test "$enable_setupapi_SetupPromptForDisk" -eq 1; then ) >> "$patchlist" fi -# Patchset sfc-SfcGetNextProtectedFile -# | -# | Modified files: -# | * dlls/sfc_os/sfc_os.c -# | -if test "$enable_sfc_SfcGetNextProtectedFile" -eq 1; then - patch_apply sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch - ( - printf '%s\n' '+ { "Michael Müller", "sfc_os: Set an error code in SfcGetNextProtectedFile stub.", 1 },'; - ) >> "$patchlist" -fi - # Patchset shdocvw-ParseURLFromOutsideSource_Tests # | # | Modified files: diff --git a/patches/sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch b/patches/sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch deleted file mode 100644 index 0defc07d..00000000 --- a/patches/sfc-SfcGetNextProtectedFile/0001-sfc_os-Set-an-error-code-in-SfcGetNextProtectedFile-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 91bd7aea87eea74498a3ea39fbc095cbdbbd1a6d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Tue, 3 Nov 2015 17:36:54 +0100 -Subject: sfc_os: Set an error code in SfcGetNextProtectedFile stub. - ---- - dlls/sfc_os/sfc_os.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/dlls/sfc_os/sfc_os.c b/dlls/sfc_os/sfc_os.c -index 9df38f8..f76b3a2 100644 ---- a/dlls/sfc_os/sfc_os.c -+++ b/dlls/sfc_os/sfc_os.c -@@ -54,6 +54,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) - BOOL WINAPI SfcGetNextProtectedFile(HANDLE handle, PROTECTED_FILE_DATA *data) - { - FIXME("%p %p\n", handle, data); -+ -+ SetLastError(ERROR_NO_MORE_FILES); - return FALSE; - } - --- -2.6.2 - diff --git a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch index ed455f8e..56c85dd7 100644 --- a/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch +++ b/patches/uxtheme-GTK_Theming/0001-uxthemegtk-Add-configure-check-and-stub-dll.patch @@ -1,4 +1,4 @@ -From 406f6a268d3b4b831e4daaccc5fa2f4877be151b Mon Sep 17 00:00:00 2001 +From 198cd3cdddaa7ad98d897444877becfe7a591910 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 9 Aug 2015 02:38:18 +0200 Subject: [PATCH] uxthemegtk: Add configure check and stub dll. @@ -20,7 +20,7 @@ List of functions updated by Ivan Akulinchev . create mode 100644 dlls/uxtheme-gtk/version.rc diff --git a/aclocal.m4 b/aclocal.m4 -index 3688165..fbc5ebf 100644 +index 6ad8363..54e2ccd 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -125,6 +125,26 @@ test -z "$ac_libs" || ac_libs=`echo " $ac_libs" | sed 's/ -L\([[^/]]\)/ -L\$(top @@ -51,7 +51,7 @@ index 3688165..fbc5ebf 100644 dnl dnl Usage: WINE_TRY_ASM_LINK(asm-code,includes,function,[action-if-found,[action-if-not-found]]) diff --git a/configure.ac b/configure.ac -index 7b796ef..e27f922 100644 +index 40f96df..a45d5b8 100644 --- a/configure.ac +++ b/configure.ac @@ -56,6 +56,7 @@ AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06 @@ -62,7 +62,7 @@ index 7b796ef..e27f922 100644 AC_ARG_WITH(hal, AS_HELP_STRING([--without-hal],[do not use HAL (dynamic device support)])) AC_ARG_WITH(jpeg, AS_HELP_STRING([--without-jpeg],[do not use JPEG])) AC_ARG_WITH(krb5, AS_HELP_STRING([--without-krb5],[do not use krb5 (Kerberos)])) -@@ -1441,6 +1442,26 @@ fi +@@ -1491,6 +1492,26 @@ fi WINE_NOTICE_WITH(cms,[test "$ac_cv_lib_lcms2_cmsOpenProfileFromFile" != "yes"], [liblcms2 ${notice_platform}development files not found, Color Management won't be supported.]) @@ -89,17 +89,17 @@ index 7b796ef..e27f922 100644 dnl **** Check for FreeType 2 **** if test "x$with_freetype" != "xno" then -@@ -3627,6 +3648,7 @@ WINE_CONFIG_TEST(dlls/userenv/tests) - WINE_CONFIG_DLL(usp10) - WINE_CONFIG_TEST(dlls/usp10/tests) - WINE_CONFIG_LIB(uuid) -+WINE_CONFIG_DLL(uxtheme-gtk) - WINE_CONFIG_DLL(uxtheme) - WINE_CONFIG_TEST(dlls/uxtheme/tests) - WINE_CONFIG_DLL(vbscript) +@@ -3731,6 +3752,7 @@ WINE_CONFIG_MAKEFILE(dlls/usp10/tests) + WINE_CONFIG_MAKEFILE(dlls/uuid) + WINE_CONFIG_MAKEFILE(dlls/uxtheme) + WINE_CONFIG_MAKEFILE(dlls/uxtheme/tests) ++WINE_CONFIG_MAKEFILE(dlls/uxtheme-gtk) + WINE_CONFIG_MAKEFILE(dlls/vbscript) + WINE_CONFIG_MAKEFILE(dlls/vbscript/tests) + WINE_CONFIG_MAKEFILE(dlls/vcomp) diff --git a/dlls/uxtheme-gtk/Makefile.in b/dlls/uxtheme-gtk/Makefile.in new file mode 100644 -index 0000000..07cf3a0 +index 0000000..07cf3a0f --- /dev/null +++ b/dlls/uxtheme-gtk/Makefile.in @@ -0,0 +1,7 @@ @@ -463,5 +463,5 @@ index 0000000..38db521 + +#include -- -2.7.4 +1.9.1 diff --git a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch index 114e8566..09d9e4f5 100644 --- a/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch +++ b/patches/wined3d-CSMT_Helper/0001-wined3d-Add-second-dll-with-STAGING_CSMT-definition-.patch @@ -1,30 +1,28 @@ -From 359733a8080403adeca1f87472cdad1884c4affb Mon Sep 17 00:00:00 2001 +From 6420a142c91174e9553960a3340ca6f38ba3c643 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 14 Dec 2014 20:49:28 +0100 Subject: [PATCH] wined3d: Add second dll with STAGING_CSMT definition set. --- - configure.ac | 3 ++- + configure.ac | 1 + dlls/wined3d-csmt/Makefile.in | 36 ++++++++++++++++++++++++++++++++++++ dlls/wined3d-csmt/version.rc | 27 +++++++++++++++++++++++++++ - 3 files changed, 65 insertions(+), 1 deletion(-) + 3 files changed, 64 insertions(+) create mode 100644 dlls/wined3d-csmt/Makefile.in create mode 100644 dlls/wined3d-csmt/version.rc diff --git a/configure.ac b/configure.ac -index 7b796ef..fbaca8e 100644 +index a45d5b8..fda7c09 100644 --- a/configure.ac +++ b/configure.ac -@@ -3679,7 +3679,8 @@ WINE_CONFIG_DLL(wineandroid.drv) - WINE_CONFIG_DLL(winebus.sys) - WINE_CONFIG_DLL(winecoreaudio.drv) - WINE_CONFIG_LIB(winecrt0) --WINE_CONFIG_DLL(wined3d) -+WINE_CONFIG_DLL(wined3d-csmt) -+WINE_CONFIG_DLL(wined3d,,[implib]) - WINE_CONFIG_DLL(winegstreamer) - WINE_CONFIG_DLL(winehid.sys) - WINE_CONFIG_DLL(winejoystick.drv) +@@ -3804,6 +3804,7 @@ WINE_CONFIG_MAKEFILE(dlls/winebus.sys) + WINE_CONFIG_MAKEFILE(dlls/winecoreaudio.drv) + WINE_CONFIG_MAKEFILE(dlls/winecrt0) + WINE_CONFIG_MAKEFILE(dlls/wined3d) ++WINE_CONFIG_MAKEFILE(dlls/wined3d-csmt) + WINE_CONFIG_MAKEFILE(dlls/winegstreamer) + WINE_CONFIG_MAKEFILE(dlls/winehid.sys) + WINE_CONFIG_MAKEFILE(dlls/winejoystick.drv) diff --git a/dlls/wined3d-csmt/Makefile.in b/dlls/wined3d-csmt/Makefile.in new file mode 100644 index 0000000..1d0458e diff --git a/patches/wined3d-CSMT_Main/9999-IfDefined.patch b/patches/wined3d-CSMT_Main/9999-IfDefined.patch index 7327d086..32c6cc0f 100644 --- a/patches/wined3d-CSMT_Main/9999-IfDefined.patch +++ b/patches/wined3d-CSMT_Main/9999-IfDefined.patch @@ -271,7 +271,7 @@ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c -@@ -2522,7 +2522,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, +@@ -2495,7 +2495,11 @@ static BOOL surface_load_texture(struct wined3d_surface *surface, /* Don't use PBOs for converted surfaces. During PBO conversion we look at * WINED3D_TEXTURE_CONVERTED but it isn't set (yet) in all cases it is * getting called. */ @@ -301,7 +301,7 @@ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c -@@ -294,7 +294,11 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su +@@ -320,7 +320,11 @@ void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int su if (locations & WINED3D_LOCATION_BUFFER) { data->addr = NULL; @@ -313,7 +313,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c return; } if (locations & WINED3D_LOCATION_USER_MEMORY) -@@ -402,6 +406,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc +@@ -428,6 +432,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc /* Context activation is done by the caller. */ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture, @@ -321,7 +321,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c unsigned int sub_resource_idx, const struct wined3d_gl_info *gl_info) { GLuint *buffer_object = &texture->sub_resources[sub_resource_idx].buffer_object; -@@ -414,6 +419,19 @@ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture +@@ -440,6 +445,19 @@ static void wined3d_texture_remove_buffer_object(struct wined3d_texture *texture wined3d_texture_invalidate_location(texture, sub_resource_idx, WINED3D_LOCATION_BUFFER); *buffer_object = 0; @@ -341,7 +341,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c } static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) -@@ -433,7 +451,11 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) +@@ -459,7 +477,11 @@ static void wined3d_texture_update_map_binding(struct wined3d_texture *texture) && !wined3d_texture_load_location(texture, i, context, map_binding)) ERR("Failed to load location %s.\n", wined3d_debug_location(map_binding)); if (texture->resource.map_binding == WINED3D_LOCATION_BUFFER) @@ -353,7 +353,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c } if (context) -@@ -634,28 +656,46 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) +@@ -660,28 +682,46 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) unsigned int sub_count = texture->level_count * texture->layer_count; struct wined3d_device *device = texture->resource.device; struct wined3d_context *context = NULL; @@ -400,7 +400,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c } if (context) context_release(context); -@@ -1455,11 +1495,16 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT +@@ -1482,11 +1522,16 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT /* Context activation is done by the caller. */ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *texture, @@ -417,7 +417,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c if (sub_resource->buffer_object) return; -@@ -1471,6 +1516,16 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur +@@ -1498,6 +1543,16 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", sub_resource->buffer_object, texture, sub_resource_idx); @@ -434,7 +434,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c } static void wined3d_texture_force_reload(struct wined3d_texture *texture) -@@ -1569,7 +1624,11 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned +@@ -1596,7 +1651,11 @@ BOOL wined3d_texture_prepare_location(struct wined3d_texture *texture, unsigned return TRUE; case WINED3D_LOCATION_BUFFER: @@ -446,7 +446,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c return TRUE; case WINED3D_LOCATION_TEXTURE_RGB: -@@ -1868,7 +1927,11 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in +@@ -1895,7 +1954,11 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -458,7 +458,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); texture1d_upload_data(texture, sub_resource_idx, context, NULL, &data, row_pitch, slice_pitch); -@@ -1913,7 +1976,11 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in +@@ -1940,7 +2003,11 @@ static BOOL texture1d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_BUFFER: if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { @@ -470,7 +470,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) wined3d_texture_bind_and_dirtify(texture, context, FALSE); -@@ -2201,8 +2268,13 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) +@@ -2228,8 +2295,13 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_DISCARDED); } @@ -484,7 +484,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c if (resource->type == WINED3D_RTYPE_TEXTURE_2D) { -@@ -2965,7 +3037,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in +@@ -2992,7 +3064,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in } else if (sub_resource->locations & WINED3D_LOCATION_BUFFER) { @@ -496,7 +496,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c wined3d_texture_bind_and_dirtify(texture, context, location == WINED3D_LOCATION_TEXTURE_SRGB); wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); -@@ -3011,7 +3087,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in +@@ -3038,7 +3114,11 @@ static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned in case WINED3D_LOCATION_BUFFER: if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { @@ -508,7 +508,7 @@ diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c if (sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB) wined3d_texture_bind_and_dirtify(texture, context, FALSE); -@@ -3214,8 +3294,19 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned +@@ -3241,8 +3321,19 @@ HRESULT CDECL wined3d_texture_blt(struct wined3d_texture *dst_texture, unsigned if (dst_texture->sub_resources[dst_sub_resource_idx].map_count || src_texture->sub_resources[src_sub_resource_idx].map_count) { @@ -618,7 +618,7 @@ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h } sub_resources[1]; }; -@@ -3522,6 +3542,9 @@ struct wined3d_cs_queue +@@ -3524,6 +3544,9 @@ struct wined3d_cs_queue struct wined3d_cs_ops { diff --git a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch index 52c6982a..afbd1565 100644 --- a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch @@ -1,4 +1,4 @@ -From ae853a70af3455e1da80e89944a1cbc91e787421 Mon Sep 17 00:00:00 2001 +From edc11b762bfe2c635a7d4cb60f779398b80cb780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:38:38 +0200 Subject: [PATCH] win32k.sys: Add stub driver. @@ -15,17 +15,17 @@ Subject: [PATCH] win32k.sys: Add stub driver. create mode 100644 dlls/win32k.sys/win32k.sys.spec diff --git a/configure.ac b/configure.ac -index 9033656..4ce2e89 100644 +index fda7c09..301e374 100644 --- a/configure.ac +++ b/configure.ac -@@ -3685,6 +3685,7 @@ WINE_CONFIG_DLL(wiaservc) - WINE_CONFIG_TEST(dlls/wiaservc/tests) - WINE_CONFIG_DLL(wimgapi) - WINE_CONFIG_DLL(win32s16.dll16,enable_win16) -+WINE_CONFIG_DLL(win32k.sys) - WINE_CONFIG_DLL(win87em.dll16,enable_win16) - WINE_CONFIG_DLL(winaspi.dll16,enable_win16) - WINE_CONFIG_DLL(windebug.dll16,enable_win16) +@@ -3791,6 +3791,7 @@ WINE_CONFIG_MAKEFILE(dlls/wiaservc) + WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests) + WINE_CONFIG_MAKEFILE(dlls/wimgapi) + WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16) ++WINE_CONFIG_MAKEFILE(dlls/win32k.sys) + WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16) + WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16) + WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16) diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in new file mode 100644 index 0000000..615d833 @@ -336,10 +336,10 @@ index 0000000..c794391 +@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove +@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset diff --git a/tools/make_specfiles b/tools/make_specfiles -index 6b59b32..e476c0d 100755 +index eac36ca..28ac498 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -410,6 +410,7 @@ my @dll_groups = +@@ -429,6 +429,7 @@ my @dll_groups = [ "ntoskrnl.exe", "hal", @@ -348,5 +348,5 @@ index 6b59b32..e476c0d 100755 ); -- -2.7.4 +1.9.1 diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch index a08b9432..d652fe35 100644 --- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch @@ -1,4 +1,4 @@ -From e898a695975defcd91cf6d81ee356937177975d8 Mon Sep 17 00:00:00 2001 +From e9e9334afc2b59ee6ae5cc0a93fb375effca227a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:41:02 +0200 Subject: [PATCH] dxgkrnl.sys: Add stub driver. @@ -15,17 +15,17 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver. create mode 100644 dlls/dxgkrnl.sys/main.c diff --git a/configure.ac b/configure.ac -index 4ce2e89..3d5aef7 100644 +index 301e374..309c114 100644 --- a/configure.ac +++ b/configure.ac -@@ -3227,6 +3227,7 @@ WINE_CONFIG_LIB(dxerr8) - WINE_CONFIG_LIB(dxerr9) - WINE_CONFIG_DLL(dxgi) - WINE_CONFIG_TEST(dlls/dxgi/tests) -+WINE_CONFIG_DLL(dxgkrnl.sys) - WINE_CONFIG_LIB(dxguid) - WINE_CONFIG_DLL(dxva2) - WINE_CONFIG_TEST(dlls/dxva2/tests) +@@ -3316,6 +3316,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) + WINE_CONFIG_MAKEFILE(dlls/dxerr9) + WINE_CONFIG_MAKEFILE(dlls/dxgi) + WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) ++WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys) + WINE_CONFIG_MAKEFILE(dlls/dxguid) + WINE_CONFIG_MAKEFILE(dlls/dxva2) + WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in new file mode 100644 index 0000000..e18ea70 @@ -116,10 +116,10 @@ index 0000000..c5639c2 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 3c55125..c69b880 100644 +index a76bb0a..f0ff79f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2548,6 +2548,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2604,6 +2604,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- @@ -127,7 +127,7 @@ index 3c55125..c69b880 100644 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- -@@ -2592,6 +2593,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2648,6 +2649,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- @@ -136,5 +136,5 @@ index 3c55125..c69b880 100644 12,,mountmgr.sys 12,,ndis.sys -- -2.7.4 +1.9.1 diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch index 5adda243..b796fdb7 100644 --- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch +++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch @@ -1,4 +1,4 @@ -From b1ca94de8e18fd482609c5b6e9ae38126ecfaa65 Mon Sep 17 00:00:00 2001 +From 7aae5361e86f2d4734d7242c6fdf790a01aaca1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 8 Jun 2017 23:42:32 +0200 Subject: [PATCH] dxgmms1.sys: Add stub driver. @@ -15,17 +15,17 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver. create mode 100644 dlls/dxgmms1.sys/main.c diff --git a/configure.ac b/configure.ac -index 3d5aef7..ab6752a 100644 +index 309c114..655d93a 100644 --- a/configure.ac +++ b/configure.ac -@@ -3228,6 +3228,7 @@ WINE_CONFIG_LIB(dxerr9) - WINE_CONFIG_DLL(dxgi) - WINE_CONFIG_TEST(dlls/dxgi/tests) - WINE_CONFIG_DLL(dxgkrnl.sys) -+WINE_CONFIG_DLL(dxgmms1.sys) - WINE_CONFIG_LIB(dxguid) - WINE_CONFIG_DLL(dxva2) - WINE_CONFIG_TEST(dlls/dxva2/tests) +@@ -3317,6 +3317,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) + WINE_CONFIG_MAKEFILE(dlls/dxgi) + WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) + WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys) ++WINE_CONFIG_MAKEFILE(dlls/dxgmms1.sys) + WINE_CONFIG_MAKEFILE(dlls/dxguid) + WINE_CONFIG_MAKEFILE(dlls/dxva2) + WINE_CONFIG_MAKEFILE(dlls/dxva2/tests) diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in new file mode 100644 index 0000000..affb9ce @@ -92,10 +92,10 @@ index 0000000..686493d + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index c69b880..03016c1 100644 +index f0ff79f..bd83ba2 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2549,6 +2549,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2605,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,dxgkrnl.sys,- @@ -103,7 +103,7 @@ index c69b880..03016c1 100644 12,,fltmgr.sys,- 12,,mountmgr.sys,- 12,,ndis.sys,- -@@ -2594,6 +2595,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2650,6 +2651,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,dxgkrnl.sys @@ -112,5 +112,5 @@ index c69b880..03016c1 100644 12,,mountmgr.sys 12,,ndis.sys -- -2.7.4 +1.9.1 diff --git a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch index f2a7d0c2..981955d2 100644 --- a/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch +++ b/patches/wuauserv-Dummy_Service/0001-wuauserv-Add-dummy-service.patch @@ -1,4 +1,4 @@ -From 1aed6403e787e6bc1f61470be8663e33757c88ab Mon Sep 17 00:00:00 2001 +From ed96944bde2b0e5cc749fc3e4fec7ad404b6ab20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 11 Mar 2016 21:44:53 +0100 Subject: [PATCH] wuauserv: Add dummy service. @@ -13,19 +13,19 @@ Subject: [PATCH] wuauserv: Add dummy service. create mode 100644 programs/wuauserv/main.c diff --git a/configure.ac b/configure.ac -index 7b796ef..a64c7b1 100644 +index 053af80..595e94b 100644 --- a/configure.ac +++ b/configure.ac -@@ -3881,6 +3881,7 @@ WINE_CONFIG_PROGRAM(wordpad) - WINE_CONFIG_PROGRAM(write) - WINE_CONFIG_PROGRAM(wscript) - WINE_CONFIG_TEST(programs/wscript/tests) -+WINE_CONFIG_PROGRAM(wuauserv) - WINE_CONFIG_PROGRAM(wusa) - WINE_CONFIG_PROGRAM(xcopy) - WINE_CONFIG_TEST(programs/xcopy/tests) +@@ -4012,6 +4012,7 @@ WINE_CONFIG_MAKEFILE(programs/wordpad) + WINE_CONFIG_MAKEFILE(programs/write) + WINE_CONFIG_MAKEFILE(programs/wscript) + WINE_CONFIG_MAKEFILE(programs/wscript/tests) ++WINE_CONFIG_MAKEFILE(programs/wuauserv) + WINE_CONFIG_MAKEFILE(programs/wusa) + WINE_CONFIG_MAKEFILE(programs/xcopy) + WINE_CONFIG_MAKEFILE(programs/xcopy/tests) diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 3c55125..520d2a2 100644 +index bd83ba2..b4377ed 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -135,6 +135,7 @@ AddService=FontCache,0,FontCacheService @@ -52,7 +52,7 @@ index 3c55125..520d2a2 100644 [Strings] MciExtStr="Software\Microsoft\Windows NT\CurrentVersion\MCI Extensions" -@@ -3391,6 +3394,14 @@ ErrorControl=1 +@@ -3458,6 +3461,14 @@ ErrorControl=1 HKR,Parameters,"ServiceDll",,"%11%\schedsvc.dll" HKLM,%CurrentVersionNT%\SvcHost,"netsvcs",0x00010008,"Schedule" @@ -190,5 +190,5 @@ index 0000000..31df299 + return 0; +} -- -2.7.4 +1.9.1 diff --git a/staging/VERSION b/staging/VERSION index 3722f3c3..b377bb6b 100644 --- a/staging/VERSION +++ b/staging/VERSION @@ -1 +1 @@ -Wine Staging 3.3 +Wine Staging 3.4 (Unreleased)