October 2019 - Wine-devel - list.winehq.org

[PATCH] scrrun/tests: Make test_clone more descriptive.
by Gijs Vermeulen 09 Oct '19

09 Oct '19

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/scrrun/tests/filesystem.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 46d452f113..5f207ed37a 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -973,7 +973,7 @@ static void test_GetFolder(void) IFolder_Release(folder); } -static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) +static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, int line) { HRESULT hr; IEnumVARIANT *clone; @@ -981,34 +981,34 @@ static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) VARIANT var, var2; hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); VariantInit(&var); fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); /* clone enumerator */ hr = IEnumVARIANT_Clone(enumvar, &clone); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(clone != enumvar, "got %p, %p\n", enumvar, clone); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(clone != enumvar, "%d: got %p, %p\n", line, enumvar, clone); /* check if clone inherits position */ VariantInit(&var2); fetched = -1; hr = IEnumVARIANT_Next(clone, 1, &var2, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); if (!position_inherited) - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); else { fetched = -1; hr = IEnumVARIANT_Next(enumvar, 1, &var, &fetched); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(fetched == 1, "got %d\n", fetched); - todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "values don't match\n"); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); + ok(fetched == 1, "%d: got %d\n", line, fetched); + todo_wine ok(V_DISPATCH(&var) == V_DISPATCH(&var2), "%d: values don't match\n", line); } VariantClear(&var2); @@ -1016,8 +1016,9 @@ static void test_clone(IEnumVARIANT *enumvar, BOOL position_inherited) IEnumVARIANT_Release(clone); hr = IEnumVARIANT_Reset(enumvar); - ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "%d: got 0x%08x\n", line, hr); } +#define test_clone(a, b) _test_clone(a, b, __LINE__) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) -- 2.23.0

1 0

[PATCH v3] x3daudio: fix lib exports
by Rafał Mużyło 08 Oct '19

08 Oct '19

x3daudio: fix lib exports 1. in case of x3daudio1_{0,1,2}, two exported functions are for some reason decorated (though only on 32bit) 2. tests show these functions should be stdcall, not cdecl; more exactly, header for 1.1 shows that too (1.7 header shows that changed at some point) Signed-off-by: Rafał Mużyło <galtgendo(a)o2.pl>

4 6

Re: [PATCH v2] ddraw: implement Pick() and GetPickRecords().
by MattKC 08 Oct '19

08 Oct '19

Hello wine-devel, is there any news on the approval process for this patch?

1 0

Re: [PATCH v2] ddraw: implement Pick() and GetPickRecords().
by MattKC 08 Oct '19

08 Oct '19

Hi wine-devel, any updates on the approval process for this patch? On 8/20/19 6:35 AM, Marvin wrote: > Thank you for your contribution to Wine! > > This is an automated notification to let you know that your patch has > been reviewed and its status set to "Assigned". > > This means that the patch has been assigned to a reviewer. If the > reviewer signs off on the patch, it will be committed, otherwise > you'll receive advice on how to improve it. If you don't hear anything > after a couple of weeks, please resend the patch.

1 0

[PATCH 2/4] winegcc: Support -delayload on binutils mingw target.
by Jacek Caban 08 Oct '19

08 Oct '19

Emulate MSVC-style delayload by creating required delay importlibs from .def files on demand. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- tools/winegcc/utils.c | 12 ++++++++++++ tools/winegcc/utils.h | 1 + tools/winegcc/winegcc.c | 39 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 51 insertions(+), 1 deletion(-)

2 2

[PATCH 2/2] ieframe: Return S_OK/VARIANT_FALSE from InternetExplorer::get_Busy.
by Dmitry Timoshkov 08 Oct '19

08 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ie.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index 99ec88e7c3..696af66a62 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -349,7 +349,8 @@ static HRESULT WINAPI InternetExplorer_get_Busy(IWebBrowser2 *iface, VARIANT_BOO { InternetExplorer *This = impl_from_IWebBrowser2(iface); FIXME("(%p)->(%p)\n", This, pBool); - return E_NOTIMPL; + *pBool = VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI InternetExplorer_Quit(IWebBrowser2 *iface) -- 2.20.1

2 1

[PATCH 1/2] ieframe: Implement InternetExplorer typelib methods.
by Dmitry Timoshkov 08 Oct '19

08 Oct '19

These are copies of appropriate methods from webbrowser.c Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/ieframe/ie.c | 48 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/ieframe/ie.c b/dlls/ieframe/ie.c index d7e3aa150c..99ec88e7c3 100644 --- a/dlls/ieframe/ie.c +++ b/dlls/ieframe/ie.c @@ -103,16 +103,29 @@ static ULONG WINAPI InternetExplorer_Release(IWebBrowser2 *iface) static HRESULT WINAPI InternetExplorer_GetTypeInfoCount(IWebBrowser2 *iface, UINT *pctinfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, pctinfo); + + *pctinfo = 1; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetTypeInfo(IWebBrowser2 *iface, UINT iTInfo, LCID lcid, LPTYPEINFO *ppTInfo) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %d %p)\n", This, iTInfo, lcid, ppTInfo); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + ITypeInfo_AddRef(typeinfo); + *ppTInfo = typeinfo; + return S_OK; } static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID riid, @@ -120,9 +133,17 @@ static HRESULT WINAPI InternetExplorer_GetIDsOfNames(IWebBrowser2 *iface, REFIID LCID lcid, DISPID *rgDispId) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, - lcid, rgDispId); - return E_NOTIMPL; + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%s %p %d %d %p)\n", This, debugstr_guid(riid), rgszNames, cNames, + lcid, rgDispId); + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_GetIDsOfNames(typeinfo, rgszNames, cNames, rgDispId); } static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispIdMember, @@ -131,9 +152,18 @@ static HRESULT WINAPI InternetExplorer_Invoke(IWebBrowser2 *iface, DISPID dispId EXCEPINFO *pExepInfo, UINT *puArgErr) { InternetExplorer *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), + ITypeInfo *typeinfo; + HRESULT hres; + + TRACE("(%p)->(%d %s %d %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); - return E_NOTIMPL; + + hres = get_typeinfo(IWebBrowser2_tid, &typeinfo); + if(FAILED(hres)) + return hres; + + return ITypeInfo_Invoke(typeinfo, &This->IWebBrowser2_iface, dispIdMember, wFlags, pDispParams, + pVarResult, pExepInfo, puArgErr); } static HRESULT WINAPI InternetExplorer_GoBack(IWebBrowser2 *iface) -- 2.20.1

2 1

[PATCH 3/3] winex11.drv: Handle display device events in the desktop thread.
by Zhiyi Zhang 08 Oct '19

08 Oct '19

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> --- 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 5b0b062ff6..e351484e31 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -243,6 +243,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 4b5c5d479f..e73cdc62d3 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -741,10 +741,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 4933b6835f..0b9bfa2cd1 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1061,10 +1061,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 @@ -1113,16 +1132,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 } -- 2.23.0

1 0

[PATCH 1/3] winex11.drv: Use underscore style for struct x11drv_display_device_handler.
by Zhiyi Zhang 08 Oct '19

08 Oct '19

Now look back at the surrounding code, underscore style is more fitting. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/display.c | 16 ++++++++-------- dlls/winex11.drv/x11drv.h | 26 +++++++++++++------------- dlls/winex11.drv/xinerama.c | 12 ++++++------ dlls/winex11.drv/xrandr.c | 12 ++++++------ 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 107719a26f..6c4097a790 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -470,7 +470,7 @@ void X11DRV_DisplayDevices_Init(BOOL force) monitor_devinfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_MONITOR, NULL); /* Initialize GPUs */ - if (!handler.pGetGpus(&gpus, &gpu_count)) + if (!handler.get_gpus(&gpus, &gpu_count)) goto done; TRACE("GPU count: %d\n", gpu_count); @@ -480,13 +480,13 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; /* Initialize adapters */ - if (!handler.pGetAdapters(gpus[gpu].id, &adapters, &adapter_count)) + if (!handler.get_adapters(gpus[gpu].id, &adapters, &adapter_count)) goto done; TRACE("GPU: %#lx %s, adapter count: %d\n", gpus[gpu].id, wine_dbgstr_w(gpus[gpu].name), adapter_count); for (adapter = 0; adapter < adapter_count; adapter++) { - if (!handler.pGetMonitors(adapters[adapter].id, &monitors, &monitor_count)) + if (!handler.get_monitors(adapters[adapter].id, &monitors, &monitor_count)) goto done; TRACE("adapter: %#lx, monitor count: %d\n", adapters[adapter].id, monitor_count); @@ -502,12 +502,12 @@ void X11DRV_DisplayDevices_Init(BOOL force) goto done; } - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); monitors = NULL; video_index++; } - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); adapters = NULL; } @@ -522,9 +522,9 @@ done: ReleaseMutex(mutex); CloseHandle(mutex); if (gpus) - handler.pFreeGpus(gpus); + handler.free_gpus(gpus); if (adapters) - handler.pFreeAdapters(adapters); + handler.free_adapters(adapters); if (monitors) - handler.pFreeMonitors(monitors); + handler.free_monitors(monitors); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 135faa8989..4b5c5d479f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -713,34 +713,34 @@ struct x11drv_display_device_handler /* A name to tell what host driver is used */ const char *name; - /* Higher priority can override handlers with lower proprity */ + /* Higher priority can override handlers with lower priority */ INT priority; - /* pGetGpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. + /* get_gpus will be called to get a list of GPUs. First GPU has to be where the primary adapter is. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetGpus)(struct x11drv_gpu **gpus, int *count); + BOOL (*get_gpus)(struct x11drv_gpu **gpus, int *count); - /* pGetAdapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. + /* get_adapters will be called to get a list of adapters in EnumDisplayDevices context under a GPU. * The first adapter has to be primary if GPU is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetAdapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); + BOOL (*get_adapters)(ULONG_PTR gpu_id, struct x11drv_adapter **adapters, int *count); - /* pGetMonitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. + /* get_monitors will be called to get a list of monitors in EnumDisplayDevices context under an adapter. * The first monitor has to be primary if adapter is primary. * * Return FALSE on failure with parameters unchanged */ - BOOL (*pGetMonitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); + BOOL (*get_monitors)(ULONG_PTR adapter_id, struct x11drv_monitor **monitors, int *count); - /* pFreeGpus will be called to free a GPU list from pGetGpus */ - void (*pFreeGpus)(struct x11drv_gpu *gpus); + /* free_gpus will be called to free a GPU list from get_gpus */ + void (*free_gpus)(struct x11drv_gpu *gpus); - /* pFreeAdapters will be called to free an adapter list from pGetAdapters */ - void (*pFreeAdapters)(struct x11drv_adapter *adapters); + /* free_adapters will be called to free an adapter list from get_adapters */ + void (*free_adapters)(struct x11drv_adapter *adapters); - /* pFreeMonitors will be called to free a monitor list from pGetMonitors */ - void (*pFreeMonitors)(struct x11drv_monitor *monitors); + /* free_monitors will be called to free a monitor list from get_monitors */ + void (*free_monitors)(struct x11drv_monitor *monitors); }; extern void X11DRV_DisplayDevices_SetHandler(const struct x11drv_display_device_handler *handler) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/xinerama.c b/dlls/winex11.drv/xinerama.c index 61c422e835..b5620d3403 100644 --- a/dlls/winex11.drv/xinerama.c +++ b/dlls/winex11.drv/xinerama.c @@ -338,11 +338,11 @@ void xinerama_init( unsigned int width, unsigned int height ) handler.name = desktop_mode ? "Desktop" : "Xinerama"; handler.priority = desktop_mode ? 1000 : 100; - handler.pGetGpus = xinerama_get_gpus; - handler.pGetAdapters = xinerama_get_adapters; - handler.pGetMonitors = xinerama_get_monitors; - handler.pFreeGpus = xinerama_free_gpus; - handler.pFreeAdapters = xinerama_free_adapters; - handler.pFreeMonitors = xinerama_free_monitors; + handler.get_gpus = xinerama_get_gpus; + handler.get_adapters = xinerama_get_adapters; + handler.get_monitors = xinerama_get_monitors; + handler.free_gpus = xinerama_free_gpus; + handler.free_adapters = xinerama_free_adapters; + handler.free_monitors = xinerama_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); } diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 6bb2b18ce7..4933b6835f 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1107,12 +1107,12 @@ void X11DRV_XRandR_Init(void) { handler.name = "XRandR 1.4"; handler.priority = 200; - handler.pGetGpus = xrandr14_get_gpus; - handler.pFreeGpus = xrandr14_free_gpus; - handler.pGetAdapters = xrandr14_get_adapters; - handler.pFreeAdapters = xrandr14_free_adapters; - handler.pGetMonitors = xrandr14_get_monitors; - handler.pFreeMonitors = xrandr14_free_monitors; + handler.get_gpus = xrandr14_get_gpus; + handler.get_adapters = xrandr14_get_adapters; + handler.get_monitors = xrandr14_get_monitors; + handler.free_gpus = xrandr14_free_gpus; + handler.free_adapters = xrandr14_free_adapters; + handler.free_monitors = xrandr14_free_monitors; X11DRV_DisplayDevices_SetHandler( &handler ); pXRRSelectInput( thread_init_display(), root_window, -- 2.23.0

1 0

[v2 PATCH 1/4] mf/tests: Use separate session instance for events tests.
by Nikolay Sivov 08 Oct '19

08 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mf/tests/mf.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 2a5efc99e8..038bfeacd1 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -1041,8 +1041,6 @@ todo_wine IMFGetService_Release(gs); - test_session_events(session); - IMFMediaSession_Release(session); hr = MFCreateMediaSession(NULL, &session); @@ -1077,6 +1075,14 @@ todo_wine IMFAttributes_Release(attributes); + /* Basic events behavior. */ + hr = MFCreateMediaSession(NULL, &session); + ok(hr == S_OK, "Failed to create media session, hr %#x.\n", hr); + + test_session_events(session); + + IMFMediaSession_Release(session); + hr = MFShutdown(); ok(hr == S_OK, "Shutdown failure, hr %#x.\n", hr); } -- 2.23.0

2 5