wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Andrew Eikum : winmm: Initialize COM for MULTITHREADED, not APARTMENTTHREADED.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 6847e882b8e7776a8ff9a77fd8795b062fadff6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6847e882b8e7776a8ff9a77fd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Jan 31 12:53:00 2012 -0600 winmm: Initialize COM for MULTITHREADED, not APARTMENTTHREADED. --- dlls/winmm/waveform.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 59fc0a2..e800653 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -2040,7 +2040,7 @@ static DWORD WINAPI WINMM_DevicesThreadProc(void *arg) HRESULT hr; static const WCHAR messageW[] = {'M','e','s','s','a','g','e',0}; - hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + hr = CoInitializeEx(NULL, COINIT_MULTITHREADED); if(FAILED(hr)){ ERR("CoInitializeEx failed: %08x\n", hr); return 1;

1 0

Juan Lang : crypt32: Only accept trailing NULLs in a certificate common name.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: ab7f8a160f8fb8ae6a970778b40fdcd455521aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab7f8a160f8fb8ae6a970778b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jan 31 08:59:36 2012 -0800 crypt32: Only accept trailing NULLs in a certificate common name. --- dlls/crypt32/chain.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 748c7ce..d112673 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -3163,10 +3163,6 @@ static BOOL match_domain_component(LPCWSTR allowed_component, DWORD allowed_len, *see_wildcard = FALSE; - /* permit server_len to be one byte short if allowed_component is NULL terminated */ - if(allowed_component[allowed_len-1] == 0) - allowed_len--; - if (server_len < allowed_len) { WARN_(chain)("domain component %s too short for %s\n", @@ -3226,6 +3222,13 @@ static BOOL match_common_name(LPCWSTR server_name, const CERT_RDN_ATTR *nameAttr TRACE_(chain)("CN = %s\n", debugstr_wn(allowed_component, allowed_len)); + /* Remove trailing NULLs from the allowed name; while they shouldn't appear + * in a certificate in the first place, they sometimes do, and they should + * be ignored. + */ + while (allowed_len && allowed_component[allowed_len - 1] == 0) + allowed_len--; + /* From RFC 2818 (HTTP over TLS), section 3.1: * "Names may contain the wildcard character * which is considered to match * any single domain name component or component fragment. E.g.,

1 0

Stefan Dösinger : ddraw/tests: Add an IDirect3DDevice7 ::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 4775c76208d90cc402e6cbacf86c1f678ffe39fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=4775c76208d90cc402e6cbacf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:19 2012 +0100 ddraw/tests: Add an IDirect3DDevice7::Load color key test. --- dlls/ddraw/tests/ddraw7.c | 88 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 88 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 0460a3f..ecafcec 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1128,6 +1128,93 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + HWND window; + IDirect3DDevice7 *device; + IDirectDraw7 *ddraw; + IDirectDrawSurface7 *src; + IDirectDrawSurface7 *dst; + DDSURFACEDESC2 ddsd; + HRESULT hr; + DDCOLORKEY ckey; + IDirect3D7 *d3d; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get Direct3D7 interface, hr %#x.\n", hr); + hr = IDirect3D7_QueryInterface(d3d, &IID_IDirectDraw7, (void **)&ddraw); + ok(SUCCEEDED(hr), "Failed to get DirectDraw7 interface, hr %#x.\n", hr); + IDirect3D7_Release(d3d); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface7_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface7_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is deleted. This behavior differs from + * IDirect3DTexture(2)::Load */ + hr = IDirectDrawSurface7_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DDevice7_Load(device, dst, NULL, src, NULL, 0); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface7_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + todo_wine ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + + IDirectDrawSurface7_Release(dst); + IDirectDrawSurface7_Release(src); + IDirectDraw7_Release(ddraw); + IDirect3DDevice7_Release(device); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -1145,4 +1232,5 @@ START_TEST(ddraw7) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Stefan Dösinger : ddraw/tests: Add an IDirect3DTexture2::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: cfc9e120ae46163f754983c72b65cdd73870bac7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfc9e120ae46163f754983c72… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:18 2012 +0100 ddraw/tests: Add an IDirect3DTexture2::Load color key test. --- dlls/ddraw/tests/ddraw4.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 96 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index b242f86..6e7490b 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1214,6 +1214,101 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + IDirectDraw4 *ddraw; + IDirectDrawSurface4 *src; + IDirectDrawSurface4 *dst; + IDirect3DTexture2 *src_tex; + IDirect3DTexture2 *dst_tex; + DDSURFACEDESC2 ddsd; + HRESULT hr; + DDCOLORKEY ckey; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create ddraw object, skipping test.\n"); + return; + } + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface4_QueryInterface(src, &IID_IDirect3DTexture2, (void **)&src_tex); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture2 interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + /* 64 bit ddraw does not support d3d */ + skip("Could not get Direct3DTexture2 interface, skipping texture::Load color keying tests.\n"); + IDirectDrawSurface4_Release(dst); + IDirectDrawSurface4_Release(src); + IDirectDraw4_Release(ddraw); + return; + } + hr = IDirectDrawSurface4_QueryInterface(dst, &IID_IDirect3DTexture2, (void **)&dst_tex); + ok(SUCCEEDED(hr), "Failed to get Direct3DTexture2 interface, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface4_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface4_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is not deleted */ + hr = IDirectDrawSurface4_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture2_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + IDirect3DTexture2_Release(dst_tex); + IDirect3DTexture2_Release(src_tex); + IDirectDrawSurface4_Release(dst); + IDirectDrawSurface4_Release(src); + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -1223,4 +1318,5 @@ START_TEST(ddraw4) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Stefan Dösinger : ddraw/tests: Add an IDirect3DTexture ::Load color key test.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 2bd56ac5530e8200082c6898d63da507192bd779 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bd56ac5530e8200082c6898d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:17 2012 +0100 ddraw/tests: Add an IDirect3DTexture::Load color key test. --- dlls/ddraw/tests/ddraw2.c | 101 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3a62f57..c84e5e9 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1078,6 +1078,106 @@ static void test_depth_blit(void) DestroyWindow(window); } +static void test_texture_load_ckey(void) +{ + IDirectDraw2 *ddraw = NULL; + IDirectDrawSurface *src = NULL; + IDirectDrawSurface *dst = NULL; + IDirect3DTexture *src_tex = NULL; + IDirect3DTexture *dst_tex = NULL; + DDSURFACEDESC ddsd; + HRESULT hr; + DDCOLORKEY ckey; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create ddraw object, skipping test.\n"); + return; + } + hr = IDirectDraw2_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_CAPS | DDSD_HEIGHT | DDSD_WIDTH; + ddsd.dwHeight = 128; + ddsd.dwWidth = 128; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_SYSTEMMEMORY; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &src, NULL); + ok(SUCCEEDED(hr), "Failed to create source texture, hr %#x.\n", hr); + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE; + hr = IDirectDraw2_CreateSurface(ddraw, &ddsd, &dst, NULL); + ok(SUCCEEDED(hr), "Failed to create destination texture, hr %#x.\n", hr); + + hr = IDirectDrawSurface_QueryInterface(src, &IID_IDirect3DTexture, (void **)&src_tex); + ok(SUCCEEDED(hr) || hr == E_NOINTERFACE, "Failed to get Direct3DTexture interface, hr %#x.\n", hr); + if (FAILED(hr)) + { + /* 64 bit ddraw does not support d3d */ + skip("Could not get Direct3DTexture interface, skipping texture::Load color keying tests.\n"); + goto done; + } + hr = IDirectDrawSurface_QueryInterface(dst, &IID_IDirect3DTexture, (void **)&dst_tex); + ok(SUCCEEDED(hr), "Failed to get Direct3DTexture interface, hr %#x.\n", hr); + + /* No surface has a color key */ + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr) || broken(hr == DDERR_INVALIDCAPS), "Got unexpected hr %#x.\n", hr); + if (FAILED(hr)) + { + /* Testbot Windows NT VMs */ + skip("IDirect3DTexture::Load does not work, skipping color keying tests.\n"); + goto done; + } + + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0xdeadbeef; + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0xdeadbeef, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0xdeadbeef, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Source surface has a color key */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x0000ff00; + hr = IDirectDrawSurface_SetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Both surfaces have a color key: Dest ckey is overwritten */ + ckey.dwColorSpaceLowValue = ckey.dwColorSpaceHighValue = 0x000000ff; + hr = IDirectDrawSurface_SetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + + /* Only the destination has a color key: It is not deleted */ + hr = IDirectDrawSurface_SetColorKey(src, DDCKEY_SRCBLT, NULL); + ok(SUCCEEDED(hr), "Failed to set color key, hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(src, DDCKEY_SRCBLT, &ckey); + ok(hr == DDERR_NOCOLORKEY, "Got unexpected hr %#x.\n", hr); + hr = IDirect3DTexture_Load(dst_tex, src_tex); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetColorKey(dst, DDCKEY_SRCBLT, &ckey); + ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); + ok(ckey.dwColorSpaceLowValue == 0x0000ff00, "dwColorSpaceLowValue is %#x.\n", ckey.dwColorSpaceLowValue); + ok(ckey.dwColorSpaceHighValue == 0x0000ff00, "dwColorSpaceHighValue is %#x.\n", ckey.dwColorSpaceHighValue); + +done: + if (dst_tex) IDirect3DTexture_Release(dst_tex); + if (src_tex) IDirect3DTexture_Release(src_tex); + if (dst) IDirectDrawSurface_Release(dst); + if (src) IDirectDrawSurface_Release(src); + if (ddraw) IDirectDraw2_Release(ddraw); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -1086,4 +1186,5 @@ START_TEST(ddraw2) test_surface_interface_mismatch(); test_coop_level_threaded(); test_depth_blit(); + test_texture_load_ckey(); }

1 0

Stefan Dösinger : ddraw: Properly set the color key in texture::load.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 551c732d744d3f5991af114b3157b641ccdcbac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=551c732d744d3f5991af114b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 31 14:49:16 2012 +0100 ddraw: Properly set the color key in texture::load. --- dlls/ddraw/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index ced64a9..2e97510 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4967,12 +4967,12 @@ static HRESULT WINAPI d3d_texture2_Load(IDirect3DTexture2 *iface, IDirect3DTextu { struct wined3d_mapped_rect src_rect, dst_rect; - /* Copy also the ColorKeying stuff */ + /* Copy the src blit color key if the source has one, don't erase + * the destination's ckey if the source has none */ if (src_desc->dwFlags & DDSD_CKSRCBLT) { - dst_desc->dwFlags |= DDSD_CKSRCBLT; - dst_desc->ddckCKSrcBlt.dwColorSpaceLowValue = src_desc->ddckCKSrcBlt.dwColorSpaceLowValue; - dst_desc->ddckCKSrcBlt.dwColorSpaceHighValue = src_desc->ddckCKSrcBlt.dwColorSpaceHighValue; + IDirectDrawSurface7_SetColorKey(&dst_surface->IDirectDrawSurface7_iface, + DDCKEY_SRCBLT, &src_desc->ddckCKSrcBlt); } /* Copy the main memory texture into the surface that corresponds

1 0

Alexandre Julliard : winex11: Consider zero-size windows mapped even when they are positioned at 0, 0.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 4f0f7dec9927eba84a98acd63b22f1d843d672fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f0f7dec9927eba84a98acd63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 17:28:34 2012 +0100 winex11: Consider zero-size windows mapped even when they are positioned at 0,0. --- dlls/winex11.drv/x11drv.h | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 8e3c4c3..78e7cd0 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -648,8 +648,10 @@ static inline void mirror_rect( const RECT *window_rect, RECT *rect ) static inline BOOL is_window_rect_mapped( const RECT *rect ) { - return (rect->left < virtual_screen_rect.right && rect->top < virtual_screen_rect.bottom && - rect->right > virtual_screen_rect.left && rect->bottom > virtual_screen_rect.top); + return (rect->left < virtual_screen_rect.right && + rect->top < virtual_screen_rect.bottom && + max( rect->right, rect->left + 1 ) > virtual_screen_rect.left && + max( rect->bottom, rect->top + 1 ) > virtual_screen_rect.top); } static inline BOOL is_window_rect_fullscreen( const RECT *rect )

1 0

Piotr Caban : urlmon: Handle implicit file scheme in MapUrlToZone and GetSecurityId functions.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 804a9d80d85d85485e8d586271996edba0a7e3b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=804a9d80d85d85485e8d58627… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jan 31 14:11:20 2012 +0100 urlmon: Handle implicit file scheme in MapUrlToZone and GetSecurityId functions. --- dlls/urlmon/sec_mgr.c | 4 ++-- dlls/urlmon/tests/sec_mgr.c | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/sec_mgr.c b/dlls/urlmon/sec_mgr.c index d569f12..d8f1a2b 100644 --- a/dlls/urlmon/sec_mgr.c +++ b/dlls/urlmon/sec_mgr.c @@ -602,7 +602,7 @@ static HRESULT map_url_to_zone(LPCWSTR url, DWORD *zone, LPWSTR *ret_url) memcpy(secur_url, url, size); } - hres = CreateUri(secur_url, 0, 0, &secur_uri); + hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &secur_uri); if(FAILED(hres)) { CoTaskMemFree(secur_url); return hres; @@ -805,7 +805,7 @@ static HRESULT get_security_id_for_url(LPCWSTR url, BYTE *secid, DWORD *secid_le if(FAILED(hres)) return hres == 0x80041001 ? E_INVALIDARG : hres; - hres = CreateUri(secur_url, 0, 0, &uri); + hres = CreateUri(secur_url, Uri_CREATE_ALLOW_IMPLICIT_FILE_SCHEME, 0, &uri); CoTaskMemFree(secur_url); if(FAILED(hres)) return hres; diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 2509d84..d0e89ce 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -105,6 +105,7 @@ static const WCHAR url14[] = {'z','i','p',':','t','e','s','t','i','n','g','.','c static const WCHAR url15[] = {'h','t','t','p',':','/','/','g','o','o','g','l','e','.','c','o','m','.','u','k',0}; static const WCHAR url16[] = {'f','i','l','e',':','/','/','/','c',':',0}; static const WCHAR url17[] = {'f','i','l','e',':','/','/','/','c',':','c','\\',0}; +static const WCHAR url18[] = {'c',':','\\','t','e','s','t','.','h','t','m',0}; static const WCHAR url4e[] = {'f','i','l','e',':','s','o','m','e',' ','f','i','l','e', '.','j','p','g',0}; @@ -161,7 +162,8 @@ static struct secmgr_test { {url11,0, S_OK, sizeof(secid1), secid1, S_OK}, {url12,0, S_OK, sizeof(secid1), secid1, S_OK}, {url16,0, S_OK, sizeof(secid1), secid1, S_OK}, - {url17,0, S_OK, sizeof(secid1), secid1, S_OK} + {url17,0, S_OK, sizeof(secid1), secid1, S_OK}, + {url18,0, S_OK, sizeof(secid1), secid1, S_OK} }; static int strcmp_w(const WCHAR *str1, const WCHAR *str2)

1 0

Alexandre Julliard : psapi/tests: Don' t check data returned from a failing call.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 773c46b9295a489744767dca824b234b720c4566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=773c46b9295a489744767dca8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 14:43:03 2012 +0100 psapi/tests: Don't check data returned from a failing call. --- dlls/psapi/tests/psapi_main.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 71c3c95..e6e0cab 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -203,17 +203,20 @@ todo_wine todo_wine ok( ret || broken(GetLastError() == ERROR_UNEXP_NET_ERR), /* win2k */ "GetMappedFileNameA failed with error %u\n", GetLastError() ); - ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); -todo_wine - ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); - szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ -todo_wine - ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); - if (szMapBaseName) + if (ret) { - GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); - ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), - "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + ok(ret == strlen(szMapPath), "szMapPath=\"%s\" ret=%d\n", szMapPath, ret); + todo_wine + ok(szMapPath[0] == '\\', "szMapPath=\"%s\"\n", szMapPath); + szMapBaseName = strrchr(szMapPath, '\\'); /* That's close enough for us */ + todo_wine + ok(szMapBaseName && *szMapBaseName, "szMapPath=\"%s\"\n", szMapPath); + if (szMapBaseName) + { + GetModuleFileNameA(NULL, szModPath, sizeof(szModPath)); + ok(!strcmp(strrchr(szModPath, '\\'), szMapBaseName), + "szModPath=\"%s\" szMapBaseName=\"%s\"\n", szModPath, szMapBaseName); + } } GetTempPath(MAX_PATH, temp_path);

1 0

Jörg Höhle : mciwave: Always reach an end position expressed in milliseconds.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: bdf757838988148a10f98e660b9ccede5f5e7d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf757838988148a10f98e660… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Jan 31 09:33:19 2012 +0100 mciwave: Always reach an end position expressed in milliseconds. --- dlls/mciwave/mciwave.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index effecf4..723b5fe 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -225,7 +225,7 @@ static void WAVE_mciNotify(DWORD_PTR hWndCallBack, WINE_MCIWAVE* wmw, UINT wStat /************************************************************************** * WAVE_ConvertByteToTimeFormat [internal] */ -static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD lpRet) +static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val) { DWORD ret = 0; @@ -243,7 +243,6 @@ static DWORD WAVE_ConvertByteToTimeFormat(WINE_MCIWAVE* wmw, DWORD val, LPDWORD WARN("Bad time format %u!\n", wmw->dwMciTimeFormat); } TRACE("val=%u=0x%08x [tf=%u] => ret=%u\n", val, val, wmw->dwMciTimeFormat, ret); - *lpRet = 0; return ret; } @@ -257,6 +256,9 @@ static DWORD WAVE_ConvertTimeFormatToByte(WINE_MCIWAVE* wmw, DWORD val) switch (wmw->dwMciTimeFormat) { case MCI_FORMAT_MILLISECONDS: ret = MulDiv(val,wmw->lpWaveFormat->nAvgBytesPerSec,1000); + if (ret > wmw->ckWaveData.cksize && + val == WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize)) + ret = wmw->ckWaveData.cksize; break; case MCI_FORMAT_BYTES: ret = val; @@ -1484,7 +1486,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM return MCIERR_UNSUPPORTED_FUNCTION; } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ - lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize, &ret); + lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, wmw->ckWaveData.cksize); TRACE("MCI_STATUS_LENGTH => %lu\n", lpParms->dwReturn); break; case MCI_STATUS_MODE: @@ -1509,8 +1511,7 @@ static DWORD WAVE_mciStatus(MCIDEVICEID wDevID, DWORD dwFlags, LPMCI_STATUS_PARM } /* only one track in file is currently handled, so don't take care of MCI_TRACK flag */ lpParms->dwReturn = WAVE_ConvertByteToTimeFormat(wmw, - (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition, - &ret); + (dwFlags & MCI_STATUS_START) ? 0 : wmw->dwPosition); TRACE("MCI_STATUS_POSITION %s => %lu\n", (dwFlags & MCI_STATUS_START) ? "start" : "current", lpParms->dwReturn); break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012