wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Louis Lenders : wine.inf: Add value for DigitalProductId.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 51c297afa5ee9220280a1f853fcba77d20890afb URL: https://source.winehq.org/git/wine.git/?a=commit;h=51c297afa5ee9220280a1f85… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Tue Nov 5 18:48:37 2019 +0100 wine.inf: Add value for DigitalProductId. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24529 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index df74f28e66..a2bcfae935 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -3756,6 +3756,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100 @@ -3767,6 +3774,13 @@ HKLM,%CurrentVersionNT%,"CSDVersion",2,"Service Pack 1" HKLM,%CurrentVersionNT%,"CurrentBuild",2,"7601" HKLM,%CurrentVersionNT%,"CurrentBuildNumber",2,"7601" HKLM,%CurrentVersionNT%,"CurrentType",2,"Uniprocessor Free" +HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"ProductName",2,"Microsoft Windows 7" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0x100

1 0

Zhiyi Zhang : winex11.drv: Fix NoRes mode handler having an empty mode.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 427152ec7b4ee85631617b693dbf1deea763c0ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=427152ec7b4ee85631617b69… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:45 2019 +0800 winex11.drv: Fix NoRes mode handler having an empty mode. After 25167fb286822c93582457815bcf069fef040976 get_primary_monitor_rect() returns an empty rectangle before X11DRV_DisplayDevices_Init() is called. So use get_host_primary_monitor_rect() to get the current X desktop size. It's also more intuitive this way. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index 800b65dbfd..a4f172037c 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -146,7 +146,7 @@ static LONG X11DRV_nores_SetCurrentMode(int mode) /* default handler only gets the current X desktop resolution */ void X11DRV_Settings_Init(void) { - RECT primary = get_primary_monitor_rect(); + RECT primary = get_host_primary_monitor_rect(); X11DRV_Settings_SetHandlers("NoRes", X11DRV_nores_GetCurrentMode, X11DRV_nores_SetCurrentMode,

1 0

Zhiyi Zhang : winex11.drv: Move the desktop fullscreen check after desktop init.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: b7b4bacaf99661e07c2f07a0260680b4e8bed4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b4bacaf99661e07c2f07a0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:31 2019 +0800 winex11.drv: Move the desktop fullscreen check after desktop init. After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect(), which is used in is_window_rect_fullscreen(), may return the primary screen size set by the last explorer instance if wineserver didn't fully shuts down. Also get_primary_monitor_rect() no longer reports the host primary monitor rect before virtual desktop initialization now. So move the desktop fullscreen check after desktop initialization so that primary screen size is updated and valid. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 2428293c4f..d70b38b2b3 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -281,7 +281,6 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) XSetWindowAttributes win_attr; Window win; Display *display = thread_init_display(); - RECT rect; WCHAR name[MAX_PATH]; if (!GetUserObjectInformationW( GetThreadDesktop( GetCurrentThreadId() ), @@ -308,18 +307,17 @@ BOOL CDECL X11DRV_create_desktop( UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + if (!create_desktop_win_data( win )) return FALSE; - SetRect( &rect, 0, 0, width, height ); - if (is_window_rect_fullscreen( &rect )) + X11DRV_init_desktop( win, width, height ); + if (is_desktop_fullscreen()) { TRACE("setting desktop to fullscreen\n"); XChangeProperty( display, win, x11drv_atom(_NET_WM_STATE), XA_ATOM, 32, PropModeReplace, (unsigned char*)&x11drv_atom(_NET_WM_STATE_FULLSCREEN), 1); } - if (!create_desktop_win_data( win )) return FALSE; XFlush( display ); - X11DRV_init_desktop( win, width, height ); return TRUE; }

1 0

Zhiyi Zhang : winex11.drv: Get virtual desktop size limit from the host primary display.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: acf03ed9da0f7d3f94de9b47c44366be3ee47f8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=acf03ed9da0f7d3f94de9b47… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:05:10 2019 +0800 winex11.drv: Get virtual desktop size limit from the host primary display. After 25167fb286822c93582457815bcf069fef040976, get_primary_monitor_rect() maybe invalid before display device initialization or returns the desktop rectangle after desktop initialization in virtual desktop mode, which is wrong. The desktop size limit should come from host system. This fixes a regression from efbbe66669a060dd01b3ae399f5a9e7328312f03. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47815 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++----- dlls/winex11.drv/display.c | 21 +++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index a3b2f0cbf2..2428293c4f 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -238,12 +238,14 @@ static void X11DRV_desktop_free_monitors( struct x11drv_monitor *monitors ) */ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) { - RECT primary_rect; + RECT primary_rect = get_host_primary_monitor_rect(); root_window = win; managed_mode = FALSE; /* no managed windows in desktop mode */ desktop_width = width; desktop_height = height; + max_width = primary_rect.right; + max_height = primary_rect.bottom; /* Initialize virtual desktop mode display device handler */ desktop_handler.name = "Virtual Desktop"; @@ -257,10 +259,6 @@ void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) TRACE("Display device functions are now handled by: Virtual Desktop\n"); X11DRV_DisplayDevices_Init( TRUE ); - primary_rect = get_primary_monitor_rect(); - max_width = primary_rect.right - primary_rect.left; - max_height = primary_rect.bottom - primary_rect.top; - /* initialize the available resolutions */ dd_modes = X11DRV_Settings_SetHandlers("desktop", X11DRV_desktop_GetCurrentMode, diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index d3ee653f21..7ad74c9b4e 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -233,6 +233,27 @@ RECT get_primary_monitor_rect(void) return primary; } +/* Get the primary monitor rect from the host system */ +RECT get_host_primary_monitor_rect(void) +{ + INT gpu_count, adapter_count, monitor_count; + struct x11drv_gpu *gpus = NULL; + struct x11drv_adapter *adapters = NULL; + struct x11drv_monitor *monitors = NULL; + RECT rect = {0}; + + /* The first monitor is always primary */ + if (host_handler.get_gpus(&gpus, &gpu_count) && gpu_count && + host_handler.get_adapters(gpus[0].id, &adapters, &adapter_count) && adapter_count && + host_handler.get_monitors(adapters[0].id, &monitors, &monitor_count) && monitor_count) + rect = monitors[0].rc_monitor; + + if (gpus) host_handler.free_gpus(gpus); + if (adapters) host_handler.free_adapters(adapters); + if (monitors) host_handler.free_monitors(monitors); + return rect; +} + void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) { if (new_handler->priority > host_handler.priority) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 4a6de9053d..ef8a42d609 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -643,6 +643,7 @@ 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; extern RECT get_primary_monitor_rect(void) DECLSPEC_HIDDEN; +extern RECT get_host_primary_monitor_rect(void) DECLSPEC_HIDDEN; extern void query_work_area( RECT *rc_work ) DECLSPEC_HIDDEN; extern void xinerama_init( unsigned int width, unsigned int height ) DECLSPEC_HIDDEN;

1 0

Zhiyi Zhang : winex11.drv: Use a separate virtual desktop display device handler.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 914b5519b1cd96f9ae19f1eec226e94af96354b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=914b5519b1cd96f9ae19f1ee… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:04:27 2019 +0800 winex11.drv: Use a separate virtual desktop display device handler. If we want to query host monitor dimensions, we need to use XRandR or Xinerama handler. However when in virtual desktop mode, its display device handler overrides other handlers. So we need to separate them. Then we can implement features that require host monitor dimensions like checking whether the virtual desktop window is fullscreen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 104 ++++++++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/display.c | 34 ++++++++------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/xinerama.c | 31 +++---------- 4 files changed, 128 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=914b5519b1cd96f9ae19…

1 0

Zhiyi Zhang : winex11.drv: Introduce is_virtual_desktop().
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 99d047724e768822d6508573cd82a5c75b30bdcb URL: https://source.winehq.org/git/wine.git/?a=commit;h=99d047724e768822d6508573… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Nov 5 21:04:07 2019 +0800 winex11.drv: Introduce is_virtual_desktop(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/desktop.c | 8 +++++++- dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/mouse.c | 2 +- dlls/winex11.drv/palette.c | 2 +- dlls/winex11.drv/systray.c | 2 +- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 1 + dlls/winex11.drv/xinerama.c | 4 ++-- dlls/winex11.drv/xrandr.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 10 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index fed8dd32e9..e4eb61f7bd 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -77,6 +77,12 @@ static struct screen_size { #define _NET_WM_STATE_REMOVE 0 #define _NET_WM_STATE_ADD 1 +/* Return TRUE if Wine is currently in virtual desktop mode */ +BOOL is_virtual_desktop(void) +{ + return root_window != DefaultRootWindow( gdi_display ); +} + /* create the mode structures */ static void make_modes(void) { @@ -268,7 +274,7 @@ static void update_desktop_fullscreen( unsigned int width, unsigned int height) Display *display = thread_display(); XEvent xev; - if (!display || root_window == DefaultRootWindow( display )) return; + if (!display || !is_virtual_desktop()) return; xev.xclient.type = ClientMessage; xev.xclient.window = root_window; diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 25730192d3..dd8837c11d 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -827,7 +827,7 @@ static void focus_out( Display *display , HWND hwnd ) x11drv_thread_data()->last_focus = hwnd; if ((xic = X11DRV_get_ic( hwnd ))) XUnsetICFocus( xic ); - if (root_window != DefaultRootWindow(display)) + if (is_virtual_desktop()) { if (hwnd == GetDesktopWindow()) reset_clipping_window(); return; diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 15e5c04a41..290732fa93 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -572,7 +572,7 @@ BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) { RECT virtual_rect = get_virtual_screen_rect(); if (!EqualRect( &rect, &virtual_rect )) return FALSE; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; } TRACE( "win %p clipping fullscreen\n", hwnd ); return grab_clipping_window( &rect ); diff --git a/dlls/winex11.drv/palette.c b/dlls/winex11.drv/palette.c index 073761a5ee..25bdb5f2bf 100644 --- a/dlls/winex11.drv/palette.c +++ b/dlls/winex11.drv/palette.c @@ -217,7 +217,7 @@ int X11DRV_PALETTE_Init(void) { X11DRV_PALETTE_PaletteFlags |= X11DRV_PALETTE_PRIVATE; - if( root_window != DefaultRootWindow(gdi_display) ) + if (is_virtual_desktop()) { win_attr.colormap = default_colormap; XChangeWindowAttributes( gdi_display, root_window, CWColormap, &win_attr ); diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index d4262c43cf..3be4bd6534 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,7 +587,7 @@ static BOOL init_systray(void) WNDCLASSEXW class; Display *display; - if (root_window != DefaultRootWindow( gdi_display )) return FALSE; + if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f3c6a1b3cb..99e4094ebd 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2474,7 +2474,7 @@ static BOOL hide_icon( struct x11drv_win_data *data ) if (data->managed) return TRUE; /* hide icons in desktop mode when the taskbar is active */ - if (root_window == DefaultRootWindow( gdi_display )) return FALSE; + if (!is_virtual_desktop()) return FALSE; return IsWindowVisible( FindWindowW( trayW, NULL )); } @@ -2781,7 +2781,7 @@ static BOOL is_netwm_supported( Display *display, Atom atom ) */ static LRESULT start_screensaver(void) { - if (root_window == DefaultRootWindow(gdi_display)) + if (!is_virtual_desktop()) { const char *argv[3] = { "xdg-screensaver", "activate", NULL }; int pid = _spawnvp( _P_DETACH, argv[0], argv ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 35e27334db..a96f57dc37 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -656,6 +656,7 @@ struct x11drv_mode_info extern void X11DRV_init_desktop( Window win, unsigned int width, unsigned int height ) DECLSPEC_HIDDEN; extern void X11DRV_resize_desktop(unsigned int width, unsigned int height) DECLSPEC_HIDDEN; +extern BOOL is_virtual_desktop(void) DECLSPEC_HIDDEN; extern BOOL is_desktop_fullscreen(void) DECLSPEC_HIDDEN; extern BOOL create_desktop_win_data( Window win ) DECLSPEC_HIDDEN; extern void X11DRV_Settings_AddDepthModes(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 57c77d6273..bd607f3006 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -310,10 +310,10 @@ void xinerama_init( unsigned int width, unsigned int height ) SetRect( &rect, 0, 0, width, height ); - if (root_window != DefaultRootWindow( gdi_display ) || !query_screens()) + if (is_virtual_desktop() || !query_screens()) { default_monitor.rcWork = default_monitor.rcMonitor = rect; - if (root_window == DefaultRootWindow( gdi_display )) + if (!is_virtual_desktop()) query_work_area( &default_monitor.rcWork ); else query_desktop_work_area( &default_monitor.rcWork ); diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 0a64613fac..5616857347 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1099,7 +1099,7 @@ void X11DRV_XRandR_Init(void) if (major) return; /* already initialized? */ if (!usexrandr) return; /* disabled in config */ - if (root_window != DefaultRootWindow( gdi_display )) return; + if (is_virtual_desktop()) return; if (!(ret = load_xrandr())) return; /* can't load the Xrandr library */ /* see if Xrandr is available */ diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 975575fe77..5acc95bd2e 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -210,7 +210,7 @@ void X11DRV_XF86VM_Init(void) #endif /* X_XF86VidModeSetGammaRamp */ /* retrieve modes */ - if (usexvidmode && root_window == DefaultRootWindow( gdi_display )) + if (usexvidmode && !is_virtual_desktop()) { X11DRV_expect_error(gdi_display, XVidModeErrorHandler, NULL); ok = pXF86VidModeGetAllModeLines(gdi_display, DefaultScreen(gdi_display), &nmodes, &real_xf86vm_modes);

1 0

Sven Baars : urlmon/tests: Fix a test failure on Windows XP.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 8180e338ea07a3b4c89641696505ee4260c9e605 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8180e338ea07a3b4c8964169… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Oct 19 14:28:56 2019 +0200 urlmon/tests: Fix a test failure on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/url.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 1aef981b83..287eb2702e 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -3911,7 +3911,8 @@ static BOOL can_do_https(void) ok(req != NULL, "HttpOpenRequest failed\n"); ret = HttpSendRequestA(req, NULL, 0, NULL, 0); - ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT), + ok(ret || broken(GetLastError() == ERROR_INTERNET_CANNOT_CONNECT) + || broken(GetLastError() == ERROR_INTERNET_SECURITY_CHANNEL_ERROR) /* WinXP */, "request failed: %u\n", GetLastError()); InternetCloseHandle(req);

1 0

Rémi Bernon : user32/tests: Wait and flush messages after window creation.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 9099b9843f048565b8bc5b3ee084df55956c5bf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9099b9843f048565b8bc5b3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Nov 5 13:46:51 2019 +0100 user32/tests: Wait and flush messages after window creation. The window created in the separate thread in test_Input_mouse sometimes fails to catch the mouse input in time. Waiting and flushing the initial messages seems to make the issue harder to reproduce. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1e6be311ee..d0e7603811 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2196,6 +2196,7 @@ static DWORD WINAPI create_static_win(void *arg) { struct thread_data *thread_data = arg; HWND win; + MSG msg; win = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); @@ -2204,6 +2205,7 @@ static DWORD WINAPI create_static_win(void *arg) GWLP_WNDPROC, (LONG_PTR)static_hook_proc); thread_data->win = win; + while (wait_for_message(&msg)) DispatchMessageA(&msg); SetEvent(thread_data->start_event); wait_for_event(thread_data->end_event, 5000); return 0;

1 0

Alistair Leslie-Hughes : user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: 71d35d8940118bc6de6522913fb8c473fa5b2c24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=71d35d8940118bc6de652291… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 1 03:07:19 2019 +0000 user32: WM_MOUSEACTIVATE should return MA_NOACTIVATE for WM_LBUTTONDOWN/HTCAPTION message. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/defwnd.c | 2 +- dlls/user32/tests/win.c | 60 +++++++++++++++++++++++++------------------------ 2 files changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index c0d1190710..9cd1298923 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -409,7 +409,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } /* Caption clicks are handled by NC_HandleNCLButtonDown() */ - return MA_ACTIVATE; + return ( HIWORD(lParam) == WM_LBUTTONDOWN && LOWORD(lParam) == HTCAPTION ? MA_NOACTIVATE : MA_ACTIVATE ); case WM_ACTIVATE: /* The default action in Windows is to set the keyboard focus to diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 784849b2ba..78dc55f00a 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2717,7 +2717,7 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) ret = SetWindowPos(hwnd_child, NULL, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE|SWP_SHOWWINDOW); ok(ret, "Got %d\n", ret); flush_events( TRUE ); - todo_wine check_active_state(hwnd2, hwnd2, hwnd2); + check_active_state(hwnd2, hwnd2, hwnd2); DestroyWindow(hwnd_child); } @@ -3371,8 +3371,8 @@ static void test_SetForegroundWindow(HWND hwnd) while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); if (0) check_wnd_state(hwnd2, hwnd2, hwnd2, 0); - todo_wine ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); - todo_wine ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); + ok(GetActiveWindow() == hwnd2, "Expected active window %p, got %p.\n", hwnd2, GetActiveWindow()); + ok(GetFocus() == hwnd2, "Expected focus window %p, got %p.\n", hwnd2, GetFocus()); SetForegroundWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3936,34 +3936,36 @@ static void test_mouse_input(HWND hwnd) ok(peek_message(&msg), "no message available\n"); /* Test WM_MOUSEACTIVATE */ -#define TEST_MOUSEACTIVATE(A,B) \ +#define TEST_MOUSEACTIVATE(A,B,C) \ res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,0)); \ - ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); + ok(res == B, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); \ + res = SendMessageA(hwnd, WM_MOUSEACTIVATE, (WPARAM)hwnd, (LPARAM)MAKELRESULT(A,WM_LBUTTONDOWN)); \ + ok(res == C, "WM_MOUSEACTIVATE for %s returned %ld\n", #A, res); - TEST_MOUSEACTIVATE(HTERROR,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTRANSPARENT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTNOWHERE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLIENT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCAPTION,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSYSMENU,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTSIZE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMENU,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHSCROLL,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTVSCROLL,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMINBUTTON,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTMAXBUTTON,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOP,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTTOPRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOM,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMLEFT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBOTTOMRIGHT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTBORDER,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTOBJECT,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTCLOSE,MA_ACTIVATE); - TEST_MOUSEACTIVATE(HTHELP,MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTERROR, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTRANSPARENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTNOWHERE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLIENT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCAPTION, MA_ACTIVATE, MA_NOACTIVATE); + TEST_MOUSEACTIVATE(HTSYSMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTSIZE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMENU, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTVSCROLL, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMINBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTMAXBUTTON, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOP, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTTOPRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOM, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMLEFT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBOTTOMRIGHT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTBORDER, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTOBJECT, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTCLOSE, MA_ACTIVATE, MA_ACTIVATE); + TEST_MOUSEACTIVATE(HTHELP, MA_ACTIVATE, MA_ACTIVATE); ShowWindow(popup, SW_HIDE);

1 0

Jacek Caban : vbscript: Clean up lookup_identifier.
by Alexandre Julliard 05 Nov '19

05 Nov '19

Module: wine Branch: master Commit: ae1291cbe0c7fbe0dd4aeffbe214388c4ebecb2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae1291cbe0c7fbe0dd4aeffb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 5 14:09:20 2019 +0100 vbscript: Clean up lookup_identifier. Be more explicit about what applies only to non-global code. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/interp.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 211a5af5f8..89f9d359da 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -109,26 +109,26 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ return S_OK; } - for(i=0; i < ctx->func->var_cnt; i++) { - if(!wcsicmp(ctx->func->vars[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->vars+i; - return TRUE; + if(ctx->func->type != FUNC_GLOBAL) { + for(i=0; i < ctx->func->var_cnt; i++) { + if(!wcsicmp(ctx->func->vars[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->vars+i; + return TRUE; + } } - } - for(i=0; i < ctx->func->arg_cnt; i++) { - if(!wcsicmp(ctx->func->args[i].name, name)) { - ref->type = REF_VAR; - ref->u.v = ctx->args+i; - return S_OK; + for(i=0; i < ctx->func->arg_cnt; i++) { + if(!wcsicmp(ctx->func->args[i].name, name)) { + ref->type = REF_VAR; + ref->u.v = ctx->args+i; + return S_OK; + } } - } - if(lookup_dynamic_vars(ctx->func->type == FUNC_GLOBAL ? ctx->script->global_vars : ctx->dynamic_vars, name, ref)) - return S_OK; + if(lookup_dynamic_vars(ctx->dynamic_vars, name, ref)) + return S_OK; - if(ctx->func->type != FUNC_GLOBAL) { if(ctx->vbthis) { /* FIXME: Bind such identifier while generating bytecode. */ for(i=0; i < ctx->vbthis->desc->prop_cnt; i++) { @@ -159,7 +159,7 @@ static HRESULT lookup_identifier(exec_ctx_t *ctx, BSTR name, vbdisp_invoke_type_ } } - if(ctx->func->type != FUNC_GLOBAL && lookup_dynamic_vars(ctx->script->global_vars, name, ref)) + if(lookup_dynamic_vars(ctx->script->global_vars, name, ref)) return S_OK; for(i = 0; i < ctx->script->global_funcs_cnt; i++) {

1 0

← Newer
1
...
76
77
78
79
80
81
82
...
90
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 November 2019