From 0372a60903925f7d9277baa3c406cbda5ca19518 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Mon, 19 Feb 2018 19:50:30 -0600 Subject: [PATCH] msi-MsiGetDatabaseState: Remove patch 0002. Fixed by https://source.winehq.org/git/wine.git/commit/237ec6480749741af45e852151089dada22ae8fd --- ...stom-action-test-framework-and-check.patch | 414 ------------------ patches/msi-MsiGetDatabaseState/definition | 3 +- patches/patchinstall.sh | 282 ++++++------ 3 files changed, 135 insertions(+), 564 deletions(-) delete mode 100644 patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch diff --git a/patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch b/patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch deleted file mode 100644 index 3843f96a..00000000 --- a/patches/msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch +++ /dev/null @@ -1,414 +0,0 @@ -From e2219e6b393f458d41f3b1d98ac7fb86d56aa235 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Wed, 31 May 2017 03:55:24 +0200 -Subject: msi/tests: Add custom action test framework and check - MsiGetDatabaseState return value. - ---- - configure.ac | 1 + - dlls/msi/tests/Makefile.in | 3 + - dlls/msi/tests/custom.dll/Makefile.in | 5 + - dlls/msi/tests/custom.dll/custom.spec | 1 + - dlls/msi/tests/custom.dll/main.c | 100 ++++++++++++++++ - dlls/msi/tests/install.c | 214 ++++++++++++++++++++++++++++++++++ - 6 files changed, 324 insertions(+) - create mode 100644 dlls/msi/tests/custom.dll/Makefile.in - create mode 100644 dlls/msi/tests/custom.dll/custom.spec - create mode 100644 dlls/msi/tests/custom.dll/main.c - -diff --git a/configure.ac b/configure.ac -index f5a617c1c33..21de7fc3103 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3276,6 +3276,7 @@ WINE_CONFIG_DLL(mshtml,,[clean,implib]) - WINE_CONFIG_TEST(dlls/mshtml/tests,[clean]) - WINE_CONFIG_DLL(msi,,[clean,implib]) - WINE_CONFIG_TEST(dlls/msi/tests) -+WINE_CONFIG_RESOURCE(dlls/msi/tests/custom.dll) - WINE_CONFIG_DLL(msident,,[clean]) - WINE_CONFIG_DLL(msimg32,,[implib]) - WINE_CONFIG_DLL(msimsg) -diff --git a/dlls/msi/tests/Makefile.in b/dlls/msi/tests/Makefile.in -index 66f8abb0c1f..fd3d9bd8e46 100644 ---- a/dlls/msi/tests/Makefile.in -+++ b/dlls/msi/tests/Makefile.in -@@ -13,3 +13,6 @@ C_SRCS = \ - record.c \ - source.c \ - suminfo.c -+ -+RC_DLLS = \ -+ custom.dll -diff --git a/dlls/msi/tests/custom.dll/Makefile.in b/dlls/msi/tests/custom.dll/Makefile.in -new file mode 100644 -index 00000000000..4565fc627f4 ---- /dev/null -+++ b/dlls/msi/tests/custom.dll/Makefile.in -@@ -0,0 +1,5 @@ -+RESOURCE = custom.dll -+IMPORTS = msi kernel32 -+ -+C_SRCS = \ -+ main.c -diff --git a/dlls/msi/tests/custom.dll/custom.spec b/dlls/msi/tests/custom.dll/custom.spec -new file mode 100644 -index 00000000000..fae6950d2d4 ---- /dev/null -+++ b/dlls/msi/tests/custom.dll/custom.spec -@@ -0,0 +1 @@ -+@ stdcall testfunc1 (ptr) -diff --git a/dlls/msi/tests/custom.dll/main.c b/dlls/msi/tests/custom.dll/main.c -new file mode 100644 -index 00000000000..91ee2d77b5b ---- /dev/null -+++ b/dlls/msi/tests/custom.dll/main.c -@@ -0,0 +1,100 @@ -+/* -+ * Copyright (C) 2017 Michael Müller -+ * -+ * Dll for testing custom msi actions. -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+#define _WIN32_MSI 300 -+#include -+#include -+ -+#include -+#include -+#include -+#include -+ -+static const char *pipename = "\\\\.\\pipe\\wine_custom_action"; -+HANDLE pipe_handle; -+ -+static void send_msg(const char *type, const char *file, int line, const char *msg) -+{ -+ DWORD written = 0; -+ char buf[512]; -+ -+ sprintf(buf, "%s:%s:%d:%s", type, file, line, msg); -+ WriteFile(pipe_handle, buf, strlen(buf)+1, &written, NULL); -+} -+ -+static inline void pipe_trace(const char *file, int line, const char *msg, ...) -+{ -+ va_list valist; -+ char buf[512]; -+ -+ va_start(valist, msg); -+ vsprintf(buf, msg, valist); -+ va_end(valist); -+ -+ send_msg("TRACE", file, line, buf); -+} -+ -+static void pipe_ok(int cnd, const char *file, int line, const char *msg, ...) -+{ -+ va_list valist; -+ char buf[512]; -+ -+ va_start(valist, msg); -+ vsprintf(buf, msg, valist); -+ va_end(valist); -+ -+ send_msg(cnd ? "OK" : "FAIL", file, line, buf); -+} -+ -+#define trace(msg, ...) pipe_trace((cnd), __FILE__, __LINE__, msg, __VA_ARGS__) -+#define ok(cnd, msg, ...) pipe_ok((cnd), __FILE__, __LINE__, msg, __VA_ARGS__) -+ -+static UINT connect_named_pipe(void) -+{ -+ BOOL res; -+ -+ res = WaitNamedPipeA(pipename, NMPWAIT_USE_DEFAULT_WAIT); -+ if(!res) return ERROR_BROKEN_PIPE; -+ -+ pipe_handle = CreateFileA(pipename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); -+ if (pipe_handle == INVALID_HANDLE_VALUE) return ERROR_BROKEN_PIPE; -+ -+ return ERROR_SUCCESS; -+} -+ -+UINT WINAPI testfunc1(MSIHANDLE handle) -+{ -+ MSIDBSTATE state; -+ UINT res; -+ -+ res = connect_named_pipe(); -+ if (res) return res; -+ -+ state = MsiGetDatabaseState(handle); -+ ok(state == MSIDBSTATE_ERROR, "Expected MSIDBSTATE_ERROR, got %d\n", state); -+ -+ CloseHandle(pipe_handle); -+ return ERROR_SUCCESS; -+} -+ -+BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -+{ -+ return TRUE; -+} -diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c -index e4290397fe7..f1c1af9f2b6 100644 ---- a/dlls/msi/tests/install.c -+++ b/dlls/msi/tests/install.c -@@ -1031,6 +1031,26 @@ static const CHAR uc_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" - "PublishProduct\t\t1200\n" - "InstallFinalize\t\t1300\n"; - -+static const CHAR ca_install_exec_seq_dat[] = "Action\tCondition\tSequence\n" -+ "s72\tS255\tI2\n" -+ "InstallExecuteSequence\tAction\n" -+ "LaunchConditions\t\t100\n" -+ "CostInitialize\t\t200\n" -+ "FileCost\t\t300\n" -+ "CostFinalize\t\t400\n" -+ "InstallInitialize\t\t500\n" -+ "ProcessComponents\t\t600\n" -+ "MyCustomAction\tNOT Installed\t650\n" -+ "InstallValidate\t\t700\n" -+ "RemoveFiles\t\t800\n" -+ "InstallFiles\t\t900\n" -+ "InstallFinalize\t\t1300\n"; -+ -+static const CHAR ca_custom_action_dat[] = "Action\tType\tSource\tTarget\n" -+ "s72\ti2\tS64\tS255\n" -+ "CustomAction\tAction\n" -+ "MyCustomAction\t1\tcustom.dll\ttestfunc1\n"; -+ - static const char mixed_feature_dat[] = - "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" - "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" -@@ -1973,6 +1993,19 @@ static const msi_table da_tables[] = - ADD_TABLE(da_custom_action), - }; - -+static const msi_table ca_tables[] = -+{ -+ ADD_TABLE(media), -+ ADD_TABLE(directory), -+ ADD_TABLE(component), -+ ADD_TABLE(feature), -+ ADD_TABLE(feature_comp), -+ ADD_TABLE(file), -+ ADD_TABLE(ca_install_exec_seq), -+ ADD_TABLE(property), -+ ADD_TABLE(ca_custom_action) -+}; -+ - /* cabinet definitions */ - - /* make the max size large so there is only one cab file */ -@@ -6100,6 +6133,186 @@ error: - DeleteFileA(msifile); - } - -+/* extracts a file from a resource to the specified filename */ -+static BOOL extract_resource(const char *name, const char *filename) -+{ -+ DWORD size, written = 0; -+ HGLOBAL reshandle; -+ HRSRC resinfo; -+ HANDLE file; -+ char *data; -+ -+ resinfo = FindResourceA(NULL, name, (LPCSTR)RT_RCDATA); -+ if (!resinfo) -+ return FALSE; -+ -+ reshandle = LoadResource(NULL, resinfo); -+ if (!reshandle) -+ return FALSE; -+ -+ data = LockResource(reshandle); -+ if (!data) -+ return FALSE; -+ -+ size = SizeofResource(NULL, resinfo); -+ if (!size) -+ return FALSE; -+ -+ file = CreateFileA(filename, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); -+ if (file == INVALID_HANDLE_VALUE) -+ return FALSE; -+ -+ while (size) -+ { -+ if (!WriteFile(file, data, size, &written, NULL)) -+ { -+ CloseHandle(file); -+ return FALSE; -+ } -+ -+ data += written; -+ size -= written; -+ } -+ -+ CloseHandle(file); -+ return TRUE; -+} -+ -+static DWORD WINAPI pipe_thread(void *arg) -+{ -+ char *file, *line, *message; -+ char buf[512], *ptr; -+ HANDLE pipe = arg; -+ DWORD read; -+ BOOL res; -+ -+ res = ConnectNamedPipe(pipe, NULL); -+ ok(res || GetLastError() == ERROR_PIPE_CONNECTED, "ConnectNamedPipe failed: %u\n", GetLastError()); -+ -+ while (1) -+ { -+ res = ReadFile(pipe, buf, sizeof(buf), &read, NULL); -+ if (!res) -+ { -+ ok(GetLastError() == ERROR_BROKEN_PIPE || GetLastError() == ERROR_INVALID_HANDLE, -+ "ReadFile failed: %u\n", GetLastError()); -+ break; -+ } -+ -+ for (ptr = buf; ptr < buf + read; ptr = message + strlen(message) + 1) -+ { -+ if ((file = strstr(ptr, ":"))) *file++ = '\0'; else break; -+ if ((line = strstr(file + 1, ":"))) *line++ = '\0'; else break; -+ if ((message = strstr(line + 1, ":"))) *message++ = '\0'; else break; -+ -+ if (!strcmp(ptr, "TRACE")) trace_(file, atoi(line))("custom action: %s", message); -+ else if (!strcmp(ptr, "OK")) ok_(file, atoi(line))(1, "custom action: %s", message); -+ else if (!strcmp(ptr, "FAIL")) ok_(file, atoi(line))(0, "custom action: %s", message); -+ else break; -+ } -+ -+ if (ptr < buf + read) -+ ok(0, "malformed custom action message: %s\n", ptr); -+ } -+ -+ DisconnectNamedPipe(pipe); -+ trace("pipe disconnected\n"); -+ return 0; -+} -+ -+static void test_custom_action(void) -+{ -+ char filename[MAX_PATH]; -+ MSIHANDLE hdb = 0, rec; -+ HANDLE thread, pipe; -+ const char *query; -+ UINT r; -+ -+ if (is_process_limited()) -+ { -+ skip("process is limited\n"); -+ return; -+ } -+ -+ create_test_files(); -+ create_database(msifile, ca_tables, sizeof(ca_tables) / sizeof(ca_tables[0])); -+ -+ r = MsiOpenDatabaseA(msifile, (char *)MSIDBOPEN_TRANSACT, &hdb ); -+ ok(r == ERROR_SUCCESS, "Failed to open database\n"); -+ -+ query = "CREATE TABLE `Binary` ( `Name` CHAR(72) NOT NULL, `Data` OBJECT PRIMARY KEY `Name` )"; -+ r = run_query(hdb, 0, query); -+ ok(r == ERROR_SUCCESS, "Cannot create Binary table: %u\n", r); -+ -+ GetTempFileNameA(".", "cus", 0, filename); -+ r = extract_resource("custom.dll", filename); -+ ok(r, "Failed to extract resource\n"); -+ -+ rec = MsiCreateRecord(1); -+ r = MsiRecordSetStreamA(rec, 1, filename); -+ ok(r == ERROR_SUCCESS, "Failed to add stream data to the record: %u\n", r); -+ -+ query = "INSERT INTO `Binary` ( `Name`, `Data` ) VALUES ( 'custom.dll', ? )"; -+ r = run_query(hdb, rec, query); -+ ok(r == ERROR_SUCCESS, "Insert into Binary table failed: %u\n", r); -+ -+ r = MsiCloseHandle(rec); -+ ok(r == ERROR_SUCCESS, "Failed to close record handle\n"); -+ r = MsiDatabaseCommit(hdb); -+ ok(r == ERROR_SUCCESS, "Failed to commit database\n"); -+ r = MsiCloseHandle(hdb); -+ ok(r == ERROR_SUCCESS, "Failed to close database\n"); -+ -+ pipe = CreateNamedPipeA("\\\\.\\pipe\\wine_custom_action", PIPE_ACCESS_INBOUND, -+ PIPE_TYPE_BYTE|PIPE_READMODE_BYTE|PIPE_WAIT, 10, 2048, 2048, 10000, NULL); -+ ok(pipe != INVALID_HANDLE_VALUE, "CreateNamedPipe failed: %u\n", GetLastError()); -+ if (pipe == INVALID_HANDLE_VALUE) -+ goto error; -+ -+ thread = CreateThread(NULL, 0, pipe_thread, pipe, 0, NULL); -+ if (!thread) -+ { -+ ok(0, "CreateThread failed: %u\n", GetLastError()); -+ CloseHandle(pipe); -+ goto error; -+ } -+ -+ r = MsiInstallProductA(msifile, NULL); -+ -+ /* just in case */ -+ TerminateThread(thread, 0); -+ CloseHandle(thread); -+ CloseHandle(pipe); -+ -+ if (r == ERROR_INSTALL_PACKAGE_REJECTED) -+ { -+ skip("Not enough rights to perform tests\n"); -+ goto error; -+ } -+ ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -+ -+ ok(delete_pf("msitest\\cabout\\new\\five.txt", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\cabout\\new", FALSE), "Directory not created\n"); -+ ok(delete_pf("msitest\\cabout\\four.txt", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\cabout", FALSE), "Directory not created\n"); -+ ok(delete_pf("msitest\\changed\\three.txt", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\changed", FALSE), "Directory not created\n"); -+ ok(delete_pf("msitest\\first\\two.txt", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\first", FALSE), "Directory not created\n"); -+ ok(delete_pf("msitest\\one.txt", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\filename", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest\\service.exe", TRUE), "File not installed\n"); -+ ok(delete_pf("msitest", FALSE), "Directory not created\n"); -+ -+ delete_key(HKEY_CURRENT_USER, "SOFTWARE\\Wine\\msitest", KEY_ALL_ACCESS); -+ -+error: -+ delete_test_files(); -+ RemoveDirectoryA("msitest"); -+ DeleteFileA(msifile); -+ DeleteFileA(filename); -+} -+ - START_TEST(install) - { - DWORD len; -@@ -6189,6 +6402,7 @@ START_TEST(install) - test_remove_upgrade_code(); - test_feature_tree(); - test_deferred_action(); -+ test_custom_action(); - - DeleteFileA(log_file); - --- -2.14.1 - diff --git a/patches/msi-MsiGetDatabaseState/definition b/patches/msi-MsiGetDatabaseState/definition index ae9fd201..0225f135 100644 --- a/patches/msi-MsiGetDatabaseState/definition +++ b/patches/msi-MsiGetDatabaseState/definition @@ -1,2 +1 @@ -Fixes: Return MSIDBSTATE_ERROR when MsiGetDatabaseState is called from a custom action -Depends: ntoskrnl-DriverTest +Fixes: Return MSIDBSTATE_ERROR when MsiGetDatabaseState is called from a custom action \ No newline at end of file diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index f45c3ea5..7687f5e0 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -2395,6 +2395,35 @@ if test "$enable_nvapi_Stub_DLL" -eq 1; then enable_nvcuda_CUDA_Support=1 fi +if test "$enable_ntoskrnl_DriverTest" -eq 1; then + if test "$enable_ntoskrnl_Stubs" -gt 1; then + abort "Patchset ntoskrnl-Stubs disabled, but ntoskrnl-DriverTest depends on that." + fi + if test "$enable_winedevice_Default_Drivers" -gt 1; then + abort "Patchset winedevice-Default_Drivers disabled, but ntoskrnl-DriverTest depends on that." + fi + enable_ntoskrnl_Stubs=1 + enable_winedevice_Default_Drivers=1 +fi + +if test "$enable_winedevice_Default_Drivers" -eq 1; then + if test "$enable_dxva2_Video_Decoder" -gt 1; then + abort "Patchset dxva2-Video_Decoder disabled, but winedevice-Default_Drivers depends on that." + fi + enable_dxva2_Video_Decoder=1 +fi + +if test "$enable_ntoskrnl_Stubs" -eq 1; then + if test "$enable_Compiler_Warnings" -gt 1; then + abort "Patchset Compiler_Warnings disabled, but ntoskrnl-Stubs depends on that." + fi + if test "$enable_ntdll_NtAllocateUuids" -gt 1; then + abort "Patchset ntdll-NtAllocateUuids disabled, but ntoskrnl-Stubs depends on that." + fi + enable_Compiler_Warnings=1 + enable_ntdll_NtAllocateUuids=1 +fi + if test "$enable_ntdll_SystemRoot_Symlink" -eq 1; then if test "$enable_ntdll_Exception" -gt 1; then abort "Patchset ntdll-Exception disabled, but ntdll-SystemRoot_Symlink depends on that." @@ -2556,42 +2585,6 @@ if test "$enable_ntdll_ApiSetMap" -eq 1; then enable_ntdll_ThreadTime=1 fi -if test "$enable_msi_MsiGetDatabaseState" -eq 1; then - if test "$enable_ntoskrnl_DriverTest" -gt 1; then - abort "Patchset ntoskrnl-DriverTest disabled, but msi-MsiGetDatabaseState depends on that." - fi - enable_ntoskrnl_DriverTest=1 -fi - -if test "$enable_ntoskrnl_DriverTest" -eq 1; then - if test "$enable_ntoskrnl_Stubs" -gt 1; then - abort "Patchset ntoskrnl-Stubs disabled, but ntoskrnl-DriverTest depends on that." - fi - if test "$enable_winedevice_Default_Drivers" -gt 1; then - abort "Patchset winedevice-Default_Drivers disabled, but ntoskrnl-DriverTest depends on that." - fi - enable_ntoskrnl_Stubs=1 - enable_winedevice_Default_Drivers=1 -fi - -if test "$enable_winedevice_Default_Drivers" -eq 1; then - if test "$enable_dxva2_Video_Decoder" -gt 1; then - abort "Patchset dxva2-Video_Decoder disabled, but winedevice-Default_Drivers depends on that." - fi - enable_dxva2_Video_Decoder=1 -fi - -if test "$enable_ntoskrnl_Stubs" -eq 1; then - if test "$enable_Compiler_Warnings" -gt 1; then - abort "Patchset Compiler_Warnings disabled, but ntoskrnl-Stubs depends on that." - fi - if test "$enable_ntdll_NtAllocateUuids" -gt 1; then - abort "Patchset ntdll-NtAllocateUuids disabled, but ntoskrnl-Stubs depends on that." - fi - enable_Compiler_Warnings=1 - enable_ntdll_NtAllocateUuids=1 -fi - if test "$enable_loader_OSX_Preloader" -eq 1; then if test "$enable_Staging" -gt 1; then abort "Patchset Staging disabled, but loader-OSX_Preloader depends on that." @@ -5402,126 +5395,15 @@ if test "$enable_msi_Dummy_Thread" -eq 1; then ) >> "$patchlist" fi -# Patchset ntdll-NtAllocateUuids -# | -# | This patchset fixes the following Wine bugs: -# | * [#35910] Fix API signature of ntdll.NtAllocateUuids -# | -# | Modified files: -# | * dlls/ntdll/ntdll.spec, dlls/ntdll/om.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/winternl.h -# | -if test "$enable_ntdll_NtAllocateUuids" -eq 1; then - patch_apply ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch - ( - printf '%s\n' '+ { "Louis Lenders", "ntdll: Improve stub for NtAllocateUuids.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset ntoskrnl-Stubs -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids -# | -# | Modified files: -# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h, include/winnt.h -# | -if test "$enable_ntoskrnl_Stubs" -eq 1; then - patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch - patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch - patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch - patch_apply ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch - patch_apply ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch - patch_apply ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch - patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch - patch_apply ntoskrnl-Stubs/0010-ntoskrnl.exe-Implement-KeInitializeMutex.patch - patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch - patch_apply ntoskrnl-Stubs/0012-ntoskrnl-Implement-ExInterlockedPopEntrySList.patch - patch_apply ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch - patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch - ( - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeReleaseMutex stub.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeSemaphore stub.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeTimerEx stub.", 1 },'; - printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.", 1 },'; - printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages.", 1 },'; - printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Implement KeInitializeMutex.", 1 },'; - printf '%s\n' '+ { "Jarkko Korpi", "ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl: Implement ExInterlockedPopEntrySList.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe: Implement NtBuildNumber.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset winedevice-Default_Drivers -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * dxva2-Video_Decoder -# | -# | Modified files: -# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c, -# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c, dlls/win32k.sys/Makefile.in, -# | dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec, loader/wine.inf.in, programs/winedevice/device.c, -# | tools/make_specfiles -# | -if test "$enable_winedevice_Default_Drivers" -eq 1; then - patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch - patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch - ( - printf '%s\n' '+ { "Michael Müller", "win32k.sys: Add stub driver.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "dxgkrnl.sys: Add stub driver.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "dxgmms1.sys: Add stub driver.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "programs/winedevice: Load some common drivers and fix ldr order.", 1 },'; - ) >> "$patchlist" -fi - -# Patchset ntoskrnl-DriverTest -# | -# | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids, ntoskrnl-Stubs, dxva2-Video_Decoder, winedevice-Default_Drivers -# | -# | Modified files: -# | * aclocal.m4, configure.ac, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, dlls/ntoskrnl.exe/tests/Makefile.in, -# | dlls/ntoskrnl.exe/tests/driver.sys/Makefile.in, dlls/ntoskrnl.exe/tests/driver.sys/driver.c, -# | dlls/ntoskrnl.exe/tests/driver.sys/driver.h, dlls/ntoskrnl.exe/tests/driver.sys/driver.sys.spec, -# | dlls/ntoskrnl.exe/tests/driver.sys/test.c, dlls/ntoskrnl.exe/tests/driver.sys/test.h, -# | dlls/ntoskrnl.exe/tests/driver.sys/util.h, dlls/ntoskrnl.exe/tests/ntoskrnl.c, include/ddk/ntddk.h, include/wine/test.h, -# | tools/make_makefiles, tools/makedep.c -# | -if test "$enable_ntoskrnl_DriverTest" -eq 1; then - patch_apply ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch - patch_apply ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch - patch_apply ntoskrnl-DriverTest/0003-ntoskrnl.exe-tests-Add-tests-for-NtBuildNumber.patch - patch_apply ntoskrnl-DriverTest/0004-ntoskrnl.exe-tests-Add-tests-for-ExInitializeNPagedL.patch - patch_apply ntoskrnl-DriverTest/0005-ntoskrnl.exe-tests-Check-ldr-module-order-and-some-c.patch - ( - printf '%s\n' '+ { "Sebastian Lackner", "ntoskrnl.exe/tests: Add initial driver testing framework and corresponding changes to Makefile system.", 2 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add kernel compliant test functions.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add tests for NtBuildNumber.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add tests for ExInitializeNPagedLookasideList.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Check ldr module order and some common kernel drivers.", 1 },'; - ) >> "$patchlist" -fi - # Patchset msi-MsiGetDatabaseState # | -# | This patchset has the following (direct or indirect) dependencies: -# | * Compiler_Warnings, ntdll-NtAllocateUuids, ntoskrnl-Stubs, dxva2-Video_Decoder, winedevice-Default_Drivers, ntoskrnl- -# | DriverTest -# | # | Modified files: -# | * configure.ac, dlls/msi/database.c, dlls/msi/tests/Makefile.in, dlls/msi/tests/custom.dll/Makefile.in, -# | dlls/msi/tests/custom.dll/custom.spec, dlls/msi/tests/custom.dll/main.c, dlls/msi/tests/install.c +# | * dlls/msi/database.c # | if test "$enable_msi_MsiGetDatabaseState" -eq 1; then patch_apply msi-MsiGetDatabaseState/0001-msi-Always-return-MSIDBSTATE_ERROR-when-MsiGetDataba.patch - patch_apply msi-MsiGetDatabaseState/0002-msi-tests-Add-custom-action-test-framework-and-check.patch ( printf '%s\n' '+ { "Michael Müller", "msi: Always return MSIDBSTATE_ERROR when MsiGetDatabaseState is called from a custom action.", 1 },'; - printf '%s\n' '+ { "Michael Müller", "msi/tests: Add custom action test framework and check MsiGetDatabaseState return value.", 1 },'; ) >> "$patchlist" fi @@ -6171,6 +6053,21 @@ if test "$enable_ntdll_NtAccessCheck" -eq 1; then ) >> "$patchlist" fi +# Patchset ntdll-NtAllocateUuids +# | +# | This patchset fixes the following Wine bugs: +# | * [#35910] Fix API signature of ntdll.NtAllocateUuids +# | +# | Modified files: +# | * dlls/ntdll/ntdll.spec, dlls/ntdll/om.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/winternl.h +# | +if test "$enable_ntdll_NtAllocateUuids" -eq 1; then + patch_apply ntdll-NtAllocateUuids/0001-ntdll-Improve-stub-for-NtAllocateUuids.patch + ( + printf '%s\n' '+ { "Louis Lenders", "ntdll: Improve stub for NtAllocateUuids.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ntdll-NtContinue # | # | Modified files: @@ -6663,6 +6560,95 @@ if test "$enable_ntdll_set_full_cpu_context" -eq 1; then ) >> "$patchlist" fi +# Patchset ntoskrnl-Stubs +# | +# | This patchset has the following (direct or indirect) dependencies: +# | * Compiler_Warnings, ntdll-NtAllocateUuids +# | +# | Modified files: +# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, include/ddk/wdm.h, include/winnt.h +# | +if test "$enable_ntoskrnl_Stubs" -eq 1; then + patch_apply ntoskrnl-Stubs/0003-ntoskrnl.exe-Add-stubs-for-ExAcquireFastMutexUnsafe-.patch + patch_apply ntoskrnl-Stubs/0004-ntoskrnl.exe-Add-stubs-for-ObReferenceObjectByPointe.patch + patch_apply ntoskrnl-Stubs/0005-ntoskrnl.exe-Improve-KeReleaseMutex-stub.patch + patch_apply ntoskrnl-Stubs/0006-ntoskrnl.exe-Improve-KeInitializeSemaphore-stub.patch + patch_apply ntoskrnl-Stubs/0007-ntoskrnl.exe-Improve-KeInitializeTimerEx-stub.patch + patch_apply ntoskrnl-Stubs/0008-ntoskrnl.exe-Fix-IoReleaseCancelSpinLock-argument.patch + patch_apply ntoskrnl-Stubs/0009-ntoskrnl.exe-Implement-MmMapLockedPages-and-MmUnmapL.patch + patch_apply ntoskrnl-Stubs/0010-ntoskrnl.exe-Implement-KeInitializeMutex.patch + patch_apply ntoskrnl-Stubs/0011-ntoskrnl.exe-Add-IoGetDeviceAttachmentBaseRef-stub.patch + patch_apply ntoskrnl-Stubs/0012-ntoskrnl-Implement-ExInterlockedPopEntrySList.patch + patch_apply ntoskrnl-Stubs/0013-ntoskrnl.exe-Implement-NtBuildNumber.patch + patch_apply ntoskrnl-Stubs/0014-ntoskrnl.exe-Implement-ExInitializeNPagedLookasideLi.patch + ( + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stubs for ExAcquireFastMutexUnsafe and ExReleaseFastMutexUnsafe.", 1 },'; + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Add stub for ObReferenceObjectByPointer.", 1 },'; + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeReleaseMutex stub.", 1 },'; + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeSemaphore stub.", 1 },'; + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Improve KeInitializeTimerEx stub.", 1 },'; + printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Fix IoReleaseCancelSpinLock argument.", 1 },'; + printf '%s\n' '+ { "Christian Costa", "ntoskrnl.exe: Implement MmMapLockedPages and MmUnmapLockedPages.", 1 },'; + printf '%s\n' '+ { "Alexander Morozov", "ntoskrnl.exe: Implement KeInitializeMutex.", 1 },'; + printf '%s\n' '+ { "Jarkko Korpi", "ntoskrnl.exe: Add IoGetDeviceAttachmentBaseRef stub.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl: Implement ExInterlockedPopEntrySList.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe: Implement NtBuildNumber.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.", 1 },'; + ) >> "$patchlist" +fi + +# Patchset winedevice-Default_Drivers +# | +# | This patchset has the following (direct or indirect) dependencies: +# | * dxva2-Video_Decoder +# | +# | Modified files: +# | * configure.ac, dlls/dxgkrnl.sys/Makefile.in, dlls/dxgkrnl.sys/dxgkrnl.sys.spec, dlls/dxgkrnl.sys/main.c, +# | dlls/dxgmms1.sys/Makefile.in, dlls/dxgmms1.sys/dxgmms1.sys.spec, dlls/dxgmms1.sys/main.c, dlls/win32k.sys/Makefile.in, +# | dlls/win32k.sys/main.c, dlls/win32k.sys/win32k.sys.spec, loader/wine.inf.in, programs/winedevice/device.c, +# | tools/make_specfiles +# | +if test "$enable_winedevice_Default_Drivers" -eq 1; then + patch_apply winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch + patch_apply winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch + ( + printf '%s\n' '+ { "Michael Müller", "win32k.sys: Add stub driver.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "dxgkrnl.sys: Add stub driver.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "dxgmms1.sys: Add stub driver.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "programs/winedevice: Load some common drivers and fix ldr order.", 1 },'; + ) >> "$patchlist" +fi + +# Patchset ntoskrnl-DriverTest +# | +# | This patchset has the following (direct or indirect) dependencies: +# | * Compiler_Warnings, ntdll-NtAllocateUuids, ntoskrnl-Stubs, dxva2-Video_Decoder, winedevice-Default_Drivers +# | +# | Modified files: +# | * aclocal.m4, configure.ac, dlls/ntoskrnl.exe/ntoskrnl.exe.spec, dlls/ntoskrnl.exe/tests/Makefile.in, +# | dlls/ntoskrnl.exe/tests/driver.sys/Makefile.in, dlls/ntoskrnl.exe/tests/driver.sys/driver.c, +# | dlls/ntoskrnl.exe/tests/driver.sys/driver.h, dlls/ntoskrnl.exe/tests/driver.sys/driver.sys.spec, +# | dlls/ntoskrnl.exe/tests/driver.sys/test.c, dlls/ntoskrnl.exe/tests/driver.sys/test.h, +# | dlls/ntoskrnl.exe/tests/driver.sys/util.h, dlls/ntoskrnl.exe/tests/ntoskrnl.c, include/ddk/ntddk.h, include/wine/test.h, +# | tools/make_makefiles, tools/makedep.c +# | +if test "$enable_ntoskrnl_DriverTest" -eq 1; then + patch_apply ntoskrnl-DriverTest/0001-ntoskrnl.exe-tests-Add-initial-driver-testing-framew.patch + patch_apply ntoskrnl-DriverTest/0002-ntoskrnl.exe-tests-Add-kernel-compliant-test-functio.patch + patch_apply ntoskrnl-DriverTest/0003-ntoskrnl.exe-tests-Add-tests-for-NtBuildNumber.patch + patch_apply ntoskrnl-DriverTest/0004-ntoskrnl.exe-tests-Add-tests-for-ExInitializeNPagedL.patch + patch_apply ntoskrnl-DriverTest/0005-ntoskrnl.exe-tests-Check-ldr-module-order-and-some-c.patch + ( + printf '%s\n' '+ { "Sebastian Lackner", "ntoskrnl.exe/tests: Add initial driver testing framework and corresponding changes to Makefile system.", 2 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add kernel compliant test functions.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add tests for NtBuildNumber.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Add tests for ExInitializeNPagedLookasideList.", 1 },'; + printf '%s\n' '+ { "Michael Müller", "ntoskrnl.exe/tests: Check ldr module order and some common kernel drivers.", 1 },'; + ) >> "$patchlist" +fi + # Patchset nvcuda-CUDA_Support # | # | This patchset fixes the following Wine bugs: