August 2018 - Wine-Commits - list.winehq.org

Zhiyi Zhang : crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: a1e2c7fd2f7c4fb5377a0528bfcb03b3813747aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1e2c7fd2f7c4fb5377a0528… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:54:00 2018 +0800 crypt32: Properly check root certificate in CERT_CHAIN_REVOCATION_CHECK_CHAIN. Original patch by Michael Müller. Root certificates don't have CRL Distribution Point or Authority Info Access field. Don't report error with CERT_CHAIN_REVOCATION_CHECK_CHAIN in CertGetCertificateChain() because of this. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/chain.c | 5 +++++ dlls/crypt32/tests/chain.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index d7015d7..41c87b7 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2698,6 +2698,11 @@ static void CRYPT_VerifyChainRevocation(PCERT_CHAIN_CONTEXT chain, ret = CertVerifyRevocation(X509_ASN_ENCODING, CERT_CONTEXT_REVOCATION_TYPE, 1, (void **)&certToCheck, revocationFlags, &revocationPara, &revocationStatus); + + if (!ret && chainFlags & CERT_CHAIN_REVOCATION_CHECK_CHAIN + && revocationStatus.dwError == CRYPT_E_NO_REVOCATION_CHECK && revocationPara.pIssuerCert == NULL) + ret = TRUE; + if (!ret) { PCERT_CHAIN_ELEMENT element = CRYPT_FindIthElementInChain( diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a995c81..e2a7633 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4156,9 +4156,9 @@ static void testGetCertChain(void) ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); - todo_wine ok(!chain->TrustStatus.dwErrorStatus - || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ - "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); pCertFreeCertificateChain(chain); ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT,

1 0

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

Aug. 23, 2018

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 : wineandroid: Add support for scaling window contents based on DPI.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

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 : user32: Scale initial window dimensions in CreateWindow() based on DPI awareness.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

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 : user32: Scale window dimensions in SetWindowPos() based on DPI awareness.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

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

Zhiyi Zhang : crypt32/tests: Add revocation flags tests for CertGetCertificateChain().
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 01262515b433669ab621b9cf9b3ae01c7c02b2e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01262515b433669ab621b9cf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 22 14:52:55 2018 +0800 crypt32/tests: Add revocation flags tests for CertGetCertificateChain(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index a6599b2..a995c81 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -4147,6 +4147,26 @@ static void testGetCertChain(void) pCertFreeCertificateChain(chain); + /* Test revocation flags */ + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_END_CERT, NULL, + &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN, NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + todo_wine ok(!chain->TrustStatus.dwErrorStatus + || broken(chain->TrustStatus.dwErrorStatus == CERT_TRUST_REVOCATION_STATUS_UNKNOWN), /* XP */ + "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + + ret = CertGetCertificateChain(NULL, cert, &fileTime, store, &para, CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, + NULL, &chain); + ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError()); + ok(!chain->TrustStatus.dwErrorStatus, "chain->TrustStatus.dwErrorStatus = %x\n", chain->TrustStatus.dwErrorStatus); + pCertFreeCertificateChain(chain); + /* Test HCCE_LOCAL_MACHINE */ ret = CertGetCertificateChain(HCCE_LOCAL_MACHINE, cert, &fileTime, store, &para, 0, NULL, &chain); ok(ret, "CertGetCertificateChain failed: %u\n", GetLastError());

1 0

Dmitry Timoshkov : shell32: Use Public instead of AllUsersProfile in the registry.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 27edd4e35c1eb3827dfb20578733242d9ed3d460 URL: https://source.winehq.org/git/wine.git/?a=commit;h=27edd4e35c1eb3827dfb2057… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Aug 23 12:45:23 2018 +0800 shell32: Use Public instead of AllUsersProfile in the registry. This matches what recent Windows versions set in the process environment. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellpath.c | 16 ++++++++-------- dlls/userenv/userenv_main.c | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index de4bf7d..fd375a3 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -943,7 +943,7 @@ static const WCHAR UsersLibrariesFolderW[] = {'U','s','e','r','s','L','i','b','r static const WCHAR UserProfilesW[] = {'U','s','e','r','P','r','o','f','i','l','e','s',0}; static const WCHAR UserProgramFilesW[] = {'U','s','e','r','P','r','o','g','r','a','m','F','i','l','e','s',0}; static const WCHAR UserProgramFilesCommonW[] = {'U','s','e','r','P','r','o','g','r','a','m','F','i','l','e','s','C','o','m','m','o','n',0}; -static const WCHAR UsersPublicW[] = {'U','s','e','r','s','\\','P','u','b','l','i','c','\0'}; +static const WCHAR UsersPublicW[] = {'u','s','e','r','s','\\','P','u','b','l','i','c','\0'}; static const WCHAR VideosW[] = {'V','i','d','e','o','s','\0'}; static const WCHAR VideosLibraryW[] = {'V','i','d','e','o','s','L','i','b','r','a','r','y',0}; static const WCHAR Videos_librarymsW[] = {'V','i','d','e','o','s','.','l','i','b','r','a','r','y','-','m','s',0}; @@ -951,19 +951,17 @@ static const WCHAR Videos_Sample_VideosW[] = {'V','i','d','e','o','s','\\','S',' static const WCHAR WindowsW[] = {'W','i','n','d','o','w','s',0}; static const WCHAR Windows_Sidebar_GadgetsW[] = {'W','i','n','d','o','w','s',' ','S','i','d','e','b','a','r','\\','G','a','d','g','e','t','s',0}; static const WCHAR DefaultW[] = {'.','D','e','f','a','u','l','t','\0'}; -static const WCHAR AllUsersProfileW[] = {'%','A','L','L','U','S','E','R','S','P','R','O','F','I','L','E','%','\0'}; +static const WCHAR AllUsersProfileW[] = {'%','P','U','B','L','I','C','%',0}; static const WCHAR UserProfileW[] = {'%','U','S','E','R','P','R','O','F','I','L','E','%','\0'}; static const WCHAR ProgramDataVarW[] = {'%','P','r','o','g','r','a','m','D','a','t','a','%','\0'}; static const WCHAR SystemDriveW[] = {'%','S','y','s','t','e','m','D','r','i','v','e','%','\0'}; static const WCHAR ProfileListW[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',' ','N','T','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','P','r','o','f','i','l','e','L','i','s','t',0}; static const WCHAR ProfilesDirectoryW[] = {'P','r','o','f','i','l','e','s','D','i','r','e','c','t','o','r','y',0}; -static const WCHAR AllUsersProfileValueW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e','\0'}; static const WCHAR szSHFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szSHUserFolders[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s','\0'}; static const WCHAR szDefaultProfileDirW[] = {'u','s','e','r','s',0}; static const WCHAR szKnownFolderDescriptions[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','F','o','l','d','e','r','D','e','s','c','r','i','p','t','i','o','n','s','\0'}; static const WCHAR szKnownFolderRedirections[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','E','x','p','l','o','r','e','r','\\','U','s','e','r',' ','S','h','e','l','l',' ','F','o','l','d','e','r','s',0}; -static const WCHAR AllUsersW[] = {'P','u','b','l','i','c',0}; #define CHANGEREMOVEPROGRAMS_PARSING_GUID '{','7','b','8','1','b','e','6','a','-','c','e','2','b','-','4','6','7','6','-','a','2','9','e','-','e','b','9','0','7','a','5','1','2','6','c','5','}' #define SYNCMANAGER_PARSING_GUID '{','9','C','7','3','F','5','E','5','-','7','A','E','7','-','4','E','3','2','-','A','8','E','8','-','8','D','2','3','B','8','5','2','5','5','B','F','}' @@ -3806,11 +3804,13 @@ static HRESULT _SHExpandEnvironmentStrings(LPCWSTR szSrc, LPWSTR szDest) { if (!strncmpiW(szTemp, AllUsersProfileW, strlenW(AllUsersProfileW))) { - WCHAR szAllUsers[MAX_PATH]; + WCHAR szAllUsers[MAX_PATH], def_val[MAX_PATH]; - strcpyW(szDest, szProfilesPrefix); - hr = _SHGetProfilesValue(key, AllUsersProfileValueW, - szAllUsers, AllUsersW); + GetSystemDirectoryW(def_val, MAX_PATH); + if (def_val[1] == ':') strcpyW( def_val + 3, UsersPublicW ); + else FIXME("non-drive system paths unsupported\n"); + + hr = _SHGetProfilesValue(key, PublicW, szAllUsers, def_val); PathAppendW(szDest, szAllUsers); PathAppendW(szDest, szTemp + strlenW(AllUsersProfileW)); } diff --git a/dlls/userenv/userenv_main.c b/dlls/userenv/userenv_main.c index 538b912..06c7653 100644 --- a/dlls/userenv/userenv_main.c +++ b/dlls/userenv/userenv_main.c @@ -244,7 +244,7 @@ BOOL WINAPI CreateEnvironmentBlock( LPVOID* lpEnvironment, static const WCHAR SystemRootW[] = {'S','y','s','t','e','m','R','o','o','t',0}; static const WCHAR SystemDriveW[] = {'S','y','s','t','e','m','D','r','i','v','e',0}; - static const WCHAR AllUsersProfileW[] = {'A','l','l','U','s','e','r','s','P','r','o','f','i','l','e',0}; + static const WCHAR AllUsersProfileW[] = {'P','u','b','l','i','c',0}; static const WCHAR ALLUSERSPROFILEW[] = {'A','L','L','U','S','E','R','S','P','R','O','F','I','L','E',0}; static const WCHAR USERNAMEW[] = {'U','S','E','R','N','A','M','E',0}; static const WCHAR USERPROFILEW[] = {'U','S','E','R','P','R','O','F','I','L','E',0};

1 0

Dmitry Timoshkov : user32: Create a mask from alpha channel when loading a 32 bpp icon.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: wine Branch: master Commit: 1f75f426428b5896b837113dd149f90b7a05de46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f75f426428b5896b837113d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Aug 22 14:00:13 2018 +0800 user32: Create a mask from alpha channel when loading a 32 bpp icon. This patch fixes applications that draw the 32 bpp icons manually. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/cursoricon.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c index 0adb73b..99337ab 100644 --- a/dlls/user32/cursoricon.c +++ b/dlls/user32/cursoricon.c @@ -1144,6 +1144,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE DWORD size, color_size, mask_size; HBITMAP color = 0, mask = 0, alpha = 0; const void *color_bits, *mask_bits; + void *alpha_mask_bits = NULL; BITMAPINFO *bmi_copy; BOOL ret = FALSE; BOOL do_stretch; @@ -1266,7 +1267,27 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE color_bits, bmi_copy, DIB_RGB_COLORS, SRCCOPY ); if (bmi_has_alpha( bmi_copy, color_bits )) + { alpha = create_alpha_bitmap( color, bmi_copy, color_bits ); + if (!mask_size) /* generate mask from alpha */ + { + LONG x, y, dst_stride = ((bmi_width + 31) / 8) & ~3; + + if ((alpha_mask_bits = heap_calloc( bmi_height, dst_stride ))) + { + static const unsigned char masks[] = { 0x80, 0x40, 0x20, 0x10, 0x8, 0x4, 0x2, 0x1 }; + const DWORD *src = color_bits; + unsigned char *dst = alpha_mask_bits; + + for (y = 0; y < bmi_height; y++, src += bmi_width, dst += dst_stride) + for (x = 0; x < bmi_width; x++) + if (src[x] >> 24 != 0xff) dst[x >> 3] |= masks[x & 7]; + + mask_bits = alpha_mask_bits; + mask_size = bmi_height * dst_stride; + } + } + } /* convert info to monochrome to copy the mask */ if (bmi_copy->bmiHeader.biSize != sizeof(BITMAPCOREHEADER)) @@ -1301,6 +1322,7 @@ static HICON create_icon_from_bmi( const BITMAPINFO *bmi, DWORD maxsize, HMODULE done: DeleteDC( hdc ); HeapFree( GetProcessHeap(), 0, bmi_copy ); + HeapFree( GetProcessHeap(), 0, alpha_mask_bits ); if (ret) hObj = alloc_icon_handle( FALSE, 0 );

1 0

Jeremy Newman : news about SteamPlay and Proton
by Jeremy Newman Aug. 23, 2018

Aug. 23, 2018

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: Remove support for the old task status lines.
by Alexandre Julliard Aug. 23, 2018

Aug. 23, 2018

Module: tools Branch: master Commit: a8430bf9165051f41657634a925e9675482a22ae URL: https://source.winehq.org/git/tools.git/?a=commit;h=a8430bf9165051f41657634… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Aug 23 10:46:29 2018 +0200 testbot: Remove support for the old task status lines. Note that there is no need to wait for all task logs to be in the new format because ParseTaskLog() is only called when a new task completes. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/WineRunBuild.pl | 2 +- testbot/bin/WineRunReconfig.pl | 2 +- testbot/bin/WineRunWineTest.pl | 2 +- testbot/lib/WineTestBot/LogUtils.pm | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/testbot/bin/WineRunBuild.pl b/testbot/bin/WineRunBuild.pl index 2c5fbfa..b246164 100755 --- a/testbot/bin/WineRunBuild.pl +++ b/testbot/bin/WineRunBuild.pl @@ -406,7 +406,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Build.log'\n"); if ($TA->GetFile("Build.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Build"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunReconfig.pl b/testbot/bin/WineRunReconfig.pl index 2301804..1e126b8 100755 --- a/testbot/bin/WineRunReconfig.pl +++ b/testbot/bin/WineRunReconfig.pl @@ -388,7 +388,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Reconfig.log'\n"); if ($TA->GetFile("Reconfig.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Reconfig"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 2168111..2552a7c 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -499,7 +499,7 @@ if (!defined $TA->Wait($Pid, $Task->Timeout, 60)) Debug(Elapsed($Start), " Retrieving 'Task.log'\n"); if ($TA->GetFile("Task.log", "$TaskDir/log")) { - my $Result = ParseTaskLog("$TaskDir/log", "Task"); + my $Result = ParseTaskLog("$TaskDir/log"); if ($Result eq "ok") { # We must have gotten the full log and the build did succeed. diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index d39c81b..e05afb6 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -50,9 +50,9 @@ Returns ok if the task was successful and an error code otherwise. =back =cut -sub ParseTaskLog($$) +sub ParseTaskLog($) { - my ($FileName, $ResultPrefix) = @_; + my ($FileName) = @_; if (open(my $LogFile, "<", $FileName)) { @@ -60,16 +60,16 @@ sub ParseTaskLog($$) foreach my $Line (<$LogFile>) { chomp $Line; - if ($Line =~ /^(?:$ResultPrefix|Task): ok$/) + if ($Line =~ /^Task: ok$/) { $Result ||= "ok"; } - elsif ($Line =~ /^(?:$ResultPrefix|Task): Patch failed to apply$/) + elsif ($Line =~ /^Task: Patch failed to apply$/) { $Result = "badpatch"; last; # Should be the last and most specific message } - elsif ($Line =~ /^(?:$ResultPrefix|Task): /) + elsif ($Line =~ /^Task: /) { $Result = "failed"; }

1 0