diff --git a/README.md b/README.md index c1d31bc4..1006e0ac 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ for more details.* * Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767)) * Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143)) * Fix crash in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983)) -* Fix crash in clip_cursor_notify caused by uninitialized TLS ([Wine Bug #36915](https://bugs.winehq.org/show_bug.cgi?id=36915)) +* ~~Fix crash in clip_cursor_notify caused by uninitialized TLS~~ ([Wine Bug #36915](https://bugs.winehq.org/show_bug.cgi?id=36915)) * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254)) * Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479)) * Fix device paths in HKLM\SYSTEM\MountedDevices ([Wine Bug #38235](https://bugs.winehq.org/show_bug.cgi?id=38235)) diff --git a/patches/mfplat-MFTRegister/0001-mfplat-Implement-MFTRegister.patch b/patches/mfplat-MFTRegister/0001-mfplat-Implement-MFTRegister.patch index a634c880..d61d8889 100644 --- a/patches/mfplat-MFTRegister/0001-mfplat-Implement-MFTRegister.patch +++ b/patches/mfplat-MFTRegister/0001-mfplat-Implement-MFTRegister.patch @@ -1,4 +1,4 @@ -From b761ffadb87d3464eefaba9cfc9f15c0297c22b5 Mon Sep 17 00:00:00 2001 +From 2a70588bac94b67bec1799479b6bc9673a15eb4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Fri, 17 Apr 2015 14:39:17 +0200 Subject: mfplat: Implement MFTRegister. @@ -7,9 +7,8 @@ Subject: mfplat: Implement MFTRegister. dlls/mfplat/Makefile.in | 1 + dlls/mfplat/main.c | 144 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 3 +- - include/mfapi.h | 4 +- loader/wine.inf.in | 4 ++ - 5 files changed, 153 insertions(+), 3 deletions(-) + 4 files changed, 151 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 2b5bd24..9679f53 100644 @@ -204,26 +203,11 @@ index 7100dfd..5b24aa9 100644 @ stub MFTRegisterLocal @ stub MFTRegisterLocalByCLSID @ stub MFTUnregister -diff --git a/include/mfapi.h b/include/mfapi.h -index 929a36d..49a86ac 100644 ---- a/include/mfapi.h -+++ b/include/mfapi.h -@@ -24,8 +24,8 @@ - #define MFSTARTUP_FULL 0 - - typedef struct _MFT_REGISTER_TYPE_INFO { -- GUID major_type; -- GUID sub_type; -+ GUID guidMajorType; -+ GUID guidSubtype; - } MFT_REGISTER_TYPE_INFO; - - typedef unsigned __int64 MFWORKITEM_KEY; diff --git a/loader/wine.inf.in b/loader/wine.inf.in -index d901251..b6a45e7 100644 +index 2025d9e..0f4c400 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in -@@ -620,6 +620,10 @@ HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,90 +@@ -623,6 +623,10 @@ HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,90 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" @@ -235,5 +219,5 @@ index d901251..b6a45e7 100644 HKLM,Software\Microsoft\Clients,,16 HKLM,Software\Microsoft\Cryptography\Calais\Current,,16 -- -2.3.5 +2.5.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 926bc4e9..efe1531e 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -55,7 +55,7 @@ version() echo "Copyright (C) 2014-2015 the Wine Staging project authors." echo "" echo "Patchset to be applied on upstream Wine:" - echo " commit e3c6777edda76f319e5c465faf6c20bb91ed9f17" + echo " commit 07e4d4bd044ac3c9f46526b210205216d8bfeb45" echo "" } @@ -269,7 +269,6 @@ patch_enable_all () enable_winex11_CandidateWindowPos="$1" enable_winex11_Clipboard_HTML="$1" enable_winex11_DragAndDrop="$1" - enable_winex11_Thread_Data="$1" enable_winex11_Window_Groups="$1" enable_winex11_Window_Style="$1" enable_winex11_XEMBED="$1" @@ -885,9 +884,6 @@ patch_enable () winex11-DragAndDrop) enable_winex11_DragAndDrop="$2" ;; - winex11-Thread_Data) - enable_winex11_Thread_Data="$2" - ;; winex11-Window_Groups) enable_winex11_Window_Groups="$2" ;; @@ -1494,9 +1490,6 @@ if test "$enable_category_stable" -eq 1; then if test "$enable_winepulse_PulseAudio_Support" -gt 1; then abort "Patchset winepulse-PulseAudio_Support disabled, but category-stable depends on that." fi - if test "$enable_winex11_Thread_Data" -gt 1; then - abort "Patchset winex11-Thread_Data disabled, but category-stable depends on that." - fi if test "$enable_winex11_Window_Style" -gt 1; then abort "Patchset winex11-Window_Style disabled, but category-stable depends on that." fi @@ -1588,7 +1581,6 @@ if test "$enable_category_stable" -eq 1; then enable_wined3d_wined3d_swapchain_present=1 enable_winemenubuilder_Desktop_Icon_Path=1 enable_winepulse_PulseAudio_Support=1 - enable_winex11_Thread_Data=1 enable_winex11_Window_Style=1 enable_winex11_XEMBED=1 enable_winex11_wglShareLists=1 @@ -3258,7 +3250,7 @@ fi # | * [#37811] Add implementation for mfplat.MFTRegister # | # | Modified files: -# | * dlls/mfplat/Makefile.in, dlls/mfplat/main.c, dlls/mfplat/mfplat.spec, include/mfapi.h, loader/wine.inf.in +# | * dlls/mfplat/Makefile.in, dlls/mfplat/main.c, dlls/mfplat/mfplat.spec, loader/wine.inf.in # | if test "$enable_mfplat_MFTRegister" -eq 1; then patch_apply mfplat-MFTRegister/0001-mfplat-Implement-MFTRegister.patch @@ -5523,21 +5515,6 @@ if test "$enable_winex11_DragAndDrop" -eq 1; then ) >> "$patchlist" fi -# Patchset winex11-Thread_Data -# | -# | This patchset fixes the following Wine bugs: -# | * [#36915] Fix crash in clip_cursor_notify caused by uninitialized TLS -# | -# | Modified files: -# | * dlls/winex11.drv/mouse.c -# | -if test "$enable_winex11_Thread_Data" -eq 1; then - patch_apply winex11-Thread_Data/0001-winex11-Initialize-thread-data-in-clip_cursor_notify.patch - ( - echo '+ { "Sebastian Lackner", "winex11: Initialize thread data in clip_cursor_notify.", 1 },'; - ) >> "$patchlist" -fi - # Patchset winex11-Window_Groups # | # | This patchset fixes the following Wine bugs: diff --git a/patches/winex11-Thread_Data/0001-winex11-Initialize-thread-data-in-clip_cursor_notify.patch b/patches/winex11-Thread_Data/0001-winex11-Initialize-thread-data-in-clip_cursor_notify.patch deleted file mode 100644 index c3564193..00000000 --- a/patches/winex11-Thread_Data/0001-winex11-Initialize-thread-data-in-clip_cursor_notify.patch +++ /dev/null @@ -1,28 +0,0 @@ -From da71d74a03fa8d8150c451c7a085c09f045fba49 Mon Sep 17 00:00:00 2001 -From: Sebastian Lackner -Date: Sat, 28 Feb 2015 21:52:40 +0100 -Subject: winex11: Initialize thread data in clip_cursor_notify. - -Fixes a crash with Slender - The Arrival when trying to start the game. -For some reason the thread local data is not initialized yet when we enter -the function. ---- - dlls/winex11.drv/mouse.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c -index 5f5bdeb..95efa19 100644 ---- a/dlls/winex11.drv/mouse.c -+++ b/dlls/winex11.drv/mouse.c -@@ -453,7 +453,7 @@ void reset_clipping_window(void) - */ - LRESULT clip_cursor_notify( HWND hwnd, HWND new_clip_hwnd ) - { -- struct x11drv_thread_data *data = x11drv_thread_data(); -+ struct x11drv_thread_data *data = x11drv_init_thread_data(); - - if (hwnd == GetDesktopWindow()) /* change the clip window stored in the desktop process */ - { --- -2.3.0 - diff --git a/patches/winex11-Thread_Data/definition b/patches/winex11-Thread_Data/definition deleted file mode 100644 index 642f2b6d..00000000 --- a/patches/winex11-Thread_Data/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [36915] Fix crash in clip_cursor_notify caused by uninitialized TLS -Category: stable