August 2015 - Wine-Commits - list.winehq.org

Sebastian Lackner : vcomp: Also initialize dynamic_type in _vcomp_fork.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

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

Nikolay Sivov : dwrite: Implement GetColorPaletteCount().
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

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

Nikolay Sivov : dwrite: Implement CreateGlyphRunAnalysis() from IDWriteFactory2.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 14e4996f6c33adddc310185780fffd185bb59715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14e4996f6c33adddc31018578… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 6 19:42:48 2015 +0300 dwrite: Implement CreateGlyphRunAnalysis() from IDWriteFactory2. --- dlls/dwrite/dwrite_private.h | 3 ++- dlls/dwrite/font.c | 2 +- dlls/dwrite/main.c | 15 +++++++++------ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h index 4418c92..caa4177 100644 --- a/dlls/dwrite/dwrite_private.h +++ b/dlls/dwrite/dwrite_private.h @@ -129,7 +129,8 @@ extern HRESULT create_font_file(IDWriteFontFileLoader *loader, const void *refer extern HRESULT create_localfontfileloader(IDWriteLocalFontFileLoader** iface) DECLSPEC_HIDDEN; extern HRESULT create_fontface(DWRITE_FONT_FACE_TYPE,UINT32,IDWriteFontFile* const*,UINT32,DWRITE_FONT_SIMULATIONS,IDWriteFontFace2**) DECLSPEC_HIDDEN; extern HRESULT create_font_collection(IDWriteFactory2*,IDWriteFontFileEnumerator*,BOOL,IDWriteFontCollection**) DECLSPEC_HIDDEN; -extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; +extern HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE,DWRITE_MEASURING_MODE,DWRITE_GLYPH_RUN const*,FLOAT,DWRITE_GRID_FIT_MODE, + DWRITE_TEXT_ANTIALIAS_MODE,FLOAT,FLOAT,IDWriteGlyphRunAnalysis**) DECLSPEC_HIDDEN; extern BOOL is_system_collection(IDWriteFontCollection*) DECLSPEC_HIDDEN; extern HRESULT get_local_refkey(const WCHAR*,const FILETIME*,void**,UINT32*) DECLSPEC_HIDDEN; extern HRESULT get_filestream_from_file(IDWriteFontFile*,IDWriteFontFileStream**) DECLSPEC_HIDDEN; diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 56a3655..db02566 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -3218,7 +3218,7 @@ static const struct IDWriteGlyphRunAnalysisVtbl glyphrunanalysisvtbl = { }; HRESULT create_glyphrunanalysis(DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, DWRITE_GLYPH_RUN const *run, - FLOAT ppdip, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) + FLOAT ppdip, DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **ret) { struct dwrite_glyphrunanalysis *analysis; diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 5673bba..9f8756d 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -1079,7 +1079,8 @@ static HRESULT WINAPI dwritefactory_CreateGlyphRunAnalysis(IDWriteFactory2 *ifac TRACE("(%p)->(%p %.2f %p %d %d %.2f %.2f %p)\n", This, run, ppdip, transform, rendering_mode, measuring_mode, originX, originY, analysis); - return create_glyphrunanalysis(rendering_mode, measuring_mode, run, ppdip, originX, originY, analysis); + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, DWRITE_GRID_FIT_MODE_DEFAULT, + DWRITE_TEXT_ANTIALIAS_MODE_CLEARTYPE, originX, originY, analysis); } static HRESULT WINAPI dwritefactory1_GetEudcFontCollection(IDWriteFactory2 *iface, IDWriteFontCollection **collection, @@ -1155,14 +1156,16 @@ static HRESULT WINAPI dwritefactory2_CreateCustomRenderingParams(IDWriteFactory2 } static HRESULT WINAPI dwritefactory2_CreateGlyphRunAnalysis(IDWriteFactory2 *iface, const DWRITE_GLYPH_RUN *run, - const DWRITE_MATRIX *transform, DWRITE_RENDERING_MODE renderingMode, DWRITE_MEASURING_MODE measuringMode, - DWRITE_GRID_FIT_MODE gridFitMode, DWRITE_TEXT_ANTIALIAS_MODE antialiasMode, FLOAT originX, FLOAT originY, + const DWRITE_MATRIX *transform, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode, + DWRITE_GRID_FIT_MODE gridfit_mode, DWRITE_TEXT_ANTIALIAS_MODE aa_mode, FLOAT originX, FLOAT originY, IDWriteGlyphRunAnalysis **analysis) { struct dwritefactory *This = impl_from_IDWriteFactory2(iface); - FIXME("(%p)->(%p %p %d %d %d %d %.2f %.2f %p): stub\n", This, run, transform, renderingMode, measuringMode, - gridFitMode, antialiasMode, originX, originY, analysis); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %d %d %d %d %.2f %.2f %p)\n", This, run, transform, rendering_mode, measuring_mode, + gridfit_mode, aa_mode, originX, originY, analysis); + + return create_glyphrunanalysis(rendering_mode, measuring_mode, run, 1.0f, gridfit_mode, aa_mode, originX, originY, analysis); } static const struct IDWriteFactory2Vtbl dwritefactoryvtbl = {

1 0

Damjan Jovanovic : winex11: Only send WM_DROPFILES if there is no drop target.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

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

Sebastian Lackner : vcomp: Implement _vcomp_single_begin and _vcomp_single_end.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: ea188ea0541e6c2dcf035ed547cef37d5e018a45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea188ea0541e6c2dcf035ed54… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:21:36 2015 +0200 vcomp: Implement _vcomp_single_begin and _vcomp_single_end. --- dlls/vcomp/main.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1e69e31..1d9765f 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -67,6 +67,9 @@ struct vcomp_thread_data struct list entry; CONDITION_VARIABLE cond; + /* single */ + unsigned int single; + /* section */ unsigned int section; @@ -95,6 +98,9 @@ struct vcomp_team_data struct vcomp_task_data { + /* single */ + unsigned int single; + /* section */ unsigned int section; int num_sections; @@ -218,6 +224,7 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) ExitProcess(1); } + data->task.single = 0; data->task.section = 0; data->task.dynamic = 0; @@ -227,6 +234,7 @@ static struct vcomp_thread_data *vcomp_init_thread_data(void) thread_data->thread_num = 0; thread_data->parallel = FALSE; thread_data->fork_threads = 0; + thread_data->single = 1; thread_data->section = 1; thread_data->dynamic = 1; thread_data->dynamic_type = 0; @@ -503,13 +511,28 @@ void CDECL _vcomp_master_end(void) int CDECL _vcomp_single_begin(int flags) { - TRACE("(%x): stub\n", flags); - return TRUE; + struct vcomp_thread_data *thread_data = vcomp_init_thread_data(); + struct vcomp_task_data *task_data = thread_data->task; + int ret = FALSE; + + TRACE("(%x): semi-stub\n", flags); + + EnterCriticalSection(&vcomp_section); + thread_data->single++; + if ((int)(thread_data->single - task_data->single) > 0) + { + task_data->single = thread_data->single; + ret = TRUE; + } + LeaveCriticalSection(&vcomp_section); + + return ret; } void CDECL _vcomp_single_end(void) { - TRACE("stub\n"); + TRACE("()\n"); + /* nothing to do here */ } void CDECL _vcomp_sections_init(int n) @@ -859,6 +882,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) team_data.barrier = 0; team_data.barrier_count = 0; + task_data.single = 0; task_data.section = 0; task_data.dynamic = 0; @@ -867,6 +891,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) thread_data.thread_num = 0; thread_data.parallel = ifval || prev_thread_data->parallel; thread_data.fork_threads = 0; + thread_data.single = 1; thread_data.section = 1; thread_data.dynamic = 1; thread_data.dynamic_type = 0; @@ -887,6 +912,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->thread_num = team_data.num_threads++; data->parallel = thread_data.parallel; data->fork_threads = 0; + data->single = 1; data->section = 1; data->dynamic = 1; data->dynamic_type = 0; @@ -910,6 +936,7 @@ void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) data->thread_num = team_data.num_threads; data->parallel = thread_data.parallel; data->fork_threads = 0; + data->single = 1; data->section = 1; data->dynamic = 1; data->dynamic_type = 0;

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_enter_critsect and _vcomp_leave_critsect.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 7fd7bcf00e940a5d3e7ed2d24ba69a384997bf0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fd7bcf00e940a5d3e7ed2d24… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:23:18 2015 +0200 vcomp/tests: Add tests for _vcomp_enter_critsect and _vcomp_leave_critsect. --- dlls/vcomp/tests/vcomp.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index e5617d8..26b50a7 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -51,6 +51,7 @@ static void (CDECL *p_vcomp_atomic_sub_r4)(float *dest, float val); static void (CDECL *p_vcomp_atomic_sub_r8)(double *dest, double val); static void (CDECL *p_vcomp_atomic_xor_i4)(int *dest, int val); static void (CDECL *p_vcomp_barrier)(void); +static void (CDECL *p_vcomp_enter_critsect)(CRITICAL_SECTION **critsect); static void (CDECL *p_vcomp_for_dynamic_init)(unsigned int flags, unsigned int first, unsigned int last, int step, unsigned int chunksize); static int (CDECL *p_vcomp_for_dynamic_next)(unsigned int *begin, unsigned int *end); @@ -60,6 +61,7 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static void (CDECL *p_vcomp_leave_critsect)(CRITICAL_SECTION *critsect); static int (CDECL *p_vcomp_master_begin)(void); static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); @@ -226,12 +228,14 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_atomic_sub_r8); VCOMP_GET_PROC(_vcomp_atomic_xor_i4); VCOMP_GET_PROC(_vcomp_barrier); + VCOMP_GET_PROC(_vcomp_enter_critsect); VCOMP_GET_PROC(_vcomp_for_dynamic_init); VCOMP_GET_PROC(_vcomp_for_dynamic_next); VCOMP_GET_PROC(_vcomp_for_static_end); VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_leave_critsect); VCOMP_GET_PROC(_vcomp_master_begin); VCOMP_GET_PROC(_vcomp_master_end); VCOMP_GET_PROC(_vcomp_sections_init); @@ -1219,6 +1223,52 @@ static void test_vcomp_single_begin(void) pomp_set_num_threads(max_threads); } +static void CDECL critsect_cb(LONG *a) +{ + static CRITICAL_SECTION *critsect; + LONG tmp; + + p_vcomp_enter_critsect(&critsect); + tmp = *a; + Sleep(50); + *a = tmp + 1; + p_vcomp_leave_critsect(critsect); + + ok(critsect != NULL, "expected critsect != NULL\n"); + + EnterCriticalSection(critsect); + tmp = *a; + Sleep(50); + *a = tmp + 1; + LeaveCriticalSection(critsect); +} + +static void test_vcomp_enter_critsect(void) +{ + int max_threads = pomp_get_max_threads(); + LONG a; + int i; + + a = 0; + critsect_cb(&a); + ok(a == 2, "expected a == 2, got %d\n", a); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + + a = 0; + p_vcomp_fork(TRUE, 1, critsect_cb, &a); + ok(a == 2 * i, "expected a == %d, got %d\n", 2 * i, a); + + a = 0; + p_vcomp_fork(FALSE, 1, critsect_cb, &a); + ok(a == 2, "expected a == 2, got %d\n", a); + } + + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1337,6 +1387,7 @@ START_TEST(vcomp) test_vcomp_for_dynamic_init(); test_vcomp_master_begin(); test_vcomp_single_begin(); + test_vcomp_enter_critsect(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0

Henri Verbeet : wined3d: Introduce a separate function to resize swapchain buffers.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 2735947d763df9bb46bffde760be9446463da668 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2735947d763df9bb46bffde76… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Aug 7 10:01:33 2015 +0200 wined3d: Introduce a separate function to resize swapchain buffers. --- dlls/wined3d/device.c | 202 ++++++++++++----------------------------- dlls/wined3d/swapchain.c | 94 ++++++++++++++++++- dlls/wined3d/wined3d_private.h | 4 +- 3 files changed, 155 insertions(+), 145 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2735947d763df9bb46bff…

1 0

Sebastian Lackner : vcomp/tests: Add tests for _vcomp_master_begin and _vcomp_master_end.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

Module: wine Branch: master Commit: 0ff9a68af3fb1971253dc0c0af9508d82d5f5c90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ff9a68af3fb1971253dc0c0a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Aug 7 08:21:09 2015 +0200 vcomp/tests: Add tests for _vcomp_master_begin and _vcomp_master_end. --- dlls/vcomp/tests/vcomp.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index 5dbe166..99c98ef 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -60,6 +60,8 @@ static void (CDECL *p_vcomp_for_static_init)(int first, int last, int step, i static void (CDECL *p_vcomp_for_static_simple_init)(unsigned int first, unsigned int last, int step, BOOL increment, unsigned int *begin, unsigned int *end); static void (WINAPIV *p_vcomp_fork)(BOOL ifval, int nargs, void *wrapper, ...); +static int (CDECL *p_vcomp_master_begin)(void); +static void (CDECL *p_vcomp_master_end)(void); static void (CDECL *p_vcomp_sections_init)(int n); static int (CDECL *p_vcomp_sections_next)(void); static void (CDECL *p_vcomp_set_num_threads)(int num_threads); @@ -228,6 +230,8 @@ static BOOL init_vcomp(void) VCOMP_GET_PROC(_vcomp_for_static_init); VCOMP_GET_PROC(_vcomp_for_static_simple_init); VCOMP_GET_PROC(_vcomp_fork); + VCOMP_GET_PROC(_vcomp_master_begin); + VCOMP_GET_PROC(_vcomp_master_end); VCOMP_GET_PROC(_vcomp_sections_init); VCOMP_GET_PROC(_vcomp_sections_next); VCOMP_GET_PROC(_vcomp_set_num_threads); @@ -1122,6 +1126,48 @@ static void test_vcomp_for_dynamic_init(void) pomp_set_num_threads(max_threads); } +static void CDECL master_cb(HANDLE semaphore) +{ + int num_threads = pomp_get_num_threads(); + int thread_num = pomp_get_thread_num(); + + if (p_vcomp_master_begin()) + { + ok(thread_num == 0, "expected thread_num == 0, got %d\n", thread_num); + if (num_threads >= 2) + { + DWORD result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + } + p_vcomp_master_end(); + } + + if (thread_num == 1) + ReleaseSemaphore(semaphore, 1, NULL); +} + +static void test_vcomp_master_begin(void) +{ + int max_threads = pomp_get_max_threads(); + HANDLE semaphore; + int i; + + semaphore = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(semaphore != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + + master_cb(semaphore); + + for (i = 1; i <= 4; i++) + { + pomp_set_num_threads(i); + p_vcomp_fork(TRUE, 1, master_cb, semaphore); + p_vcomp_fork(FALSE, 1, master_cb, semaphore); + } + + CloseHandle(semaphore); + pomp_set_num_threads(max_threads); +} + static void test_atomic_integer32(void) { struct @@ -1238,6 +1284,7 @@ START_TEST(vcomp) test_vcomp_for_static_simple_init(); test_vcomp_for_static_init(); test_vcomp_for_dynamic_init(); + test_vcomp_master_begin(); test_atomic_integer32(); test_atomic_float(); test_atomic_double();

1 0

Nikolay Sivov : dwrite: Added IDWriteColorGlyphRunEnumerator stub.
by Alexandre Julliard Aug. 7, 2015

Aug. 7, 2015

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 Aug. 7, 2015

Aug. 7, 2015

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