From 4501d49149e37b37edd61f8a1694930db7418a61 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Thu, 21 May 2020 20:17:05 -0500 Subject: [PATCH] Rebase against b65ca133052ed9053e48c571155a764d4d711277. --- patches/patchinstall.sh | 2 +- ...e-generic-hardware-in-HKEY_DYN_DATA-.patch | 23 ++++++------ ...itialize-proxy-settings-registry-key.patch | 16 ++++----- ...ebuild-Add-syscall-thunks-for-64-bit.patch | 35 +++++++------------ .../0002-dxgkrnl.sys-Add-stub-driver.patch | 24 ++++++------- .../0003-dxgmms1.sys-Add-stub-driver.patch | 24 ++++++------- staging/upstream-commit | 2 +- 7 files changed, 57 insertions(+), 69 deletions(-) diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index d07ad5ad..f2c2d5f2 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "fe4e6934a937645cea4fece505c0e1acaf2dfc07" + echo "b65ca133052ed9053e48c571155a764d4d711277" } # Show version information diff --git a/patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch b/patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch index a36cd3a8..ce23bbc8 100644 --- a/patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch +++ b/patches/wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch @@ -1,18 +1,18 @@ -From bbd182f920565d0aa58cd1524810bd11c535a965 Mon Sep 17 00:00:00 2001 +From a84eae8891c0ad4558842c63c8279b270e6e1767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sun, 16 Mar 2014 03:19:39 +0100 -Subject: wineboot: Add some generic hardware in HKEY_DYN_DATA\Config +Subject: [PATCH] wineboot: Add some generic hardware in HKEY_DYN_DATA\Config Manager\Enum --- - programs/wineboot/wineboot.c | 101 +++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 101 insertions(+) + programs/wineboot/wineboot.c | 100 +++++++++++++++++++++++++++++++++++ + 1 file changed, 100 insertions(+) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c -index a20b4e1..db58e40 100644 +index 09925bfa235..1c2731b977f 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c -@@ -272,6 +272,100 @@ static void create_hardware_registry_keys(void) +@@ -595,16 +595,116 @@ static void create_hardware_registry_keys(void) HeapFree( GetProcessHeap(), 0, power_info ); } @@ -113,16 +113,13 @@ index a20b4e1..db58e40 100644 /* create the DynData registry keys */ static void create_dynamic_registry_keys(void) -@@ -281,11 +375,18 @@ static void create_dynamic_registry_keys(void) - static const WCHAR ConfigManagerW[] = {'C','o','n','f','i','g',' ','M','a','n','a','g','e','r','\\', - 'E','n','u','m',0}; + { HKEY key; + int entry; - if (!RegCreateKeyExW( HKEY_DYN_DATA, StatDataW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + if (!RegCreateKeyExW( HKEY_DYN_DATA, L"PerfStats\\StatData", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) RegCloseKey( key ); -+ - if (!RegCreateKeyExW( HKEY_DYN_DATA, ConfigManagerW, 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + if (!RegCreateKeyExW( HKEY_DYN_DATA, L"Config Manager\\Enum", 0, NULL, 0, KEY_WRITE, NULL, &key, NULL )) + { + for (entry = 0; entry < sizeof(predefined_enums) / sizeof(predefined_enums[0]); entry++) + add_dynamic_enum_keys( key, &predefined_enums[entry] ); @@ -133,5 +130,5 @@ index a20b4e1..db58e40 100644 /* create the platform-specific environment registry keys */ -- -1.8.3.2 +2.26.2 diff --git a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch index f2e4c108..ee6f3177 100644 --- a/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch +++ b/patches/wineboot-ProxySettings/0001-wineboot-Initialize-proxy-settings-registry-key.patch @@ -1,4 +1,4 @@ -From 709d05ddf763bcfbcb708158a5302ba4e2587ee1 Mon Sep 17 00:00:00 2001 +From 47fc492aea5790880546171f7baeceb5fb4f96f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Mon, 26 Dec 2016 16:37:40 +0100 Subject: [PATCH] wineboot: Initialize proxy settings registry key. @@ -9,7 +9,7 @@ Subject: [PATCH] wineboot: Initialize proxy settings registry key. 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/wineboot/Makefile.in b/programs/wineboot/Makefile.in -index 3921fa9644..9575b45bec 100644 +index 3921fa96444..9575b45beca 100644 --- a/programs/wineboot/Makefile.in +++ b/programs/wineboot/Makefile.in @@ -1,7 +1,7 @@ @@ -22,10 +22,10 @@ index 3921fa9644..9575b45bec 100644 EXTRADLLFLAGS = -mno-cygwin diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c -index ab255ac107..d85be900e0 100644 +index 2946a17c7b3..b622f47def1 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c -@@ -71,6 +71,7 @@ +@@ -73,6 +73,7 @@ #include #include #include @@ -33,7 +33,7 @@ index ab255ac107..d85be900e0 100644 #include #include "resource.h" -@@ -595,6 +596,13 @@ static void create_volatile_environment_registry_key(void) +@@ -744,6 +745,13 @@ static void create_volatile_environment_registry_key(void) RegCloseKey( hkey ); } @@ -47,14 +47,14 @@ index ab255ac107..d85be900e0 100644 static void create_etc_stub_files(void) { static const WCHAR drivers_etcW[] = {'\\','d','r','i','v','e','r','s','\\','e','t','c',0}; -@@ -1505,6 +1513,7 @@ int __cdecl main( int argc, char *argv[] ) +@@ -1587,6 +1595,7 @@ int __cdecl main( int argc, char *argv[] ) if (init || update) update_wineprefix( update ); create_volatile_environment_registry_key(); + create_proxy_settings(); - ProcessRunKeys( HKEY_LOCAL_MACHINE, RunOnceW, TRUE, TRUE ); + ProcessRunKeys( HKEY_LOCAL_MACHINE, L"RunOnce", TRUE, TRUE ); -- -2.17.1 +2.26.2 diff --git a/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch b/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch index b585d061..d036cf96 100644 --- a/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch +++ b/patches/winebuild-Fake_Dlls/0010-tools-winebuild-Add-syscall-thunks-for-64-bit.patch @@ -1,4 +1,4 @@ -From cd9a767f1486be67feac18d7ea78a1ce6c1d0abc Mon Sep 17 00:00:00 2001 +From 93f5d4ef07bc35fc672738fe804b829595c61eda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Thu, 7 Sep 2017 00:38:09 +0200 Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit. @@ -6,17 +6,17 @@ Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit. --- dlls/kernel32/tests/loader.c | 7 +- dlls/ntdll/signal_x86_64.c | 2 + - dlls/ntdll/thread.c | 14 +- + dlls/ntdll/thread.c | 12 +- libs/wine/loader.c | 4 + tools/winebuild/parser.c | 2 +- tools/winebuild/spec32.c | 285 ++++++++++++++++++++++++++++++++++- - 6 files changed, 304 insertions(+), 10 deletions(-) + 6 files changed, 303 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c -index 5373dc4efe1..67d04876bd6 100644 +index 95939ba6bde..ae5462f6e55 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c -@@ -1537,7 +1537,7 @@ static void test_filenames(void) +@@ -1573,7 +1573,7 @@ static void test_filenames(void) static void test_FakeDLL(void) { @@ -25,7 +25,7 @@ index 5373dc4efe1..67d04876bd6 100644 NTSTATUS (WINAPI *pNtSetEvent)(HANDLE, ULONG *) = NULL; IMAGE_EXPORT_DIRECTORY *dir; HMODULE module = GetModuleHandleA("ntdll.dll"); -@@ -1579,8 +1579,13 @@ static void test_FakeDLL(void) +@@ -1615,8 +1615,13 @@ static void test_FakeDLL(void) dll_func = (BYTE *)GetProcAddress(module, func_name); ok(dll_func != NULL, "%s: GetProcAddress returned NULL\n", func_name); @@ -60,37 +60,28 @@ index 31af1e98d3f..324a92b41a9 100644 } diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c -index 0fc8aa9e928..bae49792ce5 100644 +index 19e09c7e383..857d6a68cf1 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c -@@ -59,6 +59,8 @@ struct _KUSER_SHARED_DATA *user_shared_data = NULL; - static size_t user_shared_data_size; - static const WCHAR default_windirW[] = {'C',':','\\','w','i','n','d','o','w','s',0}; +@@ -54,6 +54,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(thread); + + struct _KUSER_SHARED_DATA *user_shared_data = NULL; +extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void ); + void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL; /* info passed to a starting thread */ -@@ -294,7 +296,7 @@ TEB *thread_init(void) +@@ -312,7 +314,7 @@ TEB *thread_init(void) /* reserve space for shared user data */ addr = (void *)0x7ffe0000; - size = 0x1000; + size = 0x2000; status = NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE ); + MEM_RESERVE|MEM_COMMIT, PAGE_READONLY ); if (status) -@@ -303,7 +305,7 @@ TEB *thread_init(void) - exit(1); - } - user_shared_data = addr; -- user_shared_data_size = size; -+ user_shared_data_size = 0x1000; - memcpy( user_shared_data->NtSystemRoot, default_windirW, sizeof(default_windirW) ); - - /* allocate and initialize the PEB and initial TEB */ -@@ -333,6 +335,14 @@ TEB *thread_init(void) +@@ -349,6 +351,14 @@ TEB *thread_init(void) InitializeListHead( &ldr.InInitializationOrderModuleList ); *(ULONG_PTR *)peb->Reserved = get_image_addr(); 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 1fd30bbc..5f3d530d 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 ec2da26fdd7259af7c473698fc6aa15469393e8b Mon Sep 17 00:00:00 2001 +From 4d0e15f41b11c1ae69c3aff6fb17c0539ce43766 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,10 +15,10 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver. create mode 100644 dlls/dxgkrnl.sys/main.c diff --git a/configure.ac b/configure.ac -index dcf2d4930..fbc6acda7 100644 +index 27ab432a44a..0a6d1b0639e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3268,6 +3268,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) +@@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8) WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) @@ -28,7 +28,7 @@ index dcf2d4930..fbc6acda7 100644 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 000000000..e18ea70a9 +index 00000000000..50390fbbb1e --- /dev/null +++ b/dlls/dxgkrnl.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 000000000..e18ea70a9 + main.c diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec new file mode 100644 -index 000000000..8487664f8 +index 00000000000..8487664f8a7 --- /dev/null +++ b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec @@ -0,0 +1,26 @@ @@ -72,7 +72,7 @@ index 000000000..8487664f8 +@ stub g_loggerInfo diff --git a/dlls/dxgkrnl.sys/main.c b/dlls/dxgkrnl.sys/main.c new file mode 100644 -index 000000000..c5639c237 +index 00000000000..c5639c237c8 --- /dev/null +++ b/dlls/dxgkrnl.sys/main.c @@ -0,0 +1,39 @@ @@ -116,25 +116,25 @@ index 000000000..c5639c237 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 4d28a93c3..279271f54 100644 +index e4f3d74886c..9d9e862101b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2553,6 +2553,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2611,6 +2611,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 10,syswow64,stdole2.tlb 11,,iexplore.exe 11,,winetest.exe,- +12,,dxgkrnl.sys,- 12,,fltmgr.sys,- + 12,,http.sys,- 12,,ksecdd.sys,- - 12,,mountmgr.sys,- -@@ -2602,6 +2603,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2664,6 +2665,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,notepad.exe 11,,winetest.exe,- +12,,dxgkrnl.sys 12,,fltmgr.sys + 12,,http.sys 12,,ksecdd.sys - 12,,mountmgr.sys -- -2.21.0 +2.26.2 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 b7fa1406..1b56e545 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 7215993b74878cfd57aa7251fde74d18b233ba14 Mon Sep 17 00:00:00 2001 +From c120934a030791fdb858892fe86d278874e5e16a 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,10 +15,10 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver. create mode 100644 dlls/dxgmms1.sys/main.c diff --git a/configure.ac b/configure.ac -index fbc6acda7..f8eed3baa 100644 +index 0a6d1b0639e..6966f95ce88 100644 --- a/configure.ac +++ b/configure.ac -@@ -3269,6 +3269,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) +@@ -3283,6 +3283,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9) WINE_CONFIG_MAKEFILE(dlls/dxgi) WINE_CONFIG_MAKEFILE(dlls/dxgi/tests) WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys) @@ -28,7 +28,7 @@ index fbc6acda7..f8eed3baa 100644 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 000000000..affb9ce95 +index 00000000000..3ecc3ee5a3e --- /dev/null +++ b/dlls/dxgmms1.sys/Makefile.in @@ -0,0 +1,6 @@ @@ -40,7 +40,7 @@ index 000000000..affb9ce95 + main.c diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec new file mode 100644 -index 000000000..124b0bf94 +index 00000000000..124b0bf944d --- /dev/null +++ b/dlls/dxgmms1.sys/dxgmms1.sys.spec @@ -0,0 +1,2 @@ @@ -48,7 +48,7 @@ index 000000000..124b0bf94 +@ stub VidSchInterface diff --git a/dlls/dxgmms1.sys/main.c b/dlls/dxgmms1.sys/main.c new file mode 100644 -index 000000000..686493d32 +index 00000000000..686493d3296 --- /dev/null +++ b/dlls/dxgmms1.sys/main.c @@ -0,0 +1,39 @@ @@ -92,25 +92,25 @@ index 000000000..686493d32 + return STATUS_SUCCESS; +} diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 279271f54..29afb4182 100644 +index 9d9e862101b..180c3be2a04 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -2554,6 +2554,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,iexplore.exe 11,,winetest.exe,- 12,,dxgkrnl.sys,- +12,,dxgmms1.sys,- 12,,fltmgr.sys,- + 12,,http.sys,- 12,,ksecdd.sys,- - 12,,mountmgr.sys,- -@@ -2604,6 +2605,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" +@@ -2666,6 +2667,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,notepad.exe 11,,winetest.exe,- 12,,dxgkrnl.sys +12,,dxgmms1.sys 12,,fltmgr.sys + 12,,http.sys 12,,ksecdd.sys - 12,,mountmgr.sys -- -2.21.0 +2.26.2 diff --git a/staging/upstream-commit b/staging/upstream-commit index 98f031fa..f911a29e 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -3bb824f98891e8eb907c9c652fe528373a17b10d +b65ca133052ed9053e48c571155a764d4d711277