January 2014 - Wine-commits

Henri Verbeet : wined3d: Store color keys in textures instead of in surfaces.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 4710c4b51aef7b6f37d80d76a9333d33f59835d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4710c4b51aef7b6f37d80d76a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:00 2014 +0100 wined3d: Store color keys in textures instead of in surfaces. --- dlls/ddraw/surface.c | 49 +++++++++------- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 26 ++++----- dlls/wined3d/surface.c | 114 +++++++++---------------------------- dlls/wined3d/texture.c | 61 ++++++++++++++++++++ dlls/wined3d/utils.c | 4 +- dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 14 ++--- include/wine/wined3d.h | 4 +- 10 files changed, 139 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4710c4b51aef7b6f37d80…

1 0

Henri Verbeet : ddraw: Don' t propagate color key changes to attached surfaces.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: f7ee96c311dd8127141f268f18f9492b218dd75c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7ee96c311dd8127141f268f1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:01 2014 +0100 ddraw: Don't propagate color key changes to attached surfaces. --- dlls/ddraw/surface.c | 61 ++++---------------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8137157..8ce651c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4494,60 +4494,11 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -/***************************************************************************** - * SetColorKeyEnum - * - * EnumAttachedSurface callback for SetColorKey. Used to set color keys - * recursively in the surface tree - * - *****************************************************************************/ -struct SCKContext -{ - HRESULT ret; - struct wined3d_color_key *color_key; - DWORD Flags; -}; - -static HRESULT WINAPI SetColorKeyEnum(IDirectDrawSurface7 *surface, DDSURFACEDESC2 *desc, void *context) -{ - struct ddraw_surface *surface_impl = impl_from_IDirectDrawSurface7(surface); - struct SCKContext *ctx = context; - HRESULT hr; - - hr = wined3d_surface_set_color_key(surface_impl->wined3d_surface, ctx->Flags, ctx->color_key); - if (FAILED(hr)) - { - WARN("IWineD3DSurface_SetColorKey failed, hr = %08x\n", hr); - ctx->ret = hr; - } - - ddraw_surface7_EnumAttachedSurfaces(surface, context, SetColorKeyEnum); - ddraw_surface7_Release(surface); - - return DDENUMRET_OK; -} - -/***************************************************************************** - * IDirectDrawSurface7::SetColorKey - * - * Sets the color keying options for the surface. Observations showed that - * in case of complex surfaces the color key has to be assigned to all - * sublevels. - * - * Params: - * Flags: DDCKEY_* - * CKey: The new color key - * - * Returns: - * DD_OK on success - * See IWineD3DSurface::SetColorKey for details - * - *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) { struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + HRESULT hr = WINED3D_OK; DDCOLORKEY FixedCKey; - struct SCKContext ctx = { DD_OK, (struct wined3d_color_key *)(CKey ? &FixedCKey : NULL), Flags }; TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); @@ -4612,15 +4563,11 @@ static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWO } } if (This->wined3d_texture) - ctx.ret = wined3d_texture_set_color_key(This->wined3d_texture, Flags, ctx.color_key); - ddraw_surface7_EnumAttachedSurfaces(iface, &ctx, SetColorKeyEnum); + hr = wined3d_texture_set_color_key(This->wined3d_texture, Flags, + CKey ? (struct wined3d_color_key *)&FixedCKey : NULL); wined3d_mutex_unlock(); - switch(ctx.ret) - { - case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; - default: return ctx.ret; - } + return hr_ddraw_from_wined3d(hr); } static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key)

1 0

Henri Verbeet : ddraw: Return DDERR_NOTONMIPMAPSUBLEVEL for ddraw_surface7_SetColorKey() on mipmap sub levels.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: bddb0433f3042b1848f9b65fee4c753be812a81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddb0433f3042b1848f9b65fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:17:02 2014 +0100 ddraw: Return DDERR_NOTONMIPMAPSUBLEVEL for ddraw_surface7_SetColorKey() on mipmap sub levels. --- dlls/ddraw/surface.c | 121 +++++++++++++++++++++++++++--------------------- dlls/ddraw/tests/d3d.c | 2 +- 2 files changed, 70 insertions(+), 53 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 8ce651c..f569ae8 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4494,89 +4494,106 @@ static HRESULT WINAPI ddraw_surface1_GetPalette(IDirectDrawSurface *iface, IDire return ddraw_surface7_GetPalette(&surface->IDirectDrawSurface7_iface, palette); } -static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD Flags, DDCOLORKEY *CKey) +static HRESULT ddraw_surface_set_color_key(struct ddraw_surface *surface, DWORD flags, DDCOLORKEY *color_key) { - struct ddraw_surface *This = impl_from_IDirectDrawSurface7(iface); + DDCOLORKEY fixed_color_key; HRESULT hr = WINED3D_OK; - DDCOLORKEY FixedCKey; - - TRACE("iface %p, flags %#x, color_key %p.\n", iface, Flags, CKey); wined3d_mutex_lock(); - if (CKey) + + if (color_key) { - FixedCKey = *CKey; + fixed_color_key = *color_key; /* Handle case where dwColorSpaceHighValue < dwColorSpaceLowValue */ - if (FixedCKey.dwColorSpaceHighValue < FixedCKey.dwColorSpaceLowValue) - FixedCKey.dwColorSpaceHighValue = FixedCKey.dwColorSpaceLowValue; + if (fixed_color_key.dwColorSpaceHighValue < fixed_color_key.dwColorSpaceLowValue) + fixed_color_key.dwColorSpaceHighValue = fixed_color_key.dwColorSpaceLowValue; - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.ddckCKDestBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.ddckCKDestBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.u3.ddckCKDestOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.u3.ddckCKDestOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.ddckCKSrcOverlay = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.ddckCKSrcOverlay = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.ddckCKSrcBlt = FixedCKey; - This->surface_desc.dwFlags |= DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.ddckCKSrcBlt = fixed_color_key; + surface->surface_desc.dwFlags |= DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } else { - switch (Flags & ~DDCKEY_COLORSPACE) + switch (flags & ~DDCKEY_COLORSPACE) { - case DDCKEY_DESTBLT: - This->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; - break; + case DDCKEY_DESTBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTBLT; + break; - case DDCKEY_DESTOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; - break; + case DDCKEY_DESTOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKDESTOVERLAY; + break; - case DDCKEY_SRCOVERLAY: - This->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; - break; + case DDCKEY_SRCOVERLAY: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCOVERLAY; + break; - case DDCKEY_SRCBLT: - This->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; - break; + case DDCKEY_SRCBLT: + surface->surface_desc.dwFlags &= ~DDSD_CKSRCBLT; + break; - default: - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + default: + wined3d_mutex_unlock(); + return DDERR_INVALIDPARAMS; } } - if (This->wined3d_texture) - hr = wined3d_texture_set_color_key(This->wined3d_texture, Flags, - CKey ? (struct wined3d_color_key *)&FixedCKey : NULL); + + if (surface->wined3d_texture) + hr = wined3d_texture_set_color_key(surface->wined3d_texture, flags, + color_key ? (struct wined3d_color_key *)&fixed_color_key : NULL); + wined3d_mutex_unlock(); return hr_ddraw_from_wined3d(hr); } +static HRESULT WINAPI ddraw_surface7_SetColorKey(IDirectDrawSurface7 *iface, DWORD flags, DDCOLORKEY *color_key) +{ + struct ddraw_surface *surface = impl_from_IDirectDrawSurface7(iface); + + TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); + + wined3d_mutex_lock(); + if (!surface->wined3d_texture) + { + wined3d_mutex_unlock(); + return DDERR_NOTONMIPMAPSUBLEVEL; + } + wined3d_mutex_unlock(); + + return ddraw_surface_set_color_key(surface, flags, color_key); +} + static HRESULT WINAPI ddraw_surface4_SetColorKey(IDirectDrawSurface4 *iface, DWORD flags, DDCOLORKEY *color_key) { struct ddraw_surface *surface = impl_from_IDirectDrawSurface4(iface); TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4585,7 +4602,7 @@ static HRESULT WINAPI ddraw_surface3_SetColorKey(IDirectDrawSurface3 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4594,7 +4611,7 @@ static HRESULT WINAPI ddraw_surface2_SetColorKey(IDirectDrawSurface2 *iface, DWO TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWORD flags, DDCOLORKEY *color_key) @@ -4603,7 +4620,7 @@ static HRESULT WINAPI ddraw_surface1_SetColorKey(IDirectDrawSurface *iface, DWOR TRACE("iface %p, flags %#x, color_key %p.\n", iface, flags, color_key); - return ddraw_surface7_SetColorKey(&surface->IDirectDrawSurface7_iface, flags, color_key); + return ddraw_surface_set_color_key(surface, flags, color_key); } static HRESULT WINAPI ddraw_surface7_SetPalette(IDirectDrawSurface7 *iface, IDirectDrawPalette *palette) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 25da038..be87e63 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2761,7 +2761,7 @@ static void DeviceLoadTest(void) hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][0], DDCKEY_SRCBLT, &ddckey); ok(hr==DD_OK, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); hr = IDirectDrawSurface7_SetColorKey(texture_levels[0][1], DDCKEY_SRCBLT, &ddckey); - todo_wine ok(hr==DDERR_NOTONMIPMAPSUBLEVEL, "IDirectDrawSurface7_SetColorKey returned: %x\n", hr); + ok(hr == DDERR_NOTONMIPMAPSUBLEVEL, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface7_GetColorKey(texture_levels[1][0], DDCKEY_SRCBLT, &ddckey); ok(hr==DDERR_NOCOLORKEY, "IDirectDrawSurface7_GetColorKey returned: %x\n", hr);

1 0

Henri Verbeet : ddraw/tests: Add some color key tests for complex surfaces.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: e00cc024fde84c53a200310ac9d13326e986c171 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e00cc024fde84c53a200310ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 13:49:32 2014 +0100 ddraw/tests: Add some color key tests for complex surfaces. --- dlls/ddraw/tests/ddraw1.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 141 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 140 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 125 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 547 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e00cc024fde84c53a2003…

1 0

Michael Stefaniuc : dmime: Remove "#if 1" preprocessor directives.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: a4664409ef6cf67d88add6eb85ae503ee2b66fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4664409ef6cf67d88add6eb8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 9 10:37:26 2014 +0100 dmime: Remove "#if 1" preprocessor directives. --- dlls/dmime/segment.c | 2 -- dlls/dmime/segtriggertrack.c | 2 -- dlls/dmime/tempotrack.c | 9 +-------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index fa6a6a9..efc03ec 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1109,7 +1109,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI case DMUS_FOURCC_SEGMENT_CHUNK: { DWORD checkSz = sizeof(FOURCC); TRACE_(dmfile)(": segment chunk\n"); -#if 1 /** DX 7 */ IStream_Read (pStm, &This->header.dwRepeats, sizeof(This->header.dwRepeats), NULL); checkSz += sizeof(This->header.dwRepeats); @@ -1145,7 +1144,6 @@ static HRESULT IDirectMusicSegment8Impl_IPersistStream_ParseSegmentForm (LPPERSI IStream_Read (pStm, &This->header.rtPlayStart, sizeof(This->header.rtPlayStart), NULL); checkSz += sizeof(This->header.rtPlayStart); } -#endif liMove.QuadPart = Chunk.dwSize - checkSz + sizeof(FOURCC); IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); break; diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 56847ae..d471114 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -460,7 +460,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST TRACE("(%p, %p): Loading\n", This, pStm); -#if 1 IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { @@ -491,7 +490,6 @@ static HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_Load (LPPERSIST return E_FAIL; } } -#endif return S_OK; } diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index cf1b275..2d19a5f 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -328,14 +328,12 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA LPDMUS_PRIVATE_TEMPO_ITEM pNewItem = NULL; DWORD nItem = 0; FIXME("(%p, %p): Loading not fully implemented yet\n", This, pStm); - -#if 1 + IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); switch (Chunk.fccID) { case DMUS_FOURCC_TEMPO_TRACK: { TRACE_(dmfile)(": Tempo track\n"); -#if 1 IStream_Read (pStm, &StreamSize, sizeof(DWORD), NULL); StreamSize -= sizeof(DWORD); StreamCount = 0; @@ -356,10 +354,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA StreamCount += sizeof(item); TRACE_(dmfile)(": StreamCount[0] = %d < StreamSize[0] = %d\n", StreamCount, StreamSize); } while (StreamCount < StreamSize); -#else - liMove.QuadPart = Chunk.dwSize; - IStream_Seek (pStm, liMove, STREAM_SEEK_CUR, NULL); -#endif break; } default: { @@ -369,7 +363,6 @@ static HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_Load (LPPERSISTSTREA return E_FAIL; } } -#endif return S_OK; }

1 0

Jeremy Newman : disable E_DEPRECATED (-8192) in PHP error reporting
by Jeremy Newman 09 Jan '14

09 Jan '14

Module: appdb Branch: master Commit: 1e53df9bf82420c7498d1561cbc0d3277f093c5e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=1e53df9bf82420c7498d1561… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:27:47 2014 -0600 disable E_DEPRECATED (-8192) in PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 440ee16..98a1d1e 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting 30711 +php_value error_reporting 22519 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Jeremy Newman : disable notices, and strict PHP error reporting
by Jeremy Newman 09 Jan '14

09 Jan '14

Module: appdb Branch: master Commit: 9e89f19117f5218c5ef6186a5696c937e14dfc2b URL: http://source.winehq.org/git/appdb.git/?a=commit;h=9e89f19117f5218c5ef6186a… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Thu Jan 9 09:18:02 2014 -0600 disable notices, and strict PHP error reporting --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 1765613..440ee16 100644 --- a/.htaccess +++ b/.htaccess @@ -12,7 +12,7 @@ ErrorDocument 404 http://www.winehq.org/site/404 # Modify the PHP configuration (global vars, etc.) php_flag allow_call_time_pass_reference 1 -php_value error_reporting "1" +php_value error_reporting 30711 php_value html_errors "1" php_value display_errors "1" php_value register_globals 0

1 0

Stefan Dösinger : wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc .
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: b91973daa7601991ea70a75c3e2faebde9d34bdc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b91973daa7601991ea70a75c3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:15 2014 +0100 wined3d: Merge wined3d_surface_set_mem into wined3d_surface_update_desc . --- dlls/d3d8/device.c | 2 +- dlls/d3d9/device.c | 7 ++++-- dlls/ddraw/surface.c | 25 ++++---------------- dlls/wined3d/device.c | 6 ++--- dlls/wined3d/surface.c | 57 +++++++++++++-------------------------------- dlls/wined3d/wined3d.spec | 3 +-- include/wine/wined3d.h | 4 ++-- 7 files changed, 33 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b91973daa7601991ea70a…

1 0

Stefan Dösinger : ddraw/tests: Add a getdc test with a custom pitch.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 03b2e737d2dcf1b1c668084c4d24fa7fdccf819c URL: http://source.winehq.org/git/wine.git/?a=commit;h=03b2e737d2dcf1b1c668084c4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jan 7 22:12:16 2014 +0100 ddraw/tests: Add a getdc test with a custom pitch. --- dlls/ddraw/tests/ddraw2.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 40 +++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 117 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 46882be..30c5b81 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -4878,6 +4878,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -4926,6 +4927,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface3_SetSurfaceDesc(surface3, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface3_GetDC(surface3, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface3_ReleaseDC(surface3, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0xaaaaaaaa on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface3_Release(surface3); ref = IDirectDraw2_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index df1a23c..e737b42 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -1,6 +1,6 @@ /* * Copyright 2011-2012 Henri Verbeet for CodeWeavers - * Copyright 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2012-2014 Stefan Dösinger for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5479,6 +5479,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5523,6 +5524,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface4_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface4_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface4_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface4_Release(surface); ref = IDirectDraw4_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref); diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index e36927e..f8fa70f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -1,5 +1,5 @@ /* - * Copyright 2006, 2012-2013 Stefan Dösinger for CodeWeavers + * Copyright 2006, 2012-2014 Stefan Dösinger for CodeWeavers * Copyright 2011 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or @@ -5373,6 +5373,7 @@ static void test_user_memory_getdc(void) DWORD data[16][16]; ULONG ref; HDC dc; + unsigned int x, y; if (!(ddraw = create_ddraw())) { @@ -5417,6 +5418,43 @@ static void test_user_memory_getdc(void) ok(data[0][0] == 0xffffffff, "Expected color 0xffffffff, got %#x.\n", data[0][0]); ok(data[15][15] == 0x00000000, "Expected color 0x00000000, got %#x.\n", data[15][15]); + ddsd.dwFlags = DDSD_LPSURFACE | DDSD_HEIGHT | DDSD_WIDTH | DDSD_PITCH; + ddsd.lpSurface = data; + ddsd.dwWidth = 4; + ddsd.dwHeight = 8; + U1(ddsd).lPitch = sizeof(*data); + hr = IDirectDrawSurface7_SetSurfaceDesc(surface, &ddsd, 0); + ok(SUCCEEDED(hr), "Failed to set surface desc, hr %#x.\n", hr); + + memset(data, 0xaa, sizeof(data)); + hr = IDirectDrawSurface7_GetDC(surface, &dc); + ok(SUCCEEDED(hr), "Failed to get DC, hr %#x.\n", hr); + BitBlt(dc, 0, 0, 4, 8, NULL, 0, 0, BLACKNESS); + BitBlt(dc, 1, 1, 2, 2, NULL, 0, 0, WHITENESS); + hr = IDirectDrawSurface7_ReleaseDC(surface, dc); + ok(SUCCEEDED(hr), "Failed to release DC, hr %#x.\n", hr); + + for (y = 0; y < 4; y++) + { + for (x = 0; x < 4; x++) + { + if ((x == 1 || x == 2) && (y == 1 || y == 2)) + ok(data[y][x] == 0xffffffff, "Expected color 0xffffffff on position %ux%u, got %#x.\n", + x, y, data[y][x]); + else + ok(data[y][x] == 0x00000000, "Expected color 0x00000000 on position %ux%u, got %#x.\n", + x, y, data[y][x]); + } + } + ok(data[0][5] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 5x0, got %#x.\n", + data[0][5]); + ok(data[7][3] == 0x00000000, "Expected color 0x00000000 on position 3x7, got %#x.\n", + data[7][3]); + ok(data[7][4] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 4x7, got %#x.\n", + data[7][4]); + ok(data[8][0] == 0xaaaaaaaa, "Expected color 0xaaaaaaaa on position 0x8, got %#x.\n", + data[8][0]); + IDirectDrawSurface7_Release(surface); ref = IDirectDraw7_Release(ddraw); ok(ref == 0, "Ddraw object not properly released, refcount %u.\n", ref);

1 0

Jacek Caban : devenum: Moved test for special category GUID to separated function.
by Alexandre Julliard 08 Jan '14

08 Jan '14

Module: wine Branch: master Commit: 6ce17c1fa4a38f180c10db5db60ae7897e2dcd69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ce17c1fa4a38f180c10db5db… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jan 8 14:12:00 2014 +0100 devenum: Moved test for special category GUID to separated function. --- dlls/devenum/createdevenum.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index b7e288b..58fe7a4 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -107,12 +107,17 @@ static ULONG WINAPI DEVENUM_ICreateDevEnum_Release(ICreateDevEnum * iface) return 1; /* non-heap based object */ } +static BOOL IsSpecialCategory(const CLSID *clsid) +{ + return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) || + IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_MidiRendererCategory); +} + HRESULT DEVENUM_GetCategoryKey(REFCLSID clsidDeviceClass, HKEY *pBaseKey, WCHAR *wszRegKeyName, UINT maxLen) { - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { *pBaseKey = HKEY_CURRENT_USER; strcpyW(wszRegKeyName, wszActiveMovieKey); @@ -482,10 +487,7 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( if (FAILED(hr)) return hr; - if (IsEqualGUID(clsidDeviceClass, &CLSID_AudioRendererCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_AudioInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_VideoInputDeviceCategory) || - IsEqualGUID(clsidDeviceClass, &CLSID_MidiRendererCategory)) + if (IsSpecialCategory(clsidDeviceClass)) { hr = DEVENUM_CreateSpecialCategories(); if (FAILED(hr))

1 0