July 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Setting render target 0 to NULL in an application error.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 41346a1dae53bd941d97d7ec58e240557a37d4e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41346a1dae53bd941d97d7ec5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 27 12:54:52 2010 +0200 wined3d: Setting render target 0 to NULL in an application error. --- dlls/wined3d/device.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index be473d7..11a6b9a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5758,14 +5758,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetRenderTarget(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } - /* MSDN says that null disables the render target - but a device must always be associated with a render target - nope MSDN says that we return invalid call to a null rendertarget with an index of 0 - */ - if (RenderTargetIndex == 0 && pRenderTarget == NULL) { - FIXME("Trying to set render target 0 to NULL\n"); + /* Render target 0 can't be set to NULL. */ + if (!pRenderTarget && !RenderTargetIndex) + { + WARN("Trying to set render target 0 to NULL.\n"); return WINED3DERR_INVALIDCALL; } + if (pRenderTarget && !(((IWineD3DSurfaceImpl *)pRenderTarget)->resource.usage & WINED3DUSAGE_RENDERTARGET)) { FIXME("(%p)Trying to set the render target to a surface(%p) that wasn't created with a usage of WINED3DUSAGE_RENDERTARGET\n",This ,pRenderTarget); return WINED3DERR_INVALIDCALL;

1 0

Jacek Caban : jscript: Added support for Function.arguments property.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 922efb88bbdb56fa12149bdd6bd377934f8b3b3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=922efb88bbdb56fa12149bdd6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 11:31:01 2010 +0200 jscript: Added support for Function.arguments property. --- dlls/jscript/function.c | 80 ++++++++++++++++++++++++++++++++------------ dlls/jscript/tests/lang.js | 18 ++++++++++ 2 files changed, 76 insertions(+), 22 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index df46f1d..9f5fb3b 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -35,6 +35,7 @@ typedef struct { const WCHAR *src_str; DWORD src_len; DWORD length; + DispatchEx *arguments; } FunctionInstance; static inline FunctionInstance *function_from_vdisp(vdisp_t *vdisp) @@ -53,6 +54,7 @@ static const WCHAR lengthW[] = {'l','e','n','g','t','h',0}; static const WCHAR toStringW[] = {'t','o','S','t','r','i','n','g',0}; static const WCHAR applyW[] = {'a','p','p','l','y',0}; static const WCHAR callW[] = {'c','a','l','l',0}; +static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; static IDispatch *get_this(DISPPARAMS *dp) { @@ -157,29 +159,20 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS return S_OK; } -static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, DISPPARAMS *dp, jsexcept_t *ei, - IServiceProvider *caller, DispatchEx **ret) +static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, DispatchEx *arg_disp, + DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, DispatchEx **ret) { - DispatchEx *var_disp, *arg_disp; + DispatchEx *var_disp; + VARIANT var; HRESULT hres; - static const WCHAR argumentsW[] = {'a','r','g','u','m','e','n','t','s',0}; - hres = create_dispex(ctx, NULL, NULL, &var_disp); if(FAILED(hres)) return hres; - hres = create_arguments(ctx, (IDispatch*)_IDispatchEx_(&function->dispex), - dp, ei, caller, &arg_disp); - if(SUCCEEDED(hres)) { - VARIANT var; - - V_VT(&var) = VT_DISPATCH; - V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(arg_disp); - hres = jsdisp_propput_name(var_disp, argumentsW, &var, ei, caller); - jsdisp_release(arg_disp); - } - + V_VT(&var) = VT_DISPATCH; + V_DISPATCH(&var) = (IDispatch*)_IDispatchEx_(arg_disp); + hres = jsdisp_propput_name(var_disp, argumentsW, &var, ei, caller); if(SUCCEEDED(hres)) hres = init_parameters(var_disp, function, dp, ei, caller); if(FAILED(hres)) { @@ -194,7 +187,7 @@ static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, DI static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDispatch *this_obj, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - DispatchEx *var_disp; + DispatchEx *var_disp, *arg_disp; exec_ctx_t *exec_ctx; scope_chain_t *scope; HRESULT hres; @@ -204,21 +197,34 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return E_FAIL; } - hres = create_var_disp(ctx, function, dp, ei, caller, &var_disp); + hres = create_arguments(ctx, (IDispatch*)_IDispatchEx_(&function->dispex), + dp, ei, caller, &arg_disp); if(FAILED(hres)) return hres; + hres = create_var_disp(ctx, function, arg_disp, dp, ei, caller, &var_disp); + if(FAILED(hres)) { + jsdisp_release(arg_disp); + return hres; + } + hres = scope_push(function->scope_chain, var_disp, &scope); if(SUCCEEDED(hres)) { hres = create_exec_ctx(ctx, this_obj, var_disp, scope, &exec_ctx); scope_release(scope); } jsdisp_release(var_disp); - if(FAILED(hres)) - return hres; + if(SUCCEEDED(hres)) { + DispatchEx *prev_args; + + prev_args = function->arguments; + function->arguments = arg_disp; + hres = exec_source(exec_ctx, function->parser, function->source, EXECT_FUNCTION, ei, retv); + function->arguments = prev_args; - hres = exec_source(exec_ctx, function->parser, function->source, EXECT_FUNCTION, ei, retv); - exec_release(exec_ctx); + jsdisp_release(arg_disp); + exec_release(exec_ctx); + } return hres; } @@ -531,6 +537,35 @@ HRESULT Function_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAM return S_OK; } +static HRESULT Function_arguments(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FunctionInstance *function = (FunctionInstance*)jsthis->u.jsdisp; + HRESULT hres = S_OK; + + TRACE("\n"); + + switch(flags) { + case DISPATCH_PROPERTYGET: { + if(function->arguments) { + IDispatchEx_AddRef(_IDispatchEx_(function->arguments)); + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(function->arguments); + }else { + V_VT(retv) = VT_NULL; + } + break; + } + case DISPATCH_PROPERTYPUT: + break; + default: + FIXME("unimplemented flags %x\n", flags); + hres = E_NOTIMPL; + } + + return hres; +} + static void Function_destructor(DispatchEx *dispex) { FunctionInstance *This = (FunctionInstance*)dispex; @@ -544,6 +579,7 @@ static void Function_destructor(DispatchEx *dispex) static const builtin_prop_t Function_props[] = { {applyW, Function_apply, PROPF_METHOD|2}, + {argumentsW, Function_arguments, 0}, {callW, Function_call, PROPF_METHOD|1}, {lengthW, Function_length, 0}, {toStringW, Function_toString, PROPF_METHOD} diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 36a75f5..c3059be 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -69,11 +69,13 @@ function testFunc1(x, y) { ok(arguments["0"] === true, "arguments[0] is not true"); ok(arguments["1"] === "test", "arguments[1] is not \"test\""); ok(arguments.callee === testFunc1, "arguments.calee !== testFunc1"); + ok(testFunc1.arguments === arguments, "testFunc1.arguments = " + testFunc1.arguments); return true; } ok(testFunc1.length === 2, "testFunc1.length is not 2"); +ok(testFunc1.arguments === null, "testFunc1.arguments = " + testFunc1.arguments); ok(Object.prototype !== undefined, "Object.prototype is undefined"); ok(Object.prototype.prototype === undefined, "Object.prototype is not undefined"); @@ -109,6 +111,22 @@ ok(typeof(this) === "object", "typeof(this) is not object"); ok(testFunc1(true, "test") === true, "testFunc1 not returned true"); +ok(testFunc1.arguments === null, "testFunc1.arguments = " + testFunc1.arguments); + +function testRecFunc(x) { + ok(testRecFunc.arguments === arguments, "testRecFunc.arguments = " + testRecFunc.arguments); + if(x) { + testRecFunc(false); + ok(testRecFunc.arguments === arguments, "testRecFunc.arguments = " + testRecFunc.arguments); + ok(testRecFunc.arguments[0] === true, "testRecFunc.arguments.x = " + testRecFunc.arguments[0]); + } +} + +testRecFunc.arguments = 5; +ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); +testRecFunc(true); +ok(testRecFunc.arguments === null, "testRecFunc.arguments = " + testRecFunc.arguments); + tmp = (function() {1;})(); ok(tmp === undefined, "tmp = " + tmp); tmp = eval("1;");

1 0

Jacek Caban : jscript: Use generic object constants for Math constants.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: e81811b3a0b03f9e0ac7089fe1ad8f35631bc24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e81811b3a0b03f9e0ac7089fe… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 27 11:53:49 2010 +0200 jscript: Use generic object constants for Math constants. --- dlls/jscript/math.c | 109 ++++++++++++-------------------------------------- 1 files changed, 26 insertions(+), 83 deletions(-) diff --git a/dlls/jscript/math.c b/dlls/jscript/math.c index 8de9df9..88f0210 100644 --- a/dlls/jscript/math.c +++ b/dlls/jscript/math.c @@ -57,81 +57,6 @@ static const WCHAR sinW[] = {'s','i','n',0}; static const WCHAR sqrtW[] = {'s','q','r','t',0}; static const WCHAR tanW[] = {'t','a','n',0}; -static HRESULT math_constant(DOUBLE val, WORD flags, VARIANT *retv) -{ - switch(flags) { - case DISPATCH_PROPERTYGET: - V_VT(retv) = VT_R8; - V_R8(retv) = val; - return S_OK; - case DISPATCH_PROPERTYPUT: - return S_OK; - } - - FIXME("unhandled flags %x\n", flags); - return E_NOTIMPL; -} - -/* ECMA-262 3rd Edition 15.8.1.1 */ -static HRESULT Math_E(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_E, flags, retv); -} - -/* ECMA-262 3rd Edition 15.8.1.4 */ -static HRESULT Math_LOG2E(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_LOG2E, flags, retv); -} - -/* ECMA-262 3rd Edition 15.8.1.4 */ -static HRESULT Math_LOG10E(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_LOG10E, flags, retv); -} - -static HRESULT Math_LN2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_LN2, flags, retv); -} - -static HRESULT Math_LN10(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_LN10, flags, retv); -} - -/* ECMA-262 3rd Edition 15.8.1.6 */ -static HRESULT Math_PI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_PI, flags, retv); -} - -static HRESULT Math_SQRT2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_SQRT2, flags, retv); -} - -static HRESULT Math_SQRT1_2(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) -{ - TRACE("\n"); - return math_constant(M_SQRT1_2, flags, retv); -} - /* ECMA-262 3rd Edition 15.8.2.12 */ static HRESULT Math_abs(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) @@ -563,14 +488,6 @@ static HRESULT Math_tan(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARA } static const builtin_prop_t Math_props[] = { - {EW, Math_E, 0}, - {LN10W, Math_LN10, 0}, - {LN2W, Math_LN2, 0}, - {LOG10EW, Math_LOG10E, 0}, - {LOG2EW, Math_LOG2E, 0}, - {PIW, Math_PI, 0}, - {SQRT1_2W, Math_SQRT1_2, 0}, - {SQRT2W, Math_SQRT2, 0}, {absW, Math_abs, PROPF_METHOD|1}, {acosW, Math_acos, PROPF_METHOD|1}, {asinW, Math_asin, PROPF_METHOD|1}, @@ -603,8 +520,24 @@ static const builtin_info_t Math_info = { HRESULT create_math(script_ctx_t *ctx, DispatchEx **ret) { DispatchEx *math; + unsigned i; + VARIANT v; HRESULT hres; + struct { + const WCHAR *name; + DOUBLE val; + }constants[] = { + {EW, M_E}, /* ECMA-262 3rd Edition 15.8.1.1 */ + {LN10W, M_LN10}, /* ECMA-262 3rd Edition 15.8.1.2 */ + {LN2W, M_LN2}, /* ECMA-262 3rd Edition 15.8.1.3 */ + {LOG2EW, M_LOG2E}, /* ECMA-262 3rd Edition 15.8.1.4 */ + {LOG10EW, M_LOG10E}, /* ECMA-262 3rd Edition 15.8.1.5 */ + {PIW, M_PI}, /* ECMA-262 3rd Edition 15.8.1.6 */ + {SQRT1_2W, M_SQRT1_2}, /* ECMA-262 3rd Edition 15.8.1.7 */ + {SQRT2W, M_SQRT2}, /* ECMA-262 3rd Edition 15.8.1.8 */ + }; + math = heap_alloc_zero(sizeof(DispatchEx)); if(!math) return E_OUTOFMEMORY; @@ -615,6 +548,16 @@ HRESULT create_math(script_ctx_t *ctx, DispatchEx **ret) return hres; } + V_VT(&v) = VT_R8; + for(i=0; i < sizeof(constants)/sizeof(*constants); i++) { + V_R8(&v) = constants[i].val; + hres = jsdisp_propput_const(math, constants[i].name, &v); + if(FAILED(hres)) { + jsdisp_release(math); + return hres; + } + } + *ret = math; return S_OK; }

1 0

Alexandre Julliard : configure: Only output the disabled crosstest rule once.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: a070f9b0389333c939f1a92cfaf2b7e4eaa0e8b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a070f9b0389333c939f1a92cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 20:53:12 2010 +0200 configure: Only output the disabled crosstest rule once. --- aclocal.m4 | 13 ++++++++----- configure | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 67c7997..f67e938 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -357,10 +357,6 @@ testclean:: .PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) crosstest" - else - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" fi]) } @@ -416,7 +412,14 @@ wine_fn_config_symlink () @./config.status $ac_link distclean:: \$(RM) $ac_link" -}]) +} + +if test "x$CROSSTEST_DISABLE" != x +then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false" +fi]) dnl **** Define helper function to append a file to a makefile file list **** dnl diff --git a/configure b/configure index a966b1b..c8b1709 100755 --- a/configure +++ b/configure @@ -14234,10 +14234,6 @@ testclean:: .PHONY: $ac_dir/__crosstest__ $ac_dir/__crosstest__: $ac_dir/Makefile __builddeps__ dummy @cd $ac_dir && \$(MAKE) crosstest" - else - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ -"crosstest: - @echo \"crosstest is not supported (mingw not installed?)\" && false" fi fi } @@ -14297,6 +14293,13 @@ wine_fn_config_symlink () distclean:: \$(RM) $ac_link" } + +if test "x$CROSSTEST_DISABLE" != x +then + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ +"crosstest: + @echo \"crosstest is not supported (mingw not installed?)\" && false" +fi ac_config_links="$ac_config_links dlls/wineps.drv/generic.ppd:dlls/wineps.drv/generic.ppd" test "$srcdir" = "." || wine_fn_config_symlink dlls/wineps.drv/generic.ppd if test "x$enable_fonts" != xno; then

1 0

Alexandre Julliard : configure: Build the import libraries without recursing when possible.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: b0e48e1e2bb285fe9dd31c6c77505f0b51819178 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0e48e1e2bb285fe9dd31c6c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 26 21:06:28 2010 +0200 configure: Build the import libraries without recursing when possible. --- aclocal.m4 | 20 +++++++++++++++----- configure | 18 ++++++++++++++---- 2 files changed, 29 insertions(+), 9 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index f67e938..4bf7229 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -224,6 +224,11 @@ wine_fn_config_dll () ac_implibsrc=$[4] ac_file="dlls/$ac_dir/lib$ac_implib" ac_deps="tools/widl tools/winebuild tools/winegcc include" + ac_implibflags="" + + case $ac_dir in + *16) ac_implibflags=" -m16" ;; + esac wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" @@ -265,16 +270,18 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT +$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec +$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" +$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$[@] --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec" fi if test "$ac_dir" != "$ac_implib" @@ -390,7 +397,10 @@ install-dev:: $ac_dir all __tooldeps__: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy - @cd $ac_dir && \$(MAKE)"]) + @cd $ac_dir && \$(MAKE)" + case $ac_dir in + tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; + esac]) } wine_fn_config_makerules () diff --git a/configure b/configure index c8b1709..d62ffa8 100755 --- a/configure +++ b/configure @@ -14091,6 +14091,11 @@ wine_fn_config_dll () ac_implibsrc=$4 ac_file="dlls/$ac_dir/lib$ac_implib" ac_deps="tools/widl tools/winebuild tools/winegcc include" + ac_implibflags="" + + case $ac_dir in + *16) ac_implibflags=" -m16" ;; + esac wine_fn_all_dir_rules dlls/$ac_dir "dlls/Makedll.rules \$(MAKEDEP)" @@ -14134,16 +14139,18 @@ $ac_file.cross.a: dlls/$ac_dir/Makefile dummy then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.$IMPLIBEXT -$ac_file.$IMPLIBEXT: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.$IMPLIBEXT +$ac_file.def: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --def -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec +$ac_file.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(TARGETFLAGS)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec install-dev:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-dev" if test "x$CROSSTEST_DISABLE" = x then wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "__builddeps__: $ac_file.cross.a -$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec dlls/$ac_dir/Makefile $ac_deps - @cd dlls/$ac_dir && \$(MAKE) lib$ac_implib.cross.a" +$ac_file.cross.a: dlls/$ac_dir/$ac_dir.spec \$(WINEBUILD) + \$(WINEBUILD) \$(CROSSTARGET:%=-b %)$ac_implibflags -w --implib -o \$@ --export \$(SRCDIR)/dlls/$ac_dir/$ac_dir.spec" fi if test "$ac_dir" != "$ac_implib" @@ -14270,6 +14277,9 @@ all __tooldeps__: $ac_dir .PHONY: $ac_dir $ac_dir: $ac_dir/Makefile libs/port dummy @cd $ac_dir && \$(MAKE)" + case $ac_dir in + tools/winebuild) wine_fn_append_rule ALL_MAKEFILE_DEPENDS "\$(WINEBUILD): $ac_dir" ;; + esac fi }

1 0

Alexandre Julliard : configure: Send the flex error output to config.log.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 27816c7c321536cbe4ece7b0432abd080344794f URL: http://source.winehq.org/git/wine.git/?a=commit;h=27816c7c321536cbe4ece7b04… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 28 11:04:46 2010 +0200 configure: Send the flex error output to config.log. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index d62ffa8..7661617 100755 --- a/configure +++ b/configure @@ -4214,7 +4214,7 @@ cat >conftest.l <<EOF } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&1 +if $FLEX -t conftest.l >/dev/null 2>&5 then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } diff --git a/configure.ac b/configure.ac index b7373b2..5ba22c4 100644 --- a/configure.ac +++ b/configure.ac @@ -243,7 +243,7 @@ cat >conftest.l <<EOF } %% EOF -if $FLEX -t conftest.l >/dev/null 2>&1 +if $FLEX -t conftest.l >/dev/null 2>&AS_MESSAGE_LOG_FD then AC_MSG_RESULT([yes]) else

1 0

Andrew Talbot : advapi32: Constify some variables.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 8d5f7fe13f8570116197bf7fdb349e6854b0cfbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d5f7fe13f8570116197bf7fd… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 26 21:54:20 2010 +0100 advapi32: Constify some variables. --- dlls/advapi32/advapi32_misc.h | 4 ++-- dlls/advapi32/security.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/advapi32_misc.h b/dlls/advapi32/advapi32_misc.h index 6ec18f6..4d0a0e9 100644 --- a/dlls/advapi32/advapi32_misc.h +++ b/dlls/advapi32/advapi32_misc.h @@ -24,7 +24,7 @@ const char * debugstr_sid(PSID sid); BOOL ADVAPI_IsLocalComputer(LPCWSTR ServerName); BOOL ADVAPI_GetComputerSid(PSID sid); -BOOL lookup_local_wellknown_name(LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); -BOOL lookup_local_user_name(LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +BOOL lookup_local_wellknown_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); +BOOL lookup_local_user_name(const LSA_UNICODE_STRING*, PSID, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE, BOOL*); #endif /* __WINE_ADVAPI32MISC_H */ diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2338aca..aa7f336 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2764,7 +2764,7 @@ static BOOL match_account( ULONG idx, const LSA_UNICODE_STRING *account ) /* * Helper function for LookupAccountNameW */ -BOOL lookup_local_wellknown_name( LSA_UNICODE_STRING *account_and_domain, +BOOL lookup_local_wellknown_name( const LSA_UNICODE_STRING *account_and_domain, PSID Sid, LPDWORD cbSid, LPWSTR ReferencedDomainName, LPDWORD cchReferencedDomainName, @@ -2827,7 +2827,7 @@ BOOL lookup_local_wellknown_name( LSA_UNICODE_STRING *account_and_domain, return ret; } -BOOL lookup_local_user_name( LSA_UNICODE_STRING *account_and_domain, +BOOL lookup_local_user_name( const LSA_UNICODE_STRING *account_and_domain, PSID Sid, LPDWORD cbSid, LPWSTR ReferencedDomainName, LPDWORD cchReferencedDomainName,

1 0

Travis Athougies : wpp: Fixed bug in preventing add_text_to_macro from handling macros over 1 kb large .
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: 4858654031d169e28ca848ae69878bab822436ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=4858654031d169e28ca848ae6… Author: Travis Athougies <iammisc(a)gmail.com> Date: Mon Jul 26 17:55:29 2010 +0000 wpp: Fixed bug in preventing add_text_to_macro from handling macros over 1 kb large. --- libs/wpp/ppl.l | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wpp/ppl.l b/libs/wpp/ppl.l index 6e0c7a1..0588e5d 100644 --- a/libs/wpp/ppl.l +++ b/libs/wpp/ppl.l @@ -1455,7 +1455,7 @@ static void add_text_to_macro(const char *text, int len) if(mep->curargalloc - mep->curargsize <= len+1) /* +1 for '\0' */ { char *new_curarg; - int new_alloc = mep->curargalloc + (ALLOCBLOCKSIZE > len+1) ? ALLOCBLOCKSIZE : len+1; + int new_alloc = mep->curargalloc + ((ALLOCBLOCKSIZE > len+1) ? ALLOCBLOCKSIZE : len+1); new_curarg = pp_xrealloc(mep->curarg, new_alloc * sizeof(mep->curarg[0])); if(!new_curarg) return;

1 0

Michael Stefaniuc : oleaut32: Use IsEqualGUID instead of memcmp to compare GUIDs.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: c165fd743cc5b7ff7b82db0debf18999b3be4749 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c165fd743cc5b7ff7b82db0de… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 27 01:00:51 2010 +0200 oleaut32: Use IsEqualGUID instead of memcmp to compare GUIDs. --- dlls/oleaut32/typelib2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 1096ea8..92d4ab0 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -317,7 +317,7 @@ static int ctl2_find_guid( while (offset != -1) { guidentry = (MSFT_GuidEntry *)&This->typelib_segment_data[MSFT_SEG_GUID][offset]; - if (!memcmp(guidentry, guid, sizeof(GUID))) return offset; + if (IsEqualGUID(guidentry, guid)) return offset; offset = guidentry->next_hash; } @@ -1695,7 +1695,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnAddRefTypeInfo( impinfo.oGuid = guid_offset; *phRefType = ctl2_alloc_importinfo(This->typelib, &impinfo)+1; - if(!memcmp(&guid.guid, &IID_IDispatch, sizeof(GUID))) + if(IsEqualGUID(&guid.guid, &IID_IDispatch)) This->typelib->typelib_header.dispatchpos = *phRefType; } @@ -2469,7 +2469,7 @@ static HRESULT WINAPI ICreateTypeInfo2_fnLayOut( return hres; } - if(!memcmp(&typeattr->guid, &IID_IDispatch, sizeof(IDispatch))) + if(IsEqualGUID(&typeattr->guid, &IID_IDispatch)) This->typeinfo->flags |= TYPEFLAG_FDISPATCHABLE; This->typeinfo->datatype2 += (typeattr->cFuncs<<16) + 1;

1 0

Michael Stefaniuc : shdocvw: Add the Romanian translation.
by Alexandre Julliard 28 Jul '10

28 Jul '10

Module: wine Branch: master Commit: a246beabebe6dc50d5068a9eb27d21aa4caa3cb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a246beabebe6dc50d5068a9eb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Jul 27 01:01:10 2010 +0200 shdocvw: Add the Romanian translation. --- dlls/shdocvw/Makefile.in | 1 + dlls/shdocvw/Ro.rc | 60 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 0 deletions(-) diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index bff1a3d..f2f91f8 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -34,6 +34,7 @@ RC_SRCS = \ Ko.rc \ Lt.rc \ Nl.rc \ + Ro.rc \ Uk.rc \ shdocvw.rc diff --git a/dlls/shdocvw/Ro.rc b/dlls/shdocvw/Ro.rc new file mode 100644 index 0000000..38c51ca --- /dev/null +++ b/dlls/shdocvw/Ro.rc @@ -0,0 +1,60 @@ +/* + * Copyright 2010 Alexander N. Sørnes <alex(a)thehandofagony.com> + * Copyright 2010 Michael Stefaniuc + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +#pragma code_page(65001) + +IDD_BROWSE_OPEN DIALOG 10, 10, 210, 70 +STYLE DS_MODALFRAME | WS_CAPTION +CAPTION "Deschide URL-ul" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Specificați URL-ul pe care doriți să îl deschideți în Internet Explorer",-1,35, 5, 160,15 + LTEXT "Deschide:", -1, 2, 32, 30, 15 + EDITTEXT IDC_BROWSE_OPEN_URL, 35, 30, 170, 13 + DEFPUSHBUTTON "&OK", IDOK, 35, 50, 50, 15 + PUSHBUTTON "&Renunță", IDCANCEL, 95, 50, 50, 15 +} + +IDR_BROWSE_MAIN_MENU MENU +{ + POPUP "&Fișier" + { + POPUP "&Nou" + { + MENUITEM "&Fereastră" ID_BROWSE_NEW_WINDOW + } + MENUITEM "&Deschidere...", ID_BROWSE_OPEN + MENUITEM "&Salvează", ID_BROWSE_SAVE + MENUITEM "S&alvare ca...", ID_BROWSE_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "&Format tipărire...", ID_BROWSE_PRINT_FORMAT + MENUITEM "T&ipărire...", ID_BROWSE_PRINT + MENUITEM "Pre&vizualizare imprimare...", ID_BROWSE_PRINT_PREVIEW + MENUITEM SEPARATOR + MENUITEM "&Proprietăți...", ID_BROWSE_PROPERTIES + } + POPUP "&Ajutor" + { + MENUITEM "&Despre Internet Explorer...", ID_BROWSE_ABOUT + } +}

1 0