September 2011 - Wine-Commits

Alexandre Julliard : winex11: Add an AlphaBlend entry point in the XRender driver.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: b174bde4d2e94c3fdfaadaf3e2c1af4491bb404b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b174bde4d2e94c3fdfaadaf3e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:20:01 2011 +0200 winex11: Add an AlphaBlend entry point in the XRender driver. --- dlls/winex11.drv/bitblt.c | 22 --------------- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 6 ---- dlls/winex11.drv/xrender.c | 62 ++++++++++++++++++++++++-------------------- 4 files changed, 35 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b174bde4d2e94c3fdfaad…

1 0

Alexandre Julliard : winex11: Add an ExtEscape entry point in the XRender driver.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 89d8d1d427a322661970853026855fadc4dc317e URL: http://source.winehq.org/git/wine.git/?a=commit;h=89d8d1d427a32266197085302… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 12 12:04:41 2011 +0200 winex11: Add an ExtEscape entry point in the XRender driver. --- dlls/winex11.drv/init.c | 1 - dlls/winex11.drv/xrender.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b0592fa..db430ec 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -358,7 +358,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d if (in_count >= sizeof(struct x11drv_escape_set_drawable)) { const struct x11drv_escape_set_drawable *data = in_data; - if(physDev->xrender) X11DRV_XRender_UpdateDrawable( physDev ); physDev->dc_rect = data->dc_rect; physDev->drawable = data->drawable; physDev->drawable_rect = data->drawable_rect; diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index f5c37fe..3b931b2 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -646,6 +646,13 @@ static void free_xrender_picture( struct xrender_physdev *dev ) dev->info.format = NULL; } +static void update_xrender_drawable( struct xrender_physdev *dev ) +{ + free_xrender_picture( dev ); + dev->info.format = get_xrender_format_from_color_shifts( dev->x11dev->depth, + dev->x11dev->color_shifts ); +} + /* return a mask picture used to force alpha to 0 */ static Picture get_no_alpha_mask(void) { @@ -1193,6 +1200,28 @@ static BOOL xrenderdrv_DeleteDC( PHYSDEV dev ) return TRUE; } +/********************************************************************** + * xrenderdrv_ExtEscape + */ +static INT xrenderdrv_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_data, + INT out_count, LPVOID out_data ) +{ + struct xrender_physdev *physdev = get_xrender_dev( dev ); + + dev = GET_NEXT_PHYSDEV( dev, pExtEscape ); + + if (escape == X11DRV_ESCAPE && in_data && in_count >= sizeof(enum x11drv_escape_codes)) + { + if (*(const enum x11drv_escape_codes *)in_data == X11DRV_SET_DRAWABLE) + { + BOOL ret = dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); + if (ret) update_xrender_drawable( physdev ); + return ret; + } + } + return dev->funcs->pExtEscape( dev, escape, in_count, in_data, out_count, out_data ); +} + BOOL X11DRV_XRender_SetPhysBitmapDepth(X_PHYSBITMAP *physBitmap, int bits_pixel, const DIBSECTION *dib) { const WineXRenderFormat *fmt; @@ -2504,7 +2533,7 @@ static const struct gdi_dc_funcs xrender_funcs = NULL, /* pEnumICMProfiles */ NULL, /* pExcludeClipRect */ NULL, /* pExtDeviceMode */ - NULL, /* pExtEscape */ + xrenderdrv_ExtEscape, /* pExtEscape */ NULL, /* pExtFloodFill */ NULL, /* pExtSelectClipRgn */ NULL, /* pExtTextOut */

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

Sept. 12, 2011

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

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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 : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Norwegian translation .
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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

Sept. 12, 2011

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

Francois Gouget : winefile: Always use the same name for the Wine File Manager.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

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

Francois Gouget : po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Portugal) translation.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 2f0f07a30f56b8091a4be9206fd2919b1a07651c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0f07a30f56b8091a4be9206… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:27:41 2011 +0200 po: Mark a number of obviously incomplete cmd help messages as fuzzy in the Portuguese (Portugal) translation. --- po/pt_PT.po | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 0dc85cf..24a3b8b 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -8112,12 +8112,14 @@ msgstr "" "do procedimente chamado são herdados pelo chamador.\n" #: cmd.rc:40 +#, fuzzy msgid "" "CD <dir> is the short version of CHDIR. It changes the current\n" "default directory.\n" msgstr "Ajuda do comando CD\n" #: cmd.rc:41 +#, fuzzy msgid "CHDIR <dir> changes the current default directory.\n" msgstr "Ajuda do comando CHDIR\n" @@ -8126,22 +8128,27 @@ msgid "CLS clears the console screen.\n" msgstr "CLS limpa a ecrã da consola\n" #: cmd.rc:45 +#, fuzzy msgid "COPY <filename> copies a file.\n" msgstr "Ajuda do comando COPY\n" #: cmd.rc:46 +#, fuzzy msgid "CTTY changes the input/output device.\n" msgstr "Ajuda do comando CTTY\n" #: cmd.rc:47 +#, fuzzy msgid "DATE shows or changes the system date.\n" msgstr "Ajuda do comando DATE\n" #: cmd.rc:48 +#, fuzzy msgid "DEL <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando DEL\n" #: cmd.rc:49 +#, fuzzy msgid "DIR lists the contents of a directory.\n" msgstr "Ajuda do comando DIR\n" @@ -8166,6 +8173,7 @@ msgstr "" "símbolo @ precedendo o mesmo.\n" #: cmd.rc:61 +#, fuzzy msgid "ERASE <filename> deletes a file or set of files.\n" msgstr "Ajuda do comando ERASE\n" @@ -8214,6 +8222,7 @@ msgstr "" "GOTO não tem efeito quando usado interactivamente.\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" @@ -8255,10 +8264,12 @@ msgstr "" "especificado. Pode mostrar o rótulo do disco com o comando VOL.\n" #: cmd.rc:103 +#, fuzzy msgid "MD <name> is the short version of MKDIR. It creates a subdirectory.\n" msgstr "Ajuda do comando MD\n" #: cmd.rc:104 +#, fuzzy msgid "MKDIR <name> creates a subdirectory.\n" msgstr "Ajuda do comando MKDIR\n" @@ -8372,6 +8383,7 @@ msgstr "" "ficheiro de lote\n" #: cmd.rc:156 +#, fuzzy msgid "REN <filename> is the short version of RENAME. It renames a file.\n" msgstr "Ajuda do comando REN\n" @@ -8381,10 +8393,12 @@ msgid "RENAME <filename> renames a file.\n" msgstr "Ajuda do comando RENAME\n" #: cmd.rc:159 +#, fuzzy msgid "RD <dir> is the short version of RMDIR. It deletes a subdirectory.\n" msgstr "Ajuda do comando RD\n" #: cmd.rc:160 +#, fuzzy msgid "RMDIR <dir> deletes a subdirectory.\n" msgstr "Ajuda do comando RMDIR\n" @@ -8433,6 +8447,7 @@ msgstr "" "Isto não tem efeito se chamado a partir da linha de comando.\n" #: cmd.rc:185 +#, fuzzy msgid "TIME sets or shows the current system time.\n" msgstr "Ajuda do comando TIME\n" @@ -8473,6 +8488,7 @@ msgid "VER displays the version of cmd you are running.\n" msgstr "VER mostra a versão em execução do cmd.\n" #: cmd.rc:205 +#, fuzzy msgid "VOL shows the volume label of a disk device.\n" msgstr "Ajuda do comando VOL\n"

1 0

Francois Gouget : shell32: Add parentheses to clarify the precedence between '&' and '||'.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: f5dede7c197799d5beea5ee16f98bc1258d3919d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dede7c197799d5beea5ee16… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Sep 11 23:19:33 2011 +0200 shell32: Add parentheses to clarify the precedence between '&' and '||'. --- dlls/shell32/pidl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 71b8f93..c394e5b 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -2243,7 +2243,7 @@ FileStructW* _ILGetFileStructW(LPCITEMIDLIST pidl) { /* Currently I don't see a fool prove way to figure out if a pidl is for sure of WinXP * style with a FileStructW member. If we switch all our shellfolder-implementations to * the new format, this won't be a problem. For now, we do as many sanity checks as possible. */ - if (cbOffset & 0x1 || /* FileStructW member is word aligned in the pidl */ + if ((cbOffset & 0x1) || /* FileStructW member is word aligned in the pidl */ /* FileStructW is positioned after FileStruct */ cbOffset < sizeof(pidl->mkid.cb) + sizeof(PIDLTYPE) + sizeof(FileStruct) || /* There has to be enough space at cbOffset in the pidl to hold FileStructW and cbOffset */

1 0

Stefan Dösinger : ddraw: Correct D3DFMT_R5G6B5 in a test.
by Alexandre Julliard Sept. 12, 2011

Sept. 12, 2011

Module: wine Branch: master Commit: 0cea17037c48249b7bc4b6e09caf700fed825b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cea17037c48249b7bc4b6e09… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 29 20:07:27 2011 +0200 ddraw: Correct D3DFMT_R5G6B5 in a test. --- dlls/ddraw/tests/ddrawmodes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index 5cc80ed..a4b71fb 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -407,8 +407,8 @@ static void enumdisplaymodes(void) ddsd.dwFlags = DDSD_PIXELFORMAT; ddsd.ddpfPixelFormat.dwFlags = DDPF_RGB; U1(ddsd.ddpfPixelFormat).dwRGBBitCount = 16; - U2(ddsd.ddpfPixelFormat).dwRBitMask = 0x7C00; - U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x03E0; + U2(ddsd.ddpfPixelFormat).dwRBitMask = 0xf800; + U3(ddsd.ddpfPixelFormat).dwGBitMask = 0x07e0; U4(ddsd.ddpfPixelFormat).dwBBitMask = 0x001F; rc = IDirectDraw_EnumDisplayModes(lpDD, 0, &ddsd, 0, enummodescallback_16bit);

1 0