wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

Alexandre Julliard : user32: Scale monitor rectangles based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 92f5c6e410fe0dbcbfa4aae708e7afd9564efb21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=92f5c6e410fe0dbcbfa4aae7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:23:47 2018 +0200 user32: Scale monitor rectangles based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 26 +++++++++++++++++++++++++- dlls/user32/win.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 10f90a2..b6679c5 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3222,6 +3222,21 @@ UINT get_thread_dpi(void) } /********************************************************************** + * map_dpi_rect + */ +RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) +{ + if (dpi_from && dpi_to && dpi_from != dpi_to) + { + rect.left = MulDiv( rect.left, dpi_to, dpi_from ); + rect.top = MulDiv( rect.top, dpi_to, dpi_from ); + rect.right = MulDiv( rect.right, dpi_to, dpi_from ); + rect.bottom = MulDiv( rect.bottom, dpi_to, dpi_from ); + } + return rect; +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) @@ -3586,13 +3601,22 @@ BOOL WINAPI GetMonitorInfoA( HMONITOR monitor, LPMONITORINFO info ) BOOL WINAPI GetMonitorInfoW( HMONITOR monitor, LPMONITORINFO info ) { BOOL ret; + UINT dpi_from, dpi_to; if (info->cbSize != sizeof(MONITORINFOEXW) && info->cbSize != sizeof(MONITORINFO)) return FALSE; ret = USER_Driver->pGetMonitorInfo( monitor, info ); if (ret) + { + if ((dpi_to = get_thread_dpi())) + { + dpi_from = get_monitor_dpi( monitor ); + info->rcMonitor = map_dpi_rect( info->rcMonitor, dpi_from, dpi_to ); + info->rcWork = map_dpi_rect( info->rcWork, dpi_from, dpi_to ); + } TRACE( "flags %04x, monitor %s, work %s\n", info->dwFlags, wine_dbgstr_rect(&info->rcMonitor), wine_dbgstr_rect(&info->rcWork)); + } return ret; } @@ -3634,7 +3658,7 @@ __ASM_GLOBAL_FUNC( enum_mon_callback_wrapper, static BOOL CALLBACK enum_mon_callback( HMONITOR monitor, HDC hdc, LPRECT rect, LPARAM lp ) { struct enum_mon_data *data = (struct enum_mon_data *)lp; - RECT monrect = *rect; + RECT monrect = map_dpi_rect( *rect, get_monitor_dpi( monitor ), get_thread_dpi() ); OffsetRect( &monrect, -data->origin.x, -data->origin.y ); if (!IntersectRect( &monrect, &monrect, &data->limit )) return TRUE; diff --git a/dlls/user32/win.h b/dlls/user32/win.h index f9e11ff..226e3e9 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -131,6 +131,7 @@ extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDE extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; +extern RECT map_dpi_rect( RECT rect, UINT dpi_from, UINT dpi_to ) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Scale window dimensions in DeferWindowPos() based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 7068a856042b53d9f0aad51e5a0ad6af0b7159bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=7068a856042b53d9f0aad51e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:17:06 2018 +0200 user32: Scale window dimensions in DeferWindowPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 04c1c0c..e26dc6e 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -2435,17 +2435,26 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, DWP *pDWP; int i; HDWP retvalue = hdwp; + WINDOWPOS winpos; TRACE("hdwp %p, hwnd %p, after %p, %d,%d (%dx%d), flags %08x\n", hdwp, hwnd, hwndAfter, x, y, cx, cy, flags); - hwnd = WIN_GetFullHandle( hwnd ); - if (is_desktop_window( hwnd ) || !IsWindow( hwnd )) + winpos.hwnd = WIN_GetFullHandle( hwnd ); + if (is_desktop_window( winpos.hwnd ) || !IsWindow( winpos.hwnd )) { SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; } + winpos.hwndInsertAfter = WIN_GetFullHandle(hwndAfter); + winpos.flags = flags; + winpos.x = x; + winpos.y = y; + winpos.cx = cx; + winpos.cy = cy; + map_dpi_winpos( &winpos ); + if (!(pDWP = get_user_handle_ptr( hdwp, USER_DWP ))) return 0; if (pDWP == OBJ_OTHER_PROCESS) { @@ -2455,22 +2464,22 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, for (i = 0; i < pDWP->actualCount; i++) { - if (pDWP->winPos[i].hwnd == hwnd) + if (pDWP->winPos[i].hwnd == winpos.hwnd) { /* Merge with the other changes */ if (!(flags & SWP_NOZORDER)) { - pDWP->winPos[i].hwndInsertAfter = WIN_GetFullHandle(hwndAfter); + pDWP->winPos[i].hwndInsertAfter = winpos.hwndInsertAfter; } if (!(flags & SWP_NOMOVE)) { - pDWP->winPos[i].x = x; - pDWP->winPos[i].y = y; + pDWP->winPos[i].x = winpos.x; + pDWP->winPos[i].y = winpos.y; } if (!(flags & SWP_NOSIZE)) { - pDWP->winPos[i].cx = cx; - pDWP->winPos[i].cy = cy; + pDWP->winPos[i].cx = winpos.cx; + pDWP->winPos[i].cy = winpos.cy; } pDWP->winPos[i].flags &= flags | ~(SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOREDRAW | @@ -2493,14 +2502,7 @@ HDWP WINAPI DeferWindowPos( HDWP hdwp, HWND hwnd, HWND hwndAfter, pDWP->suggestedCount *= 2; pDWP->winPos = newpos; } - pDWP->winPos[pDWP->actualCount].hwnd = hwnd; - pDWP->winPos[pDWP->actualCount].hwndInsertAfter = hwndAfter; - pDWP->winPos[pDWP->actualCount].x = x; - pDWP->winPos[pDWP->actualCount].y = y; - pDWP->winPos[pDWP->actualCount].cx = cx; - pDWP->winPos[pDWP->actualCount].cy = cy; - pDWP->winPos[pDWP->actualCount].flags = flags; - pDWP->actualCount++; + pDWP->winPos[pDWP->actualCount++] = winpos; END: release_user_handle_ptr( pDWP ); return retvalue;

1 0

Alexandre Julliard : user32: Scale window dimensions in SetWindowPos() based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 4233caa7b89014ef20baf4667c1f8c5ee5273c21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4233caa7b89014ef20baf466… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:16:48 2018 +0200 user32: Scale window dimensions in SetWindowPos() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index ed3c105..04c1c0c 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1643,6 +1643,23 @@ static void dump_winpos_flags(UINT flags) TRACE("\n"); } + +/*********************************************************************** + * map_dpi_winpos + */ +static void map_dpi_winpos( WINDOWPOS *winpos ) +{ + UINT dpi_from = get_thread_dpi(); + UINT dpi_to = GetDpiForWindow( winpos->hwnd ); + + if (!dpi_from) dpi_from = get_win_monitor_dpi( winpos->hwnd ); + if (dpi_from == dpi_to) return; + winpos->x = MulDiv( winpos->x, dpi_to, dpi_from ); + winpos->y = MulDiv( winpos->y, dpi_to, dpi_from ); + winpos->cx = MulDiv( winpos->cx, dpi_to, dpi_from ); + winpos->cy = MulDiv( winpos->cy, dpi_to, dpi_from ); +} + /*********************************************************************** * SWP_DoWinPosChanging */ @@ -1691,10 +1708,9 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS *pWinpos, RECT *old_window_rect, REC } pWinpos->flags |= SWP_NOCLIENTMOVE | SWP_NOCLIENTSIZE; - TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n", + TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x current %s style %08x new %s\n", pWinpos->hwnd, pWinpos->hwndInsertAfter, pWinpos->x, pWinpos->y, - pWinpos->cx, pWinpos->cy, pWinpos->flags ); - TRACE( "current %s style %08x new %s\n", + pWinpos->cx, pWinpos->cy, pWinpos->flags, wine_dbgstr_rect( old_window_rect ), wndPtr->dwStyle, wine_dbgstr_rect( new_window_rect )); @@ -2216,7 +2232,9 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) { RECT old_window_rect, old_client_rect, new_window_rect, new_client_rect, valid_rects[2]; UINT orig_flags; - + BOOL ret = FALSE; + DPI_AWARENESS_CONTEXT context; + orig_flags = winpos->flags; /* First, check z-order arguments. */ @@ -2256,11 +2274,13 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) else if (winpos->cy > 32767) winpos->cy = 32767; } + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( winpos->hwnd )); + if (!SWP_DoWinPosChanging( winpos, &old_window_rect, &old_client_rect, - &new_window_rect, &new_client_rect )) return FALSE; + &new_window_rect, &new_client_rect )) goto done; /* Fix redundant flags */ - if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) return FALSE; + if (!fixup_flags( winpos, &old_window_rect, parent_x, parent_y )) goto done; if((winpos->flags & (SWP_NOZORDER | SWP_HIDEWINDOW | SWP_SHOWWINDOW)) != SWP_NOZORDER) { @@ -2275,8 +2295,7 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) if (!set_window_pos( winpos->hwnd, winpos->hwndInsertAfter, winpos->flags, &new_window_rect, &new_client_rect, valid_rects )) - return FALSE; - + goto done; if( winpos->flags & SWP_HIDEWINDOW ) @@ -2329,7 +2348,10 @@ BOOL USER_SetWindowPos( WINDOWPOS * winpos, int parent_x, int parent_y ) winpos->cy = new_window_rect.bottom - new_window_rect.top; SendMessageW( winpos->hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM)winpos ); } - return TRUE; + ret = TRUE; +done: + SetThreadDpiAwarenessContext( context ); + return ret; } /*********************************************************************** @@ -2357,7 +2379,9 @@ BOOL WINAPI SetWindowPos( HWND hwnd, HWND hwndInsertAfter, winpos.cx = cx; winpos.cy = cy; winpos.flags = flags; - + + map_dpi_winpos( &winpos ); + if (WIN_IsCurrentThread( hwnd )) return USER_SetWindowPos( &winpos, 0, 0 );

1 0

Alexandre Julliard : user32: Scale initial window dimensions in CreateWindow() based on DPI awareness.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 110443acef21dcc4639eb34ae5738444fb271562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=110443acef21dcc4639eb34a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 12:13:02 2018 +0200 user32: Scale initial window dimensions in CreateWindow() based on DPI awareness. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 13 +++++++++++++ dlls/user32/win.c | 44 +++++++++++++++++++++++++++++++++++++++----- dlls/user32/win.h | 1 + 3 files changed, 53 insertions(+), 5 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 149b483..10f90a2 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3209,6 +3209,19 @@ UINT get_win_monitor_dpi( HWND hwnd ) } /********************************************************************** + * get_thread_dpi + */ +UINT get_thread_dpi(void) +{ + switch (GetAwarenessFromDpiAwarenessContext( GetThreadDpiAwarenessContext() )) + { + case DPI_AWARENESS_UNAWARE: return USER_DEFAULT_SCREEN_DPI; + case DPI_AWARENESS_SYSTEM_AWARE: return system_dpi; + default: return 0; /* no scaling */ + } +} + +/********************************************************************** * SetProcessDpiAwarenessContext (USER32.@) */ BOOL WINAPI SetProcessDpiAwarenessContext( DPI_AWARENESS_CONTEXT context ) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index cbfd8bb..c7a3b06 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -1305,6 +1305,25 @@ static void dump_window_styles( DWORD style, DWORD exstyle ) #undef DUMPED_EX_STYLES } +/*********************************************************************** + * map_dpi_create_struct + */ +static void map_dpi_create_struct( CREATESTRUCTW *cs, UINT dpi_from, UINT dpi_to ) +{ + if (!dpi_from && !dpi_to) return; + if (!dpi_from || !dpi_to) + { + POINT pt = { cs->x, cs->y }; + UINT mon_dpi = get_monitor_dpi( MonitorFromPoint( pt, MONITOR_DEFAULTTONEAREST )); + if (!dpi_from) dpi_from = mon_dpi; + else dpi_to = mon_dpi; + } + if (dpi_from == dpi_to) return; + cs->x = MulDiv( cs->x, dpi_to, dpi_from ); + cs->y = MulDiv( cs->y, dpi_to, dpi_from ); + cs->cx = MulDiv( cs->cx, dpi_to, dpi_from ); + cs->cy = MulDiv( cs->cy, dpi_to, dpi_from ); +} /*********************************************************************** * WIN_CreateWindowEx @@ -1319,6 +1338,8 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, WND *wndPtr; HWND hwnd, parent, owner, top_child = 0; const WCHAR *p = className; + UINT win_dpi, thread_dpi = get_thread_dpi(); + DPI_AWARENESS_CONTEXT context; MDICREATESTRUCTW mdi_cs; CBT_CREATEWNDW cbtc; CREATESTRUCTW cbcs; @@ -1550,6 +1571,14 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, } else SetWindowLongPtrW( hwnd, GWLP_ID, (ULONG_PTR)cs->hMenu ); + style = wndPtr->dwStyle; + win_dpi = wndPtr->dpi; + WIN_ReleasePtr( wndPtr ); + + if (parent) map_dpi_create_struct( cs, thread_dpi, win_dpi ); + + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + /* call the WH_CBT hook */ /* the window style passed to the hook must be the real window style, @@ -1557,10 +1586,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, * passed in, so we have to copy the original CREATESTRUCT and get the * the real style. */ cbcs = *cs; - cbcs.style = wndPtr->dwStyle; + cbcs.style = style; cbtc.lpcs = &cbcs; cbtc.hwndInsertAfter = HWND_TOP; - WIN_ReleasePtr( wndPtr ); if (HOOK_CallHooks( WH_CBT, HCBT_CREATEWND, (WPARAM)hwnd, (LPARAM)&cbtc, unicode )) goto failed; /* send the WM_GETMINMAXINFO message and fix the size if needed */ @@ -1584,7 +1612,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* send WM_NCCREATE */ - TRACE( "hwnd %p cs %d,%d %dx%d\n", hwnd, cs->x, cs->y, cx, cy ); + TRACE( "hwnd %p cs %d,%d %dx%d %s\n", hwnd, cs->x, cs->y, cs->cx, cs->cy, wine_dbgstr_rect(&rect) ); if (unicode) result = SendMessageW( hwnd, WM_NCCREATE, 0, (LPARAM)cs ); else @@ -1618,7 +1646,7 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, MapWindowPoints( 0, parent, (POINT *)&client_rect, 2 ); set_window_pos( hwnd, insert_after, SWP_NOACTIVATE, &rect, &client_rect, NULL ); } - else return 0; + else goto failed; /* send WM_CREATE */ @@ -1662,7 +1690,11 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, /* Notify the parent window only */ send_parent_notify( hwnd, WM_CREATE ); - if (!IsWindow( hwnd )) return 0; + if (!IsWindow( hwnd )) + { + SetThreadDpiAwarenessContext( context ); + return 0; + } if (parent == GetDesktopWindow()) PostMessageW( parent, WM_PARENTNOTIFY, WM_CREATE, (LPARAM)hwnd ); @@ -1689,10 +1721,12 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, HOOK_CallHooks( WH_SHELL, HSHELL_WINDOWCREATED, (WPARAM)hwnd, 0, TRUE ); TRACE("created window %p\n", hwnd); + SetThreadDpiAwarenessContext( context ); return hwnd; failed: WIN_DestroyWindow( hwnd ); + SetThreadDpiAwarenessContext( context ); return 0; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index b6c162a..f9e11ff 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -130,6 +130,7 @@ extern void WINPOS_SysCommandSizeMove( HWND hwnd, WPARAM wParam ) DECLSPEC_HIDDE extern UINT get_monitor_dpi( HMONITOR monitor ) DECLSPEC_HIDDEN; extern UINT get_win_monitor_dpi( HWND hwnd ) DECLSPEC_HIDDEN; +extern UINT get_thread_dpi(void) DECLSPEC_HIDDEN; extern BOOL set_window_pos( HWND hwnd, HWND insert_after, UINT swp_flags, const RECT *window_rect, const RECT *client_rect, const RECT *valid_rects ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : wineandroid: Add support for scaling window contents based on DPI.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: e658c73aed7e904dfae932a1bde7f2c41f312bfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e658c73aed7e904dfae932a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 11:11:30 2018 +0200 wineandroid: Add support for scaling window contents based on DPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 43 ++++++++++++++++++++++++---------- dlls/wineandroid.drv/android.h | 4 ++-- dlls/wineandroid.drv/device.c | 16 ++++++++----- dlls/wineandroid.drv/opengl.c | 2 +- dlls/wineandroid.drv/window.c | 20 ++++++++++++++-- 5 files changed, 62 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e658c73aed7e904dfae9…

1 0

Alexandre Julliard : wineandroid: Handle sizing and mouse events in physical coordinates.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 240edd3fa3c341e280dbcd09c7d87df57440f390 URL: https://source.winehq.org/git/wine.git/?a=commit;h=240edd3fa3c341e280dbcd09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 11:10:32 2018 +0200 wineandroid: Handle sizing and mouse events in physical coordinates. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/window.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wineandroid.drv/window.c b/dlls/wineandroid.drv/window.c index aff687b..23b9c25 100644 --- a/dlls/wineandroid.drv/window.c +++ b/dlls/wineandroid.drv/window.c @@ -408,6 +408,7 @@ static void pull_events(void) */ static int process_events( DWORD mask ) { + DPI_AWARENESS_CONTEXT context; struct java_event *event, *next, *previous; unsigned int count = 0; @@ -448,11 +449,13 @@ static int process_events( DWORD mask ) { case DESKTOP_CHANGED: TRACE( "DESKTOP_CHANGED %ux%u\n", event->data.desktop.width, event->data.desktop.height ); + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); screen_width = event->data.desktop.width; screen_height = event->data.desktop.height; init_monitors( screen_width, screen_height ); SetWindowPos( GetDesktopWindow(), 0, 0, 0, screen_width, screen_height, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); + SetThreadDpiAwarenessContext( context ); break; case CONFIG_CHANGED: @@ -472,6 +475,7 @@ static int process_events( DWORD mask ) { HWND capture = get_capture_window(); + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); if (event->data.motion.input.u.mi.dwFlags & (MOUSEEVENTF_LEFTDOWN|MOUSEEVENTF_RIGHTDOWN|MOUSEEVENTF_MIDDLEDOWN)) TRACE( "BUTTONDOWN pos %d,%d hwnd %p flags %x\n", event->data.motion.input.u.mi.dx, event->data.motion.input.u.mi.dy, @@ -503,6 +507,7 @@ static int process_events( DWORD mask ) SERVER_END_REQ; } __wine_send_input( capture ? capture : event->data.motion.hwnd, &event->data.motion.input ); + SetThreadDpiAwarenessContext( context ); } break;

1 0

Alexandre Julliard : winex11: Use the stored coordinates to convert back from X11 to window rectangle.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: d7cd441373dfa58073d8eea29eea84af8bbc0b79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7cd441373dfa58073d8eea2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 10:50:47 2018 +0200 winex11: Use the stored coordinates to convert back from X11 to window rectangle. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/event.c | 31 ++++++++------------ dlls/winex11.drv/window.c | 73 ++++++++++++++++------------------------------- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 37 insertions(+), 69 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 8fe6b36..606fa69 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -1077,17 +1077,13 @@ static BOOL X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev ) } else pos = root_to_virtual_screen( x, y ); - rect.left = pos.x; - rect.top = pos.y; - rect.right = pos.x + event->width; - rect.bottom = pos.y + event->height; + X11DRV_X_to_window_rect( data, &rect, pos.x, pos.y, event->width, event->height ); + if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); + TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n", hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, event->x, event->y, event->width, event->height ); - X11DRV_X_to_window_rect( data, &rect ); - if (root_coords) MapWindowPoints( 0, parent, (POINT *)&rect, 2 ); - /* Compare what has changed */ x = rect.left; @@ -1155,7 +1151,8 @@ static BOOL X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) { XGravityEvent *event = &xev->xgravity; struct x11drv_win_data *data = get_win_data( hwnd ); - RECT rect, window_rect; + RECT window_rect; + int x, y; if (!data) return FALSE; @@ -1165,22 +1162,18 @@ static BOOL X11DRV_GravityNotify( HWND hwnd, XEvent *xev ) return FALSE; } - rect.left = event->x; - rect.top = event->y; - rect.right = rect.left + data->whole_rect.right - data->whole_rect.left; - rect.bottom = rect.top + data->whole_rect.bottom - data->whole_rect.top; + x = event->x + data->window_rect.left - data->whole_rect.left; + y = event->y + data->window_rect.top - data->whole_rect.top; - TRACE( "win %p/%lx new X rect %d,%d,%dx%d (event %d,%d)\n", - hwnd, data->whole_window, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top, - event->x, event->y ); + TRACE( "win %p/%lx new X pos %d,%d (event %d,%d)\n", + hwnd, data->whole_window, x, y, event->x, event->y ); - X11DRV_X_to_window_rect( data, &rect ); window_rect = data->window_rect; release_win_data( data ); - if (window_rect.left != rect.left || window_rect.top != rect.top) - SetWindowPos( hwnd, 0, rect.left, rect.top, 0, 0, - SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); + if (window_rect.left != x || window_rect.top != y) + SetWindowPos( hwnd, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS ); + return TRUE; } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 24c9429..0a4f118 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -306,33 +306,6 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, /*********************************************************************** - * get_x11_rect_offset - * - * Helper for X11DRV_window_to_X_rect and X11DRV_X_to_window_rect. - */ -static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) -{ - DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; - unsigned long decor; - - rect->top = rect->bottom = rect->left = rect->right = 0; - - style = GetWindowLongW( data->hwnd, GWL_STYLE ); - ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); - decor = get_mwm_decorations( data, style, ex_style ); - - if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; - if (decor & MWM_DECOR_BORDER) - { - style_mask |= WS_DLGFRAME | WS_THICKFRAME; - ex_style_mask |= WS_EX_DLGMODALFRAME; - } - - AdjustWindowRectEx( rect, style & style_mask, FALSE, ex_style & ex_style_mask ); -} - - -/*********************************************************************** * get_window_attributes * * Fill the window attributes structure for an X window. @@ -1185,12 +1158,26 @@ void make_window_embedded( struct x11drv_win_data *data ) */ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) { + DWORD style, ex_style, style_mask = 0, ex_style_mask = 0; + unsigned long decor; RECT rc; if (!data->managed) return; if (IsRectEmpty( rect )) return; - get_x11_rect_offset( data, &rc ); + style = GetWindowLongW( data->hwnd, GWL_STYLE ); + ex_style = GetWindowLongW( data->hwnd, GWL_EXSTYLE ); + decor = get_mwm_decorations( data, style, ex_style ); + + if (decor & MWM_DECOR_TITLE) style_mask |= WS_CAPTION; + if (decor & MWM_DECOR_BORDER) + { + style_mask |= WS_DLGFRAME | WS_THICKFRAME; + ex_style_mask |= WS_EX_DLGMODALFRAME; + } + + SetRectEmpty( &rc ); + AdjustWindowRectEx( &rc, style & style_mask, FALSE, ex_style & ex_style_mask ); rect->left -= rc.left; rect->right -= rc.right; @@ -1206,21 +1193,15 @@ static void X11DRV_window_to_X_rect( struct x11drv_win_data *data, RECT *rect ) * * Opposite of X11DRV_window_to_X_rect */ -void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) +void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) { - RECT rc; - - if (!data->managed) return; - if (IsRectEmpty( rect )) return; - - get_x11_rect_offset( data, &rc ); - - rect->left += rc.left; - rect->right += rc.right; - rect->top += rc.top; - rect->bottom += rc.bottom; - if (rect->top >= rect->bottom) rect->bottom = rect->top + 1; - if (rect->left >= rect->right) rect->right = rect->left + 1; + x += data->window_rect.left - data->whole_rect.left; + y += data->window_rect.top - data->whole_rect.top; + cx += (data->window_rect.right - data->window_rect.left) - + (data->whole_rect.right - data->whole_rect.left); + cy += (data->window_rect.bottom - data->window_rect.top) - + (data->whole_rect.bottom - data->whole_rect.top); + SetRect( rect, x, y, x + cx, y + cy ); } @@ -1531,8 +1512,6 @@ static void create_whole_window( struct x11drv_win_data *data ) mask = get_window_attributes( data, &attr ); - data->whole_rect = data->window_rect; - X11DRV_window_to_X_rect( data, &data->whole_rect ); if (!(cx = data->whole_rect.right - data->whole_rect.left)) cx = 1; else if (cx > 65535) cx = 65535; if (!(cy = data->whole_rect.bottom - data->whole_rect.top)) cy = 1; @@ -2517,11 +2496,7 @@ UINT CDECL X11DRV_ShowWindow( HWND hwnd, INT cmd, RECT *rect, UINT swp ) &root, &x, &y, &width, &height, &border, &depth ); XTranslateCoordinates( thread_data->display, data->whole_window, root, 0, 0, &x, &y, &top ); pos = root_to_virtual_screen( x, y ); - rect->left = pos.x; - rect->top = pos.y; - rect->right = pos.x + width; - rect->bottom = pos.y + height; - X11DRV_X_to_window_rect( data, rect ); + X11DRV_X_to_window_rect( data, rect, pos.x, pos.y, width, height ); swp &= ~(SWP_NOMOVE | SWP_NOCLIENTMOVE | SWP_NOSIZE | SWP_NOCLIENTSIZE); done: diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 939c2e7..a0308b0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -633,7 +633,7 @@ typedef int (*x11drv_error_callback)( Display *display, XErrorEvent *event, void extern void X11DRV_expect_error( Display *display, x11drv_error_callback callback, void *arg ) DECLSPEC_HIDDEN; extern int X11DRV_check_error(void) DECLSPEC_HIDDEN; -extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect ) DECLSPEC_HIDDEN; +extern void X11DRV_X_to_window_rect( struct x11drv_win_data *data, RECT *rect, int x, int y, int cx, int cy ) DECLSPEC_HIDDEN; extern POINT virtual_screen_to_root( INT x, INT y ) DECLSPEC_HIDDEN; extern POINT root_to_virtual_screen( INT x, INT y ) DECLSPEC_HIDDEN; extern RECT get_virtual_screen_rect(void) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Simplify the EnumDisplayMonitors driver entry point.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: wine Branch: master Commit: 341192289b0c22bcdfd70af827b9a11cff555836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341192289b0c22bcdfd70af8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Aug 23 10:53:27 2018 +0200 winex11: Simplify the EnumDisplayMonitors driver entry point. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/xinerama.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 0419535..739b139 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -267,34 +267,8 @@ BOOL CDECL X11DRV_EnumDisplayMonitors( HDC hdc, LPRECT rect, MONITORENUMPROC pro { int i; - if (hdc) - { - POINT origin; - RECT limit; - - if (!GetDCOrgEx( hdc, &origin )) return FALSE; - if (GetClipBox( hdc, &limit ) == ERROR) return FALSE; - - if (rect && !IntersectRect( &limit, &limit, rect )) return TRUE; + for (i = 0; i < nb_monitors; i++) + if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) return FALSE; - for (i = 0; i < nb_monitors; i++) - { - RECT monrect = monitors[i].rcMonitor; - OffsetRect( &monrect, -origin.x, -origin.y ); - if (IntersectRect( &monrect, &monrect, &limit )) - if (!proc( index_to_monitor(i), hdc, &monrect, lp )) - return FALSE; - } - } - else - { - for (i = 0; i < nb_monitors; i++) - { - RECT unused; - if (!rect || IntersectRect( &unused, &monitors[i].rcMonitor, rect )) - if (!proc( index_to_monitor(i), 0, &monitors[i].rcMonitor, lp )) - return FALSE; - } - } return TRUE; }

1 0

Jeremy Newman : news about SteamPlay and Proton
by Jeremy Newman 23 Aug '18

23 Aug '18

Module: website Branch: master Commit: 9f7268d63096dad4aaf01b9f72b7ae952834626b URL: https://source.winehq.org/git/website.git/?a=commit;h=9f7268d63096dad4aaf01… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Aug 23 15:37:52 2018 -0500 news about SteamPlay and Proton --- news/en/2018082301.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2018082301.xml b/news/en/2018082301.xml new file mode 100644 index 0000000..48baf29 --- /dev/null +++ b/news/en/2018082301.xml @@ -0,0 +1,16 @@ +<news> + <date>August 23, 2018</date> + <title>Valve Releases SteamPlay for Linux</title> + <body> + Valve has released <a href="http://steamcommunity.com/games/221410/announcements/detail/169605585573935…">SteamPlay Beta</a> for Linux. It includes a modified distribution of Wine, to provide compatibility with Windows game titles. The included improvements to Wine have been designed and funded by Valve, in a joint development effort with <a href="https://www.codeweavers.com/about/blogs/jwhite/2018/8/22/wine-and-steam-a-m…">CodeWeavers</a>. + Here are some examples of what they been working on together since 2016: + <ul> + <li><a href="https://source.winehq.org/git/vkd3d.git/">vkd3d</a>, the Direct3D 12 implementation based on Vulkan</li> + <li>The OpenVR and Steamworks native API bridges</li> + <li>Many wined3d performance and functionality fixes for Direct3D 9 and Direct3D 11</li> + <li>Overhauled fullscreen and gamepad support</li> + <li>The "<a href="https://github.com/zfigura/wine/blob/esync/">esync</a>" patchset, for multi-threaded performance improvements</li> + </ul> + Proton, the tool that Steam Play uses to provide Windows compatibility, contains a custom version of Wine as well as additional libraries developed alongside it. It's fully open-source and available <a href="https://github.com/ValveSoftware/Proton">on GitHub</a>. + </body> +</news> \ No newline at end of file

1 0

Francois Gouget : testbot/build: Rename the build directories to allow for more than one project.
by Alexandre Julliard 23 Aug '18

23 Aug '18

Module: tools Branch: master Commit: 5c67c93e6d5b017cd46bd9a30a13744400177a82 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5c67c93e6d5b017cd46bd9a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 10:48:43 2018 +0200 testbot/build: Rename the build directories to allow for more than one project. The new naming scheme is 'project-build', thus avoiding name collisions in case we need build trees for other projects besides Wine. The build now matches the name of the corresponding test reports for Windows builds too; that is exe32 and exe64. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/build/Build.pl | 26 ++++++++++++------------ testbot/bin/build/Reconfig.pl | 42 +++++++++++++++++++++++++++------------ testbot/bin/build/WineReconfig.pl | 16 +++++++++++---- testbot/bin/build/WineTest.pl | 2 +- testbot/lib/Build/Utils.pm | 6 +++--- 5 files changed, 58 insertions(+), 34 deletions(-) diff --git a/testbot/bin/build/Build.pl b/testbot/bin/build/Build.pl index 7f94c85..7a268db 100755 --- a/testbot/bin/build/Build.pl +++ b/testbot/bin/build/Build.pl @@ -58,11 +58,11 @@ sub BuildNative() { InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Rebuild of native tools failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -71,9 +71,9 @@ sub BuildNative() sub BuildTestExecutables($$$) { - my ($Targets, $Impacts, $Bits) = @_; + my ($Targets, $Impacts, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); + return 1 if (!$Targets->{$Build}); my (@BuildDirs, @TestExes); foreach my $TestInfo (values %{$Impacts->{Tests}}) @@ -81,26 +81,26 @@ sub BuildTestExecutables($$$) push @BuildDirs, $TestInfo->{Path}; my $TestExe = "$TestInfo->{Path}/$TestInfo->{ExeBase}.exe"; push @TestExes, $TestExe; - unlink("$DataDir/build-mingw$Bits/$TestExe"); # Ignore errors + unlink("$DataDir/wine-$Build/$TestExe"); # Ignore errors } - InfoMsg "\nBuilding the $Bits-bit test executable(s)\n"; + InfoMsg "\nBuilding the $Build Wine test executable(s)\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount ". join(" ", sort @BuildDirs)); if ($? != 0) { - LogMsg "Rebuild of $Bits-bit crossbuild failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } my $Success = 1; foreach my $TestExe (@TestExes) { - if (!-f "$DataDir/build-mingw$Bits/$TestExe") + if (!-f "$DataDir/wine-$Build/$TestExe") { - LogMsg "Make didn't produce a $TestExe file\n"; - $Success = undef; + LogMsg "Make didn't produce the $Build $TestExe file\n"; + $Success = !1; } } @@ -223,8 +223,8 @@ my $Impacts = ApplyPatch("wine", $PatchFile); if (!$Impacts or ($Impacts->{WineBuild} and !BuildNative()) or - !BuildTestExecutables($Targets, $Impacts, 32) or - !BuildTestExecutables($Targets, $Impacts, 64)) + !BuildTestExecutables($Targets, $Impacts, "exe32") or + !BuildTestExecutables($Targets, $Impacts, "exe64")) { exit(1); } diff --git a/testbot/bin/build/Reconfig.pl b/testbot/bin/build/Reconfig.pl index 36748d6..f2d63fa 100755 --- a/testbot/bin/build/Reconfig.pl +++ b/testbot/bin/build/Reconfig.pl @@ -52,19 +52,27 @@ sub BuildNative($) { my ($NoRm) = @_; - mkdir "$DataDir/build-native" if (! -d "$DataDir/build-native"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-native"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-native") + { + rename("$DataDir/$OldDir", "$DataDir/wine-native"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-native", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-native" if (!-d "$DataDir/wine-native"); # Rebuild from scratch to make sure cruft will not accumulate InfoMsg "\nRebuilding native tools\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-native' && set -x && ". + system("cd '$DataDir/wine-native' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure --enable-win64 --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount __tooldeps__"); if ($? != 0) { - LogMsg "Build native failed\n"; + LogMsg "The Wine native tools build failed\n"; return !1; } @@ -73,22 +81,30 @@ sub BuildNative($) sub BuildCross($$$) { - my ($Targets, $NoRm, $Bits) = @_; + my ($Targets, $NoRm, $Build) = @_; - return 1 if (!$Targets->{"exe$Bits"}); - mkdir "$DataDir/build-mingw$Bits" if (!-d "$DataDir/build-mingw$Bits"); + return 1 if (!$Targets->{$Build}); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = $Build eq "exe32" ? "build-mingw32" : "build-mingw64"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # Rebuild from scratch to make sure cruft will not accumulate - InfoMsg "\nRebuilding the $Bits-bit test executables\n"; + InfoMsg "\nRebuilding the $Build Wine test executables\n"; my $CPUCount = GetCPUCount(); - my $Host = ($Bits == 64 ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); - system("cd '$DataDir/build-mingw$Bits' && set -x && ". + my $Host = ($Build eq "exe64" ? "x86_64-w64-mingw32" : "i686-w64-mingw32"); + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . - "time ../wine/configure --host=$Host --with-wine-tools=../build-native --without-x --without-freetype --disable-winetest && ". + "time ../wine/configure --host=$Host --with-wine-tools=../wine-native --without-x --without-freetype --disable-winetest && ". "time make -j$CPUCount buildtests"); if ($? != 0) { - LogMsg "Build cross ($Bits bits) failed\n"; + LogMsg "The $Build Wine crossbuild failed\n"; return !1; } @@ -100,8 +116,8 @@ sub UpdateWineBuilds($$) my ($Targets, $NoRm) = @_; return BuildNative($NoRm) && - BuildCross($Targets, $NoRm, 32) && - BuildCross($Targets, $NoRm, 64); + BuildCross($Targets, $NoRm, "exe32") && + BuildCross($Targets, $NoRm, "exe64"); } diff --git a/testbot/bin/build/WineReconfig.pl b/testbot/bin/build/WineReconfig.pl index b30ddd1..2416eeb 100755 --- a/testbot/bin/build/WineReconfig.pl +++ b/testbot/bin/build/WineReconfig.pl @@ -50,19 +50,27 @@ sub BuildWine($$$$) my ($Targets, $NoRm, $Build, $Extras) = @_; return 1 if (!$Targets->{$Build}); - mkdir "$DataDir/build-$Build" if (!-d "$DataDir/build-$Build"); + # FIXME Temporary code to ensure compatibility during the transition + my $OldDir = "build-$Build"; + if (-d "$DataDir/$OldDir" and !-d "$DataDir/wine-$Build") + { + rename("$DataDir/$OldDir", "$DataDir/wine-$Build"); + # Add a symlink from compatibility with older server-side TestBot scripts + symlink("wine-$Build", "$DataDir/$OldDir"); + } + mkdir "$DataDir/wine-$Build" if (!-d "$DataDir/wine-$Build"); # If $NoRm is not set, rebuild from scratch to make sure cruft will not # accumulate InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". ($NoRm ? "" : "rm -rf * && ") . "time ../wine/configure $Extras && ". "time make -j$CPUCount"); if ($? != 0) { - LogMsg "The $Build build failed\n"; + LogMsg "The $Build Wine build failed\n"; return !1; } @@ -75,7 +83,7 @@ sub UpdateWineBuilds($$) return BuildWine($Targets, $NoRm, "win32", "") && BuildWine($Targets, $NoRm, "wow64", "--enable-win64") && - BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/build-wow64'"); + BuildWine($Targets, $NoRm, "wow32", "--with-wine64='$DataDir/wine-wow64'"); } diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index 9c264b4..9be73a4 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -58,7 +58,7 @@ sub BuildWine($$) InfoMsg "\nRebuilding the $Build Wine\n"; my $CPUCount = GetCPUCount(); - system("cd '$DataDir/build-$Build' && set -x && ". + system("cd '$DataDir/wine-$Build' && set -x && ". "time make -j$CPUCount"); if ($? != 0) { diff --git a/testbot/lib/Build/Utils.pm b/testbot/lib/Build/Utils.pm index 038c188..fd1b846 100644 --- a/testbot/lib/Build/Utils.pm +++ b/testbot/lib/Build/Utils.pm @@ -326,9 +326,9 @@ sub RunWine($$$) { my ($Build, $Cmd, $CmdArgs) = @_; - my $Magic = `cd '$DataDir/build-$Build' && file $Cmd`; + my $Magic = `cd '$DataDir/wine-$Build' && file $Cmd`; my $Wine = ($Magic =~ /ELF 64/ ? "./wine64" : "./wine"); - return system("cd '$DataDir/build-$Build' && set -x && ". + return system("cd '$DataDir/wine-$Build' && set -x && ". "time $Wine $Cmd $CmdArgs"); } @@ -354,7 +354,7 @@ sub CreateWinePrefix($$) { # Ensure the WinePrefix has been fully created and the registry files # saved before returning. - system("cd '$DataDir/build-$Build' && ./server/wineserver -w"); + system("cd '$DataDir/wine-$Build' && ./server/wineserver -w"); } return undef;

1 0

← Newer
1
...
26
27
28
29
30
31
32
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2018