October 2012 - Wine-commits

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

26 Oct '12

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 26 Oct '12

26 Oct '12

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

Frédéric Delanoy : cmd: Add support for GEQ comparison operator in if statements.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 73995c71e05a7bd33784b0f994951d6fc3ca9c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=73995c71e05a7bd33784b0f99… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:06 2012 +0200 cmd: Add support for GEQ comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++ programs/cmd/tests/test_builtins.cmd.exp | 76 +++++++++++++++--------------- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e15c7c8..112d678 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2359,6 +2359,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR leqW[] = {'l','e','q','\0'}; static const WCHAR equW[] = {'e','q','u','\0'}; static const WCHAR neqW[] = {'n','e','q','\0'}; + static const WCHAR geqW[] = {'g','e','q','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2403,6 +2404,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) != 0; } + if (!lstrcmpiW(operator, geqW)) { + 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 9adc016..c451c70 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -507,21 +507,21 @@ A NEQ AA B NEQ AA AB NEQ AA BA NEQ AA -(a)todo_wine@A GEQ A -(a)todo_wine@B GEQ A -(a)todo_wine@AB GEQ A -(a)todo_wine@BA GEQ A -(a)todo_wine@AA GEQ A -(a)todo_wine@B GEQ B -(a)todo_wine@BA GEQ B -(a)todo_wine@B GEQ AB -(a)todo_wine@AB GEQ AB -(a)todo_wine@BA GEQ AB -(a)todo_wine@BA GEQ BA -(a)todo_wine@B GEQ AA -(a)todo_wine@AB GEQ AA -(a)todo_wine@BA GEQ AA -(a)todo_wine@AA GEQ AA +A GEQ A +B GEQ A +AB GEQ A +BA GEQ A +AA GEQ A +B GEQ B +BA GEQ B +B GEQ AB +AB GEQ AB +BA GEQ AB +BA GEQ BA +B GEQ AA +AB GEQ AA +BA GEQ AA +AA GEQ AA @todo_wine(a)B GTR A @todo_wine(a)AB GTR A @todo_wine(a)BA GTR A @@ -576,16 +576,16 @@ string/hexa compare ok 0 NEQ 9 1 NEQ 9 10 NEQ 9 -(a)todo_wine@0 GEQ 0 -(a)todo_wine@1 GEQ 0 -(a)todo_wine@10 GEQ 0 -(a)todo_wine@9 GEQ 0 -(a)todo_wine@1 GEQ 1 -(a)todo_wine@10 GEQ 1 -(a)todo_wine@9 GEQ 1 -(a)todo_wine@10 GEQ 10 -(a)todo_wine@10 GEQ 9 -(a)todo_wine@9 GEQ 9 +0 GEQ 0 +1 GEQ 0 +10 GEQ 0 +9 GEQ 0 +1 GEQ 1 +10 GEQ 1 +9 GEQ 1 +10 GEQ 10 +10 GEQ 9 +9 GEQ 9 @todo_wine(a)1 GTR 0 @todo_wine(a)10 GTR 0 @todo_wine(a)9 GTR 0 @@ -596,19 +596,19 @@ string/hexa compare ok strings and integers not equal strings and integers not equal foo -(a)todo_wine@"10" GEQ "1" -(a)todo_wine@'1' GEQ 1(a)or_broken@NT4 -(a)todo_wine@1 GEQ "1" -(a)todo_wine@"1" GEQ "1" -(a)todo_wine@'1' GEQ "1" -(a)todo_wine@"10" GEQ "1" -(a)todo_wine@non NT4(a)or_broken@1 GEQ '1' -(a)todo_wine@'1' GEQ '1' -(a)todo_wine@foo -(a)todo_wine@1 GEQ "10" -(a)todo_wine@foo -(a)todo_wine@'1' GEQ "10" -(a)todo_wine@"10" GEQ "10" +"10" GEQ "1" +'1' GEQ 1(a)or_broken@NT4 +1 GEQ "1" +"1" GEQ "1" +'1' GEQ "1" +"10" GEQ "1" +non NT4(a)or_broken@1 GEQ '1' +'1' GEQ '1' +foo +1 GEQ "10" +foo +'1' GEQ "10" +"10" GEQ "10" ------------ Testing for ------------ --- plain FOR A

1 0

Frédéric Delanoy : cmd: Add support for GTR comparison operator in if statements.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: 90c6f57fa9d9c9caf1b469ae82ed13bccb9625ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=90c6f57fa9d9c9caf1b469ae8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 25 23:48:07 2012 +0200 cmd: Add support for GTR comparison operator in if statements. --- programs/cmd/builtins.c | 9 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 32 +++++++++++++++--------------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 112d678..855040e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -2360,6 +2360,7 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato static const WCHAR equW[] = {'e','q','u','\0'}; static const WCHAR neqW[] = {'n','e','q','\0'}; static const WCHAR geqW[] = {'g','e','q','\0'}; + static const WCHAR gtrW[] = {'g','t','r','\0'}; /* == is a special case, as it always compares strings */ if (!lstrcmpiW(operator, eqeqW)) @@ -2412,6 +2413,14 @@ static int evaluate_if_comparison(const WCHAR *leftOperand, const WCHAR *operato : lstrcmpW (leftOperand, rightOperand) >= 0; } + if (!lstrcmpiW(operator, gtrW)) { + 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 c451c70..aeaa14d 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -522,16 +522,16 @@ B GEQ AA AB GEQ AA BA GEQ AA AA GEQ AA -(a)todo_wine@B GTR A -(a)todo_wine@AB GTR A -(a)todo_wine@BA GTR A -(a)todo_wine@AA GTR A -(a)todo_wine@BA GTR B -(a)todo_wine@B GTR AB -(a)todo_wine@BA GTR AB -(a)todo_wine@B GTR AA -(a)todo_wine@AB GTR AA -(a)todo_wine@BA GTR AA +B GTR A +AB GTR A +BA GTR A +AA GTR A +BA GTR B +B GTR AB +BA GTR AB +B GTR AA +AB GTR AA +BA GTR AA ------ for numbers negative numbers handled negative numbers handled @@ -586,12 +586,12 @@ string/hexa compare ok 10 GEQ 10 10 GEQ 9 9 GEQ 9 -(a)todo_wine@1 GTR 0 -(a)todo_wine@10 GTR 0 -(a)todo_wine@9 GTR 0 -(a)todo_wine@10 GTR 1 -(a)todo_wine@9 GTR 1 -(a)todo_wine@10 GTR 9 +1 GTR 0 +10 GTR 0 +9 GTR 0 +10 GTR 1 +9 GTR 1 +10 GTR 9 ------ for numbers and stringified numbers strings and integers not equal strings and integers not equal

1 0

Jacek Caban : jscript: Optimize object refcount handling.
by Alexandre Julliard 26 Oct '12

26 Oct '12

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: Simplify the code for charmap selection.
by Alexandre Julliard 26 Oct '12

26 Oct '12

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

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

26 Oct '12

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

Henri Verbeet : d3dx9: Avoid LPDIRECT3DBASETEXTURE9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: c4f7bcc65343530d033420da678a91dc66917de6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4f7bcc65343530d033420da6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:37 2012 +0200 d3dx9: Avoid LPDIRECT3DBASETEXTURE9. --- dlls/d3dx9_36/effect.c | 24 +++++++++++++++--------- dlls/d3dx9_36/sprite.c | 2 +- dlls/d3dx9_36/texture.c | 4 ++-- include/d3dx9effect.h | 14 +++++++------- include/d3dx9mesh.h | 10 ++++++---- include/d3dx9tex.h | 28 +++++++++------------------- 6 files changed, 40 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c4f7bcc65343530d03342…

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DINDEXBUFFER9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: d9c68bd19152aa848865ac09af19b67c38f4cf0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9c68bd19152aa848865ac09a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:38 2012 +0200 d3dx9: Avoid LPDIRECT3DINDEXBUFFER9. --- dlls/d3dx9_36/mesh.c | 3 ++- dlls/d3dx9_36/skin.c | 3 ++- include/d3dx9mesh.h | 18 +++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 3e8fc1f..cac4481 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -784,7 +784,8 @@ static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3D return D3D_OK; } -static HRESULT WINAPI ID3DXMeshImpl_GetIndexBuffer(ID3DXMesh *iface, LPDIRECT3DINDEXBUFFER9 *index_buffer) +static HRESULT WINAPI ID3DXMeshImpl_GetIndexBuffer(struct ID3DXMesh *iface, + struct IDirect3DIndexBuffer9 **index_buffer) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); diff --git a/dlls/d3dx9_36/skin.c b/dlls/d3dx9_36/skin.c index 3b03425..8ef7fbe 100644 --- a/dlls/d3dx9_36/skin.c +++ b/dlls/d3dx9_36/skin.c @@ -210,7 +210,8 @@ static HRESULT WINAPI ID3DXSkinInfoImpl_FindBoneVertexInfluenceIndex(ID3DXSkinIn return E_NOTIMPL; } -static HRESULT WINAPI ID3DXSkinInfoImpl_GetMaxFaceInfluences(ID3DXSkinInfo *iface, LPDIRECT3DINDEXBUFFER9 index_buffer, DWORD num_faces, DWORD *max_face_influences) +static HRESULT WINAPI ID3DXSkinInfoImpl_GetMaxFaceInfluences(struct ID3DXSkinInfo *iface, + struct IDirect3DIndexBuffer9 *index_buffer, DWORD num_faces, DWORD *max_face_influences) { ID3DXSkinInfoImpl *This = impl_from_ID3DXSkinInfo(iface); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 4ced5d6..3df20be 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -323,7 +323,7 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -356,7 +356,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -397,7 +397,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -475,7 +475,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE; STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; - STDMETHOD(GetIndexBuffer)(THIS_ LPDIRECT3DINDEXBUFFER9* index_buffer) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; STDMETHOD(LockIndexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; @@ -513,7 +513,8 @@ DECLARE_INTERFACE_(ID3DXSkinInfo, IUnknown) STDMETHOD(GetMaxVertexInfluences)(THIS_ DWORD* max_vertex_influences) PURE; STDMETHOD_(DWORD, GetNumBones)(THIS) PURE; STDMETHOD(FindBoneVertexInfluenceIndex)(THIS_ DWORD bone_num, DWORD vertex_num, DWORD* influence_index) PURE; - STDMETHOD(GetMaxFaceInfluences)(THIS_ LPDIRECT3DINDEXBUFFER9 index_buffer, DWORD num_faces, DWORD* max_face_influences) PURE; + STDMETHOD(GetMaxFaceInfluences)(THIS_ struct IDirect3DIndexBuffer9 *index_buffer, + DWORD num_faces, DWORD *max_face_influences) PURE; STDMETHOD(SetMinBoneInfluence)(THIS_ FLOAT min_influence) PURE; STDMETHOD_(FLOAT, GetMinBoneInfluence)(THIS) PURE; STDMETHOD(SetBoneName)(THIS_ DWORD bone, LPCSTR name) PURE; @@ -736,8 +737,11 @@ HRESULT WINAPI D3DXComputeIMTFromTexture(struct ID3DXMesh *mesh, struct IDirect3 HRESULT WINAPI D3DXComputeNormals(LPD3DXBASEMESH, CONST DWORD *); HRESULT WINAPI D3DXComputeTangentFrameEx(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, CONST DWORD *, FLOAT, FLOAT, FLOAT, LPD3DXMESH *, LPD3DXBUFFER *); HRESULT WINAPI D3DXComputeTangent(LPD3DXMESH, DWORD, DWORD, DWORD, DWORD, CONST DWORD *); -HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9 *, DWORD *); -HRESULT WINAPI D3DXConvertMeshSubsetToStrips(LPD3DXBASEMESH, DWORD, DWORD, LPDIRECT3DINDEXBUFFER9, DWORD *, LPD3DXBUFFER *, DWORD *); +HRESULT WINAPI D3DXConvertMeshSubsetToSingleStrip(struct ID3DXBaseMesh *mesh_in, DWORD attribute_id, + DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count); +HRESULT WINAPI D3DXConvertMeshSubsetToStrips(struct ID3DXBaseMesh mesh_in, DWORD attribute_id, + DWORD ib_flags, struct IDirect3DIndexBuffer9 **index_buffer, DWORD *index_count, + struct ID3DXBuffer **strip_lengths, DWORD *strip_count); HRESULT WINAPI D3DXDeclaratorFromFVF(DWORD, D3DVERTEXELEMENT9[MAX_FVF_DECL_SIZE]); HRESULT WINAPI D3DXFVFFromDeclarator(const D3DVERTEXELEMENT9 *decl, DWORD *fvf); HRESULT WINAPI D3DXGenerateOutputDecl(D3DVERTEXELEMENT9 *, CONST D3DVERTEXELEMENT9 *);

1 0

Henri Verbeet : d3dx9: Avoid LPDIRECT3DVERTEXBUFFER9.
by Alexandre Julliard 26 Oct '12

26 Oct '12

Module: wine Branch: master Commit: fff88819d0f106e324d09ffd3debb06a6b828d43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fff88819d0f106e324d09ffd3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 25 21:21:39 2012 +0200 d3dx9: Avoid LPDIRECT3DVERTEXBUFFER9. --- dlls/d3dx9_36/mesh.c | 3 ++- include/d3dx9mesh.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index cac4481..eec6692 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -771,7 +771,8 @@ error: return hr; } -static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(ID3DXMesh *iface, LPDIRECT3DVERTEXBUFFER9 *vertex_buffer) +static HRESULT WINAPI ID3DXMeshImpl_GetVertexBuffer(struct ID3DXMesh *iface, + struct IDirect3DVertexBuffer9 **vertex_buffer) { ID3DXMeshImpl *This = impl_from_ID3DXMesh(iface); diff --git a/include/d3dx9mesh.h b/include/d3dx9mesh.h index 3df20be..eb13e93 100644 --- a/include/d3dx9mesh.h +++ b/include/d3dx9mesh.h @@ -322,7 +322,7 @@ DECLARE_INTERFACE_(ID3DXBaseMesh, IUnknown) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -355,7 +355,7 @@ DECLARE_INTERFACE_(ID3DXMesh, ID3DXBaseMesh) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -396,7 +396,7 @@ DECLARE_INTERFACE_(ID3DXPMesh, ID3DXBaseMesh) STDMETHOD(CloneMeshFVF)(THIS_ DWORD options, DWORD fvf, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; STDMETHOD(CloneMesh)(THIS_ DWORD options, CONST D3DVERTEXELEMENT9* declaration, LPDIRECT3DDEVICE9 device, LPD3DXMESH* clone_mesh) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -474,7 +474,7 @@ DECLARE_INTERFACE_(ID3DXPatchMesh, IUnknown) STDMETHOD_(DWORD, GetOptions)(THIS) PURE; STDMETHOD(GetDevice)(THIS_ LPDIRECT3DDEVICE9* device) PURE; STDMETHOD(GetPatchInfo)(THIS_ LPD3DXPATCHINFO patch_info) PURE; - STDMETHOD(GetVertexBuffer)(THIS_ LPDIRECT3DVERTEXBUFFER9* vertex_buffer) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ struct IDirect3DVertexBuffer9 **vertex_buffer) PURE; STDMETHOD(GetIndexBuffer)(THIS_ struct IDirect3DIndexBuffer9 **index_buffer) PURE; STDMETHOD(LockVertexBuffer)(THIS_ DWORD flags, LPVOID* data) PURE; STDMETHOD(UnlockVertexBuffer)(THIS) PURE; @@ -757,8 +757,10 @@ HRESULT WINAPI D3DXSHPRTCompSplitMeshSC(UINT *, UINT, UINT, UINT *, UINT, LPVOID HRESULT WINAPI D3DXSimplifyMesh(LPD3DXMESH, CONST DWORD *, CONST D3DXATTRIBUTEWEIGHTS, CONST FLOAT *, DWORD, DWORD, LPD3DXMESH *); HRESULT WINAPI D3DXSplitMesh(LPD3DXMESH, CONST DWORD *, CONST DWORD, CONST DWORD, DWORD *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *, LPD3DXBUFFER *); HRESULT WINAPI D3DXTesselateNPatches(LPD3DXMESH, CONST DWORD *, FLOAT, BOOL, LPD3DXMESH *, LPD3DXBUFFER *); -HRESULT WINAPI D3DXTesselateRectPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DRECTPATCH_INFO *, LPD3DXMESH); -HRESULT WINAPI D3DXTesselateTriPatch(LPDIRECT3DVERTEXBUFFER9, CONST FLOAT *, CONST D3DVERTEXELEMENT9 *, CONST D3DTRIPATCH_INFO *, LPD3DXMESH); +HRESULT WINAPI D3DXTesselateRectPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, + const D3DVERTEXELEMENT9 *declaration, const D3DRECTPATCH_INFO *patch_info, struct ID3DXMesh *mesh); +HRESULT WINAPI D3DXTesselateTriPatch(struct IDirect3DVertexBuffer9 *buffer, const float *segment_count, + const D3DVERTEXELEMENT9 *declaration, const D3DTRIPATCH_INFO *patch_info, struct ID3DXMesh *mesh); HRESULT WINAPI D3DXTriPatchSize(CONST FLOAT *, DWORD *, DWORD *); HRESULT WINAPI D3DXUVAtlasCreate(LPD3DXMESH, UINT, FLOAT, UINT, UINT, FLOAT, DWORD, CONST DWORD *, CONST FLOAT *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXMESH *, LPD3DXBUFFER *, LPD3DXBUFFER *, FLOAT *, UINT *); HRESULT WINAPI D3DXUVAtlasPack(ID3DXMesh *, UINT, UINT, FLOAT, DWORD, CONST DWORD *, LPD3DXUVATLASCB, FLOAT, LPVOID, DWORD, LPD3DXBUFFER);

1 0