wine-commits November 2019

wine-commits@winehq.org

1 participants
895 discussions

Hans Leidekker : shell32: Improve the stub for SHGetPropertyStoreForWindow.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: d7533e28df9ffa8303e8d53337dfe8d68e423eec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7533e28df9ffa8303e8d533… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Nov 1 14:13:00 2019 +0100 shell32: Improve the stub for SHGetPropertyStoreForWindow. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 112 +++++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/appbar.c | 32 +++++++++++++ 2 files changed, 143 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 99ee110b3d..034805f6fb 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -691,13 +691,123 @@ VOID WINAPI Printers_UnregisterWindow(HANDLE hClassPidl, HWND hwnd) FIXME("(%p, %p) stub!\n", hClassPidl, hwnd); } +struct window_prop_store +{ + IPropertyStore IPropertyStore_iface; + LONG ref; +}; + +static inline struct window_prop_store *impl_from_IPropertyStore(IPropertyStore *iface) +{ + return CONTAINING_RECORD(iface, struct window_prop_store, IPropertyStore_iface); +} + +static ULONG WINAPI window_prop_store_AddRef(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedIncrement(&store->ref); + TRACE("returning %d\n", ref); + return ref; +} + +static ULONG WINAPI window_prop_store_Release(IPropertyStore *iface) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + LONG ref = InterlockedDecrement(&store->ref); + if (!ref) heap_free(store); + TRACE("returning %d\n", ref); + return ref; +} + +static HRESULT WINAPI window_prop_store_QueryInterface(IPropertyStore *iface, REFIID iid, void **obj) +{ + struct window_prop_store *store = impl_from_IPropertyStore(iface); + TRACE("%p, %s, %p\n", iface, debugstr_guid(iid), obj); + + if (!obj) return E_POINTER; + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IPropertyStore)) + { + *obj = &store->IPropertyStore_iface; + } + else + { + FIXME("no interface for %s\n", debugstr_guid(iid)); + *obj = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown *)*obj); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_GetCount(IPropertyStore *iface, DWORD *count) +{ + FIXME("%p, %p\n", iface, count); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetAt(IPropertyStore *iface, DWORD prop, PROPERTYKEY *key) +{ + FIXME("%p, %u,%p\n", iface, prop, key); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_GetValue(IPropertyStore *iface, const PROPERTYKEY *key, PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return E_NOTIMPL; +} + +static HRESULT WINAPI window_prop_store_SetValue(IPropertyStore *iface, const PROPERTYKEY *key, const PROPVARIANT *var) +{ + FIXME("%p, {%s,%u}, %p\n", iface, debugstr_guid(&key->fmtid), key->pid, var); + return S_OK; +} + +static HRESULT WINAPI window_prop_store_Commit(IPropertyStore *iface) +{ + FIXME("%p\n", iface); + return S_OK; +} + +static const IPropertyStoreVtbl window_prop_store_vtbl = +{ + window_prop_store_QueryInterface, + window_prop_store_AddRef, + window_prop_store_Release, + window_prop_store_GetCount, + window_prop_store_GetAt, + window_prop_store_GetValue, + window_prop_store_SetValue, + window_prop_store_Commit +}; + +static HRESULT create_window_prop_store(IPropertyStore **obj) +{ + struct window_prop_store *store; + + if (!(store = heap_alloc(sizeof(*store)))) return E_OUTOFMEMORY; + store->IPropertyStore_iface.lpVtbl = &window_prop_store_vtbl; + store->ref = 1; + + *obj = &store->IPropertyStore_iface; + return S_OK; +} + /************************************************************************* * SHGetPropertyStoreForWindow [SHELL32.@] */ HRESULT WINAPI SHGetPropertyStoreForWindow(HWND hwnd, REFIID riid, void **ppv) { + IPropertyStore *store; + HRESULT hr; + FIXME("(%p %p %p) stub!\n", hwnd, riid, ppv); - return E_NOTIMPL; + + if ((hr = create_window_prop_store( &store )) != S_OK) return hr; + hr = IPropertyStore_QueryInterface( store, riid, ppv ); + IPropertyStore_Release( store ); + return hr; } /*************************************************************************/ diff --git a/dlls/shell32/tests/appbar.c b/dlls/shell32/tests/appbar.c index 1505a40aeb..229d616c6f 100644 --- a/dlls/shell32/tests/appbar.c +++ b/dlls/shell32/tests/appbar.c @@ -21,6 +21,8 @@ #include <windows.h> #include "shellapi.h" +#define COBJMACROS +#include "propsys.h" #include "wine/test.h" @@ -30,6 +32,7 @@ static const CHAR testwindow_class[] = "testwindow"; static HMONITOR (WINAPI *pMonitorFromWindow)(HWND, DWORD); static HRESULT (WINAPI *pGetCurrentProcessExplicitAppUserModelID)(PWSTR*); +static HRESULT (WINAPI *pSHGetPropertyStoreForWindow)(HWND, REFIID, void **); typedef BOOL (*boolean_function)(void); @@ -433,6 +436,33 @@ todo_wine ok(appid == NULL, "got %p\n", appid); } +static void test_SHGetPropertyStoreForWindow(void) +{ + HRESULT hr; + IUnknown *unk; + IPropertyStore *store = NULL; + + if (!pSHGetPropertyStoreForWindow) + { + win_skip("SHGetPropertyStoreForWindow() is not supported.\n"); + return; + } + + unk = (IUnknown *)0xdeadbeef; + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IDispatch, (void **)&unk); + ok(hr == E_NOINTERFACE, "got 0x%08x\n", hr); + ok(unk == NULL, "got %p\n", unk); + + hr = pSHGetPropertyStoreForWindow(GetDesktopWindow(), &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IPropertyStore, (void **)&store); + ok(hr == S_OK, "got 0x%08x\n", hr); + + if (store) IPropertyStore_Release(store); + if (unk) IUnknown_Release(unk); +} + START_TEST(appbar) { HMODULE huser32, hshell32; @@ -441,10 +471,12 @@ START_TEST(appbar) hshell32 = GetModuleHandleA("shell32.dll"); pMonitorFromWindow = (void*)GetProcAddress(huser32, "MonitorFromWindow"); pGetCurrentProcessExplicitAppUserModelID = (void*)GetProcAddress(hshell32, "GetCurrentProcessExplicitAppUserModelID"); + pSHGetPropertyStoreForWindow = (void*)GetProcAddress(hshell32, "SHGetPropertyStoreForWindow"); register_testwindow_class(); test_setpos(); test_appbarget(); test_GetCurrentProcessExplicitAppUserModelID(); + test_SHGetPropertyStoreForWindow(); }

1 0

Sven Baars : ole32/tests: Fix some test failures on Windows XP.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: b21e50c08551302d0c71ff851b553839886cd157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b21e50c08551302d0c71ff85… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri Nov 1 16:30:44 2019 +0100 ole32/tests: Fix some test failures on Windows XP. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 69a38d48b2..8412ee45a0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -757,7 +757,7 @@ static void test_CoGetClassObject(void) IUnknown_Release(pUnk); hr = CoGetClassObject(&IID_Testiface7, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); - ok(hr == 0x80001235, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001235 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); hr = CoGetClassObject(&IID_Testiface8, CLSCTX_INPROC_SERVER, NULL, &IID_IUnknown, (void **)&pUnk); ok(hr == REGDB_E_CLASSNOTREG, "Unexpected hr %#x.\n", hr); @@ -1573,7 +1573,7 @@ static void test_CoRegisterClassObject(void) if ((handle = activate_context(actctx_manifest, &ctxcookie))) { hr = CoGetClassObject(&CLSID_WineOOPTest, CLSCTX_INPROC_SERVER, NULL, &IID_IClassFactory, (void**)&pcf); - ok(hr == 0x80001234, "Unexpected hr %#x.\n", hr); + ok(hr == 0x80001234 || broken(hr == HRESULT_FROM_WIN32(ERROR_MOD_NOT_FOUND)) /* winxp */, "Unexpected hr %#x.\n", hr); deactivate_context(handle, ctxcookie); }

1 0

Paul Gofman : wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict().
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: eefc2a9c64337c418d847b8e914ab31fddd538eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=eefc2a9c64337c418d847b8e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 1 11:02:43 2019 +0300 wined3d: Return TRUE for NULL SRV format from wined3d_dsv_srv_conflict(). This undoes unintended change of wined3d_resource_check_fbo_attached() behaviour for pre-10.0 APIs. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 82161c9034..61096a0345 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5292,8 +5292,8 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) { - return srv_format && ((srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) - || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL))); + return !srv_format || (srv_format->depth_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_DEPTH)) + || (srv_format->stencil_size && !(dsv->desc.flags & WINED3D_VIEW_READ_ONLY_STENCIL)); } static inline BOOL wined3d_resource_check_fbo_attached(const struct wined3d_state *state,

1 0

Paul Gofman : d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 484e3f9c4ca698e8473b26c8ac0ae0ff42094034 URL: https://source.winehq.org/git/wine.git/?a=commit;h=484e3f9c4ca698e8473b26c8… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Nov 1 11:02:42 2019 +0300 d3d11/tests: Require D3D_FEATURE_LEVEL_11_0 for using DSV flags. Fixes test failures on older Testbot Windows versions in test_sample_attached_rtv(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d23cb15d82..1dbd405001 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -29403,6 +29403,7 @@ static void test_sample_attached_rtv(void) struct d3d11_test_context test_context; ID3D11RenderTargetView *rtv, *rtvs[2]; D3D11_TEXTURE2D_DESC texture_desc; + D3D_FEATURE_LEVEL feature_level; D3D11_SAMPLER_DESC sampler_desc; ID3D11DepthStencilView *dsview; ID3D11BlendState *blend_state; @@ -29486,6 +29487,8 @@ static void test_sample_attached_rtv(void) device = test_context.device; context = test_context.immediate_context; + feature_level = ID3D11Device_GetFeatureLevel(device); + texture_desc.SampleDesc.Count = 1; texture_desc.SampleDesc.Quality = 0; texture_desc.Usage = D3D11_USAGE_DEFAULT; @@ -29655,6 +29658,16 @@ static void test_sample_attached_rtv(void) for (i = 0; i < ARRAY_SIZE(ds_tests); ++i) { + if (ds_tests[i].dsv_flags && feature_level < D3D_FEATURE_LEVEL_11_0) + { + static unsigned int skip_once; + + if (!skip_once++) + skip("Read only depths or stencils are not supported.\n"); + + continue; + } + texture_desc.Format = ds_tests[i].texture_format; hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, &dstexture); ok(hr == S_OK, "Test %u, got unexpected hr %#x.\n", i, hr);

1 0

Zhiyi Zhang : winex11.drv: Handle display device events in the desktop thread.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 413aad39135b0b0f8255500b85fcc05337a5f138 URL: https://source.winehq.org/git/wine.git/?a=commit;h=413aad39135b0b0f8255500b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 1 21:20:21 2019 +0800 winex11.drv: Handle display device events in the desktop thread. This fixes a regression from 22795243b2d21e1a667215f54c3a15634735749c, which calls thread_init_display() and eventually XOpenIM() before X11DRV_InitXIM() is called. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47821 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 6 ++++++ dlls/winex11.drv/window.c | 1 + dlls/winex11.drv/x11drv.h | 5 +++++ dlls/winex11.drv/xinerama.c | 1 + dlls/winex11.drv/xrandr.c | 35 +++++++++++++++++++++++------------ 5 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index a323b795b8..ee867343ae 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -241,6 +241,12 @@ void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler } } +void X11DRV_DisplayDevices_RegisterEventHandlers(void) +{ + if (handler.register_event_handlers) + handler.register_event_handlers(); +} + /* Initialize a GPU instance and return its GUID string in guid_string and driver value in driver parameter */ static BOOL X11DRV_InitGpu(HDEVINFO devinfo, const struct x11drv_gpu *gpu, INT gpu_index, WCHAR *guid_string, WCHAR *driver) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 4e01eb201c..f3c6a1b3cb 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1833,6 +1833,7 @@ BOOL CDECL X11DRV_CreateWindow( HWND hwnd ) XFlush( data->display ); SetPropA( hwnd, clip_window_prop, (HANDLE)data->clip_window ); X11DRV_InitClipboard(); + X11DRV_DisplayDevices_RegisterEventHandlers(); } return TRUE; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a06cf3ffd8..35e27334db 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -743,10 +743,15 @@ struct x11drv_display_device_handler /* free_monitors will be called to free a monitor list from get_monitors */ void (*free_monitors)(struct x11drv_monitor *monitors); + + /* register_event_handlers will be called to register event handlers. + * This function pointer is optional and can be NULL when driver doesn't support it */ + void (*register_event_handlers)(void); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; extern void X11DRV_DisplayDevices_Init(BOOL force) DECLSPEC_HIDDEN; +extern void X11DRV_DisplayDevices_RegisterEventHandlers(void) DECLSPEC_HIDDEN; /* XIM support */ extern BOOL X11DRV_InitXIM( const char *input_style ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index b5620d3403..57c77d6273 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -344,5 +344,6 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.free_gpus = xinerama_free_gpus; handler.free_adapters = xinerama_free_adapters; handler.free_monitors = xinerama_free_monitors; + handler.register_event_handlers = NULL; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 412400e3f6..0a64613fac 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1063,10 +1063,29 @@ static void xrandr14_free_monitors( struct x11drv_monitor *monitors ) heap_free( monitors ); } -static BOOL xrandr14_device_change_event( HWND hwnd, XEvent *event ) +static BOOL xrandr14_device_change_handler( HWND hwnd, XEvent *event ) { - X11DRV_DisplayDevices_Init( TRUE ); - return TRUE; + if (hwnd == GetDesktopWindow() && GetWindowThreadProcessId( hwnd, NULL ) == GetCurrentThreadId()) + X11DRV_DisplayDevices_Init( TRUE ); + return FALSE; +} + +static void xrandr14_register_event_handlers(void) +{ + Display *display = thread_init_display(); + int event_base, error_base; + + if (!pXRRQueryExtension( display, &event_base, &error_base )) + return; + + pXRRSelectInput( display, root_window, + RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask ); + X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_handler, + "XRandR CrtcChange" ); + X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_handler, + "XRandR OutputChange" ); + X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_handler, + "XRandR ProviderChange" ); } #endif @@ -1115,16 +1134,8 @@ void X11DRV_XRandR_Init(void) handler.free_gpus = xrandr14_free_gpus; handler.free_adapters = xrandr14_free_adapters; handler.free_monitors = xrandr14_free_monitors; + handler.register_event_handlers = xrandr14_register_event_handlers; X11DRV_DisplayDevices_SetHandler( &handler ); - - pXRRSelectInput( thread_init_display(), root_window, - RRCrtcChangeNotifyMask | RROutputChangeNotifyMask | RRProviderChangeNotifyMask); - X11DRV_register_event_handler( event_base + RRNotify_CrtcChange, xrandr14_device_change_event, - "XRandR CrtcChange" ); - X11DRV_register_event_handler( event_base + RRNotify_OutputChange, xrandr14_device_change_event, - "XRandR OutputChange" ); - X11DRV_register_event_handler( event_base + RRNotify_ProviderChange, xrandr14_device_change_event, - "XRandR ProviderChange" ); } #endif }

1 0

Zhiyi Zhang : winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 9ae8da6bb4a8f66d55975fa0f14e5e413756d324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ae8da6bb4a8f66d55975fa0… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Nov 1 21:19:34 2019 +0800 winex11.drv: Retrieve virtual and primary monitor rectangles from SetupAPI. So that a process can still get the correct virtual and primary monitor rectangles if display devices are reinitialized in another process. Note that we can't use EnumDisplayMonitor() and GetMonitorInfo() here because they are not loaded when loading winex11.drv. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/display.c | 160 ++++++++++++++++++++++++++++++--------------- 1 file changed, 107 insertions(+), 53 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 6c4097a790..a323b795b8 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -104,33 +104,132 @@ static const WCHAR monitor_hardware_idW[] = { 'D','e','f','a','u','l','t','_','M','o','n','i','t','o','r',0,0}; static struct x11drv_display_device_handler handler; + +/* Cached screen information, protected by screen_section */ +static HKEY video_key; static RECT virtual_screen_rect; static RECT primary_monitor_rect; +static FILETIME last_query_screen_time; +static CRITICAL_SECTION screen_section; +static CRITICAL_SECTION_DEBUG screen_critsect_debug = +{ + 0, 0, &screen_section, + {&screen_critsect_debug.ProcessLocksList, &screen_critsect_debug.ProcessLocksList}, + 0, 0, {(DWORD_PTR)(__FILE__ ": screen_section")} +}; +static CRITICAL_SECTION screen_section = {&screen_critsect_debug, -1, 0, 0, 0, 0}; + +static HANDLE get_display_device_init_mutex(void) +{ + static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; + HANDLE mutex = CreateMutexW(NULL, FALSE, init_mutexW); + + WaitForSingleObject(mutex, INFINITE); + return mutex; +} + +static void release_display_device_init_mutex(HANDLE mutex) +{ + ReleaseMutex(mutex); + CloseHandle(mutex); +} + +/* Update screen rectangle cache from SetupAPI if it's outdated, return FALSE on failure and TRUE on success */ +static BOOL update_screen_cache(void) +{ + RECT virtual_rect = {0}, primary_rect = {0}, monitor_rect; + SP_DEVINFO_DATA device_data = {sizeof(device_data)}; + HDEVINFO devinfo = INVALID_HANDLE_VALUE; + FILETIME filetime = {0}; + HANDLE mutex = NULL; + DWORD i = 0; + INT result; + DWORD type; + BOOL ret = FALSE; + + EnterCriticalSection(&screen_section); + if ((!video_key && RegOpenKeyW(HKEY_LOCAL_MACHINE, video_keyW, &video_key)) + || RegQueryInfoKeyW(video_key, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, &filetime)) + { + LeaveCriticalSection(&screen_section); + return FALSE; + } + result = CompareFileTime(&filetime, &last_query_screen_time); + LeaveCriticalSection(&screen_section); + if (result < 1) + return TRUE; + + mutex = get_display_device_init_mutex(); + + devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, DIGCF_PRESENT); + if (devinfo == INVALID_HANDLE_VALUE) + goto fail; + + while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) + { + if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, + (BYTE *)&monitor_rect, sizeof(monitor_rect), NULL, 0)) + goto fail; + + UnionRect(&virtual_rect, &virtual_rect, &monitor_rect); + if (i == 1) + primary_rect = monitor_rect; + } + + EnterCriticalSection(&screen_section); + virtual_screen_rect = virtual_rect; + primary_monitor_rect = primary_rect; + last_query_screen_time = filetime; + LeaveCriticalSection(&screen_section); + ret = TRUE; +fail: + SetupDiDestroyDeviceInfoList(devinfo); + release_display_device_init_mutex(mutex); + if (!ret) + WARN("Update screen cache failed!\n"); + return ret; +} POINT virtual_screen_to_root(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x - virtual_screen_rect.left; - pt.y = y - virtual_screen_rect.top; + + pt.x = x - virtual.left; + pt.y = y - virtual.top; return pt; } POINT root_to_virtual_screen(INT x, INT y) { + RECT virtual = get_virtual_screen_rect(); POINT pt; - pt.x = x + virtual_screen_rect.left; - pt.y = y + virtual_screen_rect.top; + + pt.x = x + virtual.left; + pt.y = y + virtual.top; return pt; } RECT get_virtual_screen_rect(void) { - return virtual_screen_rect; + RECT virtual; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + virtual = virtual_screen_rect; + LeaveCriticalSection(&screen_section); + return virtual; } RECT get_primary_monitor_rect(void) { - return primary_monitor_rect; + RECT primary; + + update_screen_cache(); + EnterCriticalSection(&screen_section); + primary = primary_monitor_rect; + LeaveCriticalSection(&screen_section); + return primary; } void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *new_handler) @@ -321,9 +420,6 @@ static BOOL X11DRV_InitMonitor(HDEVINFO devinfo, const struct x11drv_monitor *mo if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_monitor, sizeof(monitor->rc_monitor), 0)) goto done; - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &monitor->rc_monitor); - if (video_index == 0) - primary_monitor_rect = monitor->rc_monitor; /* RcWork */ if (!SetupDiSetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCWORK, DEVPROP_TYPE_BINARY, (const BYTE *)&monitor->rc_work, sizeof(monitor->rc_work), 0)) @@ -348,9 +444,6 @@ static void prepare_devices(HKEY video_hkey) HDEVINFO devinfo; DWORD i = 0; - SetRectEmpty(&virtual_screen_rect); - SetRectEmpty(&primary_monitor_rect); - /* Remove all monitors */ devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) @@ -399,39 +492,8 @@ static void cleanup_devices(void) SetupDiDestroyDeviceInfoList(devinfo); } -/* Initialize virtual screen rect and primary monitor rect for current process */ -static void init_screen_rects(void) -{ - SP_DEVINFO_DATA device_data = {sizeof(device_data)}; - HDEVINFO devinfo; - DWORD type; - DWORD i = 0; - RECT rect; - - /* Already initialized */ - if (!IsRectEmpty(&virtual_screen_rect)) - return; - - devinfo = SetupDiGetClassDevsW(&GUID_DEVCLASS_MONITOR, displayW, NULL, 0); - while (SetupDiEnumDeviceInfo(devinfo, i++, &device_data)) - { - if (!SetupDiGetDevicePropertyW(devinfo, &device_data, &WINE_DEVPROPKEY_MONITOR_RCMONITOR, &type, (BYTE *)&rect, - sizeof(rect), NULL, 0)) - ERR("Failed to get monitor size property\n"); - - UnionRect(&virtual_screen_rect, &virtual_screen_rect, &rect); - if (i == 1) - primary_monitor_rect = rect; - } - SetupDiDestroyDeviceInfoList(devinfo); - - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); -} - void X11DRV_DisplayDevices_Init(BOOL force) { - static const WCHAR init_mutexW[] = {'d','i','s','p','l','a','y','_','d','e','v','i','c','e','_','i','n','i','t',0}; HANDLE mutex; struct x11drv_gpu *gpus = NULL; struct x11drv_adapter *adapters = NULL; @@ -445,8 +507,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) WCHAR guidW[40]; WCHAR driverW[1024]; - mutex = CreateMutexW(NULL, FALSE, init_mutexW); - WaitForSingleObject(mutex, INFINITE); + mutex = get_display_device_init_mutex(); if (RegCreateKeyExW(HKEY_LOCAL_MACHINE, video_keyW, 0, NULL, REG_OPTION_VOLATILE, KEY_ALL_ACCESS, NULL, &video_hkey, &disposition)) @@ -457,10 +518,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) /* Avoid unnecessary reinit */ if (!force && disposition != REG_CREATED_NEW_KEY) - { - init_screen_rects(); goto done; - } TRACE("via %s\n", wine_dbgstr_a(handler.name)); @@ -511,16 +569,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) adapters = NULL; } - TRACE("virtual screen rect:%s primary monitor rect:%s\n", wine_dbgstr_rect(&virtual_screen_rect), - wine_dbgstr_rect(&primary_monitor_rect)); - done: cleanup_devices(); SetupDiDestroyDeviceInfoList(monitor_devinfo); SetupDiDestroyDeviceInfoList(gpu_devinfo); RegCloseKey(video_hkey); - ReleaseMutex(mutex); - CloseHandle(mutex); + release_display_device_init_mutex(mutex); if (gpus) handler.free_gpus(gpus); if (adapters)

1 0

Piotr Caban : msvcrt: Add printf meaningless digits tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: f87b3750fc877935336cee2bbf8a6bf41e55836c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f87b3750fc877935336cee2b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:46 2019 +0100 msvcrt: Add printf meaningless digits tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 5ce4015440..ac5c37a59c 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -248,6 +248,8 @@ static void test_sprintf( void ) { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, + { "%.30f", "0.333333333333333310000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 1.0/3.0 }, + { "%.30lf", "1.414213562373095100000000000000", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, sqrt(2) }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Add printf rounding tests.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 04a5beac69faef994a6706356c9ef67ff9d4c9ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=04a5beac69faef994a670635… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:42 2019 +0100 msvcrt: Add printf rounding tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index bfdab8cc6b..5ce4015440 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -243,7 +243,11 @@ static void test_sprintf( void ) { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, - { "%I32d", "1", "I32d", INT_ARG, 1 } + { "%I32d", "1", "I32d", INT_ARG, 1 }, + { "%.0f", "-2", 0, DOUBLE_ARG, 0, 0, -1.5 }, + { "%.0f", "-1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, -0.5 }, + { "%.0f", "1", 0, TODO_FLAG | DOUBLE_ARG, 0, 0, 0.5 }, + { "%.0f", "2", 0, DOUBLE_ARG, 0, 0, 1.5 }, }; char buffer[100];

1 0

Piotr Caban : msvcrt: Move more printf tests to table.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: 3798c0c4c92e588d8c217fbfb8b753eaa96c800d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3798c0c4c92e588d8c217fbf… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:38 2019 +0100 msvcrt: Move more printf tests to table. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 35 ++++++++++------------------------- 1 file changed, 10 insertions(+), 25 deletions(-) diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index d62f09cc0f..bfdab8cc6b 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -242,6 +242,8 @@ static void test_sprintf( void ) { "%C", "a", 0, INT_ARG, 'a' }, { "%C", "", 0, INT_ARG, 0x3042 }, { "a%Cb", "ab", 0, INT_ARG, 0x3042 }, + { "%lld", "-8589934591", "1", ULONGLONG_ARG, 0, ((ULONGLONG)0xffffffff)*0xffffffff }, + { "%I32d", "1", "I32d", INT_ARG, 1 } }; char buffer[100]; @@ -278,19 +280,6 @@ static void test_sprintf( void ) } } - r = p_sprintf(buffer, "%lld", ((ULONGLONG)0xffffffff)*0xffffffff); - ok( r == 1 || r == 11, "return count wrong %d\n", r); - if (r == 11) /* %ll works on Vista */ - ok(!strcmp(buffer, "-8589934591"), "Problem with \"ll\" interpretation '%s'\n", buffer); - else - ok(!strcmp(buffer, "1"), "Problem with \"ll\" interpretation '%s'\n", buffer); - - r = p_sprintf(buffer, "%I32d", 1); - if (r == 1) - ok(!strcmp(buffer,"1"),"I32d failed, got '%s'\n",buffer); - else - ok(r == 4 && !strcmp(buffer,"I32d"),"I32d failed, got '%s',%d\n",buffer,r); - if (sizeof(void *) == 8) { r = p_sprintf(buffer, "%p", (void *)57); @@ -316,6 +305,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", (size_t)0x12345678123456,1); ok(!strcmp(buffer,"12345678123456 1"),"buffer = %s\n",buffer); ok( r==16, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"0000000000000000"), "failed\n"); + ok( r==16, "return count wrong\n"); } else { @@ -342,6 +335,10 @@ static void test_sprintf( void ) r = p_sprintf(buffer, "%Ix %d", 0x123456, 1); ok(!strcmp(buffer,"123456 1"),"buffer = %s\n",buffer); ok( r==8, "return count wrong\n"); + + r = p_sprintf(buffer, "%p", 0); + ok(!strcmp(buffer,"00000000"), "failed\n"); + ok( r==8, "return count wrong\n"); } r = p_sprintf(buffer, "%.*s", 1, "foo"); @@ -367,18 +364,6 @@ static void test_sprintf( void ) ok( r==4, "return count wrong: %d\n", r); } - r = p_sprintf(buffer, "%p", 0); - if (sizeof(void *) == 8) - { - ok(!strcmp(buffer,"0000000000000000"), "failed\n"); - ok( r==16, "return count wrong\n"); - } - else - { - ok(!strcmp(buffer,"00000000"), "failed\n"); - ok( r==8, "return count wrong\n"); - } - r = p_sprintf(buffer, "%S", L"\x3042"); ok(r==-1 || broken(!r), "r = %d\n", r);

1 0

Piotr Caban : msvcrt: Fix test failures on Windows 10.
by Alexandre Julliard 01 Nov '19

01 Nov '19

Module: wine Branch: master Commit: c2b6dcb08f63b18e62017122057ede7144bcdf74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b6dcb08f63b18e62017122… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 1 11:49:34 2019 +0100 msvcrt: Fix test failures on Windows 10. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/printf.c | 286 ++++++++++++++++++++++++--------------------- 1 file changed, 150 insertions(+), 136 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c2b6dcb08f63b18e6201…

1 0

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