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

Alexandre Julliard : gdi32: Improve support of bitmaps without a color table in PutImage.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: c2784e08fcac04ff0e6106292c1b9bf93acfc27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2784e08fcac04ff0e6106292… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 29 13:53:30 2012 +0200 gdi32: Improve support of bitmaps without a color table in PutImage. --- dlls/gdi32/dibdrv/bitblt.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index d6849bd..5abfd75 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -871,16 +871,25 @@ done: static BOOL matching_color_info( const dib_info *dib, const BITMAPINFO *info ) { + const RGBQUAD *color_table = info->bmiColors; + switch (info->bmiHeader.biBitCount) { case 1: + if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); + case 4: case 8: - { - RGBQUAD *color_table = (RGBQUAD *)((char *)info + info->bmiHeader.biSize); - if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + if (!info->bmiHeader.biClrUsed) + { + if (!dib->color_table_size) return TRUE; + if (dib->color_table_size != 1 << info->bmiHeader.biBitCount) return FALSE; + color_table = get_default_color_table( info->bmiHeader.biBitCount ); + } + else if (dib->color_table_size != info->bmiHeader.biClrUsed) return FALSE; + return !memcmp( color_table, dib->color_table, dib->color_table_size * sizeof(RGBQUAD) ); - } case 16: {

1 0

Dmitry Timoshkov : windowscodecs: Extend IWICImagingFactory to IWICComponentFactory.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 50d53928e048ea4679528ec5f21fda1ad71d52c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50d53928e048ea4679528ec5f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 28 18:41:38 2012 +0900 windowscodecs: Extend IWICImagingFactory to IWICComponentFactory. --- dlls/windowscodecs/clsfactory.c | 2 +- dlls/windowscodecs/imgfactory.c | 211 ++++++++++++++++++++----------- dlls/windowscodecs/proxy.c | 2 +- dlls/windowscodecs/tests/metadata.c | 5 +- dlls/windowscodecs/wincodecs_private.h | 2 +- 5 files changed, 142 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=50d53928e048ea4679528…

1 0

Dmitry Timoshkov : windowscodecs: Add support for preferred vendor guid in CreateDecoderFromStream.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: fd31112ab0a0528fd9be99e0afd49dd98f523d2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd31112ab0a0528fd9be99e0a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon May 28 18:41:27 2012 +0900 windowscodecs: Add support for preferred vendor guid in CreateDecoderFromStream. --- dlls/windowscodecs/imgfactory.c | 43 +++++++++++++++++++++++++++++---------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index a2e8e7f..c9b2716 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -122,11 +122,11 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( IWICImagingFactory *iface, IStream *pIStream, const GUID *pguidVendor, WICDecodeOptions metadataOptions, IWICBitmapDecoder **ppIDecoder) { - static int fixme=0; IEnumUnknown *enumdecoders; IUnknown *unkdecoderinfo; IWICBitmapDecoderInfo *decoderinfo; - IWICBitmapDecoder *decoder=NULL; + IWICBitmapDecoder *decoder = NULL, *preferred_decoder = NULL; + GUID vendor; HRESULT res=S_OK; ULONG num_fetched; BOOL matches; @@ -134,13 +134,10 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( TRACE("(%p,%p,%s,%u,%p)\n", iface, pIStream, debugstr_guid(pguidVendor), metadataOptions, ppIDecoder); - if (pguidVendor && !fixme++) - FIXME("ignoring vendor GUID\n"); - res = CreateComponentEnumerator(WICDecoder, WICComponentEnumerateDefault, &enumdecoders); if (FAILED(res)) return res; - while (!decoder) + while (!preferred_decoder) { res = IEnumUnknown_Next(enumdecoders, 1, &unkdecoderinfo, &num_fetched); @@ -154,19 +151,36 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( if (SUCCEEDED(res) && matches) { - res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &decoder); + IWICBitmapDecoder *new_decoder; + + res = IWICBitmapDecoderInfo_CreateInstance(decoderinfo, &new_decoder); /* FIXME: should use QueryCapability to choose a decoder */ if (SUCCEEDED(res)) { - res = IWICBitmapDecoder_Initialize(decoder, pIStream, metadataOptions); + res = IWICBitmapDecoder_Initialize(new_decoder, pIStream, metadataOptions); - if (FAILED(res)) + if (SUCCEEDED(res)) { - IWICBitmapDecoder_Release(decoder); - decoder = NULL; + if (pguidVendor) + { + res = IWICBitmapDecoderInfo_GetVendorGUID(decoderinfo, &vendor); + if (SUCCEEDED(res) && IsEqualIID(&vendor, pguidVendor)) + { + preferred_decoder = new_decoder; + new_decoder = NULL; + } + } + + if (new_decoder && !decoder) + { + decoder = new_decoder; + new_decoder = NULL; + } } + + if (new_decoder) IWICBitmapDecoder_Release(new_decoder); } } @@ -181,6 +195,13 @@ static HRESULT WINAPI ImagingFactory_CreateDecoderFromStream( IEnumUnknown_Release(enumdecoders); + if (preferred_decoder) + { + *ppIDecoder = preferred_decoder; + if (decoder) IWICBitmapDecoder_Release(decoder); + return S_OK; + } + if (decoder) { *ppIDecoder = decoder;

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Range.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: d04d994093b3d091220dda4b5b30ae63f50f86b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d994093b3d091220dda4b5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:57 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Range. --- dlls/d3drm/light.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 0e3b5af..1326b6a 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -36,6 +36,7 @@ typedef struct { LONG ref; D3DRMLIGHTTYPE type; D3DCOLOR color; + D3DVALUE range; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -214,9 +215,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f): stub\n", iface, This, range); + TRACE("(%p/%p)->(%f)\n", iface, This, range); - return E_NOTIMPL; + This->range = range; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetUmbra(IDirect3DRMLight* iface, D3DVALUE umbra) @@ -271,9 +274,9 @@ static D3DVALUE WINAPI IDirect3DRMLightImpl_GetRange(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->range; } static D3DVALUE WINAPI IDirect3DRMLightImpl_GetUmbra(IDirect3DRMLight* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMLight_[ Get|Set]Color and IDirect3DRMLight_SetColorRGB.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: d2a52d1e17bc2500744824e6801a7fdb7e6bce05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2a52d1e17bc2500744824e68… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:52:32 2012 +0200 d3drm: Implement IDirect3DRMLight_[Get|Set]Color and IDirect3DRMLight_SetColorRGB. --- dlls/d3drm/light.c | 21 +++++++++++++++------ dlls/d3drm/tests/d3drm.c | 10 +++++----- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/light.c b/dlls/d3drm/light.c index 620fb97..0e3b5af 100644 --- a/dlls/d3drm/light.c +++ b/dlls/d3drm/light.c @@ -29,10 +29,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3drm); +#define D3DCOLOR_ARGB(a,r,g,b) ((D3DCOLOR)((((a)&0xff)<<24)|(((r)&0xff)<<16)|(((g)&0xff)<<8)|((b)&0xff))) + typedef struct { IDirect3DRMLight IDirect3DRMLight_iface; LONG ref; D3DRMLIGHTTYPE type; + D3DCOLOR color; } IDirect3DRMLightImpl; static inline IDirect3DRMLightImpl *impl_from_IDirect3DRMLight(IDirect3DRMLight *iface) @@ -186,9 +189,11 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColor(IDirect3DRMLight* iface, D3D { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%u): stub\n", iface, This, color); + TRACE("(%p/%p)->(%u)\n", iface, This, color); - return E_NOTIMPL; + This->color = color; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, @@ -196,9 +201,13 @@ static HRESULT WINAPI IDirect3DRMLightImpl_SetColorRGB(IDirect3DRMLight* iface, { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(%f,%f,%f): stub\n", iface, This, red, green, blue); + TRACE("(%p/%p)->(%f,%f,%f)\n", iface, This, red, green, blue); - return E_NOTIMPL; + This->color = D3DCOLOR_ARGB(0xff, (BYTE)(red * 255.0f), + (BYTE)(green * 255.0f), + (BYTE)(blue * 255.0f)); + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMLightImpl_SetRange(IDirect3DRMLight* iface, D3DVALUE range) @@ -316,9 +325,9 @@ static D3DCOLOR WINAPI IDirect3DRMLightImpl_GetColor(IDirect3DRMLight* iface) { IDirect3DRMLightImpl *This = impl_from_IDirect3DRMLight(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return 0; + return This->color; } static D3DRMLIGHTTYPE WINAPI IDirect3DRMLightImpl_GetType(IDirect3DRMLight* iface) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 16db2c2..b6ed51a 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -842,7 +842,7 @@ static void test_Light(void) ok(type == D3DRMLIGHT_SPOT, "wrong type (%u)\n", type); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetType(pLight, D3DRMLIGHT_POINT); ok(hr == D3DRM_OK, "Cannot set type (hr = %x)\n", hr); @@ -850,14 +850,14 @@ static void test_Light(void) ok(type == D3DRMLIGHT_POINT, "wrong type (%u)\n", type); hr = IDirect3DRMLight_SetColor(pLight, 0xff180587); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff180587, "wrong color (%x)\n", color); + ok(color == 0xff180587, "wrong color (%x)\n", color); hr = IDirect3DRMLight_SetColorRGB(pLight, 0.5, 0.5, 0.5); - todo_wine ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); + ok(hr == D3DRM_OK, "Cannot set color (hr = %x)\n", hr); color = IDirect3DRMLight_GetColor(pLight); - todo_wine ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); + ok(color == 0xff7f7f7f, "wrong color (%x)\n", color); IDirect3DRMLight_Release(pLight);

1 0

Alexandre Julliard : gdi32: Remove the null driver Get/ PutImage fallbacks for bitmaps.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: b6f25e52506db727c3ddc1949bb1fcd4838ea913 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6f25e52506db727c3ddc1949… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 23 22:26:35 2012 +0200 gdi32: Remove the null driver Get/PutImage fallbacks for bitmaps. --- dlls/gdi32/bitmap.c | 20 -------------------- dlls/gdi32/driver.c | 13 +++++++++++++ dlls/gdi32/gdi_private.h | 4 ---- 3 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index 8f6fbdb..c0d6810 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -46,26 +46,6 @@ static const struct gdi_obj_funcs bitmap_funcs = }; -/*********************************************************************** - * null driver fallback implementations - */ - -DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, - struct gdi_image_bits *bits, struct bitblt_coords *src ) -{ - if (!hbitmap) return ERROR_NOT_SUPPORTED; - return dib_driver.pGetImage( 0, hbitmap, info, bits, src ); -} - -DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) -{ - if (!hbitmap) return ERROR_SUCCESS; - return dib_driver.pPutImage( NULL, hbitmap, clip, info, bits, src, dst, rop ); -} - - /****************************************************************************** * CreateBitmap [GDI32.@] * diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index d4eae73..8fc94b0 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -385,6 +385,12 @@ static BOOL nulldrv_GetICMProfile( PHYSDEV dev, LPDWORD size, LPWSTR filename ) return FALSE; } +static DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, + struct gdi_image_bits *bits, struct bitblt_coords *src ) +{ + return ERROR_NOT_SUPPORTED; +} + static DWORD nulldrv_GetKerningPairs( PHYSDEV dev, DWORD count, LPKERNINGPAIR pairs ) { return 0; @@ -496,6 +502,13 @@ static BOOL nulldrv_Polyline( PHYSDEV dev, const POINT *points, INT count ) return PolyPolyline( dev->hdc, points, counts, 1 ); } +static DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, + const struct gdi_image_bits *bits, struct bitblt_coords *src, + struct bitblt_coords *dst, DWORD rop ) +{ + return ERROR_SUCCESS; +} + static UINT nulldrv_RealizeDefaultPalette( PHYSDEV dev ) { return 0; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 1fa9395..6872093 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -371,7 +371,6 @@ extern BOOL nulldrv_FillRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush ) DECLSPEC_HIDD extern BOOL nulldrv_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_FrameRgn( PHYSDEV dev, HRGN rgn, HBRUSH brush, INT width, INT height ) DECLSPEC_HIDDEN; extern LONG nulldrv_GetBitmapBits( HBITMAP bitmap, void *bits, LONG size ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info, struct gdi_image_bits *bits, struct bitblt_coords *src ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetNearestColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; extern COLORREF nulldrv_GetPixel( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL nulldrv_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, @@ -386,9 +385,6 @@ extern BOOL nulldrv_PolyBezier( PHYSDEV dev, const POINT *points, DWORD count ) extern BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) DECLSPEC_HIDDEN; extern BOOL nulldrv_PolylineTo( PHYSDEV dev, const POINT *points, INT count ) DECLSPEC_HIDDEN; -extern DWORD nulldrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info, - const struct gdi_image_bits *bits, struct bitblt_coords *src, - struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) DECLSPEC_HIDDEN; extern INT nulldrv_SaveDC( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL nulldrv_ScaleViewportExtEx( PHYSDEV dev, INT x_num, INT x_denom, INT y_num, INT y_denom, SIZE *size ) DECLSPEC_HIDDEN;

1 0

André Hentschel : d3drm: Improve stub for IDirect3DRMWinDevice_HandleActivate.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: fde35902a7c97dc6ae0eb1303396ba8fabc7360c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fde35902a7c97dc6ae0eb1303… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:37:40 2012 +0200 d3drm: Improve stub for IDirect3DRMWinDevice_HandleActivate. --- dlls/d3drm/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index 1b4967a..767e157 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -1134,7 +1134,7 @@ static HRESULT WINAPI IDirect3DRMWinDeviceImpl_HandleActivate(IDirect3DRMWinDevi FIXME("(%p/%p)->(%u): stub\n", iface, This, wparam); - return E_NOTIMPL; + return D3DRM_OK; } static const struct IDirect3DRMWinDeviceVtbl Direct3DRMWinDevice_Vtbl =

1 0

André Hentschel : d3drm: Implement IDirect3DRMDeviceX_ [Get|Set]Dither.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 2268f8c7f1e45f995466d682bc9073e6b3d3d21c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2268f8c7f1e45f995466d682b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 27 15:34:40 2012 +0200 d3drm: Implement IDirect3DRMDeviceX_[Get|Set]Dither. --- dlls/d3drm/device.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/device.c b/dlls/d3drm/device.c index e6d1036..9ad9367 100644 --- a/dlls/d3drm/device.c +++ b/dlls/d3drm/device.c @@ -39,6 +39,7 @@ typedef struct { IDirect3DRMDevice3 IDirect3DRMDevice3_iface; IDirect3DRMWinDevice IDirect3DRMWinDevice_iface; LONG ref; + BOOL dither; } IDirect3DRMDeviceImpl; static inline IDirect3DRMDeviceImpl *impl_from_IDirect3DRMDevice2(IDirect3DRMDevice2 *iface) @@ -281,9 +282,9 @@ static HRESULT WINAPI IDirect3DRMDevice2Impl_SetDither(IDirect3DRMDevice2* iface { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(%d): stub\n", iface, This, enable); + TRACE("(%p/%p)->(%d)\n", iface, This, enable); - return E_NOTIMPL; + return IDirect3DRMDevice3_SetDither(&This->IDirect3DRMDevice3_iface, enable); } static HRESULT WINAPI IDirect3DRMDevice2Impl_SetShades(IDirect3DRMDevice2* iface, DWORD count) @@ -329,9 +330,9 @@ static BOOL WINAPI IDirect3DRMDevice2Impl_GetDither(IDirect3DRMDevice2* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice2(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return IDirect3DRMDevice3_GetDither(&This->IDirect3DRMDevice3_iface); } static DWORD WINAPI IDirect3DRMDevice2Impl_GetShades(IDirect3DRMDevice2* iface) @@ -701,9 +702,11 @@ static HRESULT WINAPI IDirect3DRMDevice3Impl_SetDither(IDirect3DRMDevice3* iface { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(%d): stub\n", iface, This, enable); + TRACE("(%p/%p)->(%d)\n", iface, This, enable); - return E_NOTIMPL; + This->dither = enable; + + return D3DRM_OK; } static HRESULT WINAPI IDirect3DRMDevice3Impl_SetShades(IDirect3DRMDevice3* iface, DWORD count) @@ -749,9 +752,9 @@ static BOOL WINAPI IDirect3DRMDevice3Impl_GetDither(IDirect3DRMDevice3* iface) { IDirect3DRMDeviceImpl *This = impl_from_IDirect3DRMDevice3(iface); - FIXME("(%p/%p)->(): stub\n", iface, This); + TRACE("(%p/%p)->()\n", iface, This); - return E_NOTIMPL; + return This->dither; } static DWORD WINAPI IDirect3DRMDevice3Impl_GetShades(IDirect3DRMDevice3* iface)

1 0

Jacek Caban : wininet: Fixed grouping security error flags.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: a24b5588d23b61a6e769f53996610c75f0de6af4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a24b5588d23b61a6e769f5399… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 28 13:55:00 2012 +0200 wininet: Fixed grouping security error flags. --- dlls/wininet/internet.h | 4 ++-- dlls/wininet/netconnection.c | 34 ++++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 230e8d8..fd6b5f7 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -561,11 +561,11 @@ typedef struct } wininet_flag_info; /* Undocumented security flags */ -#define _SECURITY_FLAG_CERT_INVALID_CA 0x00800000 +#define _SECURITY_FLAG_CERT_REV_FAILED 0x00800000 #define _SECURITY_FLAG_CERT_INVALID_CN 0x02000000 #define _SECURITY_ERROR_FLAGS_MASK \ - (_SECURITY_FLAG_CERT_INVALID_CA \ + (_SECURITY_FLAG_CERT_REV_FAILED \ |_SECURITY_FLAG_CERT_INVALID_CN) #endif /* _WINE_INTERNET_H_ */ diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index 8117884..ceed17a 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -249,7 +249,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if (chain->TrustStatus.dwErrorStatus & ~supportedErrors) { if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= supportedErrors; } @@ -257,23 +257,31 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_TIME_VALID, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) - err = ERROR_INTERNET_SEC_CERT_DATE_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_DATE_INVALID; errors &= ~CERT_TRUST_IS_NOT_TIME_VALID; } - if(errors & (CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN)) { + if(errors & CERT_TRUST_IS_UNTRUSTED_ROOT) { if(conn->mask_errors) - conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CA; + WARN("CERT_TRUST_IS_UNTRUSTED_ROOT, unknown flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) - err = ERROR_INTERNET_INVALID_CA; - errors &= ~(CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_PARTIAL_CHAIN); + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_INVALID_CA; + errors &= ~CERT_TRUST_IS_UNTRUSTED_ROOT; + } + + if(errors & CERT_TRUST_IS_PARTIAL_CHAIN) { + if(conn->mask_errors) + conn->security_flags |= _SECURITY_FLAG_CERT_REV_FAILED; + if(!(conn->security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REV_FAILED; + errors &= ~CERT_TRUST_IS_PARTIAL_CHAIN; } if(errors & (CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN)) { if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_NO_REV; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_NO_REV; errors &= ~(CERT_TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN); } @@ -281,7 +289,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("TRUST_IS_OFFLINE_REVOCATION | CERT_TRUST_REVOCATION_STATUS_UNKNOWN, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_REVOCATION)) - err = ERROR_INTERNET_SEC_CERT_REVOKED; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_REVOKED; errors &= ~CERT_TRUST_IS_REVOKED; } @@ -289,7 +297,7 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(conn->mask_errors) WARN("CERT_TRUST_IS_NOT_VALID_FOR_USAGE, unknown error flags\n"); if(!(conn->security_flags & SECURITY_FLAG_IGNORE_WRONG_USAGE)) - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; errors &= ~CERT_TRUST_IS_NOT_VALID_FOR_USAGE; } @@ -321,11 +329,11 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(policyStatus.dwError == CERT_E_CN_NO_MATCH) { if(conn->mask_errors) conn->security_flags |= _SECURITY_FLAG_CERT_INVALID_CN; - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_CERT_CN_INVALID; }else if(policyStatus.dwError) { if(conn->mask_errors) WARN("unknown error flags for policy status %x\n", policyStatus.dwError); - err = ERROR_INTERNET_SEC_INVALID_CERT; + err = conn->mask_errors && err ? ERROR_INTERNET_SEC_CERT_ERRORS : ERROR_INTERNET_SEC_INVALID_CERT; } }else { err = GetLastError(); @@ -336,10 +344,8 @@ static DWORD netconn_verify_cert(netconn_t *conn, PCCERT_CONTEXT cert, HCERTSTOR if(err) { WARN("failed %u\n", err); - if(conn->mask_errors) { + if(conn->mask_errors) conn->server->security_flags |= conn->security_flags & _SECURITY_ERROR_FLAGS_MASK; - return err == ERROR_INTERNET_INVALID_CA ? ERROR_INTERNET_SEC_CERT_REV_FAILED : ERROR_INTERNET_SEC_CERT_ERRORS; - } return err; }

1 0

Henri Verbeet : ddraw/tests: Add test_window_style() for older ddraw versions.
by Alexandre Julliard May 29, 2012

May 29, 2012

Module: wine Branch: master Commit: 7a52db09e3b61acbd185ee0d88af4257b04a7536 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a52db09e3b61acbd185ee0d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 28 18:17:27 2012 +0200 ddraw/tests: Add test_window_style() for older ddraw versions. --- dlls/ddraw/tests/ddraw1.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index cb681bf..e53a1cd 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -1834,6 +1834,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw1) { test_coop_level_create_device_window(); @@ -1848,4 +1891,5 @@ START_TEST(ddraw1) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); } diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index ca3536a..7f1ae88 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -1971,6 +1971,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw2 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw2_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw2_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw2) { test_coop_level_create_device_window(); @@ -1987,4 +2030,5 @@ START_TEST(ddraw2) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); } diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index c19cd4b..6f00b41 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2095,6 +2095,49 @@ static void test_wndproc(void) UnregisterClassA("ddraw_test_wndproc_wc", GetModuleHandleA(NULL)); } +static void test_window_style(void) +{ + LONG style, exstyle, tmp; + RECT fullscreen_rect, r; + IDirectDraw4 *ddraw; + HWND window; + HRESULT hr; + ULONG ref; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 100, 100, 0, 0, 0, 0); + if (!(ddraw = create_ddraw())) + { + skip("Failed to create a ddraw object, skipping test.\n"); + DestroyWindow(window); + return; + } + + style = GetWindowLongA(window, GWL_STYLE); + exstyle = GetWindowLongA(window, GWL_EXSTYLE); + SetRect(&fullscreen_rect, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN)); + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, window, DDSCL_EXCLUSIVE | DDSCL_FULLSCREEN); + ok(SUCCEEDED(hr), "SetCooperativeLevel failed, hr %#x.\n", hr); + + tmp = GetWindowLongA(window, GWL_STYLE); + todo_wine ok(tmp == style, "Expected window style %#x, got %#x.\n", style, tmp); + tmp = GetWindowLongA(window, GWL_EXSTYLE); + todo_wine ok(tmp == exstyle, "Expected window extended style %#x, got %#x.\n", exstyle, tmp); + + GetWindowRect(window, &r); + ok(EqualRect(&r, &fullscreen_rect), "Expected {%d, %d, %d, %d}, got {%d, %d, %d, %d}.\n", + fullscreen_rect.left, fullscreen_rect.top, fullscreen_rect.right, fullscreen_rect.bottom, + r.left, r.top, r.right, r.bottom); + GetClientRect(window, &r); + todo_wine ok(!EqualRect(&r, &fullscreen_rect), "Client rect and window rect are equal.\n"); + + ref = IDirectDraw4_Release(ddraw); + ok(ref == 0, "The ddraw object was not properly freed: refcount %u.\n", ref); + + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2112,4 +2155,5 @@ START_TEST(ddraw4) test_surface_qi(); test_device_qi(); test_wndproc(); + test_window_style(); }

1 0