diff --git a/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch b/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch index c9dde1ab..056e8815 100644 --- a/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch +++ b/patches/ntdll-DOS_Attributes/0004-ntdll-Implement-storing-DOS-attributes-in-NtCreateFi.patch @@ -1,4 +1,4 @@ -From 494342c8f911f827783f1aed9717d793c4e6a8c0 Mon Sep 17 00:00:00 2001 +From 2f6ec5b1accc1ac275bcb4edeb44c15e271d2f72 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Wed, 20 Aug 2014 15:28:00 -0600 Subject: [PATCH] ntdll: Implement storing DOS attributes in NtCreateFile. @@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Implement storing DOS attributes in NtCreateFile. 2 files changed, 57 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c -index 6a423174664..fccd48f23e5 100644 +index 77b17a50037..07211ebf5de 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c -@@ -55,7 +55,6 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG * +@@ -56,7 +56,6 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG * /* The attribute sets to test */ static struct testfile_s { @@ -20,7 +20,7 @@ index 6a423174664..fccd48f23e5 100644 BOOL attr_done; /* set if attributes were tested for this file already */ const DWORD attr; /* desired attribute */ WCHAR name[20]; /* filename to use */ -@@ -63,16 +62,16 @@ static struct testfile_s { +@@ -64,16 +63,16 @@ static struct testfile_s { const char *description; /* for error messages */ int nfound; /* How many were found (expect 1) */ } testfiles[] = { @@ -47,21 +47,21 @@ index 6a423174664..fccd48f23e5 100644 }; static const int test_dir_count = ARRAY_SIZE(testfiles); static const int max_test_dir_size = ARRAY_SIZE(testfiles) + 5; /* size of above plus some for .. etc */ -@@ -162,8 +161,7 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) +@@ -163,8 +162,7 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].name, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - todo_wine_if (testfiles[i].todo) -- ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); -+ ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%x), got %x (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); +- ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); ++ ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); testfiles[i].attr_done = TRUE; } testfiles[i].nfound++; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c -index 9a1bd50c695..9b3735dd917 100644 +index cd53ca36238..185db877d55 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c -@@ -404,6 +404,26 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si +@@ -392,6 +392,26 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si #endif } @@ -88,7 +88,7 @@ index 9a1bd50c695..9b3735dd917 100644 /* get space from the current directory data buffer, allocating a new one if necessary */ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { -@@ -3783,6 +3803,20 @@ static NTSTATUS unmount_device( HANDLE handle ) +@@ -3786,6 +3806,20 @@ static NTSTATUS unmount_device( HANDLE handle ) return status; } @@ -109,7 +109,7 @@ index 9a1bd50c695..9b3735dd917 100644 /****************************************************************************** * open_unix_file -@@ -3868,13 +3902,14 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU +@@ -3871,13 +3905,14 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU status = STATUS_SUCCESS; } @@ -129,7 +129,7 @@ index 9a1bd50c695..9b3735dd917 100644 if (status == STATUS_SUCCESS) { -@@ -3896,6 +3931,11 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU +@@ -3899,6 +3934,11 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU io->Information = FILE_OVERWRITTEN; break; } @@ -141,7 +141,7 @@ index 9a1bd50c695..9b3735dd917 100644 } else if (status == STATUS_TOO_MANY_OPENED_FILES) { -@@ -3904,6 +3944,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU +@@ -3907,6 +3947,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU } free( nt_name.Buffer ); @@ -150,5 +150,5 @@ index 9a1bd50c695..9b3735dd917 100644 } -- -2.30.2 +2.35.1 diff --git a/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch b/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch index 53a7bea0..91736dcb 100644 --- a/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch +++ b/patches/ntdll-Exception/0002-ntdll-OutputDebugString-should-throw-the-exception-a.patch @@ -1,4 +1,4 @@ -From d2dce4d7635b20ef76fc4b73594177ab8eae1575 Mon Sep 17 00:00:00 2001 +From 6cfa7d9011879898a079614077a605c812cb440e Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sun, 28 Sep 2014 23:39:51 +0200 Subject: [PATCH] ntdll: OutputDebugString should throw the exception a second @@ -10,10 +10,10 @@ Subject: [PATCH] ntdll: OutputDebugString should throw the exception a second 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c -index 91f36a3e6b3..0a3bf397725 100644 +index 9488f2e2399..1cea4b5ba3c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c -@@ -213,6 +213,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) +@@ -200,6 +200,23 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringA( LPCSTR str ) __ENDTRY if (caught_by_dbg) return; @@ -38,10 +38,10 @@ index 91f36a3e6b3..0a3bf397725 100644 if (!mutex_inited) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c -index 202a939b76f..476da44c6ed 100644 +index c4413d4d66e..4fe2c2b04db 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c -@@ -6018,7 +6018,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce +@@ -8327,7 +8327,7 @@ static LONG CALLBACK outputdebugstring_vectored_handler(EXCEPTION_POINTERS *Exce return EXCEPTION_CONTINUE_SEARCH; } @@ -50,15 +50,15 @@ index 202a939b76f..476da44c6ed 100644 { PVOID vectored_handler; -@@ -6034,7 +6034,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) +@@ -8343,7 +8343,6 @@ static void test_outputdebugstring(DWORD numexc, BOOL todo) outputdebugstring_exceptions = 0; OutputDebugStringA("Hello World"); - todo_wine_if(todo) - ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %d exceptions, expected %d\n", + ok(outputdebugstring_exceptions == numexc, "OutputDebugStringA generated %ld exceptions, expected %ld\n", outputdebugstring_exceptions, numexc); -@@ -8251,9 +8250,9 @@ START_TEST(exception) +@@ -10660,9 +10659,9 @@ START_TEST(exception) else skip( "RtlRaiseException not found\n" ); #endif test_stage = 3; @@ -70,7 +70,7 @@ index 202a939b76f..476da44c6ed 100644 test_stage = 5; test_ripevent(0); test_stage = 6; -@@ -8349,7 +8348,7 @@ START_TEST(exception) +@@ -10766,7 +10765,7 @@ START_TEST(exception) test_debugger(DBG_EXCEPTION_HANDLED); test_debugger(DBG_CONTINUE); test_thread_context(); @@ -80,5 +80,5 @@ index 202a939b76f..476da44c6ed 100644 test_breakpoint(1); test_closehandle(0, (HANDLE)0xdeadbeef); -- -2.29.2 +2.35.1 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index c7573684..9c849c41 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "083dea7fce4372840ac18176496a7d05dadd5ad8" + echo "47b02e8c1ea4ad82cd572dc3dcf60af753222f39" } # Show version information diff --git a/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch b/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch index 5f77fdab..f3b1da78 100644 --- a/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch +++ b/patches/winemenubuilder-integration/0001-winemenubuilder-Blacklist-desktop-integration-for-ce.patch @@ -1,4 +1,4 @@ -From 1b6c8682eeabea769020928a1f0fadb6f4a66930 Mon Sep 17 00:00:00 2001 +From d83180d032eee8c3ec72c22fc2706d8b7231090e Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Sun, 1 Mar 2020 17:58:12 -0700 Subject: [PATCH] winemenubuilder: Blacklist desktop integration for certain @@ -65,12 +65,12 @@ index 4a650b444fc..548739f4326 100644 ;; PS HKCR,"MIME\Database\Content Type\application/postscript","Extension",,".ps" diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index 4ff5e874cf8..892e0a04167 100644 +index 131fd34ed7a..48c867cd216 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -512,6 +512,16 @@ HKCR,MIME\Database\Charset\us-ascii,"AliasForCharset",,iso-8859-1 - HKCR,MIME\Database\Charset\visual,"AliasForCharset",,iso-8859-8 - HKCR,MIME\Database\Charset\Windows-1254,"AliasForCharset",,iso-8859-9 +@@ -329,6 +329,16 @@ HKCR,http\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" + HKCR,https\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" + HKCR,mailto\shell\open\command,,2,"""%11%\winebrowser.exe"" ""%1""" +HKCU,Software\Wine\FileOpenBlacklist\.htm,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" +HKCU,Software\Wine\FileOpenBlacklist\.html,"winebrowser",,"""%11%\winebrowser.exe"" -nohome" @@ -86,10 +86,10 @@ index 4ff5e874cf8..892e0a04167 100644 HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"WBreakerClass",,"{369647e0-17b0-11ce-9950-00aa004bbb1f}" HKLM,System\CurrentControlSet\Control\ContentIndex\Language\Neutral,"StemmerClass",,"" diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c -index 6d157305135..ed400d2052e 100644 +index 31c97107802..0226d0d7ad9 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c -@@ -2092,7 +2092,7 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W +@@ -1954,7 +1954,7 @@ static BOOL write_freedesktop_mime_type_entry(const WCHAR *packages_dir, const W return ret; } @@ -98,7 +98,7 @@ index 6d157305135..ed400d2052e 100644 { /* These are managed through external tools like wine.desktop, to evade malware created file type associations */ if (!wcsicmp(extension, L".com") || -@@ -2102,6 +2102,42 @@ static BOOL is_extension_banned(LPCWSTR extension) +@@ -1964,6 +1964,42 @@ static BOOL is_extension_banned(LPCWSTR extension) return FALSE; } @@ -141,7 +141,7 @@ index 6d157305135..ed400d2052e 100644 static WCHAR *get_special_mime_type(LPCWSTR extension) { if (!wcsicmp(extension, L".lnk")) -@@ -2189,6 +2225,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2044,6 +2080,15 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic WCHAR *mimeProgId = NULL; struct rb_string_entry *entry; @@ -157,7 +157,7 @@ index 6d157305135..ed400d2052e 100644 wcslwr(extensionW); friendlyDocNameW = assoc_query(ASSOCSTR_FRIENDLYDOCNAME, extensionW, NULL); -@@ -2229,11 +2274,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic +@@ -2083,11 +2128,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic hasChanged = TRUE; } @@ -170,5 +170,5 @@ index 6d157305135..ed400d2052e 100644 if (executableW) openWithIcon = compute_native_identifier(0, executableW, NULL); -- -2.33.0 +2.35.1 diff --git a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch index c6238a9f..df950bb9 100644 --- a/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch +++ b/patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch @@ -1,4 +1,4 @@ -From 91dfacc1a9c0af50534563975d2ef9f2262559f4 Mon Sep 17 00:00:00 2001 +From 9b42107e6396b8fa014ef258ff7e705d7048dc33 Mon Sep 17 00:00:00 2001 From: Felix Yan Date: Tue, 23 Sep 2014 23:22:17 +0800 Subject: [PATCH] winex11.drv: Update a candidate window's position with @@ -55,11 +55,11 @@ index 8bf4962b708..33954123efe 100644 } return ret; diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c -index 72ea5ad17bd..af279b2ce17 100644 +index fbbf630a80e..7ce98f4a0f9 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c -@@ -146,6 +146,11 @@ static BOOL CDECL loaderdrv_CreateWindow( HWND hwnd ) - return load_driver()->pCreateWindow( hwnd ); +@@ -113,6 +113,11 @@ static void CDECL loaderdrv_UpdateClipboard(void) + load_driver()->pUpdateClipboard(); } +static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) @@ -70,7 +70,7 @@ index 72ea5ad17bd..af279b2ce17 100644 static struct user_driver_funcs lazy_load_driver = { { NULL }, -@@ -200,6 +205,8 @@ static struct user_driver_funcs lazy_load_driver = +@@ -167,6 +172,8 @@ static struct user_driver_funcs lazy_load_driver = NULL, /* opengl support */ NULL, @@ -80,7 +80,7 @@ index 72ea5ad17bd..af279b2ce17 100644 NULL, }; diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index afe44e1c4a3..8eb412f7368 100644 +index d1062cb5f3a..02b09aecf52 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -914,6 +914,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi @@ -103,7 +103,7 @@ index afe44e1c4a3..8eb412f7368 100644 static void CDECL nulldrv_ThreadDetach( void ) { } -@@ -1273,6 +1279,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver +@@ -1287,6 +1293,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver SET_USER_FUNC(SystemParametersInfo); SET_USER_FUNC(wine_get_vulkan_driver); SET_USER_FUNC(wine_get_wgl_driver); diff --git a/staging/upstream-commit b/staging/upstream-commit index 1edf61c9..70f3dc43 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -083dea7fce4372840ac18176496a7d05dadd5ad8 +47b02e8c1ea4ad82cd572dc3dcf60af753222f39