July 2009 - Wine-Commits - list.winehq.org

Frédéric Delanoy : notepad: Update French translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: f43b8691d27b9915a78bc2b73b9a87edd389714c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f43b8691d27b9915a78bc2b73… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 18:14:02 2009 +0200 notepad: Update French translation. --- programs/notepad/Fr.rc | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/programs/notepad/Fr.rc b/programs/notepad/Fr.rc index f196258..9c8373b 100644 --- a/programs/notepad/Fr.rc +++ b/programs/notepad/Fr.rc @@ -117,20 +117,29 @@ STRING_INFO, "Information" STRING_UNTITLED, "(sans titre)" -STRING_ALL_FILES, "Tous fichiers (*.*)" +STRING_ALL_FILES, "Tous les fichiers (*.*)" STRING_TEXT_FILES_TXT, "Fichiers texte (*.txt)" -STRING_TOOLARGE, "Le fichier '%s' est trop grand pour le bloc-notes.\n\ +STRING_TOOLARGE, "Le fichier « %s » est trop grand pour le bloc-notes.\n\ Veuillez utiliser un autre éditeur." STRING_NOTEXT, "Vous n'avez pas entré de texte. \ Veuillez taper quelque chose et recommencer" -STRING_DOESNOTEXIST, "Le fichier '%s'\nn'existe pas.\n\n\ +STRING_DOESNOTEXIST, "Le fichier « %s »\nn'existe pas.\n\n\ Voulez-vous créer un nouveau fichier ?" -STRING_NOTSAVED, "Le fichier '%s'\na été modifié\n\n \ +STRING_NOTSAVED, "Le fichier « %s »\na été modifié\n\n \ Voulez-vous enregistrer vos modifications ?" -STRING_NOTFOUND, "'%s' non trouvé." +STRING_NOTFOUND, "« %s » non trouvé." STRING_OUT_OF_MEMORY, "Pas assez de mémoire pour terminer cette \ tâche.\nFermez une ou plusieurs applications pour libérer\n\ de la mémoire." +STRING_UNICODE_LE, "Unicode (UTF-16)" +STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +Ce fichier contient des caractères Unicode qui seront perdus si \n\ +vous le sauvez dans le codage %s. \n\ +Pour conserver ces caractères, cliquez sur Annuler et sélectionnez \n\ +une des alternatives Unicode dans la liste déroulante Codage. \n\ +Continuer ?" }

1 0

Frédéric Delanoy : winhlp32: Fix French translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 9595b130396c777dd9ddbeec79a6586c99fae27e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9595b130396c777dd9ddbeec7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 16:44:23 2009 +0200 winhlp32: Fix French translation. --- programs/winhlp32/Fr.rc | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/programs/winhlp32/Fr.rc b/programs/winhlp32/Fr.rc index 62a12c2..cedb0f6 100644 --- a/programs/winhlp32/Fr.rc +++ b/programs/winhlp32/Fr.rc @@ -22,6 +22,9 @@ #include "winhelp_res.h" +/* UTF-8 */ +#pragma code_page(65001) + /* Menu */ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL @@ -36,18 +39,18 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Quitter", MNID_FILE_EXIT } - POPUP "�&dition" { + POPUP "É&dition" { MENUITEM "&Copier...", MNID_EDIT_COPYDLG MENUITEM SEPARATOR - MENUITEM "&Annotation...", MNID_EDIT_ANNOTATE + MENUITEM "&Annoter...", MNID_EDIT_ANNOTATE } - POPUP "&Signet" { - MENUITEM "&D�finir...", MNID_BKMK_DEFINE + POPUP "&Signets" { + MENUITEM "&Définir...", MNID_BKMK_DEFINE } POPUP "&Options" { POPUP "Aide toujours visible" BEGIN - MENUITEM "Par d�faut", MNID_OPTS_HELP_DEFAULT + MENUITEM "Par défaut", MNID_OPTS_HELP_DEFAULT MENUITEM "Visible", MNID_OPTS_HELP_VISIBLE MENUITEM "Non visible", MNID_OPTS_HELP_NONVISIBLE END @@ -58,7 +61,7 @@ MAIN_MENU MENU MENUITEM "Normale", MNID_OPTS_FONTS_NORMAL MENUITEM "Grande", MNID_OPTS_FONTS_LARGE END - MENUITEM "Utiliser les couleurs syst�me", MNID_OPTS_SYSTEM_COLORS + MENUITEM "Utiliser les couleurs système", MNID_OPTS_SYSTEM_COLORS } POPUP "Aid&e" { MENUITEM "&Utiliser l'aide", MNID_HELP_HELPON @@ -66,7 +69,7 @@ MAIN_MENU MENU MENUITEM SEPARATOR MENUITEM "&Info...", MNID_HELP_ABOUT #ifdef WINELIB - MENUITEM "� &propos de Wine", MNID_HELP_WINE + MENUITEM "À &propos de Wine", MNID_HELP_WINE #endif } } @@ -84,7 +87,7 @@ STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" CAPTION "Recherche" { - LTEXT "Pas encore impl�ment�", -1, 10, 10, 180, 150 + LTEXT "Pas encore implémenté", -1, 10, 10, 180, 150 } /* Strings */ @@ -94,15 +97,15 @@ STID_WINE_HELP, "Aide de Wine" STID_WHERROR, "ERREUR" STID_WARNING, "ATTENTION" STID_INFO, "Information" -STID_NOT_IMPLEMENTED, "Non impl�ment�" -STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide ��%s��" +STID_NOT_IMPLEMENTED, "Non implémenté" +STID_HLPFILE_ERROR_s, "Une erreur est survenue en lisant le fichier d'aide « %s »" STID_INDEX, "&Index" STID_CONTENTS, "Sommaire" -STID_BACK, "&Pr�c�dent" -STID_ALL_FILES, "Tous fichiers (*.*)" +STID_BACK, "&Précédent" +STID_ALL_FILES, "Tous les fichiers (*.*)" STID_HELP_FILES_HLP, "Fichiers d'aide (*.hlp)" -STID_FILE_NOT_FOUND_s "Impossible de trouver ��%s��. Souhaitez-vous rechercher ce fichier vous-m�me�?" -STID_NO_RICHEDIT "La biblioth�que RichEdit n'a pu �tre localis�e... Abandon" +STID_FILE_NOT_FOUND_s "Impossible de trouver « %s ». Souhaitez-vous rechercher ce fichier vous-même ?" +STID_NO_RICHEDIT "La bibliothèque RichEdit n'a pu être localisée... Abandon" STID_PSH_INDEX, "Rubriques d'aide : " } @@ -121,10 +124,10 @@ BEGIN END POPUP "Aide toujours visible" BEGIN - MENUITEM "Par d�faut", MNID_CTXT_HELP_DEFAULT + MENUITEM "Par défaut", MNID_CTXT_HELP_DEFAULT MENUITEM "Visible", MNID_CTXT_HELP_VISIBLE MENUITEM "Non visible", MNID_CTXT_HELP_NONVISIBLE END - MENUITEM "Utiliser les couleurs syst�me", MNID_CTXT_SYSTEM_COLORS + MENUITEM "Utiliser les couleurs système", MNID_CTXT_SYSTEM_COLORS END END

1 0

Frédéric Delanoy : xcopy: Fix French translation.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: acd3be771b6809a3d147e37b6b816f5c1627646d URL: http://source.winehq.org/git/wine.git/?a=commit;h=acd3be771b6809a3d147e37b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 01:37:06 2009 +0200 xcopy: Fix French translation. --- programs/xcopy/Fr.rc | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/xcopy/Fr.rc b/programs/xcopy/Fr.rc index b28dffe..047b4b3 100644 --- a/programs/xcopy/Fr.rc +++ b/programs/xcopy/Fr.rc @@ -33,12 +33,12 @@ STRINGTABLE STRING_PAUSE, "Appuyez sur ENTRÉE pour démarrer la copie\n" STRING_SIMCOPY, "%d fichier(s) seront copiés\n" STRING_COPY, "%d fichier(s) copiés\n" - STRING_QISDIR, "Est-ce que « %s » est un fichier ou un répertoire\n" \ + STRING_QISDIR, "« %s » est-il un fichier ou un répertoire\n" \ "dans la destination ?\n" \ "(F - Fichier, R - Répertoire)\n" STRING_SRCPROMPT,"%s ? (Oui|Non)\n" STRING_OVERWRITE,"Écraser %s ? (Oui|Non|Tous)\n" - STRING_COPYFAIL, "La copie de « %s » vers « %s » a échoué avec le c/r %d\n" + STRING_COPYFAIL, "La copie de « %s » vers « %s » a échoué avec le code de retour %d\n" STRING_OPENFAIL, "Impossible d'ouvrir « %s »\n" STRING_READFAIL, "Impossible de lire « %s »\n" STRING_YES_CHAR, "O" @@ -48,36 +48,36 @@ STRINGTABLE STRING_DIR_CHAR, "R" STRING_HELP, -"XCOPY - Copie les fichiers ou répertoires source vers une destination\n\ +"XCOPY - Copie les fichiers ou répertoires sources vers une destination\n\ \n\ Syntaxe :\n\ -XCOPY source [dest] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ +XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\ \t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\ \n\ -Où :\n\ +où :\n\ \n\ [/I] Suppose que la destination est un répertoire si elle n'existe pas et que l'on copie plus\n\ \td'un fichier\n\ [/S] Copie les répertoires et sous-répertoires\n\ [/E] Copie 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 la source et la destination complète lors de la copie\n\ -[/L] Simuler l'opération, en montrant le nom des fichiers qui auraient été copiés\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] Demande avant de démarrer la copie\n\ -[/T] Créer une structure de répertoires vides, mais ne copie pas les fichiers\n\ +[/T] Créer une structure de répertoires vides, mais ne pas copier les fichiers\n\ [/Y] Ne demande pas de confirmation lors de l'écrasement des fichiers\n\ [/-Y] Demande une confirmation lors de l'écrasement des fichiers\n\ -[/P] Demande avant de copier chaque fichier source\n\ -[/N] Copie en utilisant des noms courts\n\ +[/P] Interroge l'utilisateur avant de copier chaque fichier source\n\ +[/N] Copie en utilisant les noms courts\n\ [/U] Copie uniquement les fichiers qui existent déjà dans la destination\n\ [/R] Écrase même les fichiers en lecture seule\n\ [/H] Inclure les fichiers cachés et système dans la copie\n\ [/C] Continue même si une erreur survient pendant la copie\n\ [/A] Copie uniquement les fichiers qui ont l'attribut archive défini\n\ -[/M] Copie uniquement les fichiers qui ont l'attribut archive défini, supprime\n\ +[/M] Copie uniquement les fichiers qui ont l'attribut archive défini ; supprime\n\ \tensuite l'attribut\n\ -[/D | /D:m-d-y] Copie uniquement les fichiers nouveaux ou ceux modifiés après la date spécifiée.\n\ -\t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus vieux\n\ +[/D | /D:m-d-y] Copie uniquement les nouveaux fichiers, ou ceux modifiés après la date spécifiée.\n\ +\t\tSi aucune date n'est spécifiée, copie uniquement lorsque le fichier de destination est plus ancien\n\ \t\tque le fichier source\n\n" }

1 0

Frédéric Delanoy : wordpad: Fix French translation & UI display.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: adea830ad7a5633c9fbbb1bfcd65c269213ea537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adea830ad7a5633c9fbbb1bfc… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Tue Jul 7 01:11:09 2009 +0200 wordpad: Fix French translation & UI display. --- programs/wordpad/Fr.rc | 101 ++++++++++++++++++++++++----------------------- 1 files changed, 52 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=adea830ad7a5633c9fbbb…

1 0

Paul Vriens : crypt32: Fix Dutch translations.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: bb356fe32c81d0f2cb1da8a4ab7b61d856d9e0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb356fe32c81d0f2cb1da8a4a… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 6 18:03:50 2009 +0200 crypt32: Fix Dutch translations. --- dlls/crypt32/crypt32_Nl.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index eae902f..bc5cda8 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -176,6 +176,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Certificatie Tussen-Autoriteiten" IDS_LOCALIZEDNAME_ADDRESSBOOK "Overige Personen" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Vertrouwde uitgevers" + IDS_LOCALIZEDNAME_DISALLOWED "Niet-vertrouwde certificaten" } STRINGTABLE DISCARDABLE

1 0

Paul Vriens : crypt32: Improve an English resource.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 7baf876646320dc2b6230610760a9816aee8e8e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7baf876646320dc2b62306107… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Mon Jul 6 18:03:37 2009 +0200 crypt32: Improve an English resource. --- dlls/crypt32/crypt32_En.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/crypt32_En.rc b/dlls/crypt32/crypt32_En.rc index 92d26c5..be06845 100644 --- a/dlls/crypt32/crypt32_En.rc +++ b/dlls/crypt32/crypt32_En.rc @@ -174,7 +174,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "Intermediate Certification Authorities" IDS_LOCALIZEDNAME_ADDRESSBOOK "Other People" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Trusted Publishers" - IDS_LOCALIZEDNAME_DISALLOWED "Disallowed" + IDS_LOCALIZEDNAME_DISALLOWED "Untrusted Certificates" } STRINGTABLE DISCARDABLE

1 0

Alexandre Julliard : winetest: Load resources by name instead of id.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: fc2bef1d9cd1f50db5328f75849a46ae080c98ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc2bef1d9cd1f50db5328f758… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 7 10:59:29 2009 +0200 winetest: Load resources by name instead of id. --- programs/winetest/main.c | 18 ++++++++---------- programs/winetest/resource.h | 9 --------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 66daa65..887fbfa 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -284,13 +284,13 @@ static const char* get_test_source_file(const char* test, const char* subtest) return buffer; } -static void* extract_rcdata (LPTSTR name, int type, DWORD* size) +static void* extract_rcdata (LPCTSTR name, LPCTSTR type, DWORD* size) { HRSRC rsrc; HGLOBAL hdl; LPVOID addr; - if (!(rsrc = FindResource (NULL, name, MAKEINTRESOURCE(type))) || + if (!(rsrc = FindResource (NULL, name, type)) || !(*size = SizeofResource (0, rsrc)) || !(hdl = LoadResource (0, rsrc)) || !(addr = LockResource (hdl))) @@ -308,7 +308,7 @@ extract_test (struct wine_test *test, const char *dir, LPTSTR res_name) HANDLE hfile; DWORD written; - code = extract_rcdata (res_name, TESTRES, &size); + code = extract_rcdata (res_name, "TESTRES", &size); if (!code) report (R_FATAL, "Can't find test resource %s: %d", res_name, GetLastError ()); test->name = heap_strdup( res_name ); @@ -682,7 +682,7 @@ run_tests (char *logname, char *outdir) xprintf ("Archive: -\n"); /* no longer used */ xprintf ("Tag: %s\n", tag); xprintf ("Build info:\n"); - strres = extract_rcdata (MAKEINTRESOURCE(BUILD_INFO), STRINGRES, &strsize); + strres = extract_rcdata ("BUILD_INFO", "STRINGRES", &strsize); while (strres) { eol = memchr (strres, '\n', strsize); if (!eol) { @@ -701,8 +701,7 @@ run_tests (char *logname, char *outdir) xprintf ("Dll info:\n" ); report (R_STATUS, "Counting tests"); - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), - EnumTestFileProc, (LPARAM)&nr_of_files)) + if (!EnumResourceNames (NULL, "TESTRES", EnumTestFileProc, (LPARAM)&nr_of_files)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); wine_tests = heap_alloc (nr_of_files * sizeof wine_tests[0]); @@ -717,8 +716,7 @@ run_tests (char *logname, char *outdir) report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; nr_of_tests = 0; - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), - extract_test_proc, (LPARAM)tempdir)) + if (!EnumResourceNames (NULL, "TESTRES", extract_test_proc, (LPARAM)tempdir)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); @@ -801,7 +799,7 @@ static void extract_only (const char *target_dir) nr_of_files = 0; report (R_STATUS, "Counting tests"); - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), EnumTestFileProc, (LPARAM)&nr_of_files)) + if (!EnumResourceNames (NULL, "TESTRES", EnumTestFileProc, (LPARAM)&nr_of_files)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); wine_tests = heap_alloc (nr_of_files * sizeof wine_tests[0] ); @@ -809,7 +807,7 @@ static void extract_only (const char *target_dir) report (R_STATUS, "Extracting tests"); report (R_PROGRESS, 0, nr_of_files); nr_of_files = 0; - if (!EnumResourceNames (NULL, MAKEINTRESOURCE(TESTRES), extract_only_proc, (LPARAM)target_dir)) + if (!EnumResourceNames (NULL, "TESTRES", extract_only_proc, (LPARAM)target_dir)) report (R_FATAL, "Can't enumerate test files: %d", GetLastError ()); report (R_DELTA, 0, "Extracting: Done"); diff --git a/programs/winetest/resource.h b/programs/winetest/resource.h index 6676508..b0f1646 100644 --- a/programs/winetest/resource.h +++ b/programs/winetest/resource.h @@ -43,12 +43,3 @@ #define IDC_ABOUT 4001 #define IDS_BUILD_ID 1 - -/* Resource types */ - -#define TESTRES 1000 -#define STRINGRES 1001 - -/* String resources */ - -#define BUILD_INFO 10001

1 0

Frédéric Delanoy : winefile: Fix French translation & UI display.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: wine Branch: master Commit: 8356d12c4c72eeb03644914e19debfb72829e5da URL: http://source.winehq.org/git/wine.git/?a=commit;h=8356d12c4c72eeb03644914e1… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 15:52:23 2009 +0200 winefile: Fix French translation & UI display. --- programs/winefile/Fr.rc | 165 ++++++++++++++++++++++++----------------------- 1 files changed, 84 insertions(+), 81 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8356d12c4c72eeb036449…

1 0

Antonio Ospite : git-notify: Add an option to exclude merge commits in reports.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: tools Branch: master Commit: 03d66f348668955834e4457c1701a70b061ce09b URL: http://source.winehq.org/git/tools.git/?a=commit;h=03d66f348668955834e4457c… Author: Antonio Ospite <ospite(a)studenti.unina.it> Date: Mon Jul 6 15:22:46 2009 +0200 git-notify: Add an option to exclude merge commits in reports. --- git-notify | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/git-notify b/git-notify index 8c3d523..d79cfcc 100755 --- a/git-notify +++ b/git-notify @@ -22,6 +22,7 @@ # -u url Set the URL to the gitweb browser # -i branch If at least one -i is given, report only for specified branches # -x branch Exclude changes to the specified branch from reports +# -X Exclude merge commits # use strict; @@ -72,6 +73,9 @@ my @include_list = split /\s+/, git_config( "notify.include" ) || ""; # branches to exclude my @exclude_list = split /\s+/, git_config( "notify.exclude" ) || ""; +# Extra options to git rev-list +my @revlist_options; + sub usage() { print "Usage: $0 [options] [--] old-sha1 new-sha1 refname\n"; @@ -83,6 +87,7 @@ sub usage() print " -u url Set the URL to the gitweb browser\n"; print " -i branch If at least one -i is given, report only for specified branches\n"; print " -x branch Exclude changes to the specified branch from reports\n"; + print " -X Exclude merge commits\n"; exit 1; } @@ -144,6 +149,7 @@ sub parse_options() elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } elsif ($arg eq '-i') { push @include_list, shift @ARGV; } elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } + elsif ($arg eq '-X') { push @revlist_options, "--no-merges"; } elsif ($arg eq '-d') { $debug++; } else { usage(); } } @@ -352,7 +358,8 @@ sub send_global_notice($$$) my ($ref, $old_sha1, $new_sha1) = @_; my @notice = (); - open LIST, "-|" or exec "git", "rev-list", "--pretty", "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; + push @revlist_options, "--pretty"; + open LIST, "-|" or exec "git", "rev-list", @revlist_options, "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; while (<LIST>) { chomp; @@ -381,7 +388,7 @@ sub send_all_notices($$$) my @commits = (); - open LIST, "-|" or exec "git", "rev-list", "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; + open LIST, "-|" or exec "git", "rev-list", @revlist_options, "^$old_sha1", "$new_sha1", @exclude_list or die "cannot exec git-rev-list"; while (<LIST>) { chomp;

1 0

Paul Vriens : transl: Show name for Polish locale again.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: tools Branch: master Commit: 8dc806ff75f3daab62c92e0727cb2d46019562ef URL: http://source.winehq.org/git/tools.git/?a=commit;h=8dc806ff75f3daab62c92e07… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Sat Jul 4 15:20:04 2009 +0200 transl: Show name for Polish locale again. --- transl/php/devel/dump-locales.php | 2 +- transl/php/dump_locales.php | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/transl/php/devel/dump-locales.php b/transl/php/devel/dump-locales.php index 36a915a..8b27c78 100644 --- a/transl/php/devel/dump-locales.php +++ b/transl/php/devel/dump-locales.php @@ -21,7 +21,7 @@ function res_enum($header, $f) } $LOCALE_NAMES = array(); -$res = new ResFile("../dumps/res/dlls-kernel32-kernel.res"); +$res = new ResFile("../dumps/res/dlls-kernel32.res"); $res->enumResources("res_enum"); ksort($LOCALE_NAMES); echo "<?php<br/># Generated by devel/dump-locales.php<br/>\$LOCALE_NAMES = array();<br/>"; diff --git a/transl/php/dump_locales.php b/transl/php/dump_locales.php index 69963c4..8d1bb90 100644 --- a/transl/php/dump_locales.php +++ b/transl/php/dump_locales.php @@ -89,6 +89,7 @@ $LOCALE_NAMES["013:03"] = "Dutch (Surinam)"; $LOCALE_NAMES["014:01"] = "Norwegian (Bokmal)"; $LOCALE_NAMES["014:02"] = "Norwegian (Nynorsk)"; $LOCALE_NAMES["015:01"] = "Polish"; +$LOCALE_NAMES["015:00"] = $LOCALE_NAMES["015:01"]; # ignore sublangs $LOCALE_NAMES["016:01"] = "Portuguese (Brazil)"; $LOCALE_NAMES["016:02"] = "Portuguese (Portugal)"; $LOCALE_NAMES["017:01"] = "Romansh (Switzerland)";

1 0

Daniel Ribeiro : git-notify: Add an option to notify only about specified branches.
by Alexandre Julliard July 7, 2009

July 7, 2009

Module: tools Branch: master Commit: b87fdcc46989cbc27541e5d610066b7ee95fb752 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b87fdcc46989cbc27541e5d6… Author: Daniel Ribeiro <drwyrm(a)gmail.com> Date: Mon Jul 6 15:22:45 2009 +0200 git-notify: Add an option to notify only about specified branches. To add more than one branch to the include list, issue more than one "-i branch" arguments, one for each branch. When at least one "-i branch" is used, the -x option will be ignored. --- git-notify | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/git-notify b/git-notify index 50345b1..8c3d523 100755 --- a/git-notify +++ b/git-notify @@ -20,6 +20,7 @@ # -r name Set the git repository name # -s bytes Set the maximum diff size in bytes (-1 for no limit) # -u url Set the URL to the gitweb browser +# -i branch If at least one -i is given, report only for specified branches # -x branch Exclude changes to the specified branch from reports # @@ -65,6 +66,9 @@ my $cia_project_name = git_config( "notify.cia" ); # max number of individual notices before falling back to a single global notice (can be set with -n option) my $max_individual_notices = git_config( "notify.maxnotices" ) || 100; +# branches to include +my @include_list = split /\s+/, git_config( "notify.include" ) || ""; + # branches to exclude my @exclude_list = split /\s+/, git_config( "notify.exclude" ) || ""; @@ -77,6 +81,7 @@ sub usage() print " -r name Set the git repository name\n"; print " -s bytes Set the maximum diff size in bytes (-1 for no limit)\n"; print " -u url Set the URL to the gitweb browser\n"; + print " -i branch If at least one -i is given, report only for specified branches\n"; print " -x branch Exclude changes to the specified branch from reports\n"; exit 1; } @@ -137,6 +142,7 @@ sub parse_options() elsif ($arg eq '-r') { $repos_name = shift @ARGV; } elsif ($arg eq '-s') { $max_diff_size = shift @ARGV; } elsif ($arg eq '-u') { $gitweb_url = shift @ARGV; } + elsif ($arg eq '-i') { push @include_list, shift @ARGV; } elsif ($arg eq '-x') { push @exclude_list, shift @ARGV; } elsif ($arg eq '-d') { $debug++; } else { usage(); } @@ -365,6 +371,8 @@ sub send_all_notices($$$) $ref =~ s/^refs\/heads\///; + return if (@include_list && !grep {$_ eq $ref} @include_list); + if ($old_sha1 eq '0' x 40) # new ref { send_commit_notice( $ref, $new_sha1 ) if $commitlist_address;

1 0

Jacek Caban : mshtml: Don't call AutoRegister on GRE directory - it' s no longer needed.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 3ab8778ec9384f03eb5ab0a101f1e92597bca7a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ab8778ec9384f03eb5ab0a10… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 6 13:41:48 2009 +0200 mshtml: Don't call AutoRegister on GRE directory - it's no longer needed. --- dlls/mshtml/nsembed.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9a3f396..85a3a0d 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -448,10 +448,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) if(NS_FAILED(nsres)) ERR("AutoRegister(NULL) failed: %08x\n", nsres); - nsres = nsIComponentRegistrar_AutoRegister(registrar, gre_dir); - if(NS_FAILED(nsres)) - ERR("AutoRegister(gre_dir) failed: %08x\n", nsres); - init_nsio(pCompMgr, registrar); }else { ERR("NS_GetComponentRegistrar failed: %08x\n", nsres);

1 0

Frédéric Delanoy : wineconsole: Fix French translation & UI display.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 89260f00bb825965a73d2e0d5194ca0d0f242548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89260f00bb825965a73d2e0d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Mon Jul 6 12:31:00 2009 +0200 wineconsole: Fix French translation & UI display. --- programs/wineconsole/wineconsole_Fr.rc | 106 ++++++++++++++++--------------- 1 files changed, 55 insertions(+), 51 deletions(-) diff --git a/programs/wineconsole/wineconsole_Fr.rc b/programs/wineconsole/wineconsole_Fr.rc index 63796ec..330436b 100644 --- a/programs/wineconsole/wineconsole_Fr.rc +++ b/programs/wineconsole/wineconsole_Fr.rc @@ -1,6 +1,7 @@ /* * Copyright 2001 Eric Pouech * Copyright 2006 Jonathan Ernst + * 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 @@ -19,67 +20,70 @@ #include "wineconsole_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE BEGIN -IDS_EDIT, "�&dition" -IDS_DEFAULT, "Par &d�faut" -IDS_PROPERTIES, "&Propri�t�s" +IDS_EDIT, "É&dition" +IDS_DEFAULT, "Par &défaut" +IDS_PROPERTIES, "&Propriétés" IDS_MARK, "&Marquer" IDS_COPY, "&Copier" IDS_PASTE, "C&oller" -IDS_SELECTALL, "&S�lectionner tout" -IDS_SCROLL, "&D�filer" +IDS_SELECTALL, "&Sélectionner tout" +IDS_SCROLL, "&Défiler" IDS_SEARCH, "C&hercher" -IDS_FNT_DISPLAY, "Chaque caract�re a %ld points en largeur et %ld points en hauteur" +IDS_FNT_DISPLAY, "Chaque caractère a %ld pixels de largeur et %ld pixels de hauteur" IDS_FNT_PREVIEW_1, "Ceci est un test" -IDS_FNT_PREVIEW_2, "��" -IDS_DLG_TIT_DEFAULT, "Configuration par d�faut" +IDS_FNT_PREVIEW_2, "éèàôë" +IDS_DLG_TIT_DEFAULT, "Configuration par défaut" IDS_DLG_TIT_CURRENT, "Configuration courante" IDS_DLG_TIT_ERROR, "Erreur de configuration" -IDS_DLG_ERR_SBWINSIZE, "La taille du tampon �cran doit �tre plus grande que celle de la fen�tre" +IDS_DLG_ERR_SBWINSIZE, "La taille du tampon écran doit être plus grande ou égale à celle du tampon de la fenêtre" -IDS_CMD_INVALID_EVENT_ID "wineconsole : Impossible d'analyser l'�v�nement\n" -IDS_CMD_INVALID_BACKEND "wineconsole : Moteur invalide\n" -IDS_CMD_INVALID_OPTION "wineconsole : Option de la ligne de commande non reconnue\n" -IDS_CMD_ABOUT "D�marre un programme dans une console Wine\n" -IDS_CMD_LAUNCH_FAILED "wineconsole : �chec lors du d�marrage du programme %s.\n"\ +IDS_CMD_INVALID_EVENT_ID "wineconsole : impossible de déchiffrer l'identifiant d'événement\n" +IDS_CMD_INVALID_BACKEND "wineconsole : moteur invalide\n" +IDS_CMD_INVALID_OPTION "wineconsole : option de ligne de commande non reconnue\n" +IDS_CMD_ABOUT "Démarre un programme dans une console Wine\n" +IDS_CMD_LAUNCH_FAILED "wineconsole : échec lors du démarrage du programme %s.\n"\ "La commande est invalide.\n" IDS_USAGE_HEADER "\nUsage :\n wineconsole [options] <commande>\n\nOptions :\n" -IDS_USAGE_BACKEND " --backend={user|curses} En choisissant � user � une nouvelle fen�tre sera cr��e, � curses �\n"\ - " essaiera de convertir le terminal courant en console Wine\n" -IDS_USAGE_COMMAND " <command> Le programme Wine � ex�cuter dans la console\n" -IDS_USAGE_FOOTER "\nExemple :\n wineconsole cmd\nD�marre l'interpr�teur de commandes de Wine dans une console Wine\n\n" +IDS_USAGE_BACKEND " --backend={user|curses} Utilisez « user » pour utiliser une nouvelle fenêtre\n"\ + " « curses » pour essayer de convertir le terminal courant en console Wine\n" +IDS_USAGE_COMMAND " <commande> Le programme Wine à exécuter dans la console\n" +IDS_USAGE_FOOTER "\nExemple : « wineconsole cmd » démarre l'interpréteur de commandes de Wine dans une console Wine\n\n" END -IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_OPTION DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 214, 105 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Options " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille du curseur", -1, 10, 11, 60, 44, BS_GROUPBOX - AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 23, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 33, 44, 10, WS_TABSTOP - AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 43, 44, 10, WS_TABSTOP - - GROUPBOX "Contr�le", -1, 75, 11, 125, 44, BS_GROUPBOX - LTEXT "Popup menu", -1, 79, 23, 50, 10 - AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 129, 23, 60, 10, WS_TABSTOP - AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 129, 33, 60, 10, WS_TABSTOP - LTEXT "�dition rapide", -1, 79, 43, 50, 10 - AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 129, 43, 60, 10, WS_TABSTOP - - GROUPBOX "Historique des commandes", -1, 10, 57, 190, 35, BS_GROUPBOX - LTEXT "&Taille de la m�moire tampon :", -1, 14, 67, 78, 18 - EDITTEXT IDC_OPT_HIST_SIZE, 92, 69, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER + GROUPBOX "Taille du curseur", -1, 10, 11, 63, 49, BS_GROUPBOX + AUTORADIOBUTTON "&Petit", IDC_OPT_CURSOR_SMALL, 14, 25, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Moyen", IDC_OPT_CURSOR_MEDIUM, 14, 35, 44, 10, WS_TABSTOP + AUTORADIOBUTTON "&Grand", IDC_OPT_CURSOR_LARGE, 14, 45, 44, 10, WS_TABSTOP + + GROUPBOX "Contrôle", -1, 75, 11, 129, 49, BS_GROUPBOX + LTEXT "Menu contextuel", -1, 83, 23, 53, 10 + AUTOCHECKBOX "&Control", IDC_OPT_CONF_CTRL, 142, 23, 60, 10, WS_TABSTOP + AUTOCHECKBOX "S&hift", IDC_OPT_CONF_SHIFT, 142, 33, 60, 10, WS_TABSTOP + LTEXT "Édition rapide", -1, 83, 48, 53, 10 + AUTOCHECKBOX "&activer", IDC_OPT_QUICK_EDIT, 142, 48, 60, 10, WS_TABSTOP + + GROUPBOX "Historique des commandes", -1, 10, 62, 194, 35, BS_GROUPBOX + LTEXT "&Nombre de commandes mémorisées :", -1, 14, 72, 78, 18 + EDITTEXT IDC_OPT_HIST_SIZE, 94, 74, 31, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_OPT_HIST_SIZE_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 130, 67, 60, 18, WS_TABSTOP|BS_MULTILINE + AUTOCHECKBOX "&Supprimer les doublons", IDC_OPT_HIST_NODOUBLE, 142, 72, 60, 18, WS_TABSTOP|BS_MULTILINE } -IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_FONT DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 106 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Police " FONT 8, "MS Shell Dlg" @@ -90,17 +94,17 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_FNT_COLOR_FG, "WineConColorPreview", 0L, 100, 18, 48, 16 CONTROL "", IDC_FNT_COLOR_BK, "WineConColorPreview", 0L, 100, 40, 48, 16 LTEXT "&Taille", -1, 158, 5, 40, 8 - LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 60, WS_VSCROLL + LISTBOX IDC_FNT_LIST_SIZE, 158, 18, 40, 43, WS_VSCROLL CONTROL "", IDC_FNT_PREVIEW, "WineConFontPreview", 0L, 5, 60, 109, 40 - LTEXT "", IDC_FNT_FONT_INFO, 128, 76, 80, 18 + LTEXT "", IDC_FNT_FONT_INFO, 120, 69, 78, 28 } -IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 140, 105 +IDD_CONFIG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 205, 107 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION " Configuration " FONT 8, "MS Shell Dlg" { - GROUPBOX "Taille m�moire tampon �cran", -1, 10, 11, 100, 42, BS_GROUPBOX + GROUPBOX "Taille mémoire tampon écran", -1, 10, 11, 100, 42, BS_GROUPBOX LTEXT "&Largeur :", -1, 14, 25, 54, 9 EDITTEXT IDC_CNF_SB_WIDTH, 68, 23, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -108,7 +112,7 @@ FONT 8, "MS Shell Dlg" EDITTEXT IDC_CNF_SB_HEIGHT, 68, 37, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_SB_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 - GROUPBOX "Taille de la fen�tre", -1, 10, 55, 100, 42 + GROUPBOX "Taille de la fenêtre", -1, 10, 55, 100, 42 LTEXT "La&rgeur :", -1, 14, 69, 54, 9 EDITTEXT IDC_CNF_WIN_WIDTH, 68, 67, 36, 12, WS_TABSTOP|WS_BORDER|ES_NUMBER CONTROL "", IDC_CNF_WIN_WIDTH_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 @@ -117,21 +121,21 @@ FONT 8, "MS Shell Dlg" CONTROL "", IDC_CNF_WIN_HEIGHT_UD, "msctls_updown32", UDS_SETBUDDYINT|UDS_ALIGNRIGHT|UDS_AUTOBUDDY|UDS_ARROWKEYS|UDS_NOTHOUSANDS, 0, 0, 0, 0 GROUPBOX "Fin du programme", -1, 115, 11, 80, 42, BS_GROUPBOX - AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 75, 20, WS_TABSTOP + AUTOCHECKBOX "&Fermer la console", IDC_CNF_CLOSE_EXIT, 119, 25, 70, 20, WS_TABSTOP - GROUPBOX "�dition", -1, 115, 55, 80, 42 - COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 75, 20, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP + GROUPBOX "Édition", -1, 115, 55, 80, 42 + COMBOBOX IDC_CNF_EDITION_MODE, 119, 69, 73, 13, CBS_DROPDOWNLIST|WS_VSCROLL|WS_TABSTOP } -IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 200, 60 +IDD_SAVE_SETTINGS DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 206, 60 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION -CAPTION "Param�tres de la console" +CAPTION "Paramètres de la console" FONT 8, "MS Shell Dlg" { - GROUPBOX "", -1, 10, 10, 180, 31, BS_GROUPBOX - AUTORADIOBUTTON "Sauver les param�tres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 170, 10, WS_TABSTOP - AUTORADIOBUTTON "Appliquer uniquement � la session courante", IDC_SAV_SESSION, 14, 27, 170, 10, WS_TABSTOP + GROUPBOX "", -1, 10, 10, 185, 31, BS_GROUPBOX + AUTORADIOBUTTON "Sauver les paramètres pour les prochaines sessions", IDC_SAV_SAVE, 14, 15, 180, 10, WS_TABSTOP + AUTORADIOBUTTON "Appliquer uniquement à la session courante", IDC_SAV_SESSION, 14, 27, 180, 10, WS_TABSTOP - PUSHBUTTON "OK", IDOK, 50, 45, 35, 12 - PUSHBUTTON "Annuler", IDCANCEL, 115, 45, 35, 12 + PUSHBUTTON "OK", IDOK, 55, 45, 35, 12 + PUSHBUTTON "Annuler", IDCANCEL, 120, 45, 35, 12 }

1 0

Alexandre Julliard : kernel32: Forward the Wow64 redirection functions to ntdll.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 26caf2fdda95f1934e329aa27f4d681d09390ebe URL: http://source.winehq.org/git/wine.git/?a=commit;h=26caf2fdda95f1934e329aa27… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:09:29 2009 +0200 kernel32: Forward the Wow64 redirection functions to ntdll. --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/path.c | 25 +++++++++++++++++++------ include/winbase.h | 3 +++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 5182e71..fc3b6ae 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1144,6 +1144,7 @@ @ stdcall WaitNamedPipeW (wstr long) @ stdcall WideCharToMultiByte(long long wstr long ptr long ptr ptr) @ stdcall WinExec(str long) +@ stdcall Wow64EnableWow64FsRedirection(long) @ stdcall Wow64DisableWow64FsRedirection(ptr) @ stdcall Wow64RevertWow64FsRedirection(ptr) @ stdcall WriteConsoleA(long ptr long ptr ptr) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 2633d90..0b3a87e 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -1539,24 +1539,37 @@ UINT WINAPI GetSystemWow64DirectoryA( LPSTR lpBuffer, UINT uSize ) return 0; } + +/*********************************************************************** + * Wow64EnableWow64FsRedirection (KERNEL32.@) + */ +BOOLEAN WINAPI Wow64EnableWow64FsRedirection( BOOLEAN enable ) +{ + NTSTATUS status = RtlWow64EnableFsRedirection( enable ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; +} + + /*********************************************************************** * Wow64DisableWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64DisableWow64FsRedirection( PVOID *old_value ) { - FIXME("%p\n", old_value); - - if (old_value) *old_value = (void *)0xdeadbeef; - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirectionEx( TRUE, (ULONG *)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } + /*********************************************************************** * Wow64RevertWow64FsRedirection (KERNEL32.@) */ BOOL WINAPI Wow64RevertWow64FsRedirection( PVOID old_value ) { - FIXME("%p\n", old_value); - return TRUE; + NTSTATUS status = RtlWow64EnableFsRedirection( (UINT_PTR)old_value ); + if (status) SetLastError( RtlNtStatusToDosError(status) ); + return !status; } diff --git a/include/winbase.h b/include/winbase.h index 0794fc6..a7eaf9d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2143,6 +2143,9 @@ WINBASEAPI BOOL WINAPI WaitNamedPipeA(LPCSTR,DWORD); WINBASEAPI BOOL WINAPI WaitNamedPipeW(LPCWSTR,DWORD); #define WaitNamedPipe WINELIB_NAME_AW(WaitNamedPipe) WINBASEAPI UINT WINAPI WinExec(LPCSTR,UINT); +WINBASEAPI BOOL WINAPI Wow64DisableWow64FsRedirection(PVOID*); +WINBASEAPI BOOLEAN WINAPI Wow64EnableWow64FsRedirection(BOOLEAN); +WINBASEAPI BOOL WINAPI Wow64RevertWow64FsRedirection(PVOID); WINBASEAPI BOOL WINAPI WriteFile(HANDLE,LPCVOID,DWORD,LPDWORD,LPOVERLAPPED); WINBASEAPI BOOL WINAPI WriteFileEx(HANDLE,LPCVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE); WINBASEAPI BOOL WINAPI WriteFileGather(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);

1 0

Roderick Colenbrander : winex11: Move AlphaBlend over to get_xrender_format .
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: bf86daa0b676533d8c7f7f68e1825e28751b106b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf86daa0b676533d8c7f7f68e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:52:19 2009 +0200 winex11: Move AlphaBlend over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 44 ++++++++------------------------------------ 1 files changed, 8 insertions(+), 36 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index e3d2105..afbadb3 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1739,35 +1739,6 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BLENDFUNCTION blendfn) { XRenderPictureAttributes pa; - XRenderPictFormat *src_format; - XRenderPictFormat argb32_templ = { - 0, /* id */ - PictTypeDirect, /* type */ - 32, /* depth */ - { /* direct */ - 16, /* direct.red */ - 0xff, /* direct.redMask */ - 8, /* direct.green */ - 0xff, /* direct.greenMask */ - 0, /* direct.blue */ - 0xff, /* direct.blueMask */ - 24, /* direct.alpha */ - 0xff, /* direct.alphaMask */ - }, - 0, /* colormap */ - }; - unsigned long argb32_templ_mask = - PictFormatType | - PictFormatDepth | - PictFormatRed | - PictFormatRedMask | - PictFormatGreen | - PictFormatGreenMask | - PictFormatBlue | - PictFormatBlueMask | - PictFormatAlpha | - PictFormatAlphaMask; - Picture dst_pict, src_pict; Pixmap xpm; DIBSECTION dib; @@ -1780,6 +1751,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid BOOL top_down = FALSE; RGNDATA *rgndata; WineXRenderFormat *dst_format = get_xrender_format_from_pdevice(devDst); + WineXRenderFormat *src_format; int repeat_src; if(!X11DRV_XRender_Installed) { @@ -1896,13 +1868,13 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid image = XCreateImage(gdi_display, visual, 32, ZPixmap, 0, (char*) data, widthSrc, heightSrc, 32, widthSrc * 4); - /* - Avoid using XRenderFindStandardFormat as older libraries don't have it - src_format = pXRenderFindStandardFormat(gdi_display, PictStandardARGB32); - */ - src_format = pXRenderFindFormat(gdi_display, argb32_templ_mask, &argb32_templ, 0); - + src_format = get_xrender_format(WXR_FORMAT_A8R8G8B8); TRACE("src_format %p\n", src_format); + if(!src_format) + { + WARN("Unable to find a picture format supporting alpha, make sure X is running at 24-bit\n"); + return FALSE; + } pa.subwindow_mode = IncludeInferiors; pa.repeat = repeat_src ? RepeatNormal : RepeatNone; @@ -1923,7 +1895,7 @@ BOOL CDECL X11DRV_AlphaBlend(X11DRV_PDEVICE *devDst, INT xDst, INT yDst, INT wid XPutImage(gdi_display, xpm, gc, image, 0, 0, 0, 0, widthSrc, heightSrc); src_pict = pXRenderCreatePicture(gdi_display, - xpm, src_format, + xpm, src_format->pict_format, CPSubwindowMode|CPRepeat, &pa); TRACE("src_pict %08lx\n", src_pict);

1 0

Hib Eris : msi: Implement ASSIGN mode in MsiViewModify.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: ec4edbfd6c35a76327bf06e7677170afa5aad265 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec4edbfd6c35a76327bf06e76… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:26:20 2009 +0200 msi: Implement ASSIGN mode in MsiViewModify. --- dlls/msi/table.c | 18 ++++++++++++++++++ dlls/msi/tests/db.c | 16 ++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index dc21b3b..126769a 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1711,6 +1711,21 @@ static UINT msi_table_update(struct tagMSIVIEW *view, MSIRECORD *rec, UINT row) return TABLE_set_row(view, new_row, rec, (1 << tv->num_cols) - 1); } +static UINT msi_table_assign(struct tagMSIVIEW *view, MSIRECORD *rec) +{ + MSITABLEVIEW *tv = (MSITABLEVIEW *)view; + UINT r, row; + + if (!tv->table) + return ERROR_INVALID_PARAMETER; + + r = msi_table_find_row(tv, rec, &row); + if (r == ERROR_SUCCESS) + return TABLE_set_row(view, row, rec, (1 << tv->num_cols) - 1); + else + return TABLE_insert_row( view, rec, -1, FALSE ); +} + static UINT modify_delete_row( struct tagMSIVIEW *view, MSIRECORD *rec ) { MSITABLEVIEW *tv = (MSITABLEVIEW *)view; @@ -1780,6 +1795,9 @@ static UINT TABLE_modify( struct tagMSIVIEW *view, MSIMODIFY eModifyMode, break; case MSIMODIFY_ASSIGN: + r = msi_table_assign( view, rec ); + break; + case MSIMODIFY_REPLACE: case MSIMODIFY_MERGE: case MSIMODIFY_VALIDATE: diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index e694ea3..019ff5e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4795,7 +4795,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4811,12 +4811,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 2, "Expected 2, got %d\n", r); + ok(r == 2, "Expected 2, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4845,7 +4845,7 @@ static void test_viewmodify_assign(void) ok(r == ERROR_SUCCESS, "failed to set integer\n"); r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n"); @@ -4861,12 +4861,12 @@ static void test_viewmodify_assign(void) r = MsiViewExecute(hview, 0); ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); r = MsiViewFetch(hview, &hrec); - todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); r = MsiRecordGetInteger(hrec, 1); - todo_wine ok(r == 1, "Expected 1, got %d\n", r); + ok(r == 1, "Expected 1, got %d\n", r); r = MsiRecordGetInteger(hrec, 2); - todo_wine ok(r == 4, "Expected 4, got %d\n", r); + ok(r == 4, "Expected 4, got %d\n", r); r = MsiCloseHandle(hrec); ok(r == ERROR_SUCCESS, "failed to close record\n");

1 0

Roderick Colenbrander : winex11: Move glyph code over to get_xrender_format .
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: e13865285eae43abd8d0b04dcb6182e0b0694e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13865285eae43abd8d0b04dc… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 21:03:48 2009 +0200 winex11: Move glyph code over to get_xrender_format. --- dlls/winex11.drv/xrender.c | 71 ++++++++++++++++---------------------------- 1 files changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index afbadb3..dd53f23 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -54,10 +54,11 @@ static BOOL X11DRV_XRender_Installed = FALSE; #define RepeatReflect 3 #endif -#define MAX_FORMATS 9 +#define MAX_FORMATS 10 typedef enum wine_xrformat { WXR_FORMAT_MONO, + WXR_FORMAT_GRAY, WXR_FORMAT_X1R5G5B5, WXR_FORMAT_X1B5G5R5, WXR_FORMAT_R5G6B5, @@ -86,6 +87,7 @@ static const WineXRenderFormatTemplate wxr_formats_template[] = { /* Format depth alpha mask red mask green mask blue mask*/ {WXR_FORMAT_MONO, 1, 0, 0x01, 0, 0, 0, 0, 0, 0 }, + {WXR_FORMAT_GRAY, 8, 0, 0xff, 0, 0, 0, 0, 0, 0 }, {WXR_FORMAT_X1R5G5B5, 16, 0, 0, 10, 0x1f, 5, 0x1f, 0, 0x1f }, {WXR_FORMAT_X1B5G5R5, 16, 0, 0, 0, 0x1f, 5, 0x1f, 10, 0x1f }, {WXR_FORMAT_R5G6B5, 16, 0, 0, 11, 0x1f, 5, 0x3f, 0, 0x1f }, @@ -121,7 +123,7 @@ typedef enum { AA_None = 0, AA_Grey, AA_RGB, AA_BGR, AA_VRGB, AA_VBGR, AA_MAXVAL typedef struct { GlyphSet glyphset; - XRenderPictFormat *font_format; + WineXRenderFormat *font_format; int nrealized; BOOL *realized; void **bitmaps; @@ -828,8 +830,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) gsCacheEntry *entry = glyphsetCache + physDev->xrender->cache_index; gsCacheEntryFormat *formatEntry; UINT ggo_format = GGO_GLYPH_INDEX; - XRenderPictFormat pf; - unsigned long pf_mask; + WXRFormat wxr_format; static const char zero[4]; static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; @@ -918,48 +919,28 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format) if(formatEntry->glyphset == 0 && X11DRV_XRender_Installed) { switch(format) { - case AA_Grey: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 8; - pf.direct.alpha = 0; - pf.direct.alphaMask = 0xff; - break; - - case AA_RGB: - case AA_BGR: - case AA_VRGB: - case AA_VBGR: - pf_mask = PictFormatType | PictFormatDepth | PictFormatRed | PictFormatRedMask | - PictFormatGreen | PictFormatGreenMask | PictFormatBlue | - PictFormatBlueMask | PictFormatAlpha | PictFormatAlphaMask; - pf.type = PictTypeDirect; - pf.depth = 32; - pf.direct.red = 16; - pf.direct.redMask = 0xff; - pf.direct.green = 8; - pf.direct.greenMask = 0xff; - pf.direct.blue = 0; - pf.direct.blueMask = 0xff; - pf.direct.alpha = 24; - pf.direct.alphaMask = 0xff; - break; + case AA_Grey: + wxr_format = WXR_FORMAT_GRAY; + break; - default: - ERR("aa = %d - not implemented\n", format); - case AA_None: - pf_mask = PictFormatType | PictFormatDepth | PictFormatAlpha | PictFormatAlphaMask, - pf.type = PictTypeDirect; - pf.depth = 1; - pf.direct.alpha = 0; - pf.direct.alphaMask = 1; - break; - } + case AA_RGB: + case AA_BGR: + case AA_VRGB: + case AA_VBGR: + wxr_format = WXR_FORMAT_A8R8G8B8; + break; - wine_tsx11_lock(); - formatEntry->font_format = pXRenderFindFormat(gdi_display, pf_mask, &pf, 0); - formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format); - wine_tsx11_unlock(); + default: + ERR("aa = %d - not implemented\n", format); + case AA_None: + wxr_format = WXR_FORMAT_MONO; + break; + } + + wine_tsx11_lock(); + formatEntry->font_format = get_xrender_format(wxr_format); + formatEntry->glyphset = pXRenderCreateGlyphSet(gdi_display, formatEntry->font_format->pict_format); + wine_tsx11_unlock(); } @@ -1571,7 +1552,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag pXRenderCompositeText16(gdi_display, render_op, tile_pict, physDev->xrender->pict, - formatEntry->font_format, + formatEntry->font_format->pict_format, 0, 0, 0, 0, elts, count); wine_tsx11_unlock(); HeapFree(GetProcessHeap(), 0, elts);

1 0

Roderick Colenbrander : winex11: Get rid of the static Xrender picture format table.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 8262e0a80067e75d3ff81ab4292907db9e95d157 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8262e0a80067e75d3ff81ab42… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sun Jul 5 20:35:01 2009 +0200 winex11: Get rid of the static Xrender picture format table. --- dlls/winex11.drv/xrender.c | 245 +++++++++++++++++++++++++++++++++++--------- 1 files changed, 197 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8262e0a80067e75d3ff81…

1 0

Alexandre Julliard : ntdll: Add management of the Wow64 filesystem redirection flag.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 747d58d211e76a7c06b2cd412dd43f4d71bbd82e URL: http://source.winehq.org/git/wine.git/?a=commit;h=747d58d211e76a7c06b2cd412… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jul 6 15:08:39 2009 +0200 ntdll: Add management of the Wow64 filesystem redirection flag. --- dlls/ntdll/directory.c | 23 +++++++++++++++++++++++ dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/ntdll_misc.h | 7 ++++--- dlls/ntdll/process.c | 6 +----- dlls/ntdll/server.c | 8 +++++++- include/winternl.h | 2 ++ 6 files changed, 39 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index 41880f4..bccfba6 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2130,6 +2130,29 @@ done: /****************************************************************** + * RtlWow64EnableFsRedirection (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirection( BOOLEAN enable ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** + * RtlWow64EnableFsRedirectionEx (NTDLL.@) + */ +NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx( ULONG enable, ULONG *old_value ) +{ + if (!is_wow64) return STATUS_NOT_IMPLEMENTED; + *old_value = ntdll_get_thread_data()->wow64_redir; + ntdll_get_thread_data()->wow64_redir = enable; + return STATUS_SUCCESS; +} + + +/****************************************************************** * RtlDoesFileExists_U (NTDLL.@) */ BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR file_name) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index acc69db..03686b2 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -913,6 +913,8 @@ @ stdcall -arch=x86_64 RtlVirtualUnwind(long long long ptr ptr ptr ptr ptr) @ stub RtlWalkFrameChain @ stdcall RtlWalkHeap(long ptr) +@ stdcall RtlWow64EnableFsRedirection(long) +@ stdcall RtlWow64EnableFsRedirectionEx(long ptr) @ stub RtlWriteMemoryStream @ stdcall RtlWriteRegistryValue(long ptr ptr long ptr long) @ stub RtlZeroHeap diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h index 8da7148..3032553 100644 --- a/dlls/ntdll/ntdll_misc.h +++ b/dlls/ntdll/ntdll_misc.h @@ -71,7 +71,7 @@ extern void virtual_init_threading(void); /* server support */ extern timeout_t server_start_time; -extern unsigned int server_cpus; +extern int is_wow64; extern void server_init_process(void); extern NTSTATUS server_init_process_done(void); extern size_t server_init_thread( void *entry_point ); @@ -198,8 +198,9 @@ struct ntdll_thread_data int request_fd; /* 1e0/310 fd for sending server requests */ int reply_fd; /* 1e4/314 fd for receiving server replies */ int wait_fd[2]; /* 1e8/318 fd for sleeping server requests */ - void *vm86_ptr; /* 1f0/320 data for vm86 mode */ - pthread_t pthread_id; /* 1f4/328 pthread thread id */ + BOOL wow64_redir; /* 1f0/320 Wow64 filesystem redirection flag */ + void *vm86_ptr; /* 1f4/328 data for vm86 mode */ + pthread_t pthread_id; /* 1f8/330 pthread thread id */ }; static inline struct ntdll_thread_data *ntdll_get_thread_data(void) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index c129e0a..9ec5513 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -307,11 +307,7 @@ NTSTATUS WINAPI NtQueryInformationProcess( case ProcessWow64Information: if (ProcessInformationLength == sizeof(DWORD)) { -#ifdef __i386__ - *(DWORD *)ProcessInformation = (server_cpus & (1 << CPU_x86_64)) != 0; -#else - *(DWORD *)ProcessInformation = FALSE; -#endif + *(DWORD *)ProcessInformation = is_wow64; len = sizeof(DWORD); } else ret = STATUS_INFO_LENGTH_MISMATCH; diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index e90ea72..a4f2953 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -94,7 +94,8 @@ static const enum cpu_type client_cpu = CPU_SPARC; #error Unsupported CPU #endif -unsigned int server_cpus = 0; +static unsigned int server_cpus; +int is_wow64 = FALSE; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS /* data structure used to pass an fd with sendmsg/recvmsg */ @@ -1081,6 +1082,11 @@ size_t server_init_thread( void *entry_point ) } SERVER_END_REQ; +#ifndef _WIN64 + is_wow64 = (server_cpus & (1 << CPU_x86_64)) != 0; +#endif + ntdll_get_thread_data()->wow64_redir = is_wow64; + if (ret) { if (ret == STATUS_NOT_SUPPORTED) diff --git a/include/winternl.h b/include/winternl.h index b386787..6d0b480 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2512,6 +2512,8 @@ NTSYSAPI BOOLEAN WINAPI RtlValidSid(PSID); NTSYSAPI BOOLEAN WINAPI RtlValidateHeap(HANDLE,ULONG,LPCVOID); NTSYSAPI NTSTATUS WINAPI RtlVerifyVersionInfo(const RTL_OSVERSIONINFOEXW*,DWORD,DWORDLONG); NTSYSAPI NTSTATUS WINAPI RtlWalkHeap(HANDLE,PVOID); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirection(BOOLEAN); +NTSYSAPI NTSTATUS WINAPI RtlWow64EnableFsRedirectionEx(ULONG,ULONG*); NTSYSAPI NTSTATUS WINAPI RtlWriteRegistryValue(ULONG,PCWSTR,PCWSTR,ULONG,PVOID,ULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI RtlpNtEnumerateSubKey(HANDLE,UNICODE_STRING *, ULONG);

1 0

Michael Stefaniuc : winecfg: Fix regression introduced by 807d75a94e378d05.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4f8ce1b2f2d8dcdfc24489e0ff6d34c0e7c14645 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8ce1b2f2d8dcdfc24489e0f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Jul 6 11:35:27 2009 +0200 winecfg: Fix regression introduced by 807d75a94e378d05. This is the fix for the "PACKAGE_STRING" Wine release. --- programs/winecfg/Bg.rc | 1 + programs/winecfg/Cs.rc | 1 + programs/winecfg/Da.rc | 1 + programs/winecfg/De.rc | 1 + programs/winecfg/En.rc | 1 + programs/winecfg/Es.rc | 1 + programs/winecfg/Fi.rc | 1 + programs/winecfg/Fr.rc | 1 + programs/winecfg/Hu.rc | 1 + programs/winecfg/It.rc | 1 + programs/winecfg/Ja.rc | 1 + programs/winecfg/Ko.rc | 1 + programs/winecfg/Lt.rc | 1 + programs/winecfg/Nl.rc | 1 + programs/winecfg/No.rc | 1 + programs/winecfg/Pl.rc | 1 + programs/winecfg/Pt.rc | 1 + programs/winecfg/Ro.rc | 1 + programs/winecfg/Ru.rc | 1 + programs/winecfg/Si.rc | 1 + programs/winecfg/Sv.rc | 1 + programs/winecfg/Tr.rc | 1 + programs/winecfg/Zh.rc | 1 + programs/winecfg/winecfg.rc | 1 + 24 files changed, 24 insertions(+), 0 deletions(-) diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc index 9ddaf2c..00cfbe8 100644 --- a/programs/winecfg/Bg.rc +++ b/programs/winecfg/Bg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc index 6f5804b..b34dd06 100644 --- a/programs/winecfg/Cs.rc +++ b/programs/winecfg/Cs.rc @@ -25,6 +25,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Czech strings in CP1250 */ diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc index b1df6f6..62b781b 100644 --- a/programs/winecfg/Da.rc +++ b/programs/winecfg/Da.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DANISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc index 045e709..1bedd06 100644 --- a/programs/winecfg/De.rc +++ b/programs/winecfg/De.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc index 88a6269..f71463a 100644 --- a/programs/winecfg/En.rc +++ b/programs/winecfg/En.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc index e22ada4..2ddce6c 100644 --- a/programs/winecfg/Es.rc +++ b/programs/winecfg/Es.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc index 211669e..f6fb85c 100644 --- a/programs/winecfg/Fi.rc +++ b/programs/winecfg/Fi.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc index 2b4d20b..b63adb1 100644 --- a/programs/winecfg/Fr.rc +++ b/programs/winecfg/Fr.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc index e97c7a4..0445c77 100644 --- a/programs/winecfg/Hu.rc +++ b/programs/winecfg/Hu.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_HUNGARIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/It.rc b/programs/winecfg/It.rc index 2ee50cb..aea66df 100644 --- a/programs/winecfg/It.rc +++ b/programs/winecfg/It.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc index eeb0987..a25a953 100644 --- a/programs/winecfg/Ja.rc +++ b/programs/winecfg/Ja.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc index 151375f..c01b841 100644 --- a/programs/winecfg/Ko.rc +++ b/programs/winecfg/Ko.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Lt.rc b/programs/winecfg/Lt.rc index e31c2cb..3dd3041 100644 --- a/programs/winecfg/Lt.rc +++ b/programs/winecfg/Lt.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* UTF-8 */ diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc index 66bd464..99062cf 100644 --- a/programs/winecfg/Nl.rc +++ b/programs/winecfg/Nl.rc @@ -22,6 +22,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc index 2825675..357539e 100644 --- a/programs/winecfg/No.rc +++ b/programs/winecfg/No.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc index f7fb619..8e1d9a2 100644 --- a/programs/winecfg/Pl.rc +++ b/programs/winecfg/Pl.rc @@ -23,6 +23,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_POLISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc index a3b0219..baf2920 100644 --- a/programs/winecfg/Pt.rc +++ b/programs/winecfg/Pt.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc index fb8a20b..c836d60 100644 --- a/programs/winecfg/Ro.rc +++ b/programs/winecfg/Ro.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc index 9656c48..8d61413 100644 --- a/programs/winecfg/Ru.rc +++ b/programs/winecfg/Ru.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc index 1a8d488..87cd239 100644 --- a/programs/winecfg/Si.rc +++ b/programs/winecfg/Si.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" #pragma code_page(65001) diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc index 5770899..113603c 100644 --- a/programs/winecfg/Sv.rc +++ b/programs/winecfg/Sv.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc index dbe1f2f..883c0f3 100644 --- a/programs/winecfg/Tr.rc +++ b/programs/winecfg/Tr.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc index 349d106..b483cfe 100644 --- a/programs/winecfg/Zh.rc +++ b/programs/winecfg/Zh.rc @@ -21,6 +21,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* Chinese text is encoded in UTF-8 */ diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc index 7f8fe80..df572fd 100644 --- a/programs/winecfg/winecfg.rc +++ b/programs/winecfg/winecfg.rc @@ -20,6 +20,7 @@ * */ +#include "config.h" /* Needed for the PACKAGE_STRING definition */ #include "resource.h" /* @makedep: idb_wine.bmp */

1 0

Hib Eris : msi/tests: Add tests for MsiViewModify ASSIGN mode.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: eaea537f0f0cbefc55b5fb8bb023e2cd779f810d URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaea537f0f0cbefc55b5fb8bb… Author: Hib Eris <hib(a)hiberis.nl> Date: Mon Jul 6 12:24:48 2009 +0200 msi/tests: Add tests for MsiViewModify ASSIGN mode. --- dlls/msi/tests/db.c | 122 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 122 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 43b5648..e694ea3 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4763,6 +4763,127 @@ static void test_viewmodify_update(void) ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); } +static void test_viewmodify_assign(void) +{ + MSIHANDLE hdb = 0, hview = 0, hrec = 0; + const char *query; + UINT r; + + /* setup database */ + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase failed\n"); + + query = "CREATE TABLE `table` (`A` INT, `B` INT PRIMARY KEY `A`)"; + r = run_query( hdb, 0, query ); + ok(r == ERROR_SUCCESS, "query failed\n"); + + /* assign to view, new primary key */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 2); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 2, "Expected 2, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* assign to view, primary key matches */ + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + + hrec = MsiCreateRecord(2); + ok(hrec != 0, "MsiCreateRecord failed\n"); + + r = MsiRecordSetInteger(hrec, 1, 1); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + r = MsiRecordSetInteger(hrec, 2, 4); + ok(r == ERROR_SUCCESS, "failed to set integer\n"); + + r = MsiViewModify(hview, MSIMODIFY_ASSIGN, hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewModify failed: %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "SELECT * FROM `table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "MsiDatabaseOpenView failed\n"); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "MsiViewExecute failed\n"); + r = MsiViewFetch(hview, &hrec); + todo_wine ok(r == ERROR_SUCCESS, "MsiViewFetch failed\n"); + + r = MsiRecordGetInteger(hrec, 1); + todo_wine ok(r == 1, "Expected 1, got %d\n", r); + r = MsiRecordGetInteger(hrec, 2); + todo_wine ok(r == 4, "Expected 4, got %d\n", r); + + r = MsiCloseHandle(hrec); + ok(r == ERROR_SUCCESS, "failed to close record\n"); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + r = MsiViewClose(hview); + ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); + r = MsiCloseHandle(hview); + ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + /* close database */ + r = MsiCloseHandle( hdb ); + ok(r == ERROR_SUCCESS, "MsiOpenDatabase close failed\n"); +} + static const WCHAR data10[] = { /* MOO */ 0x8001, 0x000b, }; @@ -8099,6 +8220,7 @@ START_TEST(db) test_tables_order(); test_select_markers(); test_viewmodify_update(); + test_viewmodify_assign(); test_stringtable(); test_viewmodify_delete(); test_defaultdatabase();

1 0

Piotr Caban : jscript: Added Bool_valueOf implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4725b5698ceb7023879772f888e5cc1f8cf2df29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4725b5698ceb7023879772f88… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:45 2009 +0200 jscript: Added Bool_valueOf implementation. --- dlls/jscript/bool.c | 18 ++++++++++++++++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index e7cf22f..c1cf297 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -74,11 +74,25 @@ static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DI return E_NOTIMPL; } +/* ECMA-262 3rd Edition 15.6.4.3 */ static HRESULT Bool_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = bool->val; + } + + return S_OK; } static HRESULT Bool_hasOwnProperty(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index c789cc0..2e7f2d4 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1084,5 +1084,6 @@ var bool = new Boolean(); ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); +ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); reportSuccess();

1 0

Piotr Caban : jscript: Fixed to_boolean implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b6549fa743675b9d58f57ec0bbfac0c08fefd9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6549fa743675b9d58f57ec0b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:56 2009 +0200 jscript: Fixed to_boolean implementation. --- dlls/jscript/jsutils.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 73bac94..eab850b 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -211,7 +211,8 @@ HRESULT to_boolean(VARIANT *v, VARIANT_BOOL *b) *b = V_I4(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_R8: - *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; + if(isnan(V_R8(v))) *b = VARIANT_FALSE; + else *b = V_R8(v) ? VARIANT_TRUE : VARIANT_FALSE; break; case VT_BSTR: *b = V_BSTR(v) && *V_BSTR(v) ? VARIANT_TRUE : VARIANT_FALSE;

1 0

Piotr Caban : jscript: Added Boolean constructor implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4b341bfdd4300d840800be1e7a62ecd0f3de3dc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b341bfdd4300d840800be1e7… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:36 2009 +0200 jscript: Added Boolean constructor implementation. --- dlls/jscript/bool.c | 37 +++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index 7e3bf7a..be36787 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -106,8 +106,41 @@ static const builtin_info_t Bool_info = { static HRESULT BoolConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + VARIANT_BOOL value = VARIANT_FALSE; + + if(arg_cnt(dp)) { + hres = to_boolean(get_arg(dp,0), &value); + if(FAILED(hres)) + return hres; + } + + switch(flags) { + case DISPATCH_CONSTRUCT: { + DispatchEx *bool; + + hres = create_bool(dispex->ctx, value, &bool); + if(FAILED(hres)) + return hres; + + V_VT(retv) = VT_DISPATCH; + V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(bool); + return S_OK; + } + + case INVOKE_FUNC: + if(retv) { + V_VT(retv) = VT_BOOL; + V_BOOL(retv) = value; + } + return S_OK; + + default: + FIXME("unimplemented flags %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; } static HRESULT alloc_bool(script_ctx_t *ctx, BOOL use_constr, BoolInstance **ret)

1 0

Piotr Caban : jscript: Added Date_valueOf implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 9a30d39b350088cee62eaafac4d4ca711667b069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a30d39b350088cee62eaafac… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:31 2009 +0200 jscript: Added Date_valueOf implementation. --- dlls/jscript/date.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index fe65702..525a3a2 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -676,8 +676,18 @@ static HRESULT Date_isPrototypeOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT Date_valueOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + DateInstance *date = (DateInstance*)dispex; + num_set_val(retv, date->time); + } + return S_OK; } /* ECMA-262 3rd Edition 15.9.5.42 */

1 0

Piotr Caban : jscript: Fix do while loop parsing.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 60748ebf515ba25b5e7506c54ecaa86486f9d009 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60748ebf515ba25b5e7506c54… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:23 2009 +0200 jscript: Fix do while loop parsing. --- dlls/jscript/parser.y | 2 +- dlls/jscript/tests/lang.js | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 52a31c8..d47d40d 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -386,7 +386,7 @@ IfStatement /* ECMA-262 3rd Edition 12.6 */ IterationStatement - : kDO Statement kWHILE '(' Expression ')' ';' + : kDO Statement kWHILE '(' Expression ')' semicolon_opt { $$ = new_while_statement(ctx, TRUE, $5, $2); } | kWHILE '(' Expression ')' Statement { $$ = new_while_statement(ctx, FALSE, $3, $5); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 86eba86..cf04f9e 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -672,6 +672,13 @@ do { ok(tmp === 1, "tmp !== 1"); tmp = 0; +do { + ok(tmp < 4, "tmp >= 4"); + tmp++; +} while(tmp < 4) +ok(tmp === 4, "tmp !== 4") + +tmp = 0; while(tmp < 4) { tmp++; if(tmp === 2) {

1 0

Piotr Caban : jscript: Added Bool_toLocaleString implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 2ed3903f0f3fb9080abe113014de3955a1f5413b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ed3903f0f3fb9080abe11301… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:51 2009 +0200 jscript: Added Bool_toLocaleString implementation. --- dlls/jscript/bool.c | 5 +++-- dlls/jscript/tests/api.js | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index c1cf297..ab9ef43 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -1,5 +1,6 @@ /* * Copyright 2008 Jacek Caban for CodeWeavers + * Copyright 2009 Piotr Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,8 +71,8 @@ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + TRACE("\n"); + return Bool_toString(dispex, lcid, flags, dp, retv, ei, sp); } /* ECMA-262 3rd Edition 15.6.4.3 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e7f2d4..23a4ad5 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1085,5 +1085,6 @@ ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); var bool = new Boolean("false"); ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); ok(bool.valueOf() === Boolean(1), "bool.valueOf() = " + bool.valueOf()); +ok(bool.toLocaleString() === bool.toString(), "bool.toLocaleString() = " + bool.toLocaleString()); reportSuccess();

1 0

Piotr Caban : jscript: Added Bool_toString implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 1e72bc8718ae35867b8ecdbdb7ac3efbb52a3ad5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e72bc8718ae35867b8ecdbdb… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:41 2009 +0200 jscript: Added Bool_toString implementation. --- dlls/jscript/bool.c | 28 ++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 5 +++++ 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/bool.c b/dlls/jscript/bool.c index be36787..e7cf22f 100644 --- a/dlls/jscript/bool.c +++ b/dlls/jscript/bool.c @@ -36,11 +36,35 @@ static const WCHAR propertyIsEnumerableW[] = {'p','r','o','p','e','r','t','y','I','s','E','n','u','m','e','r','a','b','l','e',0}; static const WCHAR isPrototypeOfW[] = {'i','s','P','r','o','t','o','t','y','p','e','O','f',0}; +/* ECMA-262 3rd Edition 15.6.4.2 */ static HRESULT Bool_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR trueW[] = {'t','r','u','e',0}; + static const WCHAR falseW[] = {'f','a','l','s','e',0}; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_BOOLEAN)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + if(retv) { + BoolInstance *bool = (BoolInstance*)dispex; + BSTR val; + + if(bool->val) val = SysAllocString(trueW); + else val = SysAllocString(falseW); + + if(!val) + return E_OUTOFMEMORY; + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = val; + } + + return S_OK; } static HRESULT Bool_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index b76e94b..c789cc0 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1080,4 +1080,9 @@ ok(Math.floor(Math.SQRT1_2*100) === 70, "Math.SQRT1_2 = " + Math.SQRT1_2); Math.SQRT1_2 = "test"; ok(Math.floor(Math.SQRT1_2*100) === 70, "modified Math.SQRT1_2 = " + Math.SQRT1_2); +var bool = new Boolean(); +ok(bool.toString() === "false", "bool.toString() = " + bool.toString()); +var bool = new Boolean("false"); +ok(bool.toString() === "true", "bool.toString() = " + bool.toString()); + reportSuccess();

1 0

Alexander Scott-Johns : notepad: Refactor DoOpenFile to simplify next patch .
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 93b99e0af36fd6290822a13d2e36c88cb8826956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93b99e0af36fd6290822a13d2… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 00:34:45 2009 +0100 notepad: Refactor DoOpenFile to simplify next patch. --- programs/notepad/dialog.c | 70 ++++++++++++++++----------------------------- 1 files changed, 25 insertions(+), 45 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index c1dbb6d..eae0d30 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -337,24 +337,6 @@ static inline ENCODING detect_encoding_of_buffer(const void* buffer, int size) } } -/* Similar to SetWindowTextA, but uses a CP_UTF8 encoded input, not CP_ACP. - * lpTextInUtf8 should be NUL-terminated and not include the BOM. - * - * Returns FALSE on failure, TRUE on success, like SetWindowTextA/W. - */ -static BOOL SetWindowTextUtf8(HWND hwnd, LPCSTR lpTextInUtf8) -{ - BOOL ret; - int lenW = MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, NULL, 0); - LPWSTR textW = HeapAlloc(GetProcessHeap(), 0, lenW * sizeof(WCHAR)); - if (!textW) - return FALSE; - MultiByteToWideChar(CP_UTF8, 0, lpTextInUtf8, -1, textW, lenW); - ret = SetWindowTextW(hwnd, textW); - HeapFree(GetProcessHeap(), 0, textW); - return ret; -} - void DoOpenFile(LPCWSTR szFileName, ENCODING enc) { static const WCHAR dotlog[] = { '.','L','O','G',0 }; @@ -362,7 +344,8 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) LPSTR pTemp; DWORD size; DWORD dwNumRead; - BOOL succeeded; + int lenW; + WCHAR* textW; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -405,8 +388,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) CloseHandle(hFile); size = dwNumRead; - pTemp[size] = 0; /* make sure it's (char)'\0'-terminated */ - pTemp[size+1] = 0; /* make sure it's (WCHAR)'\0'-terminated */ if (enc == ENCODING_AUTO) enc = detect_encoding_of_buffer(pTemp, size); @@ -421,9 +402,6 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) enc = ENCODING_UTF16BE; } - /* SetWindowTextUtf8 and SetWindowTextA try to allocate memory, so we - * check if they succeed. - */ switch (enc) { case ENCODING_UTF16BE: @@ -434,33 +412,35 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) /* fall through */ case ENCODING_UTF16LE: - if (size >= 2 && (BYTE)pTemp[0] == 0xff && (BYTE)pTemp[1] == 0xfe) - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp + 1); - else - succeeded = SetWindowTextW(Globals.hEdit, (LPWSTR)pTemp); - break; - - case ENCODING_UTF8: - if (size >= 3 && (BYTE)pTemp[0] == 0xef && (BYTE)pTemp[1] == 0xbb && - (BYTE)pTemp[2] == 0xbf) - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp+3); - else - succeeded = SetWindowTextUtf8(Globals.hEdit, pTemp); + textW = (LPWSTR)pTemp; + lenW = size/sizeof(WCHAR); break; default: - succeeded = SetWindowTextA(Globals.hEdit, pTemp); - break; + { + int cp = (enc==ENCODING_UTF8) ? CP_UTF8 : CP_ACP; + lenW = MultiByteToWideChar(cp, 0, pTemp, size, NULL, 0); + textW = HeapAlloc(GetProcessHeap(), 0, (lenW+1) * sizeof(WCHAR)); + if (!textW) + { + ShowLastError(); + HeapFree(GetProcessHeap(), 0, pTemp); + return; + } + MultiByteToWideChar(cp, 0, pTemp, size, textW, lenW); + HeapFree(GetProcessHeap(), 0, pTemp); + break; + } } - if (!succeeded) - { - ShowLastError(); - HeapFree(GetProcessHeap(), 0, pTemp); - return; - } + textW[lenW] = '\0'; - HeapFree(GetProcessHeap(), 0, pTemp); + if (lenW >= 1 && textW[0] == 0xfeff) + SetWindowTextW(Globals.hEdit, textW+1); + else + SetWindowTextW(Globals.hEdit, textW); + + HeapFree(GetProcessHeap(), 0, textW); SendMessageW(Globals.hEdit, EM_SETMODIFY, FALSE, 0); SendMessageW(Globals.hEdit, EM_EMPTYUNDOBUFFER, 0, 0);

1 0

Alexander Scott-Johns : notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 32c066f12abbf3864ec75b5cb6e9fb08c288c50b URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c066f12abbf3864ec75b5cb… Author: Alexander Scott-Johns <alexander.scott.johns(a)googlemail.com> Date: Fri Jul 3 01:04:00 2009 +0100 notepad: When opening a file, replace \0 characters with spaces, instead of truncating the file at the first \0. --- programs/notepad/dialog.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c index eae0d30..5594069 100644 --- a/programs/notepad/dialog.c +++ b/programs/notepad/dialog.c @@ -346,6 +346,7 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) DWORD dwNumRead; int lenW; WCHAR* textW; + int i; WCHAR log[5]; /* Close any files and prompt to save changes */ @@ -433,6 +434,12 @@ void DoOpenFile(LPCWSTR szFileName, ENCODING enc) } } + /* Replace '\0's with spaces. Other than creating a custom control that + * can deal with '\0' characters, it's the best that can be done. + */ + for (i = 0; i < lenW; i++) + if (textW[i] == '\0') + textW[i] = ' '; textW[lenW] = '\0'; if (lenW >= 1 && textW[0] == 0xfeff)

1 0

Piotr Caban : jscript: Added string argument handling to Date constructor.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 8150960f8ccdd5e52c1d2f83f857b6c9114a734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8150960f8ccdd5e52c1d2f83f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:08 2009 +0200 jscript: Added string argument handling to Date constructor. --- dlls/jscript/date.c | 9 ++++----- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d43708a..aa06f4e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2617,12 +2617,11 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(FAILED(hres)) return hres; - if(V_VT(&prim) == VT_BSTR) { - FIXME("VT_BSTR not supported\n"); - return E_NOTIMPL; - } + if(V_VT(&prim) == VT_BSTR) + hres = date_parse(V_BSTR(&prim), &num); + else + hres = to_number(dispex->ctx, &prim, ei, &num); - hres = to_number(dispex->ctx, &prim, ei, &num); VariantClear(&prim); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 27eabfc..b76e94b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -940,6 +940,8 @@ date = new Date(8.64e15+1); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +date = new Date("3 July 2009 22:28:00 UTC+0100"); +ok(date.getTime() === 1246656480000, "date.getTime() = " + date.getTime()); date = new Date(1984, 11, 29, 13, 51, 24, 120); ok(date.getFullYear() === 1984, "date.getFullYear() = " + date.getFullYear()); ok(date.getMonth() === 11, "date.getMonth() = " + date.getMonth());

1 0

Piotr Caban : jscript: Added DateConstr_parse implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 45817bf50fd0504a2f996300be52574a831a7c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45817bf50fd0504a2f996300b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 11:00:22 2009 +0200 jscript: Added DateConstr_parse implementation. --- dlls/jscript/date.c | 284 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/math.c | 1 + dlls/jscript/tests/api.js | 16 +++ 3 files changed, 299 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45817bf50fd0504a2f996…

1 0

Piotr Caban : jscript: Added calling Date as function implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b5a82030adbe3a965690a2f974511291984818c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a82030adbe3a965690a2f97… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:14 2009 +0200 jscript: Added calling Date as function implementation. --- dlls/jscript/date.c | 75 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index aa06f4e..fe65702 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -455,9 +455,7 @@ static SYSTEMTIME create_systemtime(DOUBLE time) return st; } -/* ECMA-262 3rd Edition 15.9.1.2 */ -static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, VARIANT *retv) { static const WCHAR NaNW[] = { 'N','a','N',0 }; static const WCHAR formatW[] = { '%','s',' ','%','s',' ','%','d',' ', @@ -466,6 +464,9 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static const WCHAR formatUTCW[] = { '%','s',' ','%','s',' ','%','d',' ', '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', 'U','T','C',' ','%','d','%','s',0 }; + static const WCHAR formatNoOffsetW[] = { '%','s',' ','%','s',' ', + '%','d',' ','%','0','2','d',':','%','0','2','d',':', + '%','0','2','d',' ','%','d','%','s',0 }; static const WCHAR ADW[] = { 0 }; static const WCHAR BCW[] = { ' ','B','.','C','.',0 }; @@ -481,23 +482,12 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA BOOL formatAD = TRUE; BSTR week, month; - DateInstance *date; BSTR date_str; - DOUBLE time; - int len, size, year, day, offset; + int len, size, year, day; DWORD lcid_en, week_id, month_id; WCHAR sign = '-'; - TRACE("\n"); - - if(!is_class(dispex, JSCLASS_DATE)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } - - date = (DateInstance*)dispex; - - if(isnan(date->time)) { + if(isnan(time)) { if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocString(NaNW); @@ -507,8 +497,6 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } - time = local_time(date->time, date); - if(retv) { len = 21; @@ -554,10 +542,8 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } while(day); day = date_from_time(time); - offset = date->bias + - daylight_saving_ta(time, date); - - if(offset == 0) len -= 5; + if(!show_offset) len -= 9; + else if(offset == 0) len -= 5; else if(offset < 0) { sign = '+'; offset = -offset; @@ -570,15 +556,19 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_OUTOFMEMORY; } - if(offset) + if(!show_offset) + sprintfW(date_str, formatNoOffsetW, week, month, day, + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); + else if(offset) sprintfW(date_str, formatW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, year, formatAD?ADW:BCW); else sprintfW(date_str, formatUTCW, week, month, day, - (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?ADW:BCW); + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); SysFreeString(week); SysFreeString(month); @@ -589,6 +579,29 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } +/* ECMA-262 3rd Edition 15.9.1.2 */ +static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DateInstance *date; + DOUBLE time; + int offset; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + time = local_time(date->time, date); + offset = date->bias + + daylight_saving_ta(time, date); + + return date_to_string(time, TRUE, offset, retv); +} + /* ECMA-262 3rd Edition 15.9.1.5 */ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -2652,6 +2665,18 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(date); return S_OK; + case INVOKE_FUNC: { + FILETIME system_time, local_time; + LONGLONG lltime; + + GetSystemTimeAsFileTime(&system_time); + FileTimeToLocalFileTime(&system_time, &local_time); + lltime = ((LONGLONG)local_time.dwHighDateTime<<32) + + local_time.dwLowDateTime; + + return date_to_string(lltime/10000-TIME_EPOCH, FALSE, 0, retv); + } + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL;

1 0

Nikolay Sivov : comctl32/listview: Fix some test failures on 4.7x.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: c3e66a8f86eb61107382730e30e01ef533bd4ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e66a8f86eb61107382730e3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jul 6 10:22:50 2009 +0400 comctl32/listview: Fix some test failures on 4.7x. --- dlls/comctl32/tests/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 86b7ff8..43a7037 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -201,6 +201,7 @@ static const struct message forward_erasebkgnd_parent_seq[] = { static const struct message ownderdata_select_focus_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { WM_NOTIFY, sent|id|optional, 0, 0, LVN_GETDISPINFOA }, /* version 4.7x */ { 0 } };

1 0

Aurimas Fišeras : cryptdlg: Translate "CPS" ( Certification Practice Statement) to Lithuanian and add a comment to English resource.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: e552e51a481a194ab2952d62cb8c6926f9e41198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e552e51a481a194ab2952d62c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jul 4 17:39:57 2009 +0300 cryptdlg: Translate "CPS" (Certification Practice Statement) to Lithuanian and add a comment to English resource. --- dlls/cryptdlg/cryptdlg_En.rc | 2 +- dlls/cryptdlg/cryptdlg_Lt.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_En.rc b/dlls/cryptdlg/cryptdlg_En.rc index 3ab5f94..72ceecd 100644 --- a/dlls/cryptdlg/cryptdlg_En.rc +++ b/dlls/cryptdlg/cryptdlg_En.rc @@ -28,7 +28,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "Policy Identifier: " IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" + IDS_CPS "CPS" /* Certification Practice Statement */ IDS_USER_NOTICE "User Notice" IDS_QUALIFIER "Qualifier" IDS_NOTICE_REF "Notice Reference" diff --git a/dlls/cryptdlg/cryptdlg_Lt.rc b/dlls/cryptdlg/cryptdlg_Lt.rc index a967494..74ef293 100644 --- a/dlls/cryptdlg/cryptdlg_Lt.rc +++ b/dlls/cryptdlg/cryptdlg_Lt.rc @@ -31,7 +31,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "Politikos identifikatorius: " IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" - IDS_CPS "CPS" + IDS_CPS "Sertifikavimo Veiklos Nuostatos (CPS)" IDS_USER_NOTICE "Naudotojo pranešimas" IDS_QUALIFIER "Kvalifikatorius" IDS_NOTICE_REF "Pranešimo nuoroda"

1 0

Dan Kegel : winmm: Don't convert return string in mciSendStringA on error.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: ea5a6f2db5e6f05acf38f9257278cbcad58ab898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5a6f2db5e6f05acf38f9257… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jul 3 21:52:38 2009 -0700 winmm: Don't convert return string in mciSendStringA on error. --- dlls/winmm/mci.c | 2 +- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 262d62d..6fca013 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1506,7 +1506,7 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, } } ret = mciSendStringW(lpwstrCommand, lpwstrRet, uRetLen, hwndCallback); - if (lpwstrRet) + if (!ret && lpwstrRet) WideCharToMultiByte( CP_ACP, 0, lpwstrRet, -1, lpstrRet, uRetLen, NULL, NULL ); HeapFree(GetProcessHeap(), 0, lpwstrCommand); HeapFree(GetProcessHeap(), 0, lpwstrRet); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 8764b30..5f86985 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -53,7 +53,7 @@ START_TEST(mci) memset(buf, 0, sizeof(buf)); err = mciSendString(command_close_all, buf, sizeof(buf), hwnd); todo_wine ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_close_all, err); - todo_wine ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); + ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); memset(buf, 0, sizeof(buf)); err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL);

1 0

Dmitry Timoshkov : user32: Fix some BM_SETSTYLE test failres under Win9x.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: df055b2d2ccf5911ff754619b1892c02fc333334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df055b2d2ccf5911ff754619b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 6 15:16:01 2009 +0900 user32: Fix some BM_SETSTYLE test failres under Win9x. --- dlls/user32/tests/msg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0e6ed29..e2789ce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5215,7 +5215,7 @@ static const struct message WmSetStyleButtonSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { 0 } }; @@ -5225,7 +5225,7 @@ static const struct message WmSetStyleStaticSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORSTATIC, sent|parent }, { 0 } }; @@ -5235,7 +5235,7 @@ static const struct message WmSetStyleUserSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, { 0 } @@ -5246,9 +5246,9 @@ static const struct message WmSetStyleOwnerdrawSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, - { WM_CTLCOLORBTN, sent|parent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent|optional }, /* Win9x doesn't send it */ { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, { 0 } };

1 0

Henri Verbeet : wined3d: Get rid of the redundant "return_value" variable.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: ad0ef46a39df6fcae62554c15da5a48ee2f52eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0ef46a39df6fcae62554c15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:38 2009 +0200 wined3d: Get rid of the redundant "return_value" variable. --- dlls/wined3d/directx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ac96fe..0bbb198 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -468,7 +468,6 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GLint gl_max; GLfloat gl_floatv[2]; int major = 1, minor = 0; - BOOL return_value = TRUE; unsigned i; HDC hdc; unsigned int vidmem=0; @@ -1548,7 +1547,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } LEAVE_GL(); - return return_value; + return TRUE; } /**********************************************************

1 0

Francois Gouget : winapi: Simplify and improve the readability of the C parsers.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: a4ed46d3988ad2af2d8077bb284e9a5ee0e05543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ed46d3988ad2af2d8077bb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:08:10 2009 +0200 winapi: Simplify and improve the readability of the C parsers. Specifically, clean up parameter passing, and remove unneeded intermediate variable references. Remove uninformative comments. --- tools/winapi/c_function.pm | 158 ++++--------- tools/winapi/c_parser.pm | 577 ++++++++++++++------------------------------ tools/winapi/c_type.pm | 408 ++++++++++++------------------- 3 files changed, 381 insertions(+), 762 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ed46d3988ad2af2d807…

1 0

Henri Verbeet : winedd3d: Get rid of a useless trace.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 966f8f452d5465fa06caac69f50f0c98cba0a412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966f8f452d5465fa06caac69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:39 2009 +0200 winedd3d: Get rid of a useless trace. gl_card isn't initialized yet here, and GL_RENDERER is already printed earlier. --- dlls/wined3d/directx.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0bbb198..fa89621 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -674,8 +674,6 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* Current Windows drivers have versions like 6.14.... (some older have an earlier version). */ gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14); - TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card); - /* * Initialize openGL extension related variables * with Default values

1 0

Henri Verbeet : wined3d: Get rid of the unused gl_version and glx_version fields.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b2331ec79b3471f07f8aa480b5a9e53749ade874 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2331ec79b3471f07f8aa480b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:40 2009 +0200 wined3d: Get rid of the unused gl_version and glx_version fields. --- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_gl.h | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fa89621..9db71af 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -471,6 +471,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { unsigned i; HDC hdc; unsigned int vidmem=0; + DWORD gl_version; TRACE_(d3d_caps)("(%p)\n", gl_info); @@ -539,7 +540,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { minor = atoi(gl_string_cursor); TRACE_(d3d_caps)("Found OpenGL version: %d.%d.\n", major, minor); - gl_info->gl_version = MAKEDWORD_VERSION(major, minor); + gl_version = MAKEDWORD_VERSION(major, minor); /* Now parse the driver specific string which we'll report to the app. */ switch (gl_info->gl_vendor) @@ -765,7 +766,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { { \ DWORD ver = ver_for_ext(ext); \ if (gl_info->supported[ext]) gl_info->pfn = (type)pwglGetProcAddress(#pfn); \ - else if (ver && ver <= gl_info->gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ + else if (ver && ver <= gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ else gl_info->pfn = NULL; \ } GL_EXT_FUNCS_GEN; @@ -783,7 +784,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { for (i = 0; i < (sizeof(EXTENSION_MAP) / sizeof(*EXTENSION_MAP)); ++i) { if (!gl_info->supported[EXTENSION_MAP[i].extension] - && EXTENSION_MAP[i].version <= gl_info->gl_version && EXTENSION_MAP[i].version) + && EXTENSION_MAP[i].version <= gl_version && EXTENSION_MAP[i].version) { TRACE_(d3d_caps)(" GL CORE: %s support.\n", EXTENSION_MAP[i].extension_string); gl_info->supported[EXTENSION_MAP[i].extension] = TRUE; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 0c5cae5..8471842 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3949,10 +3949,6 @@ typedef BOOL (WINAPI * WINED3D_PFNWGLSETPIXELFORMATWINE) (HDC hdc, int iPixelFor #define USE_GL_FUNC(type, pfn, ext, replace) type pfn; typedef struct _WineD3D_GL_Info { - - DWORD glx_version; - DWORD gl_version; - GL_Vendors gl_vendor; GL_Cards gl_card; UINT vidmem;

1 0

Henri Verbeet : wined3d: Avoid a forward declaration.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: c9257aed857621cd6dfb7993c14d809c5832ac19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9257aed857621cd6dfb7993c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:42 2009 +0200 wined3d: Avoid a forward declaration. --- dlls/wined3d/directx.c | 821 ++++++++++++++++++++++++------------------------ 1 files changed, 415 insertions(+), 406 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c9257aed857621cd6dfb7…

1 0

Henri Verbeet : wined3d: Remove the gl_renderer field from WineD3D_GL_Info.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 4571455fea79c0ad19b4c4bea07493722a60173a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4571455fea79c0ad19b4c4bea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:41 2009 +0200 wined3d: Remove the gl_renderer field from WineD3D_GL_Info. --- dlls/wined3d/directx.c | 294 ++++++++++++++++++++++++++------------------- dlls/wined3d/wined3d_gl.h | 1 - 2 files changed, 172 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4571455fea79c0ad19b4c…

1 0

Paul Vriens : cryptui: Fix Dutch translations.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 5c49cfc09a93723e8f2a6f8ef2bd03cf492aa612 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c49cfc09a93723e8f2a6f8ef… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 15:05:08 2009 +0200 cryptui: Fix Dutch translations. --- dlls/cryptui/cryptui_Nl.rc | 62 ++++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5c49cfc09a93723e8f2a6…

1 0

Nikolay Sivov : user32/spy: Update ListView message table.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 49e95baa2ada50cc7f9417852131bc927085587b URL: http://source.winehq.org/git/wine.git/?a=commit;h=49e95baa2ada50cc7f9417852… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 5 22:41:51 2009 +0400 user32/spy: Update ListView message table. --- dlls/user32/spy.c | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index c2bd60b..3301ac1 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -731,7 +731,7 @@ static const char * const MessageTypeNames[SPY_MAX_MSGNUM + 1] = }; -#define SPY_MAX_LVMMSGNUM 140 +#define SPY_MAX_LVMMSGNUM 182 static const char * const LVMMessageTypeNames[SPY_MAX_LVMMSGNUM + 1] = { "LVM_GETBKCOLOR", /* 1000 */ @@ -872,9 +872,51 @@ static const char * const LVMMessageTypeNames[SPY_MAX_LVMMSGNUM + 1] = NULL, NULL, NULL, - NULL, "LVM_SETBKIMAGEW", - "LVM_GETBKIMAGEW" /* 0x108B */ + "LVM_GETBKIMAGEW", /* 0x108B */ + "LVM_SETSELECTEDCOLUMN", + "LVM_SETTILEWIDTH", + "LVM_SETVIEW", + "LVM_GETVIEW", + NULL, + "LVM_INSERTGROUP", + NULL, + "LVM_SETGROUPINFO", + NULL, + "LVM_GETGROUPINFO", + "LVM_REMOVEGROUP", + "LVM_MOVEGROUP", + NULL, + NULL, + "LVM_MOVEITEMTOGROUP", + "LVM_SETGROUPMETRICS", + "LVM_GETGROUPMETRICS", + "LVM_ENABLEGROUPVIEW", + "LVM_SORTGROUPS", + "LVM_INSERTGROUPSORTED", + "LVM_REMOVEALLGROUPS", + "LVM_HASGROUP", + "LVM_SETTILEVIEWINFO", + "LVM_GETTILEVIEWINFO", + "LVM_SETTILEINFO", + "LVM_GETTILEINFO", + "LVM_SETINSERTMARK", + "LVM_GETINSERTMARK", + "LVM_INSERTMARKHITTEST", + "LVM_GETINSERTMARKRECT", + "LVM_SETINSERTMARKCOLOR", + "LVM_GETINSERTMARKCOLOR", + NULL, + "LVM_SETINFOTIP", + "LVM_GETSELECTEDCOLUMN", + "LVM_ISGROUPVIEWENABLED", + "LVM_GETOUTLINECOLOR", + "LVM_SETOUTLINECOLOR", + NULL, + "LVM_CANCELEDITLABEL", + "LVM_MAPINDEXTOID", + "LVM_MAPIDTOINDEX", + "LVM_ISITEMVISIBLE" };

1 0

Paul Vriens : cryptui: Show the select store text when browsing stores.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 304806f47588eeab2db63dfcaee0daea520966fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=304806f47588eeab2db63dfca… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 21:17:37 2009 +0200 cryptui: Show the select store text when browsing stores. --- dlls/cryptui/main.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c index c11868a..9807064 100644 --- a/dlls/cryptui/main.c +++ b/dlls/cryptui/main.c @@ -5171,6 +5171,7 @@ static LRESULT CALLBACK import_store_dlg_proc(HWND hwnd, UINT msg, WPARAM wp, selectInfo.parent = hwnd; selectInfo.dwFlags = CRYPTUI_ENABLE_SHOW_PHYSICAL_STORE; selectInfo.pwszTitle = NULL; + selectInfo.pwszText = NULL; selectInfo.pEnumData = &enumData; selectInfo.pfnSelectedStoreCallback = NULL; if ((store = CryptUIDlgSelectStoreW(&selectInfo)))

1 0

Paul Vriens : crypt32: Make sure we show Unicode characters ( Dutch translation).
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: d0ef19fe9ae75b35bb0b51c00ffee3fd16046ebf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ef19fe9ae75b35bb0b51c00… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sun Jul 5 15:15:41 2009 +0200 crypt32: Make sure we show Unicode characters (Dutch translation). --- dlls/crypt32/crypt32_Nl.rc | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Nl.rc b/dlls/crypt32/crypt32_Nl.rc index e12d25d..eae902f 100644 --- a/dlls/crypt32/crypt32_Nl.rc +++ b/dlls/crypt32/crypt32_Nl.rc @@ -20,6 +20,8 @@ #include "cryptres.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE

1 0

Aurimas Fišeras : cryptui: Add Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: d9d9dae71ae65f1ff2b118b6b9cf552585836d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d9dae71ae65f1ff2b118b6b… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 14:39:08 2009 +0300 cryptui: Add Lithuanian translation. --- dlls/cryptui/Makefile.in | 1 + dlls/cryptui/cryptui_Lt.rc | 466 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 467 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9d9dae71ae65f1ff2b11…

1 0

Nikolay Sivov : comctl32/listview: Basic LVM_GETITEMSPACING tests.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 809ef092e85fc3ddb1530e10742f5c7bce6d6af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=809ef092e85fc3ddb1530e107… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Jul 5 20:45:55 2009 +0400 comctl32/listview: Basic LVM_GETITEMSPACING tests. --- dlls/comctl32/tests/listview.c | 69 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d959deb..86b7ff8 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3661,6 +3661,74 @@ static void test_mapidindex(void) DestroyWindow(hwnd); } +static void test_getitemspacing(void) +{ + HWND hwnd; + DWORD ret; + INT cx, cy; + HIMAGELIST himl; + HBITMAP hbmp; + LVITEMA itema; + + cx = GetSystemMetrics(SM_CXICONSPACING) - GetSystemMetrics(SM_CXICON); + cy = GetSystemMetrics(SM_CYICONSPACING) - GetSystemMetrics(SM_CYICON); + + /* LVS_ICON */ + hwnd = create_custom_listview_control(0); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + /* now try with icons */ + himl = ImageList_Create(40, 40, 0, 4, 4); + ok(himl != NULL, "failed to create imagelist\n"); + hbmp = CreateBitmap(40, 40, 1, 1, NULL); + ok(hbmp != NULL, "failed to create bitmap\n"); + ret = ImageList_Add(himl, hbmp, 0); + expect(0, ret); + ret = SendMessage(hwnd, LVM_SETIMAGELIST, 0, (LPARAM)himl); + expect(0, ret); + + itema.mask = LVIF_IMAGE; + itema.iImage = 0; + itema.iItem = 0; + itema.iSubItem = 0; + ret = SendMessage(hwnd, LVM_INSERTITEM, 0, (LPARAM)&itema); + expect(0, ret); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + /* spacing + icon size returned */ + expect(cx + 40, LOWORD(ret)); + expect(cy + 40, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_SMALLICON */ + hwnd = create_custom_listview_control(LVS_SMALLICON); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_REPORT */ + hwnd = create_custom_listview_control(LVS_REPORT); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); + /* LVS_LIST */ + hwnd = create_custom_listview_control(LVS_LIST); + ret = SendMessage(hwnd, LVM_GETITEMSPACING, FALSE, 0); +todo_wine { + expect(cx, LOWORD(ret)); + expect(cy, HIWORD(ret)); +} + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3714,6 +3782,7 @@ START_TEST(listview) test_editbox(); test_notifyformat(); test_indentation(); + test_getitemspacing(); if (!load_v6_module(&ctx_cookie)) {

1 0

Aurimas Fišeras : crypt32: Add Lithuanian translation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 359a389868b80f96631f72eb3c8d77c1e45b77f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=359a389868b80f96631f72eb3… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Thu Jul 2 17:08:40 2009 +0300 crypt32: Add Lithuanian translation. --- dlls/crypt32/Makefile.in | 1 + dlls/crypt32/crypt32_Lt.rc | 244 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 245 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=359a389868b80f96631f7…

1 0