October 2012 - Wine-Commits

Huw Davies : gdi32: Simplify the code for charmap selection.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 8ef70039d366bf45900c7e7999767be2ccf9704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ef70039d366bf45900c7e799… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 26 14:04:04 2012 +0100 gdi32: Simplify the code for charmap selection. --- dlls/gdi32/freetype.c | 26 ++++++++++++++++---------- 1 files changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 81ba8a3..c62070f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4408,6 +4408,21 @@ static BOOL freetype_DeleteDC( PHYSDEV dev ) return TRUE; } +static FT_Encoding pick_charmap( FT_Face face, int charset ) +{ + static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + static const FT_Encoding symbol_order[] = { FT_ENCODING_MS_SYMBOL, FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + const FT_Encoding *encs = regular_order; + + if (charset == SYMBOL_CHARSET) encs = symbol_order; + + while (*encs != 0) + { + if (select_charmap( face, *encs )) break; + encs++; + } + return *encs; +} /************************************************************* * freetype_SelectFont @@ -4824,16 +4839,7 @@ found_face: ret->ntmFlags = face->ntmFlags; - if (ret->charset == SYMBOL_CHARSET && - select_charmap(ret->ft_face, FT_ENCODING_MS_SYMBOL)) { - /* No ops */ - } - else if (select_charmap(ret->ft_face, FT_ENCODING_UNICODE)) { - /* No ops */ - } - else { - select_charmap(ret->ft_face, FT_ENCODING_APPLE_ROMAN); - } + pick_charmap( ret->ft_face, ret->charset ); ret->orientation = FT_IS_SCALABLE(ret->ft_face) ? lf.lfOrientation : 0; ret->name = psub ? strdupW(psub->from.name) : strdupW(family->FamilyName);

1 0

Frédéric Delanoy : cmd: Get rid of longer needed 'end' parameter in WCMD_parameter.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: cee1652e61c4f3fd9a276954557245fd78365c9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee1652e61c4f3fd9a2769545… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:47:59 2012 +0200 cmd: Get rid of longer needed 'end' parameter in WCMD_parameter. --- programs/cmd/batch.c | 23 +++++++----------- programs/cmd/builtins.c | 59 +++++++++++++++++++++++---------------------- programs/cmd/directory.c | 2 +- programs/cmd/wcmd.h | 4 +- programs/cmd/wcmdmain.c | 20 +++++++------- 5 files changed, 52 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cee1652e61c4f3fd9a276…

1 0

Frédéric Delanoy : cmd: Add support for EQU comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 14cd4151a93e0656b2caeae6e095b61cbb99bff1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14cd4151a93e0656b2caeae6e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:04 2012 +0200 cmd: Add support for EQU comparison operator in if statements. --- programs/cmd/builtins.c | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.exp | 28 ++++++++++++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3505817..3a8dfba 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2357,6 +2357,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato BOOL int_operands; static const WCHAR lssW[] = {'l','s','s','\0'}; static const WCHAR leqW[] = {'l','e','q','\0'}; + static const WCHAR equW[] = {'e','q','u','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2385,6 +2386,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) <= 0; } + if (!lstrcmpiW(operator, equW)) { + if (int_operands) + return leftOperand_int == rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) == 0 + : lstrcmpW (leftOperand, rightOperand) == 0; + } + return -1; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index ec85db6..009473e 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -481,12 +481,12 @@ a LEQ B(a)or_broken@NT4 a LEQ B insensitive A LEQ b A LEQ b insensitive -(a)todo_wine@A EQU A -(a)todo_wine@B EQU B -(a)todo_wine@AB EQU AB -(a)todo_wine@BA EQU BA -(a)todo_wine@AA EQU AA -(a)todo_wine@A EQU a insensitive +A EQU A +B EQU B +AB EQU AB +BA EQU BA +AA EQU AA +A EQU a insensitive @todo_wine(a)B NEQ A @todo_wine(a)AB NEQ A @todo_wine(a)BA NEQ A @@ -556,14 +556,14 @@ also in negative form 0 LEQ 9 1 LEQ 9 9 LEQ 9 -(a)todo_wine@0 EQU 0 -(a)todo_wine@1 EQU 1 -(a)todo_wine@10 EQU 10 -(a)todo_wine@9 EQU 9 -(a)todo_wine@octal ok -(a)todo_wine@hexa ok -(a)todo_wine@string/hexa compare ok -(a)todo_wine@string/hexa compare ok +0 EQU 0 +1 EQU 1 +10 EQU 10 +9 EQU 9 +octal ok +hexa ok +string/hexa compare ok +string/hexa compare ok @todo_wine(a)1 NEQ 0 @todo_wine(a)10 NEQ 0 @todo_wine(a)9 NEQ 0

1 0

Frédéric Delanoy : cmd: Add support for NEQ comparison operator in if statements.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 80f8d49b07e493a6753518ff5b07ab475fc4b0d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80f8d49b07e493a6753518ff5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:05 2012 +0200 cmd: Add support for NEQ comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++ programs/cmd/tests/test_builtins.cmd.exp | 64 +++++++++++++++--------------- 2 files changed, 41 insertions(+), 32 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 3a8dfba..e15c7c8 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2358,6 +2358,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR lssW[] = {'l','s','s','\0'}; static const WCHAR leqW[] = {'l','e','q','\0'}; static const WCHAR equW[] = {'e','q','u','\0'}; + static const WCHAR neqW[] = {'n','e','q','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2394,6 +2395,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) == 0; } + if (!lstrcmpiW(operator, neqW)) { + if (int_operands) + return leftOperand_int != rightOperand_int; + else + return caseInsensitive ? lstrcmpiW(leftOperand, rightOperand) != 0 + : lstrcmpW (leftOperand, rightOperand) != 0; + } + return -1; } diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 009473e..9adc016 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -487,26 +487,26 @@ AB EQU AB BA EQU BA AA EQU AA A EQU a insensitive -(a)todo_wine@B NEQ A -(a)todo_wine@AB NEQ A -(a)todo_wine@BA NEQ A -(a)todo_wine@AA NEQ A -(a)todo_wine@A NEQ B -(a)todo_wine@AB NEQ B -(a)todo_wine@BA NEQ B -(a)todo_wine@AA NEQ B -(a)todo_wine@A NEQ AB -(a)todo_wine@B NEQ AB -(a)todo_wine@BA NEQ AB -(a)todo_wine@AA NEQ AB -(a)todo_wine@A NEQ BA -(a)todo_wine@B NEQ BA -(a)todo_wine@AB NEQ BA -(a)todo_wine@AA NEQ BA -(a)todo_wine@A NEQ AA -(a)todo_wine@B NEQ AA -(a)todo_wine@AB NEQ AA -(a)todo_wine@BA NEQ AA +B NEQ A +AB NEQ A +BA NEQ A +AA NEQ A +A NEQ B +AB NEQ B +BA NEQ B +AA NEQ B +A NEQ AB +B NEQ AB +BA NEQ AB +AA NEQ AB +A NEQ BA +B NEQ BA +AB NEQ BA +AA NEQ BA +A NEQ AA +B NEQ AA +AB NEQ AA +BA NEQ AA @todo_wine(a)A GEQ A @todo_wine(a)B GEQ A @todo_wine(a)AB GEQ A @@ -564,18 +564,18 @@ octal ok hexa ok string/hexa compare ok string/hexa compare ok -(a)todo_wine@1 NEQ 0 -(a)todo_wine@10 NEQ 0 -(a)todo_wine@9 NEQ 0 -(a)todo_wine@0 NEQ 1 -(a)todo_wine@10 NEQ 1 -(a)todo_wine@9 NEQ 1 -(a)todo_wine@0 NEQ 10 -(a)todo_wine@1 NEQ 10 -(a)todo_wine@9 NEQ 10 -(a)todo_wine@0 NEQ 9 -(a)todo_wine@1 NEQ 9 -(a)todo_wine@10 NEQ 9 +1 NEQ 0 +10 NEQ 0 +9 NEQ 0 +0 NEQ 1 +10 NEQ 1 +9 NEQ 1 +0 NEQ 10 +1 NEQ 10 +9 NEQ 10 +0 NEQ 9 +1 NEQ 9 +10 NEQ 9 @todo_wine(a)0 GEQ 0 @todo_wine(a)1 GEQ 0 @todo_wine(a)10 GEQ 0

1 0

Jacek Caban : jscript: Optimize object refcount handling.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 79a30a4e0ae3a7ef640fa38e3a9f77e1e73cc576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79a30a4e0ae3a7ef640fa38e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 26 13:28:17 2012 +0200 jscript: Optimize object refcount handling. --- dlls/jscript/dispex.c | 78 ++++++++++++++++++++++++++++++------------------ dlls/jscript/jscript.h | 21 +++++++++++- 2 files changed, 68 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2a5225f..211ed8a 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -543,46 +543,23 @@ static HRESULT WINAPI DispatchEx_QueryInterface(IDispatchEx *iface, REFIID riid, return E_NOINTERFACE; } - IUnknown_AddRef((IUnknown*)*ppv); + jsdisp_addref(This); return S_OK; } static ULONG WINAPI DispatchEx_AddRef(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - return ref; + jsdisp_addref(This); + return This->ref; } static ULONG WINAPI DispatchEx_Release(IDispatchEx *iface) { jsdisp_t *This = impl_from_IDispatchEx(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%d\n", This, ref); - - if(!ref) { - dispex_prop_t *prop; - - for(prop = This->props; prop < This->props+This->prop_cnt; prop++) { - if(prop->type == PROP_JSVAL) - jsval_release(prop->u.val); - heap_free(prop->name); - } - heap_free(This->props); - script_release(This->ctx); - if(This->prototype) - jsdisp_release(This->prototype); - - if(This->builtin_info->destructor) - This->builtin_info->destructor(This); - else - heap_free(This); - } - + ULONG ref = --This->ref; + if(!ref) + jsdisp_free(This); return ref; } @@ -931,6 +908,49 @@ HRESULT create_dispex(script_ctx_t *ctx, const builtin_info_t *builtin_info, jsd return S_OK; } +void jsdisp_free(jsdisp_t *obj) +{ + dispex_prop_t *prop; + + TRACE("(%p)\n", obj); + + for(prop = obj->props; prop < obj->props+obj->prop_cnt; prop++) { + if(prop->type == PROP_JSVAL) + jsval_release(prop->u.val); + heap_free(prop->name); + } + heap_free(obj->props); + script_release(obj->ctx); + if(obj->prototype) + jsdisp_release(obj->prototype); + + if(obj->builtin_info->destructor) + obj->builtin_info->destructor(obj); + else + heap_free(obj); +} + +#ifdef TRACE_REFCNT + +jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) +{ + ULONG ref = ++jsdisp->ref; + TRACE("(%p) ref=%d\n", jsdisp, ref); + return jsdisp; +} + +void jsdisp_release(jsdisp_t *jsdisp) +{ + ULONG ref = --jsdisp->ref; + + TRACE("(%p) ref=%d\n", jsdisp, ref); + + if(!ref) + jsdisp_free(jsdisp); +} + +#endif + HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const builtin_info_t *builtin_info, jsdisp_t *constr) { jsdisp_t *prot = NULL; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2630ff0..18ac1db 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -223,18 +223,35 @@ static inline IDispatch *to_disp(jsdisp_t *jsdisp) jsdisp_t *as_jsdisp(IDispatch*) DECLSPEC_HIDDEN; jsdisp_t *to_jsdisp(IDispatch*) DECLSPEC_HIDDEN; +void jsdisp_free(jsdisp_t*) DECLSPEC_HIDDEN; +#ifndef TRACE_REFCNT + +/* + * We do a lot of refcount calls during script execution, so having an inline + * version is a nice perf win. Define TRACE_REFCNT macro when debugging + * refcount bugs to have traces. Also, since jsdisp_t is not thread safe anyways, + * there is no point in using atomic operations. + */ static inline jsdisp_t *jsdisp_addref(jsdisp_t *jsdisp) { - IDispatchEx_AddRef(&jsdisp->IDispatchEx_iface); + jsdisp->ref++; return jsdisp; } static inline void jsdisp_release(jsdisp_t *jsdisp) { - IDispatchEx_Release(&jsdisp->IDispatchEx_iface); + if(!--jsdisp->ref) + jsdisp_free(jsdisp); } +#else + +jsdisp_t *jsdisp_addref(jsdisp_t*) DECLSPEC_HIDDEN; +void jsdisp_release(jsdisp_t*) DECLSPEC_HIDDEN; + +#endif + HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN;

1 0

Huw Davies : gdi32: Use a symbol charmap if all else fails.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 7cd8dc6bf2b0d81338db9a6d13669b2f31da33d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cd8dc6bf2b0d81338db9a6d1… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Oct 26 14:04:05 2012 +0100 gdi32: Use a symbol charmap if all else fails. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index c62070f..6af977c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -4410,7 +4410,7 @@ static BOOL freetype_DeleteDC( PHYSDEV dev ) static FT_Encoding pick_charmap( FT_Face face, int charset ) { - static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; + static const FT_Encoding regular_order[] = { FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, FT_ENCODING_MS_SYMBOL, 0 }; static const FT_Encoding symbol_order[] = { FT_ENCODING_MS_SYMBOL, FT_ENCODING_UNICODE, FT_ENCODING_APPLE_ROMAN, 0 }; const FT_Encoding *encs = regular_order;

1 0

Frédéric Delanoy : cmd: Move common error reporting code in WCMD_if.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: dd1395442448ec73b6e16c89d8e9affd554a4e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd1395442448ec73b6e16c89d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:00 2012 +0200 cmd: Move common error reporting code in WCMD_if. --- programs/cmd/builtins.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d13cb5c..ffdfe8d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2346,9 +2346,8 @@ void WCMD_popd (void) { * * FIXME: Much more syntax checking needed! */ - -void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { - +void WCMD_if (WCHAR *p, CMD_LIST **cmdList) +{ int negate; /* Negate condition */ int test; /* Condition evaluation result */ WCHAR condition[MAX_PATH], *command, *s; @@ -2368,10 +2367,7 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { WCHAR *param = WCMD_parameter(p, 1+negate, NULL, FALSE, FALSE); WCHAR *endptr; long int param_int = strtolW(param, &endptr, 10); - if (*endptr) { - WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - return; - } + if (*endptr) goto syntax_err; test = ((long int)errorlevel >= param_int); WCMD_parameter(p, 2+negate, &command, FALSE, FALSE); } @@ -2401,14 +2397,15 @@ void WCMD_if (WCHAR *p, CMD_LIST **cmdList) { rightPart, rightPartLen) == CSTR_EQUAL); WCMD_parameter(s, 1, &command, FALSE, FALSE); } - else { - WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); - return; - } + else goto syntax_err; /* Process rest of IF statement which is on the same line Note: This may process all or some of the cmdList (eg a GOTO) */ WCMD_part_execute(cmdList, command, NULL, NULL, TRUE, (test != negate)); + return; + +syntax_err: + WCMD_output_stderr(WCMD_LoadMessage(WCMD_SYNTAXERR)); } /****************************************************************************

1 0

Nikolay Sivov : dwrite: Layout can't be created without text format.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: fcae48a08cffec0c7af37f8fe519b0b8c5821208 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcae48a08cffec0c7af37f8fe… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 26 12:10:47 2012 -0400 dwrite: Layout can't be created without text format. --- dlls/dwrite/layout.c | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 153716b..76c5adb 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -681,14 +681,11 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma memset(&This->format, 0, sizeof(This->format)); /* reference is not kept here, instead copy all underlying data */ - if (format) - { - IDWriteTextFormat_GetFontCollection(format, &This->format.collection); - This->format.weight = IDWriteTextFormat_GetFontWeight(format); - This->format.style = IDWriteTextFormat_GetFontStyle(format); - This->format.stretch = IDWriteTextFormat_GetFontStretch(format); - This->format.size = IDWriteTextFormat_GetFontSize(format); - } + IDWriteTextFormat_GetFontCollection(format, &This->format.collection); + This->format.weight = IDWriteTextFormat_GetFontWeight(format); + This->format.style = IDWriteTextFormat_GetFontStyle(format); + This->format.stretch = IDWriteTextFormat_GetFontStretch(format); + This->format.size = IDWriteTextFormat_GetFontSize(format); *layout = &This->IDWriteTextLayout_iface;

1 0

Nikolay Sivov : dwrite: Added GetLocaleNameLength/ GetLocaleName for text format and layout.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: 51d0f61272cc2aeb3cc0aba2653174caa7dba8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51d0f61272cc2aeb3cc0aba26… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Oct 26 12:50:12 2012 -0400 dwrite: Added GetLocaleNameLength/GetLocaleName for text format and layout. --- dlls/dwrite/layout.c | 35 +++++++++++++++++++++++++++-------- dlls/dwrite/tests/layout.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 8 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index 76c5adb..f6bc421 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -35,6 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dwrite); struct dwrite_textformat_data { WCHAR *family_name; WCHAR *locale; + UINT32 locale_len; DWRITE_FONT_WEIGHT weight; DWRITE_FONT_STYLE style; @@ -114,6 +115,7 @@ static ULONG WINAPI dwritetextlayout_Release(IDWriteTextLayout *iface) if (!ref) { + release_format_data(&This->format); heap_free(This->str); heap_free(This); } @@ -289,15 +291,19 @@ static FLOAT WINAPI dwritetextlayout_GetFontSize(IDWriteTextLayout *iface) static UINT32 WINAPI dwritetextlayout_GetLocaleNameLength(IDWriteTextLayout *iface) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.locale_len; } static HRESULT WINAPI dwritetextlayout_GetLocaleName(IDWriteTextLayout *iface, WCHAR *name, UINT32 size) { struct dwrite_textlayout *This = impl_from_IDWriteTextLayout(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.locale_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.locale); + return S_OK; } static HRESULT WINAPI dwritetextlayout_SetMaxWidth(IDWriteTextLayout *iface, FLOAT maxWidth) @@ -668,6 +674,7 @@ static const IDWriteTextLayoutVtbl dwritetextlayoutvtbl = { HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *format, IDWriteTextLayout **layout) { struct dwrite_textlayout *This; + UINT32 locale_len; *layout = NULL; @@ -682,6 +689,13 @@ HRESULT create_textlayout(const WCHAR *str, UINT32 len, IDWriteTextFormat *forma /* reference is not kept here, instead copy all underlying data */ IDWriteTextFormat_GetFontCollection(format, &This->format.collection); + + /* locale name and length */ + locale_len = IDWriteTextFormat_GetLocaleNameLength(format); + This->format.locale = heap_alloc((locale_len+1)*sizeof(WCHAR)); + IDWriteTextFormat_GetLocaleName(format, This->format.locale, locale_len+1); + This->format.locale_len = locale_len; + This->format.weight = IDWriteTextFormat_GetFontWeight(format); This->format.style = IDWriteTextFormat_GetFontStyle(format); This->format.stretch = IDWriteTextFormat_GetFontStretch(format); @@ -908,15 +922,19 @@ static FLOAT WINAPI dwritetextformat_GetFontSize(IDWriteTextFormat *iface) static UINT32 WINAPI dwritetextformat_GetLocaleNameLength(IDWriteTextFormat *iface) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p): stub\n", This); - return 0; + TRACE("(%p)\n", This); + return This->format.locale_len; } static HRESULT WINAPI dwritetextformat_GetLocaleName(IDWriteTextFormat *iface, WCHAR *name, UINT32 size) { struct dwrite_textformat *This = impl_from_IDWriteTextFormat(iface); - FIXME("(%p)->(%p %u): stub\n", This, name, size); - return E_NOTIMPL; + + TRACE("(%p)->(%p %u)\n", This, name, size); + + if (size <= This->format.locale_len) return E_NOT_SUFFICIENT_BUFFER; + strcpyW(name, This->format.locale); + return S_OK; } static const IDWriteTextFormatVtbl dwritetextformatvtbl = { @@ -964,6 +982,7 @@ HRESULT create_textformat(const WCHAR *family_name, IDWriteFontCollection *colle This->ref = 1; This->format.family_name = heap_strdupW(family_name); This->format.locale = heap_strdupW(locale); + This->format.locale_len = strlenW(locale); This->format.weight = weight; This->format.style = style; This->format.size = size; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 6b8dc62..9656ba6 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -134,6 +134,41 @@ if (0) /* crashes on native */ IDWriteTextFormat_Release(format); } +static void test_GetLocaleName(void) +{ + static const WCHAR strW[] = {'s','t','r','i','n','g',0}; + static const WCHAR ruW[] = {'r','u',0}; + IDWriteTextLayout *layout; + IDWriteTextFormat *format; + WCHAR buff[10]; + UINT32 len; + HRESULT hr; + + hr = IDWriteFactory_CreateTextFormat(factory, tahomaW, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, + DWRITE_FONT_STRETCH_NORMAL, 10.0, ruW, &format); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IDWriteFactory_CreateGdiCompatibleTextLayout(factory, strW, 0, format, 100.0, 100.0, 1.0, NULL, FALSE, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + len = IDWriteTextLayout_GetLocaleNameLength(layout); + ok(len == 2, "got %u\n", len); + len = IDWriteTextFormat_GetLocaleNameLength(format); + ok(len == 2, "got %u\n", len); + hr = IDWriteTextLayout_GetLocaleName(layout, buff, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + hr = IDWriteTextLayout_GetLocaleName(layout, buff, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + hr = IDWriteTextFormat_GetLocaleName(format, buff, len); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); + hr = IDWriteTextFormat_GetLocaleName(format, buff, len+1); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(buff, ruW), "got %s\n", wine_dbgstr_w(buff)); + + IDWriteTextLayout_Release(layout); + IDWriteTextFormat_Release(format); +} + START_TEST(layout) { HRESULT hr; @@ -149,6 +184,7 @@ START_TEST(layout) test_CreateTextLayout(); test_CreateGdiCompatibleTextLayout(); test_CreateTextFormat(); + test_GetLocaleName(); IDWriteFactory_Release(factory); }

1 0

Henri Verbeet : winealsa: Avoid depending on ddraw.h.
by Alexandre Julliard Oct. 26, 2012

Oct. 26, 2012

Module: wine Branch: master Commit: fd06135d517f837596bbc0eb9d2e03124d542e4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd06135d517f837596bbc0eb9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:40 2012 +0200 winealsa: Avoid depending on ddraw.h. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 6b2bed5..1c8b03a 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -35,7 +35,7 @@ #include "ole2.h" #include "mmdeviceapi.h" #include "devpkey.h" -#include "dshow.h" +#include "mmsystem.h" #include "dsound.h" #include "initguid.h"

1 0