January 2020 - Wine-commits

Nikolay Sivov : shell32/tests: Use GetShortPathNameA() directly in tests.
by Alexandre Julliard 07 Jan '20

07 Jan '20

Module: wine Branch: master Commit: 6bfc988ea47966737803c35b981ea367dd7a4562 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bfc988ea47966737803c35b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 7 00:08:25 2020 +0300 shell32/tests: Use GetShortPathNameA() directly in tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shelllink.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 0cf24524a5..2c2ee94c17 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -43,7 +43,6 @@ static HRESULT (WINAPI *pSHILCreateFromPath)(LPCWSTR, LPITEMIDLIST *,DWORD*); static HRESULT (WINAPI *pSHGetFolderLocation)(HWND,INT,HANDLE,DWORD,PIDLIST_ABSOLUTE*); static HRESULT (WINAPI *pSHDefExtractIconA)(LPCSTR, int, UINT, HICON*, HICON*, UINT); static HRESULT (WINAPI *pSHGetStockIconInfo)(SHSTOCKICONID, UINT, SHSTOCKICONINFO *); -static DWORD (WINAPI *pGetShortPathNameA)(LPCSTR, LPSTR, DWORD); static UINT (WINAPI *pSHExtractIconsW)(LPCWSTR, int, int, int, HICON *, UINT *, UINT, UINT); static BOOL (WINAPI *pIsProcessDPIAware)(void); @@ -767,7 +766,7 @@ static void test_load_save(void) create_lnk(lnkfile, &desc, 0); check_lnk(lnkfile, &desc, 0x0); - r=pGetShortPathNameA(mydir, mypath, sizeof(mypath)); + r = GetShortPathNameA(mydir, mypath, sizeof(mypath)); ok(r<sizeof(mypath), "GetShortPathName failed (%d), err %d\n", r, GetLastError()); strcpy(realpath, mypath); @@ -1452,7 +1451,6 @@ START_TEST(shelllink) { HRESULT r; HMODULE hmod = GetModuleHandleA("shell32.dll"); - HMODULE hkernel32 = GetModuleHandleA("kernel32.dll"); HMODULE huser32 = GetModuleHandleA("user32.dll"); pILIsEqual = (void *)GetProcAddress(hmod, (LPSTR)21); @@ -1460,7 +1458,6 @@ START_TEST(shelllink) pSHGetFolderLocation = (void *)GetProcAddress(hmod, "SHGetFolderLocation"); pSHDefExtractIconA = (void *)GetProcAddress(hmod, "SHDefExtractIconA"); pSHGetStockIconInfo = (void *)GetProcAddress(hmod, "SHGetStockIconInfo"); - pGetShortPathNameA = (void *)GetProcAddress(hkernel32, "GetShortPathNameA"); pSHExtractIconsW = (void *)GetProcAddress(hmod, "SHExtractIconsW"); pIsProcessDPIAware = (void *)GetProcAddress(huser32, "IsProcessDPIAware");

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 000705ab2c9d9ba7d12cffcab0d1b416340efb04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000705ab2c9d9ba7d12cffca… Author: Kim Malmo <berencamlost(a)msn.com> Date: Mon Jan 6 14:52:33 2020 +0100 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 42 +++++++++++++----------------------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 2e95616fe1..b4ebed3cf4 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2020-01-03 16:23+0100\n" +"PO-Revision-Date: 2020-01-05 13:06+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -625,7 +625,7 @@ msgstr "&Egendefinerte farger:" #: comdlg32.rc:289 msgid "|S&olid" -msgstr "" +msgstr "|S&olid" #: comdlg32.rc:290 msgid "&Red:" @@ -6850,10 +6850,8 @@ msgid "Invalid media type.\n" msgstr "Ugyldig mediatype.\n" #: mferror.mc:67 -#, fuzzy -#| msgid "No more entries.\n" msgid "No more input is accepted.\n" -msgstr "Ingen flere oppføringer.\n" +msgstr "Ingen flere inndata akseptert.\n" #: mferror.mc:74 msgid "Object is not initialized.\n" @@ -6865,7 +6863,7 @@ msgstr "Representasjonen støttes ikke.\n" #: mferror.mc:88 msgid "No more types in the list of suggested media types.\n" -msgstr "" +msgstr "Ingen flere typer i listen av foreslåtte mediatyper.\n" #: mferror.mc:95 msgid "Unsupported service.\n" @@ -6884,10 +6882,8 @@ msgid "Invalid file format.\n" msgstr "Ugyldig filformat.\n" #: mferror.mc:137 -#, fuzzy -#| msgid "Invalid time.\n" msgid "Invalid timestamp.\n" -msgstr "Ugyldig tid.\n" +msgstr "Ugyldig tidspunkt.\n" #: mferror.mc:144 msgid "Unsupported scheme.\n" @@ -7067,7 +7063,7 @@ msgstr "Tjeneren er ikke deaktivert.\n" #: mferror.mc:403 msgid "Platform is disabled in safe mode.\n" -msgstr "" +msgstr "Plattformen er avslått i sikkermodus.\n" #: mferror.mc:410 #, fuzzy @@ -7114,32 +7110,24 @@ msgid "Shutdown() was called.\n" msgstr "" #: mferror.mc:466 -#, fuzzy -#| msgid "Registry has been recovered.\n" msgid "Media stream has no duration set.\n" -msgstr "Registeret har blitt gjenopprettet.\n" +msgstr "Mediastrømmen har ingen satt varighet.\n" #: mferror.mc:473 msgid "Media format was recognized but is invalid.\n" -msgstr "" +msgstr "Mediaformatet ble gjenkjent men er ugyldig.\n" #: mferror.mc:480 -#, fuzzy -#| msgid "Property set not found.\n" msgid "Property wasn't found.\n" -msgstr "Fant ikke settet av egenskaper.\n" +msgstr "Fant ikke egenskapen.\n" #: mferror.mc:487 -#, fuzzy -#| msgid "Directory is not empty.\n" msgid "Property is read-only.\n" -msgstr "Katalogen er ikke tom.\n" +msgstr "Egenskapen kan kun leses.\n" #: mferror.mc:494 -#, fuzzy -#| msgid "Hook type not allowed.\n" msgid "Property is not allowed.\n" -msgstr "Hook-typen er ikke tillat.\n" +msgstr "Egenskapen er ikke tillat.\n" #: mferror.mc:501 msgid "Media source is not started.\n" @@ -7156,10 +7144,8 @@ msgid "Media source is in wrong state.\n" msgstr "Ressursen er i bruk.\n" #: mferror.mc:522 -#, fuzzy -#| msgid "No data detected.\n" msgid "No media streams were selected.\n" -msgstr "Ingen data oppdaget.\n" +msgstr "Ingen mediastrømmer ble valgt.\n" #: mferror.mc:529 #, fuzzy @@ -7242,10 +7228,8 @@ msgid "Cannot find decryptor.\n" msgstr "Kan ikke finne skriveren." #: mferror.mc:641 -#, fuzzy -#| msgid "Module not found.\n" msgid "Codec was not found.\n" -msgstr "Fant ikke modulen.\n" +msgstr "Fant ikke kodeks.\n" #: mferror.mc:648 #, fuzzy

1 0

Zebediah Figura : user32/tests: Relax WindowFromDC() tests a bit.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 89d67614ca1d020fae39aa09e852a7e2bea77783 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89d67614ca1d020fae39aa09… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 10:00:00 2020 -0600 user32/tests: Relax WindowFromDC() tests a bit. Windows often reuses the DC handle for a different window (which may be in another process). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 18ded3357d..017506d9aa 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -54,7 +54,7 @@ static void test_dc_attributes(void) ok( WindowFromDC( hdc ) == hwnd_cache, "wrong window\n" ); ReleaseDC( hwnd_cache, hdc ); - ok( WindowFromDC( hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC( hwnd_cache ); rop = GetROP2( hdc ); ok( rop == def_rop, "wrong ROP2 %d after release\n", rop ); @@ -124,7 +124,7 @@ static void test_dc_attributes(void) ok( caps == 0, "got %d\n", caps ); caps = GetDeviceCaps( old_hdc, NUMCOLORS ); ok( caps == 0, "got %d\n", caps ); - ok( WindowFromDC( old_hdc ) == 0, "wrong window\n" ); + ok( WindowFromDC( old_hdc ) != hwnd_cache, "wrong window\n" ); hdc = GetDC(0); caps = GetDeviceCaps( hdc, HORZRES ); @@ -645,7 +645,7 @@ static void test_destroyed_window(void) DestroyWindow( hwnd_cache ); rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_cache, "wrong window\n" ); ok( !ReleaseDC( hwnd_cache, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_cache ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -674,7 +674,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc2, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc2, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc2 ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -688,7 +688,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == R2_WHITE, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_classdc, "wrong window\n" ); ok( !ReleaseDC( hwnd_classdc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_classdc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); @@ -702,7 +702,7 @@ static void test_destroyed_window(void) rop = GetROP2( dc ); ok( rop == 0, "wrong ROP2 %d\n", rop ); - ok( WindowFromDC( dc ) == 0, "wrong window\n" ); + ok( WindowFromDC( dc ) != hwnd_owndc, "wrong window\n" ); ok( !ReleaseDC( hwnd_owndc, dc ), "ReleaseDC succeeded\n" ); dc = GetDC( hwnd_owndc ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc );

1 0

Zebediah Figura : user32/tests: Get rid of the test for DC handle reuse.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: d76527373b6ae40439706352a9297c4bf6878dee URL: https://source.winehq.org/git/wine.git/?a=commit;h=d76527373b6ae40439706352… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 10:00:01 2020 -0600 user32/tests: Get rid of the test for DC handle reuse. It may be useful for demonstrating cache behaviour, but fails too frequently on Windows to be reliable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/dce.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 017506d9aa..116a6177b0 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -632,8 +632,7 @@ static void test_dc_layout(void) static void test_destroyed_window(void) { HDC dc, old_dc; - HDC hdcs[30]; - int i, rop; + int rop; dc = GetDC( hwnd_cache ); SetROP2( dc, R2_WHITE ); @@ -650,14 +649,6 @@ static void test_destroyed_window(void) dc = GetDC( hwnd_cache ); ok( !dc, "Got a non-NULL DC (%p) for a destroyed window\n", dc ); - for (i = 0; i < 30; i++) - { - dc = hdcs[i] = GetDCEx( hwnd_parent, 0, DCX_CACHE | DCX_USESTYLE ); - if (dc == old_dc) break; - } - ok( i < 30, "DC for destroyed window not reused\n" ); - while (i > 0) ReleaseDC( hwnd_parent, hdcs[--i] ); - dc = GetDC( hwnd_classdc ); SetROP2( dc, R2_WHITE ); rop = GetROP2( dc );

1 0

Zebediah Figura : gdi32/tests: Separate and expand tests for GetClipBox().
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 35f112d0e4493ce4502008d104644e26c64c3406 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35f112d0e4493ce4502008d1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 09:59:25 2020 -0600 gdi32/tests: Separate and expand tests for GetClipBox(). Fixes test failures on multi-monitor machines. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 99 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 79f06249bb..7f33ef9407 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -423,9 +423,6 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr, int scale } else ok( ret || broken(!ret) /* NT4 */, "GetDeviceGammaRamp failed on %s (type %d), error %u\n", descr, GetObjectType( hdc ), GetLastError() ); - type = GetClipBox( hdc, &rect ); - todo_wine_if (GetObjectType( hdc ) == OBJ_ENHMETADC) - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); type = GetBoundsRect( hdc, &rect, 0 ); ok( type == DCB_RESET || broken(type == DCB_SET) /* XP */, @@ -1563,6 +1560,104 @@ static void test_pscript_printer_dc(void) DeleteDC(hdc); } +static void test_clip_box(void) +{ + DEVMODEA scale_mode = {.dmSize = sizeof(DEVMODEA)}; + HBITMAP bitmap = CreateBitmap(10, 10, 1, 1, NULL); + HDC dc, desktop_dc, printer_dc; + RECT rect, expect, screen_rect; + int type, screen_type; + + EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &scale_mode); + scale_mode.dmFields |= DM_SCALE; + scale_mode.u1.s1.dmScale = 200; + + SetRect(&screen_rect, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN), + GetSystemMetrics(SM_XVIRTUALSCREEN) + GetSystemMetrics(SM_CXVIRTUALSCREEN), + GetSystemMetrics(SM_YVIRTUALSCREEN) + GetSystemMetrics(SM_CYVIRTUALSCREEN)); + screen_type = GetSystemMetrics(SM_CMONITORS) > 1 ? COMPLEXREGION : SIMPLEREGION; + + dc = CreateDCA("DISPLAY", NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateDCA("DISPLAY", NULL, NULL, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + ResetDCA(dc, &scale_mode); + type = GetClipBox(dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateCompatibleDC(NULL); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + SelectObject(dc, bitmap); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 10, 10); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + desktop_dc = GetDC(0); + type = GetClipBox(desktop_dc, &rect); + todo_wine_if(screen_type == COMPLEXREGION) + ok(type == screen_type, "wrong region type %d\n", type); + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + + dc = CreateEnhMetaFileA(desktop_dc, NULL, NULL, NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + if (type != ERROR) + ok(EqualRect(&rect, &screen_rect), "expected %s, got %s\n", + wine_dbgstr_rect(&screen_rect), wine_dbgstr_rect(&rect)); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + ReleaseDC(0, desktop_dc); + + dc = CreateMetaFileA(NULL); + ok(!!dc, "CreateEnhMetaFile() failed\n"); + type = GetClipBox(dc, &rect); + ok(type == ERROR, "wrong region type %d\n", type); + DeleteMetaFile(CloseMetaFile(dc)); + + if ((printer_dc = create_printer_dc(100, FALSE))) + { + type = GetClipBox(printer_dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + + dc = CreateCompatibleDC(printer_dc); + type = GetClipBox(dc, &rect); + ok(type == SIMPLEREGION, "wrong region type %d\n", type); + SetRect(&expect, 0, 0, 1, 1); + ok(EqualRect(&rect, &expect), "got %s\n", wine_dbgstr_rect(&rect)); + DeleteDC(dc); + + dc = CreateEnhMetaFileA(printer_dc, NULL, NULL, NULL); + type = GetClipBox(dc, &rect); + todo_wine ok(type == SIMPLEREGION, "wrong region type %d\n", type); + DeleteEnhMetaFile(CloseEnhMetaFile(dc)); + + DeleteDC(printer_dc); + } + + DeleteObject(bitmap); +} + START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandleA("gdi32.dll"), "SetLayout"); @@ -1579,4 +1674,5 @@ START_TEST(dc) test_gamma(); test_printer_dc(); test_pscript_printer_dc(); + test_clip_box(); }

1 0

Zebediah Figura : gdi32/tests: Clarify return values from IntersectClipRect() and ExcludeClipRect().
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: fef352cb815c3409c33b44b0fd83637dd5ed6313 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fef352cb815c3409c33b44b0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jan 6 09:59:26 2020 -0600 gdi32/tests: Clarify return values from IntersectClipRect() and ExcludeClipRect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/dc.c | 54 +++++++++++++++------------------------------ dlls/gdi32/tests/metafile.c | 50 +++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 68 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 7f33ef9407..4f53e433b4 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -40,27 +40,6 @@ static DWORD (WINAPI *pSetLayout)(HDC hdc, DWORD layout); -static void dump_region(HRGN hrgn) -{ - DWORD i, size; - RGNDATA *data = NULL; - RECT *rect; - - if (!hrgn) - { - printf( "(null) region\n" ); - return; - } - if (!(size = GetRegionData( hrgn, 0, NULL ))) return; - if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return; - GetRegionData( hrgn, size, data ); - printf( "%d rects:", data->rdh.nCount ); - for (i = 0, rect = (RECT *)data->Buffer; i < data->rdh.nCount; i++, rect++) - printf( " (%d,%d)-(%d,%d)", rect->left, rect->top, rect->right, rect->bottom ); - printf( "\n" ); - HeapFree( GetProcessHeap(), 0, data ); -} - static void test_dc_values(void) { HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); @@ -111,6 +90,8 @@ static void test_dc_values(void) static void test_savedc_2(void) { + char buffer[100]; + RGNDATA *rgndata = (RGNDATA *)buffer; HWND hwnd; HDC hdc; HRGN hrgn; @@ -130,13 +111,16 @@ static void test_savedc_2(void) ok(hdc != NULL, "GetDC failed\n"); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + /* all versions of Windows return SIMPLEREGION despite returning an empty region */ + todo_wine ok(ret == NULLREGION || broken(ret == SIMPLEREGION), "wrong region type %d\n", ret); ret = GetClipRgn(hdc, hrgn); ok(ret == 0, "GetClipRgn returned %d instead of 0\n", ret); ret = GetRgnBox(hrgn, &rc); ok(ret == NULLREGION, "GetRgnBox returned %d %s instead of NULLREGION\n", ret, wine_dbgstr_rect(&rc)); - /*dump_region(hrgn);*/ + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER), "got %u\n", ret); + ok(!rgndata->rdh.nCount, "got %u rectangles\n", rgndata->rdh.nCount); SetRect(&rc, 0, 0, 100, 100); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); @@ -145,20 +129,18 @@ static void test_savedc_2(void) ok(ret == 1, "ret = %d\n", ret); ret = IntersectClipRect(hdc, 0, 0, 50, 50); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although dump_region reports only 1 rect */ - trace("Windows BUG: IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); - /* let's make sure that it's a simple region */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); - dump_region(hrgn); - } - else - ok(ret == SIMPLEREGION, "IntersectClipRect returned %d instead of SIMPLEREGION\n", ret); + /* all versions of Windows return COMPLEXREGION despite the region comprising one rectangle */ + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "GetClipRgn returned %d instead of 1\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + SetRect(&rc, 0, 0, 50, 50); + ok(EqualRect((RECT *)rgndata->Buffer, &rc), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION, "wrong region type %d\n", ret); SetRect(&rc, 0, 0, 50, 50); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); @@ -167,7 +149,7 @@ static void test_savedc_2(void) ok(ret, "ret = %d\n", ret); ret = GetClipBox(hdc, &rc_clip); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "GetClipBox returned %d instead of SIMPLEREGION\n", ret); + ok(ret == SIMPLEREGION, "wrong region type %d\n", ret); SetRect(&rc, 0, 0, 100, 100); ok(EqualRect(&rc, &rc_clip), "rects are not equal: %s - %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&rc_clip)); diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 231d6a4d35..f1caebbc9d 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -60,20 +60,6 @@ static void init_function_pointers(void) GDI_GET_PROC(SetDCPenColor); } -static DWORD rgn_rect_count(HRGN hrgn) -{ - DWORD size; - RGNDATA *data; - - if (!hrgn) return 0; - if (!(size = GetRegionData(hrgn, 0, NULL))) return 0; - if (!(data = HeapAlloc(GetProcessHeap(), 0, size))) return 0; - GetRegionData(hrgn, size, data); - size = data->rdh.nCount; - HeapFree(GetProcessHeap(), 0, data); - return size; -} - static int CALLBACK eto_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, const ENHMETARECORD *emr, int n_objs, LPARAM param) { @@ -2716,6 +2702,8 @@ static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, static void test_emf_clipping(void) { + char buffer[100]; + RGNDATA *rgndata = (RGNDATA *)buffer; static const RECT rc = { 0, 0, 100, 100 }; RECT rc_clip = { 100, 100, 1024, 1024 }; HWND hwnd; @@ -2790,15 +2778,14 @@ static void test_emf_clipping(void) wine_dbgstr_rect(&rc_res)); ret = IntersectClipRect(hdc, 0, 0, 100, 100); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although region contains only 1 rect */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - ret = rgn_rect_count(hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - } + /* all versions of Windows return COMPLEXREGION despite the region comprising one rectangle */ + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + ok(EqualRect((RECT *)rgndata->Buffer, &rc), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); @@ -2807,15 +2794,14 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 0, 0, 100, 50); ret = ExcludeClipRect(hdc, 0, 50, 100, 100); - ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); - if (ret == COMPLEXREGION) - { - /* XP returns COMPLEXREGION although region contains only 1 rect */ - ret = GetClipRgn(hdc, hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - ret = rgn_rect_count(hrgn); - ok(ret == 1, "expected 1, got %d\n", ret); - } + /* all versions of Windows return COMPLEXREGION despite the region comprising one rectangle */ + ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION), "wrong region type %d\n", ret); + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "expected 1, got %d\n", ret); + ret = GetRegionData(hrgn, sizeof(buffer), rgndata); + ok(ret == sizeof(RGNDATAHEADER) + sizeof(RECT), "got %u\n", ret); + ok(rgndata->rdh.nCount == 1, "got %u rectangles\n", rgndata->rdh.nCount); + ok(EqualRect((RECT *)rgndata->Buffer, &rc_sclip), "got rect %s\n", wine_dbgstr_rect((RECT *)rgndata->Buffer)); SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret);

1 0

Michael Stefaniuc : dmime/tests: Destroy the performance on an error path (Valgrind).
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 5b96ed0207e5a871682bf8ff53635fd655cfdfcc URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b96ed0207e5a871682bf8ff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Jan 6 20:29:44 2020 +0100 dmime/tests: Destroy the performance on an error path (Valgrind). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36272 Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 4c340252aa..e6a3fe2271 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -96,8 +96,10 @@ static HRESULT test_InitAudio(void) dsound = NULL; hr = IDirectMusicPerformance8_InitAudio(performance, NULL, &dsound, NULL, DMUS_APATH_SHARED_STEREOPLUSREVERB, 128, DMUS_AUDIOF_ALL, NULL); - if(hr != S_OK) + if (hr != S_OK) { + IDirectMusicPerformance8_Release(performance); return hr; + } port = NULL; hr = IDirectMusicPerformance8_PChannelInfo(performance, 128, &port, NULL, NULL);

1 0

Damjan Jovanovic : server: Revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 37dec9f144501fb93e173214578b759122ac999a URL: https://source.winehq.org/git/wine.git/?a=commit;h=37dec9f144501fb93e173214… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jan 5 20:32:31 2020 +0200 server: Revert b4a1d80ae35d35f5c170e101922bf1563488be18 for now. It breaks too many things. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48357 Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 5 +++-- server/sock.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index fa9d081185..60c5dfc63f 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3053,8 +3053,9 @@ static void test_WSAEnumNetworkEvents(void) } else { - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); + todo_wine_if (i != 0) /* Remove when fixed */ + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) { diff --git a/server/sock.c b/server/sock.c index 29542cd01f..1a53ce4b09 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1228,7 +1228,7 @@ DECL_HANDLER(set_socket_event) FILE_WRITE_ATTRIBUTES, &sock_ops))) return; old_event = sock->event; sock->mask = req->mask; - sock->hmask &= (FD_WRITE | ~req->mask); /* re-enable held events */ + sock->hmask &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Alexandre Julliard : kernel32/tests: Remove some workarounds for old Windows versions.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: d6022964cb23df4acb598b2ac6ad846db16a958c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6022964cb23df4acb598b2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 6 19:28:45 2020 +0100 kernel32/tests: Remove some workarounds for old Windows versions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 107 +++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d6022964cb23df4acb59…

1 0

Nikolay Sivov : include: Update CTF_ flags.
by Alexandre Julliard 06 Jan '20

06 Jan '20

Module: wine Branch: master Commit: 70f14c1c1980bf0804feb20769695ec01d531976 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70f14c1c1980bf0804feb207… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 6 12:21:53 2020 +0300 include: Update CTF_ flags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/shlwapi.h | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/include/shlwapi.h b/include/shlwapi.h index 0cd50e9e91..d02005763b 100644 --- a/include/shlwapi.h +++ b/include/shlwapi.h @@ -1018,13 +1018,24 @@ HRESULT WINAPI SHSetThreadRef(IUnknown*); HRESULT WINAPI SHReleaseThreadRef(void); /* SHCreateThread flags */ -#define CTF_INSIST 0x01 /* Always call */ -#define CTF_THREAD_REF 0x02 /* Hold thread ref */ -#define CTF_PROCESS_REF 0x04 /* Hold process ref */ -#define CTF_COINIT 0x08 /* Startup COM first */ -#define CTF_FREELIBANDEXIT 0x10 /* Hold DLL ref */ -#define CTF_REF_COUNTED 0x20 /* Thread is ref counted */ -#define CTF_WAIT_ALLOWCOM 0x40 /* Allow marshalling */ +enum +{ + CTF_INSIST = 0x00000001, /* Always call */ + CTF_THREAD_REF = 0x00000002, /* Hold thread ref */ + CTF_PROCESS_REF = 0x00000004, /* Hold process ref */ + CTF_COINIT_STA = 0x00000008, + CTF_COINIT = 0x00000008, /* Startup COM first */ + CTF_FREELIBANDEXIT = 0x00000010, /* Hold DLL ref */ + CTF_REF_COUNTED = 0x00000020, /* Thread is ref counted */ + CTF_WAIT_ALLOWCOM = 0x00000040, /* Allow marshalling */ + CTF_UNUSED = 0x00000080, + CTF_INHERITWOW64 = 0x00000100, + CTF_WAIT_NO_REENTRACY = 0x00000200, + CTF_KEYBOARD_LOCALE = 0x00000400, + CTF_OLEINITIALIZE = 0x00000800, + CTF_COINIT_MTA = 0x00001000, + CTF_NOADDREFLIB = 0x00002000, +}; BOOL WINAPI SHCreateThread(LPTHREAD_START_ROUTINE,void*,DWORD,LPTHREAD_START_ROUTINE);

1 0