[PATCH] kernelbase: Comment out DECLSPEC_HOTPATCH for GetThreadLocale.

Zhiyi Zhang zzhang at codeweavers.com
Wed Sep 18 10:22:29 CDT 2019


Similar to winehq bug 47633 and 47649 but triggered by
i686-w64-mingw32-gcc 8.3 with -Og.

Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---

000006d6 <_GetThreadLocale at 0>:
     6d6:	8b ff                	mov    %edi,%edi
     6d8:	55                   	push   %ebp
     6d9:	8b ec                	mov    %esp,%ebp
     6db:	64 a1 18 00 00 00    	mov    %fs:0x18,%eax
     6e1:	8b 80 c4 00 00 00    	mov    0xc4(%eax),%eax
     6e7:	85 c0                	test   %eax,%eax
     6e9:	74 01                	je     6ec <_GetThreadLocale at 0+0x16>
				      > missing 'add $0x4, %esp' or similar here
     6eb:	c3                   	ret    
     6ec:	83 ec 08             	sub    $0x8,%esp
     6ef:	e8 00 00 00 00       	call   6f4 <_GetThreadLocale at 0+0x1e>
     6f4:	64 8b 15 18 00 00 00 	mov    %fs:0x18,%edx
     6fb:	89 82 c4 00 00 00    	mov    %eax,0xc4(%edx)
     701:	c9                   	leave  
     702:	c3                   	ret    

 dlls/kernelbase/thread.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/kernelbase/thread.c b/dlls/kernelbase/thread.c
index e16062016a..83aa8dc8cc 100644
--- a/dlls/kernelbase/thread.c
+++ b/dlls/kernelbase/thread.c
@@ -253,7 +253,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetThreadId( HANDLE thread )
 /***********************************************************************
  *	GetThreadLocale   (kernelbase.@)
  */
-LCID WINAPI DECLSPEC_HOTPATCH GetThreadLocale(void)
+LCID WINAPI /* DECLSPEC_HOTPATCH */ GetThreadLocale(void)
 {
     LCID ret = NtCurrentTeb()->CurrentLocale;
     if (!ret) NtCurrentTeb()->CurrentLocale = ret = GetUserDefaultLCID();
-- 
2.23.0




More information about the wine-devel mailing list