November 2012 - Wine-Commits

Hans Leidekker : windowscodecs: Implement IWICColorContext:: GetExifColorSpace.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: da7c8c6331b93dc2b6ed5ec27f520fbf0099e027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7c8c6331b93dc2b6ed5ec27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:47 2012 +0100 windowscodecs: Implement IWICColorContext::GetExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 5c8e4db..ba23387 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -158,8 +158,11 @@ static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, UINT *pValue) { - FIXME("(%p,%p)\n", iface, pValue); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%p)\n", iface, pValue); + + *pValue = This->exif_color_space; + return S_OK; } static const IWICColorContextVtbl ColorContext_Vtbl = {

1 0

Hans Leidekker : windowscodecs: Implement IWICBitmapFrameDecode:: GetColorContexts for PNG images.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: cfb91803c28d6de75cedca90c1f1eb903ee8c6e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfb91803c28d6de75cedca90c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:07:00 2012 +0100 windowscodecs: Implement IWICBitmapFrameDecode::GetColorContexts for PNG images. --- dlls/windowscodecs/pngformat.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 686f9c6..89f092e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -166,6 +166,7 @@ MAKE_FUNCPTR(png_error); MAKE_FUNCPTR(png_get_bit_depth); MAKE_FUNCPTR(png_get_color_type); MAKE_FUNCPTR(png_get_error_ptr); +MAKE_FUNCPTR(png_get_iCCP); MAKE_FUNCPTR(png_get_image_height); MAKE_FUNCPTR(png_get_image_width); MAKE_FUNCPTR(png_get_io_ptr); @@ -213,6 +214,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_get_bit_depth); LOAD_FUNCPTR(png_get_color_type); LOAD_FUNCPTR(png_get_error_ptr); + LOAD_FUNCPTR(png_get_iCCP); LOAD_FUNCPTR(png_get_image_height); LOAD_FUNCPTR(png_get_image_width); LOAD_FUNCPTR(png_get_io_ptr); @@ -624,7 +626,7 @@ static HRESULT WINAPI PngDecoder_GetPreview(IWICBitmapDecoder *iface, static HRESULT WINAPI PngDecoder_GetColorContexts(IWICBitmapDecoder *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); return WINCODEC_ERR_UNSUPPORTEDOPERATION; } @@ -844,8 +846,35 @@ static HRESULT WINAPI PngDecoder_Frame_GetMetadataQueryReader(IWICBitmapFrameDec static HRESULT WINAPI PngDecoder_Frame_GetColorContexts(IWICBitmapFrameDecode *iface, UINT cCount, IWICColorContext **ppIColorContexts, UINT *pcActualCount) { - FIXME("(%p,%u,%p,%p): stub\n", iface, cCount, ppIColorContexts, pcActualCount); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + PngDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + png_charp name, profile; + png_uint_32 len; + int compression_type; + HRESULT hr; + + TRACE("(%p,%u,%p,%p)\n", iface, cCount, ppIColorContexts, pcActualCount); + + EnterCriticalSection(&This->lock); + + if (ppng_get_iCCP(This->png_ptr, This->info_ptr, &name, &compression_type, &profile, &len)) + { + if (cCount && ppIColorContexts) + { + hr = IWICColorContext_InitializeFromMemory(*ppIColorContexts, (const BYTE *)profile, len); + if (FAILED(hr)) + { + LeaveCriticalSection(&This->lock); + return hr; + } + } + *pcActualCount = 1; + } + else + *pcActualCount = 0; + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI PngDecoder_Frame_GetThumbnail(IWICBitmapFrameDecode *iface,

1 0

Jacek Caban : cmd: Make allocation unfailable.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: c6d24089dbc284f0fef5e1ce37b75ac04c6ebd94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6d24089dbc284f0fef5e1ce3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 15 12:32:21 2012 +0100 cmd: Make allocation unfailable. --- programs/cmd/batch.c | 5 +- programs/cmd/builtins.c | 43 ++++++----------- programs/cmd/directory.c | 31 ++++-------- programs/cmd/wcmd.h | 18 +++++++- programs/cmd/wcmdmain.c | 116 ++++++++++++++++++++-------------------------- 5 files changed, 96 insertions(+), 117 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6d24089dbc284f0fef5e…

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext::GetProfileBytes .
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: ffa558bbaa3f28dd9c50222fadcdeaadbf9a3902 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa558bbaa3f28dd9c50222fa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:09:15 2012 +0100 windowscodecs: Implement IWICColorContext::GetProfileBytes. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index ba23387..5434fc6 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -151,8 +151,18 @@ static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual) { - FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); + + if (This->type != WICColorContextProfile) + return WINCODEC_ERR_NOTINITIALIZED; + + if (cbBuffer >= This->profile_len && pbBuffer) + memcpy(pbBuffer, This->profile, This->profile_len); + + *pcbActual = This->profile_len; + + return S_OK; } static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface,

1 0

Hans Leidekker : windowscodecs: Implement IWICColorContext:: InitializeFromExifColorSpace.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: a7f0c14bef80e047ed209d8bf4589f59bc8e4d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f0c14bef80e047ed209d8bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:08:21 2012 +0100 windowscodecs: Implement IWICColorContext::InitializeFromExifColorSpace. --- dlls/windowscodecs/colorcontext.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c index 2678fc2..5c8e4db 100644 --- a/dlls/windowscodecs/colorcontext.c +++ b/dlls/windowscodecs/colorcontext.c @@ -39,6 +39,7 @@ typedef struct ColorContext { WICColorContextType type; BYTE *profile; UINT profile_len; + UINT exif_color_space; } ColorContext; static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) @@ -125,8 +126,16 @@ static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, UINT value) { - FIXME("(%p,%u)\n", iface, value); - return E_NOTIMPL; + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%u)\n", iface, value); + + if (This->type != WICColorContextUninitialized && This->type != WICColorContextExifColorSpace) + return WINCODEC_ERR_WRONGSTATE; + + This->exif_color_space = value; + This->type = WICColorContextExifColorSpace; + + return S_OK; } static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, @@ -177,6 +186,7 @@ HRESULT ColorContext_Create(IWICColorContext **colorcontext) This->type = 0; This->profile = NULL; This->profile_len = 0; + This->exif_color_space = ~0u; *colorcontext = &This->IWICColorContext_iface;

1 0

Hans Leidekker : windowscodecs: Add a stub IWICColorContext implementation.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 96ebc618b5029723d1f2401dc54e5e0fac5e060f URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ebc618b5029723d1f2401dc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:06:25 2012 +0100 windowscodecs: Add a stub IWICColorContext implementation. --- dlls/windowscodecs/Makefile.in | 1 + dlls/windowscodecs/colorcontext.c | 161 ++++++++++++++++++++++++++++++++ dlls/windowscodecs/imgfactory.c | 4 +- dlls/windowscodecs/wincodecs_private.h | 1 + 4 files changed, 165 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in index 65cd913..d031daa 100644 --- a/dlls/windowscodecs/Makefile.in +++ b/dlls/windowscodecs/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ bmpdecode.c \ bmpencode.c \ clsfactory.c \ + colorcontext.c \ converter.c \ fliprotate.c \ gifformat.c \ diff --git a/dlls/windowscodecs/colorcontext.c b/dlls/windowscodecs/colorcontext.c new file mode 100644 index 0000000..9517988 --- /dev/null +++ b/dlls/windowscodecs/colorcontext.c @@ -0,0 +1,161 @@ +/* + * Copyright 2012 Hans Leidekker for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "config.h" + +#include <stdarg.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "wincodec.h" + +#include "wincodecs_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); + +typedef struct ColorContext { + IWICColorContext IWICColorContext_iface; + LONG ref; +} ColorContext; + +static inline ColorContext *impl_from_IWICColorContext(IWICColorContext *iface) +{ + return CONTAINING_RECORD(iface, ColorContext, IWICColorContext_iface); +} + +static HRESULT WINAPI ColorContext_QueryInterface(IWICColorContext *iface, REFIID iid, + void **ppv) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + TRACE("(%p,%s,%p)\n", iface, debugstr_guid(iid), ppv); + + if (!ppv) return E_INVALIDARG; + + if (IsEqualIID(&IID_IUnknown, iid) || + IsEqualIID(&IID_IWICColorContext, iid)) + { + *ppv = &This->IWICColorContext_iface; + } + else + { + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI ColorContext_AddRef(IWICColorContext *iface) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + return ref; +} + +static ULONG WINAPI ColorContext_Release(IWICColorContext *iface) +{ + ColorContext *This = impl_from_IWICColorContext(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) refcount=%u\n", iface, ref); + + if (ref == 0) + { + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +static HRESULT WINAPI ColorContext_InitializeFromFilename(IWICColorContext *iface, + LPCWSTR wzFilename) +{ + FIXME("(%p,%s)\n", iface, debugstr_w(wzFilename)); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_InitializeFromMemory(IWICColorContext *iface, + const BYTE *pbBuffer, UINT cbBufferSize) +{ + FIXME("(%p,%p,%u)\n", iface, pbBuffer, cbBufferSize); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_InitializeFromExifColorSpace(IWICColorContext *iface, + UINT value) +{ + FIXME("(%p,%u)\n", iface, value); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetType(IWICColorContext *iface, + WICColorContextType *pType) +{ + FIXME("(%p,%p)\n", iface, pType); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetProfileBytes(IWICColorContext *iface, + UINT cbBuffer, BYTE *pbBuffer, UINT *pcbActual) +{ + FIXME("(%p,%u,%p,%p)\n", iface, cbBuffer, pbBuffer, pcbActual); + return E_NOTIMPL; +} + +static HRESULT WINAPI ColorContext_GetExifColorSpace(IWICColorContext *iface, + UINT *pValue) +{ + FIXME("(%p,%p)\n", iface, pValue); + return E_NOTIMPL; +} + +static const IWICColorContextVtbl ColorContext_Vtbl = { + ColorContext_QueryInterface, + ColorContext_AddRef, + ColorContext_Release, + ColorContext_InitializeFromFilename, + ColorContext_InitializeFromMemory, + ColorContext_InitializeFromExifColorSpace, + ColorContext_GetType, + ColorContext_GetProfileBytes, + ColorContext_GetExifColorSpace +}; + +HRESULT ColorContext_Create(IWICColorContext **colorcontext) +{ + ColorContext *This; + + This = HeapAlloc(GetProcessHeap(), 0, sizeof(ColorContext)); + if (!This) return E_OUTOFMEMORY; + + This->IWICColorContext_iface.lpVtbl = &ColorContext_Vtbl; + This->ref = 1; + + *colorcontext = &This->IWICColorContext_iface; + + return S_OK; +} diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 8ba0a1d..54b390b 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -442,8 +442,8 @@ static HRESULT WINAPI ComponentFactory_CreateStream(IWICComponentFactory *iface, static HRESULT WINAPI ComponentFactory_CreateColorContext(IWICComponentFactory *iface, IWICColorContext **ppIColorContext) { - FIXME("(%p,%p): stub\n", iface, ppIColorContext); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, ppIColorContext); + return ColorContext_Create(ppIColorContext); } static HRESULT WINAPI ComponentFactory_CreateColorTransformer(IWICComponentFactory *iface, diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index 41d2d80..6857176 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -51,6 +51,7 @@ extern HRESULT BitmapScaler_Create(IWICBitmapScaler **scaler) DECLSPEC_HIDDEN; extern HRESULT FlipRotator_Create(IWICBitmapFlipRotator **fliprotator) DECLSPEC_HIDDEN; extern HRESULT PaletteImpl_Create(IWICPalette **palette) DECLSPEC_HIDDEN; extern HRESULT StreamImpl_Create(IWICStream **stream) DECLSPEC_HIDDEN; +extern HRESULT ColorContext_Create(IWICColorContext **context) DECLSPEC_HIDDEN; extern HRESULT copy_pixels(UINT bpp, const BYTE *srcbuffer, UINT srcwidth, UINT srcheight, INT srcstride,

1 0

Jacek Caban : atl: Properly fail on an aggregation attempt.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: efd0eead07b81ea01abbbcb97ba3cd7536448f4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=efd0eead07b81ea01abbbcb97… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 15 11:21:57 2012 +0100 atl: Properly fail on an aggregation attempt. --- dlls/atl/registrar.c | 49 ++++++++++++++++++++++++++++++------------- dlls/atl/tests/registrar.c | 12 ++++++++++ 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c index 7b1fe30..028f35e 100644 --- a/dlls/atl/registrar.c +++ b/dlls/atl/registrar.c @@ -698,21 +698,22 @@ static const IRegistrarVtbl RegistrarVtbl = { Registrar_ResourceUnregister, }; -static HRESULT Registrar_create(const IUnknown *pUnkOuter, REFIID riid, void **ppvObject) +/* Exported only by newer ATL versions */ +static HRESULT AtlCreateRegistrar(IRegistrar **ret) { - Registrar *ret; + Registrar *registrar; - if(!IsEqualGUID(&IID_IUnknown, riid) && !IsEqualGUID(&IID_IRegistrar, riid)) - return E_NOINTERFACE; + registrar = HeapAlloc(GetProcessHeap(), 0, sizeof(*registrar)); + if(!registrar) + return E_OUTOFMEMORY; - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(Registrar)); - ret->IRegistrar_iface.lpVtbl = &RegistrarVtbl; - ret->ref = 1; - ret->rep = NULL; - *ppvObject = ret; + registrar->IRegistrar_iface.lpVtbl = &RegistrarVtbl; + registrar->ref = 1; + registrar->rep = NULL; InterlockedIncrement(&dll_count); + *ret = &registrar->IRegistrar_iface; return S_OK; } @@ -746,10 +747,25 @@ static ULONG WINAPI RegistrarCF_Release(IClassFactory *iface) } static HRESULT WINAPI RegistrarCF_CreateInstance(IClassFactory *iface, LPUNKNOWN pUnkOuter, - REFIID riid, void **ppvObject) + REFIID riid, void **ppv) { - TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); - return Registrar_create(pUnkOuter, riid, ppvObject); + IRegistrar *registrar; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppv); + + if(pUnkOuter) { + *ppv = NULL; + return CLASS_E_NOAGGREGATION; + } + + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + + hres = IRegistrar_QueryInterface(registrar, riid, ppv); + IRegistrar_Release(registrar); + return hres; } static HRESULT WINAPI RegistrarCF_LockServer(IClassFactory *iface, BOOL lock) @@ -801,10 +817,13 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll, static const WCHAR wszModule[] = {'M','O','D','U','L','E',0}; static const WCHAR wszRegistry[] = {'R','E','G','I','S','T','R','Y',0}; - if (pRegistrar) + if(pRegistrar) { registrar = pRegistrar; - else - Registrar_create(NULL, &IID_IRegistrar, (void**)&registrar); + }else { + hres = AtlCreateRegistrar(&registrar); + if(FAILED(hres)) + return hres; + } IRegistrar_AddReplacement(registrar, wszModule, wszDll); diff --git a/dlls/atl/tests/registrar.c b/dlls/atl/tests/registrar.c index 9c5dd23..1b1c797 100644 --- a/dlls/atl/tests/registrar.c +++ b/dlls/atl/tests/registrar.c @@ -135,11 +135,23 @@ static void test_registrar(void) IRegistrar_Release(registrar); } +static void test_aggregation(void) +{ + IUnknown *unk = (IUnknown*)0xdeadbeef; + HRESULT hres; + + hres = CoCreateInstance(&CLSID_Registrar, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IUnknown, (void**)&unk); + ok(hres == CLASS_E_NOAGGREGATION, "CoCreateInstance failed: %08x, expected CLASS_E_NOAGGREGATION\n", hres); + ok(!unk, "unk = %p\n", unk); +} + START_TEST(registrar) { CoInitialize(NULL); test_registrar(); + test_aggregation(); CoUninitialize(); }

1 0

Alexandre Julliard : user32: Use the default GUI font for unspecified font parameters.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: bfc8bc4d27e5abee5e483ef6dca518a49aab6c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfc8bc4d27e5abee5e483ef6d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 13:28:22 2012 +0100 user32: Use the default GUI font for unspecified font parameters. --- dlls/user32/sysparams.c | 52 ++++++++++------------------------------------- 1 files changed, 11 insertions(+), 41 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index fa97815..8519142 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -361,6 +361,7 @@ struct sysparam_binary_entry struct sysparam_font_entry { struct sysparam_entry hdr; + UINT weight; LOGFONTW val; }; @@ -1193,7 +1194,12 @@ static BOOL get_font_entry( union sysparam_all_entry *entry, UINT int_param, voi { LOGFONTW font; - if (!reg_get_logfont( entry->hdr.regkey, entry->hdr.regval, &font )) return FALSE; + if (!reg_get_logfont( entry->hdr.regkey, entry->hdr.regval, &font )) + { + /* use the default GUI font */ + GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(font), &font ); + font.lfWeight = entry->font.weight; + } entry->font.val = font; entry->hdr.loaded = TRUE; } @@ -1331,9 +1337,9 @@ static BOOL set_entry( void *ptr, UINT int_param, void *ptr_param, UINT flags ) struct sysparam_binary_entry entry_##name = { { get_binary_entry, set_binary_entry, \ SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, &(data), sizeof(data) } -#define FONT_ENTRY(name) \ +#define FONT_ENTRY(name,weight) \ struct sysparam_font_entry entry_##name = { { get_font_entry, set_font_entry, \ - SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME } } + SPI_SET ## name ##_REGKEY, SPI_SET ## name ##_VALNAME }, (weight) } #define USERPREF_ENTRY(name,offset,mask) \ struct sysparam_pref_entry entry_##name = { { get_userpref_entry, set_userpref_entry }, \ @@ -1400,7 +1406,7 @@ static DWORD_ENTRY( MOUSECLICKLOCKTIME, 1200 ); static BYTE user_prefs[8] = { 0x30, 0x00, 0x02, 0x80, 0x10, 0x00, 0x00, 0x00 }; static BINARY_ENTRY( USERPREFERENCESMASK, user_prefs ); -static FONT_ENTRY( ICONTITLELOGFONT ); +static FONT_ENTRY( ICONTITLELOGFONT, FW_NORMAL ); static USERPREF_ENTRY( MENUANIMATION, 0, 0x02 ); static USERPREF_ENTRY( COMBOBOXANIMATION, 0, 0x04 ); @@ -1599,43 +1605,7 @@ BOOL WINAPI SystemParametersInfoW( UINT uiAction, UINT uiParam, ret = set_entry( &entry_DOUBLECLKHEIGHT, uiParam, pvParam, fWinIni ); break; case SPI_GETICONTITLELOGFONT: - if (!pvParam) return FALSE; - if (!get_entry( &entry_ICONTITLELOGFONT, uiParam, pvParam )) - { - LOGFONTW lfDefault, *font = &entry_ICONTITLELOGFONT.val; - INT r; - - /* - * The 'default GDI fonts' seems to be returned. - * If a returned font is not a correct font in your environment, - * please try to fix objects/gdiobj.c at first. - */ - GetObjectW( GetStockObject( DEFAULT_GUI_FONT ), sizeof(LOGFONTW), &lfDefault ); - - GetProfileStringW( Desktop, IconTitleFaceName, lfDefault.lfFaceName, - font->lfFaceName, LF_FACESIZE ); - - r = GetProfileIntW( Desktop, IconTitleSize, 0 ); - if (r) - font->lfHeight = -r; - else - font->lfHeight = lfDefault.lfHeight; - - font->lfWidth = 0; - font->lfEscapement = 0; - font->lfOrientation = 0; - font->lfWeight = FW_NORMAL; - font->lfItalic = FALSE; - font->lfStrikeOut = FALSE; - font->lfUnderline = FALSE; - font->lfCharSet = lfDefault.lfCharSet; /* at least 'charset' should not be hard-coded */ - font->lfOutPrecision = OUT_DEFAULT_PRECIS; - font->lfClipPrecision = CLIP_DEFAULT_PRECIS; - font->lfQuality = DEFAULT_QUALITY; - font->lfPitchAndFamily = DEFAULT_PITCH; - entry_ICONTITLELOGFONT.hdr.loaded = TRUE; - *(LOGFONTW *)pvParam = *font; - } + ret = get_entry( &entry_ICONTITLELOGFONT, uiParam, pvParam ); break; case SPI_SETDOUBLECLICKTIME: ret = set_entry( &entry_DOUBLECLICKTIME, uiParam, pvParam, fWinIni );

1 0

Alexandre Julliard : gdi32: Don' t load bitmap glyphs when using subpixel rendering in GetGlyphOutline.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: ebaf5ea17623268fb1c0f68b1cf9a5984bd4e46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebaf5ea17623268fb1c0f68b1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 15 13:29:21 2012 +0100 gdi32: Don't load bitmap glyphs when using subpixel rendering in GetGlyphOutline. --- dlls/gdi32/freetype.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 79a0975..98c66a0 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5997,12 +5997,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, needsTransform = TRUE; } - if (needsTransform || (format == GGO_NATIVE || format == GGO_BEZIER || - format == GGO_GRAY2_BITMAP || format == GGO_GRAY4_BITMAP || - format == GGO_GRAY8_BITMAP)) - { - load_flags |= FT_LOAD_NO_BITMAP; - } + if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags);

1 0

Hans Leidekker : windowscodecs: GetThumbnail should be supported for ICO frames.
by Alexandre Julliard Nov. 15, 2012

Nov. 15, 2012

Module: wine Branch: master Commit: 6395af1ae7b0cc5f2f1f82796502e2a605bc5a6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6395af1ae7b0cc5f2f1f82796… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Nov 15 14:10:31 2012 +0100 windowscodecs: GetThumbnail should be supported for ICO frames. --- dlls/windowscodecs/icoformat.c | 4 ++-- dlls/windowscodecs/tests/icoformat.c | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/icoformat.c b/dlls/windowscodecs/icoformat.c index 6cccc3e..4e83ec0 100644 --- a/dlls/windowscodecs/icoformat.c +++ b/dlls/windowscodecs/icoformat.c @@ -200,8 +200,8 @@ static HRESULT WINAPI IcoFrameDecode_GetColorContexts(IWICBitmapFrameDecode *ifa static HRESULT WINAPI IcoFrameDecode_GetThumbnail(IWICBitmapFrameDecode *iface, IWICBitmapSource **ppIThumbnail) { - TRACE("(%p,%p)\n", iface, ppIThumbnail); - return WINCODEC_ERR_CODECNOTHUMBNAIL; + FIXME("(%p,%p)\n", iface, ppIThumbnail); + return E_NOTIMPL; } static const IWICBitmapFrameDecodeVtbl IcoFrameDecode_Vtbl = { diff --git a/dlls/windowscodecs/tests/icoformat.c b/dlls/windowscodecs/tests/icoformat.c index 3974dfc..e9c0a48 100644 --- a/dlls/windowscodecs/tests/icoformat.c +++ b/dlls/windowscodecs/tests/icoformat.c @@ -134,9 +134,16 @@ static void test_bad_icondirentry_size(void) if (SUCCEEDED(hr)) { UINT width = 0, height = 0; + IWICBitmapSource *thumbnail = NULL; + hr = IWICBitmapFrameDecode_GetSize(framedecode, &width, &height); ok(hr == S_OK, "GetFrameSize failed, hr=%x\n", hr); ok(width == 16 && height == 16, "framesize=%ux%u\n", width, height); + + hr = IWICBitmapFrameDecode_GetThumbnail(framedecode, &thumbnail); + todo_wine ok(hr == S_OK, "GetThumbnail failed, hr=%x\n", hr); + + if (thumbnail) IWICBitmapSource_Release(thumbnail); IWICBitmapFrameDecode_Release(framedecode); }

1 0