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

[PATCH] msvcrt: Only export __p__* functions on i386

by Martin Storsjo

The previous specification, -arch=win32, is incorrect - these functions aren't available on arm. Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b3b9cca0b9..4f55bcb45a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc -@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv -@ cdecl -arch=win32 __p___initenv() -@ cdecl -arch=win32 __p___mb_cur_max() -@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv -@ cdecl -arch=win32 __p___winitenv() -@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln -@ cdecl -arch=win32 __p__amblksiz() -@ cdecl -arch=win32 __p__commode() -@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight -@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias -@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ -@ stub -arch=win32 __p__fileinfo() -@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=i386 __p___argc() MSVCRT___p___argc +@ cdecl -arch=i386 __p___argv() MSVCRT___p___argv +@ cdecl -arch=i386 __p___initenv() +@ cdecl -arch=i386 __p___mb_cur_max() +@ cdecl -arch=i386 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=i386 __p___winitenv() +@ cdecl -arch=i386 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=i386 __p__amblksiz() +@ cdecl -arch=i386 __p__commode() +@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=i386 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=i386 __p__environ() MSVCRT___p__environ +@ stub -arch=i386 __p__fileinfo() +@ cdecl -arch=i386 __p__fmode() MSVCRT___p__fmode @ cdecl -arch=i386 __p__iob() __iob_func -@ stub -arch=win32 __p__mbcasemap() -@ cdecl -arch=win32 __p__mbctype() -@ cdecl -arch=win32 __p__osver() -@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype -@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr -@ stub -arch=win32 __p__pwctype() -@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone -@ cdecl -arch=win32 __p__tzname() -@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron -@ cdecl -arch=win32 __p__winmajor() -@ cdecl -arch=win32 __p__winminor() -@ cdecl -arch=win32 __p__winver() -@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=i386 __p__mbcasemap() +@ cdecl -arch=i386 __p__mbctype() +@ cdecl -arch=i386 __p__osver() +@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=i386 __p__pwctype() +@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=i386 __p__tzname() +@ cdecl -arch=i386 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=i386 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=i386 __p__winmajor() +@ cdecl -arch=i386 __p__winminor() +@ cdecl -arch=i386 __p__winver() +@ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() -- 2.17.1

Dec. 20, 2019

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

by Martin Storsjö

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. // Martin

Dec. 20, 2019

Re: WineTest regressions

by Alexandre Julliard

Francois Gouget <fgouget(a)free.fr> writes: > I see two options for fixing: > * Modifying wine_dbgstr_*() so they don't modify LastError. > If that's possible. It should be fixed by a812374a529f553da0f4c0b9c2d67b9178f644ff. -- Alexandre Julliard julliard(a)codeweavers.com

Dec. 20, 2019

[PATCH 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. 20, 2019

[PATCH 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. 20, 2019

[PATCH 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. 20, 2019

[PATCH 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. 20, 2019

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

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This patch series fixes builds with mingw configured to default to ucrt. In this case, symbols pulled by startup files were not present in our import lib, so symbols found in default importlib were used. Those four symbols are enough to get current llvm-mingw with default config to work with Wine. Eventually, we will have our own startup files, so we won't need to deal with problems like this. For our own startup code, some of symbols from this series may be useful as well. dlls/msvcrt/iob.c | 8 ++------ dlls/msvcrt/msvcrt.h | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-)

Dec. 20, 2019

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

by Michael Cronenworth

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. :(

Dec. 20, 2019

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

by Jacek Caban

On 12/19/19 11:53 PM, Michael Cronenworth wrote: > On 12/19/19 4:37 PM, Jacek Caban wrote: >> >> This code path is taken only when linux_distribution() is not >> available and, according to documentation, it should be available >> since version 2.6. Please look at why it's not available. > > Python 3.8 removes dist() and linux_distribution(). Fedora 32+ will > use Python 3.8. > > https://bugs.python.org/issue28167 So if we'd like to support all Python version, we'd need a third branch using the distro package and hope it will work for at least a few years... Great job, Python. 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. Jacek

Dec. 20, 2019

llvm-mingw support update

by Jacek Caban

Hi all, Last night Martin pushed an update to llvm-mingw bumping version of LLVM to a commit that includes a number of fixes for Wine. See [1] for details. Thank you, Martin! Meantime, Wine got required fixes, so that it all should mostly work together. If you want to try it, just clone [2] git and run: DEFAULT_MSVCRT=msvcrt-os ./build-all.sh /path/to/install If the installation is on PATH, current Wine should be able to use it without any additional tweaks. You should be able to configure it just like configuration on GCC-based mingw works. DEFAULT_MSVCRT=msvcrt-os part is needed because Wine can't deal with mingw-w64 defaulting to crt version other than msvcrt.dll. This is not a problem specific to LLVM, we will hit the same problem on GCC if mingw-w64 is configured to use other crt (usually ucrt, things like msvcrt100 is also possible). It is not yet a popular setup, but it will probably be more popular over time, so it would be great to have it supported. The ultimate solution for Wine is to always use -nodefaultlibs for all its binaries. It's already the case for all Wine builtin DLLs, we just need to do the same for EXEs. I have some unfinished patches for that, but it's not something appropriate for code freeze. I'm experimenting with a smaller fix, because it would be great to have something sooner, but using DEFAULT_MSVCRT=msvcrt-os is required for now. One of nice LLVM features is support for PDB files. If you want to make a build with PDB files, configure Wine like this: configure CROSSCFLAGS="-g -gcodeview -O2" CROSSLDFLAGS="-Wl,-pdb=" #append your usual args and then run make like: make CROSSLDFLAGS="-Wl,-pdb=" The additional make argument is needed because Wine does not yet propagate CROSSLDFLAGS from configure. Patch [3] should fix it. Cheers, Jacek [1] https://github.com/mstorsjo/llvm-mingw/commit/056c1f5cd22b1c5ca76af38f2d1f9… [2] https://github.com/mstorsjo/llvm-mingw [3] https://source.winehq.org/patches/data/176054

Dec. 20, 2019

Re: win32 on macOS

by Fabian Maurer

Hello Ken, do you plan to continue to work on the custom compiler or do you want to work into a different direction using unpatched clang? Regards, Fabian Maurer

Dec. 20, 2019

[PATCH] po: Update some Russian strings.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- po/ru.po | 94 +++++++++++++++----------------------------------------- 1 file changed, 25 insertions(+), 69 deletions(-) diff --git a/po/ru.po b/po/ru.po index 3292c450d0..aa5cd6b0c1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,14 +5,14 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-28 11:30+0300\n" +"PO-Revision-Date: 2019-12-20 15:34+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 2.2.1\n" +"X-Generator: Poedit 2.2.4\n" #: appwiz.rc:58 msgid "Install/Uninstall" @@ -6829,10 +6829,8 @@ msgid "Begin request has already been made.\n" msgstr "Запрос уже был инициирован.\n" #: mferror.mc:599 -#, fuzzy -#| msgid "Object is not initialized.\n" msgid "Sink has not been finalized.\n" -msgstr "Объект не инициализирован.\n" +msgstr "Приёмник данных не был завершён.\n" #: mferror.mc:32 msgid "Media Foundation platform is not initialized.\n" @@ -7055,132 +7053,96 @@ msgid "No events available.\n" msgstr "Нет доступных событий.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Данный смена состояний не поддерживается.\n" +msgstr "Некорректная смена состояний источника данных.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Достигнут конец потока данных.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Был вызван метод Shutdown().\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Длительность медиапотока не задана.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" msgstr "" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Набор свойств не найден.\n" +msgstr "Свойство не найдено.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Пустое свойство\n" +msgstr "Свойство доступно только для чтения.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Некорректный тип свойства.\n" +msgstr "Недопустимое свойство.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Ресурс занят.\n" +msgstr "Источник данных остановлен.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Данный формат не поддерживается.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Ресурс занят.\n" +msgstr "Некорректное состояние источника данных.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Не выбрано ни одного потока.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Данный формат времени не поддерживается.\n" +msgstr "Характеристики данного источника данных не поддерживаются.\n" #: mferror.mc:536 msgid "Stream sink was removed.\n" -msgstr "" +msgstr "Приёмник данных был удалён.\n" #: mferror.mc:543 msgid "Stream sinks are out of sync.\n" msgstr "" #: mferror.mc:550 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media sink stream sinks set is fixed.\n" -msgstr "Реестр был восстановлен.\n" +msgstr "Набор потоков данного приёмника данных фиксирован.\n" #: mferror.mc:557 -#, fuzzy -#| msgid "Domain already exists.\n" msgid "Stream sink already exists.\n" -msgstr "Домен уже существует.\n" +msgstr "Поток приёмника данных уже существует.\n" #: mferror.mc:564 -#, fuzzy -#| msgid "Operation was cancelled.\n" msgid "Sample allocation was canceled.\n" -msgstr "Операция была отменена.\n" +msgstr "Создание сэмпла было отменено.\n" #: mferror.mc:571 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Sample allocator is empty.\n" -msgstr "Каталог не пуст.\n" +msgstr "Аллокатор сэмплов пуст.\n" #: mferror.mc:578 -#, fuzzy -#| msgid "Clock state was already set.\n" msgid "Sink was already stopped.\n" -msgstr "Состояние часов уже установлено.\n" +msgstr "Приёмник данных уже был остановлен.\n" #: mferror.mc:585 msgid "Bitrate was unknown for ASF file sink.\n" msgstr "" #: mferror.mc:592 -#, fuzzy -#| msgid "No data detected.\n" msgid "No streams were selected for the sink.\n" -msgstr "Данные не обнаружены.\n" +msgstr "Потоки приёмника не выбраны.\n" #: mferror.mc:606 -#, fuzzy -#| msgid "File name is too long.\n" msgid "Metadata was too long.\n" -msgstr "Слишком длинное имя файла.\n" +msgstr "Превышена длина метаданных.\n" #: mferror.mc:613 msgid "No samples were processed by the sink.\n" @@ -8338,22 +8300,16 @@ msgid "Off" msgstr "Выключено" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "видео" +msgstr "Провайдер" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Выберите формат для экспорта:" +msgstr "Выберите формат для подключения:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Сво&йства" +msgstr "Свойства подключения" #: version.rc:37 msgid "OLE DB Provider(s)" -- 2.24.0

Dec. 20, 2019

[PATCH] configure: Allow setting CROSSLDFLAGS by configure.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This may be used to configure Wine to generate .pdb files with llvm-mingw, but I think this is more generally useful (for .pdb files we should make build system be aware of them, but that's a post-code freeze thing). It's already possible to set it via make argument, but not configure. Makefile.in | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+)

Dec. 20, 2019

[v2 PATCH] ole32/tests: Add a trivial test for IMoniker::Enum().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: removed 2 tests failing on XP. dlls/ole32/tests/moniker.c | 92 +++++++++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..42bc094522 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ 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 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,15 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } -- 2.24.0

Dec. 20, 2019

[PATCH] dwrite/tests: Improve coverage of IsSymbolFont() tests.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 123 +++++++++++++++++++++++++++++++-------- 1 file changed, 99 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 3dff4a6191..da75a7b70c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -446,6 +446,7 @@ enum opentype_cmap_table_platform enum opentype_cmap_table_encoding { + OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL = 0, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_BMP = 1, OPENTYPE_CMAP_TABLE_ENCODING_UNICODE_FULL = 10, }; @@ -7198,48 +7199,122 @@ static void test_CreateAlphaTexture(void) ok(ref == 0, "factory not released, %u\n", ref); } +static BOOL get_expected_is_symbol(IDWriteFontFace *fontface) +{ + BOOL exists, is_symbol = FALSE; + struct dwrite_fonttable cmap; + const TT_OS2_V2 *tt_os2; + const BYTE *tables; + void *os2_context; + WORD num_tables; + unsigned int i; + UINT32 size; + HRESULT hr; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_0S2_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) + { + if (tt_os2->version) + is_symbol = !!(GET_BE_DWORD(tt_os2->ulCodePageRange1) & FS_SYMBOL); + if (!is_symbol) + is_symbol = tt_os2->panose.bFamilyType == PAN_FAMILY_PICTORIAL; + IDWriteFontFace_ReleaseFontTable(fontface, os2_context); + } + + if (is_symbol) + return is_symbol; + + hr = IDWriteFontFace_TryGetFontTable(fontface, MS_CMAP_TAG, (const void **)&cmap.data, + &cmap.size, &cmap.context, &exists); + if (FAILED(hr) || !exists) + return is_symbol; + + num_tables = table_read_be_word(&cmap, 0, FIELD_OFFSET(struct cmap_header, numTables)); + tables = cmap.data + FIELD_OFFSET(struct cmap_header, tables); + + for (i = 0; i < num_tables; ++i) + { + struct cmap_encoding_record *record = (struct cmap_encoding_record *)(tables + i * sizeof(*record)); + WORD platform, encoding; + + platform = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, platformID)); + encoding = table_read_be_word(&cmap, record, FIELD_OFFSET(struct cmap_encoding_record, encodingID)); + + if (platform == OPENTYPE_CMAP_TABLE_PLATFORM_WIN && encoding == OPENTYPE_CMAP_TABLE_ENCODING_SYMBOL) + { + is_symbol = TRUE; + break; + } + } + + IDWriteFontFace_ReleaseFontTable(fontface, cmap.context); + + return is_symbol; +} + static void test_IsSymbolFont(void) { - static const WCHAR symbolW[] = {'S','y','m','b','o','l',0}; IDWriteFontCollection *collection; IDWriteFontFace *fontface; IDWriteFactory *factory; IDWriteFont *font; + UINT32 count, i; HRESULT hr; ULONG ref; - BOOL ret; factory = create_factory(); - /* Tahoma */ - fontface = create_fontface(factory); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(!ret, "got %d\n", ret); - hr = IDWriteFactory_GetSystemFontCollection(factory, &collection, FALSE); ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IDWriteFontCollection_GetFontFromFontFace(collection, fontface, &font); - ok(hr == S_OK, "got 0x%08x\n", hr); + count = IDWriteFontCollection_GetFontFamilyCount(collection); + for (i = 0; i < count; ++i) + { + IDWriteLocalizedStrings *names; + IDWriteFontFamily *family; + UINT32 font_count, j; + WCHAR nameW[256]; - ret = IDWriteFont_IsSymbolFont(font); - ok(!ret, "got %d\n", ret); + hr = IDWriteFontCollection_GetFontFamily(collection, i, &family); + ok(hr == S_OK, "Failed to get family, hr %#x.\n", hr); - IDWriteFontCollection_Release(collection); - IDWriteFont_Release(font); - IDWriteFontFace_Release(fontface); + 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); - /* Symbol */ - font = get_font(factory, symbolW, DWRITE_FONT_STYLE_NORMAL); - ret = IDWriteFont_IsSymbolFont(font); - ok(ret, "got %d\n", ret); + font_count = IDWriteFontFamily_GetFontCount(family); - hr = IDWriteFont_CreateFontFace(font, &fontface); - ok(hr == S_OK, "got 0x%08x\n", hr); - ret = IDWriteFontFace_IsSymbolFont(fontface); - ok(ret, "got %d\n", ret); - IDWriteFontFace_Release(fontface); - IDWriteFont_Release(font); + for (j = 0; j < font_count; ++j) + { + BOOL is_symbol_font, is_symbol_face, is_symbol_expected; + + hr = IDWriteFontFamily_GetFont(family, j, &font); + ok(hr == S_OK, "Failed to get font, hr %#x.\n", hr); + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + + is_symbol_font = IDWriteFont_IsSymbolFont(font); + is_symbol_face = IDWriteFontFace_IsSymbolFont(fontface); + ok(is_symbol_font == is_symbol_face, "Unexpected symbol flag.\n"); + + /* FIXME: failures disabled on Wine for now */ + is_symbol_expected = get_expected_is_symbol(fontface); + todo_wine_if(is_symbol_expected != is_symbol_face) + ok(is_symbol_expected == is_symbol_face, "Unexpected is_symbol flag %d for %s, font %d.\n", + is_symbol_face, wine_dbgstr_w(nameW), j); + + IDWriteFontFace_Release(fontface); + IDWriteFont_Release(font); + } + + IDWriteFontFamily_Release(family); + } + + IDWriteFontCollection_Release(collection); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); -- 2.24.0

Dec. 20, 2019

Re: [PATCH] wineserver: avoid spurious FD_WRITE on repeated calls to WSAEventSelect()

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=62386 Your paranoid android. === debian10 (32 bit French report) === ws2_32: sock.c:3056: Test failed: Test[1]: expected 0, got 2 sock.c:3056: Test failed: Test[2]: expected 0, got 2 sock.c:3056: Test failed: Test[1]: expected 0, got 2 sock.c:3056: Test failed: Test[2]: expected 0, got 2 === debian10 (32 bit Japanese:Japan report) === ws2_32: sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3056: Test failed: Test[1]: expected 0, got 2 sock.c:3051: Test failed: Test[2]: expected 2, got 0 sock.c:3056: Test failed: Test[2]: expected 0, got 2 sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3056: Test failed: Test[1]: expected 0, got 2 sock.c:3051: Test failed: Test[2]: expected 2, got 0 sock.c:3056: Test failed: Test[2]: expected 0, got 2

Dec. 20, 2019

[PATCH] msvcrt: Implement wcstod without using 'long double'.

by Erich E. Hoover

Fix for the wide equivalent of strtod (see commit c22af971c287933a137c9fbecc81823812e12b7a). Best, Erich

Dec. 20, 2019

[PATCH] wineserver: avoid spurious FD_WRITE on repeated calls to WSAEventSelect()

by Damjan Jovanovic

Repeated calls to WSAEventSelect() with FD_WRITE deliver spurious FD_WRITE events, as the flag isn't held, resulting in us unnecessarily polling the socket for writability, despite the fact FD_WRITE should only be delivered (1) initially on socket creation, and (2) after send[to]() fails with EWOULDBLOCK and buffer space becomes available. This breaks some applications (possibly #10204 and #24946). This patch prevents the spurious FD_WRITE by always holding FD_WRITE in WSAEventSelect()/set_socket_event(). It will be cleared from hmask in enable_socket_event() when a real FD_WRITE needs to be delivered. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- server/sock.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)

Dec. 20, 2019

WineTest regressions

by Francois Gouget

It looks like this patch caused two regressions: commit c8f338369695d360e021f2cbd82a18b2c0eb1514 Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Dec 17 15:54:38 2019 +0100 include: Allow using debug.h in tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> * https://test.winehq.org/data/tests/kernel32:codepage.html Something between line 333 and 336 modifies LastError, setting it to ERROR_PROC_NOT_FOUND. Probably the call to wine_dbgstr_wn(). * https://test.winehq.org/data/tests/psapi:psapi_main.html Same thing between line 680 and 684 but this time the suspect is wine_dbgstr_w(). I see two options for fixing: * Modifying wine_dbgstr_*() so they don't modify LastError. If that's possible. * Test LastError before it has been modified (or store it for testing later). That would probably be good policy regardless. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Hell is empty and all the devils are here. -- Wm. Shakespeare, "The Tempest"

Dec. 19, 2019

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

by Michael Cronenworth

On 12/19/19 4:37 PM, Jacek Caban wrote: > > This code path is taken only when linux_distribution() is not available and, > according to documentation, it should be available since version 2.6. Please look > at why it's not available. Python 3.8 removes dist() and linux_distribution(). Fedora 32+ will use Python 3.8. https://bugs.python.org/issue28167

Dec. 19, 2019

Re: win32 on macOS

by Ken Thomases

On Dec 11, 2019, at 6:19 PM, Ken Thomases <ken(a)codeweavers.com> wrote: > > On Dec 11, 2019, at 12:51 PM, Fabian Maurer <dark.shadow4(a)web.de> wrote: >> >> is there any documentation on how the CodeWeavers solution for 32bit >> Applications on Catalina works? >> I'm interested in the technical details of this miracle, but there don't seem >> to be many details out there. What I found was either on the superficial >> level, or a bunch of speculation. > > Our solution involves a custom version of the Clang compiler as well as modifications to Wine. Some folks have tried to build wine32on64 and encountered problems. That's not surprising. CodeWeavers' goal was, of course, to get CrossOver for Mac working on Catalina. To that end, we cut some corners. We didn't review all of the non-Mac, platform-specific code (e.g. "#ifdef __linux") and correct it to build in this special mode. Similarly, we don't use the X11 driver in CrossOver on the Mac. So, we didn't bother fixing its code. We configure --without-x. Wine's Vulkan code couldn't be fixed in time, so it doesn't build. We configure --without-vulkan. Also, we didn't get around to fixing winedbg in time, either. We configure with --disable-winedbg. If you use the tools from the 64-bit build of Wine when building 32-on-64-bit (--with-wine64=…), then you need to have built the 64-bit build with the custom compiler, too. I think that's it. -Ken

Dec. 19, 2019

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

by Jacek Caban

On 19/12/2019 22:48, Michael Cronenworth wrote: > Hi Jacek, > > Trying to build 2.47.1 on Fedora Rawhide (32) results in failures for > both Python 3 and Python 2. > > Python 3: > ... > File > "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/testing/mozbase/mozinfo/mozinfo/mozinfo.py", > line 93, in <module> > (distro, os_version, codename) = platform.dist() > AttributeError: module 'platform' has no attribute 'dist' This code path is taken only when linux_distribution() is not available and, according to documentation, it should be available since version 2.6. Please look at why it's not available. Thanks, Jacek

Dec. 19, 2019

[PATCH 3/3] dmime: Implement IDirectMusicPerformance8_PChannelInfo()

by Michael Stefaniuc

NOT FOR THE FREEZE ==> DEFER Not needed for the bugs referenced in patch 1 but to validate the tests from patch 2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmime/performance.c | 31 ++++++++++++++++++++++--------- dlls/dmime/tests/performance.c | 24 +++++++++++------------- 2 files changed, 33 insertions(+), 22 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 2124c1fe35..9f489f5e36 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -701,18 +701,29 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPe } static HRESULT WINAPI IDirectMusicPerformance8Impl_PChannelInfo(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort **port, DWORD *group, DWORD *MChannel) + DWORD pchannel, IDirectMusicPort **port, DWORD *group, DWORD *channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - DMUS_PORTPARAMS8 port_params; - GUID default_port; + struct pchannel_block *block; + struct wine_rb_entry *entry; + DWORD block_num = pchannel / 16; + unsigned int index = pchannel % 16; - FIXME("(%p)->(%d, %p, %p, %p): stub\n", This, PChannel, port, group, MChannel); + TRACE("(%p)->(%d, %p, %p, %p)\n", This, pchannel, port, group, channel); - port_params.dwSize = sizeof(DMUS_PORTPARAMS8); - port_params.dwValidParams = 0; - IDirectMusic8_GetDefaultPort(This->dmusic, &default_port); - IDirectMusic8_CreatePort(This->dmusic, &default_port, &port_params, port, NULL); + entry = wine_rb_get(&This->pchannels, &block_num); + if (!entry) + return E_INVALIDARG; + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + if (port) { + *port = block->pchannel[index].port; + IDirectMusicPort_AddRef(*port); + } + if (group) + *group = block->pchannel[index].group; + if (channel) + *channel = block->pchannel[index].channel; return S_OK; } @@ -1102,7 +1113,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_CreateStandardAudioPath(IDire return E_INVALIDARG; } - /* FIXME: Should we create one secondary buffer for each PChannel? */ + /* FIXME: Create a proper port with enough dwGroups for the PChannels */ + IDirectMusicPerformance8_AddPort(iface, NULL); + hr = IDirectSound_CreateSoundBuffer(This->dsound, &desc, &buffer, NULL); if (FAILED(hr)) return DSERR_BUFFERLOST; diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..adc20224c0 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -101,9 +101,9 @@ static HRESULT test_InitAudio(void) port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); - ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + todo_wine ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); @@ -129,7 +129,7 @@ static HRESULT test_InitAudio(void) hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -344,7 +344,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); ok(hr == S_OK, "Init failed: %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); - todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ hr = IDirectMusicPerformance8_AddPort(perf, NULL); @@ -355,18 +355,16 @@ static void test_pchannel(void) ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + ok(hr == S_OK && port == port2 && group == 1 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } /* Unset PChannels fail to retrieve */ - todo_wine { hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); - } /* Channel group 0 can be set just fine */ hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); @@ -375,7 +373,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = 1; i < 16; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + ok(hr == S_OK && port == port2 && group == 0 && channel == i, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -406,7 +404,7 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + ok(hr == S_OK && port2 == port && group == 1 && channel == 7, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -416,7 +414,7 @@ static void test_pchannel(void) ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); } @@ -425,17 +423,17 @@ static void test_pchannel(void) hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + ok(hr == S_OK && port2 == port && group == 1 && channel == 13, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + ok(hr == S_OK && port2 == port && group == 0 && channel == 8, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); group = channel = 0xdeadbeef; hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); - todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + ok(hr == S_OK && port2 == port && group == 0 && channel == 15, "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); IDirectMusicPort_Release(port2); -- 2.24.1

Dec. 19, 2019

[PATCH 2/3] dmime/tests: Add PChannel tests

by Michael Stefaniuc

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Tests crash reliable without patch 1. They crash with the patch in Staging too. dlls/dmime/tests/performance.c | 126 ++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 1d17e5200e..4c340252aa 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -100,10 +100,18 @@ static HRESULT test_InitAudio(void) return hr; port = NULL; + hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 127, &port, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); - ok(hr == S_OK, "Failed to call PChannelInfo (%x)\n", hr); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); ok(port != NULL, "IDirectMusicPort not set\n"); - if (hr == S_OK && port != NULL) + hr = IDirectMusicPerformance8_AssignPChannel(performance, 0, port, 0, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannel failed (%08x)\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(performance, 0, port, 0); + todo_wine ok(hr == DMUS_E_AUDIOPATHS_IN_USE, "AssignPChannelBlock failed (%08x)\n", hr); + if (port) IDirectMusicPort_Release(port); hr = IDirectMusicPerformance8_GetDefaultAudioPath(performance, &path); @@ -120,6 +128,8 @@ static HRESULT test_InitAudio(void) create_performance(&performance, NULL, NULL, FALSE); hr = IDirectMusicPerformance8_InitAudio(performance, NULL, NULL, NULL, 0, 64, 0, NULL); ok(hr == S_OK, "InitAudio failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(performance, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x\n", hr); destroy_performance(performance, NULL, NULL); /* Refcounts for auto generated dmusic and dsound */ @@ -322,6 +332,117 @@ static void test_createport(void) IDirectMusicPerformance_Release(perf); } +static void test_pchannel(void) +{ + IDirectMusicPerformance8 *perf; + IDirectMusicPort *port = NULL, *port2; + DWORD channel, group; + unsigned int i; + HRESULT hr; + + create_performance(&perf, NULL, NULL, FALSE); + hr = IDirectMusicPerformance8_Init(perf, NULL, NULL, NULL); + ok(hr == S_OK, "Init failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && !port, "PChannelInfo failed, got %08x, %p\n", hr, port); + + /* Add default port. Sets PChannels 0-15 to the corresponding channels in group 1 */ + hr = IDirectMusicPerformance8_AddPort(perf, NULL); + ok(hr == S_OK, "AddPort of default port failed: %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, NULL, NULL, NULL); + ok(hr == S_OK, "PChannelInfo failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 0, &port, NULL, NULL); + ok(hr == S_OK && port, "PChannelInfo failed, got %08x, %p\n", hr, port); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 1 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Unset PChannels fail to retrieve */ + todo_wine { + hr = IDirectMusicPerformance8_PChannelInfo(perf, 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD - 16, &port2, NULL, NULL); + ok(hr == E_INVALIDARG, "PChannelInfo failed, got %08x, %p\n", hr, port); + } + + /* Channel group 0 can be set just fine */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 0, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, 0, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = 1; i < 16; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port == port2 && group == 0 && channel == i, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Last PChannel Block can be set only individually but not read */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, MAXDWORD, port, 0, 3); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + port2 = (IDirectMusicPort *)0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, MAXDWORD, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD, port, 0); + ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 15; i < MAXDWORD; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 0, 0); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG && port2 == (IDirectMusicPort *)0xdeadbeef, + "PChannelInfo failed, got %08x, %p\n", hr, port2); + } + + /* Second to last PChannel Block can be set only individually and read */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 1, port, 1); + todo_wine ok(hr == E_INVALIDARG, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 31; i < MAXDWORD - 15; i++) { + hr = IDirectMusicPerformance8_AssignPChannel(perf, i, port, 1, 7); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 7, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* Third to last PChannel Block behaves normal */ + hr = IDirectMusicPerformance8_AssignPChannelBlock(perf, MAXDWORD / 16 - 2, port, 0); + ok(hr == S_OK, "AssignPChannelBlock failed, got %08x\n", hr); + for (i = MAXDWORD - 47; i < MAXDWORD - 31; i++) { + hr = IDirectMusicPerformance8_PChannelInfo(perf, i, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == i % 16, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + } + + /* One PChannel set in a Block, rest is initialized too */ + hr = IDirectMusicPerformance8_AssignPChannel(perf, 4711, port, 1, 13); + ok(hr == S_OK, "AssignPChannel failed, got %08x\n", hr); + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4711, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 1 && channel == 13, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4712, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 8, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + group = channel = 0xdeadbeef; + hr = IDirectMusicPerformance8_PChannelInfo(perf, 4719, &port2, &group, &channel); + todo_wine ok(hr == S_OK && port2 == port && group == 0 && channel == 15, + "PChannelInfo failed, got %08x, %p, %u, %u\n", hr, port2, group, channel); + IDirectMusicPort_Release(port2); + + IDirectMusicPort_Release(port); + destroy_performance(perf, NULL, NULL); +} + static void test_COM(void) { IDirectMusicPerformance *dmp = (IDirectMusicPerformance*)0xdeadbeef; @@ -504,6 +625,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_pchannel(); test_notification_type(); CoUninitialize(); -- 2.24.1

Dec. 19, 2019

[PATCH 1/3] dmime: Use a rbtree to store the PChannels of a performance

by Michael Stefaniuc

The PChannel id is a 32bit, potentially random identifier and not an array index. Fixes also the handling of channel group "dwGroup" 0. As it is invalid it is used to mark uninitialized PChannels. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=17766 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=24740 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31562 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- Supersedes the Staging patch dmime-PChannel-range. Fixes memory corruption related crashes: - Fixes bug 17766, tested with Empire Earth Demo. - Should fix bug 24740 too as that is the origin of the workaround included in Staging. But BigFish GameLauncher is a pita so can't test. - Fixes the first crash in bug 31562 and lets the game continue until it hits the next crash (unrelated to PChannels). dlls/dmime/performance.c | 109 +++++++++++++++++++++++++++------------ 1 file changed, 75 insertions(+), 34 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index 615a3f8b14..2124c1fe35 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -19,10 +19,18 @@ */ #include "dmime_private.h" +#include "wine/heap.h" +#include "wine/rbtree.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmime); +struct pchannel_block { + DWORD block_num; /* Block 0 is PChannels 0-15, Block 1 is PChannels 16-31, etc */ + DMUSIC_PRIVATE_PCHANNEL pchannel[16]; + struct wine_rb_entry entry; +}; + typedef struct IDirectMusicPerformance8Impl { IDirectMusicPerformance8 IDirectMusicPerformance8_iface; LONG ref; @@ -35,7 +43,7 @@ typedef struct IDirectMusicPerformance8Impl { float fMasterTempo; long lMasterVolume; /* performance channels */ - DMUSIC_PRIVATE_PCHANNEL PChannel[32]; + struct wine_rb_tree pchannels; /* IDirectMusicPerformance8Impl fields */ IDirectMusicAudioPath *pDefaultPath; HANDLE hNotification; @@ -192,6 +200,49 @@ static BOOL PostMessageToProcessMsgThread(IDirectMusicPerformance8Impl* This, UI return PostThreadMessageA(This->procThreadId, iMsg, 0, 0); } +static int pchannel_block_compare(const void *key, const struct wine_rb_entry *entry) +{ + const struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, const struct pchannel_block, entry); + + return *(DWORD *)key - b->block_num; +} + +static void pchannel_block_free(struct wine_rb_entry *entry, void *context) +{ + struct pchannel_block *b = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + + heap_free(b); +} + +static struct pchannel_block *pchannel_block_set(struct wine_rb_tree *tree, DWORD block_num, + IDirectMusicPort *port, DWORD group, BOOL only_set_new) +{ + struct pchannel_block *block; + struct wine_rb_entry *entry; + unsigned int i; + + entry = wine_rb_get(tree, &block_num); + if (entry) { + block = WINE_RB_ENTRY_VALUE(entry, struct pchannel_block, entry); + if (only_set_new) + return block; + } else { + if (!(block = heap_alloc(sizeof(*block)))) + return NULL; + block->block_num = block_num; + } + + for (i = 0; i < 16; ++i) { + block->pchannel[i].port = port; + block->pchannel[i].group = group; + block->pchannel[i].channel = i; + } + if (!entry) + wine_rb_put(tree, &block->block_num, &block->entry); + + return block; +} + static inline IDirectMusicPerformance8Impl *impl_from_IDirectMusicPerformance8(IDirectMusicPerformance8 *iface) { return CONTAINING_RECORD(iface, IDirectMusicPerformance8Impl, IDirectMusicPerformance8_iface); @@ -236,6 +287,7 @@ static ULONG WINAPI IDirectMusicPerformance8Impl_Release(IDirectMusicPerformance TRACE("(%p): ReleaseRef to %d\n", This, ref); if (ref == 0) { + wine_rb_destroy(&This->pchannels, pchannel_block_free, NULL); This->safe.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->safe); HeapFree(GetProcessHeap(), 0, This); @@ -579,7 +631,6 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman GUID port_guid; IDirectMusicPort* pDefaultPort = NULL; DMUS_PORTPARAMS params; - int i, j; hr = IDirectMusic8_GetDefaultPort(This->dmusic, &port_guid); if (FAILED(hr)) return hr; ZeroMemory(&params, sizeof(params)); @@ -591,15 +642,7 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_AddPort(IDirectMusicPerforman if (FAILED(hr)) return hr; hr = IDirectMusicPort_Activate(pDefaultPort, TRUE); if (FAILED(hr)) { IDirectMusicPort_Release(pDefaultPort); return hr; } - j = 0; - for (i = 0; i < 16; ++i) { - if (NULL == This->PChannel[i].port) { - This->PChannel[i].port = pPort; - This->PChannel[i].group = 0; - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - } + IDirectMusicPerformance8_AssignPChannelBlock(iface, 0, pDefaultPort, 1); } else { IDirectMusicPort_AddRef(pPort); } @@ -621,41 +664,38 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_RemovePort(IDirectMusicPerfor } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannelBlock(IDirectMusicPerformance8 *iface, - DWORD dwBlockNum, IDirectMusicPort *pPort, DWORD dwGroup) + DWORD block_num, IDirectMusicPort *port, DWORD group) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - int i, j, range /* min value in range */; - - FIXME("(%p, %d, %p, %d): semi-stub\n", This, dwBlockNum, pPort, dwGroup-1); - if (NULL == pPort) return E_POINTER; - - range = 16 * dwBlockNum; - j = 0; - for (i = range; i < range+16; i++) { - /*TRACE("Setting PChannel[%i] to port %p, group %ld, MIDI port %i\n", i, pPort, dwGroup-1, j); */ - This->PChannel[i].port = pPort; - This->PChannel[i].group = dwGroup - 1; /* first index is always zero */ - This->PChannel[i].channel = j; /* FIXME: should this be assigned? */ - j++; - } - /*if (dwGroup > 2) return S_FALSE;*/ + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - return S_OK; + FIXME("(%p, %d, %p, %d): semi-stub\n", This, block_num, port, group); + + if (!port) + return E_POINTER; + if (block_num > MAXDWORD / 16) + return E_INVALIDARG; + + pchannel_block_set(&This->pchannels, block_num, port, group, FALSE); + + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_AssignPChannel(IDirectMusicPerformance8 *iface, - DWORD PChannel, IDirectMusicPort *port, DWORD group, DWORD MChannel) + DWORD pchannel, IDirectMusicPort *port, DWORD group, DWORD channel) { IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + struct pchannel_block *block; - TRACE("(%p)->(%d, %p, %d, %d)\n", This, PChannel, port, group, MChannel); + FIXME("(%p)->(%d, %p, %d, %d) semi-stub\n", This, pchannel, port, group, channel); if (!port) return E_POINTER; - This->PChannel[PChannel].port = port; - This->PChannel[PChannel].group = group; - This->PChannel[PChannel].channel = MChannel; + block = pchannel_block_set(&This->pchannels, pchannel / 16, port, 0, TRUE); + if (block) { + block->pchannel[pchannel % 16].group = group; + block->pchannel[pchannel % 16].channel = channel; + } return S_OK; } @@ -1211,6 +1251,7 @@ HRESULT WINAPI create_dmperformance(REFIID lpcGUID, void **ppobj) obj->pDefaultPath = NULL; InitializeCriticalSection(&obj->safe); obj->safe.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IDirectMusicPerformance8Impl*->safe"); + wine_rb_init(&obj->pchannels, pchannel_block_compare); obj->rtLatencyTime = 100; /* 100 ms TO FIX */ obj->dwBumperLength = 50; /* 50 ms default */ -- 2.24.1

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Alexandre Julliard

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > On Thu, Dec 19, 2019 at 2:58 AM Alexandre Julliard <julliard(a)winehq.org> wrote: >> "Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: >>. .. >> > Subject: msvcrt: Implement strtod without using 'long double'. >> > >> > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 >> > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> >> ... >> >> Thanks! Do we still need the control87 call then? > > No problem! Yes, unfortunately calculating 1.7976931348623158e+308 > (DBL_MAX) requires 64-bit doubles*. This works just fine on x86-64, > but x86-32 defaults to 53-bit precision. However, it would be > possible to only change the precision if we get into the range of > values where it becomes a problem, though that might be a little > complicated to do properly. > >> Also we should do the same changes in wcstod(). > > Would you like that as a separate patch or part of this one? A separate patch would be nice. I've committed the first one with a few changes. -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Re: [PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.

by Alexandre Julliard

Jeff Smith <whydoubt(a)gmail.com> writes: > @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown > default: wireHGLOBAL hGeneric; > } GDI_OBJECT; > > + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when > + * NONAMELESSUNION is not defined, so only define it for C++. */ > + cpp_quote("#ifndef __cplusplus") > + cpp_quote("#define _STGMEDIUM_UNION") > + cpp_quote("#endif") You may want to make this conditional on NONAMELESSUNION then. This way there's an easy way to get the definition if necessary. -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Wine Gecko 2.47.1 is not compatible with Python 2 or 3

by Michael Cronenworth

Hi Jacek, Trying to build 2.47.1 on Fedora Rawhide (32) results in failures for both Python 3 and Python 2. Python 3: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/testing/mozbase/mozinfo/mozinfo/mozinfo.py", line 93, in <module> (distro, os_version, codename) = platform.dist() AttributeError: module 'platform' has no attribute 'dist' Python 2: ... File "/builddir/build/BUILD/wine-gecko-2.47.1/wine-gecko-2.47.1/build/mach_bootstrap.py", line 331 print(NO_MERCURIAL_SETUP.format(mach=sys.argv[0]), file=sys.stderr) ^ SyntaxError: invalid syntax Am I missing something? Thanks, Michael

Dec. 19, 2019

Re: [PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.

by Michael Stefaniuc

Hello Alistair, On 12/19/19 7:59 AM, Alistair Leslie-Hughes wrote: > I have another patch that causes this function to be called (faking a > set notification). So, Yes it's currently a noop but it's small and not > going to effect anything. if you need it for a patch that fixes a bug than sure, please resubmit it as patch series with that patch during the freeze. I've would have signed-off on the patch after reading the documentation I've linked. But the timing wasn't right for a low risk but zero benefit during the freeze patch. > I happy for it to be differed for required. I've had to create a 'dmdefer' branch anyway for my two outstanding patches. So I've added your patch to that too. thanks bye michael > > Alistair. > > > On 19/12/19 7:55 am, Michael Stefaniuc wrote: >> Hello Alistair, >> >> while this patch is technically correct >> https://nam02.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdoc.51wind… >> I'm wondering why it was triggered by bug #25728 (comments 34 and 35). >> >> I don't see a FreePMsg in the log >> https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.wine… >> I also don't see a FreePMsg in any of the logs I have. >> Nor in the attachments of all directx-dmusic bugs. >> >> Also we don't set punkUser anywhere in the whole Wine code >> >> wine$ git grep -n punkUser >> dlls/dmime/performance.c:482: if (pPMSG->punkUser) >> dlls/dmime/performance.c:483: IUnknown_Release(pPMSG->punkUser); >> dlls/dmime/tests/performance.c:447: ok(msg->punkUser != NULL, >> "Unexpected NULL pointer\n"); >> dlls/dmime/tests/performance.c:448: if (msg->punkUser) { >> dlls/dmime/tests/performance.c:452: hr = >> IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, >> (void**)&segmentstate); >> include/dmusici.h:363: IUnknown* punkUser; >> >> While we seem to have a test that checks for non-NULL punkUser, that >> test doesn't runs on Wine. Changing to ok(msg->punkUser == NULL, ...) >> still passes on Wine. >> That test does run on Windows though >> https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftestbot.w… >> >> >> So this patch is a no-op for now iff we allocate zero all the messages. >> Else we might crash on uninitialized memory. So it does sound like a >> "Deferred" to me. >> >> >> bye >> michael >> >> >> >> On 12/18/19 6:17 AM, Alistair Leslie-Hughes wrote: >>> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >>> --- >>> dlls/dmime/performance.c | 4 +++- >>> 1 file changed, 3 insertions(+), 1 deletion(-) >>> >>> diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c >>> index 9dbb469f388..a63bd3b4517 100644 >>> --- a/dlls/dmime/performance.c >>> +++ b/dlls/dmime/performance.c >>> @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma >>> DMUS_ItemRemoveFromQueue( This, pItem ); >>> LeaveCriticalSection(&This->safe); >>> >>> - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ >>> + if (pPMSG->punkUser) >>> + IUnknown_Release(pPMSG->punkUser); >>> + >>> HeapFree(GetProcessHeap(), 0, pItem); >>> return S_OK; >>> } >>> >>

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Erich E. Hoover

On Thu, Dec 19, 2019 at 2:58 AM Alexandre Julliard <julliard(a)winehq.org> wrote: > "Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: >. .. > > Subject: msvcrt: Implement strtod without using 'long double'. > > > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 > > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> > ... > > Thanks! Do we still need the control87 call then? No problem! Yes, unfortunately calculating 1.7976931348623158e+308 (DBL_MAX) requires 64-bit doubles*. This works just fine on x86-64, but x86-32 defaults to 53-bit precision. However, it would be possible to only change the precision if we get into the range of values where it becomes a problem, though that might be a little complicated to do properly. > Also we should do the same changes in wcstod(). Would you like that as a separate patch or part of this one? Best, Erich * I am unaware of a way to multiply 1.7976931348623158 by 1e+308 with 53-bit doubles.

Dec. 19, 2019

[PATCH] configure: Don't check for gssapi-krb5 if krb5 is missing

by Andrew Eikum

This works around a broken krb5 package in CentOS which is missing a dependency. configure would find gssapi-krb5, but not krb5, which would cause a build failure later in <dlls/kerberos>. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48314 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- configure.ac | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 8a121bce016..c8399de6ebf 100644 --- a/configure.ac +++ b/configure.ac @@ -1825,21 +1825,24 @@ WINE_NOTICE_WITH(krb5,[test "x$ac_cv_lib_soname_krb5" = "x"], [libkrb5 ${notice_platform}development files not found (or too old), Kerberos won't be supported.]) dnl **** Check for gssapi **** -if test "x$with_gssapi" != "xno" +if test "x$ac_cv_lib_soname_krb5" != "x" -o "x$with_gssapi" = "xyes" then - WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, - [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], - [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], - [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) - if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" - then - WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) - else - GSSAPI_CFLAGS="" - fi]) + if test "x$with_gssapi" != "xno" + then + WINE_PACKAGE_FLAGS(GSSAPI,[krb5-gssapi],, + [`${KRB5_CONFIG:-krb5-config} --cflags gssapi 2>/dev/null`], + [`${KRB5_CONFIG:-krb5-config} --libs gssapi 2>/dev/null`], + [AC_CHECK_HEADERS([gssapi/gssapi.h gssapi/gssapi_ext.h]) + if test "$ac_cv_header_gssapi_gssapi_h" = "yes" -a "$ac_cv_header_gssapi_gssapi_ext_h" = "yes" + then + WINE_CHECK_SONAME(gssapi_krb5, gss_init_sec_context,,[GSSAPI_CFLAGS=""],[$GSSAPI_LIBS]) + else + GSSAPI_CFLAGS="" + fi]) + fi + WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], + [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) fi -WINE_NOTICE_WITH(gssapi,[test "x$ac_cv_lib_soname_gssapi_krb5" = "x"], - [libgssapi_krb5 ${notice_platform}development files not found (or too old), no Kerberos SSP support.]) dnl **** Check for libjpeg **** if test "x$with_jpeg" != "xno" -- 2.24.1

Dec. 19, 2019

[PATCH] include: Define the _STGMEDIUM_UNION type for C++ only.

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> --- This is like https://source.winehq.org/patches/data/175999 except that this version uses #define to blank-out _STGMEDIUM_UNION for non-C++, rather than having an idl version of the enclosing struct for C++ and a baked version of that struct for non-C++. include/objidl.idl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/include/objidl.idl b/include/objidl.idl index a0ad1f6e01..844b94af86 100644 --- a/include/objidl.idl +++ b/include/objidl.idl @@ -1426,8 +1426,14 @@ interface IAdviseSink : IUnknown default: wireHGLOBAL hGeneric; } GDI_OBJECT; + /* Defining the _STGMEDIUM_UNION type yields a violation of the C spec when + * NONAMELESSUNION is not defined, so only define it for C++. */ + cpp_quote("#ifndef __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("#ifndef __cplusplus") + cpp_quote("#undef _STGMEDIUM_UNION") + cpp_quote("#endif") + typedef [unique] userSTGMEDIUM *wireSTGMEDIUM; typedef [wire_marshal(wireSTGMEDIUM)] uSTGMEDIUM STGMEDIUM; -- 2.23.0

Dec. 19, 2019

Re: [PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

by Nikolay Sivov

On 12/19/19 5:31 PM, Marvin wrote: > 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=62345 > > Your paranoid android. > > > === wxppro (32 bit report) === > > ole32: > moniker.c:2470: Test failed: Unexpected pointer. > moniker.c:2476: Test failed: Unexpected pointer. > > === w2003std (32 bit report) === > > ole32: > moniker.c:2470: Test failed: Unexpected pointer. > moniker.c:2476: Test failed: Unexpected pointer. Okay, ignore patch 2/2 please, older versions differ apparently.

Dec. 19, 2019

Re: [PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.

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=62347 Your paranoid android. === debian10 (32 bit Chinese:China report) === wininet: http.c:5034: Test failed: expected 1 pending read, got 2

Dec. 19, 2019

Re: [PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

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=62345 Your paranoid android. === wxppro (32 bit report) === ole32: moniker.c:2470: Test failed: Unexpected pointer. moniker.c:2476: Test failed: Unexpected pointer. === w2003std (32 bit report) === ole32: moniker.c:2470: Test failed: Unexpected pointer. moniker.c:2476: Test failed: Unexpected pointer.

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

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=62342 Your paranoid android. === debian10 (32 bit report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit French report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit Japanese:Japan report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit Chinese:China report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (32 bit WoW report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 === debian10 (64 bit WoW report) === wininet: url.c:222: Test failed: [res://IELib.dll/test.htm] url.nScheme = 8, expected 11 url.c:297: Test failed: [res://IELib.dll/test.htm] urlw.nScheme = 8, expected 11 url.c:383: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8 url.c:438: Test failed: [res://IELib.dll/test.htm] Got wrong nScheme, expected: 11, got: 8

Dec. 19, 2019

[PATCH 2/2] wininet: Don't set default gopher protocol in InternetCrackUrlW.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 3 --- dlls/wininet/tests/url.c | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-)

Dec. 19, 2019

[PATCH v2 1/2] wininet: Add missing schemes to url_schemes.

by Jacek Caban

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 23 +++++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 17 insertions(+), 11 deletions(-)

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

by Jacek Caban

On 12/19/19 3:05 PM, Vijay Kiran Kamuju wrote: > Hi Jacek, > > There is a spell mistake it should be L"gopher", not L"gohper", Yeah, I messed more than that by sending a wrong version. I will send v2 soon. Thanks, Jacek

Dec. 19, 2019

[PATCH 2/2] ole32/tests: Add a trivial test for IMoniker::Enum().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 96 +++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e4d693b442..9806777698 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1532,6 +1532,7 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { IMoniker *moniker, *inverse, *reduced; + IEnumMoniker *enummoniker; HRESULT hr; DWORD moniker_type; DWORD hash; @@ -1609,6 +1610,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); @@ -1617,6 +1633,7 @@ todo_wine static void test_file_moniker(WCHAR* path) { IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; + IEnumMoniker *enummoniker; DWORD moniker_type; IBindCtx *bind_ctx; IStream *stream; @@ -1673,6 +1690,21 @@ todo_wine ok(reduced == moniker1, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker1, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker1, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bind_ctx); IStream_Release(stream); @@ -1792,6 +1824,7 @@ 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 }; + IEnumMoniker *enummoniker; WCHAR *display_name; LARGE_INTEGER pos; IStream *stream; @@ -1946,6 +1979,21 @@ todo_wine ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); /* IsEqual */ @@ -1996,6 +2044,7 @@ static void test_anti_moniker(void) FILETIME filetime; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; + IEnumMoniker *enummoniker; IStream *stream; WCHAR *name; @@ -2169,11 +2218,27 @@ todo_wine IStream_Release(stream); + /* Reduce() */ hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); ok(reduced == moniker, "Unexpected moniker.\n"); IMoniker_Release(reduced); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); @@ -2181,6 +2246,7 @@ todo_wine static void test_generic_composite_moniker(void) { + IEnumMoniker *enummoniker; HRESULT hr; IMoniker *moniker; IMoniker *moniker1; @@ -2265,18 +2331,31 @@ todo_wine ok(moniker_type == MKSYS_GENERICCOMPOSITE, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Enum() */ + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); + ok(hr == S_OK, "Failed to get enumerator, hr %#x.\n", hr); + IEnumMoniker_Release(enummoniker); + + hr = IMoniker_Enum(moniker, FALSE, NULL); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + IMoniker_Release(moniker); } static void test_pointer_moniker(void) { + IMoniker *moniker, *inverse; + IEnumMoniker *enummoniker; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; IStream *stream; IROTData *rotdata; @@ -2383,6 +2462,19 @@ todo_wine IBindCtx_Release(bindctx); + /* Enum() */ + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, TRUE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + + enummoniker = (void *)0xdeadbeef; + hr = IMoniker_Enum(moniker, FALSE, &enummoniker); +todo_wine + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!enummoniker, "Unexpected pointer.\n"); + IMoniker_Release(moniker); } -- 2.24.0

Dec. 19, 2019

[PATCH 1/2] ole32/tests: Add some tests for Reduce().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/ole32/tests/moniker.c | 47 +++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index b65c0115ca..e4d693b442 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1531,12 +1531,11 @@ todo_wine_if(moniker_type == MKSYS_GENERICCOMPOSITE) static void test_class_moniker(void) { + IMoniker *moniker, *inverse, *reduced; HRESULT hr; - IMoniker *moniker; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; - IMoniker *inverse; IUnknown *unknown; FILETIME filetime; @@ -1597,8 +1596,6 @@ todo_wine ok_ole_success(hr, IMoniker_BindToStorage); IUnknown_Release(unknown); - IBindCtx_Release(bindctx); - hr = IMoniker_Inverse(moniker, &inverse); ok(hr == S_OK, "Failed to get inverse, hr %#x.\n", hr); hr = IMoniker_IsSystemMoniker(inverse, &moniker_type); @@ -1606,13 +1603,22 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bindctx); + IMoniker_Release(moniker); } static void test_file_moniker(WCHAR* path) { - IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse; + IMoniker *moniker1 = NULL, *moniker2 = NULL, *inverse, *reduced; DWORD moniker_type; + IBindCtx *bind_ctx; IStream *stream; IUnknown *unk; HRESULT hr; @@ -1654,6 +1660,21 @@ todo_wine hr = IMoniker_IsEqual(moniker1, moniker2); ok_ole_success(hr, IsEqual); + /* Reduce() */ + hr = CreateBindCtx(0, &bind_ctx); + ok(hr == S_OK, "Failed to create bind context, hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, NULL, MKRREDUCE_ALL, NULL, &reduced); +todo_wine + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker1, bind_ctx, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker1, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + + IBindCtx_Release(bind_ctx); + IStream_Release(stream); if (moniker1) IMoniker_Release(moniker1); @@ -1761,7 +1782,7 @@ static void test_item_moniker(void) { L"%", L"A", 0x41 }, { L"%", L"a", 0x41 }, }; - IMoniker *moniker, *moniker2; + IMoniker *moniker, *moniker2, *reduced; HRESULT hr; DWORD moniker_type, i; DWORD hash; @@ -1919,6 +1940,12 @@ todo_wine ok(moniker_type == MKSYS_ANTIMONIKER, "Unexpected moniker type %d.\n", moniker_type); IMoniker_Release(inverse); + /* Reduce() */ + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IMoniker_Release(moniker); /* IsEqual */ @@ -1961,13 +1988,12 @@ static void stream_write_dword(IStream *stream, DWORD value) static void test_anti_moniker(void) { - IMoniker *moniker, *moniker2, *moniker3; + IMoniker *moniker, *moniker2, *moniker3, *inverse, *reduced; HRESULT hr; DWORD moniker_type; DWORD hash; IBindCtx *bindctx; FILETIME filetime; - IMoniker *inverse; IUnknown *unknown; static const WCHAR expected_display_name[] = { '\\','.','.',0 }; IStream *stream; @@ -2143,6 +2169,11 @@ todo_wine IStream_Release(stream); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &reduced); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(reduced == moniker, "Unexpected moniker.\n"); + IMoniker_Release(reduced); + IBindCtx_Release(bindctx); IMoniker_Release(moniker); IMoniker_Release(moniker2); -- 2.24.0

Dec. 19, 2019

Re: [PATCH] wininet: Add missing schemes to url_schemes.

by Vijay Kiran Kamuju

Hi Jacek, There is a spell mistake it should be L"gopher", not L"gohper", Thanks, Vijay On Thu, Dec 19, 2019 at 2:51 PM Jacek Caban <jacek(a)codeweavers.com> wrote: > > > Fixes res URL scheme handling. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> > --- > dlls/wininet/internet.c | 20 ++++++++++---------- > dlls/wininet/tests/url.c | 5 ++++- > 2 files changed, 14 insertions(+), 11 deletions(-) > >

Dec. 19, 2019

[PATCH] wininet: Add missing schemes to url_schemes.

by Jacek Caban

Fixes res URL scheme handling. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=31399 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/internet.c | 20 ++++++++++---------- dlls/wininet/tests/url.c | 5 ++++- 2 files changed, 14 insertions(+), 11 deletions(-)

Dec. 19, 2019

[PATCH] rpcrt4: Support VT_BSTR in get_param_pointer_info.

by Jacek Caban

Fixes a leak in typelib marshaller. Based on patch by Kevin Puetz. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This was reported as a typelib marshaller rewrite regression. dlls/rpcrt4/ndr_typelib.c | 6 ++++++ 1 file changed, 6 insertions(+)

Dec. 19, 2019

Re: [PATCH v2] msvcrt: Implement strtod without using 'long double'.

by Alexandre Julliard

"Erich E. Hoover" <erich.e.hoover(a)gmail.com> writes: > v2: Fix test results on 32-bit Debian *sigh* > > Fixes the "regression" with cl.exe caused by > 0e183cc3c0d3b6f89f79047cdd71c389afc75073. > ( https://bugs.winehq.org/show_bug.cgi?id=48160 ) > > Best, > Erich > > From 9742794ff106d76713f80c6497accc1fc78ae6c9 Mon Sep 17 00:00:00 2001 > From: "Erich E. Hoover" <erich.e.hoover(a)gmail.com> > Date: Wed, 18 Dec 2019 15:48:11 -0700 > Subject: msvcrt: Implement strtod without using 'long double'. > > Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48160 > Signed-off-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> > --- > dlls/msvcrt/string.c | 60 ++++++++++++++++++++++++++------------ > dlls/msvcrt/tests/string.c | 44 ++++++++++++++++++++++++++-- > 2 files changed, 83 insertions(+), 21 deletions(-) Thanks! Do we still need the control87 call then? Also we should do the same changes in wcstod(). -- Alexandre Julliard julliard(a)winehq.org

Dec. 19, 2019

Re: [PATCH 0/3] RFC: Implement MemoryWorkingSetExInformation.

by Paul Gofman

On 12/19/19 00:28, Alexandre Julliard wrote: > Andrew Wesie <awesie(a)gmail.com> writes: > >> If someone has an alternative approach, or there is appetite using the staging >> stub in upstream Wine, that would be very welcome feedback. > If the partial stub is enough to make the application happy, that's good > enough for now. Adding a more correct but more expensive solution can > wait until we find an app that requires it. > Just for consideration, I would like to point out that there is a set of native API functions most of DRM / anticheats calling these days (various NtQuery... functions at the first place). Many of their information classes are not implemented or implemented as simplistic stubs in various out of tree patches. Every time you test such a stuff in the applications you hit a number of these stubs and always have to suspect that this can have something to do with the problem. Sometimes it is, often not. Sorting this out takes a lot of time. So even if there is no application we currently know for sure depending on a correct implementation, still having the correct implementation for (some more) information classes would help greatly in this aspect. It seems to me that NtQueryVirtualMemory() and NtQueryInformationProcess(..., SystemModuleInformation / SystemModuleInformationEx) are currently the top hits.

Dec. 19, 2019

Re: [PATCH] dmime: IDirectMusicPerformance8_FreePMsg Release the unknown pointer.

by Alistair Leslie-Hughes

Hi Michael, I have another patch that causes this function to be called (faking a set notification). So, Yes it's currently a noop but it's small and not going to effect anything. I happy for it to be differed for required. Alistair. On 19/12/19 7:55 am, Michael Stefaniuc wrote: > Hello Alistair, > > while this patch is technically correct > https://nam02.safelinks.protection.outlook.com/?url=http%3A%2F%2Fdoc.51wind… > I'm wondering why it was triggered by bug #25728 (comments 34 and 35). > > I don't see a FreePMsg in the log > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs.wine… > I also don't see a FreePMsg in any of the logs I have. > Nor in the attachments of all directx-dmusic bugs. > > Also we don't set punkUser anywhere in the whole Wine code > > wine$ git grep -n punkUser > dlls/dmime/performance.c:482: if (pPMSG->punkUser) > dlls/dmime/performance.c:483: IUnknown_Release(pPMSG->punkUser); > dlls/dmime/tests/performance.c:447: ok(msg->punkUser != NULL, > "Unexpected NULL pointer\n"); > dlls/dmime/tests/performance.c:448: if (msg->punkUser) { > dlls/dmime/tests/performance.c:452: hr = > IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, > (void**)&segmentstate); > include/dmusici.h:363: IUnknown* punkUser; > > While we seem to have a test that checks for non-NULL punkUser, that > test doesn't runs on Wine. Changing to ok(msg->punkUser == NULL, ...) > still passes on Wine. > That test does run on Windows though > https://nam02.safelinks.protection.outlook.com/?url=https%3A%2F%2Ftestbot.w… > > > So this patch is a no-op for now iff we allocate zero all the messages. > Else we might crash on uninitialized memory. So it does sound like a > "Deferred" to me. > > > bye > michael > > > > On 12/18/19 6:17 AM, Alistair Leslie-Hughes wrote: >> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> >> --- >> dlls/dmime/performance.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c >> index 9dbb469f388..a63bd3b4517 100644 >> --- a/dlls/dmime/performance.c >> +++ b/dlls/dmime/performance.c >> @@ -479,7 +479,9 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_FreePMsg(IDirectMusicPerforma >> DMUS_ItemRemoveFromQueue( This, pItem ); >> LeaveCriticalSection(&This->safe); >> >> - /** TODO: see if we should Release the pItem->pMsg->punkUser and others Interfaces */ >> + if (pPMSG->punkUser) >> + IUnknown_Release(pPMSG->punkUser); >> + >> HeapFree(GetProcessHeap(), 0, pItem); >> return S_OK; >> } >> >

Dec. 19, 2019

Re: [PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs

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=62335 Your paranoid android. === wvistau64 (32 bit report) === ws2_32: sock.c:11455: Test failed: got 0 sock.c:11456: Test failed: got 00000000 sock.c:11457: Test failed: got 0000 sock.c:11458: Test failed: got 00000000 sock.c:11459: Test failed: got 00000000 === debian10 (32 bit report) === ws2_32: sock.c:3057: Test succeeded inside todo block: Test[1]: expected 0, got 0 === debian10 (32 bit WoW report) === ws2_32: sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3051: Test failed: Test[2]: expected 2, got 0 sock.c:3051: Test failed: Test[1]: expected 2, got 0 sock.c:3051: Test failed: Test[2]: expected 2, got 0

Dec. 19, 2019

[PATCH] ws2_32: enable a WSAEnumNetworkEvents test that never runs

by Damjan Jovanovic

In test_WSAEnumNetworkEvents(), a test's condition is always false as the preceding "if" requires the opposite condition. The test already passes. Enable it. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)

Dec. 19, 2019