November 2011 - Wine-Commits

Alex Henrie : shell32: Update Catalan translation.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 4bda215f2b0c6e746471dc4cdfa061400ab93f86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4bda215f2b0c6e746471dc4cd… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:49 2011 -0700 shell32: Update Catalan translation. --- dlls/shell32/shell32_Ca.rc | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/shell32/shell32_Ca.rc b/dlls/shell32/shell32_Ca.rc index a617770..cc34ba7 100644 --- a/dlls/shell32/shell32_Ca.rc +++ b/dlls/shell32/shell32_Ca.rc @@ -20,13 +20,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + SHBRSFORFOLDER_MSGBOX DIALOG 15, 40, 188, 192 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU | DS_MODALFRAME | DS_SETFONT | DS_3DLOOK CAPTION "Navegar per Carpeta" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", 1, 80, 176, 50, 12, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", 2, 134, 176, 50, 12, WS_GROUP | WS_TABSTOP LTEXT "", IDD_TITLE, 4, 4, 180, 12 LTEXT "", IDD_STATUS, 4, 25, 180, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", @@ -50,7 +52,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "&Fer Una Nova Carpeta", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "D'acord", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } SHELL_YESTOALL_MSGBOX DIALOG 200, 100, 280, 90 @@ -58,27 +60,27 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Missatge" FONT 8, "MS Shell Dlg" { - DEFPUSHBUTTON "&S", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "S a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "&Sí", IDYES, 34, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Sí a &tots", IDD_YESTOALL, 92, 69, 65, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&No", IDNO, 162, 69, 53, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancella", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 220, 69, 53, 14, WS_GROUP | WS_TABSTOP ICON "", IDD_ICON, 10, 10, 16, 16 LTEXT "", IDD_MESSAGE, 40, 10, 238, 52, 0 } SHELL_ABOUT_MSGBOX DIALOG 15, 40, 220, 152 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Quant a %s" +CAPTION "Quant al %s" FONT 10, "MS Shell Dlg" { DEFPUSHBUTTON "D'acord", IDOK, 153, 133, 60, 12, WS_TABSTOP - PUSHBUTTON "&Llicencia de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP + PUSHBUTTON "&Llicència de Wine", IDC_ABOUT_LICENSE, 153, 113, 60, 12, WS_TABSTOP LISTBOX IDC_ABOUT_LISTBOX, 8, 65, 137, 82, LBS_NOTIFY | WS_VSCROLL | WS_BORDER ICON "", stc1, 10, 10, 30, 30 LTEXT "", IDC_ABOUT_STATIC_TEXT1, 40, 10, 137, 10 LTEXT "", IDC_ABOUT_STATIC_TEXT2, 40, 22, 137, 10 LTEXT "Executant en %s", IDC_ABOUT_STATIC_TEXT3, 42, 34, 170, 10 - LTEXT "Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 + LTEXT "El Wine ha estat construit per:", IDC_ABOUT_WINE_TEXT, 8, 54, 204, 10 } SHELL_RUN_DLG DIALOG 0, 0, 227, 95 @@ -87,10 +89,10 @@ CAPTION "" FONT 8, "MS Shell Dlg" { ICON "", IDC_RUNDLG_ICON, 7, 11, 18, 20, WS_VISIBLE - LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i Wine el obrir per vs.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 - LTEXT "&Open:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 + LTEXT "Introdueix el nom d'un programa, carpeta, document, o recurs de web, i el Wine el obrirà per vostè.", IDC_RUNDLG_DESCRIPTION, 36, 11, 182, 18 + LTEXT "&Obrir:", IDC_RUNDLG_LABEL, 7, 39, 24, 10 CONTROL "", IDC_RUNDLG_EDITPATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 36, 37, 183, 100 DEFPUSHBUTTON "D'acord", IDOK, 62, 63, 50, 14, WS_TABSTOP - PUSHBUTTON "Cancella", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP + PUSHBUTTON "Cancel·la", IDCANCEL, 116, 63, 50, 14, WS_TABSTOP PUSHBUTTON "&Navega...", IDC_RUNDLG_BROWSE, 170, 63, 50, 14, WS_TABSTOP }

1 0

Alex Henrie : appwiz.cpl: Add Catalan translation.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: ffa8777883fac10ebc11a62a03b51af4d9217025 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffa8777883fac10ebc11a62a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:32 2011 -0700 appwiz.cpl: Add Catalan translation. --- dlls/appwiz.cpl/Ca.rc | 85 +++++++++++++++++++++++++++++++++++++++++++ dlls/appwiz.cpl/Makefile.in | 1 + 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Ca.rc b/dlls/appwiz.cpl/Ca.rc new file mode 100644 index 0000000..e411bf0 --- /dev/null +++ b/dlls/appwiz.cpl/Ca.rc @@ -0,0 +1,85 @@ +/* +* Add/Remove Programs English resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2005-2006 Jacek Caban +* +* 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 "res.h" + +LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT + +#pragma code_page(65001) /* UTF-8 */ + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lar/Desinstal·lar" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Per instal·lar un nou programa des de un disquet, disc compact, o el vostre disc dur, feu clic en Instal·la.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Instal·la...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "El següent programari es pot eliminar automàticament. Per treure un programa o modificar els seus components instal·lats, seleccioneu-lo de la llista i feu clic en Canvia/Treu.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "&Info. de suport", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 + CONTROL "&Modifica...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "&Treu", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Informació de Suport" +FONT 8, "MS Shell Dlg" +{ + CONTROL "D'acord", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "La següent informació es pot utilitzar per obtenir suport tècnic per a %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Editor:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Versió:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Contacte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Informació de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telèfon de Suport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Llegiu-me:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Actualitzacions de Producte:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Comentaris:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +} + +ID_DWL_DIALOG DIALOG 0, 0, 260, 95 +STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Instal·lador del Wine Gecko" +FONT 8, "MS Shell Dlg" +{ + LTEXT "El Wine no ha pogut trobar un paquet del Gecko que es necessita perquè les " \ + "aplicacions que inclouen HTML funcionin correctament. El Wine el pot descarregar i " \ + "instal·lar automàticament per vostè.\n\n" \ + "Nota: es recomana utilitzar els paquets de la vostra distribució en compte." \ + "Vegeu http://wiki.winehq.org/Gecko pels detalls.", + ID_DWL_STATUS, 10, 10, 240, 50, SS_LEFT + CONTROL "Progrés", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 40, 240, 12 + DEFPUSHBUTTON "&Instal·la", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Cancel·la", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP +} diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index 4d67b57..b28b61e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -9,6 +9,7 @@ C_SRCS = \ RC_SRCS = \ Bg.rc \ + Ca.rc \ Da.rc \ De.rc \ En.rc \

1 0

Jacek Caban : jscript: Get rid of no longer needed EXPRVAL_NAMEREF.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 82368f5cfea6dc4ebf91d13bab523aaebc190226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82368f5cfea6dc4ebf91d13ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:48 2011 +0100 jscript: Get rid of no longer needed EXPRVAL_NAMEREF. --- dlls/jscript/engine.c | 39 +++++---------------------------------- dlls/jscript/engine.h | 5 ----- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6567d68..62efc44 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -31,7 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NOVAL 0x0001 #define EXPR_NEWREF 0x0002 -#define EXPR_STRREF 0x0004 struct _return_type_t { enum{ @@ -154,11 +153,6 @@ static void exprval_release(exprval_t *val) if(val->u.idref.disp) IDispatch_Release(val->u.idref.disp); return; - case EXPRVAL_NAMEREF: - if(val->u.nameref.disp) - IDispatch_Release(val->u.nameref.disp); - SysFreeString(val->u.nameref.name); - return; case EXPRVAL_INVALID: SysFreeString(val->u.identifier); } @@ -179,8 +173,6 @@ static HRESULT exprval_value(script_ctx_t *ctx, exprval_t *val, jsexcept_t *ei, } return disp_propget(ctx, val->u.idref.disp, val->u.idref.id, ret, ei, NULL/*FIXME*/); - case EXPRVAL_NAMEREF: - break; case EXPRVAL_INVALID: return throw_type_error(ctx, ei, JS_E_UNDEFINED_VARIABLE, val->u.identifier); } @@ -1494,13 +1486,6 @@ HRESULT array_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flag hres = to_string(ctx, &val, ei, &str); VariantClear(&val); if(SUCCEEDED(hres)) { - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; - } - hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); SysFreeString(str); } @@ -1546,11 +1531,9 @@ HRESULT member_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla return hres; str = SysAllocString(expr->identifier); - if(flags & EXPR_STRREF) { - ret->type = EXPRVAL_NAMEREF; - ret->u.nameref.disp = obj; - ret->u.nameref.name = str; - return S_OK; + if(!str) { + IDispatch_Release(obj); + return E_OUTOFMEMORY; } hres = disp_get_id(ctx, obj, str, flags & EXPR_NEWREF ? fdexNameEnsure : 0, &id); @@ -2457,7 +2440,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla TRACE("\n"); - hres = expr_eval(ctx, expr->expression, EXPR_STRREF, ei, &exprval); + hres = expr_eval(ctx, expr->expression, 0, ei, &exprval); if(FAILED(hres)) return hres; @@ -2465,7 +2448,7 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla case EXPRVAL_IDREF: { IDispatchEx *dispex; - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); + hres = IDispatch_QueryInterface(exprval.u.idref.disp, &IID_IDispatchEx, (void**)&dispex); if(SUCCEEDED(hres)) { hres = IDispatchEx_DeleteMemberByDispID(dispex, exprval.u.idref.id); b = VARIANT_TRUE; @@ -2473,18 +2456,6 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } break; } - case EXPRVAL_NAMEREF: { - IDispatchEx *dispex; - - hres = IDispatch_QueryInterface(exprval.u.nameref.disp, &IID_IDispatchEx, (void**)&dispex); - if(SUCCEEDED(hres)) { - hres = IDispatchEx_DeleteMemberByName(dispex, exprval.u.nameref.name, - make_grfdex(ctx, fdexNameCaseSensitive)); - b = VARIANT_TRUE; - IDispatchEx_Release(dispex); - } - break; - } default: FIXME("unsupported type %d\n", exprval.type); hres = E_NOTIMPL; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index f2af36f..362e9d1 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -364,7 +364,6 @@ typedef struct { enum { EXPRVAL_VARIANT, EXPRVAL_IDREF, - EXPRVAL_NAMEREF, EXPRVAL_INVALID } type; union { @@ -373,10 +372,6 @@ typedef struct { IDispatch *disp; DISPID id; } idref; - struct { - IDispatch *disp; - BSTR name; - } nameref; BSTR identifier; } u; } exprval_t;

1 0

Jacek Caban : jscript: Use bytecode for delete on array expression implementation.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: facc2189d298ad0a76844c178fd2609e2fc7406c URL: http://source.winehq.org/git/wine.git/?a=commit;h=facc2189d298ad0a76844c178… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 30 10:14:22 2011 +0100 jscript: Use bytecode for delete on array expression implementation. --- dlls/jscript/compile.c | 30 +++++++++++++++++++++++++ dlls/jscript/engine.c | 52 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/engine.h | 1 + dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 7 ++++++ 5 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b7abdda..adcd749 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -301,6 +301,34 @@ static HRESULT compile_interp_fallback(compiler_ctx_t *ctx, expression_t *expr) return S_OK; } +static HRESULT compile_delete_expression(compiler_ctx_t *ctx, unary_expression_t *expr) +{ + HRESULT hres; + + switch(expr->expression->type) { + case EXPR_ARRAY: { + array_expression_t *array_expr = (array_expression_t*)expr->expression; + + hres = compile_expression(ctx, array_expr->member_expr); + if(FAILED(hres)) + return hres; + + hres = compile_expression(ctx, array_expr->expression); + if(FAILED(hres)) + return hres; + + if(push_instr(ctx, OP_delete) == -1) + return E_OUTOFMEMORY; + break; + } + default: + expr->expr.eval = delete_expression_eval; + return compile_interp_fallback(ctx, &expr->expr); + } + + return S_OK; +} + static HRESULT compile_literal(compiler_ctx_t *ctx, literal_t *literal) { switch(literal->type) { @@ -352,6 +380,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_comma_expression(ctx, (binary_expression_t*)expr); case EXPR_COND: return compile_conditional_expression(ctx, (conditional_expression_t*)expr); + case EXPR_DELETE: + return compile_delete_expression(ctx, (unary_expression_t*)expr); case EXPR_DIV: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_div); case EXPR_EQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 48633cf..6567d68 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2498,6 +2498,53 @@ HRESULT delete_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD fla } /* ECMA-262 3rd Edition 11.4.2 */ +static HRESULT interp_delete(exec_ctx_t *ctx) +{ + VARIANT *obj_var, *name_var; + IDispatchEx *dispex; + IDispatch *obj; + BSTR name; + BOOL ret; + HRESULT hres; + + TRACE("\n"); + + name_var = stack_pop(ctx); + obj_var = stack_pop(ctx); + + hres = to_object(ctx->parser->script, obj_var, &obj); + VariantClear(obj_var); + if(FAILED(hres)) { + VariantClear(name_var); + return hres; + } + + hres = to_string(ctx->parser->script, name_var, &ctx->ei, &name); + VariantClear(name_var); + if(FAILED(hres)) { + IDispatch_Release(obj); + return hres; + } + + hres = IDispatch_QueryInterface(obj, &IID_IDispatchEx, (void**)&dispex); + if(SUCCEEDED(hres)) { + hres = IDispatchEx_DeleteMemberByName(dispex, name, make_grfdex(ctx->parser->script, fdexNameCaseSensitive)); + ret = TRUE; + IDispatchEx_Release(dispex); + }else { + hres = S_OK; + ret = FALSE; + } + + IDispatch_Release(obj); + SysFreeString(name); + if(FAILED(hres)) + return hres; + + return stack_push_bool(ctx, ret); +} + +/* ECMA-262 3rd Edition 11.4.2 */ static HRESULT interp_void(exec_ctx_t *ctx) { VARIANT v; @@ -3469,5 +3516,8 @@ HRESULT compiled_expression_eval(script_ctx_t *ctx, expression_t *expr, DWORD fl if(FAILED(hres)) return hres; - return (expr->eval = interp_expression_eval)(ctx, expr, flags, ei, ret); + if(expr->eval == compiled_expression_eval) + expr->eval = interp_expression_eval; + + return expr->eval(ctx, expr, flags, ei, ret); } diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 58f12c7..f2af36f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -45,6 +45,7 @@ typedef struct _func_stack { X(add, 1, 0,0) \ X(bool, 1, ARG_INT, 0) \ X(bneg, 1, 0,0) \ + X(delete, 1, 0,0) \ X(div, 1, 0,0) \ X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 0912107..3fffbe9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1318,7 +1318,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - delete_expression_eval, + compiled_expression_eval, compiled_expression_eval, typeof_expression_eval, compiled_expression_eval, diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index c85907c..4f3d509 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -830,9 +830,16 @@ tmp = new Object(); tmp.test = false; ok((delete tmp.test) === true, "delete returned false"); ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); +ok(!("test" in tmp), "test is still in tmp after delete?"); for(iter in tmp) ok(false, "tmp has prop " + iter); +tmp = new Object(); +tmp.test = false; +ok((delete tmp["test"]) === true, "delete returned false"); +ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); +ok(!("test" in tmp), "test is still in tmp after delete?"); + tmp.testWith = true; with(tmp) ok(testWith === true, "testWith !== true");

1 0

Henri Verbeet : ddraw: Keep the primary surface mapped at the same address for early ddraw versions .
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 3a2921c5598b0ae9e17f7065ae06cce6a86ef225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a2921c5598b0ae9e17f7065a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:46 2011 +0100 ddraw: Keep the primary surface mapped at the same address for early ddraw versions. --- dlls/ddraw/surface.c | 10 +++++++++- dlls/wined3d/surface.c | 4 +++- dlls/wined3d/wined3d_private.h | 4 +++- include/wine/wined3d.h | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 05d9b2b..9bd6774 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5254,6 +5254,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr DDSURFACEDESC2 *desc, UINT mip_level, UINT version) { WINED3DPOOL pool = WINED3DPOOL_DEFAULT; + DWORD flags = WINED3D_SURFACE_MAPPABLE; enum wined3d_format_id format; DWORD usage = 0; HRESULT hr; @@ -5269,6 +5270,13 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { + /* Some applications assume that the primary surface will always be + * mapped at the same address. Some of those also assume that this + * address is valid even when the surface isn't mapped, and that + * updates done this way will be visible on the screen. The game Nox + * is such an application. */ + if (version == 1) + flags |= WINED3D_SURFACE_PIN_SYSMEM; usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; } @@ -5343,7 +5351,7 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr surface->first_attached = surface; hr = wined3d_surface_create(ddraw->wined3d_device, desc->dwWidth, desc->dwHeight, format, mip_level, - usage, pool, WINED3DMULTISAMPLE_NONE, 0, DefaultSurfaceType, WINED3D_SURFACE_MAPPABLE, + usage, pool, WINED3DMULTISAMPLE_NONE, 0, DefaultSurfaceType, flags, surface, &ddraw_surface_wined3d_parent_ops, &surface->wined3d_surface); if (FAILED(hr)) { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4110345..5ec4daa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -544,7 +544,7 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) * converted or NPOT surfaces. Also don't create a PBO for systemmem * surfaces. */ if (gl_info->supported[ARB_PIXEL_BUFFER_OBJECT] && (surface->flags & SFLAG_DYNLOCK) - && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2)) + && !(surface->flags & (SFLAG_PBO | SFLAG_CONVERTED | SFLAG_NONPOW2 | SFLAG_PIN_SYSMEM)) && (surface->resource.pool != WINED3DPOOL_SYSTEMMEM)) { struct wined3d_context *context; @@ -7186,6 +7186,8 @@ static HRESULT surface_init(struct wined3d_surface *surface, WINED3DSURFTYPE sur surface->flags = SFLAG_NORMCOORD; /* Default to normalized coords. */ if (flags & WINED3D_SURFACE_DISCARD) surface->flags |= SFLAG_DISCARD; + if (flags & WINED3D_SURFACE_PIN_SYSMEM) + surface->flags |= SFLAG_PIN_SYSMEM; if (lockable || format_id == WINED3DFMT_D16_LOCKABLE) surface->flags |= SFLAG_LOCKABLE; /* I'm not sure if this qualifies as a hack or as an optimization. It diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e524c3d..41e1388 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2140,6 +2140,7 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ #define SFLAG_DS_ONSCREEN 0x00800000 /* This is a depth / stencil surface, last modified onscreen. */ #define SFLAG_DS_OFFSCREEN 0x01000000 /* This is a depth / stencil surface, last modified offscreen. */ +#define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long @@ -2155,7 +2156,8 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_CLIENT | \ SFLAG_DIBSECTION | \ SFLAG_USERPTR | \ - SFLAG_PBO) + SFLAG_PBO | \ + SFLAG_PIN_SYSMEM) #define SFLAG_LOCATIONS (SFLAG_INSYSMEM | \ SFLAG_INTEXTURE | \ diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2f68f14..c79137e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1511,6 +1511,7 @@ enum wined3d_sysval_semantic #define WINED3D_SURFACE_MAPPABLE 0x00000001 #define WINED3D_SURFACE_DISCARD 0x00000002 +#define WINED3D_SURFACE_PIN_SYSMEM 0x00000004 struct wined3d_display_mode {

1 0

Alex Henrie : comctl32: Update Catalan translation.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: d8906da528dfa65f3f826b3a05de038b1eafc500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8906da528dfa65f3f826b3a0… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Nov 30 00:39:39 2011 -0700 comctl32: Update Catalan translation. --- dlls/comctl32/comctl_Ca.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/comctl_Ca.rc b/dlls/comctl32/comctl_Ca.rc index b95263b..d3533e1 100644 --- a/dlls/comctl32/comctl_Ca.rc +++ b/dlls/comctl32/comctl_Ca.rc @@ -18,13 +18,15 @@ LANGUAGE LANG_CATALAN, SUBLANG_DEFAULT +#pragma code_page(65001) /* UTF-8 */ + IDD_PROPSHEET DIALOG 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Propietats de %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "D'acord", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP - PUSHBUTTON "Cancella", IDCANCEL,58,122,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,58,122,50,14 PUSHBUTTON "&Aplica", IDC_APPLY_BUTTON,112,122,50,14,WS_DISABLED PUSHBUTTON "Ajuda", IDHELP,166,122,50,14,WS_TABSTOP|WS_GROUP CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS|WS_GROUP|WS_TABSTOP|TCS_MULTILINE,4,4,212,114 @@ -39,7 +41,7 @@ BEGIN PUSHBUTTON "< &Enrere", IDC_BACK_BUTTON,71,138,50,14 DEFPUSHBUTTON "&Proper >", IDC_NEXT_BUTTON,121,138,50,14 DEFPUSHBUTTON "Finalitza", IDC_FINISH_BUTTON,121,138,50,14 - PUSHBUTTON "Cancella", IDCANCEL,178,138,50,14 + PUSHBUTTON "Cancel·la", IDCANCEL,178,138,50,14 PUSHBUTTON "Ajuda", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN CONTROL "Tab", IDC_TABCONTROL,"SysTabControl32",WS_CLIPSIBLINGS | WS_DISABLED,7,7,258,5

1 0

Henri Verbeet : ddraw: Resize the swapchain window on mode changes in exclusive mode.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 82dd612d50f8557714f204ca6fa90bee571ca9df URL: http://source.winehq.org/git/wine.git/?a=commit;h=82dd612d50f8557714f204ca6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Nov 30 06:01:44 2011 +0100 ddraw: Resize the swapchain window on mode changes in exclusive mode. --- dlls/d3d10core/device.c | 6 ++++++ dlls/d3d8/device.c | 6 ++++++ dlls/d3d9/device.c | 6 ++++++ dlls/ddraw/ddraw.c | 36 +++++++++++++++++++++++++++++++++--- dlls/ddraw/tests/d3d.c | 5 +---- dlls/wined3d/device.c | 4 ++++ include/wine/wined3d.h | 1 + 7 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index 45b7c3a..2a84c98 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -1357,6 +1357,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par device->wined3d_device = wined3d_device; } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -1538,6 +1543,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index a8c042d..bbc69b4 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -2798,6 +2798,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -2999,6 +3004,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d8_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f8044ff..e5c9d1e 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3043,6 +3043,11 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + TRACE("device_parent %p.\n", device_parent); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -3247,6 +3252,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops d3d9_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index dfe7b37..098165a 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1008,9 +1008,6 @@ static HRESULT ddraw_set_display_mode(IDirectDrawImpl *ddraw, DWORD Width, DWORD /* TODO: Lose the primary surface */ hr = wined3d_device_set_display_mode(ddraw->wined3d_device, 0, &mode); - if (ddraw->cooperative_level & DDSCL_EXCLUSIVE) - SetWindowPos(ddraw->dest_window, HWND_TOP, 0, 0, Width, Height, SWP_SHOWWINDOW | SWP_NOACTIVATE); - wined3d_mutex_unlock(); switch(hr) @@ -5268,6 +5265,38 @@ static void CDECL device_parent_wined3d_device_created(struct wined3d_device_par TRACE("device_parent %p, device %p.\n", device_parent, device); } +static void CDECL device_parent_mode_changed(struct wined3d_device_parent *device_parent) +{ + struct IDirectDrawImpl *ddraw = ddraw_from_device_parent(device_parent); + MONITORINFO monitor_info; + HMONITOR monitor; + BOOL ret; + RECT *r; + + TRACE("device_parent %p.\n", device_parent); + + if (!(ddraw->cooperative_level & DDSCL_EXCLUSIVE) || !ddraw->swapchain_window) + { + TRACE("Nothing to resize.\n"); + return; + } + + monitor = MonitorFromWindow(ddraw->swapchain_window, MONITOR_DEFAULTTOPRIMARY); + monitor_info.cbSize = sizeof(monitor_info); + if (!(ret = GetMonitorInfoW(monitor, &monitor_info))) + { + ERR("Failed to get monitor info.\n"); + return; + } + + r = &monitor_info.rcMonitor; + TRACE("Resizing window %p to %s.\n", ddraw->swapchain_window, wine_dbgstr_rect(r)); + + if (!(ret = SetWindowPos(ddraw->swapchain_window, HWND_TOP, r->left, r->top, + r->right - r->left, r->bottom - r->top, SWP_SHOWWINDOW | SWP_NOACTIVATE))) + ERR("Failed to resize window.\n"); +} + static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface) @@ -5424,6 +5453,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent static const struct wined3d_device_parent_ops ddraw_wined3d_device_parent_ops = { device_parent_wined3d_device_created, + device_parent_mode_changed, device_parent_create_surface, device_parent_create_rendertarget, device_parent_create_depth_stencil, diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0a42083..153d39f 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -4175,10 +4175,7 @@ static void test_coop_level_mode_set(void) WM_WINDOWPOSCHANGING, WM_WINDOWPOSCHANGED, WM_SIZE, - /* WM_DISPLAYCHANGE, This message is received after WM_SIZE on native. However, the - * more important behaviour is that at the time the WM_SIZE message - * is processed SM_CXSCREEN and SM_CYSCREEN already have the new - * values. */ + WM_DISPLAYCHANGE, 0, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c71232..4c585d4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6033,6 +6033,10 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL if (device->focus_window == window) device->focus_window = NULL; else ERR("Window %p is not the focus window for device %p.\n", window, device); } + else if (message == WM_DISPLAYCHANGE) + { + device->device_parent->ops->mode_changed(device->device_parent); + } if (unicode) return CallWindowProcW(proc, window, message, wparam, lparam); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 1ee94b7..0ba3a08 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2066,6 +2066,7 @@ struct wined3d_device_parent struct wined3d_device_parent_ops { void (__cdecl *wined3d_device_created)(struct wined3d_device_parent *device_parent, struct wined3d_device *device); + void (__cdecl *mode_changed)(struct wined3d_device_parent *device_parent); HRESULT (__cdecl *create_surface)(struct wined3d_device_parent *device_parent, void *container_parent, UINT width, UINT height, enum wined3d_format_id format_id, DWORD usage, WINED3DPOOL pool, UINT level, WINED3DCUBEMAP_FACES face, struct wined3d_surface **surface);

1 0

André Hentschel : ntdll: Move a return out of a #ifdef .
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 3f90cb8c9e9c542faa5a8535dbea192b21aeb425 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f90cb8c9e9c542faa5a8535d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Nov 30 01:13:22 2011 +0100 ntdll: Move a return out of a #ifdef. --- dlls/ntdll/signal_sparc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/signal_sparc.c b/dlls/ntdll/signal_sparc.c index ac9ee9c..798397d 100644 --- a/dlls/ntdll/signal_sparc.c +++ b/dlls/ntdll/signal_sparc.c @@ -818,9 +818,9 @@ void signal_init_process(void) this is correct, because that is what x86 does, or it is harmful because it could obscure problems in user code */ __asm__("ta 6"); /* 6 == ST_FIX_ALIGN defined in sys/trap.h */ - return; #endif + return; error: perror("sigaction"); exit(1);

1 0

Frédéric Delanoy : gameux: Remove duplicate "if" condition.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: 5a04819709d355122d1882b418a0835bfdf5d23a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a04819709d355122d1882b41… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:50 2011 +0100 gameux: Remove duplicate "if" condition. --- dlls/gameux/gamestatistics.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c index 96b35d5..cfe14b9 100644 --- a/dlls/gameux/gamestatistics.c +++ b/dlls/gameux/gamestatistics.c @@ -176,8 +176,6 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats) } if(SUCCEEDED(hr)) - - if(SUCCEEDED(hr)) for(i=0; i<MAX_CATEGORIES; ++i) { if(lstrlenW(stats->categories[i].sName)==0)

1 0

Frédéric Delanoy : cmd: Move a global var to the file using it.
by Alexandre Julliard Nov. 30, 2011

Nov. 30, 2011

Module: wine Branch: master Commit: ad81871f1568df82c537643ff8947568390cc0f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad81871f1568df82c537643ff… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Nov 29 23:30:49 2011 +0100 cmd: Move a global var to the file using it. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5197297..a418d92 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -41,13 +41,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern HINSTANCE hinst; extern int defaultColor; extern BOOL echo_mode; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; +static HINSTANCE hinst; static struct env_stack *saved_environment; struct env_stack *pushd_directories; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1947884..94ce9de 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -31,8 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmd); -extern WCHAR inbuilt[][10]; -HINSTANCE hinst; +extern const WCHAR inbuilt[][10]; DWORD errorlevel; int defaultColor = 7; BOOL echo_mode = TRUE;

1 0