wine-commits July 2009

wine-commits@winehq.org

4 participants
1067 discussions

Frédéric Delanoy : mpr: Fix French translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: f091492ad378f149c442885e45e29f50385d0eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f091492ad378f149c442885e4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 14:46:35 2009 +0200 mpr: Fix French translation. --- dlls/mpr/mpr_Fr.rc | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/mpr/mpr_Fr.rc b/dlls/mpr/mpr_Fr.rc index 7fbbc95..4481639 100644 --- a/dlls/mpr/mpr_Fr.rc +++ b/dlls/mpr/mpr_Fr.rc @@ -21,29 +21,32 @@ #include "mprres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_ENTIRENETWORK "Le r�seau entier" + IDS_ENTIRENETWORK "Le réseau entier" } -IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 +IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 210, 146 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Entrez le mot de passe r�seau" +CAPTION "Entrez le mot de passe réseau" FONT 8, "MS Shell Dlg" { - LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe:", IDC_EXPLAIN, 40, 6, 150, 15 - LTEXT "Proxy", -1, 40, 26, 50, 10 + LTEXT "Veuillez saisir votre nom d'utilisateur et votre mot de passe :", IDC_EXPLAIN, 10, 6, 150, 17 + LTEXT "Proxy", -1, 10, 31, 50, 10 /* LTEXT "Realm", -1, 40, 46, 50, 10 */ - LTEXT "Utilisateur", -1, 40, 66, 50, 10 - LTEXT "Mot de passe", -1, 40, 86, 50, 10 - LTEXT "" IDC_PROXY, 80, 26, 150, 14, 0 - LTEXT "" IDC_REALM, 80, 46, 150, 14, 0 - EDITTEXT IDC_USERNAME, 80, 66, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP - EDITTEXT IDC_PASSWORD, 80, 86, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD - CHECKBOX "&Enregistrer ce mot de passe (risqu�)", IDC_SAVEPASSWORD, - 80, 106, 150, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "OK", IDOK, 98, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON - PUSHBUTTON "Annuler", IDCANCEL, 158, 126, 56, 14, WS_GROUP | WS_TABSTOP + LTEXT "Utilisateur", -1, 10, 68, 45, 10 + LTEXT "Mot de passe", -1, 10, 88, 45, 10 + LTEXT "" IDC_PROXY, 56, 32, 144, 14, 0 + LTEXT "" IDC_REALM, 56, 46, 144, 14, 0 + EDITTEXT IDC_USERNAME, 56, 66, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP + EDITTEXT IDC_PASSWORD, 56, 86, 144, 14, ES_AUTOHSCROLL | WS_BORDER | WS_TABSTOP | ES_PASSWORD + CHECKBOX "&Enregistrer ce mot de passe (risqué)", IDC_SAVEPASSWORD, + 56, 106, 144, 12, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 68, 126, 56, 14, WS_GROUP | WS_TABSTOP | BS_DEFPUSHBUTTON + PUSHBUTTON "Annuler", IDCANCEL, 128, 126, 56, 14, WS_GROUP | WS_TABSTOP }

1 0

Frédéric Delanoy : comctl32: Fix French translation & UI display.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 3a18d63c4c1077376f08abe4bb180eade42ffe03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a18d63c4c1077376f08abe4b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:18:09 2009 +0200 comctl32: Fix French translation & UI display. --- dlls/comctl32/comctl_Fr.rc | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/comctl_Fr.rc b/dlls/comctl32/comctl_Fr.rc index daa2713..2fd2f89 100644 --- a/dlls/comctl32/comctl_Fr.rc +++ b/dlls/comctl32/comctl_Fr.rc @@ -3,7 +3,7 @@ * French language support * * Copyright 1999 Eric Kohl - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -22,11 +22,14 @@ #include "comctl32.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_PROPSHEET DIALOG DISCARDABLE 0, 0, 220, 140 STYLE DS_CONTEXTHELP | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE -CAPTION "Propri�t�s pour %s" +CAPTION "Propriétés pour %s" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "OK", IDOK,4,122,50,14, WS_TABSTOP | WS_GROUP @@ -42,9 +45,9 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE CAPTION "Assistant" FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "< &Pr�c�dent", IDC_BACK_BUTTON,71,138,50,14 - DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,121,138,50,14 - DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,121,138,50,14 + PUSHBUTTON "< &Précédent", IDC_BACK_BUTTON,71,138,50,14 + DEFPUSHBUTTON "&Suivant >", IDC_NEXT_BUTTON,123,138,50,14 + DEFPUSHBUTTON "Terminer", IDC_FINISH_BUTTON,123,138,50,14 PUSHBUTTON "Annuler", IDCANCEL,178,138,50,14 PUSHBUTTON "Aide", IDHELP,235,138,50,14,WS_GROUP LTEXT "", IDC_SUNKEN_LINE,7,129,278,1,SS_SUNKEN @@ -59,15 +62,15 @@ CAPTION "Personnaliser la barre d'outils" FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "&Fermer", IDCANCEL,308,6,44,14 - PUSHBUTTON "&R�initialiser", IDC_RESET_BTN,308,23,44,14 + PUSHBUTTON "&Réinitialiser", IDC_RESET_BTN,308,23,44,14 PUSHBUTTON "Aid&e", IDC_HELP_BTN,308,40,44,14 PUSHBUTTON "&Monter", IDC_MOVEUP_BTN,308,74,44,14 PUSHBUTTON "&Descendre", IDC_MOVEDN_BTN,308,91,44,14 - LTEXT "Boutons disponibles :", -1,4,5,84,10 + LTEXT "Boutons &disponibles :", -1,4,5,84,10 LISTBOX IDC_AVAILBTN_LBOX,4,17,120,100, LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP PUSHBUTTON "A&jouter ->", IDOK, 131, 42, 44, 14 PUSHBUTTON "<- E&nlever", IDC_REMOVE_BTN,131,62,44,14 - LTEXT "&Boutons de la barre d'outils :", -1,182,5,78,10 + LTEXT "&Boutons de la barre d'outils :", -1,182,5,93,10 LISTBOX IDC_TOOLBARBTN_LBOX, 182,17,120,100,LBS_NOTIFY | LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_DISABLENOSCROLL | WS_BORDER | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP END @@ -79,12 +82,12 @@ STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE { IDM_TODAY "Aujourd'hui:" - IDM_GOTODAY "Aller � aujourd'hui" + IDM_GOTODAY "Aller à aujourd'hui" } STRINGTABLE DISCARDABLE { - IDS_SEPARATOR "S�parateur" + IDS_SEPARATOR "Séparateur" } STRINGTABLE DISCARDABLE

1 0

Frédéric Delanoy : comdlg32: Fix French translation & UI display.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: d9a121c3e25cae545a0bf855cd2e806d63845edd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a121c3e25cae545a0bf855c… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:18:42 2009 +0200 comdlg32: Fix French translation & UI display. --- dlls/comdlg32/cdlg_Fr.rc | 368 +++++++++++++++++++++++----------------------- 1 files changed, 186 insertions(+), 182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9a121c3e25cae545a0bf…

1 0

Frédéric Delanoy : wldap32: Fix French translation.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 90684e6f439471886b9c68a9a9e6dc7fdacf5e2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=90684e6f439471886b9c68a9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 13:48:05 2009 +0200 wldap32: Fix French translation. --- dlls/wldap32/wldap32_Fr.rc | 75 +++++++++++++++++++++++--------------------- 1 files changed, 39 insertions(+), 36 deletions(-) diff --git a/dlls/wldap32/wldap32_Fr.rc b/dlls/wldap32/wldap32_Fr.rc index 7b62613..fa3d4f8 100644 --- a/dlls/wldap32/wldap32_Fr.rc +++ b/dlls/wldap32/wldap32_Fr.rc @@ -2,7 +2,7 @@ * French resources for WLDAP32 * * Copyright 2005 Jonathan Ernst - * Copyright 2009 Fr�d�ric Delanoy + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,31 +21,34 @@ #include "windef.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - 0 "Succ�s" - 1 "Erreur d'op�ration" + 0 "Succès" + 1 "Erreur d'opération" 2 "Erreur de protocole" - 3 "Limite de temps d�pass�e" - 4 "Limite de taille d�pass�e" + 3 "Limite de temps dépassée" + 4 "Limite de taille dépassée" 5 "Comparaison fausse" 6 "Comparaison vraie" - 7 "M�thode d'authentification non support�e" + 7 "Méthode d'authentification non prise en charge" 8 "Authentification forte requise" - 9 "R�f�rant (v2)" - 10 "R�f�rant" - 11 "Limite administrative d�pass�e" + 9 "Référant (v2)" + 10 "Référant" + 11 "Limite administrative dépassée" 12 "Extension critique indisponible" - 13 "Confidentialit� requise" + 13 "Confidentialité requise" 14 "" 15 "" 16 "Attribut inconnu" - 17 "Type ind�fini" - 18 "Correspondance inappropri�e" + 17 "Type non défini" + 18 "Correspondance inappropriée" 19 "Violation de contrainte" - 20 "Attribut ou valeur existant" + 20 "Attribut ou valeur préexistant(e)" 21 "Syntaxe invalide" 22 "" 23 "" @@ -58,10 +61,10 @@ STRINGTABLE DISCARDABLE 30 "" 31 "" 32 "Objet inconnu" - 33 "Probl�me d'alias" + 33 "Problème d'alias" 34 "Syntaxe DN invalide" 35 "Est une feuille" - 36 "Probl�me de d�r�f�rencement d'alias" + 36 "Problème de déréférencement d'alias" 37 "" 38 "" 39 "" @@ -73,29 +76,29 @@ STRINGTABLE DISCARDABLE 45 "" 46 "" 47 "" - 48 "Authentification inappropri�e" + 48 "Authentification inappropriée" 49 "Autorisations invalides" 50 "Droits insuffisants" - 51 "Occup�" + 51 "Occupé" 52 "Indisponible" - 53 "Ne souhaite pas s'ex�cuter" - 54 "Boucle d�tect�e" + 53 "Pas disposé à s'exécuter" + 54 "Boucle détectée" 55 "" 56 "" 57 "" 58 "" 59 "" - 60 "Contr�le de tri manquant" - 61 "Erreur d'intervalle d'index" + 60 "Contrôle de tri manquant" + 61 "Erreur de plage d'index" 62 "" 63 "" 64 "Violation de nomenclature" 65 "Violation de classe d'objet" 66 "Interdit sur des non-feuilles" 67 "Interdit sur RDN" - 68 "Existe d�j�" - 69 "Pas de Mods de classe d'objet" - 70 "R�sultats trop grands" + 68 "Existe déjà" + 69 "Pas de modification de classe d'objet" + 70 "Résultats trop grands" 71 "Affecte de multiples DSA" 72 "" 73 "" @@ -109,18 +112,18 @@ STRINGTABLE DISCARDABLE 81 "Serveur indisponible" 82 "Erreur locale" 83 "Erreur d'encodage" - 84 "Erreur de d�codage" - 85 "D�lai d'attente d�pass�" - 86 "Auth. inconnue" - 87 "Erreur de filtre" + 84 "Erreur de décodage" + 85 "Délai d'attente dépassé" + 86 "Méthode d'authentification inconnue" + 87 "Erreur de filtrage" 88 "Annulation par l'utilisateur" - 89 "Erreur de param�tre" - 90 "Pas de m�moire" + 89 "Erreur de paramètre" + 90 "Mémoire insuffisante" 91 "Impossible de se connecter au serveur LDAP" - 92 "Op�ration non support�e par cette version du protocole LDAP" - 93 "Le contr�le sp�cifi� n'a pas �t� trouv� dans le message" - 94 "Pas de r�sultat dans le message" - 95 "Plus de r�sultats retourn�s" - 96 "Boucle lors du traitement des r�f�rants" - 97 "Limite du nombre de r�f�rants d�pass�e" + 92 "Opération non supportée par cette version du protocole LDAP" + 93 "Le contrôle spécifié n'a pas été trouvé dans le message" + 94 "Aucun résultat dans le message" + 95 "Plus de résultats reçus" + 96 "Boucle lors du traitement des référants" + 97 "Limite du nombre de référants dépassée" }

1 0

Frédéric Delanoy : msacm32: Fix French translation & UI display.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: b1f24b4061264eaa50b27e74a2d4810ed1726a23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1f24b4061264eaa50b27e74a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 12:02:14 2009 +0200 msacm32: Fix French translation & UI display. --- dlls/msacm32/msacm_Fr.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/msacm32/msacm_Fr.rc b/dlls/msacm32/msacm_Fr.rc index 5960fff..9341e6c 100644 --- a/dlls/msacm32/msacm_Fr.rc +++ b/dlls/msacm32/msacm_Fr.rc @@ -2,7 +2,7 @@ * French resource file for MS ACM * * Copyright 2000 Eric Pouech - * Copyright 2003 Vincent B�ron + * Copyright 2003 Vincent Béron * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,25 +21,28 @@ #include "wineacm.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 +DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 250, 100 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "S�lection du son" +CAPTION "Sélection du son" FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Nom :", -1, 5, 5, 115, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 15, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 - PUSHBUTTON "&Retirer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + PUSHBUTTON "&Enregistrer sous...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 70, 14 + PUSHBUTTON "&Supprimer", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 199, 14, 45, 14 LTEXT "&Format :", -1, 5, 41, 44, 8, NOT WS_GROUP - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 48, 39, 197, 15, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "&Attributs :", -1, 5, 59, 44, 8, NOT WS_GROUP @@ -49,7 +52,7 @@ BEGIN CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP | CBS_OWNERDRAWFIXED | CBS_HASSTRINGS #else - COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 48, 57, 197, 60, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP #endif DEFPUSHBUTTON "OK", IDOK, 48, 80, 40, 14

1 0

Francois Gouget : winapi/c_parser: Remove special cases for DEFINE_SHLGUID( ) and ICOM_DEFINE().
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 8890282ac09f43e305afec069ef0c30ea36ef256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8890282ac09f43e305afec069… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 12:26:39 2009 +0200 winapi/c_parser: Remove special cases for DEFINE_SHLGUID() and ICOM_DEFINE(). These macros don't exist anymore. --- tools/winapi/c_parser.pm | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index d39d093..e927fb9 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -796,12 +796,8 @@ sub parse_c_file($$$$) next; } - } elsif ($declaration =~ s/^(?:DEFINE_SHLGUID)\s*$.*?$//s) { - $self->_update_c_position($&, \$declaration_line, \$declaration_column); } elsif ($declaration =~ s/^(?:DECL_WINELIB_TYPE_AW|DECLARE_HANDLE(?:16)?|TYPE_MARSHAL)$\s*(\w+)\s*$\s*//s) { $self->_update_c_position($&, \$declaration_line, \$declaration_column); - } elsif ($declaration =~ s/^ICOM_DEFINE$\s*(\w+)\s*,\s*(\w+)\s*$\s*//s) { - $self->_update_c_position($&, \$declaration_line, \$declaration_column); } } else { my $blank_lines = 0;

1 0

Francois Gouget : winapi/c_parser: Badly indenting a closing brace should be a warning, not an error.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 8c1bf48fbf9908b7937a8d0430a2ad758045a803 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c1bf48fbf9908b7937a8d043… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 12:26:30 2009 +0200 winapi/c_parser: Badly indenting a closing brace should be a warning, not an error. --- tools/winapi/c_parser.pm | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 3a00039..d39d093 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -971,7 +971,7 @@ sub parse_c_file($$$$) $declaration_line = $line; $declaration_column = $column; } elsif($column == 1 && !$extern_c) { - $self->_parse_c_error("", $line, $column, "file", "inner } ends on column 1"); + $self->_parse_c_warning("", $line, $column, "file", "inner } ends on column 1"); } } elsif(s/^;//) { $declaration .= $&;

1 0

Alexandre Julliard : winetest: Create a separate resource file with the SHA1 build id.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: ae1afb82d2db69fe35d6060278a28ca2f98b8cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1afb82d2db69fe35d606027… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:54:39 2009 +0200 winetest: Create a separate resource file with the SHA1 build id. --- .gitignore | 1 + programs/winetest/Makefile.in | 7 ++++--- programs/winetest/winetest.rc | 7 ------- tools/make_makefiles | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5303e1c..cc746dd 100644 --- a/.gitignore +++ b/.gitignore @@ -198,6 +198,7 @@ programs/winedbg/debug.yy.c programs/winedbg/winedbg.man programs/winetest/*_test.exe programs/winetest/*_test.rc +programs/winetest/build.rc programs/winhlp32/macro.lex.yy.c server/wineserver server/wineserver-installed diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in index 90cd983..9e43465 100644 --- a/programs/winetest/Makefile.in +++ b/programs/winetest/Makefile.in @@ -7,8 +7,6 @@ APPMODE = -mconsole IMPORTS = uuid comctl32 version user32 gdi32 advapi32 wsock32 kernel32 DELAYIMPORTS = ole32 -EXTRARCFLAGS = -DBUILD_SHA1=\"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" - C_SRCS = \ gui.c \ main.c \ @@ -23,7 +21,7 @@ SVG_SRCS = winetest.svg ALL_TEST_DIRS = @ALL_TEST_DIRS@ TESTBINS = $(ALL_TEST_DIRS:%/tests=%_test.exe) -TESTRCS = $(TESTBINS:.exe=.rc) +TESTRCS = build.rc $(TESTBINS:.exe=.rc) EXTRA_OBJS = $(TESTRCS:.rc=.res) @MAKE_PROG_RULES@ @@ -33,6 +31,9 @@ EXTRA_OBJS = $(TESTRCS:.rc=.res) clean:: $(RM) winetest-dist.exe $(TESTBINS) $(TESTRCS) +build.rc: dummy + build="STRINGTABLE { 1 \"`GIT_DIR=$(TOPSRCDIR)/.git git rev-parse HEAD 2>/dev/null`\" }" && (echo $$build | cmp -s - $@) || echo $$build >$@ || ($(RM) $@ && exit 1) + # Rules for building distributable executable .PHONY: dist diff --git a/programs/winetest/winetest.rc b/programs/winetest/winetest.rc index 8056a25..52c3430 100644 --- a/programs/winetest/winetest.rc +++ b/programs/winetest/winetest.rc @@ -24,13 +24,6 @@ #include "resource.h" -#ifdef BUILD_SHA1 -STRINGTABLE -BEGIN - IDS_BUILD_ID BUILD_SHA1 -END -#endif - IDD_TAG DIALOG 0, 0, 150, 65 STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "No tag supplied" diff --git a/tools/make_makefiles b/tools/make_makefiles index b1766a7..f23706c 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -76,6 +76,7 @@ my @ignores = ( "include/stamp-h", "programs/winetest/*_test.exe", "programs/winetest/*_test.rc", + "programs/winetest/build.rc", ); # Source files and their resulting target to ignore

1 0

Alexandre Julliard : winebuild: Dump resource data as dwords to reduce the output file size.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: f0ea22ba87ac15374c254b9d6195fd4aecda3b35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ea22ba87ac15374c254b9d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:54:16 2009 +0200 winebuild: Dump resource data as dwords to reduce the output file size. --- tools/winebuild/res32.c | 24 +++++++++++++++++++++++- 1 files changed, 23 insertions(+), 1 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 946523d..d03d16f 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -218,6 +218,28 @@ static void put_string( const struct string_id *str ) } } +static void dump_res_data( const struct resource *res ) +{ + unsigned int i = 0; + unsigned int size = (res->data_size + 3) & ~3; + + if (!size) return; + + file_pos = res->data; + file_end = (const unsigned char *)res->data + size; + + output( "\t.long " ); + while (size > 4) + { + if ((i++ % 16) == 15) output( "0x%08x\n\t.long ", get_dword() ); + else output( "0x%08x,", get_dword() ); + size -= 4; + } + output( "0x%08x\n", get_dword() ); + size -= 4; + assert( file_pos == file_end ); +} + /* check the file header */ /* all values must be zero except header size */ static int check_header(void) @@ -515,7 +537,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.align %d\n", get_alignment(get_ptr_size()) ); output( ".L__wine_spec_res_%d:\n", i ); - dump_bytes( res->data, (res->data_size + 3) & ~3 ); + dump_res_data( res ); } output( ".L__wine_spec_resources_end:\n" ); output( "\t.byte 0\n" );

1 0

Alexandre Julliard : configure: Apply makedep flags when doing automatic dependencies.
by Alexandre Julliard 09 Jul '09

09 Jul '09

Module: wine Branch: master Commit: 21872b3d57441b743fa53397272929fbb0573d20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21872b3d57441b743fa533972… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 12:53:49 2009 +0200 configure: Apply makedep flags when doing automatic dependencies. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9e59d11..aa0ade1 100755 --- a/configure +++ b/configure @@ -24588,7 +24588,7 @@ DEPENDENCIES="### Dependencies: .BEGIN: Makefile .MAKEFILEDEPS: Makefile: dummy - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) \$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) diff --git a/configure.ac b/configure.ac index 23cf7fe..e07de2b 100644 --- a/configure.ac +++ b/configure.ac @@ -1978,7 +1978,7 @@ AC_SUBST(DEPENDENCIES,["### Dependencies: .BEGIN: Makefile .MAKEFILEDEPS: Makefile: dummy - -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) + -\$(MAKEDEP) \$(MAKEDEPFLAGS) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) \$(OBJS) \$(C_SRCS16:.c=.o): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2009