September 2011 - Wine-Commits

Francois Gouget : kernel32/tests: Skip some tests if not allowed to modify the image file execution options.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 752bb66b654e69a87c56b52a352104eea265f790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=752bb66b654e69a87c56b52a3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:40:52 2011 +0200 kernel32/tests: Skip some tests if not allowed to modify the image file execution options. --- dlls/kernel32/tests/heap.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 26bc58f..634e14d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -724,6 +724,11 @@ static void test_debug_heap( const char *argv0, DWORD flags ) if (!strcmp( keyname + strlen(keyname) - 3, ".so" )) keyname[strlen(keyname) - 3] = 0; err = RegCreateKeyA( HKEY_LOCAL_MACHINE, keyname, &hkey ); + if (err == ERROR_ACCESS_DENIED) + { + skip("Not authorized to change the image file execution options\n"); + return; + } ok( !err, "failed to create '%s' error %u\n", keyname, err ); if (err) return;

1 0

Francois Gouget : quartz/tests: Skip some tests if not allowed to register filters.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: e5e2304427c2ea7dab662fdb39a109cac1060969 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5e2304427c2ea7dab662fdb3… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:42:15 2011 +0200 quartz/tests: Skip some tests if not allowed to register filters. --- dlls/quartz/tests/filtergraph.c | 59 +++++++------ dlls/quartz/tests/filtermapper.c | 177 ++++++++++++++++++++----------------- 2 files changed, 128 insertions(+), 108 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e5e2304427c2ea7dab662…

1 0

Francois Gouget : ntdll/tests: Skip some tests if not allowed to modify image file execution options.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: 344ef82b68411ac3115e5e1dcc2596fecfd9a5f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=344ef82b68411ac3115e5e1dc… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:41:27 2011 +0200 ntdll/tests: Skip some tests if not allowed to modify image file execution options. --- dlls/ntdll/tests/reg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index 8f44a1d..5ca14eb 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -1198,6 +1198,11 @@ static void test_redirection(void) pRtlInitUnicodeString( &str, classes64W ); status = pNtCreateKey( &key64, KEY_WOW64_64KEY | KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); + if (status == STATUS_ACCESS_DENIED) + { + skip("Not authorized to modify the Classes key\n"); + return; + } ok( status == STATUS_SUCCESS, "NtCreateKey failed: 0x%08x\n", status ); pRtlInitUnicodeString( &str, classes32W );

1 0

André Hentschel : winex11: Multiply the error tolerance by the table caused error magnification.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

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 Sept. 19, 2011

Sept. 19, 2011

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 Sept. 19, 2011

Sept. 19, 2011

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 : d3dxof: Fix printing NULL strings.
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

Module: wine Branch: master Commit: cb6a8125a9b2acbc4085714a1f7c6bade2621125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb6a8125a9b2acbc4085714a1… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 18 19:50:11 2011 +0200 d3dxof: Fix printing NULL strings. --- dlls/d3dxof/d3dxof.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index b8f0f00..8678396 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -575,7 +575,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetData(IDirectXFileData* iface, LPCS { IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); - TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, szMember, pcbSize, ppvData); + TRACE("(%p/%p)->(%s,%p,%p)\n", This, iface, debugstr_a(szMember), pcbSize, ppvData); if (!pcbSize || !ppvData) return DXFILEERR_BADVALUE;

1 0

Alexandre Julliard : widl: Store the type format offset for function parameters in the variable object .
by Alexandre Julliard Sept. 19, 2011

Sept. 19, 2011

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 Sept. 19, 2011

Sept. 19, 2011

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 Sept. 19, 2011

Sept. 19, 2011

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