October 2010 - Wine-commits

Henri Verbeet : d3d10core: Rename texture2d.c to texture.c.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 81c3f289a3c8768c9b98e859fc5749fc75538e30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c3f289a3c8768c9b98e859f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:00 2010 +0200 d3d10core: Rename texture2d.c to texture.c. --- dlls/d3d10core/Makefile.in | 2 +- dlls/d3d10core/{texture2d.c => texture.c} | 0 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10core/Makefile.in b/dlls/d3d10core/Makefile.in index 8a7239c..4557741 100644 --- a/dlls/d3d10core/Makefile.in +++ b/dlls/d3d10core/Makefile.in @@ -10,7 +10,7 @@ C_SRCS = \ inputlayout.c \ shader.c \ state.c \ - texture2d.c \ + texture.c \ utils.c \ view.c diff --git a/dlls/d3d10core/texture2d.c b/dlls/d3d10core/texture.c similarity index 100% rename from dlls/d3d10core/texture2d.c rename to dlls/d3d10core/texture.c

1 0

Henri Verbeet : d3d10core: Add a stub ID3D10Texture3D implementation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 0d4e0bc9babdbb619dfd97719526cd841db10a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4e0bc9babdbb619dfd97719… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:01 2010 +0200 d3d10core: Add a stub ID3D10Texture3D implementation. --- dlls/d3d10core/d3d10core_private.h | 13 +++ dlls/d3d10core/device.c | 26 +++++- dlls/d3d10core/tests/device.c | 40 ++++++++- dlls/d3d10core/texture.c | 175 ++++++++++++++++++++++++++++++++++++ 4 files changed, 250 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0d4e0bc9babdbb619dfd9…

1 0

Henri Verbeet : wined3d: Consistently use Map/Unmap for mapping resources.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 95469309d6f82fe91e78c94e59984fcd75cefc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95469309d6f82fe91e78c94e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 14 13:04:02 2010 +0200 wined3d: Consistently use Map/Unmap for mapping resources. --- dlls/d3d8/cubetexture.c | 5 ++- dlls/d3d8/surface.c | 4 +- dlls/d3d8/texture.c | 4 +- dlls/d3d8/volume.c | 5 ++- dlls/d3d8/volumetexture.c | 5 ++- dlls/d3d9/cubetexture.c | 5 ++- dlls/d3d9/surface.c | 4 +- dlls/d3d9/texture.c | 4 +- dlls/d3d9/volume.c | 4 +- dlls/d3d9/volumetexture.c | 6 ++-- dlls/ddraw/surface.c | 21 +++++------- dlls/wined3d/cubetexture.c | 12 +++--- dlls/wined3d/device.c | 33 ++++++++++--------- dlls/wined3d/surface.c | 70 ++++++++++++++++++++-------------------- dlls/wined3d/surface_base.c | 51 +++++++++++++++-------------- dlls/wined3d/surface_gdi.c | 64 ++++++++++--------------------------- dlls/wined3d/texture.c | 12 +++--- dlls/wined3d/volume.c | 11 ++++-- dlls/wined3d/volumetexture.c | 12 +++--- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 20 ++++++------ 21 files changed, 166 insertions(+), 188 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=95469309d6f82fe91e78c…

1 0

Jacek Caban : jscript: Don't lookup global variables on function invocation .
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 35968b97551f577d903a872163f3d1ea8f0abbb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35968b97551f577d903a87216… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 15:21:13 2010 +0200 jscript: Don't lookup global variables on function invocation. --- dlls/jscript/engine.c | 17 +++++++---------- dlls/jscript/engine.h | 11 +++-------- dlls/jscript/function.c | 4 ++-- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.c | 4 ++-- dlls/jscript/tests/run.c | 6 ++++++ 6 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8e43f70..55ac3a6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -179,7 +179,7 @@ void scope_release(scope_chain_t *scope) } HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t *var_disp, - scope_chain_t *scope, exec_ctx_t **ret) + scope_chain_t *scope, BOOL is_global, exec_ctx_t **ret) { exec_ctx_t *ctx; @@ -188,6 +188,7 @@ HRESULT create_exec_ctx(script_ctx_t *script_ctx, IDispatch *this_obj, jsdisp_t return E_OUTOFMEMORY; ctx->ref = 1; + ctx->is_global = is_global; if(this_obj) ctx->this_obj = this_obj; @@ -410,7 +411,7 @@ static BOOL lookup_global_members(script_ctx_t *ctx, BSTR identifier, exprval_t return FALSE; } -HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, exec_type_t exec_type, +HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *source, BOOL from_eval, jsexcept_t *ei, VARIANT *retv) { script_ctx_t *script = parser->script; @@ -447,7 +448,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so if(!name) return E_OUTOFMEMORY; - if(!lookup_global_members(parser->script, name, NULL)) + if(!ctx->is_global || !lookup_global_members(parser->script, name, NULL)) hres = jsdisp_get_id(ctx->var_disp, var->identifier, fdexNameEnsure, &id); SysFreeString(name); if(FAILED(hres)) @@ -489,14 +490,10 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so return hres; } - if(retv && (exec_type == EXECT_EVAL || rt.type == RT_RETURN)) - *retv = val; - else { - if (retv) { - VariantInit(retv); - } + if(!retv || (!from_eval && rt.type != RT_RETURN)) VariantClear(&val); - } + if(retv) + *retv = val; return S_OK; } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 1e7b041..c1997a1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -102,6 +102,7 @@ struct _exec_ctx_t { scope_chain_t *scope_chain; jsdisp_t *var_disp; IDispatch *this_obj; + BOOL is_global; }; static inline void exec_addref(exec_ctx_t *ctx) @@ -109,15 +110,9 @@ static inline void exec_addref(exec_ctx_t *ctx) ctx->ref++; } -typedef enum { - EXECT_PROGRAM, - EXECT_FUNCTION, - EXECT_EVAL -} exec_type_t; - void exec_release(exec_ctx_t*); -HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,exec_ctx_t**); -HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,exec_type_t,jsexcept_t*,VARIANT*); +HRESULT create_exec_ctx(script_ctx_t*,IDispatch*,jsdisp_t*,scope_chain_t*,BOOL,exec_ctx_t**); +HRESULT exec_source(exec_ctx_t*,parser_ctx_t*,source_elements_t*,BOOL,jsexcept_t*,VARIANT*); typedef struct _statement_t statement_t; typedef struct _expression_t expression_t; diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 2bcc918..0fd6cff 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -209,7 +209,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis hres = scope_push(function->scope_chain, var_disp, &scope); if(SUCCEEDED(hres)) { - hres = create_exec_ctx(ctx, this_obj, var_disp, scope, &exec_ctx); + hres = create_exec_ctx(ctx, this_obj, var_disp, scope, FALSE, &exec_ctx); scope_release(scope); } jsdisp_release(var_disp); @@ -218,7 +218,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis prev_args = function->arguments; function->arguments = arg_disp; - hres = exec_source(exec_ctx, function->parser, function->source, EXECT_FUNCTION, ei, retv); + hres = exec_source(exec_ctx, function->parser, function->source, FALSE, ei, retv); function->arguments = prev_args; jsdisp_release(arg_disp); diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 21d9201..8655d8a 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -371,7 +371,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return throw_syntax_error(ctx, ei, hres, NULL); } - hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, EXECT_EVAL, ei, retv); + hres = exec_source(ctx->exec_ctx, parser_ctx, parser_ctx->source, TRUE, ei, retv); parser_release(parser_ctx); return hres; diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 079db3d..ab56696 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -97,14 +97,14 @@ static HRESULT exec_global_code(JScript *This, parser_ctx_t *parser_ctx) jsexcept_t jsexcept; HRESULT hres; - hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, &exec_ctx); + hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, TRUE, &exec_ctx); if(FAILED(hres)) return hres; IActiveScriptSite_OnEnterScript(This->site); memset(&jsexcept, 0, sizeof(jsexcept)); - hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, EXECT_PROGRAM, &jsexcept, NULL); + hres = exec_source(exec_ctx, parser_ctx, parser_ctx->source, FALSE, &jsexcept, NULL); VariantClear(&jsexcept.var); exec_release(exec_ctx); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5efdcfb..de4d872 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1214,11 +1214,17 @@ static void run_tests(void) parse_script_a("var testPropGet"); CHECK_CALLED(global_propget_d); + SET_EXPECT(global_propget_d); + parse_script_a("eval('var testPropGet;');"); + CHECK_CALLED(global_propget_d); + SET_EXPECT(global_notexists_d); parse_script_a("var notExists; notExists = 1;"); CHECK_CALLED(global_notexists_d); parse_script_a("function f() { var testPropGet; }"); + parse_script_a("(function () { var testPropGet; })();"); + parse_script_a("(function () { eval('var testPropGet;'); })();"); parse_script_a("ok((testObj instanceof Object) === false, 'testObj is instance of Object');");

1 0

Paul Vriens : taskmgr: Remove a useless commented line.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 0d4c5c87761975cdb6b310f07179429625167947 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4c5c87761975cdb6b310f07… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Oct 13 21:06:22 2010 +0200 taskmgr: Remove a useless commented line. --- programs/taskmgr/Da.rc | 1 - programs/taskmgr/De.rc | 1 - programs/taskmgr/En.rc | 1 - programs/taskmgr/Fr.rc | 1 - programs/taskmgr/He.rc | 1 - programs/taskmgr/It.rc | 1 - programs/taskmgr/Ja.rc | 1 - programs/taskmgr/Ko.rc | 1 - programs/taskmgr/Lt.rc | 1 - programs/taskmgr/Nl.rc | 1 - programs/taskmgr/No.rc | 1 - programs/taskmgr/Pt.rc | 2 -- programs/taskmgr/Ro.rc | 1 - programs/taskmgr/Ru.rc | 1 - programs/taskmgr/Si.rc | 1 - programs/taskmgr/Sv.rc | 1 - programs/taskmgr/Tr.rc | 1 - programs/taskmgr/Uk.rc | 1 - programs/taskmgr/Zh.rc | 2 -- 19 files changed, 0 insertions(+), 21 deletions(-) diff --git a/programs/taskmgr/Da.rc b/programs/taskmgr/Da.rc index 8554bc5..92bf45d 100644 --- a/programs/taskmgr/Da.rc +++ b/programs/taskmgr/Da.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/De.rc b/programs/taskmgr/De.rc index c31e3b2..569fce6 100644 --- a/programs/taskmgr/De.rc +++ b/programs/taskmgr/De.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,121,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/En.rc b/programs/taskmgr/En.rc index 0074e7b..eddc1ee 100644 --- a/programs/taskmgr/En.rc +++ b/programs/taskmgr/En.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Fr.rc b/programs/taskmgr/Fr.rc index f084f39..a3121d7 100644 --- a/programs/taskmgr/Fr.rc +++ b/programs/taskmgr/Fr.rc @@ -212,7 +212,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,161,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/He.rc b/programs/taskmgr/He.rc index d5ce06b..02b5834 100644 --- a/programs/taskmgr/He.rc +++ b/programs/taskmgr/He.rc @@ -213,7 +213,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN EXSTYLE WS_EX_LAYOUTRTL diff --git a/programs/taskmgr/It.rc b/programs/taskmgr/It.rc index f7517c2..7e15983 100644 --- a/programs/taskmgr/It.rc +++ b/programs/taskmgr/It.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ja.rc b/programs/taskmgr/Ja.rc index 495996d..171aedf 100644 --- a/programs/taskmgr/Ja.rc +++ b/programs/taskmgr/Ja.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Ko.rc b/programs/taskmgr/Ko.rc index efe94ae..645d4fd 100644 --- a/programs/taskmgr/Ko.rc +++ b/programs/taskmgr/Ko.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" diff --git a/programs/taskmgr/Lt.rc b/programs/taskmgr/Lt.rc index 75847d6..062d931 100644 --- a/programs/taskmgr/Lt.rc +++ b/programs/taskmgr/Lt.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Nl.rc b/programs/taskmgr/Nl.rc index 53e081b..e91fd63 100644 --- a/programs/taskmgr/Nl.rc +++ b/programs/taskmgr/Nl.rc @@ -202,7 +202,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,125,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/No.rc b/programs/taskmgr/No.rc index 2e9c239..d03fb86 100644 --- a/programs/taskmgr/No.rc +++ b/programs/taskmgr/No.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Pt.rc b/programs/taskmgr/Pt.rc index f169516..3ce7fe9 100644 --- a/programs/taskmgr/Pt.rc +++ b/programs/taskmgr/Pt.rc @@ -344,7 +344,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" @@ -405,7 +404,6 @@ END LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ro.rc b/programs/taskmgr/Ro.rc index fbc6e62..0a0a650 100644 --- a/programs/taskmgr/Ro.rc +++ b/programs/taskmgr/Ro.rc @@ -205,7 +205,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,135,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Ru.rc b/programs/taskmgr/Ru.rc index c0d87f3..81c2492 100644 --- a/programs/taskmgr/Ru.rc +++ b/programs/taskmgr/Ru.rc @@ -210,7 +210,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,160,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Si.rc b/programs/taskmgr/Si.rc index 20e5a1c..3ec4e21 100644 --- a/programs/taskmgr/Si.rc +++ b/programs/taskmgr/Si.rc @@ -209,7 +209,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,120,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Sv.rc b/programs/taskmgr/Sv.rc index 1a244a5..9fba1f8 100644 --- a/programs/taskmgr/Sv.rc +++ b/programs/taskmgr/Sv.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,130,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Tr.rc b/programs/taskmgr/Tr.rc index 9573cde..77ca968 100644 --- a/programs/taskmgr/Tr.rc +++ b/programs/taskmgr/Tr.rc @@ -207,7 +207,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Uk.rc b/programs/taskmgr/Uk.rc index 81568c7..e2093ab 100644 --- a/programs/taskmgr/Uk.rc +++ b/programs/taskmgr/Uk.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,147,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" diff --git a/programs/taskmgr/Zh.rc b/programs/taskmgr/Zh.rc index 6ae6ace..33d27fd 100644 --- a/programs/taskmgr/Zh.rc +++ b/programs/taskmgr/Zh.rc @@ -211,7 +211,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg" @@ -667,7 +666,6 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 END -/*IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210*/ IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 9, "MS Shell Dlg"

1 0

Anders Jonsson : cryptdlg: Add Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 89845fc9e80d2d06693b781bb975bc992c14e66b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89845fc9e80d2d06693b781bb… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:04:23 2010 +0200 cryptdlg: Add Swedish translation. --- dlls/cryptdlg/Makefile.in | 1 + dlls/cryptdlg/cryptdlg_Sv.rc | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/cryptdlg/Makefile.in b/dlls/cryptdlg/Makefile.in index 079cf7a..2122165 100644 --- a/dlls/cryptdlg/Makefile.in +++ b/dlls/cryptdlg/Makefile.in @@ -18,6 +18,7 @@ RC_SRCS = \ cryptdlg_Pl.rc \ cryptdlg_Pt.rc \ cryptdlg_Ro.rc \ + cryptdlg_Sv.rc \ cryptdlg_Uk.rc @MAKE_DLL_RULES@ diff --git a/dlls/cryptdlg/cryptdlg_Sv.rc b/dlls/cryptdlg/cryptdlg_Sv.rc new file mode 100644 index 0000000..b09f82d --- /dev/null +++ b/dlls/cryptdlg/cryptdlg_Sv.rc @@ -0,0 +1,40 @@ +/* + * cryptdlg dll resources + * + * Copyright 2010 Anders Jonsson + * + * 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 "cryptres.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CERT_POLICY "Certifikatspolicy" + IDS_POLICY_ID "Policy-identifierare: " + IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" + IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" + IDS_CPS "CPS" /* Certification Practice Statement */ + IDS_USER_NOTICE "Användarmeddelande" + IDS_QUALIFIER "Qualifier" + IDS_NOTICE_REF "Meddelandereferens" + IDS_ORGANIZATION "Organisation=" + IDS_NOTICE_NUM "Meddelandenummer=" + IDS_NOTICE_TEXT "Meddelandetext=" +}

1 0

Anders Jonsson : inetcpl.cpl: Update Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 6667a6bc8a9ee629a6f9c815c0691c4d9855d81e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6667a6bc8a9ee629a6f9c815c… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:17:34 2010 +0200 inetcpl.cpl: Update Swedish translation. --- dlls/inetcpl.cpl/cpl_Sv.rc | 19 ++++++++++++++++++- 1 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index 102f934..c152db3 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -31,11 +31,28 @@ BEGIN IDS_CPL_INFO "Konfigurera Wines webbläsare och tillhörande inställningar" END +/* "General" propsheet */ +IDD_GENERAL DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "Allmänt" +BEGIN + + GROUPBOX " Startsida ", IDC_STATIC, 4, 4, 312, 52 + LTEXT "Du kan välja vilken adress som ska användas som startsida.", + IDC_STATIC, 58, 10, 252, 10 + EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL + PUSHBUTTON "&Aktuell sida", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "&Förvald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "&Blank sida", IDC_HOME_BLANK, 230, 36, 80, 14 + +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Content" +CAPTION "Innehåll" BEGIN GROUPBOX " Certifikat ", IDC_STATIC, 4, 4, 312, 50

1 0

Anders Jonsson : taskkill: Update Swedish translation.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: 87a138f331a0baa19ba2f4f74b847d4f70497e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=87a138f331a0baa19ba2f4f74… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Oct 13 21:02:19 2010 +0200 taskkill: Update Swedish translation. --- programs/taskkill/Sv.rc | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/Sv.rc b/programs/taskkill/Sv.rc index 209abdc..8246e56 100644 --- a/programs/taskkill/Sv.rc +++ b/programs/taskkill/Sv.rc @@ -39,5 +39,6 @@ STRINGTABLE STRING_TERM_PROC_SEARCH, "Tvingade fram nedstängning av processen \"%s\" med PID %u.\n" STRING_SEARCH_FAILED, "Fel: Kunde inte hitta processen \"%s\".\n" STRING_ENUM_FAILED, "Fel: Kunde inte räkna upp processlistan.\n" - STRING_TERMINATE_FAILED, "Fel: Kunde inte avbryta processen \"%s\".\n" + STRING_TERMINATE_FAILED, "Fel: Kunde inte avsluta processen \"%s\".\n" + STRING_SELF_TERMINATION, "Fel: Processen får inte avsluta sig själv.\n" }

1 0

Jacek Caban : mshtml: Fixed the first ReportData invocation when binding from objects created by BindToObject .
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: e0ef2d177443d7768c565e7c401e74b3be2feab8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ef2d177443d7768c565e7c4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Oct 14 00:51:18 2010 +0200 mshtml: Fixed the first ReportData invocation when binding from objects created by BindToObject. --- dlls/urlmon/binding.c | 3 ++- dlls/urlmon/tests/url.c | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index ca2b91d..99aaf02 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1566,7 +1566,8 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I set_binding_sink(binding->protocol, PROTSINK(binding), BINDINF(binding)); if(binding_ctx->redirect_url) IBindStatusCallback_OnProgress(binding->callback, 0, 0, BINDSTATUS_REDIRECTING, binding_ctx->redirect_url); - report_data(binding, 0, 0, 0); + report_data(binding, BSCF_FIRSTDATANOTIFICATION | (binding_ctx->download_state == END_DOWNLOAD ? BSCF_LASTDATANOTIFICATION : 0), + 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), BINDINF(binding), PI_APARTMENTTHREADED|PI_MIMEVERIFICATION, 0); diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 03a95fd..818fff9 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -189,7 +189,7 @@ static IInternetProtocolSink *protocol_sink = NULL; static IBinding *current_binding; static HANDLE complete_event, complete_event2; static HRESULT binding_hres; -static BOOL have_IHttpNegotiate2, use_bscex; +static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot; static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort; static WCHAR cache_file_name[MAX_PATH]; @@ -1601,6 +1601,9 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW download_state); data_available = TRUE; + if(bind_to_object && !is_async_prot) + ok(grfBSCF == (BSCF_FIRSTDATANOTIFICATION|BSCF_LASTDATANOTIFICATION), "grfBSCF = %x\n", grfBSCF); + ok(pformatetc != NULL, "pformatetx == NULL\n"); if(pformatetc) { if (mime_type[0]) { @@ -2452,6 +2455,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) callback_read = !(flags & BINDTEST_NO_CALLBACK_READ); no_callback = (flags & BINDTEST_NO_CALLBACK) != 0; test_abort = (flags & BINDTEST_ABORT) != 0; + is_async_prot = protocol == HTTP_TEST || protocol == HTTPS_TEST || protocol == FTP_TEST || protocol == WINETEST_TEST; } static void test_BindToStorage(int protocol, DWORD flags, DWORD t)

1 0

Joel Holdsworth : shdocvw: Replaced iexplore. bmp with a tango compliant toolstrip.
by Alexandre Julliard 14 Oct '10

14 Oct '10

Module: wine Branch: master Commit: a19defdf4c4da88eb93144197e5dcc1866c50a51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19defdf4c4da88eb93144197… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Oct 13 22:14:04 2010 +0100 shdocvw: Replaced iexplore.bmp with a tango compliant toolstrip. --- dlls/shdocvw/Makefile.in | 3 + dlls/shdocvw/ietoolbar.bmp | Bin 3170 -> 24698 bytes dlls/shdocvw/ietoolbar.svg | 285 ++++++++++++++++++++++++++++++++++++++++++++ dlls/shdocvw/iexplore.c | 2 +- 4 files changed, 289 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a19defdf4c4da88eb9314…

1 0