September 2011 - Wine-commits

Francois Gouget : msi: Don't use debugstr_a() on an output parameter.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: ed01c5329036105c04ac8b6e729b8c3e47975462 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed01c5329036105c04ac8b6e7… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Sep 19 23:09:43 2011 +0200 msi: Don't use debugstr_a() on an output parameter. Spotted by Michael Stefaniuc and Hans Leidekker. --- dlls/msi/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index de9c0ce..672c528 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -489,7 +489,7 @@ UINT WINAPI MsiGetSourcePathA( MSIHANDLE hInstall, LPCSTR szFolder, awstring str; UINT r; - TRACE("%s %p %p\n", debugstr_a(szFolder), debugstr_a(szPathBuf), pcchPathBuf); + TRACE("%s %p %p\n", debugstr_a(szFolder), szPathBuf, pcchPathBuf); str.unicode = FALSE; str.str.a = szPathBuf;

1 0

André Hentschel : gdi32/tests: Add a second test about non-uniform ramps.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 61034406db98e6ed15bef5aa345d4b433f81c88b URL: http://source.winehq.org/git/wine.git/?a=commit;h=61034406db98e6ed15bef5aa3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Sep 19 21:39:12 2011 +0200 gdi32/tests: Add a second test about non-uniform ramps. --- dlls/gdi32/tests/dc.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9420f78..2eee7ed 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -761,11 +761,19 @@ static void test_gamma(void) ret = SetDeviceGammaRamp(hdc, &ramp); ok(!ret, "SetDeviceGammaRamp succeeded\n"); - /* try a ramp which is not uniform */ + /* try ramps which are not uniform */ ramp[0][0] = 0; for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n"); + ramp[0][0] = 0; + for (i = 2; i < 256; i+=2) + { + ramp[0][i - 1] = ramp[0][i - 2]; + ramp[0][i] = ramp[0][i - 2] + 512; + } + ret = SetDeviceGammaRamp(hdc, &ramp); + ok(ret, "SetDeviceGammaRamp failed\n"); /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp);

1 0

Henri Verbeet : ddraw: Setup swapchain dimensions and format using the current display mode in ddraw_create_swapchain ().
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: cc45316d029c35b287e3266eec5c7162345db602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc45316d029c35b287e3266ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 21:50:23 2011 +0200 ddraw: Setup swapchain dimensions and format using the current display mode in ddraw_create_swapchain(). --- dlls/ddraw/ddraw.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 65afa90..5b3b0e2 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2554,8 +2554,20 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface { WINED3DPRESENT_PARAMETERS presentation_parameters; IDirectDrawSurfaceImpl *target = surface; + WINED3DDISPLAYMODE mode; HRESULT hr = WINED3D_OK; + /* FIXME: wined3d_get_adapter_display_mode() would be more appropriate + * here, since we don't actually have a swapchain yet, but + * wined3d_device_get_display_mode() has some special handling for color + * depth changes. */ + hr = wined3d_device_get_display_mode(ddraw->wined3d_device, 0, &mode); + if (FAILED(hr)) + { + ERR("Failed to get display mode.\n"); + return hr; + } + if (ddraw->primary) { TRACE("Using primary %p.\n", ddraw->primary); @@ -2563,9 +2575,9 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface } memset(&presentation_parameters, 0, sizeof(presentation_parameters)); - presentation_parameters.BackBufferWidth = target->surface_desc.dwWidth; - presentation_parameters.BackBufferHeight = target->surface_desc.dwHeight; - presentation_parameters.BackBufferFormat = PixelFormat_DD2WineD3D(&target->surface_desc.u4.ddpfPixelFormat); + presentation_parameters.BackBufferWidth = mode.Width; + presentation_parameters.BackBufferHeight = mode.Height; + presentation_parameters.BackBufferFormat = mode.Format; presentation_parameters.SwapEffect = WINED3DSWAPEFFECT_COPY; presentation_parameters.hDeviceWindow = ddraw->dest_window; presentation_parameters.Windowed = !(ddraw->cooperative_level & DDSCL_FULLSCREEN); @@ -2588,7 +2600,6 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface } return hr; - } /*****************************************************************************

1 0

Henri Verbeet : ddraw: Store the wined3d swapchain reference in the ddraw object instead of the primary surface .
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 4228bbc5bf78c199a131cbc8db507d284ab4e63d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4228bbc5bf78c199a131cbc8d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 21:50:24 2011 +0200 ddraw: Store the wined3d swapchain reference in the ddraw object instead of the primary surface. --- dlls/ddraw/ddraw.c | 49 +++++++++---------------- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/surface.c | 84 +++++++++++++++++++++++-------------------- 3 files changed, 64 insertions(+), 71 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 5b3b0e2..18fe07f 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2533,23 +2533,6 @@ static HRESULT ddraw_attach_d3d_device(IDirectDrawImpl *ddraw, IDirectDrawSurfac return DD_OK; } -static HRESULT ddraw_create_gdi_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *primary, - WINED3DPRESENT_PARAMETERS *presentation_parameters) -{ - HRESULT hr; - - ddraw->d3d_target = primary; - hr = wined3d_device_init_gdi(ddraw->wined3d_device, presentation_parameters); - ddraw->d3d_target = NULL; - if (FAILED(hr)) - { - WARN("Failed to initialize GDI ddraw implementation, hr %#x.\n", hr); - primary->wined3d_swapchain = NULL; - } - - return hr; -} - static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurfaceImpl *surface) { WINED3DPRESENT_PARAMETERS presentation_parameters; @@ -2596,7 +2579,18 @@ static HRESULT ddraw_create_swapchain(IDirectDrawImpl *ddraw, IDirectDrawSurface } else if (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - hr = ddraw_create_gdi_swapchain(ddraw, target, &presentation_parameters); + hr = wined3d_device_init_gdi(ddraw->wined3d_device, &presentation_parameters); + if (FAILED(hr)) + WARN("Failed to initialize GDI ddraw implementation, hr %#x.\n", hr); + } + + if (SUCCEEDED(hr)) + { + if (FAILED(hr = wined3d_device_get_swapchain(ddraw->wined3d_device, 0, &ddraw->wined3d_swapchain))) + { + ERR("Failed to get swapchain, hr %#x.\n", hr); + ddraw->wined3d_swapchain = NULL; + } } return hr; @@ -5341,27 +5335,20 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent WINED3DPRESENT_PARAMETERS *present_parameters, struct wined3d_swapchain **swapchain) { struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); - IDirectDrawSurfaceImpl *iterator; HRESULT hr; TRACE("device_parent %p, present_parameters %p, swapchain %p.\n", device_parent, present_parameters, swapchain); + if (ddraw->wined3d_swapchain) + { + ERR("Swapchain already created.\n"); + return E_FAIL; + } + hr = wined3d_swapchain_create(ddraw->wined3d_device, present_parameters, DefaultSurfaceType, NULL, &ddraw_null_wined3d_parent_ops, swapchain); if (FAILED(hr)) - { WARN("Failed to create swapchain, hr %#x.\n", hr); - *swapchain = NULL; - return hr; - } - - ddraw->d3d_target->wined3d_swapchain = *swapchain; - iterator = ddraw->d3d_target->complex_array[0]; - while (iterator) - { - iterator->wined3d_swapchain = *swapchain; - iterator = iterator->complex_array[0]; - } return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index bc48ad1..0572172 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -90,6 +90,7 @@ struct IDirectDrawImpl IDirectDrawSurfaceImpl *primary; struct wined3d_surface *wined3d_frontbuffer; + struct wined3d_swapchain *wined3d_swapchain; /* DirectDraw things, which are not handled by WineD3D */ DWORD cooperative_level; @@ -160,7 +161,6 @@ struct IDirectDrawSurfaceImpl IDirectDrawImpl *ddraw; struct wined3d_surface *wined3d_surface; struct wined3d_texture *wined3d_texture; - struct wined3d_swapchain *wined3d_swapchain; /* This implementation handles attaching surfaces to other surfaces */ IDirectDrawSurfaceImpl *next_attached; diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 96caa3f..4cd1452 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -385,21 +385,57 @@ void ddraw_surface_destroy(IDirectDrawSurfaceImpl *This) static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) { + IDirectDrawImpl *ddraw = surface->ddraw; + BOOL destroy_swapchain = FALSE; IDirectDrawSurfaceImpl *surf; IUnknown *ifaceToRelease; UINT i; TRACE("surface %p.\n", surface); - if (surface->wined3d_swapchain) + if ((ddraw->d3d_initialized && surface == ddraw->d3d_target + && DefaultSurfaceType == SURFACE_OPENGL) + || ((surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) + && DefaultSurfaceType != SURFACE_OPENGL)) + destroy_swapchain = TRUE; + + /* The refcount test shows that the palette is detached when the surface + * is destroyed. */ + IDirectDrawSurface7_SetPalette(&surface->IDirectDrawSurface7_iface, NULL); + + /* Loop through all complex attached surfaces and destroy them. + * + * Yet again, only the root can have more than one complexly attached + * surface, all the others have a total of one. */ + for (i = 0; i < MAX_COMPLEX_ATTACHED; ++i) { - IDirectDrawImpl *ddraw = surface->ddraw; + if (!surface->complex_array[i]) + break; - /* If it's the render target, destroy the D3D device. */ - if (ddraw->d3d_initialized && surface == ddraw->d3d_target) + surf = surface->complex_array[i]; + surface->complex_array[i] = NULL; + while (surf) { - TRACE("Destroying the render target, uninitializing D3D.\n"); + IDirectDrawSurfaceImpl *destroy = surf; + surf = surf->complex_array[0]; /* Iterate through the "tree" */ + ddraw_surface_destroy(destroy); /* Destroy it */ + } + } + + ifaceToRelease = surface->ifaceToRelease; + /* Destroy the root surface. */ + ddraw_surface_destroy(surface); + + if (ddraw->wined3d_swapchain && destroy_swapchain) + { + TRACE("Destroying the swapchain.\n"); + + wined3d_swapchain_decref(ddraw->wined3d_swapchain); + ddraw->wined3d_swapchain = NULL; + + if (DefaultSurfaceType == SURFACE_OPENGL) + { for (i = 0; i < ddraw->numConvertedDecls; ++i) { wined3d_vertex_declaration_decref(ddraw->decls[i].decl); @@ -430,39 +466,9 @@ static void ddraw_surface_cleanup(IDirectDrawSurfaceImpl *surface) wined3d_device_uninit_gdi(ddraw->wined3d_device); } - surface->wined3d_swapchain = NULL; - - TRACE("D3D unloaded.\n"); + TRACE("Swapchain destroyed.\n"); } - /* The refcount test shows that the palette is detached when the surface - * is destroyed. */ - IDirectDrawSurface7_SetPalette(&surface->IDirectDrawSurface7_iface, NULL); - - /* Loop through all complex attached surfaces and destroy them. - * - * Yet again, only the root can have more than one complexly attached - * surface, all the others have a total of one. */ - for (i = 0; i < MAX_COMPLEX_ATTACHED; ++i) - { - if (!surface->complex_array[i]) - break; - - surf = surface->complex_array[i]; - surface->complex_array[i] = NULL; - while (surf) - { - IDirectDrawSurfaceImpl *destroy = surf; - surf = surf->complex_array[0]; /* Iterate through the "tree" */ - ddraw_surface_destroy(destroy); /* Destroy it */ - } - } - - ifaceToRelease = surface->ifaceToRelease; - - /* Destroy the root surface. */ - ddraw_surface_destroy(surface); - /* Reduce the ddraw refcount */ if (ifaceToRelease) IUnknown_Release(ifaceToRelease); @@ -3859,7 +3865,7 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, hr = wined3d_surface_set_clipper(This->wined3d_surface, This->clipper ? This->clipper->wineD3DClipper : NULL); - if (This->wined3d_swapchain) + if ((This->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) && This->ddraw->wined3d_swapchain) { clipWindow = NULL; if(clipper) { @@ -3867,9 +3873,9 @@ static HRESULT WINAPI ddraw_surface7_SetClipper(IDirectDrawSurface7 *iface, } if (clipWindow) - wined3d_swapchain_set_window(This->wined3d_swapchain, clipWindow); + wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, clipWindow); else - wined3d_swapchain_set_window(This->wined3d_swapchain, This->ddraw->d3d_window); + wined3d_swapchain_set_window(This->ddraw->wined3d_swapchain, This->ddraw->d3d_window); } LeaveCriticalSection(&ddraw_cs);

1 0

Henri Verbeet : wined3d: Dump the WINEDDBLTFX structure in wined3d_surface_blt().
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: wine Branch: master Commit: 5609f062d250504657302f7615e0692ef2548529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5609f062d250504657302f761… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 19 21:50:25 2011 +0200 wined3d: Dump the WINEDDBLTFX structure in wined3d_surface_blt(). --- dlls/wined3d/surface.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f64e0ca..4f2c5c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1481,6 +1481,37 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC flags, fx, debug_d3dtexturefiltertype(filter)); TRACE("Usage is %s.\n", debug_d3dusage(dst_surface->resource.usage)); + if (fx) + { + TRACE("dwSize %#x.\n", fx->dwSize); + TRACE("dwDDFX %#x.\n", fx->dwDDFX); + TRACE("dwROP %#x.\n", fx->dwROP); + TRACE("dwDDROP %#x.\n", fx->dwDDROP); + TRACE("dwRotationAngle %#x.\n", fx->dwRotationAngle); + TRACE("dwZBufferOpCode %#x.\n", fx->dwZBufferOpCode); + TRACE("dwZBufferLow %#x.\n", fx->dwZBufferLow); + TRACE("dwZBufferHigh %#x.\n", fx->dwZBufferHigh); + TRACE("dwZBufferBaseDest %#x.\n", fx->dwZBufferBaseDest); + TRACE("dwZDestConstBitDepth %#x.\n", fx->dwZDestConstBitDepth); + TRACE("lpDDSZBufferDest %p.\n", fx->u1.lpDDSZBufferDest); + TRACE("dwZSrcConstBitDepth %#x.\n", fx->dwZSrcConstBitDepth); + TRACE("lpDDSZBufferSrc %p.\n", fx->u2.lpDDSZBufferSrc); + TRACE("dwAlphaEdgeBlendBitDepth %#x.\n", fx->dwAlphaEdgeBlendBitDepth); + TRACE("dwAlphaEdgeBlend %#x.\n", fx->dwAlphaEdgeBlend); + TRACE("dwReserved %#x.\n", fx->dwReserved); + TRACE("dwAlphaDestConstBitDepth %#x.\n", fx->dwAlphaDestConstBitDepth); + TRACE("lpDDSAlphaDest %p.\n", fx->u3.lpDDSAlphaDest); + TRACE("dwAlphaSrcConstBitDepth %#x.\n", fx->dwAlphaSrcConstBitDepth); + TRACE("lpDDSAlphaSrc %p.\n", fx->u4.lpDDSAlphaSrc); + TRACE("lpDDSPattern %p.\n", fx->u5.lpDDSPattern); + TRACE("ddckDestColorkey {%#x, %#x}.\n", + fx->ddckDestColorkey.dwColorSpaceLowValue, + fx->ddckDestColorkey.dwColorSpaceHighValue); + TRACE("ddckSrcColorkey {%#x, %#x}.\n", + fx->ddckSrcColorkey.dwColorSpaceLowValue, + fx->ddckSrcColorkey.dwColorSpaceHighValue); + } + if ((dst_surface->flags & SFLAG_LOCKED) || (src_surface && (src_surface->flags & SFLAG_LOCKED))) { WARN("Surface is busy, returning WINEDDERR_SURFACEBUSY.\n");

1 0

Frédéric Delanoy : winedev: Add doc for winedbg symbol_picker option.
by Alexandre Julliard 20 Sep '11

20 Sep '11

Module: docs Branch: master Commit: 7a53e943ed3fc96c0e34458019ee0f5827b06c6f URL: http://source.winehq.org/git/docs.git/?a=commit;h=7a53e943ed3fc96c0e3445801… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Sep 19 21:08:12 2011 +0200 winedev: Add doc for winedbg symbol_picker option. --- en/winedev-debugger.sgml | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/en/winedev-debugger.sgml b/en/winedev-debugger.sgml index e4810d3..587a470 100644 --- a/en/winedev-debugger.sgml +++ b/en/winedev-debugger.sgml @@ -1934,6 +1934,27 @@ set $BreakAllThreadsStartup = 1 prints the C type of expression <expr> </entry> </row> + <row> + <entry> + <command> + set ! symbol_picker interactive + </command> + </entry> + <entry> + when printing a value, if several symbols are found, ask the user + which one to pick (default) + </entry> + </row> + <row> + <entry> + <command> + set ! symbol_picker scoped + </command> + </entry> + <entry> + when printing a value, give precedence to local symbols over global symbols + </entry> + </row> </tbody> </tgroup> </table>

1 0

Jacek Caban : jscript: Removed useless undef ACTSCPSITE_THIS.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: c46c47cbf31621ec61fb7ec672c2b95cc40ccf40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46c47cbf31621ec61fb7ec67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 19 14:46:43 2011 +0200 jscript: Removed useless undef ACTSCPSITE_THIS. --- dlls/jscript/tests/jscript.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c index eda867d..152329b 100644 --- a/dlls/jscript/tests/jscript.c +++ b/dlls/jscript/tests/jscript.c @@ -189,8 +189,6 @@ static HRESULT WINAPI ActiveScriptSite_OnLeaveScript(IActiveScriptSite *iface) return S_OK; } -#undef ACTSCPSITE_THIS - static const IActiveScriptSiteVtbl ActiveScriptSiteVtbl = { ActiveScriptSite_QueryInterface, ActiveScriptSite_AddRef,

1 0

Francois Gouget : comctl32: Don' t crash when getting a bad image list handle.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 01378c5c8e12847a6c79a2a4599796eefe874a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01378c5c8e12847a6c79a2a45… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Sep 19 15:32:16 2011 +0200 comctl32: Don't crash when getting a bad image list handle. --- dlls/comctl32/imagelist.c | 13 ++++++++++++- dlls/comctl32/tests/imagelist.c | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ec62370..83b8b44 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -54,6 +54,7 @@ #include "commoncontrols.h" #include "imagelist.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(imagelist); @@ -3587,7 +3588,17 @@ static const IImageListVtbl ImageListImpl_Vtbl = { static inline BOOL is_valid(HIMAGELIST himl) { - return himl && himl->lpVtbl == &ImageListImpl_Vtbl; + BOOL valid; + __TRY + { + valid = himl && himl->lpVtbl == &ImageListImpl_Vtbl; + } + __EXCEPT_PAGE_FAULT + { + valid = FALSE; + } + __ENDTRY + return valid; } /************************************************************************* diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 0441fd0..dc08205 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -372,6 +372,8 @@ static void test_add_remove(void) /* destroy it */ ok(ImageList_Destroy(himl),"destroy imagelist failed\n"); + ok(-1==ImageList_AddIcon((HIMAGELIST)0xdeadbeef, hicon1),"don't crash on bad handle\n"); + ok(DestroyIcon(hicon1),"icon 1 wasn't deleted\n"); ok(DestroyIcon(hicon2),"icon 2 wasn't deleted\n"); ok(DestroyIcon(hicon3),"icon 3 wasn't deleted\n"); @@ -381,6 +383,8 @@ static void test_imagecount(void) { HIMAGELIST himl; + ok(0==ImageList_GetImageCount((HIMAGELIST)0xdeadbeef),"don't crash on bad handle\n"); + if (!pImageList_SetImageCount) { win_skip("ImageList_SetImageCount not available\n"); @@ -451,6 +455,8 @@ static void test_DrawIndirect(void) ok(!pImageList_DrawIndirect(&imldp), "zero hdc succeeded!\n"); imldp.hdcDst = hdc; ok(!pImageList_DrawIndirect(&imldp),"zero himl succeeded!\n"); + imldp.himl = (HIMAGELIST)0xdeadbeef; + ok(!pImageList_DrawIndirect(&imldp),"bad himl succeeded!\n"); imldp.himl = himl; REDRAW(hwndfortest); @@ -1752,11 +1758,15 @@ static void test_iconsize(void) ok(cy == 0x1abe11ed, "got %d\n", cy); ImageList_Destroy(himl); + + ret = ImageList_GetIconSize((HIMAGELIST)0xdeadbeef, &cx, &cy); + ok(!ret, "got %d\n", ret); } -static void test_create(void) +static void test_create_destroy(void) { HIMAGELIST himl; + BOOL rc; /* list with zero or negative image dimensions */ himl = ImageList_Create(0, 0, ILC_COLOR16, 0, 3); @@ -1773,6 +1783,9 @@ static void test_create(void) himl = ImageList_Create(-1, 16, ILC_COLOR16, 0, 3); ok(himl == NULL, "got %p\n", himl); + + rc = ImageList_Destroy((HIMAGELIST)0xdeadbeef); + ok(rc == FALSE, "ImageList_Destroy(0xdeadbeef) should fail and not crash\n"); } static void test_IImageList_Clone(void) @@ -1912,7 +1925,7 @@ START_TEST(imagelist) InitCommonControls(); - test_create(); + test_create_destroy(); test_hotspot(); test_add_remove(); test_imagecount();

1 0

Stefan Dösinger : ddraw/tests: Remove the partial cube map load tests.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 81a9f19bacce4694fb527372342af2a6b20466b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81a9f19bacce4694fb5273723… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:43:45 2011 +0200 ddraw/tests: Remove the partial cube map load tests. They BSOD my Radeon X1600 Windows machine. --- dlls/ddraw/tests/d3d.c | 56 +++-------------------------------------------- 1 files changed, 4 insertions(+), 52 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 54974d9..dee6f05 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -2435,58 +2435,10 @@ static void DeviceLoadTest(void) IDirectDrawSurface7_Release(texture_levels[0][0]); memset(texture_levels, 0, sizeof(texture_levels)); - /* Test cubemap loading from cubemap with different number of faces. */ - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[0][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - memset(&ddsd, 0, sizeof(DDSURFACEDESC2)); - ddsd.dwSize = sizeof(ddsd); - ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT; - ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_COMPLEX; - ddsd.ddsCaps.dwCaps2 = DDSCAPS2_CUBEMAP | DDSCAPS2_CUBEMAP_POSITIVEX | DDSCAPS2_CUBEMAP_POSITIVEY; - ddsd.dwWidth = 128; - ddsd.dwHeight = 128; - hr = IDirectDraw7_CreateSurface(lpDD, &ddsd, &cube_face_levels[1][0][0], NULL); - ok(hr==DD_OK,"CreateSurface returned: %x\n",hr); - if (FAILED(hr)) goto out; - - /* INVALIDPARAMS tests currently would fail because wine doesn't support partial cube faces - (the above created cubemaps will have all faces. */ - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[0][0][0], NULL, cube_face_levels[1][0][0], NULL, - DDSCAPS2_CUBEMAP_ALLFACES); - todo_wine ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[0][0][0], NULL, cube_face_levels[1][0][0], NULL, - DDSCAPS2_CUBEMAP_POSITIVEX | DDSCAPS2_CUBEMAP_POSITIVEY); - todo_wine ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[0][0][0], NULL, cube_face_levels[1][0][0], NULL, - DDSCAPS2_CUBEMAP_POSITIVEX); - todo_wine ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[1][0][0], NULL, cube_face_levels[0][0][0], NULL, - DDSCAPS2_CUBEMAP_ALLFACES); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[1][0][0], NULL, cube_face_levels[0][0][0], NULL, - DDSCAPS2_CUBEMAP_POSITIVEX); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - hr = IDirect3DDevice7_Load(lpD3DDevice, cube_face_levels[1][0][0], NULL, cube_face_levels[0][0][0], NULL, - DDSCAPS2_CUBEMAP_POSITIVEZ); - ok(hr==D3D_OK, "IDirect3DDevice7_Load returned: %x\n",hr); - - IDirectDrawSurface7_Release(cube_face_levels[0][0][0]); - IDirectDrawSurface7_Release(cube_face_levels[1][0][0]); - memset(cube_face_levels, 0, sizeof(cube_face_levels)); + /* Partial cube maps(e.g. created with an explicitly set DDSCAPS2_CUBEMAP_POSITIVEX flag) + * BSOD some Windows machines when an app tries to create them(Radeon X1600, Windows XP, + * Catalyst 10.2 driver, 6.14.10.6925) + */ } /* Test texture loading with different mip level count (larger levels match, smaller levels missing in destination. */

1 0

Stefan Dösinger : ddraw/tests: Mark a strange radeon X1600 Windows behavior broken.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 95b7cda6be6896e4084a264aba4c8dfd0536dbeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b7cda6be6896e4084a264ab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 15 23:49:21 2011 +0200 ddraw/tests: Mark a strange radeon X1600 Windows behavior broken. --- dlls/ddraw/tests/d3d.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index dee6f05..54ff598 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4401,8 +4401,12 @@ static HRESULT WINAPI enum_z_fmt_cb(DDPIXELFORMAT *fmt, void *ctx) if (U1(*fmt).dwZBufferBitDepth == 24) expected_pitch = ddsd.dwWidth * 4; else expected_pitch = ddsd.dwWidth * U1(*fmt).dwZBufferBitDepth / 8; - /* Some formats(16 bit depth without stencil) return pitch 0 */ - if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch) + /* Some formats(16 bit depth without stencil) return pitch 0 + * + * The Radeon X1600 Catalyst 10.2 Windows XP driver returns an otherwise sane + * pitch with an extra 128 bytes, regardless of the format and width */ + if (U1(ddsd).lPitch != 0 && U1(ddsd).lPitch != expected_pitch + && !broken(U1(ddsd).lPitch == expected_pitch + 128)) { ok(0, "Z buffer pitch is %u, expected %u\n", U1(ddsd).lPitch, expected_pitch); dump_format(fmt);

1 0