October 2020 - Wine-commits

Sven Baars : ntdll: Fix a memory leak (Valgrind).
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 973b0e1dfcfb20fe5ac2713721a4844e3e3c0671 URL: https://source.winehq.org/git/wine.git/?a=commit;h=973b0e1dfcfb20fe5ac27137… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sun Oct 4 18:10:24 2020 +0200 ntdll: Fix a memory leak (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49904 Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index f12cc51899..c2b6ea603e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -920,7 +920,9 @@ static void load_libwine(void) if (build_dir) path = build_path( build_dir, "libs/wine/" LIBWINE ); else path = build_path( dll_dir, "../" LIBWINE ); - if (!(handle = dlopen( path, RTLD_NOW )) && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; + handle = dlopen( path, RTLD_NOW ); + free( path ); + if (!handle && !(handle = dlopen( LIBWINE, RTLD_NOW ))) return; p_wine_dll_set_callback = dlsym( handle, "wine_dll_set_callback" ); p___wine_main_argc = dlsym( handle, "__wine_main_argc" );

1 0

Rémi Bernon : winex11.drv: Split clip cursor message in notify/request.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 0120a1aa40936fc6d57d83eb12709b951c7b88d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0120a1aa40936fc6d57d83eb… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 1 22:24:30 2020 +0200 winex11.drv: Split clip cursor message in notify/request. The message was sent to two different types of windows, with a different semantic. We can now add parameters to the request without changing the notify parameters semantics. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 41 +++++++++++++++++++++++++++-------------- dlls/winex11.drv/window.c | 4 +++- dlls/winex11.drv/x11drv.h | 4 +++- 3 files changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 68e24a320a..add38a95ba 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -445,7 +445,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!data->clip_hwnd) sync_window_cursor( clip_window ); InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd ); data->clip_hwnd = msg_hwnd; - SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, (LPARAM)msg_hwnd ); return TRUE; } @@ -465,7 +465,7 @@ void ungrab_clipping_window(void) XUnmapWindow( display, clip_window ); if (clipping_cursor) XUngrabPointer( display, CurrentTime ); clipping_cursor = FALSE; - SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR_NOTIFY, 0, 0 ); } /*********************************************************************** @@ -493,12 +493,10 @@ void retry_grab_clipping_window(void) ClipCursor( &last_clip_rect ); } -BOOL CDECL X11DRV_ClipCursor( const RECT *clip ); - /*********************************************************************** * clip_cursor_notify * - * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR. + * Notification function called upon receiving a WM_X11DRV_CLIP_CURSOR_NOTIFY. */ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) { @@ -511,7 +509,7 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) HWND prev = clip_hwnd; clip_hwnd = new_clip_hwnd; if (prev || new_clip_hwnd) TRACE( "clip hwnd changed from %p to %p\n", prev, new_clip_hwnd ); - if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR, (WPARAM)prev, 0 ); + if (prev) SendNotifyMessageW( prev, WM_X11DRV_CLIP_CURSOR_NOTIFY, (WPARAM)prev, 0 ); } else if (hwnd == data->clip_hwnd) /* this is a notification that clipping has been reset */ { @@ -521,13 +519,6 @@ LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) disable_xinput2(); DestroyWindow( hwnd ); } - else if (hwnd == GetForegroundWindow()) /* request to clip */ - { - RECT clip; - - GetClipCursor( &clip ); - X11DRV_ClipCursor( &clip ); - } else if (prev_clip_hwnd) { /* This is a notification send by the desktop window to an old @@ -1539,7 +1530,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR, 0, 0 ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, 0, 0 ); return TRUE; } @@ -1563,6 +1554,28 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) return TRUE; } +/*********************************************************************** + * clip_cursor_request + * + * Function called upon receiving a WM_X11DRV_CLIP_CURSOR_REQUEST. + */ +LRESULT clip_cursor_request( HWND hwnd ) +{ + RECT clip; + + if (hwnd == GetDesktopWindow()) + WARN( "ignoring clip cursor request on desktop window.\n" ); + else if (hwnd != GetForegroundWindow()) + WARN( "ignoring clip cursor request on non-foreground window.\n" ); + else + { + GetClipCursor( &clip ); + X11DRV_ClipCursor( &clip ); + } + + return 0; +} + /*********************************************************************** * move_resize_window */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 455957264b..b0312b1a18 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2781,8 +2781,10 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) else if (hwnd == x11drv_thread_data()->clip_hwnd) set_window_cursor( x11drv_thread_data()->clip_window, (HCURSOR)lp ); return 0; - case WM_X11DRV_CLIP_CURSOR: + case WM_X11DRV_CLIP_CURSOR_NOTIFY: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); + case WM_X11DRV_CLIP_CURSOR_REQUEST: + return clip_cursor_request( hwnd ); default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a92c738a68..d4ee4a7c8d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -538,7 +538,8 @@ enum x11drv_window_messages WM_X11DRV_SET_WIN_REGION, WM_X11DRV_RESIZE_DESKTOP, WM_X11DRV_SET_CURSOR, - WM_X11DRV_CLIP_CURSOR + WM_X11DRV_CLIP_CURSOR_NOTIFY, + WM_X11DRV_CLIP_CURSOR_REQUEST }; /* _NET_WM_STATE properties that we keep track of */ @@ -627,6 +628,7 @@ extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; +extern LRESULT clip_cursor_request( HWND hwnd ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;

1 0

Rémi Bernon : winex11.drv: Forward clip_fullscreen_window to foreground thread.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 16984895f0191dad12d55dee422214645b51aece URL: https://source.winehq.org/git/wine.git/?a=commit;h=16984895f0191dad12d55dee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 1 22:24:31 2020 +0200 winex11.drv: Forward clip_fullscreen_window to foreground thread. If the current thread isn't the foreground thread. Otherwise we may clip the cursor in the wrong thread, that isn't expecting mouse messages or may not be checking its messages. Red Faction has some race condition where this can happen for instance, with clip_fullscreen_window called from X11DRV_DisplayDevices_Update callback in a background thread. This thread starts clipping the cursor, and the foreground thread isn't receiving MotionNotify events anymore. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 11 +++++++++-- dlls/winex11.drv/mouse.c | 6 ++++-- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index cf55a5c1fb..0f61f9f7b2 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -372,14 +372,14 @@ static BOOL CALLBACK update_windows_on_display_change(HWND hwnd, LPARAM lparam) XReconfigureWMWindow(data->display, data->whole_window, data->vis.screen, mask, &changes); } release_win_data(data); - if (hwnd == GetForegroundWindow()) - clip_fullscreen_window(hwnd, TRUE); return TRUE; } void X11DRV_DisplayDevices_Update(BOOL send_display_change) { RECT old_virtual_rect, new_virtual_rect; + DWORD tid, pid; + HWND foreground; UINT mask = 0; old_virtual_rect = get_virtual_screen_rect(); @@ -394,6 +394,13 @@ void X11DRV_DisplayDevices_Update(BOOL send_display_change) X11DRV_resize_desktop(send_display_change); EnumWindows(update_windows_on_display_change, (LPARAM)mask); + + /* forward clip_fullscreen_window request to the foreground window */ + if ((foreground = GetForegroundWindow()) && (tid = GetWindowThreadProcessId( foreground, &pid )) && pid == GetCurrentProcessId()) + { + if (tid == GetCurrentThreadId()) clip_fullscreen_window( foreground, TRUE ); + else SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, TRUE, TRUE ); + } } /* Initialize a GPU instance. diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index add38a95ba..dd25f8b172 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1530,7 +1530,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) if (tid && tid != GetCurrentThreadId() && pid == GetCurrentProcessId()) { TRACE( "forwarding clip request to %p\n", foreground ); - SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, 0, 0 ); + SendNotifyMessageW( foreground, WM_X11DRV_CLIP_CURSOR_REQUEST, FALSE, FALSE ); return TRUE; } @@ -1559,7 +1559,7 @@ BOOL CDECL X11DRV_ClipCursor( LPCRECT clip ) * * Function called upon receiving a WM_X11DRV_CLIP_CURSOR_REQUEST. */ -LRESULT clip_cursor_request( HWND hwnd ) +LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) { RECT clip; @@ -1567,6 +1567,8 @@ LRESULT clip_cursor_request( HWND hwnd ) WARN( "ignoring clip cursor request on desktop window.\n" ); else if (hwnd != GetForegroundWindow()) WARN( "ignoring clip cursor request on non-foreground window.\n" ); + else if (fullscreen) + clip_fullscreen_window( hwnd, reset ); else { GetClipCursor( &clip ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index b0312b1a18..457173964e 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2784,7 +2784,7 @@ LRESULT CDECL X11DRV_WindowMessage( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) case WM_X11DRV_CLIP_CURSOR_NOTIFY: return clip_cursor_notify( hwnd, (HWND)wp, (HWND)lp ); case WM_X11DRV_CLIP_CURSOR_REQUEST: - return clip_cursor_request( hwnd ); + return clip_cursor_request( hwnd, (BOOL)wp, (BOOL)lp ); default: FIXME( "got window msg %x hwnd %p wp %lx lp %lx\n", msg, hwnd, wp, lp ); return 0; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d4ee4a7c8d..173d94b9ef 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -628,7 +628,7 @@ extern void CDECL X11DRV_SetFocus( HWND hwnd ) DECLSPEC_HIDDEN; extern void set_window_cursor( Window window, HCURSOR handle ) DECLSPEC_HIDDEN; extern void sync_window_cursor( Window window ) DECLSPEC_HIDDEN; extern LRESULT clip_cursor_notify( HWND hwnd, HWND prev_clip_hwnd, HWND new_clip_hwnd ) DECLSPEC_HIDDEN; -extern LRESULT clip_cursor_request( HWND hwnd ) DECLSPEC_HIDDEN; +extern LRESULT clip_cursor_request( HWND hwnd, BOOL fullscreen, BOOL reset ) DECLSPEC_HIDDEN; extern void ungrab_clipping_window(void) DECLSPEC_HIDDEN; extern void reset_clipping_window(void) DECLSPEC_HIDDEN; extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;

1 0

Alistair Leslie-Hughes : xactengine3_7: Explicity copy the XACT_RUNTIME_PARAMETERS members.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 8ea0607befc4c1ad349cd85c6587aa91a6d0220d URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ea0607befc4c1ad349cd85c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Oct 2 17:23:24 2020 +1000 xactengine3_7: Explicity copy the XACT_RUNTIME_PARAMETERS members. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49911 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xactengine3_7/xact_dll.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/xactengine3_7/xact_dll.c b/dlls/xactengine3_7/xact_dll.c index 84ed35d2c4..281aecc154 100644 --- a/dlls/xactengine3_7/xact_dll.c +++ b/dlls/xactengine3_7/xact_dll.c @@ -776,7 +776,16 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, TRACE("(%p)->(%p)\n", This, pParams); - memcpy(&params, pParams, sizeof(FACTRuntimeParameters)); + memset(&params, 0, sizeof(FACTRuntimeParameters)); + /* Explicitly copy to the FAudio structure as the packing is wrong under 64 bits */ + params.lookAheadTime = pParams->lookAheadTime; + params.pGlobalSettingsBuffer = pParams->pGlobalSettingsBuffer; + params.globalSettingsBufferSize = pParams->globalSettingsBufferSize; + params.globalSettingsFlags = pParams->globalSettingsFlags; + params.globalSettingsAllocAttributes = pParams->globalSettingsAllocAttributes; + params.pRendererID = (int16_t*)pParams->pRendererID; + params.pXAudio2 = NULL; + params.pMasteringVoice = NULL; /* FIXME: pXAudio2 and pMasteringVoice are pointers to * IXAudio2/IXAudio2MasteringVoice objects. FACT wants pointers to @@ -789,12 +798,10 @@ static HRESULT WINAPI IXACT3EngineImpl_Initialize(IXACT3Engine *iface, * -flibit */ if (pParams->pXAudio2 != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pXAudio2 = NULL; + FIXME("pXAudio2 parameter not supported!\n"); if (pParams->pMasteringVoice != NULL){ - FIXME("pXAudio2 parameter not supported! Falling back to NULL\n"); - params.pMasteringVoice = NULL; + FIXME("pMasteringVoice parameter not supported!\n"); } }

1 0

Daniel Lehman : tzres: Add North Korea Time Zone.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: a486680a2b008d18da1a321b3ed2a921312bce69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a486680a2b008d18da1a321b… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Oct 4 16:22:37 2020 -0700 tzres: Add North Korea Time Zone. Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 2 + loader/wine.inf.in | 14 +++++ po/ar.po | 142 ++++++++++++++++++++++++++++----------------------- po/ast.po | 142 ++++++++++++++++++++++++++++----------------------- po/bg.po | 138 ++++++++++++++++++++++++++----------------------- po/ca.po | 142 ++++++++++++++++++++++++++++----------------------- po/cs.po | 142 ++++++++++++++++++++++++++++----------------------- po/da.po | 142 ++++++++++++++++++++++++++++----------------------- po/de.po | 142 ++++++++++++++++++++++++++++----------------------- po/el.po | 138 ++++++++++++++++++++++++++----------------------- po/en.po | 138 ++++++++++++++++++++++++++----------------------- po/en_US.po | 138 ++++++++++++++++++++++++++----------------------- po/eo.po | 142 ++++++++++++++++++++++++++++----------------------- po/es.po | 142 ++++++++++++++++++++++++++++----------------------- po/fa.po | 140 +++++++++++++++++++++++++++----------------------- po/fi.po | 142 ++++++++++++++++++++++++++++----------------------- po/fr.po | 142 ++++++++++++++++++++++++++++----------------------- po/he.po | 142 ++++++++++++++++++++++++++++----------------------- po/hi.po | 138 ++++++++++++++++++++++++++----------------------- po/hr.po | 142 ++++++++++++++++++++++++++++----------------------- po/hu.po | 142 ++++++++++++++++++++++++++++----------------------- po/it.po | 142 ++++++++++++++++++++++++++++----------------------- po/ja.po | 142 ++++++++++++++++++++++++++++----------------------- po/ko.po | 142 ++++++++++++++++++++++++++++----------------------- po/lt.po | 142 ++++++++++++++++++++++++++++----------------------- po/ml.po | 138 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 142 ++++++++++++++++++++++++++++----------------------- po/nl.po | 142 ++++++++++++++++++++++++++++----------------------- po/or.po | 138 ++++++++++++++++++++++++++----------------------- po/pa.po | 138 ++++++++++++++++++++++++++----------------------- po/pl.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 142 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 142 ++++++++++++++++++++++++++++----------------------- po/rm.po | 138 ++++++++++++++++++++++++++----------------------- po/ro.po | 142 ++++++++++++++++++++++++++++----------------------- po/ru.po | 138 ++++++++++++++++++++++++++----------------------- po/si.po | 142 ++++++++++++++++++++++++++++----------------------- po/sk.po | 142 ++++++++++++++++++++++++++++----------------------- po/sl.po | 142 ++++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 141 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 141 +++++++++++++++++++++++++++----------------------- po/sv.po | 142 ++++++++++++++++++++++++++++----------------------- po/ta.po | 138 ++++++++++++++++++++++++++----------------------- po/te.po | 138 ++++++++++++++++++++++++++----------------------- po/th.po | 140 +++++++++++++++++++++++++++----------------------- po/tr.po | 142 ++++++++++++++++++++++++++++----------------------- po/uk.po | 138 ++++++++++++++++++++++++++----------------------- po/wa.po | 140 +++++++++++++++++++++++++++----------------------- po/wine.pot | 138 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 142 ++++++++++++++++++++++++++++----------------------- po/zh_TW.po | 142 ++++++++++++++++++++++++++++----------------------- 51 files changed, 3725 insertions(+), 3185 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a486680a2b008d18da1a…

1 0

Rémi Bernon : include: Split objidl.idl to objidlbase.idl.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: 6e09636f68c30d0452db3268e366a4c26301f826 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e09636f68c30d0452db3268… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:13 2020 +0200 include: Split objidl.idl to objidlbase.idl. Windows SDKs use #include here to import one into the other, so we do the same. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/objidl.idl | 1217 ++---------------------------------------------- include/objidlbase.idl | 1198 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 1227 insertions(+), 1189 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6e09636f68c30d0452db…

1 0

Rémi Bernon : include: Add IAgileObject to objidlbase.idl.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: cdf013b9b984e4d161b7a3ae27adde366969eee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdf013b9b984e4d161b7a3ae… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Oct 2 12:04:14 2020 +0200 include: Add IAgileObject to objidlbase.idl. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/objidlbase.idl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/include/objidlbase.idl b/include/objidlbase.idl index 7f649dd005..6449be8417 100644 --- a/include/objidlbase.idl +++ b/include/objidlbase.idl @@ -83,6 +83,15 @@ interface IMarshal : IUnknown [in] DWORD dwReserved); } +[ + local, + object, + uuid(94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90) +] +interface IAgileObject : IUnknown +{ +} + [ local, object,

1 0

Matteo Bruni : winex11: Add DriverDate registry property to display adapters.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: bd27af974a21085cd0dc78b37b715bbcc3cfab69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd27af974a21085cd0dc78b3… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Oct 1 11:01:11 2020 +0200 winex11: Add DriverDate registry property to display adapters. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 47e4733dba..cf55a5c1fb 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -51,6 +51,7 @@ DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_RCWORK, 0x233a9ef3, 0xafc4, 0x4abd, 0x DEFINE_DEVPROPKEY(WINE_DEVPROPKEY_MONITOR_ADAPTERNAME, 0x233a9ef3, 0xafc4, 0x4abd, 0xb5, 0x64, 0xc3, 0x2f, 0x21, 0xf1, 0x53, 0x5b, 5); static const WCHAR driver_date_dataW[] = {'D','r','i','v','e','r','D','a','t','e','D','a','t','a',0}; +static const WCHAR driver_dateW[] = {'D','r','i','v','e','r','D','a','t','e',0}; static const WCHAR driver_descW[] = {'D','r','i','v','e','r','D','e','s','c',0}; static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; static const WCHAR pciW[] = {'P','C','I',0}; @@ -107,6 +108,7 @@ static const WCHAR monitor_instance_fmtW[] = { static const WCHAR monitor_hardware_idW[] = { 'M','O','N','I','T','O','R','\\', 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; +static const WCHAR driver_date_fmtW[] = {'%','u','-','%','u','-','%','u',0}; static struct x11drv_display_device_handler host_handler; struct x11drv_display_device_handler desktop_handler; @@ -403,14 +405,15 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g SP_DEVINFO_DATA device_data = {sizeof(device_data)}; WCHAR instanceW[MAX_PATH]; DEVPROPTYPE property_type; + SYSTEMTIME systemtime; WCHAR bufferW[1024]; + FILETIME filetime; HKEY hkey = NULL; GUID guid; LUID luid; INT written; DWORD size; BOOL ret = FALSE; - FILETIME filetime; TRACE("GPU id:0x%s name:%s.\n", wine_dbgstr_longlong(gpu->id), wine_dbgstr_w(gpu->name)); @@ -468,6 +471,11 @@ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT g if (RegSetValueExW(hkey, driver_date_dataW, 0, REG_BINARY, (BYTE *)&filetime, sizeof(filetime))) goto done; + GetSystemTime(&systemtime); + sprintfW(bufferW, driver_date_fmtW, systemtime.wMonth, systemtime.wDay, systemtime.wYear); + if (RegSetValueExW(hkey, driver_dateW, 0, REG_SZ, (BYTE *)bufferW, (strlenW(bufferW) + 1) * sizeof(WCHAR))) + goto done; + RegCloseKey(hkey); /* Retrieve driver value for adapters */

1 0

Martin Storsjo : ntdll: Unwind to the LR register if no unwind info is available.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: df794f342500f1b4bfd988f292302afa890354c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=df794f342500f1b4bfd988f2… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:39 2020 +0300 ntdll: Unwind to the LR register if no unwind info is available. Try to keep the behaviour from ea9f47a767c2 of erroring out if unwinding ends up out of bounds (with pc==lr, where setting pc to lr doesn't progress the unwind), but support unwinding from functions without unwind info. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_arm64.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/signal_arm64.c b/dlls/ntdll/signal_arm64.c index eb451603fe..c9f44e92d3 100644 --- a/dlls/ntdll/signal_arm64.c +++ b/dlls/ntdll/signal_arm64.c @@ -197,8 +197,16 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX } else { - WARN( "exception data not found in %s\n", debugstr_w(module->BaseDllName.Buffer) ); - return STATUS_INVALID_DISPOSITION; + status = context->Pc != context->u.s.Lr ? + STATUS_SUCCESS : STATUS_INVALID_DISPOSITION; + WARN( "exception data not found in %s for %p, LR %p, status %x\n", + debugstr_w(module->BaseDllName.Buffer), (void*) context->Pc, + (void*) context->u.s.Lr, status ); + dispatch->EstablisherFrame = context->Sp; + dispatch->LanguageHandler = NULL; + context->Pc = context->u.s.Lr; + context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + return status; } dispatch->EstablisherFrame = context->u.s.Fp;

1 0

Martin Storsjo : ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64.
by Alexandre Julliard 05 Oct '20

05 Oct '20

Module: wine Branch: master Commit: dcf3874e005f864a87205bb7da7ac4bda24a81b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcf3874e005f864a87205bb7… Author: Martin Storsjo <martin(a)martin.st> Date: Mon Oct 5 12:16:40 2020 +0300 ntdll: Restore the original Lr value when unwinding through raise_func_trampoline on arm64. When a signal is raised in a leaf function (that hasn't backed up the Lr register itself), we need to restore both Pc and Lr separately. This doesn't seem to be possible via libunwind, so add a special case unwinding rule for this function. As we have a special case for the function, we could also just as well skip normal dwarf unwinding for this function altogether and just restore the full context from the stack. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_arm64.c | 62 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 51 insertions(+), 11 deletions(-) diff --git a/dlls/ntdll/unix/signal_arm64.c b/dlls/ntdll/unix/signal_arm64.c index e08d6a2ee1..3beef729dc 100644 --- a/dlls/ntdll/unix/signal_arm64.c +++ b/dlls/ntdll/unix/signal_arm64.c @@ -157,6 +157,7 @@ static inline struct arm64_thread_data *arm64_thread_data(void) return (struct arm64_thread_data *)ntdll_get_thread_data()->cpu_data; } +extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher ); /*********************************************************************** * unwind_builtin_dll @@ -276,6 +277,17 @@ NTSTATUS CDECL unwind_builtin_dll( ULONG type, DISPATCHER_CONTEXT *dispatch, CON unw_get_reg( &cursor, UNW_REG_IP, (unw_word_t *)&context->Pc ); context->ContextFlags |= CONTEXT_UNWOUND_TO_CALL; + if (info.start_ip == (unw_word_t)raise_func_trampoline) { + /* raise_func_trampoline has a full CONTEXT stored on the stack; + * restore the original Lr value from there. The function we unwind + * to might be a leaf function that hasn't backed up its own original + * Lr value on the stack. + * We could also just restore the full context here without doing + * unw_step at all. */ + const CONTEXT *next_ctx = (const CONTEXT *) dispatch->EstablisherFrame; + context->u.s.Lr = next_ctx->u.s.Lr; + } + TRACE( "next function pc=%016lx%s\n", context->Pc, rc ? "" : " (last frame)" ); TRACE(" x0=%016lx x1=%016lx x2=%016lx x3=%016lx\n", context->u.s.X0, context->u.s.X1, context->u.s.X2, context->u.s.X3 ); @@ -573,20 +585,49 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) } -extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void *dispatcher, void *sp ); +/* Note, unwind_builtin_dll above has hardcoded assumptions on how this + * function stores things on the stack; if modified, modify that one in + * sync as well. */ __ASM_GLOBAL_FUNC( raise_func_trampoline, - __ASM_CFI(".cfi_signal_frame\n\t") - "stp x29, x30, [sp, #-0x20]!\n\t" - __ASM_CFI(".cfi_def_cfa_offset 32\n\t") - __ASM_CFI(".cfi_offset 29, -32\n\t") - __ASM_CFI(".cfi_offset 30, -24\n\t") + "stp x29, x30, [sp, #-0x30]!\n\t" + __ASM_CFI(".cfi_def_cfa_offset 48\n\t") + __ASM_CFI(".cfi_offset 29, -48\n\t") + __ASM_CFI(".cfi_offset 30, -40\n\t") + "stp x0, x1, [sp, #0x10]\n\t" + "str x2, [sp, #0x20]\n\t" "mov x29, sp\n\t" __ASM_CFI(".cfi_def_cfa_register 29\n\t") - "str x3, [sp, 0x10]\n\t" __ASM_CFI(".cfi_remember_state\n\t") - __ASM_CFI(".cfi_escape 0x0f,0x03,0x8d,0x10,0x06\n\t") /* CFA */ - __ASM_CFI(".cfi_escape 0x10,0x1d,0x02,0x8d,0x00\n\t") /* x29 */ - __ASM_CFI(".cfi_escape 0x10,0x1e,0x02,0x8d,0x08\n\t") /* x30 */ + + /* Memcpy the context onto the stack */ + "sub sp, sp, #0x390\n\t" + "mov x0, sp\n\t" + "mov x2, #0x390\n\t" + "bl " __ASM_NAME("memcpy") "\n\t" + __ASM_CFI(".cfi_def_cfa 31, 0\n\t") + __ASM_CFI(".cfi_escape 0x0f,0x04,0x8f,0x80,0x02,0x06\n\t") /* CFA, DW_OP_breg31 + 0x100, DW_OP_deref */ + __ASM_CFI(".cfi_escape 0x10,0x13,0x03,0x8f,0xa0,0x01\n\t") /* x19, DW_OP_breg31 + 0xA0 */ + __ASM_CFI(".cfi_escape 0x10,0x14,0x03,0x8f,0xa8,0x01\n\t") /* x20 */ + __ASM_CFI(".cfi_escape 0x10,0x15,0x03,0x8f,0xb0,0x01\n\t") /* x21 */ + __ASM_CFI(".cfi_escape 0x10,0x16,0x03,0x8f,0xb8,0x01\n\t") /* x22 */ + __ASM_CFI(".cfi_escape 0x10,0x17,0x03,0x8f,0xc0,0x01\n\t") /* x23 */ + __ASM_CFI(".cfi_escape 0x10,0x18,0x03,0x8f,0xc8,0x01\n\t") /* x24 */ + __ASM_CFI(".cfi_escape 0x10,0x19,0x03,0x8f,0xd0,0x01\n\t") /* x25 */ + __ASM_CFI(".cfi_escape 0x10,0x1a,0x03,0x8f,0xd8,0x01\n\t") /* x26 */ + __ASM_CFI(".cfi_escape 0x10,0x1b,0x03,0x8f,0xe0,0x01\n\t") /* x27 */ + __ASM_CFI(".cfi_escape 0x10,0x1c,0x03,0x8f,0xe8,0x01\n\t") /* x28 */ + __ASM_CFI(".cfi_escape 0x10,0x1d,0x03,0x8f,0xf0,0x01\n\t") /* x29 */ + __ASM_CFI(".cfi_escape 0x10,0x1e,0x03,0x8f,0x88,0x02\n\t") /* x30 = pc */ + __ASM_CFI(".cfi_escape 0x10,0x48,0x03,0x8f,0x90,0x03\n\t") /* d8 */ + __ASM_CFI(".cfi_escape 0x10,0x49,0x03,0x8f,0x98,0x03\n\t") /* d9 */ + __ASM_CFI(".cfi_escape 0x10,0x4a,0x03,0x8f,0xa0,0x03\n\t") /* d10 */ + __ASM_CFI(".cfi_escape 0x10,0x4b,0x03,0x8f,0xa8,0x03\n\t") /* d11 */ + __ASM_CFI(".cfi_escape 0x10,0x4c,0x03,0x8f,0xb0,0x03\n\t") /* d12 */ + __ASM_CFI(".cfi_escape 0x10,0x4d,0x03,0x8f,0xb8,0x03\n\t") /* d13 */ + __ASM_CFI(".cfi_escape 0x10,0x4e,0x03,0x8f,0xc0,0x03\n\t") /* d14 */ + __ASM_CFI(".cfi_escape 0x10,0x4f,0x03,0x8f,0xc8,0x03\n\t") /* d15 */ + "ldp x0, x1, [x29, #0x10]\n\t" + "ldr x2, [x29, #0x20]\n\t" "blr x2\n\t" __ASM_CFI(".cfi_restore_state\n\t") "brk #1") @@ -625,7 +666,6 @@ static void setup_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec ) stack->rec = *rec; stack->context = context; - REGn_sig(3, sigcontext) = SP_sig(sigcontext); /* original stack pointer, fourth arg for raise_func_trampoline */ SP_sig(sigcontext) = (ULONG_PTR)stack; LR_sig(sigcontext) = PC_sig(sigcontext); PC_sig(sigcontext) = (ULONG_PTR)raise_func_trampoline;

1 0