wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Francois Gouget : jscript/tests: Some tests require that the user interface be in English.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 405c3ef483f9661a2983c0c1bad76012c342f7ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=405c3ef483f9661a2983c0c1b… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:38:18 2011 +0200 jscript/tests: Some tests require that the user interface be in English. --- dlls/jscript/tests/run.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index fbbff96..3ad9600 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,6 +108,29 @@ static IDispatch *script_disp; static int invoke_version; static IActiveScriptError *script_error; +/* Returns true if the user interface is in English. Note that this does not + * presume of the formatting of dates, numbers, etc. + */ +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static BSTR a2bstr(const char *str) { BSTR ret; @@ -1145,8 +1168,8 @@ static void test_IActiveScriptError(IActiveScriptError *error, SCODE errorcode, ok(excep.wCode == 0, "IActiveScriptError_GetExceptionInfo -- excep.wCode: expected 0, got 0x%08x\n", excep.wCode); ok(excep.wReserved == 0, "IActiveScriptError_GetExceptionInfo -- excep.wReserved: expected 0, got %d\n", excep.wReserved); - if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) - skip("Non-english locale (test with hardcoded strings)\n"); + if (!is_lang_english()) + skip("Non-english UI (test with hardcoded strings)\n"); else { ok(excep.bstrSource != NULL && !lstrcmpW(excep.bstrSource, script_source), "IActiveScriptError_GetExceptionInfo -- excep.bstrSource is not valid: expected %s, got %s\n",

1 0

Francois Gouget : shdocvw: Make get_ieframe_instance() static.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 4c7e83f9d933b53308587b470ad2edfbe9b2538f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c7e83f9d933b53308587b470… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:36:45 2011 +0200 shdocvw: Make get_ieframe_instance() static. --- dlls/shdocvw/shdocvw.h | 1 - dlls/shdocvw/shdocvw_main.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 792c9bd..e741482 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -52,7 +52,6 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r extern HINSTANCE shdocvw_hinstance DECLSPEC_HIDDEN; -HINSTANCE get_ieframe_instance(void) DECLSPEC_HIDDEN; /* memory allocation functions */ diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 2bfe3c9..88fe5ed 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -45,7 +45,7 @@ HINSTANCE shdocvw_hinstance = 0; static HMODULE SHDOCVW_hshell32 = 0; static HINSTANCE ieframe_instance; -HINSTANCE get_ieframe_instance(void) +static HINSTANCE get_ieframe_instance(void) { static const WCHAR ieframe_dllW[] = {'i','e','f','r','a','m','e','.','d','l','l',0};

1 0

André Hentschel : winex11: Multiply the error tolerance by the table caused error magnification.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 321224d2f680f2b78bf2f3e53d977a51d82d136a URL: http://source.winehq.org/git/wine.git/?a=commit;h=321224d2f680f2b78bf2f3e53… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 18 19:07:33 2011 +0200 winex11: Multiply the error tolerance by the table caused error magnification. --- dlls/gdi32/tests/dc.c | 2 +- dlls/winex11.drv/xvidmode.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 9e2b3eb..9420f78 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -765,7 +765,7 @@ static void test_gamma(void) ramp[0][0] = 0; for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp failed\n"); /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); diff --git a/dlls/winex11.drv/xvidmode.c b/dlls/winex11.drv/xvidmode.c index 2d8a4eb..1f13737 100644 --- a/dlls/winex11.drv/xvidmode.c +++ b/dlls/winex11.drv/xvidmode.c @@ -335,7 +335,7 @@ static BOOL ComputeGammaFromRamp(WORD ramp[256], float *gamma) return FALSE; } /* check that the gamma is reasonably uniform across the ramp */ - if (g_max - g_min > 0.1) { + if (g_max - g_min > 12.8) { ERR("ramp not uniform (max=%f, min=%f, avg=%f), rejected\n", g_max, g_min, g_avg); return FALSE; }

1 0

André Hentschel : gdi32/tests: Add a test about non-uniform ramps.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 0644fd499f35d3c41e819bc2f08079426a7eb34c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0644fd499f35d3c41e819bc2f… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Sep 18 19:06:56 2011 +0200 gdi32/tests: Add a test about non-uniform ramps. --- dlls/gdi32/tests/dc.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index efa7d53..9e2b3eb 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -761,6 +761,12 @@ static void test_gamma(void) ret = SetDeviceGammaRamp(hdc, &ramp); ok(!ret, "SetDeviceGammaRamp succeeded\n"); + /* try a ramp which is not uniform */ + ramp[0][0] = 0; + for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; + ret = SetDeviceGammaRamp(hdc, &ramp); + todo_wine ok(ret, "SetDeviceGammaRamp failed\n"); + /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); ok(ret, "SetDeviceGammaRamp failed\n");

1 0

Octavian Voicu : vbscript: Add explicit cast to int for pointer difference type.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 0a4bedde4329db217d70de281eebb1b1c1d22200 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a4bedde4329db217d70de281… Author: Octavian Voicu <octavian.voicu(a)gmail.com> Date: Sun Sep 18 14:40:33 2011 +0300 vbscript: Add explicit cast to int for pointer difference type. --- dlls/vbscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 1ff3c40..60e4935 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -95,7 +95,7 @@ static void dump_code(compile_ctx_t *ctx) instr_t *instr; for(instr = ctx->code->instrs; instr < ctx->code->instrs+ctx->instr_cnt; instr++) { - TRACE_(vbscript_disas)("%d:\t%s", instr-ctx->code->instrs, instr_info[instr->op].op_str); + TRACE_(vbscript_disas)("%d:\t%s", (int)(instr-ctx->code->instrs), instr_info[instr->op].op_str); dump_instr_arg(instr_info[instr->op].arg1_type, &instr->arg1); dump_instr_arg(instr_info[instr->op].arg2_type, &instr->arg2); TRACE_(vbscript_disas)("\n");

1 0

Francois Gouget : ole32/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 54c74dc4a2dbbaac8e171592ec14821c4f93b2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=54c74dc4a2dbbaac8e171592e… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Sep 17 11:33:29 2011 +0200 ole32/tests: Fix compilation on systems that don't support nameless unions. --- dlls/ole32/tests/storage32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b8c6ada..b465269 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2984,7 +2984,7 @@ static void test_hglobal_storage_creation(void) r = ILockBytes_Stat(ilb, &stat, STATFLAG_NONAME); ok(r == S_OK, "ILockBytes_Stat failed, hr=%x\n", r); - ok(stat.cbSize.LowPart < 2512, "expected truncated size, got %d\n", stat.cbSize.LowPart); + ok(stat.cbSize.u.LowPart < 2512, "expected truncated size, got %d\n", stat.cbSize.u.LowPart); ILockBytes_Release(ilb); }

1 0

Alexandre Julliard : rpcrt4/tests: Add more tests for integer ranges to show that ranges are independent.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: cb5beede167260c1ccd5d5588fbf6103217c293b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb5beede167260c1ccd5d5588… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 13:17:41 2011 +0200 rpcrt4/tests: Add more tests for integer ranges to show that ranges are independent. Reported by Jérôme Gardou. --- dlls/rpcrt4/tests/server.c | 15 +++++++++++---- dlls/rpcrt4/tests/server.idl | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index eb8f061..d66c22c 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -599,9 +599,14 @@ str_t __cdecl s_get_filename(void) return (char *)__FILE__; } -int __cdecl s_echo_ranged_int(int n) +int __cdecl s_echo_ranged_int(int i, int j, int k) { - return n; + return min( 100, i + j + k ); +} + +int __cdecl s_echo_ranged_int2(int i) +{ + return i; } void __cdecl s_get_ranged_enum(renum_t *re) @@ -934,10 +939,12 @@ basic_tests(void) ok(!strcmp(str, __FILE__), "get_filename() returned %s instead of %s\n", str, __FILE__); midl_user_free(str); - x = echo_ranged_int(0); + x = echo_ranged_int(0,0,0); ok(x == 0, "echo_ranged_int() returned %d instead of 0\n", x); - x = echo_ranged_int(100); + x = echo_ranged_int(10,20,100); ok(x == 100, "echo_ranged_int() returned %d instead of 100\n", x); + x = echo_ranged_int2(40); + ok(x == 40, "echo_ranged_int() returned %d instead of 40\n", x); if (!old_windows_version) { diff --git a/dlls/rpcrt4/tests/server.idl b/dlls/rpcrt4/tests/server.idl index c7c7237..2e305c1 100644 --- a/dlls/rpcrt4/tests/server.idl +++ b/dlls/rpcrt4/tests/server.idl @@ -363,7 +363,8 @@ cpp_quote("#endif") const int RE_MAX = RE3; typedef [range(RE_MIN, RE_MAX)] enum renum renum_t; typedef [range(0, 100)] int rint_t; - rint_t echo_ranged_int([range(0, 100)] int n); + rint_t echo_ranged_int([range(0, 10)] int i, [range(0, 20)] int j, [range(0, 100)] int k); + rint_t echo_ranged_int2([range(0, 40)] int i); void get_ranged_enum([out] renum_t *re); void context_handle_test(void);

1 0

Alexandre Julliard : widl: Store the type format offset for function parameters in the variable object .
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: 977e15b76259929490ef2d4f3a3cda84f8886129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=977e15b76259929490ef2d4f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 12:23:01 2011 +0200 widl: Store the type format offset for function parameters in the variable object. --- tools/widl/proxy.c | 2 +- tools/widl/typegen.c | 31 +++++++++++++++++-------------- tools/widl/widltypes.h | 1 + 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/tools/widl/proxy.c b/tools/widl/proxy.c index 5d6b669..e0690e4 100644 --- a/tools/widl/proxy.c +++ b/tools/widl/proxy.c @@ -148,7 +148,7 @@ static int need_delegation_indirect(const type_t *iface) static void free_variable( const var_t *arg, const char *local_var_prefix ) { - unsigned int type_offset = arg->type->typestring_offset; + unsigned int type_offset = arg->typestring_offset; type_t *type = arg->type; write_parameter_conf_or_var_exprs(proxy, indent, local_var_prefix, PHASE_FREE, arg, FALSE); diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 14734cf..cadbef2 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -966,7 +966,7 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned *flags = 0; *stack_size = get_stack_size( var, &is_byval ); - *typestring_offset = var->type->typestring_offset; + *typestring_offset = var->typestring_offset; if (is_in) *flags |= IsIn; if (is_out) *flags |= IsOut; @@ -1005,7 +1005,10 @@ static unsigned char get_parameter_fc( const var_t *var, int is_return, unsigned *flags |= MustFree; if (type_array_is_decl_as_ptr(var->type) && var->type->details.array.ptr_tfsoff && get_pointer_fc( var->type, var->attrs, !is_return ) == RPC_FC_RP) + { + *typestring_offset = var->type->typestring_offset; *flags |= IsSimpleRef; + } break; case TGT_STRING: *flags |= MustFree; @@ -1207,12 +1210,12 @@ static unsigned int write_old_procformatstring_type(FILE *file, int indent, cons } else { - unsigned short offset = var->type->typestring_offset; + unsigned short offset = var->typestring_offset; - if (is_interpreted && is_array(var->type) && + if (!is_interpreted && is_array(var->type) && type_array_is_decl_as_ptr(var->type) && var->type->details.array.ptr_tfsoff) - offset = var->type->details.array.ptr_tfsoff; + offset = var->type->typestring_offset; if (is_return) print_file(file, indent, "0x52, /* FC_RETURN_PARAM */\n"); @@ -3611,7 +3614,7 @@ static int write_embedded_types(FILE *file, const attr_list_t *attrs, type_t *ty static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, type_pred_t pred, unsigned int *typeformat_offset) { - const var_t *var; + var_t *var; const statement_t *stmt; if (stmts) LIST_FOR_EACH_ENTRY( stmt, stmts, const statement_t, entry ) @@ -3633,16 +3636,16 @@ static unsigned int process_tfs_stmts(FILE *file, const statement_list_t *stmts, current_func = func; if (is_local(func->attrs)) continue; - if (!is_void(type_function_get_rettype(func->type))) - { - write_type_tfs( file, 2, func->attrs, type_function_get_rettype(func->type), - func->name, TYPE_CONTEXT_PARAM, typeformat_offset); - } + var = type_function_get_retval(func->type); + if (!is_void(var->type)) + var->typestring_offset = write_type_tfs( file, 2, func->attrs, var->type, func->name, + TYPE_CONTEXT_PARAM, typeformat_offset); if (type_get_function_args(func->type)) - LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), const var_t, entry ) - write_type_tfs( file, 2, var->attrs, var->type, var->name, - TYPE_CONTEXT_TOPLEVELPARAM, typeformat_offset ); + LIST_FOR_EACH_ENTRY( var, type_get_function_args(func->type), var_t, entry ) + var->typestring_offset = write_type_tfs( file, 2, var->attrs, var->type, var->name, + TYPE_CONTEXT_TOPLEVELPARAM, + typeformat_offset ); } } @@ -4606,7 +4609,7 @@ void assign_stub_out_args( FILE *file, int indent, const var_t *func, const char fprintf(file, " = NdrContextHandleInitialize(\n"); print_file(file, indent + 1, "&__frame->_StubMsg,\n"); print_file(file, indent + 1, "(PFORMAT_STRING)&__MIDL_TypeFormatString.Format[%d]);\n", - var->type->typestring_offset); + var->typestring_offset); break; case TGT_ARRAY: if (type_array_has_conformance(var->type)) diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 0e8bfeb..84e4467 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -436,6 +436,7 @@ struct _var_t { expr_t *eval; enum storage_class stgclass; unsigned int procstring_offset; + unsigned int typestring_offset; struct _loc_info_t loc_info;

1 0

Alexandre Julliard : widl: Pass variables around instead of types for function parameters.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: e2a92702edc3844f722e9227d5c53d832efd36b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2a92702edc3844f722e9227d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 19 11:54:42 2011 +0200 widl: Pass variables around instead of types for function parameters. --- tools/widl/typegen.c | 106 +++++++++++++++++++++++--------------------------- 1 files changed, 49 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e2a92702edc3844f722e9…

1 0

Alexandre Julliard : widl: Make the function return value a variable.
by Alexandre Julliard 19 Sep '11

19 Sep '11

Module: wine Branch: master Commit: c31948a775ecaaf3b761585cabecfd0491dc049a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c31948a775ecaaf3b761585ca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Sep 17 13:38:15 2011 +0200 widl: Make the function return value a variable. --- tools/widl/client.c | 29 ++++++++++++++--------------- tools/widl/parser.y | 3 ++- tools/widl/proxy.c | 25 ++++++++++++------------- tools/widl/typegen.c | 33 +++++++++++++++------------------ tools/widl/typetree.h | 9 +++++++-- tools/widl/widltypes.h | 2 +- 6 files changed, 51 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c31948a775ecaaf3b7615…

1 0

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 September 2011