May 2015 - Wine-Commits - list.winehq.org

André Hentschel : wineboot: Add environment registry keys on ARM64.
by Alexandre Julliard May 22, 2015

May 22, 2015

Module: wine Branch: master Commit: b4a46dbcaa7c9405ecf6783c0abaa0fbcece9d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4a46dbcaa7c9405ecf6783c0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Thu May 21 16:12:25 2015 +0200 wineboot: Add environment registry keys on ARM64. --- programs/wineboot/wineboot.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index a20b4e1..0792c2d 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -300,6 +300,7 @@ static void create_environment_registry_keys( void ) static const WCHAR ProcArchW[] = {'P','R','O','C','E','S','S','O','R','_','A','R','C','H','I','T','E','C','T','U','R','E',0}; static const WCHAR x86W[] = {'x','8','6',0}; static const WCHAR armW[] = {'A','R','M',0}; + static const WCHAR arm64W[] = {'A','R','M','6','4',0}; static const WCHAR AMD64W[] = {'A','M','D','6','4',0}; static const WCHAR ProcIdW[] = {'P','R','O','C','E','S','S','O','R','_','I','D','E','N','T','I','F','I','E','R',0}; static const WCHAR ProcLvlW[] = {'P','R','O','C','E','S','S','O','R','_','L','E','V','E','L',0}; @@ -308,7 +309,7 @@ static void create_environment_registry_keys( void ) static const WCHAR Percent04XW[] = {'%','0','4','x',0}; static const WCHAR IntelCpuDescrW[] = {'%','s',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','S','t','e','p','p','i','n','g',' ','%','d',',',' ','G','e','n','u','i','n','e','I','n','t','e','l',0}; - static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','7',' ','M','o','d','e','l',' ','%','X', + static const WCHAR ARMCpuDescrW[] = {'A','R','M',' ','F','a','m','i','l','y',' ','%','d',' ','M','o','d','e','l',' ','%','d', ' ','R','e','v','i','s','i','o','n',' ','%','d',0}; HKEY env_key; @@ -327,6 +328,7 @@ static void create_environment_registry_keys( void ) { case PROCESSOR_ARCHITECTURE_AMD64: arch = AMD64W; break; case PROCESSOR_ARCHITECTURE_ARM: arch = armW; break; + case PROCESSOR_ARCHITECTURE_ARM64: arch = arm64W; break; default: case PROCESSOR_ARCHITECTURE_INTEL: arch = x86W; break; } @@ -335,7 +337,8 @@ static void create_environment_registry_keys( void ) switch(sci.Architecture) { case PROCESSOR_ARCHITECTURE_ARM: - sprintfW( buffer, ARMCpuDescrW, sci.Level, sci.Revision ); + case PROCESSOR_ARCHITECTURE_ARM64: + sprintfW( buffer, ARMCpuDescrW, sci.Level, HIBYTE(sci.Revision), LOBYTE(sci.Revision) ); break; default: case PROCESSOR_ARCHITECTURE_INTEL:

1 0

Matteo Bruni : wined3d: Add missing entries for Nvidia GPUs.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 83254963da344300e8854562dc6ce37a9fcea7e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83254963da344300e8854562d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 21 00:24:46 2015 +0200 wined3d: Add missing entries for Nvidia GPUs. --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 36be539..93e06a6 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1185,6 +1185,7 @@ struct gpu_description static const struct gpu_description gpu_description_table[] = { /* Nvidia cards */ + {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_128, "NVIDIA RIVA 128", DRIVER_NVIDIA_TNT, 4 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT, "NVIDIA RIVA TNT", DRIVER_NVIDIA_TNT, 16 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_RIVA_TNT2, "NVIDIA RIVA TNT2/TNT2 Pro", DRIVER_NVIDIA_TNT, 32 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", DRIVER_NVIDIA_TNT, 32 }, @@ -1206,6 +1207,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8200, "NVIDIA GeForce 8200", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8400GS, "NVIDIA GeForce 8400 GS", DRIVER_NVIDIA_GEFORCE8, 128 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8500GT, "NVIDIA GeForce 8500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", DRIVER_NVIDIA_GEFORCE8, 320 }, @@ -1225,11 +1227,11 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE8, 256}, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTS350M, "NVIDIA GeForce GTS 350M", DRIVER_NVIDIA_GEFORCE8, 1024}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE8, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT420, "NVIDIA GeForce GT 420", DRIVER_NVIDIA_GEFORCE8, 2048}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT430, "NVIDIA GeForce GT 430", DRIVER_NVIDIA_GEFORCE8, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT440, "NVIDIA GeForce GT 440", DRIVER_NVIDIA_GEFORCE8, 1024}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f23197d..b48c0e6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1514,8 +1514,8 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_6200 = 0x014f, CARD_NVIDIA_GEFORCE_6600GT = 0x0140, CARD_NVIDIA_GEFORCE_6800 = 0x0041, - CARD_NVIDIA_GEFORCE_7400 = 0x01d8, CARD_NVIDIA_GEFORCE_7300 = 0x01d7, /* GeForce Go 7300 */ + CARD_NVIDIA_GEFORCE_7400 = 0x01d8, CARD_NVIDIA_GEFORCE_7600 = 0x0391, CARD_NVIDIA_GEFORCE_7800GT = 0x0092, CARD_NVIDIA_GEFORCE_8200 = 0x0849, /* Other PCI ID 0x084b */

1 0

Huw Davies : comctl32/tests: Skip the hover tests if the listview' s parent is not the foreground window.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: a1d54447b8290e8e7c666a14bc6c23d481e2b716 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1d54447b8290e8e7c666a14b… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu May 21 11:51:50 2015 +0100 comctl32/tests: Skip the hover tests if the listview's parent is not the foreground window. --- dlls/comctl32/tests/listview.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index a165100..3edb25a 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5178,10 +5178,18 @@ static void test_LVS_EX_HEADERINALLVIEWS(void) static void test_hover(void) { - HWND hwnd; + HWND hwnd, fg; DWORD r; hwnd = create_listview_control(LVS_ICON); + SetForegroundWindow(hwndparent); + fg = GetForegroundWindow(); + if (fg != hwndparent) + { + skip("Window is not in the foreground. Skipping hover tests.\n"); + DestroyWindow(hwnd); + return; + } /* test WM_MOUSEHOVER forwarding */ flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Alexandre Julliard : ntdll: Remove the special case for the NUL device.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: ee1528040e47b39591a39ee42b2a6587a653e00c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1528040e47b39591a39ee42… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:28:03 2015 +0900 ntdll: Remove the special case for the NUL device. --- dlls/ntdll/directory.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 1a8d9cc..8e4db83 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2734,12 +2734,6 @@ static NTSTATUS get_dos_device( const WCHAR *name, UINT name_len, ANSI_STRING *u strcpy( dev, "lpt1" ); continue; } - if (!strcmp( dev, "nul" )) - { - strcpy( unix_name, "/dev/null" ); - dev = NULL; /* last try */ - continue; - } new_name = NULL; if (dev[1] == ':' && dev[2] == ':') /* drive device */

1 0

Alexandre Julliard : kernel32: Get rid of the hardcoded NUL device in QueryDosDeviceW.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: c4fb1f617dbe15ce6fa1e5602de4ade764388b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4fb1f617dbe15ce6fa1e5602… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 21 17:35:59 2015 +0900 kernel32: Get rid of the hardcoded NUL device in QueryDosDeviceW. --- dlls/kernel32/volume.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/volume.c b/dlls/kernel32/volume.c index 0bbf621..d06dd05 100644 --- a/dlls/kernel32/volume.c +++ b/dlls/kernel32/volume.c @@ -1258,7 +1258,6 @@ BOOL WINAPI DefineDosDeviceA(DWORD flags, LPCSTR devname, LPCSTR targetpath) DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) { static const WCHAR auxW[] = {'A','U','X',0}; - static const WCHAR nulW[] = {'N','U','L',0}; static const WCHAR prnW[] = {'P','R','N',0}; static const WCHAR comW[] = {'C','O','M',0}; static const WCHAR lptW[] = {'L','P','T',0}; @@ -1376,7 +1375,7 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) WCHAR *p = target; int i; - if (bufsize <= (sizeof(auxW)+sizeof(nulW)+sizeof(prnW))/sizeof(WCHAR)) + if (bufsize <= (sizeof(auxW)+sizeof(prnW))/sizeof(WCHAR)) { SetLastError( ERROR_INSUFFICIENT_BUFFER ); return 0; @@ -1386,8 +1385,6 @@ DWORD WINAPI QueryDosDeviceW( LPCWSTR devname, LPWSTR target, DWORD bufsize ) memcpy( p, auxW, sizeof(auxW) ); p += sizeof(auxW) / sizeof(WCHAR); - memcpy( p, nulW, sizeof(nulW) ); - p += sizeof(nulW) / sizeof(WCHAR); memcpy( p, prnW, sizeof(prnW) ); p += sizeof(prnW) / sizeof(WCHAR);

1 0

Matteo Bruni : ddraw/tests: Accept broken testbot result for ddraw1: test_texturemapblend().
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 5ec54d2f3b14db8195de0b8a9b8edcfc1ba12374 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ec54d2f3b14db8195de0b8a9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 21 00:24:45 2015 +0200 ddraw/tests: Accept broken testbot result for ddraw1:test_texturemapblend(). --- dlls/ddraw/tests/ddraw1.c | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index a1e595c..f97b964 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6427,6 +6427,24 @@ static void test_texturemapblend(void) emit_set_rs(&ptr, D3DRENDERSTATE_ZENABLE, D3DZB_FALSE); emit_set_rs(&ptr, D3DRENDERSTATE_SRCBLEND, D3DBLEND_SRCALPHA); emit_set_rs(&ptr, D3DRENDERSTATE_DESTBLEND, D3DBLEND_INVSRCALPHA); + /* The history of D3DRENDERSTATE_ALPHABLENDENABLE is quite a mess. In the + * first D3D release there was a D3DRENDERSTATE_BLENDENABLE (enum value 27). + * D3D5 introduced a new and separate D3DRENDERSTATE_ALPHABLENDENABLE (42) + * together with D3DRENDERSTATE_COLORKEYENABLE (41). The docs aren't all + * that clear but they mention that D3DRENDERSTATE_BLENDENABLE overrides the + * two new states. + * Then D3D6 came and got rid of the new D3DRENDERSTATE_ALPHABLENDENABLE + * state (42), renaming the older D3DRENDERSTATE_BLENDENABLE enum (27) + * as D3DRENDERSTATE_ALPHABLENDENABLE. + * There is a comment in the D3D6 docs which mentions that hardware + * rasterizers always used D3DRENDERSTATE_BLENDENABLE to just toggle alpha + * blending while prior to D3D5 software rasterizers toggled both color + * keying and alpha blending according to it. What I gather is that, from + * D3D6 onwards, D3DRENDERSTATE_ALPHABLENDENABLE always only toggles the + * alpha blending state. + * These tests seem to show that actual, current hardware follows the D3D6 + * behavior even when using the original D3D interfaces, for the HAL device + * at least. */ emit_set_rs(&ptr, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREMAPBLEND, D3DTBLEND_MODULATE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); @@ -6658,10 +6676,12 @@ static void test_texturemapblend(void) emit_process_vertices(&ptr, D3DPROCESSVERTICES_COPY, 0, 8); emit_set_rs(&ptr, D3DRENDERSTATE_ALPHABLENDENABLE, TRUE); emit_set_rs(&ptr, D3DRENDERSTATE_TEXTUREHANDLE, texture_handle); - /* This is supposed to be on by default on version 1 devices, - * but for some reason it randomly defaults to FALSE on the W8 - * testbot. This is either the fault of Windows 8 or the WARP - * driver. */ + /* D3DRENDERSTATE_COLORKEYENABLE is supposed to be on by default on version + * 1 devices, but for some reason it randomly defaults to FALSE on the W8 + * testbot. This is either the fault of Windows 8 or the WARP driver. + * Also D3DRENDERSTATE_COLORKEYENABLE was introduced in D3D 5 aka version 2 + * devices only, which might imply this doesn't actually do anything on + * WARP. */ emit_set_rs(&ptr, D3DRENDERSTATE_COLORKEYENABLE, TRUE); emit_tquad(&ptr, 0); @@ -6681,12 +6701,15 @@ static void test_texturemapblend(void) hr = IDirect3DDevice_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + /* Allow broken WARP results (colorkey disabled). */ color = get_surface_color(rt, 5, 5); - ok(compare_color(color, 0x00000000, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000000, 2) || broken(compare_color(color, 0x000000ff, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 5); ok(compare_color(color, 0x00ff0000, 2), "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 5, 245); - ok(compare_color(color, 0x00000000, 2), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x00000000, 2) || broken(compare_color(color, 0x00000080, 2)), + "Got unexpected color 0x%08x.\n", color); color = get_surface_color(rt, 400, 245); ok(compare_color(color, 0x00800000, 2), "Got unexpected color 0x%08x.\n", color);

1 0

Matteo Bruni : ddraw/tests: Workaround a testbot failure in test_ck_rgba() .
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 2fee34f97b3b2cffae6299e5aeba8e2a6b41af15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fee34f97b3b2cffae6299e5a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 21 00:24:44 2015 +0200 ddraw/tests: Workaround a testbot failure in test_ck_rgba(). --- dlls/ddraw/tests/ddraw1.c | 49 +++++++++++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 2675e9f..a1e595c 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1239,26 +1239,41 @@ static void test_ck_rgba(void) {{640.0f}, {480.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {0.0f}}, {{640.0f}, { 0.0f}, {0.75f}, {1.0f}, {0xffffffff}, {0x00000000}, {1.0f}, {1.0f}}, }; + /* Supposedly there was no D3DRENDERSTATE_COLORKEYENABLE in D3D < 5. + * Maybe the WARP driver on Windows 8 ignores setting it via the older + * device interface but it's buggy in that the internal state is not + * initialized, or possibly toggling D3DRENDERSTATE_COLORKEYENABLE / + * D3DRENDERSTATE_ALPHABLENDENABLE has unintended side effects. + * Checking the W8 test results it seems like test 1 fails most of the time + * and test 0 fails very rarely. */ static const struct { D3DCOLOR fill_color; BOOL color_key; BOOL blend; - D3DCOLOR result1, result1_broken; - D3DCOLOR result2, result2_broken; + D3DCOLOR result1, result1_r200, result1_warp; + D3DCOLOR result2, result2_r200, result2_warp; } tests[] = { /* r200 on Windows doesn't check the alpha component when applying the color * key, so the key matches on every texel. */ - {0xff00ff00, TRUE, TRUE, 0x00ff0000, 0x00ff0000, 0x000000ff, 0x000000ff}, - {0xff00ff00, TRUE, FALSE, 0x00ff0000, 0x00ff0000, 0x000000ff, 0x000000ff}, - {0xff00ff00, FALSE, TRUE, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, - {0xff00ff00, FALSE, FALSE, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, - {0x7f00ff00, TRUE, TRUE, 0x00807f00, 0x00ff0000, 0x00807f00, 0x000000ff}, - {0x7f00ff00, TRUE, FALSE, 0x0000ff00, 0x00ff0000, 0x0000ff00, 0x000000ff}, - {0x7f00ff00, FALSE, TRUE, 0x00807f00, 0x00807f00, 0x00807f00, 0x00807f00}, - {0x7f00ff00, FALSE, FALSE, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0xff00ff00, TRUE, TRUE, 0x00ff0000, 0x00ff0000, 0x0000ff00, + 0x000000ff, 0x000000ff, 0x0000ff00}, + {0xff00ff00, TRUE, FALSE, 0x00ff0000, 0x00ff0000, 0x0000ff00, + 0x000000ff, 0x000000ff, 0x0000ff00}, + {0xff00ff00, FALSE, TRUE, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0xff00ff00, FALSE, FALSE, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00}, + {0x7f00ff00, TRUE, TRUE, 0x00807f00, 0x00ff0000, 0x00807f00, + 0x00807f00, 0x000000ff, 0x00807f00}, + {0x7f00ff00, TRUE, FALSE, 0x0000ff00, 0x00ff0000, 0x0000ff00, + 0x0000ff00, 0x000000ff, 0x0000ff00}, + {0x7f00ff00, FALSE, TRUE, 0x00807f00, 0x00807f00, 0x00807f00, + 0x00807f00, 0x00807f00, 0x00807f00}, + {0x7f00ff00, FALSE, FALSE, 0x0000ff00, 0x0000ff00, 0x0000ff00, + 0x0000ff00, 0x0000ff00, 0x0000ff00}, }; IDirect3DExecuteBuffer *execute_buffer; @@ -1371,9 +1386,10 @@ static void test_ck_rgba(void) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, tests[i].result1, 1) || compare_color(color, tests[i].result1_broken, 1), - "Expected color 0x%08x for test %u, got 0x%08x.\n", - tests[i].result1, i, color); + ok(compare_color(color, tests[i].result1, 1) + || broken(compare_color(color, tests[i].result1_r200, 1)) + || broken(compare_color(color, tests[i].result1_warp, 1)), + "Got unexpected color 0x%08x for test %u.\n", color, i); U5(fx).dwFillColor = 0xff0000ff; hr = IDirectDrawSurface_Blt(surface, NULL, NULL, NULL, DDBLT_COLORFILL | DDBLT_WAIT, &fx); @@ -1390,9 +1406,10 @@ static void test_ck_rgba(void) /* This tests that fragments that are masked out by the color key are * discarded, instead of just fully transparent. */ color = get_surface_color(rt, 320, 240); - ok(compare_color(color, tests[i].result2, 1) || compare_color(color, tests[i].result2_broken, 1), - "Expected color 0x%08x for test %u, got 0x%08x.\n", - tests[i].result2, i, color); + ok(compare_color(color, tests[i].result2, 1) + || broken(compare_color(color, tests[i].result2_r200, 1)) + || broken(compare_color(color, tests[i].result2_warp, 1)), + "Got unexpected color 0x%08x for test %u.\n", color, i); } IDirectDrawSurface_Release(rt);

1 0

Matteo Bruni : ddraw/tests: Accept broken testbot result for test_coop_level_d3d_state().
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 30a1fffcc7cc3463eed457c4fa96f4209ca73ab0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30a1fffcc7cc3463eed457c4f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu May 21 00:24:43 2015 +0200 ddraw/tests: Accept broken testbot result for test_coop_level_d3d_state(). --- dlls/ddraw/tests/ddraw1.c | 3 ++- dlls/ddraw/tests/ddraw2.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 39e1570..2675e9f 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -883,7 +883,8 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DViewport_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background); diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 85233f0..0cb1ca4 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -810,7 +810,8 @@ static void test_coop_level_d3d_state(void) hr = IDirect3DViewport2_Clear(viewport, 1, &clear_rect, D3DCLEAR_TARGET); ok(SUCCEEDED(hr), "Failed to clear viewport, hr %#x.\n", hr); color = get_surface_color(rt, 320, 240); - ok(compare_color(color, 0x0000ff00, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x0000ff00, 1) || broken(compare_color(color, 0x00000000, 1)), + "Got unexpected color 0x%08x.\n", color); destroy_viewport(device, viewport); destroy_material(background);

1 0

Jacek Caban : ieframe: Allow any VT_ARRAY type as post data.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 51a08f8c8f54e308722759e21121079e8830b89b URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a08f8c8f54e308722759e21… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 21 12:56:47 2015 +0200 ieframe: Allow any VT_ARRAY type as post data. --- dlls/ieframe/navigate.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 9c5b88a..2eaf200 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -944,6 +944,7 @@ static void navigate_bsc_proc(DocHost *This, task_header_t *t) HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, const VARIANT *TargetFrameName, VARIANT *PostData, VARIANT *Headers) { + SAFEARRAY *post_array = NULL; PBYTE post_data = NULL; ULONG post_data_len = 0; LPWSTR headers = NULL; @@ -955,9 +956,18 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, || (TargetFrameName && V_VT(TargetFrameName) != VT_EMPTY && V_VT(TargetFrameName) != VT_ERROR)) FIXME("Unsupported args (Flags %s; TargetFrameName %s)\n", debugstr_variant(Flags), debugstr_variant(TargetFrameName)); - if(PostData && V_VT(PostData) == (VT_ARRAY | VT_UI1) && V_ARRAY(PostData)) { - SafeArrayAccessData(V_ARRAY(PostData), (void**)&post_data); - post_data_len = V_ARRAY(PostData)->rgsabound[0].cElements; + if(PostData) { + if(V_VT(PostData) & VT_ARRAY) + post_array = V_ISBYREF(PostData) ? *V_ARRAYREF(PostData) : V_ARRAY(PostData); + else + WARN("Invalid post data %s\n", debugstr_variant(PostData)); + } + + if(post_array) { + LONG elem_max; + SafeArrayAccessData(post_array, (void**)&post_data); + SafeArrayGetUBound(post_array, 1, &elem_max); + post_data_len = (elem_max+1) * SafeArrayGetElemsize(post_array); } if(Headers && V_VT(Headers) == VT_BSTR) { @@ -996,7 +1006,7 @@ HRESULT navigate_url(DocHost *This, LPCWSTR url, const VARIANT *Flags, } if(post_data) - SafeArrayUnaccessData(V_ARRAY(PostData)); + SafeArrayUnaccessData(post_array); return hres; }

1 0

Nikolay Sivov : riched20/tests: Test against proper LCID.
by Alexandre Julliard May 21, 2015

May 21, 2015

Module: wine Branch: master Commit: 6fcb092f0f2d503296d08c13effad9dfe4d9b95b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fcb092f0f2d503296d08c13e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu May 21 11:47:16 2015 +0300 riched20/tests: Test against proper LCID. --- dlls/riched20/tests/richole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/tests/richole.c b/dlls/riched20/tests/richole.c index 042bef4..6852821 100644 --- a/dlls/riched20/tests/richole.c +++ b/dlls/riched20/tests/richole.c @@ -1301,8 +1301,8 @@ static void test_GetFont(void) hr = ITextFont_GetLanguageID(font, &value); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine - ok(value == GetUserDefaultLCID(), "got lcid %x, user lcid %x\n", value, - GetUserDefaultLCID()); + ok(value == GetSystemDefaultLCID(), "got lcid %x, user lcid %x\n", value, + GetSystemDefaultLCID()); /* range is non-italic */ value = tomTrue;

1 0