November 2012 - Wine-commits

Dmitry Timoshkov : windowscodecs: Implement QueryCapability in the GIF decoder.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 7baf4ecd064a0c226ce3ceb2b83182a70328d65e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf4ecd064a0c226ce3ceb2b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Nov 22 18:27:22 2012 +0800 windowscodecs: Implement QueryCapability in the GIF decoder. --- dlls/windowscodecs/gifformat.c | 19 +++++++++++++++---- 1 files changed, 15 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/gifformat.c b/dlls/windowscodecs/gifformat.c index eb8a37b..d87a6e7 100644 --- a/dlls/windowscodecs/gifformat.c +++ b/dlls/windowscodecs/gifformat.c @@ -1064,11 +1064,22 @@ static ULONG WINAPI GifDecoder_Release(IWICBitmapDecoder *iface) return ref; } -static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *pIStream, - DWORD *pdwCapability) +static HRESULT WINAPI GifDecoder_QueryCapability(IWICBitmapDecoder *iface, IStream *stream, + DWORD *capability) { - FIXME("(%p,%p,%p): stub\n", iface, pIStream, pdwCapability); - return E_NOTIMPL; + HRESULT hr; + + TRACE("(%p,%p,%p)\n", iface, stream, capability); + + if (!stream || !capability) return E_INVALIDARG; + + hr = IWICBitmapDecoder_Initialize(iface, stream, WICDecodeMetadataCacheOnDemand); + if (hr != S_OK) return hr; + + *capability = WICBitmapDecoderCapabilityCanDecodeAllImages | + WICBitmapDecoderCapabilityCanDecodeSomeImages | + WICBitmapDecoderCapabilityCanEnumerateMetadata; + return S_OK; } static int _gif_inputfunc(GifFileType *gif, GifByteType *data, int len) {

1 0

Alexandre Julliard : user32: Fix the wait event mask in PeekMessage.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: a0f039a6049641cc2be8fa32f2afa3c3f394a99b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f039a6049641cc2be8fa32f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 22 11:57:15 2012 +0100 user32: Fix the wait event mask in PeekMessage. --- dlls/user32/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index ba37a3a..8ca259b 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3690,7 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (flags & PM_NOYIELD) ret = USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); else - ret = wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + ret = wow_handlers.wait_message( 0, NULL, 0, QS_ALLINPUT, 0 ); /* if we received driver events, check again for a pending message */ if (ret == WAIT_TIMEOUT || !peek_message( &msg, hwnd, first, last, flags, 0 )) return FALSE;

1 0

Maarten Lankhorst : dsound: Create a primary_pwfx separately from pwfx.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: 605cd62c7dc84ef86cbd260139c6875cd0ed8d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605cd62c7dc84ef86cbd26013… Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> Date: Fri Nov 16 20:35:51 2012 +0100 dsound: Create a primary_pwfx separately from pwfx. --- dlls/dsound/dsound.c | 35 ++++- dlls/dsound/dsound_main.c | 10 -- dlls/dsound/dsound_private.h | 8 +- dlls/dsound/mixer.c | 1 + dlls/dsound/primary.c | 334 ++++++++++++++++++++++-------------------- 5 files changed, 204 insertions(+), 184 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=605cd62c7dc84ef86cbd2…

1 0

Jacek Caban : atl: Don't forward AtlModule* calls to atl100.dll.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: fed2d49fd9d69bf597f117f6e36bef9adca78ed5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fed2d49fd9d69bf597f117f6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:33:25 2012 +0100 atl: Don't forward AtlModule* calls to atl100.dll. --- dlls/atl/atl.spec | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/atl/atl.spec b/dlls/atl/atl.spec index c043d3e..1de6f0c 100644 --- a/dlls/atl/atl.spec +++ b/dlls/atl/atl.spec @@ -34,10 +34,10 @@ 40 stdcall AtlAxCreateControlEx(ptr ptr ptr ptr ptr ptr ptr) atl100.AtlAxCreateControlEx 41 stdcall AtlAxAttachControl(ptr ptr ptr) atl100.AtlAxAttachControl 42 stdcall AtlAxWinInit() atl100.AtlAxWinInit -43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) atl100.AtlModuleAddCreateWndData -44 stdcall AtlModuleExtractCreateWndData(ptr) atl100.AtlModuleExtractCreateWndData -45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoW -46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) atl100.AtlModuleRegisterWndClassInfoA +43 stdcall AtlModuleAddCreateWndData(ptr ptr ptr) +44 stdcall AtlModuleExtractCreateWndData(ptr) +45 stdcall AtlModuleRegisterWndClassInfoW(ptr ptr ptr) +46 stdcall AtlModuleRegisterWndClassInfoA(ptr ptr ptr) 47 stdcall AtlAxGetControl(long ptr) atl100.AtlAxGetControl 48 stdcall AtlAxGetHost(long ptr) atl100.AtlAxGetHost 49 stub AtlRegisterClassCategoriesHelper

1 0

Jacek Caban : advapi32: Added debug trace to RegOverridePredefKey.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: d331118bfd3f71bd8e336e011c3ce2f0afd16ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d331118bfd3f71bd8e336e011… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Nov 22 12:40:40 2012 +0100 advapi32: Added debug trace to RegOverridePredefKey. --- dlls/advapi32/registry.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index d3b8edf..744908f 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -284,6 +284,8 @@ LSTATUS WINAPI RegOverridePredefKey( HKEY hkey, HKEY override ) HKEY old_key; int idx; + TRACE("(%p %p)\n", hkey, override); + if ((hkey < HKEY_SPECIAL_ROOT_FIRST) || (hkey > HKEY_SPECIAL_ROOT_LAST)) return ERROR_INVALID_PARAMETER; idx = (UINT_PTR)hkey - (UINT_PTR)HKEY_SPECIAL_ROOT_FIRST;

1 0

Henri Verbeet : d3dx9: Avoid LPD3DXFILEDATA.
by Alexandre Julliard 22 Nov '12

22 Nov '12

Module: wine Branch: master Commit: b868105e4b9c87dcc6fbaafb084a69e386c472b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b868105e4b9c87dcc6fbaafb0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 22 13:45:09 2012 +0100 d3dx9: Avoid LPD3DXFILEDATA. --- include/d3dx9anim.h | 6 +++--- include/d3dx9xof.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/d3dx9anim.h b/include/d3dx9anim.h index 0c9d7b9..9a25ec8 100644 --- a/include/d3dx9anim.h +++ b/include/d3dx9anim.h @@ -183,9 +183,9 @@ DECLARE_INTERFACE(ID3DXAllocateHierarchy) #define INTERFACE ID3DXLoadUserData DECLARE_INTERFACE(ID3DXLoadUserData) { - STDMETHOD(LoadTopLevelData)(LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadFrameChildData)(LPD3DXFRAME frame, LPD3DXFILEDATA child_data) PURE; - STDMETHOD(LoadMeshChildData)(LPD3DXMESHCONTAINER mesh_container, LPD3DXFILEDATA child_data) PURE; + STDMETHOD(LoadTopLevelData)(ID3DXFileData *child_data) PURE; + STDMETHOD(LoadFrameChildData)(D3DXFRAME *frame, ID3DXFileData *child_data) PURE; + STDMETHOD(LoadMeshChildData)(D3DXMESHCONTAINER *mesh_container, ID3DXFileData *child_data) PURE; }; #undef INTERFACE diff --git a/include/d3dx9xof.h b/include/d3dx9xof.h index 123f0ac..f110a1f 100644 --- a/include/d3dx9xof.h +++ b/include/d3dx9xof.h @@ -125,9 +125,9 @@ DECLARE_INTERFACE_IID_(ID3DXFileEnumObject,IUnknown,"cef08cfc-7b4f-4429-9624-2a6 /*** ID3DXFileEnumObject methods ***/ STDMETHOD(GetFile)(THIS_ LPD3DXFILE*) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectById)(THIS_ REFGUID, LPD3DXFILEDATA*) PURE; - STDMETHOD(GetDataObjectByName)(THIS_ LPCSTR, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, struct ID3DXFileData **child) PURE; + STDMETHOD(GetDataObjectById)(THIS_ REFGUID guid, struct ID3DXFileData **obj) PURE; + STDMETHOD(GetDataObjectByName)(THIS_ const char *name, struct ID3DXFileData **obj) PURE; }; #undef INTERFACE @@ -147,7 +147,7 @@ DECLARE_INTERFACE_IID_(ID3DXFileData,IUnknown,"cef08cfd-7b4f-4429-9624-2a690a933 STDMETHOD(GetType)(THIS_ GUID*) PURE; STDMETHOD_(BOOL,IsReference)(THIS) PURE; STDMETHOD(GetChildren)(THIS_ SIZE_T*) PURE; - STDMETHOD(GetChild)(THIS_ SIZE_T, LPD3DXFILEDATA*) PURE; + STDMETHOD(GetChild)(THIS_ SIZE_T id, ID3DXFileData **child) PURE; }; #undef INTERFACE

1 0

Christian Costa : winegstreamer: Turn some FIXME into TRACE.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 20e1f8a0278dd7cd7866f9d2e9d32533ccdd4943 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20e1f8a0278dd7cd7866f9d2e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Nov 21 09:49:01 2012 +0100 winegstreamer: Turn some FIXME into TRACE. --- dlls/winegstreamer/gstdemux.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3f70ae3..dd160eb 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -515,7 +515,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { if (This->initial) { gst_buffer_unref(buf); - FIXME("Triggering %p %p\n", pad, pin->caps_event); + TRACE("Triggering %p %p\n", pad, pin->caps_event); SetEvent(pin->caps_event); return GST_FLOW_NOT_LINKED; } @@ -539,7 +539,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstBuffer *buf) { ERR("Didn't get a GST_APP_BUFFER, and could not get a delivery buffer (%x), returning GST_FLOW_WRONG_STATE\n", hr); return GST_FLOW_WRONG_STATE; } - FIXME("Did not get a GST_APP_BUFFER, creating a sample\n"); + TRACE("Did not get a GST_APP_BUFFER, creating a sample\n"); IMediaSample_GetPointer(sample, &ptr); memcpy(ptr, GST_BUFFER_DATA(buf), GST_BUFFER_SIZE(buf)); } @@ -759,7 +759,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, gboolean last, GS gst_segment_init(pin->segment, GST_FORMAT_TIME); ret = gst_pad_link(pad, mypad); gst_pad_activate_push(mypad, 1); - FIXME("Linking: %i\n", ret); + TRACE("Linking: %i\n", ret); if (ret >= 0) { pin->their_src = pad; gst_object_ref(pin->their_src); @@ -859,7 +859,7 @@ static gboolean activate_push(GstPad *pad, gboolean activate) { } static void no_more_pads(GstElement *decodebin, GSTImpl *This) { - FIXME("Done\n"); + TRACE("Done\n"); SetEvent(This->event); }

1 0

Qian Hong : usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 33cefcf8ea8f8570b02e7190cc0866b0325021f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33cefcf8ea8f8570b02e7190c… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Nov 21 18:13:14 2012 +0800 usp10: Fixed wgBlank, wgDefault, wgInvalid and wgKashida. --- dlls/usp10/usp10.c | 68 +++++++++++++++++++++++++++++++++++++----- dlls/usp10/usp10_internal.h | 1 + 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 7f181d0..6ff640e 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -729,9 +729,61 @@ static inline BOOL heap_free(LPVOID mem) return HeapFree(GetProcessHeap(), 0, mem); } -static inline WCHAR get_cache_default_char(SCRIPT_CACHE *psc) +/* TODO Fix font properties on Arabic locale */ +static inline BOOL set_cache_font_properties(const HDC hdc, ScriptCache *sc) { - return ((ScriptCache *)*psc)->tm.tmDefaultChar; + if (!sc->sfnt) + { + sc->sfp.wgBlank = sc->tm.tmBreakChar; + sc->sfp.wgDefault = sc->tm.tmDefaultChar; + sc->sfp.wgInvalid = sc->sfp.wgBlank; + sc->sfp.wgKashida = 0xFFFF; + sc->sfp.iKashidaWidth = 0; + } + else + { + static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unknow char found by black box testing + U+0640: kashida */ + WORD gi[4]; + + if (GetGlyphIndicesW(hdc, chars, 4, gi, GGI_MARK_NONEXISTING_GLYPHS) != GDI_ERROR) + { + if(gi[0] != 0xFFFF) /* 0xFFFF: index of default non exist char */ + sc->sfp.wgBlank = gi[0]; + else + sc->sfp.wgBlank = 0; + + sc->sfp.wgDefault = 0; + + if (gi[2] != 0xFFFF) + sc->sfp.wgInvalid = gi[2]; + else if (gi[1] != 0xFFFF) + sc->sfp.wgInvalid = gi[1]; + else if (gi[0] != 0xFFFF) + sc->sfp.wgInvalid = gi[0]; + else + sc->sfp.wgInvalid = 0; + + sc->sfp.wgKashida = gi[3]; + + sc->sfp.iKashidaWidth = 0; /* TODO */ + } + else + return FALSE; + } + return TRUE; +} + +static inline void get_cache_font_properties(SCRIPT_FONTPROPERTIES *sfp, ScriptCache *sc) +{ + sfp->wgBlank = sc->sfp.wgBlank; + sfp->wgDefault = sc->sfp.wgDefault; + sfp->wgInvalid = sc->sfp.wgInvalid; + sfp->wgKashida = sc->sfp.wgKashida; + sfp->iKashidaWidth = sc->sfp.iKashidaWidth; } static inline LONG get_cache_height(SCRIPT_CACHE *psc) @@ -813,6 +865,11 @@ static HRESULT init_script_cache(const HDC hdc, SCRIPT_CACHE *psc) return E_INVALIDARG; } sc->sfnt = (GetFontData(hdc, MS_MAKE_TAG('h','e','a','d'), 0, NULL, 0)!=GDI_ERROR); + if (!set_cache_font_properties(hdc, sc)) + { + heap_free(sc); + return E_INVALIDARG; + } *psc = sc; TRACE("<- %p\n", sc); return S_OK; @@ -1063,12 +1120,7 @@ HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPR if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) return E_INVALIDARG; - /* return something sensible? */ - sfp->wgBlank = 0; - sfp->wgDefault = get_cache_default_char(psc); - sfp->wgInvalid = 0; - sfp->wgKashida = 0xffff; - sfp->iKashidaWidth = 0; + get_cache_font_properties(sfp, *psc); return S_OK; } diff --git a/dlls/usp10/usp10_internal.h b/dlls/usp10/usp10_internal.h index 674db89..e92648c 100644 --- a/dlls/usp10/usp10_internal.h +++ b/dlls/usp10/usp10_internal.h @@ -160,6 +160,7 @@ typedef struct { LOGFONTW lf; TEXTMETRICW tm; OUTLINETEXTMETRICW *otm; + SCRIPT_FONTPROPERTIES sfp; BOOL sfnt; CacheGlyphPage *page[0x10]; ABC *widths[GLYPH_MAX / GLYPH_BLOCK_SIZE];

1 0

Qian Hong : usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: dd2be15118fa368c18ee9fe300f91c1ba8f9ab3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd2be15118fa368c18ee9fe30… Author: Qian Hong <fracting(a)gmail.com> Date: Wed Nov 21 18:14:30 2012 +0800 usp10/tests: Added tests for wgBlank, wgDefault, wgInvalid and wgKashida. --- dlls/usp10/tests/usp10.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 156 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index ff757ee..d6786cd 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -1804,11 +1804,64 @@ static void test_ScriptGetCMap(HDC hdc, unsigned short pwOutGlyphs[256]) ok (!psc, "psc is not null after ScriptFreeCache\n"); } +#define MAX_ENUM_FONTS 4096 + +struct enum_font_data +{ + int total; + ENUMLOGFONT elf[MAX_ENUM_FONTS]; +}; + +static INT CALLBACK enum_bitmap_font_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE)) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + +static INT CALLBACK enum_truetype_proc(const LOGFONT *lf, const TEXTMETRIC *ntm, DWORD type, LPARAM lParam) +{ + struct enum_font_data *efnd = (struct enum_font_data *)lParam; + + if (!(type & (TRUETYPE_FONTTYPE | DEVICE_FONTTYPE))) return 1; + + if (efnd->total < MAX_ENUM_FONTS) + { + efnd->elf[efnd->total++] = *(ENUMLOGFONT*)lf; + } + else + trace("enum tests invalid; you have more than %d fonts\n", MAX_ENUM_FONTS); + + return 1; +} + static void test_ScriptGetFontProperties(HDC hdc) { HRESULT hr; SCRIPT_CACHE psc,old_psc; SCRIPT_FONTPROPERTIES sfp; + HFONT font, oldfont; + LOGFONT lf; + struct enum_font_data efnd; + TEXTMETRICA tmA; + WORD gi[3]; + WCHAR str[3]; + DWORD i, ret; + WORD system_lang_id = PRIMARYLANGID(GetSystemDefaultLangID()); + static const WCHAR invalids[] = {0x0020, 0x200B, 0xF71B}; + /* U+0020: numeric space + U+200B: zero width space + U+F71B: unkown, found by black box testing */ + BOOL is_terminal, is_arial, is_times_new_roman, is_arabic = (system_lang_id == LANG_ARABIC); /* Some sanity checks for ScriptGetFontProperties */ @@ -1866,6 +1919,109 @@ static void test_ScriptGetFontProperties(HDC hdc) ok( psc == old_psc, "Expected psc not to be changed, was %p is now %p\n", old_psc, psc); ScriptFreeCache(&psc); ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + + pGetGlyphIndicesW = (void*)GetProcAddress(GetModuleHandleA("gdi32.dll"), "GetGlyphIndicesW"); + if (!pGetGlyphIndicesW) + { + win_skip("Skip on WINNT4\n"); + return; + } + memset(&lf, 0, sizeof(lf)); + lf.lfCharSet = DEFAULT_CHARSET; + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_bitmap_font_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("bitmap font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + ret = GetTextMetricsA(hdc, &tmA); + ok(ret != 0, "GetTextMetricsA failed!\n"); + + is_terminal = !(lstrcmpA(lf.lfFaceName, "Terminal") && lstrcmpA(lf.lfFaceName, "@Terminal")); + ok(sfp.wgBlank == tmA.tmBreakChar || broken(is_terminal) || broken(is_arabic), "bitmap font %s wgBlank %04x tmBreakChar %04x\n", lf.lfFaceName, sfp.wgBlank, tmA.tmBreakChar); + + ok(sfp.wgDefault == tmA.tmDefaultChar || broken(is_arabic), "bitmap font %s wgDefault %04x, tmDefaultChar %04x\n", lf.lfFaceName, sfp.wgDefault, tmA.tmDefaultChar); + + ok(sfp.wgInvalid == sfp.wgBlank || broken(is_arabic), "bitmap font %s wgInvalid %02x wgBlank %02x\n", lf.lfFaceName, sfp.wgInvalid, sfp.wgBlank); + + ok(sfp.wgKashida == 0xFFFF || broken(is_arabic), "bitmap font %s wgKashida %02x\n", lf.lfFaceName, sfp.wgKashida); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } + + efnd.total = 0; + EnumFontFamiliesA(hdc, NULL, enum_truetype_proc, (LPARAM)&efnd); + + for (i = 0; i < efnd.total; i++) + { + lstrcpyA(lf.lfFaceName, (char *)efnd.elf[i].elfFullName); + font = CreateFontIndirect(&lf); + oldfont = SelectObject(hdc, font); + + sfp.cBytes = sizeof(SCRIPT_FONTPROPERTIES); + psc = NULL; + hr = ScriptGetFontProperties(hdc, &psc, &sfp); + ok(hr == S_OK, "ScriptGetFontProperties expected S_OK, got %08x\n", hr); + if (winetest_interactive) + { + trace("truetype font %s\n", lf.lfFaceName); + trace("wgBlank %04x\n", sfp.wgBlank); + trace("wgDefault %04x\n", sfp.wgDefault); + trace("wgInvalid %04x\n", sfp.wgInvalid); + trace("wgKashida %04x\n", sfp.wgKashida); + trace("iKashidaWidth %d\n", sfp.iKashidaWidth); + } + + str[0] = 0x0020; /* U+0020: numeric space */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, 0); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + ok(sfp.wgBlank == gi[0], "truetype font %s wgBlank %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgBlank, gi[0]); + + ok(sfp.wgDefault == 0 || broken(is_arabic), "truetype font %s wgDefault %04x\n", lf.lfFaceName, sfp.wgDefault); + + ret = pGetGlyphIndicesW(hdc, invalids, 3, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + if (gi[2] != 0xFFFF) /* index of default non exist char */ + ok(sfp.wgInvalid == gi[2], "truetype font %s wgInvalid %04x gi[2] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[2]); + else if (gi[1] != 0xFFFF) + ok(sfp.wgInvalid == gi[1], "truetype font %s wgInvalid %04x gi[1] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[1]); + else if (gi[0] != 0xFFFF) + ok(sfp.wgInvalid == gi[0], "truetype font %s wgInvalid %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgInvalid, gi[0]); + else + ok(sfp.wgInvalid == 0, "truetype font %s wgInvalid %04x expect 0\n", lf.lfFaceName, sfp.wgInvalid); + + str[0] = 0x0640; /* U+0640: kashida */ + ret = pGetGlyphIndicesW(hdc, str, 1, gi, GGI_MARK_NONEXISTING_GLYPHS); + ok(ret != GDI_ERROR, "GetGlyphIndicesW failed!\n"); + is_arial = !lstrcmpA(lf.lfFaceName, "Arial"); + is_times_new_roman= !lstrcmpA(lf.lfFaceName, "Times New Roman"); + ok(sfp.wgKashida == gi[0] || broken(is_arial || is_times_new_roman) || broken(is_arabic), "truetype font %s wgKashida %04x gi[0] %04x\n", lf.lfFaceName, sfp.wgKashida, gi[0]); + + ScriptFreeCache(&psc); + + SelectObject(hdc, oldfont); + DeleteObject(font); + } } static void test_ScriptTextOut(HDC hdc)

1 0

Dmitry Timoshkov : windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream.
by Alexandre Julliard 21 Nov '12

21 Nov '12

Module: wine Branch: master Commit: 9e5ecdb74532e0d2a503d26d16de98376c17f7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9e5ecdb74532e0d2a503d26d1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Nov 21 17:11:15 2012 +0800 windowscodecs: Make GetFrameCount in the TIFF decoder not fail without an image stream. --- dlls/windowscodecs/tests/tiffformat.c | 3 --- dlls/windowscodecs/tiffformat.c | 8 ++------ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/windowscodecs/tests/tiffformat.c b/dlls/windowscodecs/tests/tiffformat.c index 9b5db52..4cbda4d 100644 --- a/dlls/windowscodecs/tests/tiffformat.c +++ b/dlls/windowscodecs/tests/tiffformat.c @@ -203,9 +203,7 @@ static void test_QueryCapability(void) frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK || broken(hr == E_POINTER) /* XP */, "GetFrameCount error %#x\n", hr); -todo_wine ok(frame_count == 0, "expected 0, got %u\n", frame_count); pos.QuadPart = 4; @@ -222,7 +220,6 @@ todo_wine frame_count = 0xdeadbeef; hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); -todo_wine ok(hr == S_OK, "GetFrameCount error %#x\n", hr); todo_wine ok(frame_count == 1, "expected 1, got %u\n", frame_count); diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index cf93540..f22d9f6 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -668,14 +668,10 @@ static HRESULT WINAPI TiffDecoder_GetFrameCount(IWICBitmapDecoder *iface, { TiffDecoder *This = impl_from_IWICBitmapDecoder(iface); - if (!This->tiff) - { - WARN("(%p) <-- WINCODEC_ERR_WRONGSTATE\n", iface); - return WINCODEC_ERR_WRONGSTATE; - } + if (!pCount) return E_INVALIDARG; EnterCriticalSection(&This->lock); - *pCount = pTIFFNumberOfDirectories(This->tiff); + *pCount = This->tiff ? pTIFFNumberOfDirectories(This->tiff) : 0; LeaveCriticalSection(&This->lock); TRACE("(%p) <-- %i\n", iface, *pCount);

1 0