December 2019 - Wine-Devel - list.winehq.org

Re: [PATCH] winhttp: Initialize a return variable.

by Hans Leidekker

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>

Dec. 24, 2019

[PATCH] winhttp: Initialize a return variable.

by Zhiyi Zhang

When getaddrinfo() failed in detect_autoproxyconfig_url_dns(), an undefined variable is passed to WinHttpDetectAutoProxyConfigUrl(), causing applications to receive a wrong url. This is a regression from 4ad4173e3a715d5bd27bedc164718cef9cafe0a4. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48349 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- This fixes Steam not displaying anything. dlls/winhttp/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 22aa285a44..e647d71faf 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1427,7 +1427,7 @@ static WCHAR *build_wpad_url( const char *hostname, const struct addrinfo *ai ) static WCHAR *detect_autoproxyconfig_url_dns(void) { char *fqdn, *domain, *p; - WCHAR *ret; + WCHAR *ret = NULL; if (!(fqdn = get_computer_name( ComputerNamePhysicalDnsFullyQualified ))) return NULL; if (!(domain = get_computer_name( ComputerNamePhysicalDnsDomain ))) -- 2.24.0

Dec. 24, 2019

Re: [PATCH] user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62500 Your paranoid android. === w2003std (task log) === Task errors: The task timed out === w8 (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w8adm (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w864 (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809 (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809_2scr (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809_ar (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809_he (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809_ja (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1 === w1064v1809_zh_CN (32 bit report) === user32: sysparams.c:2514: Test failed: Waiting for the WM_DISPLAYCHANGE message timed out sysparams.c:2525: Test failed: Set bpp 32, but WM_DISPLAYCHANGE reported bpp -1

Dec. 24, 2019

[PATCH] user32/tests: Mark some GetDeviceCaps() tests as todo on Wine.

by Zhiyi Zhang

GetDeviceCaps(hdc, DESKTOPHORZRES/DESKTOPVERTRES) on Windows reports the primary desktop, but on Wine it reports the virtual screen. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/user32/tests/sysparams.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 645c188008..e40d49e8f8 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3267,6 +3267,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu: wrong caps desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu: wrong caps virt desktop rect %s expected %s\n", i, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); DeleteDC( hdc ); @@ -3345,6 +3346,7 @@ static void test_dpi_mapping(void) ok( EqualRect( &expect, &rect ), "%lu/%lu: wrong DC resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&expect) ); SetRect( &rect, 0, 0, GetDeviceCaps( hdc, DESKTOPHORZRES ), GetDeviceCaps( hdc, DESKTOPVERTRES )); + todo_wine_if(monitor_count > 1) ok( EqualRect( &desktop, &rect ), "%lu/%lu: wrong desktop resolution %s expected %s\n", i, j, wine_dbgstr_rect(&rect), wine_dbgstr_rect(&desktop) ); ReleaseDC( hwnd, hdc ); -- 2.24.0

Dec. 24, 2019

[PATCH] configure: Update Xinerama and XRandR extension help strings.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 88965115d7..5e36331596 100644 --- a/configure.ac +++ b/configure.ac @@ -92,14 +92,14 @@ AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcurso [if test "x$withval" = "xno"; then ac_cv_header_X11_Xcursor_Xcursor_h=no; fi]) AC_ARG_WITH(xfixes, AS_HELP_STRING([--without-xfixes],[do not use Xfixes for clipboard change notifications]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xfixes_h=no; fi]) -AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (multi-monitor support)]), +AC_ARG_WITH(xinerama, AS_HELP_STRING([--without-xinerama],[do not use Xinerama (legacy multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xinerama_h=no; fi]) AC_ARG_WITH(xinput, AS_HELP_STRING([--without-xinput],[do not use the Xinput extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput_h=no; fi]) AC_ARG_WITH(xinput2, AS_HELP_STRING([--without-xinput2],[do not use the Xinput 2 extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XInput2_h=no; fi]) AC_ARG_WITH(xml, AS_HELP_STRING([--without-xml],[do not use XML])) -AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (resolution changes)]), +AC_ARG_WITH(xrandr, AS_HELP_STRING([--without-xrandr],[do not use Xrandr (multi-monitor support)]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrandr_h=no; fi]) AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrender extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) -- 2.24.0

Dec. 24, 2019

Re: [PATCH] ole32/tests: Avoid testing exact sequences of IUnknown methods.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62498 Your paranoid android. === w1064v1809 (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809_2scr (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809_ar (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809_he (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809_ja (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809_zh_CN (32 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 === w1064v1809 (64 bit report) === ole32: ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64 ole2.c:163: Test failed: got cf 000e vs 0003 ole2.c:169: Test failed: got tymed 64 vs 32 ole2.c:163: Test failed: got cf 0003 vs 000e ole2.c:169: Test failed: got tymed 32 vs 64

Dec. 24, 2019

[PATCH] ole32/tests: Avoid testing exact sequences of IUnknown methods.

by Zebediah Figura

Instead, just test that AddRef()/Release() come in balanced pairs by keeping track of the reference count. This fixes test failures with recent Windows 10. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/tests/ole2.c | 174 ++++++---------------------------------- 1 file changed, 23 insertions(+), 151 deletions(-) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b71a103dbc..6be187497d 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -99,7 +99,6 @@ static const IID IID_WineTest = {0xbc, 0x13, 0x51, 0x6e, 0x92, 0x39, 0xac, 0xe1} }; -#define TEST_OPTIONAL 0x1 #define TEST_TODO 0x2 struct expected_method @@ -152,16 +151,8 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM { trace("%s\n", method_name); ok(expected_method_list->method != NULL, "Extra method %s called\n", method_name); - if (!strcmp(expected_method_list->method, "WINE_EXTRA")) - { - todo_wine ok(0, "Too many method calls.\n"); - return; - } if (expected_method_list->method) { - while (expected_method_list->flags & TEST_OPTIONAL && - strcmp(expected_method_list->method, method_name) != 0) - expected_method_list++; todo_wine_if (expected_method_list->flags & TEST_TODO) { ok(!strcmp(expected_method_list->method, method_name), @@ -188,8 +179,6 @@ static void inline check_expected_method_fmt(const char *method_name, const FORM #define CHECK_NO_EXTRA_METHODS() \ do { \ - while (expected_method_list->flags & TEST_OPTIONAL) \ - expected_method_list++; \ ok(!expected_method_list->method, "Method sequence starting from %s not called\n", expected_method_list->method); \ } while (0) @@ -266,10 +255,10 @@ static void create_text(STGMEDIUM *med) med->pUnkForRelease = NULL; } +static LONG ole_object_refcount; + static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, void **ppv) { - CHECK_EXPECTED_METHOD("OleObject_QueryInterface"); - *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IOleObject)) @@ -294,14 +283,12 @@ static HRESULT WINAPI OleObject_QueryInterface(IOleObject *iface, REFIID riid, v static ULONG WINAPI OleObject_AddRef(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_AddRef"); - return 2; + return InterlockedIncrement(&ole_object_refcount); } static ULONG WINAPI OleObject_Release(IOleObject *iface) { - CHECK_EXPECTED_METHOD("OleObject_Release"); - return 1; + return InterlockedDecrement(&ole_object_refcount); } static HRESULT WINAPI OleObject_SetClientSite @@ -573,20 +560,17 @@ static IOleObject OleObject = { &OleObjectVtbl }; static HRESULT WINAPI OleObjectPersistStg_QueryInterface(IPersistStorage *iface, REFIID riid, void **ppv) { - trace("OleObjectPersistStg_QueryInterface\n"); return IOleObject_QueryInterface(&OleObject, riid, ppv); } static ULONG WINAPI OleObjectPersistStg_AddRef(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectPersistStg_Release(IPersistStorage *iface) { - CHECK_EXPECTED_METHOD("OleObjectPersistStg_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectPersistStg_GetClassId(IPersistStorage *iface, CLSID *clsid) @@ -677,14 +661,12 @@ static HRESULT WINAPI OleObjectCache_QueryInterface(IOleCache *iface, REFIID rii static ULONG WINAPI OleObjectCache_AddRef(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectCache_Release(IOleCache *iface) { - CHECK_EXPECTED_METHOD("OleObjectCache_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectCache_Cache @@ -824,14 +806,12 @@ static HRESULT WINAPI OleObjectRunnable_QueryInterface(IRunnableObject *iface, R static ULONG WINAPI OleObjectRunnable_AddRef(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_AddRef"); - return 2; + return IOleObject_AddRef(&OleObject); } static ULONG WINAPI OleObjectRunnable_Release(IRunnableObject *iface) { - CHECK_EXPECTED_METHOD("OleObjectRunnable_Release"); - return 1; + return IOleObject_Release(&OleObject); } static HRESULT WINAPI OleObjectRunnable_GetRunningClass( @@ -974,143 +954,49 @@ static void test_OleCreate(IStorage *pStorage) FORMATETC formatetc; static const struct expected_method methods_olerender_none[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL }, - { "OleObject_Release", TEST_OPTIONAL }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_with_site[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_format[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_olerender_asis[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; static const struct expected_method methods_olerender_draw_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectCache_AddRef", 0 }, { "OleObjectCache_Cache", 0 }, - { "OleObjectCache_Release", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 }, }; static const struct expected_method methods_olerender_draw_no_cache[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, - { "OleObject_QueryInterface", TEST_OPTIONAL /* NT4 only */ }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_InitNew", 0 }, - { "OleObjectPersistStg_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_Run", 0 }, - { "OleObjectRunnable_Release", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_Release", TEST_OPTIONAL /* NT4 only */ }, { NULL, 0 } }; @@ -1128,6 +1014,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw; trace("OleCreate with OLERENDER_DRAW:\n"); @@ -1135,6 +1022,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_draw_with_site; trace("OleCreate with OLERENDER_DRAW, with site:\n"); @@ -1142,6 +1030,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); /* GetMiscStatus fails */ g_GetMiscStatusFailsWith = 0x8fafefaf; @@ -1151,6 +1040,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; formatetc.cfFormat = CF_TEXT; @@ -1169,6 +1059,7 @@ static void test_OleCreate(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); expected_method_list = methods_olerender_asis; trace("OleCreate with OLERENDER_ASIS:\n"); @@ -1176,6 +1067,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); formatetc.cfFormat = 0; formatetc.tymed = TYMED_NULL; @@ -1195,6 +1087,7 @@ static void test_OleCreate(IStorage *pStorage) ok_ole_success(hr, "OleCreate"); IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); trace("end\n"); g_expected_fetc = NULL; } @@ -1207,20 +1100,10 @@ static void test_OleLoad(IStorage *pStorage) static const struct expected_method methods_oleload[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObjectPersistStg_AddRef", 0 }, { "OleObjectPersistStg_Load", 0 }, - { "OleObjectPersistStg_Release", 0 }, { "OleObject_SetClientSite", 0 }, - { "OleObject_Release", 0 }, - { "OleObject_QueryInterface", 0 }, { "OleObject_GetMiscStatus", 0 }, - { "OleObject_Release", 0 }, { NULL, 0 } }; @@ -1242,6 +1125,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_GetMiscStatusFailsWith = S_OK; /* Test again, let IOleObject_GetMiscStatus succeed. */ @@ -1261,6 +1145,7 @@ static void test_OleLoad(IStorage *pStorage) IOleObject_Release(pObject); CHECK_NO_EXTRA_METHODS(); } + ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); for (fmt = CF_TEXT; fmt < CF_MAX; fmt++) { @@ -1447,8 +1332,6 @@ static HRESULT WINAPI DataObject_QueryInterface( REFIID riid, void** ppvObject) { - CHECK_EXPECTED_METHOD("DataObject_QueryInterface"); - if (IsEqualIID(riid, &IID_IDataObject) || IsEqualIID(riid, &IID_IUnknown)) { *ppvObject = iface; @@ -1461,14 +1344,12 @@ static HRESULT WINAPI DataObject_QueryInterface( static ULONG WINAPI DataObject_AddRef( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_AddRef"); return 2; } static ULONG WINAPI DataObject_Release( IDataObject* iface) { - CHECK_EXPECTED_METHOD("DataObject_Release"); return 1; } @@ -2962,15 +2843,6 @@ static void test_default_handler(void) static const struct expected_method methods_embeddinghelper[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObject_AddRef", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_TODO }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", 0 }, - { "OleObject_QueryInterface", TEST_OPTIONAL }, /* Win95/98/NT4 */ - { "OleObject_Release", TEST_TODO }, - { "WINE_EXTRA", TEST_OPTIONAL }, { NULL, 0 } }; @@ -3138,6 +3010,7 @@ static void test_default_handler(void) } CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); hr = CoRevokeClassObject(dwRegister); ok_ole_success(hr, "CoRevokeClassObject"); @@ -3148,16 +3021,12 @@ static void test_runnable(void) { static const struct expected_method methods_query_runnable[] = { - { "OleObject_QueryInterface", 0 }, - { "OleObjectRunnable_AddRef", 0 }, { "OleObjectRunnable_IsRunning", 0 }, - { "OleObjectRunnable_Release", 0 }, { NULL, 0 } }; static const struct expected_method methods_no_runnable[] = { - { "OleObject_QueryInterface", 0 }, { NULL, 0 } }; @@ -3172,18 +3041,21 @@ static void test_runnable(void) ret = OleIsRunning(object); ok(ret == TRUE, "Object should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = FALSE; expected_method_list = methods_query_runnable; ret = OleIsRunning(object); ok(ret == FALSE, "Object should not be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ expected_method_list = methods_no_runnable; ret = OleIsRunning(object); ok(ret == TRUE, "Object without IRunnableObject should be running\n"); CHECK_NO_EXTRA_METHODS(); + todo_wine ok(!ole_object_refcount, "Got outstanding refcount %d.\n", ole_object_refcount); g_isRunning = TRUE; g_showRunnable = TRUE; -- 2.24.1

Dec. 24, 2019

[PATCH] include: Update DWRITE_FONT_PROPERTY_ID enum.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/dwrite_3.idl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/dwrite_3.idl b/include/dwrite_3.idl index f7cb97dff6..54d204f39f 100644 --- a/include/dwrite_3.idl +++ b/include/dwrite_3.idl @@ -53,9 +53,9 @@ typedef enum DWRITE_RENDERING_MODE1 typedef enum DWRITE_FONT_PROPERTY_ID { DWRITE_FONT_PROPERTY_ID_NONE, - DWRITE_FONT_PROPERTY_ID_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME, - DWRITE_FONT_PROPERTY_ID_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, DWRITE_FONT_PROPERTY_ID_FULL_NAME, DWRITE_FONT_PROPERTY_ID_WIN32_FAMILY_NAME, DWRITE_FONT_PROPERTY_ID_POSTSCRIPT_NAME, @@ -65,7 +65,12 @@ typedef enum DWRITE_FONT_PROPERTY_ID DWRITE_FONT_PROPERTY_ID_WEIGHT, DWRITE_FONT_PROPERTY_ID_STRETCH, DWRITE_FONT_PROPERTY_ID_STYLE, - DWRITE_FONT_PROPERTY_ID_TOTAL + DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME, + DWRITE_FONT_PROPERTY_ID_TOTAL = DWRITE_FONT_PROPERTY_ID_STYLE + 1, + DWRITE_FONT_PROPERTY_ID_TOTAL_RS3 = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FACE_NAME + 1, + DWRITE_FONT_PROPERTY_ID_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_TYPOGRAPHIC_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_PREFERRED_FAMILY_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FAMILY_NAME, + DWRITE_FONT_PROPERTY_ID_FACE_NAME = DWRITE_FONT_PROPERTY_ID_WEIGHT_STRETCH_STYLE_FACE_NAME, } DWRITE_FONT_PROPERTY_ID; typedef struct DWRITE_FONT_PROPERTY -- 2.24.0

Dec. 23, 2019

Re: Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Michael Cronenworth

On 12/23/19 12:21 PM, Jacek Caban wrote: > > That was from my import, I missed the fact that it's too new to be in Git. You may > just fetch and cherry-pick this commit from here: > > https://github.com/mozilla/gecko-dev/commit/4262e28d067edd239f96cb75a8280b9… Pip 8.1.1 is still using the deprecated call. ... 0:03.19$<2> File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/python/virtualenv/virtualenv_support/pip-8.1.1-py2.py3-none-any.whl/pip/download.py", line 93, in user_agent 0:03.19$<2> zip(["name", "version", "id"], platform.linux_distribution()), 0:03.19$<2> AttributeError: module 'platform' has no attribute 'linux_distribution'

Dec. 23, 2019

Re: Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Jacek Caban

On 12/23/19 7:12 PM, Michael Cronenworth wrote: > On 12/23/19 10:47 AM, Jacek Caban wrote: >> Does it help if you cherry-pick commit 8812ca17fd5c720fc? > > I can't find that commit. Are you still using sourceforge? That was from my import, I missed the fact that it's too new to be in Git. You may just fetch and cherry-pick this commit from here: https://github.com/mozilla/gecko-dev/commit/4262e28d067edd239f96cb75a8280b9… Thanks, Jacek

Dec. 23, 2019

Re: Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Michael Cronenworth

On 12/23/19 10:47 AM, Jacek Caban wrote: > Does it help if you cherry-pick commit 8812ca17fd5c720fc? I can't find that commit. Are you still using sourceforge?

Dec. 23, 2019

Re: Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Jacek Caban

On 12/20/19 6:05 PM, Michael Cronenworth wrote: > On 12/20/19 10:51 AM, Jacek Caban wrote: >> Let's not do that. Does the attached patch help? git grep suggests >> that that may be a few more usages in the tree, but most of them may >> not be relevant to our builds. > > It does help get past that usage of dist() but there are other uses of > it further on. > > ... > 0:03.26$<2> File > "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/python/virtualenv/virtualenv_support/pip-8.0.2-py2.py3-none-any.whl/pip/download.py", > line 92, in user_agent > 0:03.26$<2> zip(["name", "version", "id"], > platform.linux_distribution()), > 0:03.26$<2> AttributeError: module 'platform' has no attribute > 'linux_distribution' > > Being inside of a zipped file I'm not sure the best way to patch that > one. :( Does it help if you cherry-pick commit 8812ca17fd5c720fc? Thanks, Jacek

Dec. 23, 2019

[PATCH v2 5/5] msvcrt: Add compatibility _set_invalid_parameter_handler importlib implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcr70/Makefile.in | 1 + dlls/msvcr71/Makefile.in | 1 + dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/invalid_parameter.c | 38 +++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 5 files changed, 42 insertions(+) create mode 100644 dlls/msvcrt/invalid_parameter.c

Dec. 23, 2019

[PATCH v2 4/5] msvcrt: Add compatibility __p__wcmdln importlib implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/wcmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/wcmdln.c

Dec. 23, 2019

[PATCH v2 3/5] msvcrt: Add compatibility __p__acmdln importlib implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/acmdln.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/acmdln.c

Dec. 23, 2019

[PATCH v2 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/Makefile.in | 1 + dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ dlls/msvcrtd/Makefile.in | 1 + 3 files changed, 41 insertions(+) create mode 100644 dlls/msvcrt/fmode.c

Dec. 23, 2019

[PATCH v2 1/5] msvcrt: Introduce IMPORT_SYMBOL helper macro.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 8 ++++++++ 2 files changed, 10 insertions(+), 6 deletions(-)

Dec. 23, 2019

[PATCH v2] winegstreamer: Recognize the "video/x-cinepak" type.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: remove an unused variable dlls/winegstreamer/gstdemux.c | 41 ++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..e67efd58eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -853,12 +888,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

Dec. 23, 2019

Re: [PATCH 2/5] msvcrt: Provide compatibility __p__fmode importlib implementation.

by Jacek Caban

On 12/20/19 9:41 PM, Martin Storsjö wrote: > On Fri, 20 Dec 2019, Jacek Caban wrote: > >> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> >> --- >> dlls/msvcrt/Makefile.in | 1 + >> dlls/msvcrt/fmode.c | 39 +++++++++++++++++++++++++++++++++++++++ >> dlls/msvcrtd/Makefile.in | 1 + >> 3 files changed, 41 insertions(+) >> create mode 100644 dlls/msvcrt/fmode.c > >> diff --git a/dlls/msvcrt/Makefile.in b/dlls/msvcrt/Makefile.in >> index d0237fd891..9a6e4fd476 100644 >> --- a/dlls/msvcrt/Makefile.in >> +++ b/dlls/msvcrt/Makefile.in >> @@ -18,6 +18,7 @@ C_SRCS = \ >> except_x86_64.c \ >> exit.c \ >> file.c \ >> + fmode.c \ >> heap.c \ >> iob.c \ >> locale.c \ >> diff --git a/dlls/msvcrt/fmode.c b/dlls/msvcrt/fmode.c >> new file mode 100644 >> index 0000000000..a4e80a5082 >> --- /dev/null >> +++ b/dlls/msvcrt/fmode.c >> @@ -0,0 +1,39 @@ >> +/* >> + * Copyright 2019 Jacek Caban for CodeWeavers >> + * >> + * This library is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU Lesser General Public >> + * License as published by the Free Software Foundation; either >> + * version 2.1 of the License, or (at your option) any later version. >> + * >> + * This library is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU >> + * Lesser General Public License for more details. >> + * >> + * You should have received a copy of the GNU Lesser General Public >> + * License along with this library; if not, write to the Free Software >> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA >> 02110-1301, USA >> + */ >> + >> +/* this function is part of the import lib for compatibility with >> ucrt runtime */ >> +#if 0 >> +#pragma makedep implib >> +#endif >> + >> +#if defined(__MINGW32__) && defined(_WIN64) > > This arch specific code made me look into this detail, and it looks > like wine's msvcrt.spec has got it slightly wrong. > > The current file has got this: > @ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode > > While mingw-w64's def files only provides this function for i386, not > for armv7. I checked with an actual arm32 msvcrt.dll, and that matches > mingw-w64's def file, i.e. __p__fmode only exists on i386. Thanks for looking at this. I will send updated patches. Jacek

Dec. 23, 2019

Re: msvcrt:scanf float conversion behavior

by Jacek Caban

Hi Erich, On 12/23/19 3:52 PM, Erich E. Hoover wrote: > I am trying to resolve places where "long double" is being used to > compute the value of a floating point number and I am currently > looking at resolving this issue in the scanf family of functions. I'm > not the hugest fan of having duplicated code running around, so I'm > wondering if anyone knows why scanf float behavior isn't implemented > using [str|wcs]tod (or possibly the other way around). So, does > anyone know why this is the case? Would a patch be accepted that > consolidates these instances? I heard that Piotr was looking at this before leaving for vacations. I don't know how far he got. He will be back later this week and it may be good to coordinate with him. Jacek

Dec. 23, 2019

msvcrt:scanf float conversion behavior

by Erich E. Hoover

I am trying to resolve places where "long double" is being used to compute the value of a floating point number and I am currently looking at resolving this issue in the scanf family of functions. I'm not the hugest fan of having duplicated code running around, so I'm wondering if anyone knows why scanf float behavior isn't implemented using [str|wcs]tod (or possibly the other way around). So, does anyone know why this is the case? Would a patch be accepted that consolidates these instances? Best, Erich

Dec. 23, 2019

[PATCH] msvcrt: Fix [str|wcs]tod result being compared against FLT_MAX.

by Erich E. Hoover

Apparently cl.exe treats floats as doubles and compares them against FLT_MAX before converting them (see Bug #48324). It would be really nice if people didn't use constants that are more precise than the number format actually supports... Best, Erich

Dec. 23, 2019

Re: [PATCH 2/2] winex11.drv: Send HTMENU instead of HTCAPTION to query window activation.

by Rémi Bernon

On 12/23/19 1:51 PM, Rémi Bernon wrote: > Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way > WM_TAKE_FOCUS protocol is implemented: WM_MOUSEACTIVATE now replies > MA_NOACTIVATE by default when using HTCAPTION. > > We use the WM_MOUSEACTIVATE -although Windows does not- regardless of > the way focus is changed to check whether a window wants focus, and > Windows sometimes changes focus regardless of the message reply. > > Steam and the Wine system tray are affected for instance. > > Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> > --- > > With the previous patch, it's also possible to revert > 71d35d8940118bc6de6522913fb8c473fa5b2c24, but the WM_MOUSEACTIVATE reply > it changes is indeed correct. > > dlls/winex11.drv/event.c | 2 +- > dlls/winex11.drv/window.c | 2 +- > dlls/winex11.drv/x11drv.h | 1 + > 3 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c > index 2649d561a6b..957d7c5efdf 100644 > --- a/dlls/winex11.drv/event.c > +++ b/dlls/winex11.drv/event.c > @@ -714,7 +714,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) > * whether the window wants to be activated */ > LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, > (WPARAM)GetAncestor( hwnd, GA_ROOT ), > - MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); > + MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); > if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) > { > set_focus( event->display, hwnd, event_time, event->serial ); > diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c > index 99e4094ebd9..89ea42b7567 100644 > --- a/dlls/winex11.drv/window.c > +++ b/dlls/winex11.drv/window.c > @@ -169,7 +169,7 @@ struct has_popup_result > BOOL found; > }; > > -static BOOL is_managed( HWND hwnd ) > +BOOL is_managed( HWND hwnd ) > { > struct x11drv_win_data *data = get_win_data( hwnd ); > BOOL ret = data && data->managed; > diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h > index e9b827c7e9a..0e55e5115f8 100644 > --- a/dlls/winex11.drv/x11drv.h > +++ b/dlls/winex11.drv/x11drv.h > @@ -607,6 +607,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL > extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; > extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; > extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; > +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; > > static inline void mirror_rect( const RECT *window_rect, RECT *rect ) > { > I forgot to cleanup the rest of the patch, sorry about that. -- Rémi Bernon <rbernon(a)codeweavers.com>

Dec. 23, 2019

[PATCH 2/2] winex11.drv: Send HTMENU instead of HTCAPTION to query window activation.

by Rémi Bernon

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented: WM_MOUSEACTIVATE now replies MA_NOACTIVATE by default when using HTCAPTION. We use the WM_MOUSEACTIVATE -although Windows does not- regardless of the way focus is changed to check whether a window wants focus, and Windows sometimes changes focus regardless of the message reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- With the previous patch, it's also possible to revert 71d35d8940118bc6de6522913fb8c473fa5b2c24, but the WM_MOUSEACTIVATE reply it changes is indeed correct. dlls/winex11.drv/event.c | 2 +- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 2649d561a6b..957d7c5efdf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -714,7 +714,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) * whether the window wants to be activated */ LRESULT ma = SendMessageW( hwnd, WM_MOUSEACTIVATE, (WPARAM)GetAncestor( hwnd, GA_ROOT ), - MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); + MAKELONG( HTMENU, WM_LBUTTONDOWN ) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { set_focus( event->display, hwnd, event_time, event->serial ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..89ea42b7567 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -169,7 +169,7 @@ struct has_popup_result BOOL found; }; -static BOOL is_managed( HWND hwnd ) +BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); BOOL ret = data && data->managed; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e9b827c7e9a..0e55e5115f8 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -607,6 +607,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { -- 2.24.1

Dec. 23, 2019

[PATCH 1/2] winex11.drv: Don't set the foreground for focus events that are older than the last SetFocus sent without an event.

by Rémi Bernon

From: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> When creating a visible window, the focus and the respective messages are immediately sent to the created window to match Windows behavior. However, the X11 server also sends either FocusIn events or the WM sends ClientMessages with the WM_TAKE_FOCUS atom (by default) if the windows are managed, since it received focus. If the application didn't have a message loop up to process these events, they will remain in the queue. If only one window is created, this is not a problem because the focus set manually and the focus set when processing the events will be the same and no message is sent. However, if 2 or more windows are created before the message loop, when these events are later processed by the app's message loop, they will change the focus and send the messages again, even though we've already done so earlier, which confuses some apps at this point. One example is Heroes of Might and Magic 5. See comment #11 on https://bugs.winehq.org/show_bug.cgi?id=39742#c11 -- `When "Full screen" active game starts and then shows desktop but it is not exited and after a few times switching game/desktop it shows game screen and it is playable` Related Proton bug: https://github.com/ValveSoftware/Proton/issues/2401 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47945 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I believe this is the correct fix to the failing dinput mouse test. The test fails because the focus is changed back to the second window after it's been created, when the WM_TAKE_FOCUS event actually arrives: as we do not wait for the X11 focus to be set on CreateWindow, it can create an additional and unexpected focus change later on. dlls/winex11.drv/event.c | 48 ++++++++++++++++++++++++++++++++------- dlls/winex11.drv/x11drv.h | 2 ++ 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..2649d561a6b 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -594,14 +594,22 @@ static void set_input_focus( struct x11drv_win_data *data ) /********************************************************************** * set_focus */ -static void set_focus( Display *display, HWND hwnd, Time time ) +static void set_focus( Display *display, HWND hwnd, Time time, unsigned long serial ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); HWND focus; Window win; GUITHREADINFO threadinfo; - TRACE( "setting foreground window to %p\n", hwnd ); - SetForegroundWindow( hwnd ); + if ((long)(thread_data->setfocus_serial - serial) > 0) + { + TRACE( "ignoring old serial %lu/%lu\n", serial, thread_data->setfocus_serial ); + } + else + { + TRACE( "setting foreground window to %p\n", hwnd ); + SetForegroundWindow( hwnd ); + } threadinfo.cbSize = sizeof(threadinfo); GetGUIThreadInfo(0, &threadinfo); @@ -709,7 +717,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) MAKELONG(HTCAPTION,WM_LBUTTONDOWN) ); if (ma != MA_NOACTIVATEANDEAT && ma != MA_NOACTIVATE) { - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } } @@ -718,7 +726,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd = GetForegroundWindow(); if (!hwnd) hwnd = last_focus; if (!hwnd) hwnd = GetDesktopWindow(); - set_focus( event->display, hwnd, event_time ); + set_focus( event->display, hwnd, event_time, event->serial ); return; } /* try to find some other window to give the focus to */ @@ -726,7 +734,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, event_time, event->serial ); } else if (protocol == x11drv_atom(_NET_WM_PING)) { @@ -806,9 +814,17 @@ static BOOL X11DRV_FocusIn( HWND hwnd, XEvent *xev ) if (hwnd) hwnd = GetAncestor( hwnd, GA_ROOT ); if (!hwnd) hwnd = GetActiveWindow(); if (!hwnd) hwnd = x11drv_thread_data()->last_focus; - if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime ); + if (hwnd && can_activate_window(hwnd)) set_focus( event->display, hwnd, CurrentTime, event->serial ); + } + else + { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); + + if ((long)(thread_data->setfocus_serial - event->serial) > 0) + TRACE("ignoring old serial %lu/%lu\n", event->serial, thread_data->setfocus_serial); + else + SetForegroundWindow( hwnd ); } - else SetForegroundWindow( hwnd ); return TRUE; } @@ -1426,6 +1442,7 @@ void wait_for_withdrawn_state( HWND hwnd, BOOL set ) */ void CDECL X11DRV_SetFocus( HWND hwnd ) { + struct x11drv_thread_data *thread_data = x11drv_thread_data(); struct x11drv_win_data *data; HWND parent; @@ -1441,6 +1458,21 @@ void CDECL X11DRV_SetFocus( HWND hwnd ) } if (!data->managed || data->embedder) set_input_focus( data ); release_win_data( data ); + + hwnd = GetAncestor(hwnd, GA_ROOT); + if (hwnd != thread_data->setfocus_hwnd) + { + thread_data->setfocus_hwnd = hwnd; + + /* If we are not processing an event, store the current serial so that + we ignore all older focus-related events. This prevents the focus + from being reverted later when the app processes its messages. */ + if (!thread_data->current_event) + { + thread_data->setfocus_serial = NextRequest(thread_data->display); + XNoOp(thread_data->display); + } + } } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..e9b827c7e9a 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -333,6 +333,8 @@ struct x11drv_thread_data HWND last_xic_hwnd; /* last xic window */ XFontSet font_set; /* international text drawing font set */ Window selection_wnd; /* window used for selection interactions */ + HWND setfocus_hwnd; /* top-level window corresponding to the last SetFocus */ + unsigned long setfocus_serial; /* serial number when last SetFocus without an event happened */ unsigned long warp_serial; /* serial number of last pointer warp request */ Window clip_window; /* window used for cursor clipping */ HWND clip_hwnd; /* message window stored in desktop while clipping is active */ -- 2.24.1

Dec. 23, 2019

Re: [PATCH] winex11.drv: Always set focus to managed window when requested.

by Alexandre Julliard

Rémi Bernon <rbernon(a)codeweavers.com> writes: > @@ -700,7 +700,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) > hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), > GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); > > - if (can_activate_window(hwnd)) > + if (is_managed(hwnd)) > + { > + set_focus( event->display, hwnd, event_time ); > + return; > + } > + else if (can_activate_window(hwnd)) This will completely break the take focus mechanism. The complicated heuristic to find an appropriate window is very much necessary, you can't just give focus to the window suggested by the window manager. For instance, a disabled window should never receive focus. -- Alexandre Julliard julliard(a)winehq.org

Dec. 23, 2019

Re: [PATCH] winex11.drv: Always set focus to managed window when requested.

by Alistair Leslie-Hughes

Hi Rémi, On 23/12/19 9:12 pm, Rémi Bernon wrote: > Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way > I can modify the test if that's what we want to do, but I'm assuming the > test was moving the cursor over the original window on purpose. No, modify the tests is just hiding the actual behavior of windows. I have a feeling there are applications that rely on this, maybe bug 40045 but still needs more investigation. The tests where always failing under wine but never showed up until the return values were actually checked. Regards Alistair.

Dec. 23, 2019

[PATCH 3/3] ole32/tests: Add some tests for item moniker ParseDisplayName().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 99 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 1daf46ce5d..9a61be4f47 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -252,6 +252,7 @@ struct test_moniker IMoniker IMoniker_iface; IROTData IROTData_iface; IOleItemContainer IOleItemContainer_iface; + IParseDisplayName IParseDisplayName_iface; LONG refcount; BOOL no_IROTData; @@ -272,6 +273,51 @@ static struct test_moniker *impl_from_IOleItemContainer(IOleItemContainer *iface return CONTAINING_RECORD(iface, struct test_moniker, IOleItemContainer_iface); } +static struct test_moniker *impl_from_IParseDisplayName(IParseDisplayName *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IParseDisplayName_iface); +} + +static HRESULT WINAPI test_moniker_parse_QueryInterface(IParseDisplayName *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IParseDisplayName)) + { + *obj = iface; + IParseDisplayName_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_moniker_parse_AddRef(IParseDisplayName *iface) +{ + struct test_moniker *moniker = impl_from_IParseDisplayName(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI test_moniker_parse_Release(IParseDisplayName *iface) +{ + struct test_moniker *moniker = impl_from_IParseDisplayName(iface); + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI test_moniker_parse_ParseDisplayName(IParseDisplayName *iface, + IBindCtx *pbc, LPOLESTR displayname, ULONG *eaten, IMoniker **out) +{ + return E_NOTIMPL; +} + +static const IParseDisplayNameVtbl test_moniker_parse_vtbl = +{ + test_moniker_parse_QueryInterface, + test_moniker_parse_AddRef, + test_moniker_parse_Release, + test_moniker_parse_ParseDisplayName, +}; + static HRESULT WINAPI test_item_container_QueryInterface(IOleItemContainer *iface, REFIID riid, void **obj) { if (IsEqualIID(riid, &IID_IOleItemContainer) || @@ -314,12 +360,20 @@ static HRESULT WINAPI test_item_container_EnumObjects(IOleItemContainer *iface, static HRESULT WINAPI test_item_container_LockContainer(IOleItemContainer *iface, BOOL lock) { - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI test_item_container_GetObject(IOleItemContainer *iface, LPOLESTR item, DWORD bind_speed, IBindCtx *pbc, REFIID riid, void **obj) { + struct test_moniker *moniker = impl_from_IOleItemContainer(iface); + + if (IsEqualIID(riid, &IID_IParseDisplayName)) + { + *obj = &moniker->IParseDisplayName_iface; + IOleItemContainer_AddRef(iface); + } + return 0x8bee0000 | bind_speed; } @@ -658,6 +712,7 @@ static struct test_moniker *create_test_moniker(void) obj->IMoniker_iface.lpVtbl = &MonikerVtbl; obj->IROTData_iface.lpVtbl = &ROTDataVtbl; obj->IOleItemContainer_iface.lpVtbl = &test_item_container_vtbl; + obj->IParseDisplayName_iface.lpVtbl = &test_moniker_parse_vtbl; obj->refcount = 1; return obj; @@ -1899,7 +1954,7 @@ static void test_item_moniker(void) IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; - DWORD hash; + DWORD hash, eaten; IBindCtx *bindctx; IMoniker *inverse; IUnknown *unknown; @@ -1907,6 +1962,7 @@ static void test_item_moniker(void) static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; struct test_moniker *container_moniker; + WCHAR displayname[16] = L"display name"; IEnumMoniker *enummoniker; WCHAR *display_name; BIND_OPTS bind_opts; @@ -2076,10 +2132,43 @@ todo_wine hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); - IMoniker_Release(&container_moniker->IMoniker_iface); - + /* BindToStorage() */ hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); - ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + /* ParseDisplayName() */ + hr = IMoniker_ParseDisplayName(moniker, bindctx, NULL, displayname, &eaten, &moniker2); + ok(hr == MK_E_SYNTAX, "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 0; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 1; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2499; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2500; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_ParseDisplayName(moniker, bindctx, &container_moniker->IMoniker_iface, displayname, &eaten, &moniker2); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); + + IMoniker_Release(&container_moniker->IMoniker_iface); IBindCtx_Release(bindctx); -- 2.24.0

Dec. 23, 2019

[PATCH 2/3] ole32/tests: Add a test for bind speed used by item moniker BindToObject().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 131 ++++++++++++++++++++++++++++++++++++- 1 file changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 2e1e00adc8..1daf46ce5d 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -251,6 +251,7 @@ struct test_moniker { IMoniker IMoniker_iface; IROTData IROTData_iface; + IOleItemContainer IOleItemContainer_iface; LONG refcount; BOOL no_IROTData; @@ -266,6 +267,86 @@ static struct test_moniker *impl_from_IROTData(IROTData *iface) return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); } +static struct test_moniker *impl_from_IOleItemContainer(IOleItemContainer *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IOleItemContainer_iface); +} + +static HRESULT WINAPI test_item_container_QueryInterface(IOleItemContainer *iface, REFIID riid, void **obj) +{ + if (IsEqualIID(riid, &IID_IOleItemContainer) || + IsEqualIID(riid, &IID_IOleContainer) || + IsEqualIID(riid, &IID_IParseDisplayName) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IOleItemContainer_AddRef(iface); + return S_OK; + } + + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI test_item_container_AddRef(IOleItemContainer *iface) +{ + struct test_moniker *moniker = impl_from_IOleItemContainer(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); +} + +static ULONG WINAPI test_item_container_Release(IOleItemContainer *iface) +{ + struct test_moniker *moniker = impl_from_IOleItemContainer(iface); + return IMoniker_Release(&moniker->IMoniker_iface); +} + +static HRESULT WINAPI test_item_container_ParseDisplayName(IOleItemContainer *iface, + IBindCtx *pbc, LPOLESTR displayname, ULONG *eaten, IMoniker **out) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_item_container_EnumObjects(IOleItemContainer *iface, DWORD flags, + IEnumUnknown **ppenum) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_item_container_LockContainer(IOleItemContainer *iface, BOOL lock) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_item_container_GetObject(IOleItemContainer *iface, LPOLESTR item, + DWORD bind_speed, IBindCtx *pbc, REFIID riid, void **obj) +{ + return 0x8bee0000 | bind_speed; +} + +static HRESULT WINAPI test_item_container_GetObjectStorage(IOleItemContainer *iface, LPOLESTR item, + IBindCtx *pbc, REFIID riid, void **obj) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI test_item_container_IsRunning(IOleItemContainer *iface, LPOLESTR item) +{ + return E_NOTIMPL; +} + +static const IOleItemContainerVtbl test_item_container_vtbl = +{ + test_item_container_QueryInterface, + test_item_container_AddRef, + test_item_container_Release, + test_item_container_ParseDisplayName, + test_item_container_EnumObjects, + test_item_container_LockContainer, + test_item_container_GetObject, + test_item_container_GetObjectStorage, + test_item_container_IsRunning, +}; + static HRESULT WINAPI Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { @@ -354,10 +435,18 @@ Moniker_GetSizeMax(IMoniker* iface, ULARGE_INTEGER* pcbSize) return E_NOTIMPL; } -static HRESULT WINAPI -Moniker_BindToObject(IMoniker* iface, IBindCtx* pbc, IMoniker* pmkToLeft, - REFIID riid, VOID** ppvResult) +static HRESULT WINAPI Moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, + void **obj) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + + if (IsEqualIID(riid, &IID_IOleItemContainer)) + { + *obj = &moniker->IOleItemContainer_iface; + IMoniker_AddRef(iface); + return S_OK; + } + CHECK_EXPECTED_METHOD("Moniker_BindToObject"); return E_NOTIMPL; } @@ -568,6 +657,7 @@ static struct test_moniker *create_test_moniker(void) obj = heap_alloc_zero(sizeof(*obj)); obj->IMoniker_iface.lpVtbl = &MonikerVtbl; obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->IOleItemContainer_iface.lpVtbl = &test_item_container_vtbl; obj->refcount = 1; return obj; @@ -1816,8 +1906,10 @@ static void test_item_moniker(void) static const WCHAR wszDelimiter[] = {'!',0}; static const WCHAR wszObjectName[] = {'T','e','s','t',0}; static const WCHAR expected_display_name[] = { '!','T','e','s','t',0 }; + struct test_moniker *container_moniker; IEnumMoniker *enummoniker; WCHAR *display_name; + BIND_OPTS bind_opts; LARGE_INTEGER pos; IStream *stream; @@ -1950,9 +2042,42 @@ todo_wine hr = IMoniker_IsRunning(moniker, bindctx, NULL, NULL); ok(hr == S_FALSE, "IMoniker_IsRunning should return S_FALSE, not 0x%08x\n", hr); + /* BindToObject() */ hr = IMoniker_BindToObject(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToStorage should return E_INVALIDARG, not 0x%08x\n", hr); + container_moniker = create_test_moniker(); + + hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_INDEFINITE), "Unexpected hr %#x.\n", hr); + + bind_opts.cbStruct = sizeof(bind_opts); + hr = IBindCtx_GetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to get bind options, hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 1; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2499; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); +todo_wine + ok(hr == (0x8bee0000 | BINDSPEED_IMMEDIATE), "Unexpected hr %#x.\n", hr); + + bind_opts.dwTickCountDeadline = 2500; + hr = IBindCtx_SetBindOptions(bindctx, &bind_opts); + ok(hr == S_OK, "Failed to set bind options, hr %#x.\n", hr); + hr = IMoniker_BindToObject(moniker, bindctx, &container_moniker->IMoniker_iface, &IID_IUnknown, (void **)&unknown); + ok(hr == (0x8bee0000 | BINDSPEED_MODERATE), "Unexpected hr %#x.\n", hr); + + IMoniker_Release(&container_moniker->IMoniker_iface); + hr = IMoniker_BindToStorage(moniker, bindctx, NULL, &IID_IUnknown, (void **)&unknown); ok(hr == E_INVALIDARG, "IMoniker_BindToObject should return E_INVALIDARG, not 0x%08x\n", hr); -- 2.24.0

Dec. 23, 2019

[PATCH 1/3] ole32/tests: Use heap-based object for custom moniker.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 138 +++++++++++++++++-------------------- 1 file changed, 65 insertions(+), 73 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 42bc094522..2e1e00adc8 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -34,6 +34,7 @@ #include "initguid.h" #include "wine/test.h" +#include "wine/heap.h" #define ok_more_than_one_lock() ok(cLocks > 0, "Number of locks should be > 0, but actually is %d\n", cLocks) #define ok_no_locks() ok(cLocks == 0, "Number of locks should be 0, but actually is %d\n", cLocks) @@ -246,9 +247,30 @@ static const IUnknownVtbl HeapUnknown_Vtbl = HeapUnknown_Release }; +struct test_moniker +{ + IMoniker IMoniker_iface; + IROTData IROTData_iface; + LONG refcount; + + BOOL no_IROTData; +}; + +static struct test_moniker *impl_from_IMoniker(IMoniker *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IMoniker_iface); +} + +static struct test_moniker *impl_from_IROTData(IROTData *iface) +{ + return CONTAINING_RECORD(iface, struct test_moniker, IROTData_iface); +} + static HRESULT WINAPI -MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) +Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) { + struct test_moniker *moniker = impl_from_IMoniker(iface); + if (!ppvObject) return E_INVALIDARG; @@ -260,7 +282,11 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) IsEqualIID(&IID_IMoniker, riid)) *ppvObject = iface; if (IsEqualIID(&IID_IROTData, riid)) + { CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); + if (!moniker->no_IROTData) + *ppvObject = &moniker->IROTData_iface; + } if ((*ppvObject)==0) return E_NOINTERFACE; @@ -273,13 +299,20 @@ MonikerNoROTData_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) static ULONG WINAPI Moniker_AddRef(IMoniker* iface) { - return 2; + struct test_moniker *moniker = impl_from_IMoniker(iface); + return InterlockedIncrement(&moniker->refcount); } static ULONG WINAPI Moniker_Release(IMoniker* iface) { - return 1; + struct test_moniker *moniker = impl_from_IMoniker(iface); + ULONG refcount = InterlockedDecrement(&moniker->refcount); + + if (!refcount) + heap_free(moniker); + + return refcount; } static HRESULT WINAPI @@ -457,53 +490,25 @@ Moniker_IsSystemMoniker(IMoniker* iface,DWORD* pwdMksys) return S_FALSE; } -static const IMonikerVtbl MonikerNoROTDataVtbl = -{ - MonikerNoROTData_QueryInterface, - Moniker_AddRef, - Moniker_Release, - Moniker_GetClassID, - Moniker_IsDirty, - Moniker_Load, - Moniker_Save, - Moniker_GetSizeMax, - Moniker_BindToObject, - Moniker_BindToStorage, - Moniker_Reduce, - Moniker_ComposeWith, - Moniker_Enum, - Moniker_IsEqual, - Moniker_Hash, - Moniker_IsRunning, - Moniker_GetTimeOfLastChange, - Moniker_Inverse, - Moniker_CommonPrefixWith, - Moniker_RelativePathTo, - Moniker_GetDisplayName, - Moniker_ParseDisplayName, - Moniker_IsSystemMoniker -}; - -static IMoniker MonikerNoROTData = { &MonikerNoROTDataVtbl }; - -static IMoniker Moniker; - static HRESULT WINAPI ROTData_QueryInterface(IROTData *iface,REFIID riid,VOID** ppvObject) { - return IMoniker_QueryInterface(&Moniker, riid, ppvObject); + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_QueryInterface(&moniker->IMoniker_iface, riid, ppvObject); } static ULONG WINAPI ROTData_AddRef(IROTData *iface) { - return 2; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_AddRef(&moniker->IMoniker_iface); } static ULONG WINAPI ROTData_Release(IROTData* iface) { - return 1; + struct test_moniker *moniker = impl_from_IROTData(iface); + return IMoniker_Release(&moniker->IMoniker_iface); } static HRESULT WINAPI @@ -529,35 +534,6 @@ static IROTDataVtbl ROTDataVtbl = ROTData_GetComparisonData }; -static IROTData ROTData = { &ROTDataVtbl }; - -static HRESULT WINAPI -Moniker_QueryInterface(IMoniker* iface,REFIID riid,void** ppvObject) -{ - if (!ppvObject) - return E_INVALIDARG; - - *ppvObject = 0; - - if (IsEqualIID(&IID_IUnknown, riid) || - IsEqualIID(&IID_IPersist, riid) || - IsEqualIID(&IID_IPersistStream,riid) || - IsEqualIID(&IID_IMoniker, riid)) - *ppvObject = iface; - if (IsEqualIID(&IID_IROTData, riid)) - { - CHECK_EXPECTED_METHOD("Moniker_QueryInterface(IID_IROTData)"); - *ppvObject = &ROTData; - } - - if ((*ppvObject)==0) - return E_NOINTERFACE; - - IMoniker_AddRef(iface); - - return S_OK; -} - static const IMonikerVtbl MonikerVtbl = { Moniker_QueryInterface, @@ -585,7 +561,17 @@ static const IMonikerVtbl MonikerVtbl = Moniker_IsSystemMoniker }; -static IMoniker Moniker = { &MonikerVtbl }; +static struct test_moniker *create_test_moniker(void) +{ + struct test_moniker *obj; + + obj = heap_alloc_zero(sizeof(*obj)); + obj->IMoniker_iface.lpVtbl = &MonikerVtbl; + obj->IROTData_iface.lpVtbl = &ROTDataVtbl; + obj->refcount = 1; + + return obj; +} static void test_ROT(void) { @@ -594,6 +580,7 @@ static void test_ROT(void) '2','0','4','6','E','5','8','6','C','9','2','5',0}; HRESULT hr; IMoniker *pMoniker = NULL; + struct test_moniker *test_moniker; IRunningObjectTable *pROT = NULL; DWORD dwCookie; static const char *methods_register_no_ROTData[] = @@ -634,19 +621,22 @@ static void test_ROT(void) hr = GetRunningObjectTable(0, &pROT); ok_ole_success(hr, GetRunningObjectTable); + test_moniker = create_test_moniker(); + test_moniker->no_IROTData = TRUE; + expected_method_list = methods_register_no_ROTData; external_connections = 0; /* try with our own moniker that doesn't support IROTData */ - hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &MonikerNoROTData, &dwCookie); - ok_ole_success(hr, IRunningObjectTable_Register); + hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, (IUnknown *)&Test_ClassFactory, + &test_moniker->IMoniker_iface, &dwCookie); + ok(hr == S_OK, "Failed to register interface, hr %#x.\n", hr); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok(external_connections == 1, "external_connections = %d\n", external_connections); ok_more_than_one_lock(); expected_method_list = methods_isrunning_no_ROTData; - hr = IRunningObjectTable_IsRunning(pROT, &MonikerNoROTData); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -658,15 +648,16 @@ static void test_ROT(void) expected_method_list = methods_register; /* try with our own moniker */ + test_moniker->no_IROTData = FALSE; hr = IRunningObjectTable_Register(pROT, ROTFLAGS_REGISTRATIONKEEPSALIVE, - (IUnknown*)&Test_ClassFactory, &Moniker, &dwCookie); + (IUnknown *)&Test_ClassFactory, &test_moniker->IMoniker_iface, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); ok_more_than_one_lock(); expected_method_list = methods_isrunning; - hr = IRunningObjectTable_IsRunning(pROT, &Moniker); + hr = IRunningObjectTable_IsRunning(pROT, &test_moniker->IMoniker_iface); ok_ole_success(hr, IRunningObjectTable_IsRunning); ok(!*expected_method_list, "Method sequence starting from %s not called\n", *expected_method_list); @@ -719,6 +710,7 @@ static void test_ROT(void) ok(hr == E_INVALIDARG, "IRunningObjectTable_Register should have returned E_INVALIDARG instead of 0x%08x\n", hr); IMoniker_Release(pMoniker); + IMoniker_Release(&test_moniker->IMoniker_iface); IRunningObjectTable_Release(pROT); } -- 2.24.0

Dec. 23, 2019

[PATCH] winex11.drv: Always set focus to managed window when requested.

by Rémi Bernon

Commit 71d35d8940118bc6de6522913fb8c473fa5b2c24 broke the way WM_TAKE_FOCUS protocol is implemented. We used the WM_MOUSEACTIVATE even when changing focus using Alt-Tab for example, and in this case Windows changes focus regardless of the WM_MOUSEACTIVATE reply. Steam and the Wine system tray are affected for instance. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- I expect this is going to break dinput mouse test on testbot again, as 71d35d8940118bc6de6522913fb8c473fa5b2c24 was "fixing" it. The problem came from the "set focus on mouse hover" setting, Windows has no such mechanism I believe, but then we shouldn't try to prevent focus from changing when using this setting. It should either be disabled, or taken into account in the test by not moving the mouse over another window. I can modify the test if that's what we want to do, but I'm assuming the test was moving the cursor over the original window on purpose. dlls/winex11.drv/event.c | 7 ++++++- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index dd8837c11da..69012e5b8cb 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -700,7 +700,12 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event ) hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE), GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus ); - if (can_activate_window(hwnd)) + if (is_managed(hwnd)) + { + set_focus( event->display, hwnd, event_time ); + return; + } + else if (can_activate_window(hwnd)) { /* simulate a mouse click on the caption to find out * whether the window wants to be activated */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 99e4094ebd9..89ea42b7567 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -169,7 +169,7 @@ struct has_popup_result BOOL found; }; -static BOOL is_managed( HWND hwnd ) +BOOL is_managed( HWND hwnd ) { struct x11drv_win_data *data = get_win_data( hwnd ); BOOL ret = data && data->managed; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 98cab8947be..d4f21024634 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -605,6 +605,7 @@ extern void change_systray_owner( Display *display, Window systray_window ) DECL extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; +extern BOOL is_managed( HWND hwnd ) DECLSPEC_HIDDEN; static inline void mirror_rect( const RECT *window_rect, RECT *rect ) { -- 2.24.1

Dec. 23, 2019

Re: [PATCH 1/2] dwrite/tests: Improve coverage of IsMonospacedFont() tests.

by Nikolay Sivov

Probably bot was under heavier load than usual? Normal run is under 30 sec for this machine, that's what patch 2/2 shows (that runs with test from patch 1/2), and manual run I did earlier.

Dec. 23, 2019

Re: [PATCH 1/2] dwrite/tests: Improve coverage of IsMonospacedFont() tests.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=62460 Your paranoid android. === w864 (task log) === Task errors: The task timed out

Dec. 23, 2019

[PATCH 2/2] dwrite/tests: Add IsColorFont() tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 104 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 68e2c03baf..d7bcfb1f0a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -9546,6 +9546,109 @@ static void test_font_resource(void) ok(ref == 0, "Factory wasn't released, %u.\n", ref); } +static BOOL get_expected_is_color(IDWriteFontFace2 *fontface) +{ + void *context; + UINT32 size; + BOOL exists; + void *data; + HRESULT hr; + + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_CPAL_TAG, (const void **)&data, &size, &context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (context) + IDWriteFontFace2_ReleaseFontTable(fontface, context); + + if (exists) + { + hr = IDWriteFontFace2_TryGetFontTable(fontface, MS_COLR_TAG, (const void **)&data, &size, &context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (context) + IDWriteFontFace2_ReleaseFontTable(fontface, context); + } + + return exists; +} + +static void test_IsColorFont(void) +{ + IDWriteFontCollection *collection; + IDWriteFactory2 *factory; + UINT32 count, i; + ULONG refcount; + HRESULT hr; + + factory = create_factory_iid(&IID_IDWriteFactory2); + + if (!factory) + { + win_skip("IsColorFont() is not supported.\n"); + return; + } + + hr = IDWriteFactory2_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; + + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); + + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); + + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_color_font, is_color_face, is_color_expected; + IDWriteFontFace2 *fontface2; + IDWriteFontFace *fontface; + IDWriteFont2 *font2; + IDWriteFont *font; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont2, (void **)&font2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFont2_CreateFontFace(font2, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void **)&fontface2); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFontFace_Release(fontface); + + is_color_font = IDWriteFont2_IsColorFont(font2); + is_color_face = IDWriteFontFace2_IsColorFont(fontface2); + ok(is_color_font == is_color_face, "Unexpected color flag.\n"); + + is_color_expected = get_expected_is_color(fontface2); + ok(is_color_expected == is_color_face, "Unexpected is_color flag %d for %s, font %d.\n", + is_color_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace2_Release(fontface2); + IDWriteFont2_Release(font2); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); + refcount = IDWriteFactory2_Release(factory); + ok(refcount == 0, "Factory not released, refcount %u.\n", refcount); +} + START_TEST(font) { IDWriteFactory *factory; @@ -9614,6 +9717,7 @@ START_TEST(font) test_AnalyzeContainerType(); test_fontsetbuilder(); test_font_resource(); + test_IsColorFont(); IDWriteFactory_Release(factory); } -- 2.24.0

Dec. 23, 2019

[PATCH 1/2] dwrite/tests: Improve coverage of IsMonospacedFont() tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 130 ++++++++++++++++++++++++++------------- 1 file changed, 87 insertions(+), 43 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index da75a7b70c..68e2c03baf 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -1,7 +1,7 @@ /* * Font related tests * - * Copyright 2012, 2014-2018 Nikolay Sivov for CodeWeavers + * Copyright 2012, 2014-2019 Nikolay Sivov for CodeWeavers * Copyright 2014 Aric Stewart for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -37,7 +37,7 @@ #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') #define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') -#define MS_0S2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') +#define MS_OS2_TAG DWRITE_MAKE_OPENTYPE_TAG('O','S','/','2') #define MS_HEAD_TAG DWRITE_MAKE_OPENTYPE_TAG('h','e','a','d') #define MS_HHEA_TAG DWRITE_MAKE_OPENTYPE_TAG('h','h','e','a') #define MS_POST_TAG DWRITE_MAKE_OPENTYPE_TAG('p','o','s','t') @@ -1961,7 +1961,7 @@ static void get_expected_font_metrics(IDWriteFontFace *fontface, DWRITE_FONT_MET memset(metrics, 0, sizeof(*metrics)); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IDWriteFontFace_TryGetFontTable(fontface, MS_HEAD_TAG, (const void**)&tt_head, &size, &head_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -2600,7 +2600,7 @@ static void get_logfont_from_font(IDWriteFont *font, LOGFONTW *logfont) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "Failed to create font face, %#x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, %#x\n", hr); @@ -4900,67 +4900,111 @@ static void test_GetDesignGlyphMetrics(void) DELETE_FONTFILE(path); } +static BOOL get_expected_is_monospaced(IDWriteFontFace1 *fontface, const DWRITE_PANOSE *panose) +{ + BOOL exists, is_monospaced = FALSE; + const TT_POST *tt_post; + void *post_context; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace1_TryGetFontTable(fontface, MS_POST_TAG, (const void **)&tt_post, &size, + &post_context, &exists); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + if (tt_post) + { + is_monospaced = !!tt_post->fixed_pitch; + IDWriteFontFace1_ReleaseFontTable(fontface, post_context); + } + + if (!is_monospaced) + is_monospaced |= panose->text.proportion == DWRITE_PANOSE_PROPORTION_MONOSPACED; + + return is_monospaced; +} + static void test_IsMonospacedFont(void) { - static const WCHAR courierW[] = {'C','o','u','r','i','e','r',' ','N','e','w',0}; IDWriteFontCollection *collection; - IDWriteFactory *factory; - UINT32 index; - BOOL exists; + IDWriteFactory1 *factory; + UINT32 count, i; HRESULT hr; ULONG ref; - factory = create_factory(); + factory = create_factory_iid(&IID_IDWriteFactory1); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); - ok(hr == S_OK, "got 0x%08x\n", hr); + if (!factory) + { + win_skip("IsMonospacedFont() is not supported.\n"); + return; + } - exists = FALSE; - hr = IDWriteFontCollection_FindFamilyName(collection, courierW, &index, &exists); - ok(hr == S_OK, "got 0x%08x\n", hr); - if (exists) { + hr = IDWriteFactory1_GetSystemFontCollection(factory, &collection, FALSE); + ok(hr == S_OK, "Failed to get font collection, hr %#x.\n", hr); + + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; IDWriteFontFamily *family; - IDWriteFont1 *font1; - IDWriteFont *font; + UINT32 font_count, j; + WCHAR nameW[256]; - hr = IDWriteFontCollection_GetFontFamily(collection, index, &family); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - hr = IDWriteFontFamily_GetFirstMatchingFont(family, DWRITE_FONT_WEIGHT_NORMAL, - DWRITE_FONT_STRETCH_NORMAL, DWRITE_FONT_STYLE_NORMAL, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); - IDWriteFontFamily_Release(family); + hr = IDWriteFontFamily_GetFamilyNames(family, &names); + ok(hr == S_OK, "Failed to get names, hr %#x.\n", hr); + get_enus_string(names, nameW, ARRAY_SIZE(nameW)); + IDWriteLocalizedStrings_Release(names); - hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void**)&font1); - if (hr == S_OK) { + font_count = IDWriteFontFamily_GetFontCount(family); + + for (j = 0; j < font_count; ++j) + { + BOOL is_monospaced_font, is_monospaced_face, is_monospaced_expected; IDWriteFontFace1 *fontface1; IDWriteFontFace *fontface; - BOOL is_monospaced; + DWRITE_PANOSE panose; + IDWriteFont1 *font1; + IDWriteFont *font; - is_monospaced = IDWriteFont1_IsMonospacedFont(font1); - ok(is_monospaced, "got %d\n", is_monospaced); + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_QueryInterface(font, &IID_IDWriteFont1, (void **)&font1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + IDWriteFont_Release(font); hr = IDWriteFont1_CreateFontFace(font1, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void**)&fontface1); - ok(hr == S_OK, "got 0x%08x\n", hr); - is_monospaced = IDWriteFontFace1_IsMonospacedFont(fontface1); - ok(is_monospaced, "got %d\n", is_monospaced); - IDWriteFontFace1_Release(fontface1); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace1, (void **)&fontface1); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); IDWriteFontFace_Release(fontface); + + is_monospaced_font = IDWriteFont1_IsMonospacedFont(font1); + is_monospaced_face = IDWriteFontFace1_IsMonospacedFont(fontface1); + ok(is_monospaced_font == is_monospaced_face, "Unexpected monospaced flag.\n"); + + IDWriteFont1_GetPanose(font1, &panose); + + /* FIXME: failures disabled on Wine for now */ + is_monospaced_expected = get_expected_is_monospaced(fontface1, &panose); + todo_wine_if(is_monospaced_expected != is_monospaced_face) + ok(is_monospaced_expected == is_monospaced_face, "Unexpected is_monospaced flag %d for %s, font %d.\n", + is_monospaced_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace1_Release(fontface1); IDWriteFont1_Release(font1); } - else - win_skip("IsMonospacedFont() is not supported.\n"); - IDWriteFont_Release(font); + IDWriteFontFamily_Release(family); } - else - skip("Courier New font not found.\n"); IDWriteFontCollection_Release(collection); - ref = IDWriteFactory_Release(factory); + ref = IDWriteFactory1_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); } @@ -6276,7 +6320,7 @@ static void get_expected_panose(IDWriteFont1 *font, DWRITE_PANOSE *panose) hr = IDWriteFont1_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { @@ -7211,7 +7255,7 @@ static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) UINT32 size; HRESULT hr; - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "Failed to get OS/2 table, hr %#x.\n", hr); if (tt_os2) @@ -7848,7 +7892,7 @@ static void get_expected_fontsig(IDWriteFont *font, FONTSIGNATURE *fontsig) hr = IDWriteFont_CreateFontFace(font, &fontface); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_TAG, (const void**)&tt_os2, &size, &os2_context, &exists); + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_OS2_TAG, (const void **)&tt_os2, &size, &os2_context, &exists); ok(hr == S_OK, "got 0x%08x\n", hr); if (tt_os2) { -- 2.24.0

Dec. 23, 2019

[PATCH v2] include: Declare _STGMEDIUM_UNION type except when it violates C spec.

by Jeff Smith

Fixes a regression introduced by 732f67ed38a45911d726df8da5a68710d175ba1d Based on a patch from Zebediah Figura <z.figura12(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47710 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Take NONAMELESSUNION definition into consideration in determining what to do with _STGMEDIUM_UNION. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..a86ceb8b1d 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* When NONAMELESSUNION is not defined, the presence of _STGMEDIUM_UNION + * violates the C spec, but is necessary for C++. Avoid C spec violation. */ + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#define _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef struct _userSTGMEDIUM { - union switch(DWORD tymed) u { + union _STGMEDIUM_UNION switch(DWORD tymed) u { case TYMED_NULL: ; case TYMED_MFPICT: wireHMETAFILEPICT hMetaFilePict; case TYMED_ENHMF: wireHENHMETAFILE hHEnhMetaFile; @@ -1440,6 +1446,10 @@ interface IAdviseSink : IUnknown IUnknown *pUnkForRelease; } userSTGMEDIUM; + cpp_quote("#if !defined(NONAMELESSUNION) && !defined(__cplusplus)") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

Dec. 23, 2019

Re: Unix FD to Windows File Handles mapping.

by Bruno Albuquerque

FWIIW, got it to work by loading ntdll.dll and getting the proc to the wine_server_fd_to_handle() function and using it on the fd. After that I could use Win32 functions on the handle as suggested. It is kinda funny that I can use a handle to the underlying fd but I can not use the fd. In any case, thanks for all your help. On Sun, Dec 22, 2019 at 10:00 AM Bruno Albuquerque <bga(a)gmail.com> wrote: > Thanks. > > My question is now how to access that function from my Windows program as > it does not seem to be directly available (i.e. in a importable header > file). In any cae, is it similar to _get_osfhandle()? I was considering > using it (it is documented by Microsoft) but I also failed at including > "msvcrt/io.h" (not found). > > > On Sun, Dec 22, 2019 at 8:12 AM Alexandre Julliard <julliard(a)winehq.org> > wrote: > >> Zebediah Figura <z.figura12(a)gmail.com> writes: >> >> > On 12/22/19 6:40 AM, Gabriel Ivăncescu wrote: >> >> On 12/21/19 5:34 PM, Bruno Albuquerque wrote: >> >>> Thanks. That led me to the init_user_process_params() where it seems >> >>> stdin/stdout/stderr are mapped to the running Windows program. I >> could >> >>> not find any code that would do anything with other inherited opened >> fds >> >>> and that led me to think that there is really no special handling and >> it >> >>> somehow just happens to work with a winelib program (most >> likely because >> >>> it has a bigger Linux surface to it). >> >>> >> >>> Based on this, I guess what I really want to know is: >> >>> >> >>> 1 - Does a non-winelib Windows program have access to opened fds >> >>> inherited during a fork/exec of Wine? >> >>> 2 - If so, is there a way to actually use those fds in the Windows >> program? >> >>> >> >>> >> >> >> >> Hi Bruno, >> >> >> >> I'm not sure if this is feasible to you, but keep in mind that >> "Windows >> >> programs" ran under Wine are technically still running on Linux. So >> you >> >> still have access to Linux syscalls (but not libraries, unless you >> load >> >> them manually, which is not worth it). >> >> >> >> One possible hack to do this in a "generic" way would be: >> >> >> >> 1) Use an exception handler in your app. >> >> >> >> 2) Call the 'uname' system call to make sure the returned sysname is >> >> 'Linux'. If the syscall results in an exception, then it's obviously >> not >> >> running on Linux (it could be running on Windows), so do the necessary >> >> thing there. >> > >> > There's also wine_get_host_version(), exported from ntdll, which would >> > probably be easier. >> > >> > In order to get access to file descriptors in the first place, you can >> > use the counterpart wine_server_handle_to_fd() [also exported from >> ntdll]. >> >> Or use wine_server_fd_to_handle() and call Win32 APIs instead of direct >> syscalls, that's even easier... >> >> -- >> Alexandre Julliard >> julliard(a)winehq.org >> >>

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Bruno Albuquerque

Thanks. My question is now how to access that function from my Windows program as it does not seem to be directly available (i.e. in a importable header file). In any cae, is it similar to _get_osfhandle()? I was considering using it (it is documented by Microsoft) but I also failed at including "msvcrt/io.h" (not found). On Sun, Dec 22, 2019 at 8:12 AM Alexandre Julliard <julliard(a)winehq.org> wrote: > Zebediah Figura <z.figura12(a)gmail.com> writes: > > > On 12/22/19 6:40 AM, Gabriel Ivăncescu wrote: > >> On 12/21/19 5:34 PM, Bruno Albuquerque wrote: > >>> Thanks. That led me to the init_user_process_params() where it seems > >>> stdin/stdout/stderr are mapped to the running Windows program. I could > >>> not find any code that would do anything with other inherited opened > fds > >>> and that led me to think that there is really no special handling and > it > >>> somehow just happens to work with a winelib program (most > likely because > >>> it has a bigger Linux surface to it). > >>> > >>> Based on this, I guess what I really want to know is: > >>> > >>> 1 - Does a non-winelib Windows program have access to opened fds > >>> inherited during a fork/exec of Wine? > >>> 2 - If so, is there a way to actually use those fds in the Windows > program? > >>> > >>> > >> > >> Hi Bruno, > >> > >> I'm not sure if this is feasible to you, but keep in mind that "Windows > >> programs" ran under Wine are technically still running on Linux. So you > >> still have access to Linux syscalls (but not libraries, unless you load > >> them manually, which is not worth it). > >> > >> One possible hack to do this in a "generic" way would be: > >> > >> 1) Use an exception handler in your app. > >> > >> 2) Call the 'uname' system call to make sure the returned sysname is > >> 'Linux'. If the syscall results in an exception, then it's obviously > not > >> running on Linux (it could be running on Windows), so do the necessary > >> thing there. > > > > There's also wine_get_host_version(), exported from ntdll, which would > > probably be easier. > > > > In order to get access to file descriptors in the first place, you can > > use the counterpart wine_server_handle_to_fd() [also exported from > ntdll]. > > Or use wine_server_fd_to_handle() and call Win32 APIs instead of direct > syscalls, that's even easier... > > -- > Alexandre Julliard > julliard(a)winehq.org > >

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Bruno Albuquerque

I am new to writing wine specific things so bear with me for a while. Is there a header file that I can include to get access to those ntdll functions (a cursory look only resulted in me finding the associated c file)? If not, do I have to use LoadLibrary() or some other trick? Thanks again for all your help so far. It is much appreciated. On Sun, Dec 22, 2019 at 8:04 AM Zebediah Figura <z.figura12(a)gmail.com> wrote: > > > On 12/22/19 6:40 AM, Gabriel Ivăncescu wrote: > > On 12/21/19 5:34 PM, Bruno Albuquerque wrote: > >> Thanks. That led me to the init_user_process_params() where it seems > >> stdin/stdout/stderr are mapped to the running Windows program. I could > >> not find any code that would do anything with other inherited opened > fds > >> and that led me to think that there is really no special handling and > it > >> somehow just happens to work with a winelib program (most > likely because > >> it has a bigger Linux surface to it). > >> > >> Based on this, I guess what I really want to know is: > >> > >> 1 - Does a non-winelib Windows program have access to opened fds > >> inherited during a fork/exec of Wine? > >> 2 - If so, is there a way to actually use those fds in the Windows > program? > >> > >> > > > > Hi Bruno, > > > > I'm not sure if this is feasible to you, but keep in mind that "Windows > > programs" ran under Wine are technically still running on Linux. So you > > still have access to Linux syscalls (but not libraries, unless you load > > them manually, which is not worth it). > > > > One possible hack to do this in a "generic" way would be: > > > > 1) Use an exception handler in your app. > > > > 2) Call the 'uname' system call to make sure the returned sysname is > > 'Linux'. If the syscall results in an exception, then it's obviously not > > running on Linux (it could be running on Windows), so do the necessary > > thing there. > > There's also wine_get_host_version(), exported from ntdll, which would > probably be easier. > > In order to get access to file descriptors in the first place, you can > use the counterpart wine_server_handle_to_fd() [also exported from ntdll]. > > > > > 3) If it's 'Linux' then mark it so and simply use Linux syscalls to use > > the fd and read or write to it. You can use inline assembly for this > > purpose. > > > > If your program is not intended to run on non-Linux environments then > > you can skip the first two steps. I realize it's a hack but without > > winelib I don't think there's much else you can do. > > > >

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Alexandre Julliard

Zebediah Figura <z.figura12(a)gmail.com> writes: > On 12/22/19 6:40 AM, Gabriel Ivăncescu wrote: >> On 12/21/19 5:34 PM, Bruno Albuquerque wrote: >>> Thanks. That led me to the init_user_process_params() where it seems >>> stdin/stdout/stderr are mapped to the running Windows program. I could >>> not find any code that would do anything with other inherited opened fds >>> and that led me to think that there is really no special handling and it >>> somehow just happens to work with a winelib program (most likely because >>> it has a bigger Linux surface to it). >>> >>> Based on this, I guess what I really want to know is: >>> >>> 1 - Does a non-winelib Windows program have access to opened fds >>> inherited during a fork/exec of Wine? >>> 2 - If so, is there a way to actually use those fds in the Windows program? >>> >>> >> >> Hi Bruno, >> >> I'm not sure if this is feasible to you, but keep in mind that "Windows >> programs" ran under Wine are technically still running on Linux. So you >> still have access to Linux syscalls (but not libraries, unless you load >> them manually, which is not worth it). >> >> One possible hack to do this in a "generic" way would be: >> >> 1) Use an exception handler in your app. >> >> 2) Call the 'uname' system call to make sure the returned sysname is >> 'Linux'. If the syscall results in an exception, then it's obviously not >> running on Linux (it could be running on Windows), so do the necessary >> thing there. > > There's also wine_get_host_version(), exported from ntdll, which would > probably be easier. > > In order to get access to file descriptors in the first place, you can > use the counterpart wine_server_handle_to_fd() [also exported from ntdll]. Or use wine_server_fd_to_handle() and call Win32 APIs instead of direct syscalls, that's even easier... -- Alexandre Julliard julliard(a)winehq.org

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Zebediah Figura

On 12/22/19 6:40 AM, Gabriel Ivăncescu wrote: > On 12/21/19 5:34 PM, Bruno Albuquerque wrote: >> Thanks. That led me to the init_user_process_params() where it seems >> stdin/stdout/stderr are mapped to the running Windows program. I could >> not find any code that would do anything with other inherited opened fds >> and that led me to think that there is really no special handling and it >> somehow just happens to work with a winelib program (most likely because >> it has a bigger Linux surface to it). >> >> Based on this, I guess what I really want to know is: >> >> 1 - Does a non-winelib Windows program have access to opened fds >> inherited during a fork/exec of Wine? >> 2 - If so, is there a way to actually use those fds in the Windows program? >> >> > > Hi Bruno, > > I'm not sure if this is feasible to you, but keep in mind that "Windows > programs" ran under Wine are technically still running on Linux. So you > still have access to Linux syscalls (but not libraries, unless you load > them manually, which is not worth it). > > One possible hack to do this in a "generic" way would be: > > 1) Use an exception handler in your app. > > 2) Call the 'uname' system call to make sure the returned sysname is > 'Linux'. If the syscall results in an exception, then it's obviously not > running on Linux (it could be running on Windows), so do the necessary > thing there. There's also wine_get_host_version(), exported from ntdll, which would probably be easier. In order to get access to file descriptors in the first place, you can use the counterpart wine_server_handle_to_fd() [also exported from ntdll]. > > 3) If it's 'Linux' then mark it so and simply use Linux syscalls to use > the fd and read or write to it. You can use inline assembly for this > purpose. > > If your program is not intended to run on non-Linux environments then > you can skip the first two steps. I realize it's a hack but without > winelib I don't think there's much else you can do. >

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Gabriel Ivăncescu

On 12/21/19 5:34 PM, Bruno Albuquerque wrote: > Thanks. That led me to the init_user_process_params() where it seems > stdin/stdout/stderr are mapped to the running Windows program. I could > not find any code that would do anything with other inherited opened fds > and that led me to think that there is really no special handling and it > somehow just happens to work with a winelib program (most likely because > it has a bigger Linux surface to it). > > Based on this, I guess what I really want to know is: > > 1 - Does a non-winelib Windows program have access to opened fds > inherited during a fork/exec of Wine? > 2 - If so, is there a way to actually use those fds in the Windows program? > > Hi Bruno, I'm not sure if this is feasible to you, but keep in mind that "Windows programs" ran under Wine are technically still running on Linux. So you still have access to Linux syscalls (but not libraries, unless you load them manually, which is not worth it). One possible hack to do this in a "generic" way would be: 1) Use an exception handler in your app. 2) Call the 'uname' system call to make sure the returned sysname is 'Linux'. If the syscall results in an exception, then it's obviously not running on Linux (it could be running on Windows), so do the necessary thing there. 3) If it's 'Linux' then mark it so and simply use Linux syscalls to use the fd and read or write to it. You can use inline assembly for this purpose. If your program is not intended to run on non-Linux environments then you can skip the first two steps. I realize it's a hack but without winelib I don't think there's much else you can do.

Dec. 22, 2019

Re: [PATCH] dxgidebug: add missing debug API

by Steve Lhomme

Hi, We have been using this in VLC for many years (hence the old copyright date) to debug DXGI leaks on Windows. On Wed, Dec 18, 2019 at 4:56 PM Fabian Maurer <dark.shadow4(a)web.de> wrote: > > Hi Steve, > > FYI, wine-patches is deprecated - please send patches and other mail to wine- > devel in the future. AFAIK this time it should still be okay though. > > Are those flags already needed somewhere? > > Regards, > Fabian Maurer > >

Dec. 22, 2019

[PATCH] winegstreamer: Recognize the "video/x-cinepak" type.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39809 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/gstdemux.c | 42 ++++++++++++++++++++++++++++++----- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 869a15b619..3641cb5635 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -45,6 +45,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(gstreamer); +static const GUID MEDIASUBTYPE_CVID = {mmioFOURCC('c','v','i','d'), 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; + static pthread_key_t wine_gst_key; struct gstdemux @@ -331,6 +333,7 @@ static gboolean amt_from_gst_caps_audio_mpeg(const GstCaps *caps, AM_MEDIA_TYPE static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) { const char *type = gst_structure_get_name(gst_caps_get_structure(caps, 0)); + GstStructure *structure = gst_caps_get_structure(caps, 0); if (!strcmp(type, "audio/x-raw")) return amt_from_gst_caps_audio_raw(caps, mt); @@ -338,6 +341,38 @@ static gboolean amt_from_gst_caps(const GstCaps *caps, AM_MEDIA_TYPE *mt) return amt_from_gst_caps_video_raw(caps, mt); else if (!strcmp(type, "audio/mpeg")) return amt_from_gst_caps_audio_mpeg(caps, mt); + else if (!strcmp(type, "video/x-cinepak")) + { + VIDEOINFOHEADER *vih; + gint i; + + memset(mt, 0, sizeof(AM_MEDIA_TYPE)); + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_CVID; + mt->bTemporalCompression = TRUE; + mt->lSampleSize = 1; + mt->formattype = FORMAT_VideoInfo; + if (!(vih = CoTaskMemAlloc(sizeof(VIDEOINFOHEADER)))) + return FALSE; + mt->cbFormat = sizeof(VIDEOINFOHEADER); + mt->pbFormat = (BYTE *)vih; + + memset(vih, 0, sizeof(VIDEOINFOHEADER)); + vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + if (gst_structure_get_int(structure, "width", &i)) + vih->bmiHeader.biWidth = i; + if (gst_structure_get_int(structure, "height", &i)) + vih->bmiHeader.biHeight = i; + vih->bmiHeader.biPlanes = 1; + /* Both ffmpeg's encoder and a Cinepak file seen in the wild report + * 24 bpp. ffmpeg sets biSizeImage as below; others may be smaller, but + * as long as every sample fits into our allocator, we're fine. */ + vih->bmiHeader.biBitCount = 24; + vih->bmiHeader.biCompression = mmioFOURCC('c','v','i','d'); + vih->bmiHeader.biSizeImage = vih->bmiHeader.biWidth + * vih->bmiHeader.biHeight * vih->bmiHeader.biBitCount / 8; + return TRUE; + } else { FIXME("Unhandled type %s.\n", debugstr_a(type)); @@ -833,6 +868,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * { static const WCHAR formatW[] = {'S','t','r','e','a','m',' ','%','0','2','u',0}; const char *typename; + AM_MEDIA_TYPE mt; char *name; GstCaps *caps; GstStructure *arg; @@ -853,12 +889,6 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct gstdemux * arg = gst_caps_get_structure(caps, 0); typename = gst_structure_get_name(arg); - if (strcmp(typename, "audio/x-raw") && strcmp(typename, "video/x-raw")) - { - FIXME("Unknown type \'%s\'\n", typename); - return; - } - if (!(pin = create_pin(This, nameW))) { ERR("Failed to allocate memory.\n"); -- 2.24.1

Dec. 22, 2019

[PATCH] ntdll: Drop support for floating point numbers in sscanf.

by Erich E. Hoover

Takes care of one more use of "long double". Best, Erich

Dec. 22, 2019

Re: Unix FD to Windows File Handles mapping.

by Bruno Albuquerque

Thanks. That led me to the init_user_process_params() where it seems stdin/stdout/stderr are mapped to the running Windows program. I could not find any code that would do anything with other inherited opened fds and that led me to think that there is really no special handling and it somehow just happens to work with a winelib program (most likely because it has a bigger Linux surface to it). Based on this, I guess what I really want to know is: 1 - Does a non-winelib Windows program have access to opened fds inherited during a fork/exec of Wine? 2 - If so, is there a way to actually use those fds in the Windows program? On Fri, Dec 20, 2019 at 7:49 PM Damjan Jovanovic <damjan.jov(a)gmail.com> wrote: > Try wine_server_fd_to_handle() > > Once you register a fd with Wine that way, it lives inside wineserver, and > during API calls, you just get back temporary copies of it, usually with > different fd numbers. > > > > On Sat, Dec 21, 2019 at 1:57 AM Bruno Albuquerque <bga(a)gmail.com> wrote: > >> Is the way that wine maps file handles from Unix (Linux, more >> specifically) to Windows predictable? >> >> I have this Linux program that forks Wine to run a Windows program. The >> Windows program can easily access stdin/stdout/stderr the way one would >> expect in a forked Unix program but I am trying to pass one extra file >> descriptor to the windows program but I am not sure how to do that. >> >> In the Unix program, the FD will be, say, 3. As I am forking then >> exec'ing Wine, wine itself will have access to this FD and, from Wine's >> point of view, it should also be 3. The problem is that it seems file >> handles in Windows are not like in Unix (for example, stdin is not 0, >> stdout is not 1 and stderr is not 2) so I am assuming that to make this FD >> available to the WIndows program, it is somehow mapped to a file handle >> with a different number too. I need to know which one it si to be able to >> use it. Any pointers on how to do that? >> >> If I compile a C program with winegcc/winelib and fork/exec it, it looks >> like file handles and file descriptors match so one option is to use it. >> But I prefer to create the program in a different language so winelib is >> not ideal. >> >> Any help would be much appreciated. >> >

Dec. 21, 2019

Wine staging 5.0 rc2 release

by Alistair Leslie-Hughes

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 5.0 rc2 (835 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [30155] Improve support for SafeDisc v2.05.030. * [47507] Send a WM_ACTIVATE message after restoring a minimized window. * [48289] Grand Theft Auto 5 crashes after loading. Updated: * winebuild-Fake_Dlls * dmime-PChannel-range Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

Dec. 21, 2019

Re: Unix FD to Windows File Handles mapping.

by Damjan Jovanovic

Try wine_server_fd_to_handle() Once you register a fd with Wine that way, it lives inside wineserver, and during API calls, you just get back temporary copies of it, usually with different fd numbers. On Sat, Dec 21, 2019 at 1:57 AM Bruno Albuquerque <bga(a)gmail.com> wrote: > Is the way that wine maps file handles from Unix (Linux, more > specifically) to Windows predictable? > > I have this Linux program that forks Wine to run a Windows program. The > Windows program can easily access stdin/stdout/stderr the way one would > expect in a forked Unix program but I am trying to pass one extra file > descriptor to the windows program but I am not sure how to do that. > > In the Unix program, the FD will be, say, 3. As I am forking then exec'ing > Wine, wine itself will have access to this FD and, from Wine's point of > view, it should also be 3. The problem is that it seems file handles in > Windows are not like in Unix (for example, stdin is not 0, stdout is not 1 > and stderr is not 2) so I am assuming that to make this FD available to the > WIndows program, it is somehow mapped to a file handle with a > different number too. I need to know which one it si to be able to use it. > Any pointers on how to do that? > > If I compile a C program with winegcc/winelib and fork/exec it, it looks > like file handles and file descriptors match so one option is to use it. > But I prefer to create the program in a different language so winelib is > not ideal. > > Any help would be much appreciated. >

Dec. 21, 2019

Unix FD to Windows File Handles mapping.

by Bruno Albuquerque

Is the way that wine maps file handles from Unix (Linux, more specifically) to Windows predictable? I have this Linux program that forks Wine to run a Windows program. The Windows program can easily access stdin/stdout/stderr the way one would expect in a forked Unix program but I am trying to pass one extra file descriptor to the windows program but I am not sure how to do that. In the Unix program, the FD will be, say, 3. As I am forking then exec'ing Wine, wine itself will have access to this FD and, from Wine's point of view, it should also be 3. The problem is that it seems file handles in Windows are not like in Unix (for example, stdin is not 0, stdout is not 1 and stderr is not 2) so I am assuming that to make this FD available to the WIndows program, it is somehow mapped to a file handle with a different number too. I need to know which one it si to be able to use it. Any pointers on how to do that? If I compile a C program with winegcc/winelib and fork/exec it, it looks like file handles and file descriptors match so one option is to use it. But I prefer to create the program in a different language so winelib is not ideal. Any help would be much appreciated.

Dec. 20, 2019

[PATCH] dmstyle: Avoid cloning the IStream in parse_style_form()

by Michael Stefaniuc

It can be an application provided IStream with unimplemented Clone() method. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- That fixes the last crash and the "No One Lives Forever" demo seems playable now. dlls/dmstyle/style.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index 5ebe6589d4..3e480028b9 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -778,23 +778,21 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK ListCount[0] = 0; switch (Chunk.fccID) { case DMUS_FOURCC_BAND_FORM: { - LPSTREAM pClonedStream = NULL; + ULARGE_INTEGER save; struct style_band *pNewBand; TRACE_(dmfile)(": BAND RIFF\n"); - - IStream_Clone (pStm, &pClonedStream); - + + /* Can be application provided IStream without Clone method */ liMove.QuadPart = 0; liMove.QuadPart -= sizeof(FOURCC) + (sizeof(FOURCC)+sizeof(DWORD)); - IStream_Seek (pClonedStream, liMove, STREAM_SEEK_CUR, NULL); + IStream_Seek(pStm, liMove, STREAM_SEEK_CUR, &save); - hr = load_band(pClonedStream, &pBand); + hr = load_band(pStm, &pBand); if (FAILED(hr)) { ERR(": could not load track\n"); return hr; } - IStream_Release (pClonedStream); pNewBand = heap_alloc_zero(sizeof(*pNewBand)); if (NULL == pNewBand) { @@ -808,9 +806,9 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK IDirectMusicTrack_Release(pBand); pBand = NULL; /* now we can release it as it's inserted */ /** now safely move the cursor */ - liMove.QuadPart = ListSize[0]; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); - + liMove.QuadPart = save.QuadPart - liMove.QuadPart + ListSize[0]; + IStream_Seek(pStm, liMove, STREAM_SEEK_SET, NULL); + break; } default: { -- 2.24.1

Dec. 20, 2019