September 2011 - Wine-commits

Jacek Caban : vbscript: Added concatenation expression parser/ compiler support.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e06017b2a37ebfcc635641816229fd6a00641b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06017b2a37ebfcc635641816… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:47 2011 +0200 vbscript: Added concatenation expression parser/compiler support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b398d85..9e59fe1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -236,6 +236,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) switch(expr->type) { case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); + case EXPR_CONCAT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1661700..7ee58a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,12 @@ static HRESULT interp_equal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_concat(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static const instr_func_t op_funcs[] = { #define X(x,n,a,b) interp_ ## x, OP_LIST diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 82a60a9..b47360c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_CONCAT, EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ef12328..756cf6a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression +%type <expression> ConcatExpression AdditiveExpression %type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -141,6 +141,10 @@ EqualityExpression | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } ConcatExpression + : AdditiveExpression { $$ = $1; } + | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } + +AdditiveExpression : LiteralExpression /* FIXME */ { $$ = $1; } | CallExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 7835eb2..2abbc9d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -89,6 +89,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added interp_concat implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: fad15f782a9b70c0c5a924e6735bf7ef30502333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad15f782a9b70c0c5a924e67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:57 2011 +0200 vbscript: Added interp_concat implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7ee58a2..90531fb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -369,8 +369,26 @@ static HRESULT interp_equal(exec_ctx_t *ctx) static HRESULT interp_concat(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarCat(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = {

1 0

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Norwegian translation .
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 996f71e1bf4b736791983a90679a66403bd21951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=996f71e1bf4b736791983a906… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:28:20 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Norwegian translation. --- po/nb_NO.po | 50 +++++++++++++++++++++++++++++++++----------------- 1 files changed, 33 insertions(+), 17 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index 0717981..39a739a 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -8043,38 +8043,45 @@ msgstr "" "prosedyren arves av påkalleren.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" -msgstr "Hjelp til CD\n" +msgstr "Hjelp til CD.\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" -msgstr "Hjelp til CHDIR\n" +msgstr "Hjelp til CHDIR.\n" #: cmd.rc:43 msgid "CLS clears the console screen.\n" msgstr "CLS tømmer konsollskjermen\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" -msgstr "Hjelp til COPY\n" +msgstr "Hjelp til COPY.\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" -msgstr "Hjelp til CTTY\n" +msgstr "Hjelp til CTTY.\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" -msgstr "Hjelp til DATE\n" +msgstr "Hjelp til DATE.\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" -msgstr "Hjelp til DEL\n" +msgstr "Hjelp til DEL.\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" -msgstr "Hjelp til DIR\n" +msgstr "Hjelp til DIR.\n" #: cmd.rc:59 msgid "" @@ -8097,8 +8104,9 @@ msgstr "" "et @-tegn foran den.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" -msgstr "Hjelp til ERASE\n" +msgstr "Hjelp til ERASE.\n" #: cmd.rc:69 msgid "" @@ -8140,10 +8148,11 @@ msgstr "" "GOTO har ingen effekt når den brukes interaktivt.\n" #: cmd.rc:84 +#, fuzzy msgid "" "HELP <command> shows brief help details on a topic.\n" "HELP without an argument shows all CMD built-in commands.\n" -msgstr "Hjelp til HELP\n" +msgstr "Hjelp til HELP.\n" #: cmd.rc:94 #, fuzzy @@ -8181,12 +8190,14 @@ msgstr "" "Du kan vise en stasjons volumnavn med VOL-kommandoen.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" -msgstr "Hjelp til MD\n" +msgstr "Hjelp til MD.\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" -msgstr "Hjelp til MKDIR\n" +msgstr "Hjelp til MKDIR.\n" #: cmd.rc:111 msgid "" @@ -8294,21 +8305,24 @@ msgstr "" "fil.\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" -msgstr "Hjelp til REN\n" +msgstr "Hjelp til REN.\n" #: cmd.rc:157 #, fuzzy msgid "RENAME <filename> renames a file.\n" -msgstr "Hjelp til RENAME\n" +msgstr "Hjelp til RENAME.\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" -msgstr "Hjelp til RD\n" +msgstr "Hjelp til RD.\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" -msgstr "Hjelp til RMDIR\n" +msgstr "Hjelp til RMDIR.\n" #: cmd.rc:178 msgid "" @@ -8357,8 +8371,9 @@ msgstr "" "effekt hvis det brukes fra kommandolinjen.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" -msgstr "Hjelp til TIME\n" +msgstr "Hjelp til TIME.\n" #: cmd.rc:187 msgid "Sets the window title for the cmd window, syntax TITLE [string]\n" @@ -8400,8 +8415,9 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER viser versjonnummeret til CMD\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" -msgstr "Hjelp til VOL\n" +msgstr "Hjelp til VOL.\n" #: cmd.rc:209 msgid ""

1 0

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 3f2ef4ac58e34ed664fb452f1ee15d2f34a2f5dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f2ef4ac58e34ed664fb452f1… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Sep 11 22:55:46 2011 +0900 po: Update Japanese translation. --- po/ja.po | 211 ++++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 118 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f2ef4ac58e34ed664fb4…

1 0

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e1b47ebbc05484f9434588271212c12dd6b6a62e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1b47ebbc05484f9434588271… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Sep 9 21:46:39 2011 +0200 po: Update French translation. --- po/fr.po | 88 ++++++++++++++++++++++++++++--------------------------------- 1 files changed, 40 insertions(+), 48 deletions(-) diff --git a/po/fr.po b/po/fr.po index 5d23e65..1644926 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7948,7 +7948,6 @@ msgstr "" "HELP sans argument affiche toutes les commandes intégrées de CMD.\n" #: cmd.rc:94 -#, fuzzy msgid "" "IF is used to conditionally execute a command.\n" "\n" @@ -7961,9 +7960,9 @@ msgid "" msgstr "" "IF est utilisé pour exécuter une commande de façon conditionnelle.\n" "\n" -"Syntaxe :\tIF [NOT] EXIST fichier commande\n" -"IF [NOT] chaîne1==chaîne2 commande\n" -"IF [NOT] ERRORLEVEL nombre commande\n" +"Syntaxe : IF [NOT] EXIST fichier commande\n" +" IF [NOT] chaîne1==chaîne2 commande\n" +" IF [NOT] ERRORLEVEL nombre commande\n" "\n" "Dans la deuxième forme de la commande, chaîne1 et chaîne2 doivent être\n" "entre guillemets. La comparaison est insensible à la casse.\n" @@ -8045,7 +8044,6 @@ msgstr "" "la dernière commande avant qu'elle ne disparaisse de l'écran.\n" #: cmd.rc:149 -#, fuzzy msgid "" "PROMPT sets the command-line prompt.\n" "\n" @@ -8083,13 +8081,13 @@ msgstr "" "$q Signe = $t Heure courante $v Version de cmd\n" "\n" "Notez qu'entrer la commande PROMPT sans texte d'invite remet l'invite\n" -"à sa valeur par défaut, à savoir la lettre du lecteur courant suivie de\n" -"son répertoire courant et d'un signe « plus grand que » (>).\n" +"à sa valeur par défaut, à savoir le répertoire courant (incluant la lettre\n" +"du lecteur courant) suivi d'un signe « plus grand que » (>).\n" "(c.-à-d. la commande PROMPT $p$g).\n" "\n" "L'invite peut aussi être adaptée en modifiant la variable d'environnement\n" -"PROMPT ; ainsi la commande « SET PROMPT=texte » a le même effet que « PROMPT " -"texte »\n" +"PROMPT ; ainsi la commande « SET PROMPT=texte » a le même effet que « PROMPT " +"texte ».\n" #: cmd.rc:153 msgid "" @@ -8326,7 +8324,6 @@ msgstr "" "au système d'exploitation ou au shell où vous avez invoqué cmd.\n" #: cmd.rc:288 -#, fuzzy msgid "" "CMD built-in commands are:\n" "ASSOC\t\tShow or modify file extension associations\n" @@ -8401,6 +8398,7 @@ msgstr "" "TYPE\t\tAffiche le contenu d'un fichier texte\n" "VER\t\tAffiche la version de cmd utilisée.\n" "VOL\t\tAffiche le nom de volume d'un lecteur de disque\n" +"XCOPY\t\tCopie des fichiers ou répertoires sources vers une destination\n" "EXIT\t\tQuitte CMD\n" "\n" "Entrez HELP <commande> pour plus d'informations sur les commandes ci-dessus\n" @@ -8642,7 +8640,6 @@ msgid "Default gateway" msgstr "Passerelle par défaut" #: net.rc:27 -#, fuzzy msgid "" "The syntax of this command is:\n" "\n" @@ -8658,7 +8655,7 @@ msgstr "" " -ou-\n" "NET commande /HELP\n" "\n" -"où « commande » peut être HELP, START, STOP ou USE\n" +"où « commande » peut être HELP, START, STOP ou USE.\n" #: net.rc:28 msgid "" @@ -10621,7 +10618,6 @@ msgstr "" "le recréer !" #: winecfg.rc:80 -#, fuzzy msgctxt "Drive letter" msgid "Letter" msgstr "Lettre" @@ -10866,26 +10862,23 @@ msgstr "" "Options :\n" #: wineconsole.rc:49 -#, fuzzy msgid "" " --backend={user|curses} Choosing user will spawn a new window, curses " "will\n" " try to setup the current terminal as a Wine " "console.\n" msgstr "" -" --backend={user|curses} Utilisez « user » pour utiliser une nouvelle " +" --backend={user|curses} Utilisez « user » pour utiliser une nouvelle " "fenêtre\n" -" « curses » pour essayer de convertir le " -"terminal courant en console Wine\n" +" « curses » pour tenter de convertir le " +"terminal courant en console Wine.\n" #: wineconsole.rc:51 -#, fuzzy msgid " <command> The Wine program to launch in the console.\n" msgstr "" -" <commande> Le programme Wine à exécuter dans la console\n" +" <commande> Le programme Wine à exécuter dans la console.\n" #: wineconsole.rc:52 -#, fuzzy msgid "" "\n" "Example:\n" @@ -10894,9 +10887,9 @@ msgid "" "\n" msgstr "" "\n" -"Exemple :\n" +"Exemple :\n" " wineconsole cmd\n" -"Démarre l'interpréteur de commandes de Wine dans une console Wine\n" +"Démarre l'interpréteur de commandes de Wine dans une console Wine.\n" "\n" #: winedbg.rc:35 @@ -11522,7 +11515,6 @@ msgid "D" msgstr "R" #: xcopy.rc:77 -#, fuzzy msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n" @@ -11557,7 +11549,7 @@ msgid "" "\t\tthan source.\n" "\n" msgstr "" -"XCOPY - Copie des fichiers ou répertoires sources vers une destination\n" +"XCOPY - Copie des fichiers ou répertoires sources vers une destination.\n" "\n" "Syntaxe :\n" "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" @@ -11567,31 +11559,31 @@ msgstr "" "\n" "[/I] Supposer que la destination est un répertoire si elle n'existe pas et " "que l'on copie plus\n" -"\td'un fichier\n" -"[/S] Copier les répertoires et sous-répertoires\n" +" d'un fichier.\n" +"[/S] Copier les répertoires et sous-répertoires.\n" "[/E] Copier les répertoires et sous-répertoires, y compris ceux qui sont " -"vides\n" -"[/Q] Ne pas afficher la liste des fichiers copiés (mode silencieux)\n" -"[/F] Afficher les source et destination complètes lors de la copie\n" -"[/L] Simuler la copie, en montrant le nom des fichiers qui seraient copiés\n" -"[/W] Demander confirmation avant de démarrer la copie\n" -"[/T] Créer une structure de répertoires vides, mais ne pas copier les " -"fichiers\n" -"[/Y] Ne pas demander de confirmation lors de l'écrasement des fichiers\n" -"[/-Y] Demander une confirmation lors de l'écrasement de fichiers\n" -"[/P] Interroger l'utilisateur avant de copier chaque fichier source\n" -"[/N] Copier en utilisant les noms courts\n" -"[/U] Copier uniquement les fichiers qui existent déjà dans la destination\n" -"[/R] Écraser les fichiers en lecture seule\n" -"[/H] Inclure les fichiers cachés et système dans la copie\n" -"[/C] Continuer même si une erreur survient pendant la copie\n" -"[/A] Copier uniquement les fichiers qui ont l'attribut archive défini\n" -"[/M] Copier uniquement les fichiers qui ont l'attribut archive défini ; " -"supprime\n" -"\tensuite l'attribut\n" -"[/D | /D:m-d-y] Copier uniquement les nouveaux fichiers, ou ceux modifiés " -"après la date spécifiée.\n" +"vides.\n" +"[/Q] Ne pas afficher les fichiers copiés (mode silencieux).\n" +"[/F] Afficher les sources et destination complètes lors de la copie.\n" +"[/L] Simuler la copie, en montrant le nom des fichiers qui seraient " +"copiés.\n" +"[/W] Demander confirmation avant de démarrer la copie.\n" +"[/T] Créer une structure de répertoires vides, mais ne copie pas les " +"fichiers.\n" +"[/Y] Demander une confirmation lors de l'écrasement de fichiers.\n" +"[/-Y] Demander une confirmation lors de l'écrasement de fichiers.\n" +"[/P] Interroger l'utilisateur avant de copier chaque fichier source.\n" +"[/N] Copier en utilisant les noms courts.\n" +"[/U] Ne copier que les fichiers existant déjà dans la destination.\n" +"[/R] Écraser les fichiers en lecture seule.\n" +"[/H] Inclure les fichiers cachés et système dans la copie.\n" +"[/C] Continuer même si une erreur survient pendant la copie.\n" +"[/A] Ne copier que les fichiers ayant l'attribut archive défini.\n" +"[/M] Ne copier que les fichiers ayant l'attribut archive défini ; supprime\n" +" ensuite l'attribut.\n" +"[/D | /D:m-d-y] Ne copier que les nouveaux fichiers, ou ceux modifiés après " +"la date spécifiée.\n" "\t\tSi aucune date n'est fournie, ne copier que si le fichier de destination " "est plus ancien\n" -"\t\tque le fichier source\n" +"\t\tque le fichier source.\n" "\n"

1 0

Francois Gouget : winefile: Always use the same name for the Wine File Manager.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 661c9c1c2c0e06e32d7749046628f1740a1ddd32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=661c9c1c2c0e06e32d7749046… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:17:10 2011 +0200 winefile: Always use the same name for the Wine File Manager. --- po/ar.po | 26 +++++++++++--------------- po/bg.po | 27 +++++++++++---------------- po/ca.po | 26 +++++++++++--------------- po/cs.po | 28 ++++++++++++---------------- po/da.po | 28 ++++++++++++---------------- po/de.po | 29 +++++++++++++---------------- po/el.po | 26 +++++++++++--------------- po/en.po | 28 ++++++++++++---------------- po/en_US.po | 28 ++++++++++++---------------- po/eo.po | 27 +++++++++++---------------- po/es.po | 28 ++++++++++++---------------- po/fa.po | 26 +++++++++++--------------- po/fi.po | 27 +++++++++++---------------- po/fr.po | 29 +++++++++++++---------------- po/he.po | 29 +++++++++++++---------------- po/hi.po | 26 +++++++++++--------------- po/hu.po | 27 +++++++++++---------------- po/it.po | 28 ++++++++++++---------------- po/ja.po | 29 +++++++++++++---------------- po/ko.po | 29 +++++++++++++---------------- po/lt.po | 29 +++++++++++++---------------- po/ml.po | 26 +++++++++++--------------- po/nb_NO.po | 28 ++++++++++++---------------- po/nl.po | 28 ++++++++++++---------------- po/or.po | 26 +++++++++++--------------- po/pa.po | 26 +++++++++++--------------- po/pl.po | 29 +++++++++++++---------------- po/pt_BR.po | 28 ++++++++++++---------------- po/pt_PT.po | 28 ++++++++++++---------------- po/rm.po | 27 +++++++++++---------------- po/ro.po | 28 ++++++++++++---------------- po/ru.po | 29 +++++++++++++---------------- po/sk.po | 27 +++++++++++---------------- po/sl.po | 28 ++++++++++++---------------- po/sr_RS(a)cyrillic.po | 26 +++++++++++--------------- po/sr_RS(a)latin.po | 27 +++++++++++---------------- po/sv.po | 29 +++++++++++++---------------- po/te.po | 26 +++++++++++--------------- po/th.po | 26 +++++++++++--------------- po/tr.po | 28 ++++++++++++---------------- po/uk.po | 29 +++++++++++++---------------- po/wa.po | 30 +++++++++++++----------------- po/wine.pot | 26 +++++++++++--------------- po/zh_CN.po | 27 +++++++++++---------------- po/zh_TW.po | 27 +++++++++++---------------- programs/winefile/resource.h | 1 - programs/winefile/winefile.c | 2 +- programs/winefile/winefile.rc | 3 +-- 48 files changed, 532 insertions(+), 713 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=661c9c1c2c0e06e32d774…

1 0

Christian Costa : cmd: Move externals list at the same place as the builtins one so it' s easier to known how a command is implemented.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: faa23d2a1639c3b2d1ffa4e8f679047e47580b72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faa23d2a1639c3b2d1ffa4e8f… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Sep 12 09:24:25 2011 +0200 cmd: Move externals list at the same place as the builtins one so it's easier to known how a command is implemented. --- programs/cmd/builtins.c | 7 +------ programs/cmd/wcmd.h | 3 +++ programs/cmd/wcmdmain.c | 5 +++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index dcbc73e..716db4b 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -67,11 +67,6 @@ static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static const WCHAR nullW[] = {'\0'}; -const WCHAR externals[][10] = { - {'A','T','T','R','I','B','\0'}, - {'X','C','O','P','Y','\0'} -}; - /************************************************************************** * WCMD_ask_confirm * @@ -1335,7 +1330,7 @@ void WCMD_give_help (const WCHAR *command) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { - /* Display help message for builtin command */ + /* Display help message for builtin commands */ for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, command, -1, inbuilt[i], -1) == CSTR_EQUAL) { diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index c8a7e6d..b7bc175 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -211,6 +211,9 @@ typedef struct _DIRECTORY_STACK /* Must be last in list */ #define WCMD_EXIT 44 +#define NUM_EXTERNALS 2 +extern const WCHAR externals[NUM_EXTERNALS][10]; + /* Some standard messages */ extern const WCHAR newline[]; extern WCHAR anykey[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 108d411..840c5da 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -79,6 +79,11 @@ const WCHAR inbuilt[][10] = { {'E','X','I','T','\0'} }; +const WCHAR externals[NUM_EXTERNALS][10] = { + {'A','T','T','R','I','B','\0'}, + {'X','C','O','P','Y','\0'} +}; + HINSTANCE hinst; DWORD errorlevel; int echo_mode = 1, verify_mode = 0, defaultColor = 7;

1 0

Henri Verbeet : ddraw: Get the total amount of video memory from wined3d.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: b23809868a2dc06373cd9f9fcbc1e56a497301d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b23809868a2dc06373cd9f9fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:40 2011 +0200 ddraw: Get the total amount of video memory from wined3d. Instead of hoping that what's available at ddraw_init() time is the total. --- dlls/ddraw/ddraw.c | 15 +++++++++------ dlls/ddraw/ddraw_private.h | 1 - 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index e9aefd9..d48aa01 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1593,6 +1593,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C DWORD *free) { IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); + HRESULT hr = DD_OK; TRACE("iface %p, caps %p, total %p, free %p.\n", iface, Caps, total, free); @@ -1614,13 +1615,18 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C return DDERR_INVALIDPARAMS; } - if (total) - *total = This->total_vidmem; if (free) *free = wined3d_device_get_available_texture_mem(This->wined3d_device); + if (total) + { + WINED3DADAPTER_IDENTIFIER desc = {0}; + + hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); + *total = desc.video_memory; + } LeaveCriticalSection(&ddraw_cs); - return DD_OK; + return hr; } static HRESULT WINAPI ddraw4_GetAvailableVidMem(IDirectDraw4 *iface, @@ -5841,9 +5847,6 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) return hr; } - /* Get the amount of video memory */ - ddraw->total_vidmem = wined3d_device_get_available_texture_mem(ddraw->wined3d_device); - list_init(&ddraw->surface_list); return DD_OK; diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 065ef8a..1daefbc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -89,7 +89,6 @@ struct IDirectDrawImpl BOOL d3d_initialized; /* Misc ddraw fields */ - UINT total_vidmem; DWORD cur_scanline; BOOL fake_vblank; BOOL initialized;

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vs_consts_b() const.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 098d30946da16a1026ab68d98a4aee83ad056227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=098d30946da16a1026ab68d98… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:41 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vs_consts_b() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e1cb38f..4caac23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2722,7 +2722,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vs_consts_b(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count) { UINT count = min(bool_count, MAX_CONST_B - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ed03929..08b6462 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2266,7 +2266,7 @@ HRESULT __cdecl wined3d_device_get_vertex_declaration(const struct wined3d_devic struct wined3d_vertex_declaration **declaration); struct wined3d_shader * __cdecl wined3d_device_get_vertex_shader(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_viewport(const struct wined3d_device *device, WINED3DVIEWPORT *viewport); -HRESULT __cdecl wined3d_device_get_vs_consts_b(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *device, UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count);

1 0

Henri Verbeet : wined3d: Make the device parameter to wined3d_device_get_vs_consts_i() const.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: d7fa599974846415f2f7f6981e8a659a5c8cd5e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7fa599974846415f2f7f6981… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Sep 11 22:25:42 2011 +0200 wined3d: Make the device parameter to wined3d_device_get_vs_consts_i() const. --- dlls/wined3d/device.c | 2 +- include/wine/wined3d.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4caac23..fe0d5fe 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2765,7 +2765,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, return WINED3D_OK; } -HRESULT CDECL wined3d_device_get_vs_consts_i(struct wined3d_device *device, +HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count) { UINT count = min(vector4i_count, MAX_CONST_I - start_register); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 08b6462..5327beb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2270,7 +2270,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *devi UINT start_register, BOOL *constants, UINT bool_count); HRESULT __cdecl wined3d_device_get_vs_consts_f(struct wined3d_device *device, UINT start_register, float *constants, UINT vector4f_count); -HRESULT __cdecl wined3d_device_get_vs_consts_i(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, UINT start_register, int *constants, UINT vector4i_count); HRESULT __cdecl wined3d_device_get_wined3d(const struct wined3d_device *device, struct wined3d **wined3d); ULONG __cdecl wined3d_device_incref(struct wined3d_device *device);

1 0