From 66cad5b6aeac1ee90e392dbbea77c1e1c8c28ee3 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 25 Feb 2016 22:13:42 +0100 Subject: [PATCH] Rebase against 215e2d7fed58ccd7c5e55ad536fb311608b51d26. --- ...-dll-and-add-stub-for-QuirkIsEnabled.patch | 12 +- ...Add-dll-and-add-stub-for-ordinal-811.patch | 10 +- .../0007-shcore-Add-dll.patch | 14 +- ...s-win-shcore-obsolete-l1-1-0-Add-dll.patch | 14 +- ...-ms-win-shcore-thread-l1-1-0-Add-dll.patch | 14 +- ...lar-code-in-NtReadFile-and-FILE_Asyn.patch | 25 ++- ...ng-for-partially-received-messages-i.patch | 2 +- ...-tool-for-manipulating-MSI-databases.patch | 10 +- ...ventRegister-from-advapi32-to-ntdll.patch} | 28 +-- ...terTraceGuids-from-advapi32-to-ntdll.patch | 200 ------------------ ...etInformation-from-advapi32-to-ntdl.patch} | 20 +- .../ntdll-EtwRegisterTraceGuids/definition | 1 - ...for-WinSqmStartSession-WinSqmEndSess.patch | 28 +-- ...ts-Add-initial-driver-testing-framew.patch | 34 +-- patches/patchinstall.sh | 9 +- ...ams-shutdown-Add-stub-implementation.patch | 8 +- 16 files changed, 115 insertions(+), 314 deletions(-) rename patches/ntdll-EtwRegisterTraceGuids/{0002-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch => 0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch} (85%) delete mode 100644 patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-RegisterTraceGuids-from-advapi32-to-ntdll.patch rename patches/ntdll-EtwRegisterTraceGuids/{0003-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch => 0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch} (88%) diff --git a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch index 92284c98..09c51f32 100644 --- a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch +++ b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch @@ -1,4 +1,4 @@ -From 8527284d33c97a71e472215edfc66a766a199096 Mon Sep 17 00:00:00 2001 +From a86ba3ecb3dc441272294eb8e06baf06228f3ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 15 Jan 2016 13:01:15 +0100 Subject: kernelbase: Add dll and add stub for QuirkIsEnabled. @@ -16,12 +16,12 @@ Subject: kernelbase: Add dll and add stub for QuirkIsEnabled. create mode 100644 dlls/kernelbase/misc.c diff --git a/configure.ac b/configure.ac -index c47c0fd..dc89f99 100644 +index 9e0dcd9..8c3171c 100644 --- a/configure.ac +++ b/configure.ac -@@ -2989,6 +2989,7 @@ WINE_CONFIG_TEST(dlls/jscript/tests) +@@ -3006,6 +3006,7 @@ WINE_CONFIG_TEST(dlls/jscript/tests) WINE_CONFIG_DLL(jsproxy,,[implib]) - WINE_CONFIG_DLL(kernel32,,[clean,implib,mc]) + WINE_CONFIG_DLL(kernel32,,[clean,implib]) WINE_CONFIG_TEST(dlls/kernel32/tests) +WINE_CONFIG_DLL(kernelbase) WINE_CONFIG_DLL(keyboard.drv16,enable_win16) @@ -1826,10 +1826,10 @@ index 6b6ead2..7c2a9d1 100644 422 stdcall -noname SHGlobalCounterCreateNamedA(str long) 423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long) diff --git a/tools/make_specfiles b/tools/make_specfiles -index 97780a1..617d1a9 100755 +index 223af079..77be0c3 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -226,6 +226,13 @@ my @dll_groups = +@@ -228,6 +228,13 @@ my @dll_groups = "api-ms-win-core-processthreads-l1-1-1", ], [ 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 a0723d34..f5762998 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 35889173d6a36887a9fdd08e49d3d5776f9680b9 Mon Sep 17 00:00:00 2001 +From 6f0d202c753022f704d4211bb628d9f1b990874e 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: iertutil: Add dll and add stub for ordinal 811. @@ -14,12 +14,12 @@ Subject: 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 0766edf..786a250 100644 +index a3114e4..2de0e77 100644 --- a/configure.ac +++ b/configure.ac -@@ -2949,6 +2949,7 @@ WINE_CONFIG_DLL(iccvid,,[po]) +@@ -2981,6 +2981,7 @@ WINE_CONFIG_DLL(iccvid,,[clean]) WINE_CONFIG_DLL(icmp) - WINE_CONFIG_DLL(ieframe,,[clean,implib,po]) + WINE_CONFIG_DLL(ieframe,,[clean,implib]) WINE_CONFIG_TEST(dlls/ieframe/tests) +WINE_CONFIG_DLL(iertutil) WINE_CONFIG_DLL(ifsmgr.vxd,enable_win16) @@ -617,5 +617,5 @@ index 0000000..2b993a4 + return FALSE; +} -- -2.6.4 +2.7.1 diff --git a/patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch b/patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch index c740b814..423bc6f3 100644 --- a/patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch +++ b/patches/api-ms-win-Stub_DLLs/0007-shcore-Add-dll.patch @@ -1,4 +1,4 @@ -From 9f681980f083dd1243453e266cd132185aedd435 Mon Sep 17 00:00:00 2001 +From 973646f2c179624b6de64b6cb4d2be74ce6a7f0f Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 17 Jan 2016 20:17:46 +0100 Subject: shcore: Add dll. @@ -13,15 +13,15 @@ Subject: shcore: Add dll. create mode 100644 dlls/shcore/shcore.spec diff --git a/configure.ac b/configure.ac -index cf39973..24ce204 100644 +index 2de0e77..29e46ec 100644 --- a/configure.ac +++ b/configure.ac -@@ -3231,6 +3231,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests) +@@ -3253,6 +3253,7 @@ WINE_CONFIG_TEST(dlls/setupapi/tests) WINE_CONFIG_DLL(setupx.dll16,enable_win16) WINE_CONFIG_DLL(sfc,,[implib]) WINE_CONFIG_DLL(sfc_os,,[implib]) +WINE_CONFIG_DLL(shcore) - WINE_CONFIG_DLL(shdoclc,,[po]) + WINE_CONFIG_DLL(shdoclc,,[clean]) WINE_CONFIG_DLL(shdocvw,,[clean,implib]) WINE_CONFIG_TEST(dlls/shdocvw/tests) diff --git a/dlls/shcore/Makefile.in b/dlls/shcore/Makefile.in @@ -121,10 +121,10 @@ index 0000000..12a4ef3 +@ stub SetProcessReference +@ stub UnregisterScaleChangeEvent diff --git a/tools/make_specfiles b/tools/make_specfiles -index 759fd9e..c4c4e07 100755 +index ef32690..613c9c7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -256,6 +256,11 @@ my @dll_groups = +@@ -259,6 +259,11 @@ my @dll_groups = "api-ms-win-core-url-l1-1-0", ], [ @@ -137,5 +137,5 @@ index 759fd9e..c4c4e07 100755 "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", -- -2.6.4 +2.7.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 849a1e2e..3cdd86da 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 aa8264fadf5a344a0af523cf8bc0c9c0e0d472f2 Mon Sep 17 00:00:00 2001 +From ffb9c50ef1528d11dad953314da5f615bbe18a36 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: api-ms-win-shcore-obsolete-l1-1-0: Add dll. @@ -13,17 +13,17 @@ Subject: 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 24ce204..e8129b2 100644 +index 29e46ec..b61d4d8 100644 --- a/configure.ac +++ b/configure.ac -@@ -2730,6 +2730,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) +@@ -2750,6 +2750,7 @@ WINE_CONFIG_DLL(api-ms-win-security-sddl-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-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(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) - WINE_CONFIG_DLL(appwiz.cpl,,[po]) + WINE_CONFIG_DLL(appwiz.cpl,,[clean]) 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 c4c4e07..0c07edb 100755 +index 613c9c7..f7d7ede 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -261,6 +261,10 @@ my @dll_groups = +@@ -264,6 +264,10 @@ my @dll_groups = "shcore", ], [ @@ -56,5 +56,5 @@ index c4c4e07..0c07edb 100755 "api-ms-win-downlevel-user32-l1-1-0", "api-ms-win-ntuser-dc-access-l1-1-0", -- -2.6.4 +2.7.1 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 e4cb0487..13380673 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,4 +1,4 @@ -From 4ec5001da925dfb1f9506539d93c4c2297c53e16 Mon Sep 17 00:00:00 2001 +From 7100e12fb3dcc986f210cf0a41e462fbcc122906 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 @@ -13,17 +13,17 @@ 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 363b78c..37ff44d 100644 +index 442335d..d2bac7d 100644 --- a/configure.ac +++ b/configure.ac -@@ -2801,6 +2801,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) +@@ -2751,6 +2751,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-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-thread-l1-1-0) WINE_CONFIG_DLL(apphelp) WINE_CONFIG_TEST(dlls/apphelp/tests) - WINE_CONFIG_DLL(appwiz.cpl,,[po]) + WINE_CONFIG_DLL(appwiz.cpl,,[clean]) 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 0000000..0a20ccf @@ -46,10 +46,10 @@ index 0000000..1533005 +@ stdcall SHSetThreadRef(ptr) shcore.SHSetThreadRef +@ stub SetProcessReference diff --git a/tools/make_specfiles b/tools/make_specfiles -index 197ff73..fc2cf66 100755 +index f7d7ede..c7761b9 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles -@@ -262,6 +262,7 @@ my @dll_groups = +@@ -266,6 +266,7 @@ my @dll_groups = [ "shcore", "api-ms-win-shcore-obsolete-l1-1-0", @@ -58,5 +58,5 @@ index 197ff73..fc2cf66 100755 [ "user32", -- -2.6.4 +2.7.1 diff --git a/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch b/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch index 451f1048..21deb317 100644 --- a/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch +++ b/patches/kernel32-Named_Pipe/0006-ntdll-Unify-similar-code-in-NtReadFile-and-FILE_Asyn.patch @@ -1,4 +1,4 @@ -From 22c72712928594addc4e717d2bb3fd8185db4479 Mon Sep 17 00:00:00 2001 +From db2c7e03ab42dc8e97a02e8531948c86840b207a Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 15 Aug 2014 22:23:08 +0200 Subject: ntdll: Unify similar code in NtReadFile and FILE_AsyncReadService. @@ -15,14 +15,14 @@ Changes in FILE_AsyncReadService: whereas NtReadFile uses different behaviour based on the fd type. Now both implementations match, and behave the same way. --- - dlls/ntdll/file.c | 102 ++++++++++++++++++++++++------------------------------ - 1 file changed, 46 insertions(+), 56 deletions(-) + dlls/ntdll/file.c | 107 +++++++++++++++++++++++------------------------------- + 1 file changed, 46 insertions(+), 61 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 4134b9b..72bbaa2 100644 +index 1c23f9e..5dab5c9 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c -@@ -486,6 +486,45 @@ NTSTATUS FILE_GetNtStatus(void) +@@ -484,6 +484,45 @@ NTSTATUS FILE_GetNtStatus(void) } } @@ -48,7 +48,7 @@ index 4134b9b..72bbaa2 100644 + case FD_TYPE_DEVICE: + return length ? STATUS_END_OF_FILE : STATUS_SUCCESS; + case FD_TYPE_SERIAL: -+ return STATUS_PENDING; ++ return length ? STATUS_PENDING : STATUS_SUCCESS; + default: + return STATUS_PIPE_BROKEN; + } @@ -68,7 +68,7 @@ index 4134b9b..72bbaa2 100644 /*********************************************************************** * FILE_AsyncReadService (INTERNAL) */ -@@ -493,38 +532,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, +@@ -491,38 +530,19 @@ static NTSTATUS FILE_AsyncReadService( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS status, void **apc, void **arg ) { struct async_fileio_read *fileio = user; @@ -112,7 +112,7 @@ index 4134b9b..72bbaa2 100644 break; case STATUS_TIMEOUT: -@@ -771,7 +791,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL +@@ -769,7 +789,6 @@ static NTSTATUS get_io_avail_mode( HANDLE handle, enum server_fd_type type, BOOL return status; } @@ -120,7 +120,7 @@ index 4134b9b..72bbaa2 100644 /****************************************************************************** * NtReadFile [NTDLL.@] * ZwReadFile [NTDLL.@] -@@ -867,38 +886,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, +@@ -865,43 +884,9 @@ NTSTATUS WINAPI NtReadFile(HANDLE hFile, HANDLE hEvent, for (;;) { @@ -142,6 +142,11 @@ index 4134b9b..72bbaa2 100644 - status = length ? STATUS_END_OF_FILE : STATUS_SUCCESS; - goto done; - case FD_TYPE_SERIAL: +- if (!length) +- { +- status = STATUS_SUCCESS; +- goto done; +- } - break; - default: - status = STATUS_PIPE_BROKEN; @@ -162,5 +167,5 @@ index 4134b9b..72bbaa2 100644 if (async_read) { -- -2.6.4 +2.7.1 diff --git a/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch b/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch index 6447342f..ba79a68b 100644 --- a/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch +++ b/patches/kernel32-Named_Pipe/0010-ntdll-Add-handling-for-partially-received-messages-i.patch @@ -294,7 +294,7 @@ index fd6c605..18ee740 100644 @@ -577,11 +586,18 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length, return length ? STATUS_END_OF_FILE : STATUS_SUCCESS; case FD_TYPE_SERIAL: - return STATUS_PENDING; + return length ? STATUS_PENDING : STATUS_SUCCESS; + case FD_TYPE_PIPE: + { + NTSTATUS status = unix_fd_avail( fd, &result ); 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 ef52a2b3..b7f1cca6 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 7128a10cb4d1febc06bac49191c36fc1561141b0 Mon Sep 17 00:00:00 2001 +From 57f3079d00eb226013528e2171e19f9aa7e31282 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 15 Sep 2015 17:44:33 -0600 Subject: msidb: Add stub tool for manipulating MSI databases. @@ -13,16 +13,16 @@ Signed-off-by: Erich E. Hoover create mode 100644 programs/msidb/main.c diff --git a/configure.ac b/configure.ac -index bb879b0..06a0d24 100644 +index 9e0dcd9..7989ec6 100644 --- a/configure.ac +++ b/configure.ac -@@ -3514,6 +3514,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[install,po]) +@@ -3474,6 +3474,7 @@ WINE_CONFIG_PROGRAM(ipconfig,,[clean,install]) WINE_CONFIG_PROGRAM(lodctr,,[install]) WINE_CONFIG_PROGRAM(mofcomp,,[install]) WINE_CONFIG_PROGRAM(mshta,,[install]) +WINE_CONFIG_PROGRAM(msidb,,[install,installbin]) WINE_CONFIG_PROGRAM(msiexec,,[install,installbin,manpage]) - WINE_CONFIG_PROGRAM(net,,[install,po]) + WINE_CONFIG_PROGRAM(net,,[clean,install]) WINE_CONFIG_PROGRAM(netsh,,[install]) diff --git a/programs/msidb/Makefile.in b/programs/msidb/Makefile.in new file mode 100644 @@ -198,5 +198,5 @@ index 0000000..43cc519 + return 0; +} -- -2.6.1 +2.7.1 diff --git a/patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch b/patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch similarity index 85% rename from patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch rename to patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch index 27cb054c..baab091f 100644 --- a/patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch +++ b/patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch @@ -1,4 +1,4 @@ -From 68e7778fafe734c25a8bb9e4499dbd3f87106751 Mon Sep 17 00:00:00 2001 +From cd819b58a124eccd6c2322819f799e8870853896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 03:02:57 +0100 Subject: ntdll: Move EventRegister from advapi32 to ntdll. @@ -46,21 +46,22 @@ index 93c164d..4beda0f 100644 */ ULONG WINAPI EventUnregister( REGHANDLE handle ) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 94fa72b..599822c 100644 +index 0f6c5df..fadba20 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -32,6 +32,7 @@ - #include "windows.h" + #include "ntdll_misc.h" #include "wmistr.h" #include "evntrace.h" +#include "evntprov.h" - #include "wine/library.h" - #include "wine/debug.h" - #include "ntdll_misc.h" -@@ -379,6 +380,17 @@ BOOL WINAPI ApiSetQueryApiSetPresence(const UNICODE_STRING *namespace, BOOLEAN * + + WINE_DEFAULT_DEBUG_CHANNEL(ntdll); + +@@ -338,6 +339,17 @@ BOOL WINAPI WinSqmIsOptedIn(void) + return FALSE; } - /********************************************************************* ++/********************************************************************* + * EtwEventRegister (NTDLL.@) + */ +ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) @@ -71,15 +72,14 @@ index 94fa72b..599822c 100644 + return ERROR_SUCCESS; +} + -+/********************************************************************* - * EtwRegisterTraceGuidsW (NTDLL.@) + /****************************************************************************** + * EtwRegisterTraceGuidsW (NTDLL.@) * - * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index bbb2595..22d80be 100644 +index 0ccd79f..57a11b6 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -42,6 +42,7 @@ +@@ -41,6 +41,7 @@ # @ stub DbgUiStopDebugging @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() @@ -88,5 +88,5 @@ index bbb2595..22d80be 100644 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall -- -2.6.4 +2.7.1 diff --git a/patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-RegisterTraceGuids-from-advapi32-to-ntdll.patch b/patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-RegisterTraceGuids-from-advapi32-to-ntdll.patch deleted file mode 100644 index 0e40588b..00000000 --- a/patches/ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-RegisterTraceGuids-from-advapi32-to-ntdll.patch +++ /dev/null @@ -1,200 +0,0 @@ -From da0ee9b66b05e52f3494181c74042e3c40d4f3a0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sun, 17 Jan 2016 01:01:56 +0100 -Subject: ntdll: Move RegisterTraceGuids from advapi32 to ntdll. - ---- - dlls/advapi32/advapi32.spec | 4 +-- - dlls/advapi32/eventlog.c | 64 ------------------------------------------- - dlls/ntdll/misc.c | 67 +++++++++++++++++++++++++++++++++++++++++++++ - dlls/ntdll/ntdll.spec | 2 ++ - 4 files changed, 71 insertions(+), 66 deletions(-) - -diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec -index 36f176b..88f7fee 100644 ---- a/dlls/advapi32/advapi32.spec -+++ b/dlls/advapi32/advapi32.spec -@@ -661,8 +661,8 @@ - @ stdcall RegisterServiceCtrlHandlerExA(str ptr ptr) - @ stdcall RegisterServiceCtrlHandlerExW(wstr ptr ptr) - @ stdcall RegisterServiceCtrlHandlerW(wstr ptr) --@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) --@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) -+@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) ntdll.EtwRegisterTraceGuidsA -+@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) ntdll.EtwRegisterTraceGuidsW - # @ stub RemoveTraceCallback - # @ stub RemoveUsersFromEncryptedFile - @ stdcall ReportEventA(long long long long ptr long long ptr ptr) -diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c -index 7839fc4..93c164d 100644 ---- a/dlls/advapi32/eventlog.c -+++ b/dlls/advapi32/eventlog.c -@@ -742,70 +742,6 @@ BOOL WINAPI ReportEventW( HANDLE hEventLog, WORD wType, WORD wCategory, DWORD dw - } - - /****************************************************************************** -- * RegisterTraceGuidsW [ADVAPI32.@] -- * -- * Register an event trace provider and the event trace classes that it uses -- * to generate events. -- * -- * PARAMS -- * RequestAddress [I] ControlCallback function -- * RequestContext [I] Optional provider-defined context -- * ControlGuid [I] GUID of the registering provider -- * GuidCount [I] Number of elements in the TraceGuidReg array -- * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures -- * MofImagePath [I] not supported, set to NULL -- * MofResourceName [I] not supported, set to NULL -- * RegistrationHandle [O] Provider's registration handle -- * -- * RETURNS -- * Success: ERROR_SUCCESS -- * Failure: System error code -- * -- * FIXME -- * Stub. -- */ --ULONG WINAPI RegisterTraceGuidsW( WMIDPREQUEST RequestAddress, -- PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, -- PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, -- LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) --{ -- FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, -- debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), -- debugstr_w(MofResourceName), RegistrationHandle); -- -- if (TraceGuidReg) -- { -- ULONG i; -- for (i = 0; i < GuidCount; i++) -- { -- FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); -- TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; -- } -- } -- *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; -- return ERROR_SUCCESS; --} -- --/****************************************************************************** -- * RegisterTraceGuidsA [ADVAPI32.@] -- * -- * See RegisterTraceGuidsW. -- * -- * FIXME -- * Stub. -- */ --ULONG WINAPI RegisterTraceGuidsA( WMIDPREQUEST RequestAddress, -- PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, -- PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, -- LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) --{ -- FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, -- debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), -- debugstr_a(MofResourceName), RegistrationHandle); -- return ERROR_SUCCESS; --} -- --/****************************************************************************** - * StartTraceW [ADVAPI32.@] - * - * Register and start an event trace session -diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 2cfa900..6d49882 100644 ---- a/dlls/ntdll/misc.c -+++ b/dlls/ntdll/misc.c -@@ -27,6 +27,9 @@ - #include - #endif - -+#include "windows.h" -+#include "wmistr.h" -+#include "evntrace.h" - #include "wine/library.h" - #include "wine/debug.h" - #include "ntdll_misc.h" -@@ -335,3 +338,67 @@ BOOL WINAPI WinSqmIsOptedIn(void) - FIXME("() stub\n"); - return FALSE; - } -+ -+/********************************************************************* -+ * EtwRegisterTraceGuidsW (NTDLL.@) -+ * -+ * Register an event trace provider and the event trace classes that it uses -+ * to generate events. -+ * -+ * PARAMS -+ * RequestAddress [I] ControlCallback function -+ * RequestContext [I] Optional provider-defined context -+ * ControlGuid [I] GUID of the registering provider -+ * GuidCount [I] Number of elements in the TraceGuidReg array -+ * TraceGuidReg [I/O] Array of TRACE_GUID_REGISTRATION structures -+ * MofImagePath [I] not supported, set to NULL -+ * MofResourceName [I] not supported, set to NULL -+ * RegistrationHandle [O] Provider's registration handle -+ * -+ * RETURNS -+ * Success: ERROR_SUCCESS -+ * Failure: System error code -+ * -+ * FIXME -+ * Stub. -+ */ -+ULONG WINAPI EtwRegisterTraceGuidsW( WMIDPREQUEST RequestAddress, -+ PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, -+ PTRACE_GUID_REGISTRATION TraceGuidReg, LPCWSTR MofImagePath, -+ LPCWSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -+{ -+ FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, -+ debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_w(MofImagePath), -+ debugstr_w(MofResourceName), RegistrationHandle); -+ -+ if (TraceGuidReg) -+ { -+ ULONG i; -+ for (i = 0; i < GuidCount; i++) -+ { -+ FIXME(" register trace class %s\n", debugstr_guid(TraceGuidReg[i].Guid)); -+ TraceGuidReg[i].RegHandle = (HANDLE)0xdeadbeef; -+ } -+ } -+ *RegistrationHandle = (TRACEHANDLE)0xdeadbeef; -+ return ERROR_SUCCESS; -+} -+ -+/********************************************************************* -+ * EtwRegisterTraceGuidsA (NTDLL.@) -+ * -+ * See EtwRegisterTraceGuidsW. -+ * -+ * FIXME -+ * Stub. -+ */ -+ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress, -+ PVOID RequestContext, LPCGUID ControlGuid, ULONG GuidCount, -+ PTRACE_GUID_REGISTRATION TraceGuidReg, LPCSTR MofImagePath, -+ LPCSTR MofResourceName, PTRACEHANDLE RegistrationHandle ) -+{ -+ FIXME("(%p, %p, %s, %u, %p, %s, %s, %p): stub\n", RequestAddress, RequestContext, -+ debugstr_guid(ControlGuid), GuidCount, TraceGuidReg, debugstr_a(MofImagePath), -+ debugstr_a(MofResourceName), RegistrationHandle); -+ return ERROR_SUCCESS; -+} -diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 4e49709..2b5c6cf 100644 ---- a/dlls/ntdll/ntdll.spec -+++ b/dlls/ntdll/ntdll.spec -@@ -41,6 +41,8 @@ - # @ stub DbgUiStopDebugging - @ stub DbgUiWaitStateChange - @ stdcall DbgUserBreakPoint() -+@ stdcall EtwRegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) -+@ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) - # @ stub KiFastSystemCall - # @ stub KiFastSystemCallRet - # @ stub KiIntSystemCall --- -2.6.4 - diff --git a/patches/ntdll-EtwRegisterTraceGuids/0003-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch b/patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch similarity index 88% rename from patches/ntdll-EtwRegisterTraceGuids/0003-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch rename to patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch index 304ec7bd..3d153488 100644 --- a/patches/ntdll-EtwRegisterTraceGuids/0003-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch +++ b/patches/ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch @@ -1,4 +1,4 @@ -From 26422de432cbbb693de72652cf3035395d23c1c7 Mon Sep 17 00:00:00 2001 +From 6aab8cc223633eeef84ce54d999f540b513c1a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 17 Jan 2016 03:08:07 +0100 Subject: ntdll: Move EventSetInformation from advapi32 to ntdll. @@ -45,13 +45,14 @@ index 4beda0f..a48e016 100644 */ ULONG WINAPI QueryTraceW( TRACEHANDLE handle, LPCWSTR sessionname, PEVENT_TRACE_PROPERTIES properties ) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 599822c..aa9aff3 100644 +index fadba20..b087319 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c -@@ -391,6 +391,16 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID +@@ -350,6 +350,16 @@ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID + return ERROR_SUCCESS; } - /********************************************************************* ++/********************************************************************* + * EtwEventSetInformation (NTDLL.@) + */ +ULONG WINAPI EtwEventSetInformation( REGHANDLE handle, EVENT_INFO_CLASS class, PVOID info, @@ -61,15 +62,14 @@ index 599822c..aa9aff3 100644 + return ERROR_SUCCESS; +} + -+/********************************************************************* - * EtwRegisterTraceGuidsW (NTDLL.@) + /****************************************************************************** + * EtwRegisterTraceGuidsW (NTDLL.@) * - * Register an event trace provider and the event trace classes that it uses diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index 22d80be..c1df843 100644 +index 57a11b6..1a3b724 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -43,6 +43,7 @@ +@@ -42,6 +42,7 @@ @ stub DbgUiWaitStateChange @ stdcall DbgUserBreakPoint() @ stdcall EtwEventRegister(ptr ptr ptr ptr) @@ -78,5 +78,5 @@ index 22d80be..c1df843 100644 @ stdcall EtwRegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) # @ stub KiFastSystemCall -- -2.6.4 +2.7.1 diff --git a/patches/ntdll-EtwRegisterTraceGuids/definition b/patches/ntdll-EtwRegisterTraceGuids/definition index dc9a68db..3ca18df6 100644 --- a/patches/ntdll-EtwRegisterTraceGuids/definition +++ b/patches/ntdll-EtwRegisterTraceGuids/definition @@ -1,2 +1 @@ -Fixes: [34318] Move implementation of EtwRegisterTraceGuidsW to ntdll FIxes: [33021] Move implementation of EtwEventRegister to ntdll diff --git a/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch b/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch index fd90a19a..a1d8557c 100644 --- a/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch +++ b/patches/ntdll-WinSqm/0001-ntdll-Add-stubs-for-WinSqmStartSession-WinSqmEndSess.patch @@ -1,4 +1,4 @@ -From d02606aaa6cbdbb1939cfe99b6d5f013af5c48a6 Mon Sep 17 00:00:00 2001 +From 851ba4dda4a21cbd8f18cf1748e0a8192662fe35 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Thu, 25 Dec 2014 12:36:28 -0700 Subject: ntdll: Add stubs for WinSqmStartSession / WinSqmEndSession. @@ -11,7 +11,7 @@ Based on a patch by Detlef Riekenberg. 3 files changed, 76 insertions(+) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c -index 5469116..4517aec 100644 +index b087319..0d52b67 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -27,6 +27,8 @@ @@ -20,10 +20,10 @@ index 5469116..4517aec 100644 +#include "ntstatus.h" +#define WIN32_NO_STATUS - #include "windows.h" - #include "wmistr.h" - #include "evntrace.h" -@@ -332,6 +334,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, + #include "wine/library.h" + #include "wine/debug.h" + #include "ntdll_misc.h" +@@ -331,6 +333,15 @@ void * __cdecl _lfind( const void *key, const void *base, unsigned int *nmemb, } /********************************************************************* @@ -39,7 +39,7 @@ index 5469116..4517aec 100644 * WinSqmIsOptedIn (NTDLL.@) */ BOOL WINAPI WinSqmIsOptedIn(void) -@@ -341,6 +352,15 @@ BOOL WINAPI WinSqmIsOptedIn(void) +@@ -340,6 +351,15 @@ BOOL WINAPI WinSqmIsOptedIn(void) } /********************************************************************* @@ -56,10 +56,10 @@ index 5469116..4517aec 100644 */ ULONG WINAPI EtwEventRegister( LPCGUID provider, PENABLECALLBACK callback, PVOID context, PREGHANDLE handle ) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec -index d6ded19..0c23514 100644 +index 1a3b724..c353acf 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec -@@ -1011,7 +1011,9 @@ +@@ -1012,7 +1012,9 @@ @ stdcall TpWaitForWait(ptr long) @ stdcall TpWaitForWork(ptr long) @ stdcall -ret64 VerSetConditionMask(int64 long long) @@ -70,7 +70,7 @@ index d6ded19..0c23514 100644 @ stdcall ZwAccessCheck(ptr long long ptr ptr ptr ptr ptr) NtAccessCheck @ stdcall ZwAccessCheckAndAuditAlarm(ptr long ptr ptr ptr long ptr long ptr ptr ptr) NtAccessCheckAndAuditAlarm diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c -index 94a22ac..d382691 100644 +index fc0d4b4..8cfb106 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -62,6 +62,9 @@ static inline USHORT __my_ushort_swap(USHORT s) @@ -83,7 +83,7 @@ index 94a22ac..d382691 100644 static SIZE_T (WINAPI *pRtlCompareMemory)(LPCVOID,LPCVOID,SIZE_T); static SIZE_T (WINAPI *pRtlCompareMemoryUlong)(PULONG, SIZE_T, ULONG); static NTSTATUS (WINAPI *pRtlDeleteTimer)(HANDLE, HANDLE, HANDLE); -@@ -115,6 +118,9 @@ static void InitFunctionPtrs(void) +@@ -116,6 +119,9 @@ static void InitFunctionPtrs(void) hntdll = LoadLibraryA("ntdll.dll"); ok(hntdll != 0, "LoadLibrary failed\n"); if (hntdll) { @@ -93,7 +93,7 @@ index 94a22ac..d382691 100644 pRtlCompareMemory = (void *)GetProcAddress(hntdll, "RtlCompareMemory"); pRtlCompareMemoryUlong = (void *)GetProcAddress(hntdll, "RtlCompareMemoryUlong"); pRtlDeleteTimer = (void *)GetProcAddress(hntdll, "RtlDeleteTimer"); -@@ -161,6 +167,48 @@ static void InitFunctionPtrs(void) +@@ -163,6 +169,48 @@ static void InitFunctionPtrs(void) ok(strlen(src) == 15, "Source must be 16 bytes long!\n"); } @@ -142,7 +142,7 @@ index 94a22ac..d382691 100644 #define COMP(str1,str2,cmplen,len) size = pRtlCompareMemory(str1, str2, cmplen); \ ok(size == len, "Expected %ld, got %ld\n", size, (SIZE_T)len) -@@ -2060,6 +2108,12 @@ START_TEST(rtl) +@@ -2096,6 +2144,12 @@ START_TEST(rtl) { InitFunctionPtrs(); @@ -156,5 +156,5 @@ index 94a22ac..d382691 100644 test_RtlCompareMemoryUlong(); test_RtlMoveMemory(); -- -2.6.4 +2.7.1 diff --git a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch index ab195702..9d84655a 100644 --- a/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch +++ b/patches/ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch @@ -1,4 +1,4 @@ -From 53e679dcc9880ff814feb7776ecf66111da24b18 Mon Sep 17 00:00:00 2001 +From 1f4a1a1c60ec3e6ee9a381c9b10915ed6ecc0025 Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 18 Jan 2015 05:42:10 +0100 Subject: ntoskrnl.exe/tests: Add initial driver testing framework and @@ -24,10 +24,10 @@ Subject: ntoskrnl.exe/tests: Add initial driver testing framework and create mode 100644 dlls/ntoskrnl.exe/tests/ntoskrnl.c diff --git a/aclocal.m4 b/aclocal.m4 -index 99faf92..f880723 100644 +index 4171f47..4ad7d27 100644 --- a/aclocal.m4 +++ b/aclocal.m4 -@@ -609,6 +609,28 @@ $ac_dir/crosstest: __builddeps__ dummy +@@ -578,6 +578,28 @@ $ac_dir/crosstest: __builddeps__ dummy fi } @@ -56,7 +56,7 @@ index 99faf92..f880723 100644 wine_fn_config_tool () { ac_dir=$[1] -@@ -714,6 +736,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl +@@ -683,6 +705,15 @@ wine_fn_config_test $1 ac_name[]ac_suffix [$2]dnl m4_popdef([ac_suffix])dnl m4_popdef([ac_name])]) @@ -73,10 +73,10 @@ index 99faf92..f880723 100644 dnl dnl Usage: WINE_CONFIG_LIB(name,flags) diff --git a/configure.ac b/configure.ac -index 7d2449f..dd5ee1e 100644 +index bb390e2..d766249 100644 --- a/configure.ac +++ b/configure.ac -@@ -3097,6 +3097,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests) +@@ -3216,6 +3216,8 @@ WINE_CONFIG_TEST(dlls/ntdll/tests) WINE_CONFIG_DLL(ntdsapi,,[implib]) WINE_CONFIG_TEST(dlls/ntdsapi/tests) WINE_CONFIG_DLL(ntoskrnl.exe,,[implib]) @@ -530,7 +530,7 @@ index 0000000..9b8a6a7 + unload_driver(service, filename); +} diff --git a/tools/make_makefiles b/tools/make_makefiles -index e65429f..18b33c3 100755 +index ce38c53..d60a3fd 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -204,7 +204,7 @@ sub parse_makefile($) @@ -557,16 +557,16 @@ index e65429f..18b33c3 100755 { die "MODULE should not be defined as static lib in $file" unless $file =~ /^dlls\//; diff --git a/tools/makedep.c b/tools/makedep.c -index e1897bc..ce33ed3 100644 +index 3b7b2b8..aa6a94b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c -@@ -172,4 +172,5 @@ struct makefile +@@ -174,4 +174,5 @@ struct makefile const char *module; const char *testdll; + const char *resource; const char *sharedlib; const char *staticlib; -@@ -475,6 +476,30 @@ static char *get_extension( char *filename ) +@@ -478,6 +479,30 @@ static char *get_extension( char *filename ) /******************************************************************* @@ -597,15 +597,15 @@ index e1897bc..ce33ed3 100644 * replace_extension */ static char *replace_extension( const char *name, const char *old_ext, const char *new_ext ) -@@ -2165,6 +2190,7 @@ static struct strarray output_sources( const struct makefile *make ) - struct strarray subdirs = empty_strarray; +@@ -2239,6 +2264,7 @@ static struct strarray output_sources( const struct makefile *make ) + struct strarray includes = empty_strarray; struct strarray phony_targets = empty_strarray; struct strarray all_targets = empty_strarray; + struct strarray resource_dlls = get_expanded_make_var_array( make, "RC_DLLS" ); struct strarray install_rules[NB_INSTALL_RULES]; char *ldrpath_local = get_expanded_make_variable( make, "LDRPATH_LOCAL" ); char *ldrpath_install = get_expanded_make_variable( make, "LDRPATH_INSTALL" ); -@@ -2440,7 +2466,7 @@ static struct strarray output_sources( const struct makefile *make ) +@@ -2521,7 +2547,7 @@ static struct strarray output_sources( const struct makefile *make ) } else { @@ -614,7 +614,7 @@ index e1897bc..ce33ed3 100644 (source->file->flags & FLAG_C_IMPLIB) || (make->module && make->staticlib); -@@ -2454,7 +2480,7 @@ static struct strarray output_sources( const struct makefile *make ) +@@ -2535,7 +2561,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); @@ -623,7 +623,7 @@ index e1897bc..ce33ed3 100644 { output_filenames( dll_flags ); if (make->use_msvcrt) output_filenames( msvcrt_flags ); -@@ -2533,6 +2559,72 @@ static struct strarray output_sources( const struct makefile *make ) +@@ -2587,6 +2613,72 @@ static struct strarray output_sources( const struct makefile *make ) output( "\n" ); } @@ -696,7 +696,7 @@ index e1897bc..ce33ed3 100644 if (make->module && !make->staticlib) { struct strarray all_libs = empty_strarray; -@@ -2925,6 +3017,83 @@ static struct strarray output_sources( const struct makefile *make ) +@@ -2984,6 +3076,83 @@ static struct strarray output_sources( const struct makefile *make ) add_install_rule( make, install_rules, make->scripts.str[i], make->scripts.str[i], strmake( "S$(bindir)/%s", make->scripts.str[i] )); @@ -780,7 +780,7 @@ index e1897bc..ce33ed3 100644 if (all_targets.count) { output( "all:" ); -@@ -3255,4 +3424,5 @@ static void load_sources( struct makefile *make ) +@@ -3331,4 +3500,5 @@ static void load_sources( struct makefile *make ) make->module = get_expanded_make_variable( make, "MODULE" ); make->testdll = get_expanded_make_variable( make, "TESTDLL" ); + make->resource = get_expanded_make_variable( make, "RESOURCE" ); diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 7b71271f..6128f4d5 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "b652c119690afe8b89b8ce9cddde34b4c1589a62" + echo "215e2d7fed58ccd7c5e55ad536fb311608b51d26" } # Show version information @@ -4422,18 +4422,15 @@ fi # Patchset ntdll-EtwRegisterTraceGuids # | # | This patchset fixes the following Wine bugs: -# | * [#34318] Move implementation of EtwRegisterTraceGuidsW to ntdll # | * [#33021] Move implementation of EtwEventRegister to ntdll # | # | Modified files: # | * dlls/advapi32/advapi32.spec, dlls/advapi32/eventlog.c, dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec # | if test "$enable_ntdll_EtwRegisterTraceGuids" -eq 1; then - patch_apply ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-RegisterTraceGuids-from-advapi32-to-ntdll.patch - patch_apply ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch - patch_apply ntdll-EtwRegisterTraceGuids/0003-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch + patch_apply ntdll-EtwRegisterTraceGuids/0001-ntdll-Move-EventRegister-from-advapi32-to-ntdll.patch + patch_apply ntdll-EtwRegisterTraceGuids/0002-ntdll-Move-EventSetInformation-from-advapi32-to-ntdl.patch ( - echo '+ { "Michael Müller", "ntdll: Move RegisterTraceGuids from advapi32 to ntdll.", 1 },'; echo '+ { "Michael Müller", "ntdll: Move EventRegister from advapi32 to ntdll.", 1 },'; echo '+ { "Michael Müller", "ntdll: Move EventSetInformation from advapi32 to ntdll.", 1 },'; ) >> "$patchlist" diff --git a/patches/shutdown-Stub_DLL/0001-programs-shutdown-Add-stub-implementation.patch b/patches/shutdown-Stub_DLL/0001-programs-shutdown-Add-stub-implementation.patch index 369ecb1b..f98fa9e1 100644 --- a/patches/shutdown-Stub_DLL/0001-programs-shutdown-Add-stub-implementation.patch +++ b/patches/shutdown-Stub_DLL/0001-programs-shutdown-Add-stub-implementation.patch @@ -1,4 +1,4 @@ -From 9d1c1de2572a3a891ff7e2c4ad3c10798f8e138e Mon Sep 17 00:00:00 2001 +From 6c0b9fc4b26ba0f2efaa9fca6e12fef3c27bd2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 11 Feb 2016 20:13:58 +0100 Subject: programs/shutdown: Add stub implementation. @@ -12,16 +12,16 @@ Subject: programs/shutdown: Add stub implementation. create mode 100644 programs/shutdown/main.c diff --git a/configure.ac b/configure.ac -index 76fb87d..f6e2a2e 100644 +index 9e0dcd9..d11f5e4 100644 --- a/configure.ac +++ b/configure.ac -@@ -3487,6 +3487,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install]) +@@ -3502,6 +3502,7 @@ WINE_CONFIG_PROGRAM(secedit,,[install]) WINE_CONFIG_PROGRAM(servicemodelreg,,[install]) WINE_CONFIG_PROGRAM(services,,[clean,install]) WINE_CONFIG_TEST(programs/services/tests) +WINE_CONFIG_PROGRAM(shutdown,,[install]) WINE_CONFIG_PROGRAM(spoolsv,,[install]) - WINE_CONFIG_PROGRAM(start,,[install,po]) + WINE_CONFIG_PROGRAM(start,,[clean,install]) WINE_CONFIG_PROGRAM(svchost,,[install]) diff --git a/programs/shutdown/Makefile.in b/programs/shutdown/Makefile.in new file mode 100644