June 2012 - Wine-commits - list.winehq.org

Vincent Povirk : windowscodecs: Implement IWICComponentInfo::GetVendorGUID.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 7d19b39c2d666f7219e88ceb79e7d8b1b9774d3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d19b39c2d666f7219e88ceb7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:19:05 2012 -0500 windowscodecs: Implement IWICComponentInfo::GetVendorGUID. --- dlls/windowscodecs/info.c | 29 +++++++++++++++++++++-------- dlls/windowscodecs/tests/info.c | 11 ++++------- 2 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 699f3f2..4893621 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -41,6 +41,7 @@ static const WCHAR author_valuename[] = {'A','u','t','h','o','r',0}; static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; +static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -199,8 +200,11 @@ static HRESULT WINAPI BitmapDecoderInfo_GetAuthor(IWICBitmapDecoderInfo *iface, static HRESULT WINAPI BitmapDecoderInfo_GetVendorGUID(IWICBitmapDecoderInfo *iface, GUID *pguidVendor) { - FIXME("(%p,%p): stub\n", iface, pguidVendor); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%p)\n", iface, pguidVendor); + + return ComponentInfo_GetGUIDValue(This->classkey, vendor_valuename, pguidVendor); } static HRESULT WINAPI BitmapDecoderInfo_GetVersion(IWICBitmapDecoderInfo *iface, UINT cchVersion, @@ -653,8 +657,11 @@ static HRESULT WINAPI BitmapEncoderInfo_GetAuthor(IWICBitmapEncoderInfo *iface, static HRESULT WINAPI BitmapEncoderInfo_GetVendorGUID(IWICBitmapEncoderInfo *iface, GUID *pguidVendor) { - FIXME("(%p,%p): stub\n", iface, pguidVendor); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%p)\n", iface, pguidVendor); + + return ComponentInfo_GetGUIDValue(This->classkey, vendor_valuename, pguidVendor); } static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, UINT cchVersion, @@ -932,8 +939,11 @@ static HRESULT WINAPI FormatConverterInfo_GetAuthor(IWICFormatConverterInfo *ifa static HRESULT WINAPI FormatConverterInfo_GetVendorGUID(IWICFormatConverterInfo *iface, GUID *pguidVendor) { - FIXME("(%p,%p): stub\n", iface, pguidVendor); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%p)\n", iface, pguidVendor); + + return ComponentInfo_GetGUIDValue(This->classkey, vendor_valuename, pguidVendor); } static HRESULT WINAPI FormatConverterInfo_GetVersion(IWICFormatConverterInfo *iface, UINT cchVersion, @@ -1146,8 +1156,11 @@ static HRESULT WINAPI PixelFormatInfo_GetAuthor(IWICPixelFormatInfo2 *iface, UIN static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, GUID *pguidVendor) { - FIXME("(%p,%p): stub\n", iface, pguidVendor); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%p)\n", iface, pguidVendor); + + return ComponentInfo_GetGUIDValue(This->classkey, vendor_valuename, pguidVendor); } static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UINT cchVersion, diff --git a/dlls/windowscodecs/tests/info.c b/dlls/windowscodecs/tests/info.c index f8c3402..1e31fcc 100644 --- a/dlls/windowscodecs/tests/info.c +++ b/dlls/windowscodecs/tests/info.c @@ -201,12 +201,10 @@ static void test_pixelformat_info(void) ok(hr == S_OK, "GetSigningStatus failed, hr=%x\n", hr); ok(signing == WICComponentSigned, "unexpected signing status 0x%x\n", signing); - todo_wine - { len = 0xdeadbeef; hr = IWICComponentInfo_GetSpecVersion(info, 0, NULL, &len); - ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); - ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ + todo_wine ok(hr == S_OK, "GetSpecVersion failed, hr=%x\n", hr); + todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* spec version does not apply to pixel formats */ memset(&guid, 0xaa, sizeof(guid)); hr = IWICComponentInfo_GetVendorGUID(info, &guid); @@ -216,9 +214,8 @@ static void test_pixelformat_info(void) len = 0xdeadbeef; hr = IWICComponentInfo_GetVersion(info, 0, NULL, &len); - ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); - ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ - } + todo_wine ok(hr == S_OK, "GetVersion failed, hr=%x\n", hr); + todo_wine ok(len == 0, "invalid length 0x%x\n", len); /* version does not apply to pixel formats */ IWICComponentInfo_Release(info); }

1 0

Vincent Povirk : windowscodecs: Implement IWICComponentInfo::GetVersion.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: d0f31cddfee3fd871fbf6ab22ec24cdd828534dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0f31cddfee3fd871fbf6ab22… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 16 15:22:23 2012 -0500 windowscodecs: Implement IWICComponentInfo::GetVersion. --- dlls/windowscodecs/info.c | 33 +++++++++++++++++++++++++-------- 1 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 4893621..5632bf1 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -42,6 +42,7 @@ static const WCHAR friendlyname_valuename[] = {'F','r','i','e','n','d','l','y',' static const WCHAR pixelformats_keyname[] = {'P','i','x','e','l','F','o','r','m','a','t','s',0}; static const WCHAR containerformat_valuename[] = {'C','o','n','t','a','i','n','e','r','F','o','r','m','a','t',0}; static const WCHAR vendor_valuename[] = {'V','e','n','d','o','r',0}; +static const WCHAR version_valuename[] = {'V','e','r','s','i','o','n',0}; static HRESULT ComponentInfo_GetStringValue(HKEY classkey, LPCWSTR value, UINT buffer_size, WCHAR *buffer, UINT *actual_size) @@ -210,8 +211,12 @@ static HRESULT WINAPI BitmapDecoderInfo_GetVendorGUID(IWICBitmapDecoderInfo *ifa static HRESULT WINAPI BitmapDecoderInfo_GetVersion(IWICBitmapDecoderInfo *iface, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); - return E_NOTIMPL; + BitmapDecoderInfo *This = impl_from_IWICBitmapDecoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchVersion, wzVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, version_valuename, + cchVersion, wzVersion, pcchActual); } static HRESULT WINAPI BitmapDecoderInfo_GetSpecVersion(IWICBitmapDecoderInfo *iface, UINT cchSpecVersion, @@ -667,8 +672,12 @@ static HRESULT WINAPI BitmapEncoderInfo_GetVendorGUID(IWICBitmapEncoderInfo *ifa static HRESULT WINAPI BitmapEncoderInfo_GetVersion(IWICBitmapEncoderInfo *iface, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); - return E_NOTIMPL; + BitmapEncoderInfo *This = impl_from_IWICBitmapEncoderInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchVersion, wzVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, version_valuename, + cchVersion, wzVersion, pcchActual); } static HRESULT WINAPI BitmapEncoderInfo_GetSpecVersion(IWICBitmapEncoderInfo *iface, UINT cchSpecVersion, @@ -949,8 +958,12 @@ static HRESULT WINAPI FormatConverterInfo_GetVendorGUID(IWICFormatConverterInfo static HRESULT WINAPI FormatConverterInfo_GetVersion(IWICFormatConverterInfo *iface, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); - return E_NOTIMPL; + FormatConverterInfo *This = impl_from_IWICFormatConverterInfo(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchVersion, wzVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, version_valuename, + cchVersion, wzVersion, pcchActual); } static HRESULT WINAPI FormatConverterInfo_GetSpecVersion(IWICFormatConverterInfo *iface, UINT cchSpecVersion, @@ -1166,8 +1179,12 @@ static HRESULT WINAPI PixelFormatInfo_GetVendorGUID(IWICPixelFormatInfo2 *iface, static HRESULT WINAPI PixelFormatInfo_GetVersion(IWICPixelFormatInfo2 *iface, UINT cchVersion, WCHAR *wzVersion, UINT *pcchActual) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cchVersion, wzVersion, pcchActual); - return E_NOTIMPL; + PixelFormatInfo *This = impl_from_IWICPixelFormatInfo2(iface); + + TRACE("(%p,%u,%p,%p)\n", iface, cchVersion, wzVersion, pcchActual); + + return ComponentInfo_GetStringValue(This->classkey, version_valuename, + cchVersion, wzVersion, pcchActual); } static HRESULT WINAPI PixelFormatInfo_GetSpecVersion(IWICPixelFormatInfo2 *iface, UINT cchSpecVersion,

1 0

André Hentschel : d3drm/tests: Destroy window after use.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 6f3c571a0543f3e1a33ea687274fa1b215b26a49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f3c571a0543f3e1a33ea6872… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 18 22:30:10 2012 +0200 d3drm/tests: Destroy window after use. --- dlls/d3drm/tests/d3drm.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index a86c719..91dd095 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -961,6 +961,7 @@ static void test_Viewport(void) IDirectDrawClipper_Release(pClipper); IDirect3DRM_Release(pD3DRM); + DestroyWindow(window); } static void test_Light(void)

1 0

Józef Kucia : d3dx9: Get rid of ID3DXFontImpl.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: caf1c1a775ab1e6049328c359a31a81a70334423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=caf1c1a775ab1e6049328c359… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:15:36 2012 +0200 d3dx9: Get rid of ID3DXFontImpl. --- dlls/d3dx9_36/font.c | 87 +++++++++++++++++++++++--------------------------- 1 files changed, 40 insertions(+), 47 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 452bbcf..5c09f82 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -26,7 +26,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dx); -typedef struct ID3DXFontImpl +struct d3dx_font { ID3DXFont ID3DXFont_iface; LONG ref; @@ -36,11 +36,11 @@ typedef struct ID3DXFontImpl HDC hdc; HFONT hfont; -} ID3DXFontImpl; +}; -static inline ID3DXFontImpl *impl_from_ID3DXFont(ID3DXFont *iface) +static inline struct d3dx_font *impl_from_ID3DXFont(ID3DXFont *iface) { - return CONTAINING_RECORD(iface, ID3DXFontImpl, ID3DXFont_iface); + return CONTAINING_RECORD(iface, struct d3dx_font, ID3DXFont_iface); } static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid, void **out) @@ -63,18 +63,18 @@ static HRESULT WINAPI ID3DXFontImpl_QueryInterface(ID3DXFont *iface, REFIID riid static ULONG WINAPI ID3DXFontImpl_AddRef(ID3DXFont *iface) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + struct d3dx_font *This = impl_from_ID3DXFont(iface); ULONG ref=InterlockedIncrement(&This->ref); - TRACE("(%p)->(): AddRef from %d\n", This, ref-1); + TRACE("%p increasing refcount to %u\n", iface, ref); return ref; } static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + struct d3dx_font *This = impl_from_ID3DXFont(iface); ULONG ref=InterlockedDecrement(&This->ref); - TRACE("(%p)->(): ReleaseRef to %d\n", This, ref); + TRACE("%p decreasing refcount to %u\n", iface, ref); if(ref==0) { DeleteObject(This->hfont); @@ -85,11 +85,11 @@ static ULONG WINAPI ID3DXFontImpl_Release(ID3DXFont *iface) return ref; } -static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, LPDIRECT3DDEVICE9 *device) +static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, IDirect3DDevice9 **device) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + struct d3dx_font *This = impl_from_ID3DXFont(iface); - TRACE("(%p)->(%p)\n", This, device); + TRACE("iface %p, device %p\n", iface, device); if( !device ) return D3DERR_INVALIDCALL; *device = This->device; @@ -100,9 +100,9 @@ static HRESULT WINAPI ID3DXFontImpl_GetDevice(ID3DXFont *iface, LPDIRECT3DDEVICE static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *desc) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + struct d3dx_font *This = impl_from_ID3DXFont(iface); - TRACE("(%p)->(%p)\n", This, desc); + TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; memcpy(desc, &This->desc, FIELD_OFFSET(D3DXFONT_DESCA, FaceName)); @@ -113,9 +113,9 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescA(ID3DXFont *iface, D3DXFONT_DESCA *d static HRESULT WINAPI ID3DXFontImpl_GetDescW(ID3DXFont *iface, D3DXFONT_DESCW *desc) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); + struct d3dx_font *This = impl_from_ID3DXFont(iface); - TRACE("(%p)->(%p)\n", This, desc); + TRACE("iface %p, desc %p\n", iface, desc); if( !desc ) return D3DERR_INVALIDCALL; *desc = This->desc; @@ -125,22 +125,22 @@ static HRESULT WINAPI ID3DXFontImpl_GetDescW(ID3DXFont *iface, D3DXFONT_DESCW *d static BOOL WINAPI ID3DXFontImpl_GetTextMetricsA(ID3DXFont *iface, TEXTMETRICA *metrics) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - TRACE("(%p)->(%p)\n", This, metrics); + struct d3dx_font *This = impl_from_ID3DXFont(iface); + TRACE("iface %p, metrics %p\n", iface, metrics); return GetTextMetricsA(This->hdc, metrics); } static BOOL WINAPI ID3DXFontImpl_GetTextMetricsW(ID3DXFont *iface, TEXTMETRICW *metrics) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - TRACE("(%p)->(%p)\n", This, metrics); + struct d3dx_font *This = impl_from_ID3DXFont(iface); + TRACE("iface %p, metrics %p\n", iface, metrics); return GetTextMetricsW(This->hdc, metrics); } static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - TRACE("(%p)->()\n", This); + struct d3dx_font *This = impl_from_ID3DXFont(iface); + TRACE("iface %p\n", iface); return This->hdc; } @@ -149,36 +149,31 @@ static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, { FIXME("iface %p, glyph %#x, texture %p, baclbox %s, cellinc %s stub!\n", iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); - - return D3D_OK; + return E_NOTIMPL; } static HRESULT WINAPI ID3DXFontImpl_PreloadCharacters(ID3DXFont *iface, UINT first, UINT last) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(%u, %u): stub\n", This, first, last); - return D3D_OK; + FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); + return E_NOTIMPL; } static HRESULT WINAPI ID3DXFontImpl_PreloadGlyphs(ID3DXFont *iface, UINT first, UINT last) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(%u, %u): stub\n", This, first, last); - return D3D_OK; + FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); + return E_NOTIMPL; } -static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, LPCSTR string, INT count) +static HRESULT WINAPI ID3DXFontImpl_PreloadTextA(ID3DXFont *iface, const char *string, INT count) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(%s, %d): stub\n", This, string, count); - return D3D_OK; + FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_a(string), count); + return E_NOTIMPL; } -static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, LPCWSTR string, INT count) +static HRESULT WINAPI ID3DXFontImpl_PreloadTextW(ID3DXFont *iface, const WCHAR *string, INT count) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(%s, %d): stub\n", This, debugstr_w(string), count); - return D3D_OK; + FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_w(string), count); + return E_NOTIMPL; } static INT WINAPI ID3DXFontImpl_DrawTextA(ID3DXFont *iface, ID3DXSprite *sprite, @@ -199,15 +194,13 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite, static HRESULT WINAPI ID3DXFontImpl_OnLostDevice(ID3DXFont *iface) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(): stub\n", This); + FIXME("iface %p stub!\n", iface); return D3D_OK; } static HRESULT WINAPI ID3DXFontImpl_OnResetDevice(ID3DXFont *iface) { - ID3DXFontImpl *This=impl_from_ID3DXFont(iface); - FIXME("(%p)->(): stub\n", This); + FIXME("iface %p stub\n", iface); return D3D_OK; } @@ -257,8 +250,8 @@ HRESULT WINAPI D3DXCreateFontA(LPDIRECT3DDEVICE9 device, INT height, UINT width, return D3DXCreateFontIndirectA(device, &desc, font); } -HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset, - DWORD precision, DWORD quality, DWORD pitchandfamily, LPCWSTR facename, LPD3DXFONT *font) +HRESULT WINAPI D3DXCreateFontW(IDirect3DDevice9 *device, INT height, UINT width, UINT weight, UINT miplevels, BOOL italic, DWORD charset, + DWORD precision, DWORD quality, DWORD pitchandfamily, const WCHAR *facename, ID3DXFont **font) { D3DXFONT_DESCW desc; @@ -282,7 +275,7 @@ HRESULT WINAPI D3DXCreateFontW(LPDIRECT3DDEVICE9 device, INT height, UINT width, /*********************************************************************** * D3DXCreateFontIndirectA (D3DX9_36.@) */ -HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCA *desc, LPD3DXFONT *font) +HRESULT WINAPI D3DXCreateFontIndirectA(IDirect3DDevice9 *device, const D3DXFONT_DESCA *desc, ID3DXFont **font) { D3DXFONT_DESCW widedesc; @@ -299,11 +292,11 @@ HRESULT WINAPI D3DXCreateFontIndirectA(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ /*********************************************************************** * D3DXCreateFontIndirectW (D3DX9_36.@) */ -HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_DESCW *desc, LPD3DXFONT *font) +HRESULT WINAPI D3DXCreateFontIndirectW(IDirect3DDevice9 *device, const D3DXFONT_DESCW *desc, ID3DXFont **font) { D3DDEVICE_CREATION_PARAMETERS cpars; D3DDISPLAYMODE mode; - ID3DXFontImpl *object; + struct d3dx_font *object; IDirect3D9 *d3d; HRESULT hr; @@ -322,7 +315,7 @@ HRESULT WINAPI D3DXCreateFontIndirectW(LPDIRECT3DDEVICE9 device, CONST D3DXFONT_ } IDirect3D9_Release(d3d); - object=HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXFontImpl)); + object = HeapAlloc(GetProcessHeap(), 0, sizeof(struct d3dx_font)); if(object==NULL) { *font=NULL; return E_OUTOFMEMORY;

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXFont:: PreloadText.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 4f68916600273c18b579c6fb1b51973c82841346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f68916600273c18b579c6fb1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:15:37 2012 +0200 d3dx9/tests: Add tests for ID3DXFont::PreloadText. --- dlls/d3dx9_36/tests/core.c | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index ec7d40d..aa848b5 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -446,6 +446,35 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) } ID3DXFont_Release(font); } else skip("Failed to create a ID3DXFont object\n"); + + + /* ID3DXFont_PreloadText */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if(SUCCEEDED(hr)) { + const WCHAR testW[] = {'t','e','s','t',0}; + + todo_wine { + hr = ID3DXFont_PreloadTextA(font, NULL, -1); + ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + hr = ID3DXFont_PreloadTextA(font, NULL, 0); + ok(hr == D3D_OK, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_PreloadTextA(font, NULL, 1); + ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + hr = ID3DXFont_PreloadTextA(font, "test", -1); + ok(hr == D3D_OK, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXFont_PreloadTextW(font, NULL, -1); + ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextW returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + hr = ID3DXFont_PreloadTextW(font, NULL, 0); + ok(hr == D3D_OK, "ID3DXFont_PreloadTextW returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_PreloadTextW(font, NULL, 1); + ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextW returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL); + hr = ID3DXFont_PreloadTextW(font, testW, -1); + ok(hr == D3D_OK, "ID3DXFont_PreloadTextW returned %#x, expected %#x\n", hr, D3D_OK); + } + + check_release((IUnknown*)font, 0); + } else skip("Failed to create a ID3DXFont object\n"); } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

1 0

Józef Kucia : d3dx9/tests: Add tests for ID3DXFont:: GetGlyphData.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 720dfb9b95b39918d93ae421202b7699966fbc29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=720dfb9b95b39918d93ae4212… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:15:38 2012 +0200 d3dx9/tests: Add tests for ID3DXFont::GetGlyphData. --- dlls/d3dx9_36/tests/core.c | 117 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 117 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c index aa848b5..cb5c7ec 100644 --- a/dlls/d3dx9_36/tests/core.c +++ b/dlls/d3dx9_36/tests/core.c @@ -309,6 +309,18 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) ID3DXFont *font; HRESULT hr; int ref; + int i; + static const struct { + INT font_height; + UINT expected_size; + DWORD expected_levels; + } texture_tests[] = { + { 6, 128, 4 }, + { 8, 128, 4 }, + { 10, 256, 5 }, + { 12, 256, 5 }, + { 72, 256, 8 } + }; /* D3DXCreateFont */ @@ -475,6 +487,111 @@ static void test_ID3DXFont(IDirect3DDevice9 *device) check_release((IUnknown*)font, 0); } else skip("Failed to create a ID3DXFont object\n"); + + + /* ID3DXFont_GetGlyphData, ID3DXFont_PreloadGlyphs, ID3DXFont_PreloadCharacters */ + hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if(SUCCEEDED(hr)) { + char c; + HDC hdc; + DWORD ret; + HRESULT hr; + RECT blackbox; + POINT cellinc; + IDirect3DTexture9 *texture; + + hdc = ID3DXFont_GetDC(font); + + todo_wine { + hr = ID3DXFont_GetGlyphData(font, 0, NULL, &blackbox, &cellinc); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_GetGlyphData(font, 0, &texture, NULL, &cellinc); + if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_GetGlyphData(font, 0, &texture, &blackbox, NULL); + if(SUCCEEDED(hr)) check_release((IUnknown*)texture, 1); + ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXFont_PreloadCharacters(font, 'b', 'a'); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + hr = ID3DXFont_PreloadGlyphs(font, 1, 0); + ok(hr == D3D_OK, "ID3DXFont_PreloadGlyphs returned %#x, expected %#x\n", hr, D3D_OK); + + hr = ID3DXFont_PreloadCharacters(font, 'a', 'a'); + ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + } + + for(c = 'b'; c <= 'z'; c++) { + WORD glyph; + + ret = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesA failed\n"); + + hr = ID3DXFont_GetGlyphData(font, glyph, &texture, &blackbox, &cellinc); + todo_wine ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + if(SUCCEEDED(hr)) { + DWORD levels; + D3DSURFACE_DESC desc; + + levels = IDirect3DTexture9_GetLevelCount(texture); + ok(levels == 5, "Got levels %u, expected %u\n", levels, 5); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n"); + ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8); + ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0); + ok(desc.Width == 256, "Got width %u, expected %u\n", desc.Width, 256); + ok(desc.Height == 256, "Got height %u, expected %u\n", desc.Height, 256); + ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED); + + check_release((IUnknown*)texture, 1); + } + } + + hr = ID3DXFont_PreloadCharacters(font, 'a', 'z'); + todo_wine ok(hr == D3D_OK, "ID3DXFont_PreloadCharacters returned %#x, expected %#x\n", hr, D3D_OK); + + check_release((IUnknown*)font, 0); + } else skip("Failed to create a ID3DXFont object\n"); + + for(i = 0; i < sizeof(texture_tests) / sizeof(texture_tests[0]); i++) { + HDC hdc; + DWORD ret; + HRESULT hr; + WORD glyph; + char c = 'a'; + IDirect3DTexture9 *texture; + + hr = D3DXCreateFontA(device, texture_tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font); + if(FAILED(hr)) { + skip("Failed to create a ID3DXFont object\n"); + continue; + } + + hdc = ID3DXFont_GetDC(font); + + ret = GetGlyphIndicesA(hdc, &c, 1, &glyph, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesA failed\n"); + + hr = ID3DXFont_GetGlyphData(font, glyph, &texture, NULL, NULL); + todo_wine ok(hr == D3D_OK, "ID3DXFont_GetGlyphData returned %#x, expected %#x\n", hr, D3D_OK); + if(SUCCEEDED(hr)) { + DWORD levels; + D3DSURFACE_DESC desc; + + levels = IDirect3DTexture9_GetLevelCount(texture); + ok(levels == texture_tests[i].expected_levels, "Got levels %u, expected %u\n", levels, texture_tests[i].expected_levels); + hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc); + ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n"); + ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8); + ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0); + ok(desc.Width == texture_tests[i].expected_size, "Got width %u, expected %u\n", desc.Width, texture_tests[i].expected_size); + ok(desc.Height == texture_tests[i].expected_size, "Got height %u, expected %u\n", desc.Height, texture_tests[i].expected_size); + ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED); + + IDirect3DTexture9_Release(texture); + } + ID3DXFont_Release(font); + } } static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)

1 0

Józef Kucia : d3dx9: Recognize X8B8G8R8 pixel format in DDS files.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 217c8b947e94cc03f5dc2a7d6f472882d0764ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=217c8b947e94cc03f5dc2a7d6… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:35:47 2012 +0200 d3dx9: Recognize X8B8G8R8 pixel format in DDS files. --- dlls/d3dx9_36/surface.c | 1 + dlls/d3dx9_36/tests/surface.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index f71af32..7be3ebe 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -191,6 +191,7 @@ static D3DFORMAT dds_rgb_to_d3dformat(const struct dds_pixel_format *pixel_forma { 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10 }, { 32, 0x0000ffff, 0xffff0000, 0x00000000, 0x00000000, D3DFMT_G16R16 }, { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8 }, + { 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0x00000000, D3DFMT_X8B8G8R8 }, }; for (i = 0; i < sizeof(rgb_pixel_formats) / sizeof(rgb_pixel_formats[0]); i++) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 64bb7a3..325f6b0 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -514,7 +514,9 @@ static void test_D3DXGetImageInfo(void) check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x3ff00000, 0x000ffc00, 0x000003ff, 0xc0000000, D3DFMT_A2B10G10R10); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000, D3DFMT_A2R10G10B10); check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, D3DFMT_A8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB | DDS_PF_ALPHA, 0, 32, 0x000000ff, 0x0000ff00, 0x00ff0000, 0xff000000, D3DFMT_A8B8G8R8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0xff0000, 0x00ff00, 0x0000ff, 0, D3DFMT_X8R8G8B8); + check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ff, 0x00ff00, 0xff0000, 0, D3DFMT_X8B8G8R8); check_dds_pixel_format(DDS_PF_RGB, 0, 32, 0x0000ffff, 0xffff0000, 0, 0, D3DFMT_G16R16); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 8, 0xff, 0, 0, 0, D3DFMT_L8); check_dds_pixel_format(DDS_PF_LUMINANCE, 0, 16, 0xffff, 0, 0, 0, D3DFMT_L16);

1 0

Józef Kucia : d3dx9/tests: Improve test failure messages for check_dds_pixel_format.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: 95b822d6725b4d9a9a4d621ca1b7d1585fca4ac6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b822d6725b4d9a9a4d621ca… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Tue Jun 19 01:35:48 2012 +0200 d3dx9/tests: Improve test failure messages for check_dds_pixel_format. --- dlls/d3dx9_36/tests/surface.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 325f6b0..84b1c56 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -211,9 +211,12 @@ static void fill_dds_header(struct dds_header *header) header->caps = DDS_CAPS_TEXTURE; } -static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, - DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, - D3DFORMAT expected_format) +#define check_dds_pixel_format(flags, fourcc, bpp, rmask, gmask, bmask, amask, format) \ + check_dds_pixel_format_(__LINE__, flags, fourcc, bpp, rmask, gmask, bmask, amask, format) +static void check_dds_pixel_format_(unsigned int line, + DWORD flags, DWORD fourcc, DWORD bpp, + DWORD rmask, DWORD gmask, DWORD bmask, DWORD amask, + D3DFORMAT expected_format) { HRESULT hr; D3DXIMAGE_INFO info; @@ -234,9 +237,13 @@ static void check_dds_pixel_format(DWORD flags, DWORD fourcc, DWORD bpp, memset(dds.data, 0, sizeof(dds.data)); hr = D3DXGetImageInfoFromFileInMemory(&dds, sizeof(dds), &info); - ok(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", hr, expected_format, D3D_OK); + ok_(__FILE__, line)(hr == D3D_OK, "D3DXGetImageInfoFromFileInMemory returned %#x for pixel format %#x, expected %#x\n", + hr, expected_format, D3D_OK); if (SUCCEEDED(hr)) - ok(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", info.Format, expected_format); + { + ok_(__FILE__, line)(info.Format == expected_format, "D3DXGetImageInfoFromFileInMemory returned format %#x, expected %#x\n", + info.Format, expected_format); + } } static void test_dds_header_handling(void)

1 0

Hans Leidekker : wbemprox: Improve tracing in IWbemLocator::ConnectServer.
by Alexandre Julliard 19 Jun '12

19 Jun '12

Module: wine Branch: master Commit: e7a4fb15731e612f466bb2b13a35e9402d0c951d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7a4fb15731e612f466bb2b13… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 19 10:19:03 2012 +0200 wbemprox: Improve tracing in IWbemLocator::ConnectServer. --- dlls/wbemprox/wbemlocator.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/wbemlocator.c b/dlls/wbemprox/wbemlocator.c index 4368db3..b80e080 100644 --- a/dlls/wbemprox/wbemlocator.c +++ b/dlls/wbemprox/wbemlocator.c @@ -99,7 +99,7 @@ static HRESULT WINAPI wbem_locator_ConnectServer( { HRESULT hr; - FIXME("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), + TRACE("%p, %s, %s, %s, %s, 0x%08x, %s, %p, %p)\n", iface, debugstr_w(NetworkResource), debugstr_w(User), debugstr_w(Password), debugstr_w(Locale), SecurityFlags, debugstr_w(Authority), pCtx, ppNamespace); if (((NetworkResource[0] == '\\' && NetworkResource[1] == '\\') || @@ -108,6 +108,13 @@ static HRESULT WINAPI wbem_locator_ConnectServer( FIXME("remote computer not supported\n"); return WBEM_E_TRANSPORT_FAILURE; } + if (User || Password || Authority) + FIXME("authentication not supported\n"); + if (Locale) + FIXME("specific locale not supported\n"); + if (SecurityFlags) + FIXME("unsupported flags\n"); + hr = WbemServices_create( NULL, (void **)ppNamespace ); if (SUCCEEDED( hr )) return WBEM_NO_ERROR;

1 0

Lucas Zawacki : Portuguese translation for release 1.4.1 (try 2)
by Jeremy Newman 19 Jun '12

19 Jun '12

Module: website Branch: master Commit: a17e029623f68d2a4a504ca7c4f6c5df81a9f3ee URL: http://source.winehq.org/git/website.git/?a=commit;h=a17e029623f68d2a4a504c… Author: Lucas Zawacki <lfzawacki(a)gmail.com> Date: Tue Jun 19 12:24:59 2012 -0300 Portuguese translation for release 1.4.1 (try 2) --- news/pt/2012061501.xml | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/news/pt/2012061501.xml b/news/pt/2012061501.xml new file mode 100644 index 0000000..0818200 --- /dev/null +++ b/news/pt/2012061501.xml @@ -0,0 +1,13 @@ +<news> +<date>15 de Junho de 2012</date> +<title>Wine 1.4.1 lançado</title> +<body> + A versão de manutenção 1.4.1 já está disponível. + <a href="{$root}/announce/1.4.1">Novidades</a> nesta versão: +<ul> + <li>Atualização das traduções.</li> + <li>Várias correções de bugs.</li> +</ul> +O código fonte está <a href="http://prdownloads.sourceforge.net/wine/wine-1.4.1.tar.bz2">disponível agora</a>. +Pacotes binários estão em processo de construção e em breve estarão em suas respectivas <a href="{$root}/download">sessões da área de downloads.</a>. +</body></news>

1 0