wine-commits August 2015

wine-commits@winehq.org

2 participants
503 discussions

Sebastian Lackner : vcomp: Implement _vcomp_master_begin and _vcomp_master_end.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: bf4daa339563f2bce883e7210d54cea331f7867c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4daa339563f2bce883e7210… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:20:27 2015 +0200 vcomp: Implement _vcomp_master_begin and _vcomp_master_end. --- dlls/vcomp/main.c | 12 ++++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- dlls/vcomp100/vcomp100.spec | 4 ++-- dlls/vcomp110/vcomp110.spec | 4 ++-- dlls/vcomp90/vcomp90.spec | 4 ++-- 5 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 42b116b..1e69e31 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -489,6 +489,18 @@ void CDECL _vcomp_set_num_threads(int num_threads) vcomp_init_thread_data()->fork_threads = num_threads; } +int CDECL _vcomp_master_begin(void) +{ + TRACE("()\n"); + return !vcomp_init_thread_data()->thread_num; +} + +void CDECL _vcomp_master_end(void) +{ + TRACE("()\n"); + /* nothing to do here */ +} + int CDECL _vcomp_single_begin(int flags) { TRACE("(%x): stub\n", flags); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 6e2fcec..3167839 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() +@ cdecl _vcomp_master_end() @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp100/vcomp100.spec b/dlls/vcomp100/vcomp100.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp100/vcomp100.spec +++ b/dlls/vcomp100/vcomp100.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp110/vcomp110.spec b/dlls/vcomp110/vcomp110.spec index 5373420..ef8222f 100644 --- a/dlls/vcomp110/vcomp110.spec +++ b/dlls/vcomp110/vcomp110.spec @@ -69,8 +69,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end diff --git a/dlls/vcomp90/vcomp90.spec b/dlls/vcomp90/vcomp90.spec index a9a07e1..38578b9 100644 --- a/dlls/vcomp90/vcomp90.spec +++ b/dlls/vcomp90/vcomp90.spec @@ -68,8 +68,8 @@ @ stub _vcomp_get_thread_num @ stub _vcomp_leave_critsect @ stub _vcomp_master_barrier -@ stub _vcomp_master_begin -@ stub _vcomp_master_end +@ cdecl _vcomp_master_begin() vcomp._vcomp_master_begin +@ cdecl _vcomp_master_end() vcomp._vcomp_master_end @ stub _vcomp_ordered_begin @ stub _vcomp_ordered_end @ stub _vcomp_ordered_loop_end

1 0

Sebastian Lackner : vcomp: Also initialize dynamic_type in _vcomp_fork.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 2c8f5e09ed2b4514b3e1059a5319f2b309594c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c8f5e09ed2b4514b3e1059a5… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:20:11 2015 +0200 vcomp: Also initialize dynamic_type in _vcomp_fork. --- dlls/vcomp/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 748899d..42b116b 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -857,6 +857,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) thread_data.fork_threads = 0; thread_data.section = 1; thread_data.dynamic = 1; + thread_data.dynamic_type = 0; list_init(&thread_data.entry); InitializeConditionVariable(&thread_data.cond); @@ -876,6 +877,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->fork_threads = 0; data->section = 1; data->dynamic = 1; + data->dynamic_type = 0; list_remove(&data->entry); list_add_tail(&thread_data.entry, &data->entry); WakeAllConditionVariable(&data->cond); @@ -898,6 +900,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->fork_threads = 0; data->section = 1; data->dynamic = 1; + data->dynamic_type = 0; InitializeConditionVariable(&data->cond); thread = CreateThread(NULL, 0, _vcomp_fork_worker, data, 0, NULL);

1 0

Damjan Jovanovic : winex11: Use the correct drop effect for WM_DROPFILES.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 3f99e71fde8231524597901e512e5c1909a82e1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f99e71fde8231524597901e5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 7 04:21:27 2015 +0200 winex11: Use the correct drop effect for WM_DROPFILES. Tests show that on Windows, for a window to indicate it will accept a file drop or to actually accept it, it must have WS_EX_ACCEPTFILES in its style, contain DROPEFFECT_COPY (which will be chosen if offered among several drop effects), and be offered the HDROP format. --- dlls/winex11.drv/xdnd.c | 67 +++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 9944dab..72758a0 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -74,7 +74,8 @@ static HWND XDNDLastDropTargetWnd; static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents); static void X11DRV_XDND_ResolveProperty(Display *display, Window xwin, Time tm, Atom *types, unsigned long count); -static void X11DRV_XDND_SendDropFiles(HWND hwnd); +static BOOL X11DRV_XDND_HasHDROP(void); +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd); static void X11DRV_XDND_FreeDragDropOp(void); static CRITICAL_SECTION xdnd_cs; @@ -338,8 +339,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) + else if (dropTarget == NULL && + (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { accept = 1; + effect = DROPEFFECT_COPY; + XDNDDropEffect = effect; + } TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n", event->data.l[4], accept, XDNDxy.x, XDNDxy.y); @@ -407,8 +415,17 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if there is no drop target. Doing both * causes winamp to duplicate the dropped files (#29081) */ - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) - X11DRV_XDND_SendDropFiles( hWnd ); + if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && + (effect & DROPEFFECT_COPY) && + X11DRV_XDND_HasHDROP()) + { + HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + if (SUCCEEDED(hr)) + { + accept = 1; + effect = DROPEFFECT_COPY; + } + } } X11DRV_XDND_FreeDragDropOp(); @@ -552,9 +569,9 @@ static void X11DRV_XDND_InsertXDNDData(int property, int format, HANDLE contents /************************************************************************** - * X11DRV_XDND_SendDropFiles + * X11DRV_XDND_HasHDROP */ -static void X11DRV_XDND_SendDropFiles(HWND hwnd) +static BOOL X11DRV_XDND_HasHDROP(void) { LPXDNDDATA current = NULL; BOOL found = FALSE; @@ -571,10 +588,33 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) } } + LeaveCriticalSection(&xdnd_cs); + + return found; +} + +/************************************************************************** + * X11DRV_XDND_SendDropFiles + */ +static HRESULT X11DRV_XDND_SendDropFiles(HWND hwnd) +{ + HRESULT hr; + LPXDNDDATA current = NULL; + BOOL found = FALSE; + + EnterCriticalSection(&xdnd_cs); + + LIST_FOR_EACH_ENTRY(current, &xdndData, XDNDDATA, entry) + { + if (current->cf_win == CF_HDROP) + { + found = TRUE; + break; + } + } if (found) { HGLOBAL dropHandle = GlobalAlloc(GMEM_FIXED, GlobalSize(current->contents)); - if (dropHandle) { DROPFILES *lpDrop = GlobalLock(dropHandle); @@ -587,12 +627,23 @@ static void X11DRV_XDND_SendDropFiles(HWND hwnd) lpDrop->fNC, lpDrop->pt.x, lpDrop->pt.y, ((char*)lpDrop) + lpDrop->pFiles, debugstr_w((WCHAR*)(((char*)lpDrop) + lpDrop->pFiles))); GlobalUnlock(dropHandle); - if (!PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + if (PostMessageW(hwnd, WM_DROPFILES, (WPARAM)dropHandle, 0)) + hr = S_OK; + else + { + hr = HRESULT_FROM_WIN32(GetLastError()); GlobalFree(dropHandle); + } } + else + hr = HRESULT_FROM_WIN32(GetLastError()); } + else + hr = E_FAIL; LeaveCriticalSection(&xdnd_cs); + + return hr; }

1 0

Damjan Jovanovic : winex11: Only send WM_DROPFILES if there is no drop target.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: b78a9f1aa14d2d43ee7e62f617a3c7bdf576dd4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b78a9f1aa14d2d43ee7e62f61… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Fri Aug 7 04:17:40 2015 +0200 winex11: Only send WM_DROPFILES if there is no drop target. Windows doesn't send WM_DROPFILES to a window if a drop target is registered on that window. Some apps that support both even duplicate dropped files if we send it and a drop target is registered. --- dlls/winex11.drv/xdnd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index f6ce5e9..9944dab 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -378,10 +378,6 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) TRACE("\n"); - /* If we have a HDROP type we send a WM_ACCEPTFILES.*/ - if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) - X11DRV_XDND_SendDropFiles( hWnd ); - /* Notify OLE of Drop */ dropTarget = get_droptarget_pointer(XDNDLastDropTargetWnd); if (dropTarget) @@ -407,6 +403,13 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) WARN("drop failed, error 0x%08X\n", hr); IDropTarget_Release(dropTarget); } + else + { + /* Only send WM_DROPFILES if there is no drop target. Doing both + * causes winamp to duplicate the dropped files (#29081) */ + if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) + X11DRV_XDND_SendDropFiles( hWnd ); + } X11DRV_XDND_FreeDragDropOp();

1 0

Nikolay Sivov : dwrite: Fix IsColorFont() return type for IDWriteFont2.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: e1f353663acd5fe32b2292ae3cb3bd86a8d92f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1f353663acd5fe32b2292ae3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:45:14 2015 +0300 dwrite: Fix IsColorFont() return type for IDWriteFont2. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1f4e565..93aae86 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1405,7 +1405,7 @@ static BOOL WINAPI dwritefont1_IsMonospacedFont(IDWriteFont2 *iface) return IDWriteFontFace2_IsMonospacedFont(fontface); } -static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) +static BOOL WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) { struct dwrite_font *This = impl_from_IDWriteFont2(iface); IDWriteFontFace2 *fontface; @@ -1415,7 +1415,7 @@ static HRESULT WINAPI dwritefont2_IsColorFont(IDWriteFont2 *iface) hr = get_fontface_from_font(This, &fontface); if (FAILED(hr)) - return hr; + return FALSE; return IDWriteFontFace2_IsColorFont(fontface); }

1 0

Nikolay Sivov : dwrite: Added IDWriteColorGlyphRunEnumerator stub.
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 93d24de308471d665d95b38b7b79ffb2125b4908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93d24de308471d665d95b38b7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:44:53 2015 +0300 dwrite: Added IDWriteColorGlyphRunEnumerator stub. --- dlls/dwrite/dwrite_private.h | 2 + dlls/dwrite/font.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dwrite/main.c | 8 ++-- 3 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 48078d9..1b7bd3a 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -136,6 +136,8 @@ extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DEC extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; extern BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE) DECLSPEC_HIDDEN; extern HRESULT get_family_names_from_stream(IDWriteFontFileStream*,UINT32,DWRITE_FONT_FACE_TYPE,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; +extern HRESULT create_colorglyphenum(FLOAT,FLOAT,const DWRITE_GLYPH_RUN*,const DWRITE_GLYPH_RUN_DESCRIPTION*,DWRITE_MEASURING_MODE, + const DWRITE_MATRIX*,UINT32,IDWriteColorGlyphRunEnumerator**) DECLSPEC_HIDDEN; /* Opentype font table functions */ struct dwrite_font_props { diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 80a209f..1f4e565 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -131,6 +131,11 @@ struct dwrite_glyphrunanalysis { BYTE *bitmap; }; +struct dwrite_colorglyphenum { + IDWriteColorGlyphRunEnumerator IDWriteColorGlyphRunEnumerator_iface; + LONG ref; +}; + #define GLYPH_BLOCK_SHIFT 8 #define GLYPH_BLOCK_SIZE (1UL << GLYPH_BLOCK_SHIFT) #define GLYPH_BLOCK_MASK (GLYPH_BLOCK_SIZE - 1) @@ -199,6 +204,11 @@ static inline struct dwrite_glyphrunanalysis *impl_from_IDWriteGlyphRunAnalysis( return CONTAINING_RECORD(iface, struct dwrite_glyphrunanalysis, IDWriteGlyphRunAnalysis_iface); } +static inline struct dwrite_colorglyphenum *impl_from_IDWriteColorGlyphRunEnumerator(IDWriteColorGlyphRunEnumerator *iface) +{ + return CONTAINING_RECORD(iface, struct dwrite_colorglyphenum, IDWriteColorGlyphRunEnumerator_iface); +} + static inline const char *debugstr_tag(UINT32 tag) { return wine_dbg_sprintf("%c%c%c%c", tag >> 24, (tag >> 16) & 0xff, (tag >> 8) & 0xff, tag & 0xff); @@ -3321,3 +3331,82 @@ HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEA *ret = &analysis->IDWriteGlyphRunAnalysis_iface; return S_OK; } + +/* IDWriteColorGlyphRunEnumerator */ +static HRESULT WINAPI colorglyphenum_QueryInterface(IDWriteColorGlyphRunEnumerator *iface, REFIID riid, void **ppv) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); + + if (IsEqualIID(riid, &IID_IDWriteColorGlyphRunEnumerator) || + IsEqualIID(riid, &IID_IUnknown)) + { + *ppv = iface; + IDWriteColorGlyphRunEnumerator_AddRef(iface); + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI colorglyphenum_AddRef(IDWriteColorGlyphRunEnumerator *iface) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + ULONG ref = InterlockedIncrement(&This->ref); + TRACE("(%p)->(%u)\n", This, ref); + return ref; +} + +static ULONG WINAPI colorglyphenum_Release(IDWriteColorGlyphRunEnumerator *iface) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(%u)\n", This, ref); + + if (!ref) + heap_free(This); + + return ref; +} + +static HRESULT WINAPI colorglyphenum_MoveNext(IDWriteColorGlyphRunEnumerator *iface, BOOL *has_run) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + FIXME("(%p)->(%p): stub\n", This, has_run); + return E_NOTIMPL; +} + +static HRESULT WINAPI colorglyphenum_GetCurrentRun(IDWriteColorGlyphRunEnumerator *iface, DWRITE_COLOR_GLYPH_RUN const **run) +{ + struct dwrite_colorglyphenum *This = impl_from_IDWriteColorGlyphRunEnumerator(iface); + FIXME("(%p)->(%p): stub\n", This, run); + return E_NOTIMPL; +} + +static const IDWriteColorGlyphRunEnumeratorVtbl colorglyphenumvtbl = { + colorglyphenum_QueryInterface, + colorglyphenum_AddRef, + colorglyphenum_Release, + colorglyphenum_MoveNext, + colorglyphenum_GetCurrentRun +}; + +HRESULT create_colorglyphenum(FLOAT originX, FLOAT originY, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, + DWRITE_MEASURING_MODE mode, const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **ret) +{ + struct dwrite_colorglyphenum *colorglyphenum; + + *ret = NULL; + colorglyphenum = heap_alloc(sizeof(*colorglyphenum)); + if (!colorglyphenum) + return E_OUTOFMEMORY; + + colorglyphenum->IDWriteColorGlyphRunEnumerator_iface.lpVtbl = &colorglyphenumvtbl; + colorglyphenum->ref = 1; + + *ret = &colorglyphenum->IDWriteColorGlyphRunEnumerator_iface; + return S_OK; +} diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 9f8756d..01a4012 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1137,12 +1137,12 @@ static HRESULT WINAPI dwritefactory2_CreateFontFallbackBuilder(IDWriteFactory2 * static HRESULT WINAPI dwritefactory2_TranslateColorGlyphRun(IDWriteFactory2 *iface, FLOAT originX, FLOAT originY, const DWRITE_GLYPH_RUN *run, const DWRITE_GLYPH_RUN_DESCRIPTION *rundescr, DWRITE_MEASURING_MODE mode, - const DWRITE_MATRIX *transform, UINT32 palette_index, IDWriteColorGlyphRunEnumerator **colorlayers) + const DWRITE_MATRIX *transform, UINT32 palette, IDWriteColorGlyphRunEnumerator **colorlayers) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%.2f %.2f %p %p %d %p %u %p): stub\n", This, originX, originY, run, rundescr, mode, - transform, palette_index, colorlayers); - return E_NOTIMPL; + TRACE("(%p)->(%.2f %.2f %p %p %d %p %u %p)\n", This, originX, originY, run, rundescr, mode, + transform, palette, colorlayers); + return create_colorglyphenum(originX, originY, run, rundescr, mode, transform, palette, colorlayers); } static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory2 *iface, FLOAT gamma, FLOAT contrast,

1 0

Nikolay Sivov : dwrite: Implement GetPaletteEntries().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: fd35a1af6acc78e36c270a2395ec381a73065d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd35a1af6acc78e36c270a239… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:44:27 2015 +0300 dwrite: Implement GetPaletteEntries(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/opentype.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/dwrite/tests/font.c | 6 ------ 4 files changed, 41 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index a849406..48078d9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -155,6 +155,7 @@ extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32, extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; +extern HRESULT opentype_get_cpal_entries(const void*,UINT32,UINT32,UINT32,DWRITE_COLOR_F*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 266f7ef..80a209f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -972,8 +972,8 @@ static HRESULT WINAPI dwritefontface2_GetPaletteEntries(IDWriteFontFace2 *iface, UINT32 first_entry_index, UINT32 entry_count, DWRITE_COLOR_F *entries) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p)->(%u %u %u %p): stub\n", This, palette_index, first_entry_index, entry_count, entries); - return E_NOTIMPL; + TRACE("(%p)->(%u %u %u %p)\n", This, palette_index, first_entry_index, entry_count, entries); + return opentype_get_cpal_entries(get_fontface_cpal(This), palette_index, first_entry_index, entry_count, entries); } static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFace2 *iface, FLOAT emSize, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 7be9df3..f8c66fc 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -687,6 +687,14 @@ struct CPAL_SubHeader_1 ULONG offsetPaletteEntryLabelArray; }; +struct CPAL_ColorRecord +{ + BYTE blue; + BYTE green; + BYTE red; + BYTE alpha; +}; + BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || @@ -1434,3 +1442,33 @@ UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; return header ? GET_BE_WORD(header->numPaletteEntries) : 0; } + +HRESULT opentype_get_cpal_entries(const void *cpal, UINT32 palette, UINT32 first_entry_index, UINT32 entry_count, + DWRITE_COLOR_F *entries) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + const struct CPAL_ColorRecord *records; + UINT32 palettecount, entrycount, i; + + if (!header) return DWRITE_E_NOCOLOR; + + palettecount = GET_BE_WORD(header->numPalette); + if (palette >= palettecount) + return DWRITE_E_NOCOLOR; + + entrycount = GET_BE_WORD(header->numPaletteEntries); + if (first_entry_index + entry_count > entrycount) + return E_INVALIDARG; + + records = (const struct CPAL_ColorRecord*)((BYTE*)cpal + GET_BE_DWORD(header->offsetFirstColorRecord)); + first_entry_index += GET_BE_WORD(header->colorRecordIndices[palette]); + + for (i = 0; i < entry_count; i++) { + entries[i].r = records[first_entry_index + i].red / 255.0f; + entries[i].g = records[first_entry_index + i].green / 255.0f; + entries[i].b = records[first_entry_index + i].blue / 255.0f; + entries[i].a = records[first_entry_index + i].alpha / 255.0f; + } + + return S_OK; +} diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 6c5cb82..0664a9a 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -4792,7 +4792,6 @@ static void test_GetPaletteEntries(void) } hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 1, &color); -todo_wine ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); IDWriteFontFace2_Release(fontface2); @@ -4827,7 +4826,6 @@ todo_wine /* invalid palette index */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, palettecount, 0, 1, &color); -todo_wine ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); @@ -4835,23 +4833,19 @@ todo_wine /* invalid entry index */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount, 1, &color); -todo_wine ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount - 1, 1, &color); -todo_wine { ok(hr == S_OK, "got 0x%08x\n", hr); ok(color.r != 123.0 && color.g != 123.0 && color.b != 123.0 && color.a != 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); -} /* zero return length */ color.r = color.g = color.b = color.a = 123.0; hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 0, &color); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a);

1 0

Nikolay Sivov : dwrite/tests: Basic test for GetPaletteEntries().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 4df29eb02f9c29df09539ab0613c58bd28089c19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4df29eb02f9c29df09539ab06… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:58 2015 +0300 dwrite/tests: Basic test for GetPaletteEntries(). --- dlls/dwrite/tests/font.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 9a75abc..6c5cb82 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -39,6 +39,7 @@ #define MS_CMAP_TAG MS_MAKE_TAG('c','m','a','p') #define MS_VDMX_TAG MS_MAKE_TAG('V','D','M','X') #define MS_GASP_TAG MS_MAKE_TAG('g','a','s','p') +#define MS_CPAL_TAG MS_MAKE_TAG('C','P','A','L') #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) @@ -4754,6 +4755,111 @@ static void test_IsSymbolFont(void) IDWriteFactory_Release(factory); } +struct CPAL_Header_0 +{ + USHORT version; + USHORT numPaletteEntries; + USHORT numPalette; + USHORT numColorRecords; + ULONG offsetFirstColorRecord; + USHORT colorRecordIndices[1]; +}; + +static void test_GetPaletteEntries(void) +{ + static const WCHAR emojiW[] = {'S','e','g','o','e',' ','U','I',' ','E','m','o','j','i',0}; + IDWriteFontFace2 *fontface2; + IDWriteFontFace *fontface; + IDWriteFactory *factory; + IDWriteFont *font; + DWRITE_COLOR_F color; + UINT32 palettecount, entrycount, size, colorrecords; + void *ctxt; + const struct CPAL_Header_0 *cpal_header; + HRESULT hr; + BOOL exists; + + factory = create_factory(); + + /* Tahoma, no color support */ + fontface = create_fontface(factory); + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + if (hr != S_OK) { + IDWriteFactory_Release(factory); + win_skip("GetPaletteEntries() is not supported.\n"); + return; + } + + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + IDWriteFontFace2_Release(fontface2); + + /* Segoe UI Emoji, with color support */ + font = get_font(factory, emojiW, DWRITE_FONT_STYLE_NORMAL); + if (!font) { + IDWriteFactory_Release(factory); + skip("Segoe UI Emoji font not found.\n"); + return; + } + + hr = IDWriteFont_CreateFontFace(font, &fontface); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFont_Release(font); + + hr = IDWriteFontFace_QueryInterface(fontface, &IID_IDWriteFontFace2, (void**)&fontface2); + IDWriteFontFace_Release(fontface); + + palettecount = IDWriteFontFace2_GetColorPaletteCount(fontface2); + ok(palettecount >= 1, "got %u\n", palettecount); + + entrycount = IDWriteFontFace2_GetPaletteEntryCount(fontface2); + ok(entrycount >= 1, "got %u\n", entrycount); + + exists = FALSE; + hr = IDWriteFontFace2_TryGetFontTable(fontface2, MS_CPAL_TAG, (const void**)&cpal_header, &size, &ctxt, &exists); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(exists, "got %d\n", exists); + colorrecords = GET_BE_WORD(cpal_header->numColorRecords); + ok(colorrecords >= 1, "got %u\n", colorrecords); + + /* invalid palette index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, palettecount, 0, 1, &color); +todo_wine + ok(hr == DWRITE_E_NOCOLOR, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + /* invalid entry index */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount, 1, &color); +todo_wine + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, entrycount - 1, 1, &color); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r != 123.0 && color.g != 123.0 && color.b != 123.0 && color.a != 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); +} + + /* zero return length */ + color.r = color.g = color.b = color.a = 123.0; + hr = IDWriteFontFace2_GetPaletteEntries(fontface2, 0, 0, 0, &color); +todo_wine + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(color.r == 123.0 && color.g == 123.0 && color.b == 123.0 && color.a == 123.0, + "got wrong color %.2fx%.2fx%.2fx%.2f\n", color.r, color.g, color.b, color.a); + + IDWriteFontFace2_Release(fontface2); + IDWriteFactory_Release(factory); +} + START_TEST(font) { IDWriteFactory *factory; @@ -4804,6 +4910,7 @@ START_TEST(font) test_GetAlphaBlendParams(); test_CreateAlphaTexture(); test_IsSymbolFont(); + test_GetPaletteEntries(); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Implement GetPaletteEntryCount().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 5734c2ed9825c61d5a5299a17e7fd922ee86132a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5734c2ed9825c61d5a5299a17… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:41 2015 +0300 dwrite: Implement GetPaletteEntryCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 4 ++-- dlls/dwrite/opentype.c | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 7668bc9..a849406 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -154,6 +154,7 @@ extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONA extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_cpal_paletteentrycount(const void*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 1ee97fa..266f7ef 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -964,8 +964,8 @@ static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *ifac static UINT32 WINAPI dwritefontface2_GetPaletteEntryCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return opentype_get_cpal_paletteentrycount(get_fontface_cpal(This)); } static HRESULT WINAPI dwritefontface2_GetPaletteEntries(IDWriteFontFace2 *iface, UINT32 palette_index, diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 389183f..7be9df3 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -1428,3 +1428,9 @@ UINT32 opentype_get_cpal_palettecount(const void *cpal) const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; return header ? GET_BE_WORD(header->numPalette) : 0; } + +UINT32 opentype_get_cpal_paletteentrycount(const void *cpal) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + return header ? GET_BE_WORD(header->numPaletteEntries) : 0; +}

1 0

Nikolay Sivov : dwrite: Implement GetColorPaletteCount().
by Alexandre Julliard 07 Aug '15

07 Aug '15

Module: wine Branch: master Commit: 20571725f370460a2ba000d1ab9a232e84607f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=20571725f370460a2ba000d1a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:43:23 2015 +0300 dwrite: Implement GetColorPaletteCount(). --- dlls/dwrite/dwrite_private.h | 1 + dlls/dwrite/font.c | 15 +++++++++++++-- dlls/dwrite/opentype.c | 25 +++++++++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index caa4177..7668bc9 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -153,6 +153,7 @@ extern void opentype_get_font_metrics(IDWriteFontFileStream*,DWRITE_FONT_FACE_TY extern HRESULT opentype_get_font_strings_from_id(const void*,DWRITE_INFORMATIONAL_STRING_ID,IDWriteLocalizedStrings**) DECLSPEC_HIDDEN; extern HRESULT opentype_get_typographic_features(IDWriteFontFace*,UINT32,UINT32,UINT32,UINT32*,DWRITE_FONT_FEATURE_TAG*) DECLSPEC_HIDDEN; extern BOOL opentype_get_vdmx_size(const void*,INT,UINT16*,UINT16*) DECLSPEC_HIDDEN; +extern UINT32 opentype_get_cpal_palettecount(const void*) DECLSPEC_HIDDEN; enum gasp_flags { GASP_GRIDFIT = 0x0001, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index db02566..1ee97fa 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); #define MS_NAME_TAG DWRITE_MAKE_OPENTYPE_TAG('n','a','m','e') #define MS_VDMX_TAG DWRITE_MAKE_OPENTYPE_TAG('V','D','M','X') #define MS_GASP_TAG DWRITE_MAKE_OPENTYPE_TAG('g','a','s','p') +#define MS_CPAL_TAG DWRITE_MAKE_OPENTYPE_TAG('C','P','A','L') static const IID IID_issystemcollection = {0x14d88047,0x331f,0x4cd3,{0xbc,0xa8,0x3e,0x67,0x99,0xaf,0x34,0x75}}; @@ -154,6 +155,7 @@ struct dwrite_fontface { struct dwrite_fonttable cmap; struct dwrite_fonttable vdmx; struct dwrite_fonttable gasp; + struct dwrite_fonttable cpal; DWRITE_GLYPH_METRICS *glyphs[GLYPH_MAX/GLYPH_BLOCK_SIZE]; }; @@ -262,6 +264,11 @@ static inline void* get_fontface_gasp(struct dwrite_fontface *fontface, UINT32 * return ptr; } +static inline void* get_fontface_cpal(struct dwrite_fontface *fontface) +{ + return get_fontface_table(fontface, MS_CPAL_TAG, &fontface->cpal); +} + static void release_font_data(struct dwrite_font_data *data) { int i; @@ -338,6 +345,8 @@ static ULONG WINAPI dwritefontface_Release(IDWriteFontFace2 *iface) IDWriteFontFace2_ReleaseFontTable(iface, This->vdmx.context); if (This->gasp.context) IDWriteFontFace2_ReleaseFontTable(iface, This->gasp.context); + if (This->cpal.context) + IDWriteFontFace2_ReleaseFontTable(iface, This->cpal.context); for (i = 0; i < This->file_count; i++) { if (This->streams[i]) IDWriteFontFileStream_Release(This->streams[i]); @@ -948,8 +957,8 @@ static BOOL WINAPI dwritefontface2_IsColorFont(IDWriteFontFace2 *iface) static UINT32 WINAPI dwritefontface2_GetColorPaletteCount(IDWriteFontFace2 *iface) { struct dwrite_fontface *This = impl_from_IDWriteFontFace2(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return opentype_get_cpal_palettecount(get_fontface_cpal(This)); } static UINT32 WINAPI dwritefontface2_GetPaletteEntryCount(IDWriteFontFace2 *iface) @@ -2476,9 +2485,11 @@ HRESULT create_fontface(DWRITE_FONT_FACE_TYPE facetype, UINT32 files_number, IDW memset(&fontface->cmap, 0, sizeof(fontface->cmap)); memset(&fontface->vdmx, 0, sizeof(fontface->vdmx)); memset(&fontface->gasp, 0, sizeof(fontface->gasp)); + memset(&fontface->cpal, 0, sizeof(fontface->cpal)); fontface->cmap.exists = TRUE; fontface->vdmx.exists = TRUE; fontface->gasp.exists = TRUE; + fontface->cpal.exists = TRUE; fontface->index = index; fontface->simulations = simulations; memset(fontface->glyphs, 0, sizeof(fontface->glyphs)); diff --git a/dlls/dwrite/opentype.c b/dlls/dwrite/opentype.c index 3cb8afb..389183f 100644 --- a/dlls/dwrite/opentype.c +++ b/dlls/dwrite/opentype.c @@ -668,6 +668,25 @@ static const UINT16 dwriteid_to_opentypeid[DWRITE_INFORMATIONAL_STRING_POSTSCRIP OPENTYPE_STRING_POSTSCRIPT_CID_NAME }; +/* CPAL table */ +struct CPAL_Header_0 +{ + USHORT version; + USHORT numPaletteEntries; + USHORT numPalette; + USHORT numColorRecords; + ULONG offsetFirstColorRecord; + USHORT colorRecordIndices[1]; +}; + +/* for version == 1, this comes after full CPAL_Header_0 */ +struct CPAL_SubHeader_1 +{ + ULONG offsetPaletteTypeArray; + ULONG offsetPaletteLabelArray; + ULONG offsetPaletteEntryLabelArray; +}; + BOOL is_face_type_supported(DWRITE_FONT_FACE_TYPE type) { return (type == DWRITE_FONT_FACE_TYPE_CFF) || @@ -1403,3 +1422,9 @@ WORD opentype_get_gasp_flags(const WORD *ptr, UINT32 size, INT emsize) done: return flags; } + +UINT32 opentype_get_cpal_palettecount(const void *cpal) +{ + const struct CPAL_Header_0 *header = (const struct CPAL_Header_0*)cpal; + return header ? GET_BE_WORD(header->numPalette) : 0; +}

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2015