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

[PATCH] dinput: Fix a possible deadlock at exit.
by Zhiyi Zhang April 11, 2019

April 11, 2019

This fix another deadlock issue with dinput. The old implementation of dinput waits for a hook thread to exit during its uninitialization, which will never return during DLL_THREAD_DETACH. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 65aaf92313..1b2020c711 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1781,7 +1781,7 @@ static DWORD WINAPI hook_thread_proc(void *param) DispatchMessageW(&msg); } - return 0; + FreeLibraryAndExitThread(DINPUT_instance, 0); } static DWORD hook_thread_id; @@ -1798,15 +1798,16 @@ static CRITICAL_SECTION dinput_hook_crit = { &dinput_critsect_debug, -1, 0, 0, 0 static BOOL check_hook_thread(void) { static HANDLE hook_thread; + HMODULE module; EnterCriticalSection(&dinput_hook_crit); TRACE("IDirectInputs left: %d\n", list_count(&direct_input_list)); if (!list_empty(&direct_input_list) && !hook_thread) { + GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR*)DINPUT_instance, &module); hook_thread_event = CreateEventW(NULL, FALSE, FALSE, NULL); hook_thread = CreateThread(NULL, 0, hook_thread_proc, hook_thread_event, 0, &hook_thread_id); - LeaveCriticalSection(&dinput_hook_crit); } else if (list_empty(&direct_input_list) && hook_thread) { @@ -1821,16 +1822,11 @@ static BOOL check_hook_thread(void) hook_thread_id = 0; PostThreadMessageW(tid, WM_USER+0x10, 0, 0); - LeaveCriticalSection(&dinput_hook_crit); - - /* wait for hook thread to exit */ - WaitForSingleObject(hook_thread, INFINITE); CloseHandle(hook_thread); hook_thread = NULL; } - else - LeaveCriticalSection(&dinput_hook_crit); + LeaveCriticalSection(&dinput_hook_crit); return hook_thread_id != 0; } -- 2.19.1

1 0

[PATCHv2] msvcrt: Implement the remquo family of functions
by Martin Storsjo April 11, 2019

April 11, 2019

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- Fixed the remquol signature in specfiles. --- configure.ac | 2 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +-- dlls/msvcr120/msvcr120.spec | 6 +-- dlls/msvcr120_app/msvcr120_app.spec | 6 +-- dlls/msvcrt/math.c | 38 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 +-- 6 files changed, 52 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index 67b360d9a9..a38a9873df 100644 --- a/configure.ac +++ b/configure.ac @@ -2728,6 +2728,8 @@ AC_CHECK_FUNCS(\ powl \ remainder \ remainderf \ + remquo \ + remquof \ rint \ rintf \ round \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index dea5094a91..a9deec8e48 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -308,9 +308,9 @@ @ cdecl remainder(double double) ucrtbase.remainder @ cdecl remainderf(float float) ucrtbase.remainderf @ cdecl remainderl(double double) ucrtbase.remainderl -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) ucrtbase.remquo +@ cdecl remquof(float float ptr) ucrtbase.remquof +@ cdecl remquol(double double ptr) ucrtbase.remquol @ cdecl rint(double) ucrtbase.rint @ cdecl rintf(float) ucrtbase.rintf @ cdecl rintl(double) ucrtbase.rintl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8cd39ea19e..618b9bccbc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2328,9 +2328,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index dc3f3bd807..26ffaf7743 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1991,9 +1991,9 @@ @ cdecl remainderf(float float) msvcr120.remainderf @ cdecl remainderl(double double) msvcr120.remainderl @ cdecl remove(str) msvcr120.remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) msvcr120.remquo +@ cdecl remquof(float float ptr) msvcr120.remquof +@ cdecl remquol(double double ptr) msvcr120.remquol @ cdecl rename(str str) msvcr120.rename @ cdecl rewind(ptr) msvcr120.rewind @ cdecl rint(double) msvcr120.rint diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 754e46ce66..c893c83a69 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3272,6 +3272,44 @@ LDOUBLE CDECL MSVCR120_remainderl(LDOUBLE x, LDOUBLE y) return MSVCR120_remainder(x, y); } +/********************************************************************* + * remquo (MSVCR120.@) + */ +double CDECL MSVCR120_remquo(double x, double y, int *quo) +{ +#ifdef HAVE_REMQUO + if(!finite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0) *MSVCRT__errno() = MSVCRT_EDOM; + return remquo(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * remquof (MSVCR120.@) + */ +float CDECL MSVCR120_remquof(float x, float y, int *quo) +{ +#ifdef HAVE_REMQUOF + if(!finitef(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if(isnan(y) || y==0.0f) *MSVCRT__errno() = MSVCRT_EDOM; + return remquof(x, y, quo); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * remquol (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_remquol(LDOUBLE x, LDOUBLE y, int *quo) +{ + return MSVCR120_remquo(x, y, quo); +} + /********************************************************************* * lgamma (MSVCR120.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d218aa3a7b..1866f1b8b0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2463,9 +2463,9 @@ @ cdecl remainderf(float float) MSVCR120_remainderf @ cdecl remainderl(double double) MSVCR120_remainderl @ cdecl remove(str) MSVCRT_remove -@ stub remquo -@ stub remquof -@ stub remquol +@ cdecl remquo(double double ptr) MSVCR120_remquo +@ cdecl remquof(float float ptr) MSVCR120_remquof +@ cdecl remquol(double double ptr) MSVCR120_remquol @ cdecl rename(str str) MSVCRT_rename @ cdecl rewind(ptr) MSVCRT_rewind @ cdecl rint(double) MSVCR120_rint -- 2.17.1

2 1

[PATCH] msvcrt: Implement _get_environ and _get_wenviron
by Martin Storsjo April 11, 2019

April 11, 2019

Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/environ.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/tests/environ.c | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index cce62bc6a5..cc180e819e 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -310,3 +310,19 @@ int CDECL _wgetenv_s(MSVCRT_size_t *pReturnValue, MSVCRT_wchar_t *buffer, MSVCRT strcpyW(buffer, e); return 0; } + +/********************************************************************* + * _get_environ (MSVCRT.@) + */ +void CDECL MSVCRT__get_environ(char ***ptr) +{ + *ptr = MSVCRT__environ; +} + +/********************************************************************* + * _get_wenviron (MSVCRT.@) + */ +void CDECL MSVCRT__get_wenviron(MSVCRT_wchar_t ***ptr) +{ + *ptr = MSVCRT__wenviron; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0c2881d87b..5be4b4c16a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -501,7 +501,7 @@ @ cdecl _gcvt_s(ptr long double long) MSVCRT__gcvt_s @ cdecl _get_current_locale() MSVCRT__get_current_locale @ cdecl _get_doserrno(ptr) -# stub _get_environ(ptr) +@ cdecl _get_environ(ptr) MSVCRT__get_environ @ cdecl _get_errno(ptr) # stub _get_fileinfo(ptr) @ cdecl _get_fmode(ptr) MSVCRT__get_fmode @@ -512,7 +512,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_sbh_threshold() -# stub _get_wenviron(ptr) +@ cdecl _get_wenviron(ptr) MSVCRT__get_wenviron @ cdecl _get_winmajor(ptr) MSVCRT__get_winmajor @ cdecl _get_winminor(ptr) MSVCRT__get_winminor # stub _get_winver(ptr) diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index fdfe81f5ee..11b79f0d7c 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -47,6 +47,8 @@ void __cdecl __wgetmainargs(int *, wchar_t ***, wchar_t ***, int, int *); static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); +static void (*p_get_environ)(char ***); +static void (*p_get_wenviron)(WCHAR ***); static char ***p_environ; static WCHAR ***p_wenviron; @@ -59,6 +61,8 @@ static void init(void) p__p__wenviron = (void *)GetProcAddress(hmod, "__p__wenviron"); p_environ = (void *)GetProcAddress(hmod, "_environ"); p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); + p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); + p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); } static void test_system(void) @@ -95,6 +99,16 @@ static void test__environ(void) else win_skip( "__p__environ() is not available\n" ); + if (p_get_environ) + { + char **retptr; + p_get_environ(&retptr); + ok( retptr == *p_environ, + "Expected _environ pointers to be identical\n" ); + } + else + win_skip( "_get_environ() is not available\n" ); + /* Note that msvcrt from Windows versions older than Vista * expects the mode pointer parameter to be valid.*/ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -151,6 +165,16 @@ static void test__wenviron(void) else win_skip( "__p__wenviron() is not available\n" ); + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == NULL, + "Expected _wenviron pointers to be NULL\n" ); + } + else + win_skip( "_get_wenviron() is not available\n" ); + /* __getmainargs doesn't initialize _wenviron. */ __getmainargs(&argc, &argv, &envp, 0, &mode); @@ -191,6 +215,14 @@ static void test__wenviron(void) "Expected _wenviron pointers to be identical\n" ); } + if (p_get_wenviron) + { + WCHAR **retptr; + p_get_wenviron(&retptr); + ok( retptr == *p_wenviron, + "Expected _wenviron pointers to be identical\n" ); + } + for (i = 0; ; i++) { if ((*p_wenviron)[i]) -- 2.17.1

3 2

[PATCH] po: Update Finnish translation.
by Lauri Kenttä April 11, 2019

April 11, 2019

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 48 +++++++++++++----------------------------------- 1 file changed, 13 insertions(+), 35 deletions(-) diff --git a/po/fi.po b/po/fi.po index e27f3f0a73..6a2a857802 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4917,7 +4917,7 @@ msgstr "Kovalevyn nollaus epäonnistui.\n" #: winerror.mc:1443 msgid "End of tape media.\n" -msgstr "Nauha on loppussa.\n" +msgstr "Nauhan loppu.\n" #: winerror.mc:1448 msgid "Not enough server memory.\n" @@ -7029,78 +7029,56 @@ msgid "No events available.\n" msgstr "Tapahtumia ei ole saatavilla.\n" #: mferror.mc:445 -#, fuzzy -#| msgid "Unsupported state transition.\n" msgid "Invalid media source state transition.\n" -msgstr "Tilan muutosta ei tueta.\n" +msgstr "Medialähteen tilan muutos ei kelpaa.\n" #: mferror.mc:452 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "End of media stream has been reached.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirta on lopussa.\n" #: mferror.mc:459 msgid "Shutdown() was called.\n" msgstr "Shutdown() kutsuttu.\n" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Rekisteri on palautettu.\n" +msgstr "Mediavirralla ei ole kestoa.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Median muoto tunnistettiin, mutta se ei kelpaa.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Ominaisuusjoukkoa ei löytynyt.\n" +msgstr "Ominaisuutta ei löytynyt.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Property is empty.\n" msgid "Property is read-only.\n" -msgstr "Ominaisuus on tyhjä.\n" +msgstr "Ominaisuus on vain luettava.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Property type is not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Ominaisuuden tyyppi ei ole sallittu.\n" +msgstr "Ominaisuutta ei sallita.\n" #: mferror.mc:501 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is not started.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähdettä ei ole käynnistetty.\n" #: mferror.mc:508 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media format.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Median muotoa ei tueta.\n" #: mferror.mc:515 -#, fuzzy -#| msgid "Resource in use.\n" msgid "Media source is in wrong state.\n" -msgstr "Resurssi on käytössä.\n" +msgstr "Medialähde on väärässä tilassa.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Dataa ei löytynyt.\n" +msgstr "Mediavirtoja ei ole valittu.\n" #: mferror.mc:529 -#, fuzzy -#| msgid "Unsupported time format.\n" msgid "Unsupported media source characteristics.\n" -msgstr "Ajan muotoa ei tueta.\n" +msgstr "Medialähteen ominaisuuksia ei tueta.\n" #: mferror.mc:536 msgid "Optional node is invalid.\n" -- 2.21.0

1 0

[PATCH 2/2] wintab32/tests: Add WTInfoA tests
by Alistair Leslie-Hughes April 11, 2019

April 11, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wintab32/tests/context.c | 64 +++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 5f059127657..3eb1315a102 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -32,8 +32,11 @@ static const UINT Y = 0; static const UINT WIDTH = 200; static const UINT HEIGHT = 200; +static LOGCONTEXTA glogContext; + static HCTX (WINAPI *pWTOpenA)(HWND, LPLOGCONTEXTA, BOOL); static BOOL (WINAPI *pWTClose)(HCTX); +static UINT (WINAPI *pWTInfoA)(UINT, UINT, void*); static HMODULE load_functions(void) { @@ -50,6 +53,7 @@ static HMODULE load_functions(void) } if (GET_PROC(WTOpenA) && + GET_PROC(WTInfoA) && GET_PROC(WTClose) ) { return hWintab; @@ -135,6 +139,65 @@ static void test_WTOpenContextValidation(void) wintab_destroy_window(defaultWindow); } +static void test_WTInfoA(void) +{ + char name[LCNAMELEN]; + UINT ret; + AXIS value; + AXIS orientation[3]; + + glogContext.lcOptions |= CXO_SYSTEM; + + ret = pWTInfoA(WTI_DEFSYSCTX, 0, &glogContext); + if(!ret) + { + skip("No tablet connected\n"); + return; + } + ok(ret == sizeof( LOGCONTEXTA ), "incorrect size\n" ); + ok(glogContext.lcOptions & CXO_SYSTEM, "Wrong options 0x%08x\n", glogContext.lcOptions); + + ret = pWTInfoA( WTI_DEVICES, DVC_NAME, name ); + trace("DVC_NAME %s\n", name); + + ret = pWTInfoA( WTI_DEVICES, DVC_X, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_X size %d\n", ret); + trace("DVC_X %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Y, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_Y size %d\n", ret); + trace("DVC_Y %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_Z, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_Z size %d\n", ret); + trace("DVC_Z %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_NPRESSURE, &value ); + ok(ret == sizeof( AXIS ), "Wrong DVC_NPRESSURE, size %d\n", ret); + trace("DVC_NPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_TPRESSURE, &value ); + todo_wine ok(ret == sizeof( AXIS ), "Wrong DVC_TPRESSURE, size %d\n", ret); + trace("DVC_TPRESSURE %d, %d, %d\n", value.axMin, value.axMax, value.axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ORIENTATION, &orientation ); + ok(ret == sizeof( AXIS )*3, "Wrong DVC_ORIENTATION, size %d\n", ret); + trace("DVC_ORIENTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ORIENTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ORIENTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + + ret = pWTInfoA( WTI_DEVICES, DVC_ROTATION, &orientation ); + if(ret) + { + trace("DVC_ROTATION0 %d, %d, %d\n", orientation[0].axMin, orientation[0].axMax, orientation[0].axUnits); + trace("DVC_ROTATION1 %d, %d, %d\n", orientation[1].axMin, orientation[1].axMax, orientation[1].axUnits); + trace("DVC_ROTATION2 %d, %d, %d\n", orientation[2].axMin, orientation[2].axMax, orientation[2].axUnits); + } + else + trace("DVC_ROTATION not supported\n"); + +} + START_TEST(context) { HMODULE hWintab = load_functions(); @@ -146,6 +209,7 @@ START_TEST(context) } test_WTOpenContextValidation(); + test_WTInfoA(); FreeLibrary(hWintab); } -- 2.20.1

1 0

[PATCH 1/2] wintab32: Improve tracing of LOGCONTEXT
by Alistair Leslie-Hughes April 11, 2019

April 11, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/wintab32/context.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index 49ba09a13d3..9960ba02c80 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -113,28 +113,22 @@ static inline void DUMPPACKET(WTPACKET packet) static inline void DUMPCONTEXT(LOGCONTEXTW lc) { - TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, " - "Device: %x, PktRate: %x, " - "%x%s, %x%s, %x%s, " - "BtnDnMask: %x, BtnUpMask: %x, " - "InOrgX: %i, InOrgY: %i, InOrgZ: %i, " - "InExtX: %i, InExtY: %i, InExtZ: %i, " - "OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i, " - "OutExtX: %i, OutExtY: %i, OutExtZ: %i, " - "SensX: %i, SensY: %i, SensZ: %i, " - "SysMode: %i, " - "SysOrgX: %i, SysOrgY: %i, " - "SysExtX: %i, SysExtY: %i, " - "SysSensX: %i, SysSensY: %i\n", - wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, - lc.lcDevice, lc.lcPktRate, lc.lcPktData, DUMPBITS(lc.lcPktData), - lc.lcPktMode, DUMPBITS(lc.lcPktMode), lc.lcMoveMask, - DUMPBITS(lc.lcMoveMask), lc.lcBtnDnMask, lc.lcBtnUpMask, - lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ, lc.lcInExtX, lc.lcInExtY, - lc.lcInExtZ, lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ, lc.lcOutExtX, - lc.lcOutExtY, lc.lcOutExtZ, lc.lcSensX, lc.lcSensY, lc.lcSensZ, lc.lcSysMode, - lc.lcSysOrgX, lc.lcSysOrgY, lc.lcSysExtX, lc.lcSysExtY, lc.lcSysSensX, - lc.lcSysSensY); + TRACE("Name: %s, Options: %x, Status: %x, Locks: %x, MsgBase: %x, Device: %x\n", + wine_dbgstr_w(lc.lcName), lc.lcOptions, lc.lcStatus, lc.lcLocks, lc.lcMsgBase, lc.lcDevice); + TRACE("PktRate %x\n", lc.lcPktRate); + TRACE("PktData 0x%04x %s\n", lc.lcPktData, DUMPBITS(lc.lcPktData)); + TRACE("PktMode 0x%04x %s\n", lc.lcPktMode, DUMPBITS(lc.lcPktMode)); + TRACE("MovMask 0x%04x %s\n", lc.lcMoveMask, DUMPBITS(lc.lcMoveMask)); + TRACE("BtnDnMask: %x, BtnUpMask: %x\n", lc.lcBtnDnMask, lc.lcBtnUpMask); + TRACE("InOrgX: %i, InOrgY: %i, InOrgZ: %i\n", lc.lcInOrgX, lc.lcInOrgY, lc.lcInOrgZ); + TRACE("InExtX: %i, InExtY: %i, InExtZ: %i\n", lc.lcInExtX, lc.lcInExtY, lc.lcInExtZ); + TRACE("OutOrgX: %i, OutOrgY: %i, OutOrgZ: %i\n", lc.lcOutOrgX, lc.lcOutOrgY, lc.lcOutOrgZ); + TRACE("OutExtX: %i, OutExtY: %i, OutExtZ: %i\n", lc.lcOutExtX, lc.lcOutExtY, lc.lcOutExtZ); + TRACE("SensX: %i, SensY: %i, SensZ: %i\n", lc.lcSensX, lc.lcSensY, lc.lcSensZ); + TRACE("SysMode: %i\n", lc.lcSysMode); + TRACE("SysOrgX: %i, SysOrgY: %i\n", lc.lcSysOrgX, lc.lcSysOrgY); + TRACE("SysExtX: %i, SysExtY: %i\n", lc.lcSysExtX, lc.lcSysExtY); + TRACE("SysSensX: %i, SysSensY: %i\n", lc.lcSysSensX, lc.lcSysSensY); } -- 2.20.1

1 0

[PATCH 1/5] qcap: Get rid of V4l_Unprepare().
by Zebediah Figura April 10, 2019

April 10, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qcap/v4l.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 809ce7a406..752751a97b 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -131,11 +131,6 @@ static HRESULT V4l_Prepare(Capture *device) return S_OK; } -static void V4l_Unprepare(Capture *device) -{ - heap_free(device->image_data); -} - HRESULT qcap_driver_destroy(Capture *capBox) { TRACE("%p\n", capBox); @@ -439,7 +434,7 @@ static DWORD WINAPI ReadThread(LPVOID lParam) if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { TRACE("Return %x, stop IFilterGraph\n", hr); - V4l_Unprepare(capBox); + heap_free(capBox->image_data); capBox->thread = 0; capBox->stopped = TRUE; break; @@ -559,7 +554,7 @@ HRESULT qcap_driver_stop(Capture *capBox, FILTER_STATE *state) if (hr != S_OK && hr != VFW_E_NOT_COMMITTED) WARN("Decommitting allocator: %x\n", hr); } - V4l_Unprepare(capBox); + heap_free(capBox->image_data); } *state = State_Stopped; -- 2.21.0

1 4

[PATCH] winex11: Resize the screen when changing CRTC modes.
by Zebediah Figura April 10, 2019

April 10, 2019

Based on a patch by Gabriel Corona. According to the RandR spec for RRSetCrtcConfig: "The entire area of the CRTC must fit within the screen size, else a Match error results. As an example, rotating the screen so that a single CRTC fills the entire screen before and after may necessitate disabling the CRTC, resizing the screen, then re-enabling the CRTC at the new configuration to avoid an invalid intermediate configuration." This patch involves resizing the screen also when shrinking a CRTC, not just when expanding it past the current screen size. This is partially because we have no way to reliably determine the current display width (DisplayWidth() is never updated past opening the connection, and RandR exposes no way to retrieve the screen dimensions), and partially because it's probably what the user wants anyway (e.g. it's what the `xrandr` configuration app does when the screen size is not expliticly specified). This patch fixes TestBot failures on the Debian machines for ddraw, d3d8, and d3d9 device tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33290 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winex11.drv/xrandr.c | 55 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 2fee851ad7..9f63310291 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -58,6 +58,7 @@ MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) MAKE_FUNCPTR(XRRGetScreenResources) MAKE_FUNCPTR(XRRSetCrtcConfig) +MAKE_FUNCPTR(XRRSetScreenSize) static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; static RRMode *xrandr12_modes; static int primary_crtc; @@ -102,6 +103,7 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRGetOutputInfo) LOAD_FUNCPTR(XRRGetScreenResources) LOAD_FUNCPTR(XRRSetCrtcConfig) + LOAD_FUNCPTR(XRRSetScreenSize) r = 2; #endif #undef LOAD_FUNCPTR @@ -320,8 +322,30 @@ static int xrandr12_get_current_mode(void) return ret; } +static void get_screen_size( XRRScreenResources *resources, unsigned int *width, unsigned int *height ) +{ + XRRCrtcInfo *crtc_info; + int i; + *width = *height = 0; + + for (i = 0; i < resources->ncrtc; ++i) + { + if (!(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ))) + continue; + + if (crtc_info->mode != None) + { + *width = max(*width, crtc_info->x + crtc_info->width); + *height = max(*height, crtc_info->y + crtc_info->height); + } + + pXRRFreeCrtcInfo( crtc_info ); + } +} + static LONG xrandr12_set_current_mode( int mode ) { + unsigned int screen_width, screen_height; Status status = RRSetConfigFailed; XRRScreenResources *resources; XRRCrtcInfo *crtc_info; @@ -345,10 +369,41 @@ static LONG xrandr12_set_current_mode( int mode ) TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); + /* According to the RandR spec, the entire CRTC must fit inside the screen. + * Since we use the union of all enabled CRTCs to determine the necessary + * screen size, this might involve shrinking the screen, so we must disable + * the CRTC in question first. */ + + XGrabServer( gdi_display ); + + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], + CurrentTime, crtc_info->x, crtc_info->y, None, + crtc_info->rotation, NULL, 0 ); + if (status != RRSetConfigSuccess) + { + XUngrabServer( gdi_display ); + ERR("Failed to disable CRTC.\n"); + pXRRFreeCrtcInfo( crtc_info ); + pXRRFreeScreenResources( resources ); + return DISP_CHANGE_FAILED; + } + + get_screen_size( resources, &screen_width, &screen_height ); + screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width ); + screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height ); + + pXRRSetScreenSize( gdi_display, root_window, screen_width, screen_height, + screen_width * DisplayWidthMM( gdi_display, default_visual.screen ) + / DisplayWidth( gdi_display, default_visual.screen ), + screen_height * DisplayHeightMM( gdi_display, default_visual.screen ) + / DisplayHeight( gdi_display, default_visual.screen )); + status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); + XUngrabServer( gdi_display ); + pXRRFreeCrtcInfo( crtc_info ); pXRRFreeScreenResources( resources ); -- 2.21.0

1 0

network support on 4.0 from EPEL
by Jerry Geis April 10, 2019

April 10, 2019

I am using wine from EPEL on CentOS 7. My application is running - but I have no network access. Doing a ping of my address: wine ping 192.168.1.8 0009:err:winediag:IcmpCreateFile Failed to use ICMP (network ping), this requires special permissions. Pinging 192.168.1.8 [192.168.1.8] with 32 bytes of data: PING: transmit failed. General failure. ^C0028:fixme:console:CONSOLE_DefaultHandler Terminating process 8 on event 0 wine ipconfig /all looks all normal. Am I missing something to get network access ? What is my next step? Thanks Jerry

3 6

[PATCH] winex11.drv: Recreate gl_drawable for top-level windows as non-top level when clipping for child windows is required
by Micah N Gorrell April 10, 2019

April 10, 2019

Prevent creating a gl_drawable for a window as type DC_GL_WINDOW if the window has children since DC_GL_WINDOW does not support clipping. If a parent window is encountered of type DC_GL_WINDOW then recreate the gl_drawable. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15232 Signed-off-by: Micah N Gorrell <mgorrell(a)codeweavers.com> --- dlls/winex11.drv/opengl.c | 23 +++++++++++++++-------- dlls/winex11.drv/window.c | 13 ++++++++++++- dlls/winex11.drv/x11drv.h | 2 +- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 13a1da32ea..0d4fb521c4 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -1328,7 +1328,7 @@ static GLXContext create_glxcontext(Display *display, struct wgl_context *contex /*********************************************************************** * create_gl_drawable */ -static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format ) +static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel_format *format, BOOL have_child ) { struct gl_drawable *gl, *prev; XVisualInfo *visual = format->visual; @@ -1349,7 +1349,7 @@ static struct gl_drawable *create_gl_drawable( HWND hwnd, const struct wgl_pixel gl->format = format; gl->ref = 1; - if (GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* top-level window */ + if (!have_child && !GetWindow( hwnd, GW_CHILD ) && GetAncestor( hwnd, GA_PARENT ) == GetDesktopWindow()) /* childless top-level window */ { gl->type = DC_GL_WINDOW; gl->window = create_client_window( hwnd, visual ); @@ -1412,7 +1412,7 @@ static BOOL set_win_format( HWND hwnd, const struct wgl_pixel_format *format ) if (!format->visual) return FALSE; - if (!(gl = create_gl_drawable( hwnd, format ))) return FALSE; + if (!(gl = create_gl_drawable( hwnd, format, FALSE ))) return FALSE; TRACE( "created GL drawable %lx for win %p %s\n", gl->drawable, hwnd, debugstr_fbconfig( format->fbconfig )); @@ -1471,7 +1471,7 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL allow_change) /*********************************************************************** * sync_gl_drawable */ -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL have_child ) { struct gl_drawable *old, *new; @@ -1479,8 +1479,11 @@ void sync_gl_drawable( HWND hwnd ) switch (old->type) { + case DC_GL_WINDOW: + if (!have_child) break; /* Still a childless top-level window */ + /* fall through */ case DC_GL_PIXMAP_WIN: - if (!(new = create_gl_drawable( hwnd, old->format ))) break; + if (!(new = create_gl_drawable( hwnd, old->format, have_child ))) break; mark_drawable_dirty( old, new ); XFlush( gdi_display ); TRACE( "Recreated GL drawable %lx to replace %lx\n", new->drawable, old->drawable ); @@ -1517,7 +1520,7 @@ void set_gl_drawable_parent( HWND hwnd, HWND parent ) return; } - if ((new = create_gl_drawable( hwnd, old->format ))) + if ((new = create_gl_drawable( hwnd, old->format, FALSE ))) { mark_drawable_dirty( old, new ); release_gl_drawable( new ); @@ -3304,9 +3307,13 @@ static BOOL glxdrv_wglSwapBuffers( HDC hdc ) } pglXSwapBuffers(gdi_display, gl->drawable); break; + case DC_GL_WINDOW: case DC_GL_CHILD_WIN: if (ctx) sync_context( ctx ); - escape.gl_drawable = gl->window; + if (gl->type == DC_GL_CHILD_WIN) + { + escape.gl_drawable = gl->window; + } /* fall through */ default: if (escape.gl_drawable && pglXSwapBuffersMscOML) @@ -3362,7 +3369,7 @@ struct opengl_funcs *get_glx_driver( UINT version ) return NULL; } -void sync_gl_drawable( HWND hwnd ) +void sync_gl_drawable( HWND hwnd, BOOL have_child ) { } diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340e19..97dee523c9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1874,6 +1874,11 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi if (GetWindowThreadProcessId( hwnd, NULL ) != GetCurrentThreadId()) return NULL; + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + display = thread_init_display(); init_clip_window(); /* make sure the clip window is initialized in this thread */ @@ -2206,6 +2211,12 @@ void CDECL X11DRV_SetParent( HWND hwnd, HWND parent, HWND old_parent ) done: release_win_data( data ); set_gl_drawable_parent( hwnd, parent ); + + /* Recreate the parent gl_drawable now that we know there are child windows + * that will need clipping support. + */ + sync_gl_drawable( parent, TRUE ); + fetch_icon_data( hwnd, 0, 0 ); } @@ -2369,7 +2380,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->client_rect.bottom - data->client_rect.top != old_client_rect.bottom - old_client_rect.top)); release_win_data( data ); - if (needs_resize) sync_gl_drawable( hwnd ); + if (needs_resize) sync_gl_drawable( hwnd, FALSE ); return; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index a0308b0675..71c1f3877d 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -583,7 +583,7 @@ extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; -extern void sync_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; +extern void sync_gl_drawable( HWND hwnd, BOOL have_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; -- 2.21.0

2 4