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

Frédéric Delanoy : appwiz.cpl: Fix French UI display and wording.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 0c334f597bcc7fd034367d1d0d72f798d5da2a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c334f597bcc7fd034367d1d0… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 15 23:36:15 2009 +0200 appwiz.cpl: Fix French UI display and wording. --- dlls/appwiz.cpl/Fr.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index e456e46..e8e67e5 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -50,12 +50,12 @@ CAPTION "Installation/Désinstallation" FONT 8, "MS Shell Dlg" { CONTROL "Pour installer un nouveau programme à partir d'une disquette, d'un CD-ROM ou d'un disque dur, cliquez sur Installer.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 - CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 26, 70, 14 + CONTROL "&Installer...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 242, 26, 68, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Les logiciels suivants peuvent être désinstallés automatiquement.\nPour supprimer un programme ou modifier ses composants, sélectionnez-le dans la liste et cliquez sur Modifier/Supprimer.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Les logiciels suivants peuvent être désinstallés automatiquement.\nPour supprimer un programme ou modifier ses composants, sélectionnez-le dans la liste et cliquez sur Supprimer ou Modifier respectivement.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "&Informations de support...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 81, 198, 87, 14 + CONTROL "Inf&ormations de support...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 73, 198, 95, 14 CONTROL "&Modifier...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Supprimer...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20

1 0

Juan Lang : winhttp: Use the correct address length when connecting.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 235c6c1e1ea959062f51909f2ae5ea402398907b URL: http://source.winehq.org/git/wine.git/?a=commit;h=235c6c1e1ea959062f51909f2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 15 13:03:19 2009 -0700 winhttp: Use the correct address length when connecting. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index edb9143..5704417 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -920,7 +920,7 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } - if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, sizeof(struct sockaddr_in) )) + if (!netconn_connect( &request->netconn, (struct sockaddr *)&connect->sockaddr, slen )) { netconn_close( &request->netconn ); heap_free( addressW );

1 0

Juan Lang : winhttp: Fix a comment typo.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: a4a3953b2fe4e0869fb6ccf277ba0ae647852d95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4a3953b2fe4e0869fb6ccf27… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 15 08:40:51 2009 -0700 winhttp: Fix a comment typo. --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fab6c96..e1a2b4b 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -283,7 +283,7 @@ static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) return ret; } -/* Matches INTERNET_MAX_USER_NAME_LENGTH in wininet.h, also RFC 1035 */ +/* Matches INTERNET_MAX_HOST_NAME_LENGTH in wininet.h, also RFC 1035 */ #define MAX_HOST_NAME_LENGTH 256 static BOOL should_bypass_proxy(session_t *session, LPCWSTR server)

1 0

Aurimas Fišeras : appwiz.cpl: Update Lithuanian translation.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: f220d1227ad4b010c7d25cd37575552b5f4aa0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=f220d1227ad4b010c7d25cd37… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Wed Jul 15 18:59:04 2009 +0300 appwiz.cpl: Update Lithuanian translation. --- dlls/appwiz.cpl/Lt.rc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/appwiz.cpl/Lt.rc b/dlls/appwiz.cpl/Lt.rc index 7ec2a13..88f491e 100644 --- a/dlls/appwiz.cpl/Lt.rc +++ b/dlls/appwiz.cpl/Lt.rc @@ -32,7 +32,7 @@ STRINGTABLE IDS_CPL_DESC, "Leidžia įdiegti naują programinę įrangą, ar pašalinti jau įdiegtą iš jūsų kompiuterio." IDS_TAB1_TITLE, "Programos" - IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos '%s'. Ar norite pašalinti programos šalinimo įrašą iš registro?" + IDS_UNINSTALL_FAILED, "Nepavyko įvykdyti programos pašalinimo komandos „%s“. Ar norite pašalinti programos šalinimo įrašą iš registro?" IDS_NOT_SPECIFIED, "Nenurodyta" IDS_COLUMN_NAME, "Vardas" @@ -41,7 +41,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Diegimo programos\0*instal*.exe;*setup*.exe;*.msi\0Programos (*.exe)\0*.exe\0Visi failai (*.*)\0*.*\0\0" IDS_REMOVE, "Pa&šalinti..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "Pa&keisti/pašalinti..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -49,14 +49,14 @@ STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Įdiegti/Pašalinti" FONT 8, "MS Shell Dlg" { - CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite 'Įdiegti'.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "Norėdami įdiegti naują programą iš diskelio, kompaktinio disko ar standžiojo disko spauskite „Įdiegti“.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 CONTROL "Į&diegti...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite 'Įdiegti/Pašalinti'.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "Ši programinė įranga gali būti automatiškai pašalinta. Norėdami pašalinti programą ar modifikuoti jos įdiegtus komponentus pažymėkite ją sąraše ir spauskite „Pakeisti/pašalinti“.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Priežiūros informacija...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 84, 198, 84, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Pa&keisti...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "Pa&šalinti...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } @@ -67,7 +67,7 @@ CAPTION "Priežiūros informacija" FONT 8, "MS Shell Dlg" { CONTROL "Gerai", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Ši informacija gali būti panaudota programos '%s' techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Ši informacija gali būti panaudota programos „%s“ techninei priežiūrai gauti:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 CONTROL "Leidėjas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 CONTROL "Versija:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 CONTROL "Kontaktas:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8

1 0

André Hentschel : shell32: Correct German language.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 4a70164d66959f49f33f7f7bf7d9da9db9ef14ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a70164d66959f49f33f7f7bf… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 15 17:45:44 2009 +0200 shell32: Correct German language. --- dlls/shell32/shell32_De.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/shell32/shell32_De.rc b/dlls/shell32/shell32_De.rc index 47ccae2..75980ec 100644 --- a/dlls/shell32/shell32_De.rc +++ b/dlls/shell32/shell32_De.rc @@ -97,13 +97,13 @@ END MENU_CPANEL MENU BEGIN - POPUP "&File" + POPUP "&Datei" BEGIN MENUITEM SEPARATOR - MENUITEM "E&xit", IDM_CPANEL_EXIT + MENUITEM "&Beenden", IDM_CPANEL_EXIT END - POPUP "&View" + POPUP "&Ansicht" BEGIN MENUITEM "&Große Symbole", FCIDM_SHVIEW_BIGICON MENUITEM "&Kleine Symbole", FCIDM_SHVIEW_SMALLICON @@ -111,9 +111,9 @@ BEGIN MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END - POPUP "&Help" + POPUP "&Hilfe" BEGIN - MENUITEM "&About Control Panel...", IDM_CPANEL_ABOUT + MENUITEM "&Über Systemsteuerung...", IDM_CPANEL_ABOUT END END @@ -213,7 +213,7 @@ STRINGTABLE IDS_DESKTOP "Desktop" IDS_MYCOMPUTER "Arbeitsplatz" IDS_RECYCLEBIN_FOLDER_NAME "Papierkorb" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Systemsteuerung" /* context menus */ IDS_VIEW_LARGE "&Große Symbole" @@ -283,15 +283,15 @@ STRINGTABLE IDS_NEWFOLDER "Neuer Ordner" - IDS_CPANEL_TITLE "Wine Control Panel" + IDS_CPANEL_TITLE "Wine Systemsteuerung" IDS_CPANEL_NAME "Name" - IDS_CPANEL_DESCRIPTION "Description" + IDS_CPANEL_DESCRIPTION "Beschreibung" IDS_SHLEXEC_NOASSOC "Es ist kein Programm mit diesem Dateityp verknüpft." } STRINGTABLE { -IDS_LICENSE_CAPTION, "Wine License" +IDS_LICENSE_CAPTION, "Wine Lizenz" IDS_LICENSE, "Wine ist freie Software; Sie dürfen sie unter den Bedingungen \ der GNU Lesser General Public License, welche von der \

1 0

André Hentschel : appwiz.cpl: Correct German language.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: 599942643ba3fa75dec767c843dd151b1f843e48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=599942643ba3fa75dec767c84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jul 15 17:25:14 2009 +0200 appwiz.cpl: Correct German language. --- dlls/appwiz.cpl/De.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/De.rc b/dlls/appwiz.cpl/De.rc index 1111601..c851d46 100644 --- a/dlls/appwiz.cpl/De.rc +++ b/dlls/appwiz.cpl/De.rc @@ -40,7 +40,7 @@ STRINGTABLE IDS_INSTALL_FILTER, "Setup-Programme\0*instal*.exe;*setup*.exe;*.msi\0Programme (*.exe)\0*.exe\0Alle Dateien (*.*)\0*.*\0\0" IDS_REMOVE, "&Entfernen..." - IDS_MODIFY_REMOVE, "&Modify/Remove..." + IDS_MODIFY_REMOVE, "Än&dern/Entfernen..." } IDD_MAIN DIALOG 0, 0, 320, 220 @@ -55,7 +55,7 @@ FONT 8, "MS Shell Dlg" CONTROL "Folgende Programme können automatisch entfernt werden. Um ein Programm zu entfernen oder um installierte Komponenten zu ändern, wählen Sie es aus der Liste aus und klicken Sie auf Ändern/Entfernen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 CONTROL "&Informationen...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 104, 198, 64, 14 - CONTROL "&Modify...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 + CONTROL "Än&dern...", IDC_MODIFY, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 172, 198, 68, 14 CONTROL "&Entfernen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20

1 0

Aric Stewart : sane: Remove BOM from Japanese resource.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: wine Branch: master Commit: a3bae05dece0cbf45d918e511cf0b02640db6631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3bae05dece0cbf45d918e511… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 15 10:06:45 2009 -0500 sane: Remove BOM from Japanese resource. --- dlls/sane.ds/sane_Ja.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/sane.ds/sane_Ja.rc b/dlls/sane.ds/sane_Ja.rc index dd610c6..27e7095 100644 --- a/dlls/sane.ds/sane_Ja.rc +++ b/dlls/sane.ds/sane_Ja.rc @@ -1,4 +1,4 @@ -/* +/* * Japanese resources for Twain * * Copyright 2009 CodeWeavers, Aric Stewart

1 0

Paul Vriens : transl: Merge summary.pl with checkmakefile.pl.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: tools Branch: master Commit: 42929a4dab87309bf3373a20555277dc052610e6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=42929a4dab87309bf3373a20… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 21:54:48 2009 +0200 transl: Merge summary.pl with checkmakefile.pl. --- transl/scripts/Master.sh | 1 - transl/scripts/checkmakefile.pl | 27 +++++++++++++++++++ transl/scripts/summary.pl | 54 --------------------------------------- winetest/make-winetest | 1 - 4 files changed, 27 insertions(+), 56 deletions(-) diff --git a/transl/scripts/Master.sh b/transl/scripts/Master.sh index 2391a28..a1e1747 100755 --- a/transl/scripts/Master.sh +++ b/transl/scripts/Master.sh @@ -49,7 +49,6 @@ mkdir $WORKDIR/new-langs # Analyze all the Makefiles $SCRIPTSDIR/checkmakefile.pl -S "$SOURCEROOT" -T "$BUILDROOT" -t "$WRCROOT" -s "$SCRIPTSDIR" -w "$WORKDIR" 2>>"$WORKDIR/run.log" || exit -$SCRIPTSDIR/summary.pl "$WORKDIR" "$SCRIPTSDIR" || exit # Check for a new languages for i in $WORKDIR/new-langs/*; do diff --git a/transl/scripts/checkmakefile.pl b/transl/scripts/checkmakefile.pl index 66c7fe5..c0294fd 100755 --- a/transl/scripts/checkmakefile.pl +++ b/transl/scripts/checkmakefile.pl @@ -487,3 +487,30 @@ foreach my $makefile (@makefiles) mycheck("normal", $path,$defs,@files); } } + +# create the summary file +opendir(DIR, "$scriptsdir/conf"); +my @files = grep(!/^\./, readdir(DIR)); +closedir(DIR); + +open(OUT, ">$workdir/langs/summary"); +foreach my $lang (@files) +{ + next if (!($lang eq collapse($lang))); + my $transl = 0; + my $missing = 0; + my $errors = 0; + open(FILE, "<$workdir/langs/$lang"); + while (<FILE>) + { + if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { + $transl += $1; + $missing += $2; + $errors += $3; + } + } + close(FILE); + my $sum = $transl + $missing + $errors; + print OUT "LANG $lang $sum $transl $missing $errors\n"; +} +close(OUT); diff --git a/transl/scripts/summary.pl b/transl/scripts/summary.pl deleted file mode 100755 index f1290b5..0000000 --- a/transl/scripts/summary.pl +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/perl - -# Helper script - create a summary for each language about how -# many resources are translated - -die "This helper script takes two arguments" unless ($#ARGV == 1); - -$workdir = $ARGV[0]; -$scriptsdir = $ARGV[1]; - -sub collapse { - my($name) = shift @_; - $base_name = $name; - $base_name =~ s/:[0-9a-f]{2}/:00/; - if (not exists $tab_should_collapse{$name}) - { - open(NAMEFILE, "<$scriptsdir/conf/$base_name"); - $content = <NAMEFILE>; - close(NAMEFILE); - if ($content =~ /\[ignore-sublang\]/) { - $tab_should_collapse{$name} = TRUE; - } - } - - if ($tab_should_collapse{$name} eq TRUE) { - $name = $base_name; - } - return $name; -} - -opendir(DIR, "$scriptsdir/conf"); -(a)files = grep(!/^\./, readdir(DIR)); -closedir(DIR); - -open(OUT, ">$workdir/langs/summary"); -foreach $lang (@files) { - next if (!($lang eq collapse($lang))); - $transl = 0; - $missing = 0; - $errors = 0; - open(FILE, "<$workdir/langs/$lang"); - while (<FILE>) - { - if (m/^FILE [A-Z]+ .* ([0-9]+) ([0-9]+) ([0-9]+)$/) { - $transl += $1; - $missing += $2; - $errors += $3; - } - } - close(FILE); - $sum = $transl + $missing + $errors; - print OUT "LANG $lang $sum $transl $missing $errors\n"; -} -close(OUT); diff --git a/winetest/make-winetest b/winetest/make-winetest index 7394638..3b492ce 100755 --- a/winetest/make-winetest +++ b/winetest/make-winetest @@ -133,7 +133,6 @@ umask 022 rm -rf work mkdir work work/langs work/dumps work/dumps/res work/new-langs $toolsdir/transl/scripts/checkmakefile.pl -S ./wine -T ./build-mingw -t ./build-native -w ./work -s "$toolsdir/transl/scripts" 2>>work/run.log - $toolsdir/transl/scripts/summary.pl ./work "$toolsdir/transl/scripts" for i in work/new-langs/* do if [ -f "$i" ]

1 0

Paul Vriens : transl: Merge ver.pl with checkmakefile.pl.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: tools Branch: master Commit: da9ae7279646a482a401a471a050737eda70a734 URL: http://source.winehq.org/git/tools.git/?a=commit;h=da9ae7279646a482a401a471… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 21:44:46 2009 +0200 transl: Merge ver.pl with checkmakefile.pl. --- transl/scripts/checkmakefile.pl | 342 +++++++++++++++++++++++++++++++++++++-- transl/scripts/ver.pl | 309 ----------------------------------- 2 files changed, 327 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=da9ae7279646a482a401…

1 0

Paul Vriens : transl: Retrieve the locale names from kernel32 instead of the conf files.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: tools Branch: master Commit: b0d8197b06d82a014e60faae4af327ade847b33a URL: http://source.winehq.org/git/tools.git/?a=commit;h=b0d8197b06d82a014e60faae… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Thu Jul 16 11:32:50 2009 +0200 transl: Retrieve the locale names from kernel32 instead of the conf files. --- transl/php/lib.php | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 57 insertions(+), 3 deletions(-) diff --git a/transl/php/lib.php b/transl/php/lib.php index 6774775..400cbf7 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -6,6 +6,60 @@ $MASTER_LANGUAGE_NAME = "English (US)"; $WINE_WIKI_TRANSLATIONS = "<a href=\"redirect.php?url=http://wiki.winehq.org/Translating\">http://wiki.winehq.org/Translating</a>"; +static $LOCALE_NAMES = array(); + +// These resources are retrieved as a sequence of words that need to be converted to a string +function convert_to_unicode($words) +{ + $unistr= ''; + + foreach ($words as $word) + $unistr .= html_entity_decode('&#'.$word.';',ENT_NOQUOTES,'UTF-8'); + + return $unistr; +} + +function res_enum($header, $f) +{ + global $LOCALE_NAMES; + + // We are only interested in a STRINGTABLE + if ($header["type"] != 6) + return FALSE; + + // Look for LOCALE_SLANGUAGE or LOCALE_SENGLANGUAGE + if ($header["name"] != 1 && $header["name"] != 257) + return FALSE; + + $data = fread($f, $header["resSize"]); + $str = new StringTable($header, $data, 0); + $langid = sprintf("%03x:%02x", $header["language"] & 0x3ff, $header["language"] >> 10); + + if ($header["name"] == 1) + { + $LOCALE_NAMES[$langid] = convert_to_unicode($str->getString(2)); + } + else if ($header["name"] == 257) + { + $baseid = get_lang_base($langid); + $LOCALE_NAMES[$baseid] = convert_to_unicode($str->getString(1)); + } +} + +function enum_locale_names() +{ + include_once "lib_res.php"; + global $LOCALE_NAMES; + + if (!empty($LOCALE_NAMES)) + { + return; + } + $res = new ResFile("dumps/res/dlls-kernel32.res"); + $res->enumResources("res_enum"); + ksort($LOCALE_NAMES); +} + function validate_lang($id) { global $DATAROOT; @@ -52,7 +106,7 @@ function get_raw_lang_name($id) function get_lang_name($id) { - return preg_replace("/\[[A-za-z0-9-]+\]/", "", get_raw_lang_name($id)); + return get_locale_name($id); } function get_lang_base($id) @@ -65,7 +119,7 @@ function get_sublangs($id) if (preg_match("/:00/", $id)) { global $LOCALE_NAMES; - include_once("dump_locales.php"); + enum_locale_names(); $base = preg_replace("/:00/", "", $id); $sublangs = array(); @@ -120,7 +174,7 @@ function get_lang_binid($lang) function get_locale_name($localeid) { global $LOCALE_NAMES; - include_once("dump_locales.php"); + enum_locale_names(); return $LOCALE_NAMES[$localeid]; }

1 0

Paul Vriens : transl: Get rid of the [hide] parameter in the conf files.
by Alexandre Julliard July 16, 2009

July 16, 2009

Module: tools Branch: master Commit: 1bcd58ff30ab1d7cd5bb0416c4d4752d26a5bc78 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1bcd58ff30ab1d7cd5bb0416… Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Wed Jul 15 12:38:09 2009 +0200 transl: Get rid of the [hide] parameter in the conf files. --- transl/php/index.php | 2 +- transl/php/lang.php | 9 +++++++- transl/php/lib.php | 50 +++++++++++++++++++++++++++++++++---------- transl/php/resfile.php | 10 +++++++- transl/php/style.css | 1 + transl/scripts/conf/016:00 | 2 +- 6 files changed, 57 insertions(+), 17 deletions(-) diff --git a/transl/php/index.php b/transl/php/index.php index 76ed5a8..94ee569 100644 --- a/transl/php/index.php +++ b/transl/php/index.php @@ -10,7 +10,7 @@ while ($line = fgets($summary, 1024)) die("couldn't parse line $line"); } - if (has_lang_flag($m[1], "hide")) + if ($m[3] == 0) continue; $sum = $m[2]+0; diff --git a/transl/php/lang.php b/transl/php/lang.php index bb46261..c6a237f 100644 --- a/transl/php/lang.php +++ b/transl/php/lang.php @@ -84,7 +84,14 @@ function dump_table($table) <div class="main"> <h1><?php echo "Language: ".get_lang_name($lang) ?></h1> -<?php warn_if_lang_hidden($lang) ?> +<?php +$translations = count($partial) + count($transl); +if (preg_match("/:00/", $lang) && $translations == 0) +{ + show_sublangs($lang); + exit(); +} +?> <div class="group"> <h2>Partially translated modules</h2> diff --git a/transl/php/lib.php b/transl/php/lib.php index adde182..6774775 100644 --- a/transl/php/lib.php +++ b/transl/php/lib.php @@ -60,6 +60,44 @@ function get_lang_base($id) return preg_replace("/:[0-9a-f]{2}/", ":00", $id); } +function get_sublangs($id) +{ + if (preg_match("/:00/", $id)) + { + global $LOCALE_NAMES; + include_once("dump_locales.php"); + + $base = preg_replace("/:00/", "", $id); + $sublangs = array(); + foreach ($LOCALE_NAMES as $key => $value) + if (preg_match("/$base/", $key) && ($key != $id)) + $sublangs[] = $key; + return $sublangs; + } + else + return NULL; +} + +function show_sublangs($id) +{ + echo "<p class=\"note\"><b>Note:</b> This is the '".get_lang_name($id)."' locale which ". + "is not used directly but has resources inherited by sublanguages.<br />". + "You can still use this locale in translations but the results will show up at the ". + "sublanguages (see below).</p>"; + + echo "<div class=\"group\">"; + echo "<h2>Sublanguages</h2>"; + echo "<table>\n"; + echo "<tr><th>Sublanguage</th></tr>\n"; + $sublangs = get_sublangs($id); + foreach ($sublangs as $key) + { + echo "<tr><td>".gen_lang_a($key).get_lang_name($key)."</a></td></tr>"; + } + echo "</table>\n"; + echo "</div>"; +} + function has_lang_flag($id, $flag) { return is_int(strpos(get_raw_lang_name($id), "[".$flag."]")); @@ -79,18 +117,6 @@ function get_lang_binid($lang) return hexdec($m[1]) + (hexdec($m[2]) << 10); } -/* Make sure people are not suprised if they see Portugese (Neutral) has nearly - * no resources */ -function warn_if_lang_hidden($lang) -{ - if (has_lang_flag($lang, "hide")) - { - echo "<p class=\"note\"><b>Note:</b> this is the ".get_lang_name($lang)." locale which\n". - "is not supposed to be used directly but only to have some resources\n". - "inherited by sublanguages.</p>"; - } -} - function get_locale_name($localeid) { global $LOCALE_NAMES; diff --git a/transl/php/resfile.php b/transl/php/resfile.php index 685f80e..337dc89 100644 --- a/transl/php/resfile.php +++ b/transl/php/resfile.php @@ -19,7 +19,6 @@ $msgs = array(); <h1>Module <?php echo $resfile?></h1> <?php -warn_if_lang_hidden($lang); while ($line = fgets($file, 4096)) { @@ -29,7 +28,14 @@ while ($line = fgets($file, 4096)) } } -if (count($msgs) == 0) { +if (count($msgs) == 0) +{ + if (preg_match("/:00/", $lang)) + { + show_sublangs($lang); + exit(); + } + echo "<p>This module is not translated into ".get_lang_name($lang).".</p>\n"; echo "<ul><li>If you want to see what resources are in this module, check the " .gen_resfile_a($MASTER_LANGUAGE, $resfile)."English (US) version</a>" diff --git a/transl/php/style.css b/transl/php/style.css index e600cc7..0464bc2 100644 --- a/transl/php/style.css +++ b/transl/php/style.css @@ -89,6 +89,7 @@ p.note border-style: solid; border-color: black; padding: 2px; + text-align: center; } /* table with a standard resource dump */ diff --git a/transl/scripts/conf/016:00 b/transl/scripts/conf/016:00 index 13944f6..edbd93f 100644 --- a/transl/scripts/conf/016:00 +++ b/transl/scripts/conf/016:00 @@ -1 +1 @@ -Portugese (Neutral)[hide] \ No newline at end of file +Portuguese (Neutral)

1 0

Alexander Nicolaysen Sørnes : objectManager: Send a more helpful mail when moving child objects
by Alexander Nicolaysen Sørnes July 16, 2009

July 16, 2009

Module: appdb Branch: master Commit: 7997837f191eefe8ab89a25d6849da19e3519004 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=7997837f191eefe8ab89a25d… Author: Alexander Nicolaysen Sørnes <alexander(a)linux-xqqm.site> Date: Wed Jul 15 01:11:55 2009 +0200 objectManager: Send a more helpful mail when moving child objects --- include/objectManager.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 735e839..5153941 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -899,7 +899,7 @@ class ObjectManager } /* The argument is the reply text */ - $this->delete_entry("Duplicate entry"); + $this->delete_entry("This entry was merged with an existing one, which can be found at\n" . $oNewObject->objectMakeUrl()); } /* Display a page where the user can move the current object to another parent */

1 0

Dmitry Timoshkov : comctl32: Do not redraw treeview in TVM_INSERTITEM handler if bRedraw is not set, trigger the redraw on WM_SETREDRAW/TRUE.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: ee7ca802f4839fab9efd1759a762a9839d931a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee7ca802f4839fab9efd1759a… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Jul 15 21:21:26 2009 +0900 comctl32: Do not redraw treeview in TVM_INSERTITEM handler if bRedraw is not set, trigger the redraw on WM_SETREDRAW/TRUE. --- dlls/comctl32/treeview.c | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 8bea973..fd20cef 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1367,6 +1367,8 @@ TREEVIEW_InsertItemT(TREEVIEW_INFO *infoPtr, const TVINSERTSTRUCTW *ptdi, BOOL i TREEVIEW_VerifyTree(infoPtr); + if (!infoPtr->bRedraw) return (LRESULT)newItem; + if (parentItem == infoPtr->root || (ISVISIBLE(parentItem) && parentItem->state & TVIS_EXPANDED)) { @@ -1564,6 +1566,7 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) TREEVIEW_VerifyTree(infoPtr); + if (!infoPtr->bRedraw) return TRUE; if (visible) { @@ -1586,12 +1589,15 @@ TREEVIEW_DeleteItem(TREEVIEW_INFO *infoPtr, HTREEITEM wineItem) static LRESULT TREEVIEW_SetRedraw(TREEVIEW_INFO* infoPtr, WPARAM wParam) { - if(wParam) - infoPtr->bRedraw = TRUE; - else - infoPtr->bRedraw = FALSE; + infoPtr->bRedraw = wParam ? TRUE : FALSE; - return 0; + if (infoPtr->bRedraw) + { + TREEVIEW_UpdateSubTree(infoPtr, infoPtr->root); + TREEVIEW_UpdateScrollBars(infoPtr); + TREEVIEW_Invalidate(infoPtr, NULL); + } + return 0; } static LRESULT

1 0

Ricardo Filipe : crypt32: Update Portuguese translation and convert to UTF8 .
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 1f710d72820fbaa82f7c4650dc7747dad4219c22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f710d72820fbaa82f7c4650d… Author: Ricardo Filipe <ricardojdfilipe(a)gmail.com> Date: Wed Jul 15 04:56:18 2009 -0700 crypt32: Update Portuguese translation and convert to UTF8. --- dlls/crypt32/crypt32_Pt.rc | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/crypt32_Pt.rc b/dlls/crypt32/crypt32_Pt.rc index 5c5d3b7..dcce809 100644 --- a/dlls/crypt32/crypt32_Pt.rc +++ b/dlls/crypt32/crypt32_Pt.rc @@ -20,7 +20,9 @@ #include "cryptres.h" -LANGUAGE LANG_PORTUGUESE, SUBLANG_NEUTRAL +#pragma code_page(65001) + +LANGUAGE LANG_PORTUGUESE, SUBLANG_PORTUGUESE STRINGTABLE DISCARDABLE { @@ -108,11 +110,11 @@ STRINGTABLE DISCARDABLE IDS_CMC_ATTRIBUTES "Atributos CMC" IDS_PKCS_7_DATA "Dados PKCS 7" IDS_PKCS_7_SIGNED "Assinado PKCS 7" - IDS_PKCS_7_ENVELOPED "PKCS 7 Enveloped" - IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Signed Enveloped" + IDS_PKCS_7_ENVELOPED "PKCS 7 Envolvido" + IDS_PKCS_7_SIGNED_ENVELOPED "PKCS 7 Assinado Envolvido" IDS_PKCS_7_DIGESTED "PKCS 7 Resumido" IDS_PKCS_7_ENCRYPTED "PKCS 7 Cifrado" - IDS_PREVIOUS_CA_CERT_HASH "Hash Certificado CA prévio" + IDS_PREVIOUS_CA_CERT_HASH "Hash anterior de Certificado CA" IDS_CRL_VIRTUAL_BASE "Número CRL de Base Virtual" IDS_CRL_NEXT_PUBLISH "Próxima Publicação CRL" IDS_CA_EXCHANGE "Certificado de Cifra CA" @@ -173,6 +175,8 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_MY "Pessoal" IDS_LOCALIZEDNAME_CA "Autoridades de Certificação Intermédias" IDS_LOCALIZEDNAME_ADDRESSBOOK "Outras pessoas" + IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "Publicadores Confiáveis" + IDS_LOCALIZEDNAME_DISALLOWED "Certificados Desconfiáveis" } STRINGTABLE DISCARDABLE @@ -219,4 +223,21 @@ STRINGTABLE DISCARDABLE IDS_FINANCIAL_CRITERIA_MEETS_CRITERIA "Conforme os Critérios=" IDS_YES "Sim" IDS_NO "Não" + IDS_DIGITAL_SIGNATURE "Assinatura Digital" + IDS_NON_REPUDIATION "Não-Repudiação" + IDS_KEY_ENCIPHERMENT "Ciframento de Chaves" + IDS_DATA_ENCIPHERMENT "Ciframento de Dados" + IDS_KEY_AGREEMENT "Acordo de Chaves" + IDS_CERT_SIGN "Assinatura de Certificados" + IDS_OFFLINE_CRL_SIGN "Assinatura CRL Off-line" + IDS_CRL_SIGN "Assinatura CRL" + IDS_ENCIPHER_ONLY "Cifrar apenas" + IDS_DECIPHER_ONLY "Decifrar apenas" + IDS_NETSCAPE_SSL_CLIENT "Autenticação de Cliente SSL" + IDS_NETSCAPE_SSL_SERVER "Autenticação de Servidor SSL" + IDS_NETSCAPE_SMIME "S/MIME" + IDS_NETSCAPE_SIGN "Assinatura" + IDS_NETSCAPE_SSL_CA "SSL CA" + IDS_NETSCAPE_SMIME_CA "S/MIME CA" + IDS_NETSCAPE_SIGN_CA "CA de Assinatura" }

1 0

Vincent Povirk : windowscodecs: Register BMP decoder as a bitmap decoder.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 81c7e81348c63a7b863219e4ffcd29eb3ad84d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c7e81348c63a7b863219e4f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jul 6 17:53:36 2009 -0500 windowscodecs: Register BMP decoder as a bitmap decoder. --- dlls/windowscodecs/regsvr.c | 289 +++++++++++++++++++++++++++++++++++++++++++ include/wincodec.idl | 4 + 2 files changed, 293 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=81c7e81348c63a7b86321…

1 0

Alexandre Julliard : msi: Build a proper tab chain by walking through the controls list.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 2c5bd49297f79d9941a256d8ec61e0eb2bf9bf9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5bd49297f79d9941a256d8e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jul 15 14:22:14 2009 +0200 msi: Build a proper tab chain by walking through the controls list. Simply changing Z-order as we encounter windows is not sufficient to ensure correct ordering, we have to rebuild the list from scratch. --- dlls/msi/dialog.c | 50 +++++++++++++++++++++++--------------------------- 1 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 025a227..88416e3 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -417,7 +417,7 @@ static msi_control *msi_dialog_create_window( msi_dialog *dialog, return NULL; strcpyW( control->name, name ); - list_add_head( &dialog->controls, &control->entry ); + list_add_tail( &dialog->controls, &control->entry ); control->handler = NULL; control->update = NULL; control->property = NULL; @@ -3002,37 +3002,34 @@ static void msi_dialog_adjust_dialog_pos( msi_dialog *dialog, MSIRECORD *rec, LP AdjustWindowRect( pos, style, FALSE ); } -static BOOL msi_control_set_next( msi_control *control, msi_control *next ) +static void msi_dialog_set_tab_order( msi_dialog *dialog, LPCWSTR first ) { - return SetWindowPos( next->hwnd, control->hwnd, 0, 0, 0, 0, - SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW | - SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE ); -} + struct list tab_chain; + msi_control *control; + HWND prev = HWND_TOP; -static UINT msi_dialog_set_tab_order( msi_dialog *dialog ) -{ - msi_control *control, *tab_next; + list_init( &tab_chain ); + if (!(control = msi_dialog_find_control( dialog, first ))) return; - LIST_FOR_EACH_ENTRY( control, &dialog->controls, msi_control, entry ) + dialog->hWndFocus = control->hwnd; + while (control) { - tab_next = msi_dialog_find_control( dialog, control->tabnext ); - if( !tab_next ) - continue; - msi_control_set_next( control, tab_next ); + list_remove( &control->entry ); + list_add_tail( &tab_chain, &control->entry ); + if (!control->tabnext) break; + control = msi_dialog_find_control( dialog, control->tabnext ); } - return ERROR_SUCCESS; -} - -static void msi_dialog_set_first_control( msi_dialog* dialog, LPCWSTR name ) -{ - msi_control *control; + LIST_FOR_EACH_ENTRY( control, &tab_chain, msi_control, entry ) + { + SetWindowPos( control->hwnd, prev, 0, 0, 0, 0, + SWP_NOMOVE | SWP_NOOWNERZORDER | SWP_NOREDRAW | + SWP_NOREPOSITION | SWP_NOSENDCHANGING | SWP_NOSIZE ); + prev = control->hwnd; + } - control = msi_dialog_find_control( dialog, name ); - if( control ) - dialog->hWndFocus = control->hwnd; - else - dialog->hWndFocus = NULL; + /* put them back on the main list */ + list_move_head( &dialog->controls, &tab_chain ); } static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) @@ -3082,8 +3079,7 @@ static LRESULT msi_dialog_oncreate( HWND hwnd, LPCREATESTRUCTW cs ) msi_dialog_build_font_list( dialog ); msi_dialog_fill_controls( dialog ); msi_dialog_evaluate_control_conditions( dialog ); - msi_dialog_set_tab_order( dialog ); - msi_dialog_set_first_control( dialog, MSI_RecordGetString( rec, 8 ) ); + msi_dialog_set_tab_order( dialog, MSI_RecordGetString( rec, 8 ) ); msiobj_release( &rec->hdr ); return 0;

1 0

Juan Lang : winhttp: Issue CONNECT command to connect to a secure server through a proxy server .
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: bd7a2e70b0e00725a5e76bdbbc7b2cf36ab3c33b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd7a2e70b0e00725a5e76bdbb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:05:01 2009 -0700 winhttp: Issue CONNECT command to connect to a secure server through a proxy server. --- dlls/winhttp/request.c | 140 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 136 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 85e9b61..edb9143 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1,5 +1,8 @@ /* + * Copyright 2004 Mike McCormack for CodeWeavers + * Copyright 2006 Rob Shearman for CodeWeavers * Copyright 2008 Hans Leidekker for CodeWeavers + * Copyright 2009 Juan Lang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -752,6 +755,123 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } +static LPWSTR concatenate_string_list( LPCWSTR *list, int len ) +{ + LPCWSTR *t; + LPWSTR str; + + for( t = list; *t ; t++ ) + len += strlenW( *t ); + len++; + + str = heap_alloc( len * sizeof(WCHAR) ); + *str = 0; + + for( t = list; *t ; t++ ) + strcatW( str, *t ); + + return str; +} + +static LPWSTR build_header_request_string( request_t *request, LPCWSTR verb, + LPCWSTR path, LPCWSTR version ) +{ + static const WCHAR crlf[] = {'\r','\n',0}; + static const WCHAR space[] = { ' ',0 }; + static const WCHAR colon[] = { ':',' ',0 }; + static const WCHAR twocrlf[] = {'\r','\n','\r','\n', 0}; + LPWSTR requestString; + DWORD len, n; + LPCWSTR *req; + UINT i; + LPWSTR p; + + /* allocate space for an array of all the string pointers to be added */ + len = (request->num_headers) * 4 + 10; + req = heap_alloc( len * sizeof(LPCWSTR) ); + + /* add the verb, path and HTTP version string */ + n = 0; + req[n++] = verb; + req[n++] = space; + req[n++] = path; + req[n++] = space; + req[n++] = version; + + /* Append custom request headers */ + for (i = 0; i < request->num_headers; i++) + { + if (request->headers[i].is_request) + { + req[n++] = crlf; + req[n++] = request->headers[i].field; + req[n++] = colon; + req[n++] = request->headers[i].value; + + TRACE("Adding custom header %s (%s)\n", + debugstr_w(request->headers[i].field), + debugstr_w(request->headers[i].value)); + } + } + + if( n >= len ) + ERR("oops. buffer overrun\n"); + + req[n] = NULL; + requestString = concatenate_string_list( req, 4 ); + heap_free( req ); + + /* + * Set (header) termination string for request + * Make sure there's exactly two new lines at the end of the request + */ + p = &requestString[strlenW(requestString)-1]; + while ( (*p == '\n') || (*p == '\r') ) + p--; + strcpyW( p+1, twocrlf ); + + return requestString; +} + +static BOOL read_reply( request_t *request ); + +static BOOL secure_proxy_connect( request_t *request ) +{ + static const WCHAR verbConnect[] = {'C','O','N','N','E','C','T',0}; + static const WCHAR fmt[] = {'%','s',':','%','d',0}; + static const WCHAR http1_1[] = {'H','T','T','P','/','1','.','1',0}; + BOOL ret = FALSE; + LPWSTR path; + connect_t *connect = request->connect; + + path = heap_alloc( (strlenW( connect->hostname ) + 13) * sizeof(WCHAR) ); + if (path) + { + LPWSTR requestString; + + sprintfW( path, fmt, connect->hostname, connect->hostport ); + requestString = build_header_request_string( request, verbConnect, + path, http1_1 ); + heap_free( path ); + if (requestString) + { + LPSTR req_ascii = strdupWA( requestString ); + + heap_free( requestString ); + if (req_ascii) + { + int len = strlen( req_ascii ), bytes_sent; + + ret = netconn_send( &request->netconn, req_ascii, len, 0, &bytes_sent ); + heap_free( req_ascii ); + if (ret) + ret = read_reply( request ); + } + } + } + return ret; +} + #ifndef INET6_ADDRSTRLEN #define INET6_ADDRSTRLEN 46 #endif @@ -806,11 +926,23 @@ static BOOL open_connection( request_t *request ) heap_free( addressW ); return FALSE; } - if (request->hdr.flags & WINHTTP_FLAG_SECURE && !netconn_secure_connect( &request->netconn )) + if (request->hdr.flags & WINHTTP_FLAG_SECURE) { - netconn_close( &request->netconn ); - heap_free( addressW ); - return FALSE; + if (connect->session->proxy_server && + strcmpiW( connect->hostname, connect->servername )) + { + if (!secure_proxy_connect( request )) + { + heap_free( addressW ); + return FALSE; + } + } + if (!netconn_secure_connect( &request->netconn )) + { + netconn_close( &request->netconn ); + heap_free( addressW ); + return FALSE; + } } send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTED_TO_SERVER, addressW, strlenW(addressW) + 1 );

1 0

Juan Lang : winhttp: Don' t set port number to a default before scheme is known.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: c2ba725196aa2f5ce93761d0602adeadb28407c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ba725196aa2f5ce93761d06… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:04:42 2009 -0700 winhttp: Don't set port number to a default before scheme is known. --- dlls/winhttp/session.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index b09e887..fab6c96 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -343,7 +343,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT if (*(colon + 1)) connect->serverport = atoiW( colon + 1 ); else - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + connect->serverport = INTERNET_DEFAULT_PORT; } } else @@ -357,7 +357,7 @@ BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT ret = FALSE; goto end; } - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + connect->serverport = INTERNET_DEFAULT_PORT; } } }

1 0

Juan Lang : winhttp: Allow full path in addition to relative path in headers to accomodate proxy servers .
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 5c24a1c824be04ac7684ff77c40e6255c7318629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c24a1c824be04ac7684ff77c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:04:20 2009 -0700 winhttp: Allow full path in addition to relative path in headers to accomodate proxy servers. --- dlls/winhttp/tests/winhttp.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 5a1db48..78c4777 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -343,6 +343,8 @@ static void test_WinHttpAddHeaders(void) static const WCHAR test_header_begin[] = {'P','O','S','T',' ','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; + static const WCHAR full_path_test_header_begin[] = + {'P','O','S','T',' ','h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',':','8','0','/','p','o','s','t','t','e','s','t','.','p','h','p',' ','H','T','T','P','/','1'}; static const WCHAR test_header_end[] = {'\r','\n','\r','\n',0}; static const WCHAR test_header_name[] = {'W','a','r','n','i','n','g',0}; @@ -476,7 +478,8 @@ static void test_WinHttpAddHeaders(void) ok(len + sizeof(WCHAR) <= oldlen, "WinHttpQueryHeaders resulting length longer than advertized.\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && buffer[len / sizeof(WCHAR)] == 0, "WinHttpQueryHeaders did not append NULL terminator\n"); ok(len == lstrlenW(buffer) * sizeof(WCHAR), "WinHttpQueryHeaders returned incorrect length.\n"); - ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0, + ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || + memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, "WinHttpQueryHeaders returned invalid beginning of header string.\n"); ok(memcmp(buffer + lstrlenW(buffer) - 4, test_header_end, sizeof(test_header_end)) == 0, "WinHttpQueryHeaders returned invalid end of header string.\n"); @@ -503,7 +506,9 @@ static void test_WinHttpAddHeaders(void) ok(len + sizeof(WCHAR) <= oldlen, "resulting length longer than advertized\n"); ok((len < sizeof(buffer) - sizeof(WCHAR)) && !buffer[len / sizeof(WCHAR)] && !buffer[len / sizeof(WCHAR) - 1], "no double NULL terminator\n"); - ok(!memcmp(buffer, test_header_begin, sizeof(test_header_begin)), "invalid beginning of header string\n"); + ok(memcmp(buffer, test_header_begin, sizeof(test_header_begin)) == 0 || + memcmp(buffer, full_path_test_header_begin, sizeof(full_path_test_header_begin)) == 0, + "invalid beginning of header string.\n"); ok(index == 0, "header index was incremented\n"); /* tests for more indices */

1 0

Juan Lang : winhttp: Use proxy server when redirecting.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 31545206fb6be070c223c42b85bf3143867d6a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31545206fb6be070c223c42b8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:03:52 2009 -0700 winhttp: Use proxy server when redirecting. --- dlls/winhttp/request.c | 7 +++---- dlls/winhttp/session.c | 1 - dlls/winhttp/winhttp_private.h | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 37dd556..85e9b61 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1158,13 +1158,12 @@ static BOOL handle_redirect( request_t *request ) hostname[len] = 0; port = uc.nPort ? uc.nPort : (uc.nScheme == INTERNET_SCHEME_HTTPS ? 443 : 80); - if (strcmpiW( connect->servername, hostname ) || connect->serverport != port) + if (strcmpiW( connect->hostname, hostname ) || connect->serverport != port) { heap_free( connect->hostname ); connect->hostname = hostname; - heap_free( connect->servername ); - connect->servername = strdupW( connect->hostname ); - connect->serverport = connect->hostport = port; + connect->hostport = port; + if (!(ret = set_server_for_hostname( connect, hostname, port ))) goto end; netconn_close( &request->netconn ); if (!(ret = netconn_init( &request->netconn, request->hdr.flags & WINHTTP_FLAG_SECURE ))) goto end; diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 5d2466e..b09e887 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -316,7 +316,6 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) return ret; } -static BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) { session_t *session = connect->session; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 2143953..2431d7c 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -221,6 +221,7 @@ BOOL set_cookies( request_t *, const WCHAR * ); BOOL add_cookie_headers( request_t * ); BOOL add_request_headers( request_t *, LPCWSTR, DWORD, DWORD ); void delete_domain( domain_t * ); +BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ); static inline void *heap_alloc( SIZE_T size ) {

1 0

Juan Lang : winhttp: Use a helper function to set connect_t' s servername and port.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: de12987d7f61bc21c6345df7cbaeafbeeaa09d23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de12987d7f61bc21c6345df7c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:03:26 2009 -0700 winhttp: Use a helper function to set connect_t's servername and port. --- dlls/winhttp/session.c | 91 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 61 insertions(+), 30 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3b5f6e6..5d2466e 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -316,6 +316,65 @@ static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) return ret; } +static +BOOL set_server_for_hostname( connect_t *connect, LPCWSTR server, INTERNET_PORT port ) +{ + session_t *session = connect->session; + BOOL ret = TRUE; + + if (session->proxy_server && !should_bypass_proxy(session, server)) + { + LPCWSTR colon; + + if ((colon = strchrW( session->proxy_server, ':' ))) + { + if (!connect->servername || strncmpiW( connect->servername, + session->proxy_server, colon - session->proxy_server - 1 )) + { + heap_free( connect->servername ); + if (!(connect->servername = heap_alloc( + (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) + { + ret = FALSE; + goto end; + } + memcpy( connect->servername, session->proxy_server, + (colon - session->proxy_server) * sizeof(WCHAR) ); + connect->servername[colon - session->proxy_server] = 0; + if (*(colon + 1)) + connect->serverport = atoiW( colon + 1 ); + else + connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + } + } + else + { + if (!connect->servername || strcmpiW( connect->servername, + session->proxy_server )) + { + heap_free( connect->servername ); + if (!(connect->servername = strdupW( session->proxy_server ))) + { + ret = FALSE; + goto end; + } + connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + } + } + } + else if (server) + { + if (!(connect->servername = strdupW( server ))) + { + ret = FALSE; + goto end; + } + connect->serverport = port; + } +end: + return ret; +} + /*********************************************************************** * WinHttpConnect (winhttp.@) */ @@ -363,36 +422,8 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (server && !(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; - if (session->proxy_server && !should_bypass_proxy(session, server)) - { - LPCWSTR colon; - - if ((colon = strchrW( session->proxy_server, ':' ))) - { - if (!(connect->servername = heap_alloc( - (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) - goto end; - memcpy( connect->servername, session->proxy_server, - (colon - session->proxy_server) * sizeof(WCHAR) ); - connect->servername[colon - session->proxy_server] = 0; - if (*(colon + 1)) - connect->serverport = atoiW( colon + 1 ); - else - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; - } - else - { - if (!(connect->servername = strdupW( session->proxy_server ))) - goto end; - connect->serverport = INTERNET_DEFAULT_HTTP_PORT; - } - } - else if (server) - { - if (!(connect->servername = strdupW( server ))) - goto end; - connect->serverport = port; - } + if (!set_server_for_hostname( connect, server, port )) + goto end; if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect;

1 0

Juan Lang : winhttp: Connect to the proxy port rather than the host port.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 85579ebb4c9ece576f885482ef5ffeea3f49095a URL: http://source.winehq.org/git/wine.git/?a=commit;h=85579ebb4c9ece576f885482e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:03:10 2009 -0700 winhttp: Connect to the proxy port rather than the host port. --- dlls/winhttp/request.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index a0a7a4c..37dd556 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -768,7 +768,7 @@ static BOOL open_connection( request_t *request ) if (netconn_connected( &request->netconn )) return TRUE; connect = request->connect; - port = connect->hostport ? connect->hostport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); + port = connect->serverport ? connect->serverport : (request->hdr.flags & WINHTTP_FLAG_SECURE ? 443 : 80); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 );

1 0

Juan Lang : winhttp: When connecting via a proxy include full hostname and scheme in path.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 6fad52bd14fa0522cad877047a374680ca60ca9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fad52bd14fa0522cad877047… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:02:48 2009 -0700 winhttp: When connecting via a proxy include full hostname and scheme in path. --- dlls/winhttp/request.c | 54 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index af1d5ad..a0a7a4c 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -474,6 +474,47 @@ BOOL WINAPI WinHttpAddRequestHeaders( HINTERNET hrequest, LPCWSTR headers, DWORD return ret; } +static WCHAR *build_request_path( request_t *request ) +{ + WCHAR *ret; + + if (strcmpiW( request->connect->hostname, request->connect->servername )) + { + static const WCHAR http[] = { 'h','t','t','p',0 }; + static const WCHAR https[] = { 'h','t','t','p','s',0 }; + static const WCHAR fmt[] = { '%','s',':','/','/','%','s',0 }; + LPCWSTR scheme = request->netconn.secure ? https : http; + int len; + + len = strlenW( scheme ) + strlenW( request->connect->hostname ); + /* 3 characters for '://', 1 for NUL. */ + len += 4; + if (request->connect->hostport) + { + /* 1 for ':' between host and port, up to 5 for port */ + len += 6; + } + if (request->path) + len += strlenW( request->path ); + if ((ret = heap_alloc( len * sizeof(WCHAR) ))) + { + sprintfW( ret, fmt, scheme, request->connect->hostname ); + if (request->connect->hostport) + { + static const WCHAR colonFmt[] = { ':','%','d',0 }; + + sprintfW( ret + strlenW( ret ), colonFmt, + request->connect->hostport ); + } + if (request->path) + strcatW( ret, request->path ); + } + } + else + ret = request->path; + return ret; +} + static WCHAR *build_request_string( request_t *request ) { static const WCHAR space[] = {' ',0}; @@ -481,7 +522,7 @@ static WCHAR *build_request_string( request_t *request ) static const WCHAR colon[] = {':',' ',0}; static const WCHAR twocrlf[] = {'\r','\n','\r','\n',0}; - WCHAR *ret; + WCHAR *path, *ret; const WCHAR **headers, **p; unsigned int len, i = 0, j; @@ -489,9 +530,10 @@ static WCHAR *build_request_string( request_t *request ) len = request->num_headers * 4 + 7; if (!(headers = heap_alloc( len * sizeof(LPCWSTR) ))) return NULL; + path = build_request_path( request ); headers[i++] = request->verb; headers[i++] = space; - headers[i++] = request->path; + headers[i++] = path; headers[i++] = space; headers[i++] = request->version; @@ -516,13 +558,13 @@ static WCHAR *build_request_string( request_t *request ) len++; if (!(ret = heap_alloc( len * sizeof(WCHAR) ))) - { - heap_free( headers ); - return NULL; - } + goto out; *ret = 0; for (p = headers; *p; p++) strcatW( ret, *p ); +out: + if (path != request->path) + heap_free( path ); heap_free( headers ); return ret; }

1 0

Juan Lang : winhttp: Set connect_t' s servername and port based on proxy settings.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 0080a7f8a2a80621559c7a33f078f63987f92ba4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0080a7f8a2a80621559c7a33f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:02:29 2009 -0700 winhttp: Set connect_t's servername and port based on proxy settings. --- dlls/winhttp/session.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 114 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index c26e577..3b5f6e6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -232,6 +232,90 @@ static const object_vtbl_t connect_vtbl = NULL }; +static BOOL domain_matches(LPCWSTR server, LPCWSTR domain) +{ + static const WCHAR localW[] = { '<','l','o','c','a','l','>',0 }; + BOOL ret = FALSE; + + if (!strcmpiW( domain, localW ) && !strchrW( server, '.' )) + ret = TRUE; + else if (*domain == '*') + { + if (domain[1] == '.') + { + LPCWSTR dot; + + /* For a hostname to match a wildcard, the last domain must match + * the wildcard exactly. E.g. if the wildcard is *.a.b, and the + * hostname is www.foo.a.b, it matches, but a.b does not. + */ + dot = strchrW( server, '.' ); + if (dot) + { + int len = strlenW( dot + 1 ); + + if (len > strlenW( domain + 2 )) + { + LPCWSTR ptr; + + /* The server's domain is longer than the wildcard, so it + * could be a subdomain. Compare the last portion of the + * server's domain. + */ + ptr = dot + len + 1 - strlenW( domain + 2 ); + if (!strcmpiW( ptr, domain + 2 )) + { + /* This is only a match if the preceding character is + * a '.', i.e. that it is a matching domain. E.g. + * if domain is '*.b.c' and server is 'www.ab.c' they + * do not match. + */ + ret = *(ptr - 1) == '.'; + } + } + else + ret = !strcmpiW( dot + 1, domain + 2 ); + } + } + } + else + ret = !strcmpiW( server, domain ); + return ret; +} + +/* Matches INTERNET_MAX_USER_NAME_LENGTH in wininet.h, also RFC 1035 */ +#define MAX_HOST_NAME_LENGTH 256 + +static BOOL should_bypass_proxy(session_t *session, LPCWSTR server) +{ + LPCWSTR ptr; + BOOL ret = FALSE; + + ptr = session->proxy_bypass; + do { + LPCWSTR tmp = ptr; + + ptr = strchrW( ptr, ';' ); + if (!ptr) + ptr = strchrW( tmp, ' ' ); + if (ptr) + { + if (ptr - tmp < MAX_HOST_NAME_LENGTH) + { + WCHAR domain[MAX_HOST_NAME_LENGTH]; + + memcpy( domain, tmp, (ptr - tmp) * sizeof(WCHAR) ); + domain[ptr - tmp] = 0; + ret = domain_matches( server, domain ); + } + ptr += 1; + } + else if (*tmp) + ret = domain_matches( server, tmp ); + } while (ptr && !ret); + return ret; +} + /*********************************************************************** * WinHttpConnect (winhttp.@) */ @@ -279,8 +363,36 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO if (server && !(connect->hostname = strdupW( server ))) goto end; connect->hostport = port; - if (server && !(connect->servername = strdupW( server ))) goto end; - connect->serverport = port; + if (session->proxy_server && !should_bypass_proxy(session, server)) + { + LPCWSTR colon; + + if ((colon = strchrW( session->proxy_server, ':' ))) + { + if (!(connect->servername = heap_alloc( + (colon - session->proxy_server + 1) * sizeof(WCHAR) ))) + goto end; + memcpy( connect->servername, session->proxy_server, + (colon - session->proxy_server) * sizeof(WCHAR) ); + connect->servername[colon - session->proxy_server] = 0; + if (*(colon + 1)) + connect->serverport = atoiW( colon + 1 ); + else + connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + } + else + { + if (!(connect->servername = strdupW( session->proxy_server ))) + goto end; + connect->serverport = INTERNET_DEFAULT_HTTP_PORT; + } + } + else if (server) + { + if (!(connect->servername = strdupW( server ))) + goto end; + connect->serverport = port; + } if (!(hconnect = alloc_handle( &connect->hdr ))) goto end; connect->hdr.handle = hconnect;

1 0

Juan Lang : winhttp: Honor WINHTTP_ACCESS_TYPE_DEFAULT_PROXY in WinHttpOpen .
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 5575957657f2e256d91fc5b895a033f428b5f63c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5575957657f2e256d91fc5b89… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:01:48 2009 -0700 winhttp: Honor WINHTTP_ACCESS_TYPE_DEFAULT_PROXY in WinHttpOpen. --- dlls/winhttp/session.c | 28 +++++++++++++++++++++++++--- 1 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 8a9a039..c26e577 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -168,13 +168,35 @@ HINTERNET WINAPI WinHttpOpen( LPCWSTR agent, DWORD access, LPCWSTR proxy, LPCWST session->hdr.vtbl = &session_vtbl; session->hdr.flags = flags; session->hdr.refs = 1; - session->access = access; session->hdr.redirect_policy = WINHTTP_OPTION_REDIRECT_POLICY_DISALLOW_HTTPS_TO_HTTP; list_init( &session->cookie_cache ); if (agent && !(session->agent = strdupW( agent ))) goto end; - if (proxy && !(session->proxy_server = strdupW( proxy ))) goto end; - if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; + if (access == WINHTTP_ACCESS_TYPE_DEFAULT_PROXY) + { + WINHTTP_PROXY_INFO info; + + WinHttpGetDefaultProxyConfiguration( &info ); + session->access = info.dwAccessType; + if (info.lpszProxy && !(session->proxy_server = strdupW( info.lpszProxy ))) + { + GlobalFree( (LPWSTR)info.lpszProxy ); + GlobalFree( (LPWSTR)info.lpszProxyBypass ); + goto end; + } + if (info.lpszProxyBypass && !(session->proxy_bypass = strdupW( info.lpszProxyBypass ))) + { + GlobalFree( (LPWSTR)info.lpszProxy ); + GlobalFree( (LPWSTR)info.lpszProxyBypass ); + goto end; + } + } + else if (access == WINHTTP_ACCESS_TYPE_NAMED_PROXY) + { + session->access = access; + if (proxy && !(session->proxy_server = strdupW( proxy ))) goto end; + if (bypass && !(session->proxy_bypass = strdupW( bypass ))) goto end; + } if (!(handle = alloc_handle( &session->hdr ))) goto end; session->hdr.handle = handle;

1 0

Juan Lang : winhttp: Support getting the default proxy settings from the http_proxy environment variable .
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 51e54a8b75d8e9ce8e282633ff8dde13c3119669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e54a8b75d8e9ce8e282633f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:01:26 2009 -0700 winhttp: Support getting the default proxy settings from the http_proxy environment variable. --- dlls/winhttp/session.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 17a0a5f..8a9a039 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -21,6 +21,7 @@ #include "wine/debug.h" #include <stdarg.h> +#include <stdlib.h> #include "windef.h" #include "winbase.h" @@ -686,6 +687,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) LONG l; HKEY key; BOOL direct = TRUE; + char *envproxy; TRACE("%p\n", info); @@ -749,6 +751,9 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) direct = FALSE; info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + TRACE("http proxy (from registry) = %s, bypass = %s\n", + debugstr_w(info->lpszProxy), + debugstr_w(info->lpszProxyBypass)); } } } @@ -757,6 +762,23 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) } RegCloseKey( key ); } + else if ((envproxy = getenv( "http_proxy" ))) + { + WCHAR *envproxyW; + int len; + + len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 ); + if ((envproxyW = GlobalAlloc( 0, len * sizeof(WCHAR)))) + { + MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len ); + direct = FALSE; + info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info->lpszProxy = envproxyW; + info->lpszProxyBypass = NULL; + TRACE("http proxy (from environment) = %s\n", + debugstr_w(info->lpszProxy)); + } + } if (direct) { info->dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY;

1 0

Juan Lang : winhttp: Implement WinHttpGetDefaultProxyConfiguration.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: fd9aa244d3a6010932caf759ce79114a13f39add URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd9aa244d3a6010932caf759c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 13:00:38 2009 -0700 winhttp: Implement WinHttpGetDefaultProxyConfiguration. --- dlls/winhttp/session.c | 91 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 87 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 863b226..17a0a5f 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -669,17 +669,100 @@ struct winhttp_settings_header DWORD flags; /* one of WINHTTP_PROXY_TYPE_* */ }; +static inline void copy_char_to_wchar_sz(const BYTE *src, DWORD len, WCHAR *dst) +{ + const BYTE *begin; + + for (begin = src; src - begin < len; src++, dst++) + *dst = *src; + *dst = 0; +} + /*********************************************************************** * WinHttpGetDefaultProxyConfiguration (winhttp.@) */ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) { - FIXME("%p\n", info); + LONG l; + HKEY key; + BOOL direct = TRUE; - info->dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; - info->lpszProxy = NULL; - info->lpszProxyBypass = NULL; + TRACE("%p\n", info); + l = RegOpenKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, KEY_READ, &key ); + if (!l) + { + DWORD type, size = 0; + + l = RegQueryValueExW( key, WinHttpSettings, NULL, &type, NULL, &size ); + if (!l && type == REG_BINARY && + size >= sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD)) + { + BYTE *buf = heap_alloc( size ); + + if (buf) + { + struct winhttp_settings_header *hdr = + (struct winhttp_settings_header *)buf; + DWORD *len = (DWORD *)(hdr + 1); + + l = RegQueryValueExW( key, WinHttpSettings, NULL, NULL, buf, + &size ); + if (!l && hdr->magic == WINHTTPSETTINGS_MAGIC && + hdr->unknown == 0) + { + if (hdr->flags & WINHTTP_PROXY_TYPE_PROXY) + { + BOOL sane = FALSE; + + /* Sanity-check length of proxy string */ + if ((BYTE *)len - buf + *len <= size) + { + sane = TRUE; + info->lpszProxy = GlobalAlloc( 0, + (*len + 1) * sizeof(WCHAR) ); + if (info->lpszProxy) + copy_char_to_wchar_sz( (BYTE *)(len + 1), + *len, (LPWSTR)info->lpszProxy ); + len = (DWORD *)((BYTE *)(len + 1) + *len); + } + if (sane) + { + /* Sanity-check length of proxy bypass string */ + if ((BYTE *)len - buf + *len <= size) + { + info->lpszProxyBypass = GlobalAlloc( 0, + (*len + 1) * sizeof(WCHAR) ); + if (info->lpszProxyBypass) + copy_char_to_wchar_sz( (BYTE *)(len + 1), + *len, (LPWSTR)info->lpszProxyBypass ); + } + else + { + sane = FALSE; + GlobalFree( (LPWSTR)info->lpszProxy ); + info->lpszProxy = NULL; + } + } + if (sane) + { + direct = FALSE; + info->dwAccessType = + WINHTTP_ACCESS_TYPE_NAMED_PROXY; + } + } + } + heap_free( buf ); + } + } + RegCloseKey( key ); + } + if (direct) + { + info->dwAccessType = WINHTTP_ACCESS_TYPE_NO_PROXY; + info->lpszProxy = NULL; + info->lpszProxyBypass = NULL; + } return TRUE; }

1 0

Juan Lang : winhttp: Implement WinHttpSetDefaultProxyConfiguration.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 3469a021be5aee6c67b606e1a46da48cc52fdf46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3469a021be5aee6c67b606e1a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 12:53:14 2009 -0700 winhttp: Implement WinHttpSetDefaultProxyConfiguration. --- dlls/winhttp/Makefile.in | 2 +- dlls/winhttp/session.c | 123 +++++++++++++++++++++++++++++++++++++++++- dlls/winhttp/tests/winhttp.c | 5 -- 3 files changed, 122 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in index 78d3814..7a61dc9 100644 --- a/dlls/winhttp/Makefile.in +++ b/dlls/winhttp/Makefile.in @@ -5,7 +5,7 @@ VPATH = @srcdir@ MODULE = winhttp.dll IMPORTLIB = winhttp IMPORTS = shlwapi kernel32 -DELAYIMPORTS = crypt32 +DELAYIMPORTS = crypt32 advapi32 EXTRALIBS = @SOCKETLIBS@ C_SRCS = \ diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index e8c1677..863b226 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -26,6 +26,7 @@ #include "winbase.h" #include "winhttp.h" #include "wincrypt.h" +#include "winreg.h" #include "winhttp_private.h" @@ -648,6 +649,26 @@ BOOL WINAPI WinHttpDetectAutoProxyConfigUrl( DWORD flags, LPWSTR *url ) return FALSE; } +static const WCHAR Connections[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'C','o','n','n','e','c','t','i','o','n','s',0 }; +static const WCHAR WinHttpSettings[] = { + 'W','i','n','H','t','t','p','S','e','t','t','i','n','g','s',0 }; +static const DWORD WINHTTPSETTINGS_MAGIC = 0x18; +static const DWORD WINHTTP_PROXY_TYPE_DIRECT = 1; +static const DWORD WINHTTP_PROXY_TYPE_PROXY = 2; + +struct winhttp_settings_header +{ + DWORD magic; + DWORD unknown; /* always zero? */ + DWORD flags; /* one of WINHTTP_PROXY_TYPE_* */ +}; + /*********************************************************************** * WinHttpGetDefaultProxyConfiguration (winhttp.@) */ @@ -703,8 +724,106 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO */ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) { - FIXME("%p\n", info); - return TRUE; + LONG l; + HKEY key; + BOOL ret = FALSE; + const WCHAR *src; + + TRACE("%p\n", info); + + if (!info) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + switch (info->dwAccessType) + { + case WINHTTP_ACCESS_TYPE_NO_PROXY: + break; + case WINHTTP_ACCESS_TYPE_NAMED_PROXY: + if (!info->lpszProxy) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + /* Only ASCII characters are allowed */ + for (src = info->lpszProxy; *src; src++) + if (*src > 0x7f) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + if (info->lpszProxyBypass) + { + for (src = info->lpszProxyBypass; *src; src++) + if (*src > 0x7f) + { + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + } + break; + default: + set_last_error( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, + KEY_WRITE, NULL, &key, NULL ); + if (!l) + { + DWORD size = sizeof(struct winhttp_settings_header) + 2 * sizeof(DWORD); + BYTE *buf; + + if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) + { + size += strlenW( info->lpszProxy ); + if (info->lpszProxyBypass) + size += strlenW( info->lpszProxyBypass ); + } + buf = heap_alloc( size ); + if (buf) + { + struct winhttp_settings_header *hdr = + (struct winhttp_settings_header *)buf; + DWORD *len = (DWORD *)(hdr + 1); + + hdr->magic = WINHTTPSETTINGS_MAGIC; + hdr->unknown = 0; + if (info->dwAccessType == WINHTTP_ACCESS_TYPE_NAMED_PROXY) + { + BYTE *dst; + + hdr->flags = WINHTTP_PROXY_TYPE_PROXY; + *len++ = strlenW( info->lpszProxy ); + for (dst = (BYTE *)len, src = info->lpszProxy; *src; + src++, dst++) + *dst = *src; + len = (DWORD *)dst; + if (info->lpszProxyBypass) + { + *len++ = strlenW( info->lpszProxyBypass ); + for (dst = (BYTE *)len, src = info->lpszProxyBypass; *src; + src++, dst++) + *dst = *src; + } + else + *len++ = 0; + } + else + { + hdr->flags = WINHTTP_PROXY_TYPE_DIRECT; + *len++ = 0; + *len++ = 0; + } + l = RegSetValueExW( key, WinHttpSettings, 0, REG_BINARY, buf, size ); + if (!l) + ret = TRUE; + heap_free( buf ); + } + RegCloseKey( key ); + } + return ret; } /*********************************************************************** diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 9dced9d..5a1db48 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -902,7 +902,6 @@ static void test_set_default_proxy_config(void) SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(NULL); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -911,7 +910,6 @@ static void test_set_default_proxy_config(void) info.lpszProxy = info.lpszProxyBypass = NULL; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -920,13 +918,11 @@ static void test_set_default_proxy_config(void) info.lpszProxy = info.lpszProxyBypass = NULL; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); info.lpszProxyBypass = normalString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); @@ -934,7 +930,6 @@ static void test_set_default_proxy_config(void) info.lpszProxy = wideString; SetLastError(0xdeadbeef); ret = WinHttpSetDefaultProxyConfiguration(&info); - todo_wine ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());

1 0

Juan Lang : winhttp: Add tests for WinHttpSetDefaultProxyConfiguration.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 461b1240153beed83e631ba3c28ba30eaa16d9a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=461b1240153beed83e631ba3c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Jul 14 12:36:41 2009 -0700 winhttp: Add tests for WinHttpSetDefaultProxyConfiguration. --- dlls/winhttp/session.c | 3 +- dlls/winhttp/tests/Makefile.in | 2 +- dlls/winhttp/tests/winhttp.c | 130 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 132 insertions(+), 3 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 55f9779..e8c1677 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -703,8 +703,7 @@ BOOL WINAPI WinHttpGetProxyForUrl( HINTERNET hsession, LPCWSTR url, WINHTTP_AUTO */ BOOL WINAPI WinHttpSetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info ) { - FIXME("%p [%u, %s, %s]\n", info, info->dwAccessType, debugstr_w(info->lpszProxy), - debugstr_w(info->lpszProxyBypass)); + FIXME("%p\n", info); return TRUE; } diff --git a/dlls/winhttp/tests/Makefile.in b/dlls/winhttp/tests/Makefile.in index 561efac..670ee1a 100644 --- a/dlls/winhttp/tests/Makefile.in +++ b/dlls/winhttp/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = winhttp.dll -IMPORTS = winhttp kernel32 +IMPORTS = winhttp advapi32 kernel32 CTESTS = \ notification.c \ diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index 74e1c9a..9dced9d 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -24,6 +24,7 @@ #include <winbase.h> #include <winhttp.h> #include <wincrypt.h> +#include <winreg.h> #include "wine/test.h" @@ -817,6 +818,134 @@ static void test_request_parameter_defaults(void) WinHttpCloseHandle(ses); } +static const WCHAR Connections[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'W','i','n','d','o','w','s','\\', + 'C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\', + 'I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s','\\', + 'C','o','n','n','e','c','t','i','o','n','s',0 }; +static const WCHAR WinHttpSettings[] = { + 'W','i','n','H','t','t','p','S','e','t','t','i','n','g','s',0 }; + +static DWORD get_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD *type ) +{ + LONG l; + HKEY key; + DWORD ret = 0; + + l = RegOpenKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, KEY_READ, &key ); + if (!l) + { + DWORD size = 0; + + l = RegQueryValueExW( key, WinHttpSettings, NULL, type, NULL, &size ); + if (!l) + { + if (size <= len) + l = RegQueryValueExW( key, WinHttpSettings, NULL, type, buf, + &size ); + if (!l) + ret = size; + } + RegCloseKey( key ); + } + return ret; +} + +static void set_default_proxy_reg_value( BYTE *buf, DWORD len, DWORD type ) +{ + LONG l; + HKEY key; + + l = RegCreateKeyExW( HKEY_LOCAL_MACHINE, Connections, 0, NULL, 0, + KEY_WRITE, NULL, &key, NULL ); + if (!l) + { + RegSetValueExW( key, WinHttpSettings, 0, type, buf, len ); + RegCloseKey( key ); + } +} + +static void test_set_default_proxy_config(void) +{ + static const WCHAR wideString[] = { 0x226f, 0x575b, 0 }; + static const WCHAR normalString[] = { 'f','o','o',0 }; + DWORD type, len; + BYTE *saved_proxy_settings = NULL; + WINHTTP_PROXY_INFO info; + BOOL ret; + + /* FIXME: it would be simpler to read the current settings using + * WinHttpGetDefaultProxyConfiguration and save them using + * WinHttpSetDefaultProxyConfiguration, but they appear to have a bug. + * + * If a proxy is configured in the registry, e.g. via 'proxcfg -p "foo"', + * the access type reported by WinHttpGetDefaultProxyConfiguration is 1, + * WINHTTP_ACCESS_TYPE_NO_PROXY, whereas it should be + * WINHTTP_ACCESS_TYPE_NAMED_PROXY. + * If WinHttpSetDefaultProxyConfiguration is called with dwAccessType = 1, + * the lpszProxy and lpszProxyBypass values are ignored. + * Thus, if a proxy is set with proxycfg, then calling + * WinHttpGetDefaultProxyConfiguration followed by + * WinHttpSetDefaultProxyConfiguration results in the proxy settings + * getting deleted from the registry. + * + * Instead I read the current registry value and restore it directly. + */ + len = get_default_proxy_reg_value( NULL, 0, &type ); + if (len) + { + saved_proxy_settings = HeapAlloc( GetProcessHeap(), 0, len ); + len = get_default_proxy_reg_value( saved_proxy_settings, len, &type ); + } + + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(NULL); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* test with invalid access type */ + info.dwAccessType = 0xdeadbeef; + info.lpszProxy = info.lpszProxyBypass = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(&info); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* at a minimum, the proxy server must be set */ + info.dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY; + info.lpszProxy = info.lpszProxyBypass = NULL; + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(&info); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + info.lpszProxyBypass = normalString; + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(&info); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + /* the proxy server can't have wide characters */ + info.lpszProxy = wideString; + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(&info); + todo_wine + ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, + "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); + + info.lpszProxy = normalString; + SetLastError(0xdeadbeef); + ret = WinHttpSetDefaultProxyConfiguration(&info); + ok(ret, "WinHttpSetDefaultProxyConfiguration failed: %d\n", GetLastError()); + + set_default_proxy_reg_value( saved_proxy_settings, len, type ); +} + START_TEST (winhttp) { test_OpenRequest(); @@ -827,4 +956,5 @@ START_TEST (winhttp) test_secure_connection(); test_request_parameter_defaults(); test_QueryOption(); + test_set_default_proxy_config(); }

1 0

Vladimir Pankratov : comctl32: Fix division by zero.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 585e8dfbb4adac0ff1f5dd995ff92a2c4a0e288b URL: http://source.winehq.org/git/wine.git/?a=commit;h=585e8dfbb4adac0ff1f5dd995… Author: Vladimir Pankratov <scriptkid(a)mail.ru> Date: Tue Jul 14 14:01:23 2009 +0500 comctl32: Fix division by zero. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index c6cf83e..0d11b2b 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4846,7 +4846,7 @@ TOOLBAR_SetRows (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPRECT lprc) if (seps) FIXME("Separators unhandled\n"); /* Round up so more per line, i.e., less rows */ - idealWrap = (infoPtr->nNumButtons - hidden + (rows-1)) / rows; + idealWrap = (infoPtr->nNumButtons - hidden + (rows-1)) / (rows ? rows : 1); /* Calculate ideal wrap point if we are allowed to grow, but cannot achieve the requested number of rows. */

1 0

Piotr Caban : jscript: Added RegExp_test stub.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: f421746980a53a95f5b255d99e62dee7ad9dbc2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f421746980a53a95f5b255d99… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:51:43 2009 +0200 jscript: Added RegExp_test stub. --- dlls/jscript/regexp.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 0acc478..9722919 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -96,6 +96,7 @@ 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}; static const WCHAR execW[] = {'e','x','e','c',0}; +static const WCHAR testW[] = {'t','e','s','t',0}; static const WCHAR emptyW[] = {0}; @@ -3505,6 +3506,13 @@ static HRESULT RegExp_exec(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS return E_NOTIMPL; } +static HRESULT RegExp_test(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT RegExp_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -3532,6 +3540,7 @@ static const builtin_prop_t RegExp_props[] = { {multilineW, RegExp_multiline, 0}, {propertyIsEnumerableW, RegExp_propertyIsEnumerable, PROPF_METHOD}, {sourceW, RegExp_source, 0}, + {testW, RegExp_test, PROPF_METHOD}, {toLocaleStringW, RegExp_toLocaleString, PROPF_METHOD}, {toStringW, RegExp_toString, PROPF_METHOD} };

1 0

Piotr Caban : jscript: Improve Number_toString implementation.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 1cffc0eb73dc479ea83da847c342926d55028b45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cffc0eb73dc479ea83da847c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:51:21 2009 +0200 jscript: Improve Number_toString implementation. --- dlls/jscript/number.c | 113 ++++++++++++++++++++++++++++++++++++++++++-- dlls/jscript/tests/api.js | 50 +++++++++++++++++-- 2 files changed, 151 insertions(+), 12 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index d6591d0..5399c91 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <math.h> + #include "jscript.h" #include "wine/debug.h" @@ -39,11 +41,14 @@ 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}; +#define NUMBER_TOSTRING_BUF_SIZE 64 /* ECMA-262 3rd Edition 15.7.4.2 */ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { NumberInstance *number; + INT radix = 10; + DOUBLE val; BSTR str; HRESULT hres; @@ -56,14 +61,110 @@ static HRESULT Number_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPA number = (NumberInstance*)dispex; - if(arg_cnt(dp) != 0) { - FIXME("unsupported args\n"); - return E_NOTIMPL; + if(arg_cnt(dp)) { + hres = to_int32(dispex->ctx, get_arg(dp, 0), ei, &radix); + if(FAILED(hres)) + return hres; + + if(radix<2 || radix>36) { + FIXME("throw TypeError\n"); + return E_FAIL; + } } - hres = to_string(dispex->ctx, &number->num, ei, &str); - if(FAILED(hres)) - return hres; + if(V_VT(&number->num) == VT_I4) + val = V_I4(&number->num); + else + val = V_R8(&number->num); + + if(radix==10 || isnan(val) || isinf(val)) { + hres = to_string(dispex->ctx, &number->num, ei, &str); + if(FAILED(hres)) + return hres; + } + else { + INT idx = 0; + DOUBLE integ, frac, log_radix = 0; + WCHAR buf[NUMBER_TOSTRING_BUF_SIZE+16]; + BOOL exp = FALSE; + + if(val<0) { + val = -val; + buf[idx++] = '-'; + } + + while(1) { + integ = floor(val); + frac = val-integ; + + if(integ == 0) + buf[idx++] = '0'; + while(integ>=1 && idx<NUMBER_TOSTRING_BUF_SIZE) { + buf[idx] = fmod(integ, radix); + if(buf[idx]<10) buf[idx] += '0'; + else buf[idx] += 'a'-10; + integ /= radix; + idx++; + } + + if(idx<NUMBER_TOSTRING_BUF_SIZE) { + INT beg = buf[0]=='-'?1:0; + INT end = idx-1; + WCHAR wch; + + while(end > beg) { + wch = buf[beg]; + buf[beg++] = buf[end]; + buf[end--] = wch; + } + } + + if(idx != NUMBER_TOSTRING_BUF_SIZE) buf[idx++] = '.'; + + while(frac>0 && idx<NUMBER_TOSTRING_BUF_SIZE) { + frac *= radix; + buf[idx] = fmod(frac, radix); + frac -= buf[idx]; + if(buf[idx]<10) buf[idx] += '0'; + else buf[idx] += 'a'-10; + idx++; + } + + if(idx==NUMBER_TOSTRING_BUF_SIZE && !exp) { + exp = TRUE; + idx = (buf[0]=='-') ? 1 : 0; + log_radix = floor(log(val)/log(radix)); + val *= pow(radix, -log_radix); + continue; + } + + break; + } + + while(buf[idx-1] == '0') idx--; + if(buf[idx-1] == '.') idx--; + + if(exp) { + if(log_radix==0) + buf[idx++] = '\0'; + else { + static const WCHAR formatW[] = {'(','e','%','c','%','d',')',0}; + WCHAR ch; + + if(log_radix<0) { + log_radix = -log_radix; + ch = '-'; + } + else ch = '+'; + sprintfW(&buf[idx], formatW, ch, (int)log_radix); + } + } + else buf[idx] = '\0'; + + str = SysAllocString(buf); + if(!str) + return E_OUTOFMEMORY; + } if(retv) { V_VT(retv) = VT_BSTR; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index f4dd74b..b347846 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -566,12 +566,50 @@ ok(tmp === 0, "(new Number()).valueOf = " + tmp); tmp = Number.prototype.valueOf(); ok(tmp === 0, "Number.prototype.valueOf = " + tmp); -num = new Number(NaN); -ok(num.toString() === "NaN", "num.toString() = " + num.toString()); -num = new Number(-Infinity); -ok(num.toString() === "-Infinity", "num.toString() = " + num.toString()); -num = new Number(Infinity); -ok(num.toString() === "Infinity", "num.toString() = " + num.toString()); +function equals(val, base) { + var i; + var num = 0; + var str = val.toString(base); + + for(i=0; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + if(str.substring(i, i+1) == '.') break; + num = num*base + parseInt(str.substring(i, i+1)); + } + + if(str.substring(i, i+1) == '.') { + var mult = base; + for(i++; i<str.length; i++) { + if(str.substring(i, i+1) == '(') break; + num += parseInt(str.substring(i, i+1))/mult; + mult *= base; + } + } + + if(str.substring(i, i+1) == '(') { + exp = parseInt(str.substring(i+2)); + num *= Math.pow(base, exp); + } + + ok(num>val-val/1000 && num<val+val/1000, "equals: num = " + num); +} + +ok((10).toString(11) === "a", "(10).toString(11) = " + (10).toString(11)); +ok((213213433).toString(17) === "8e2ddcb", "(213213433).toString(17) = " + (213213433).toString(17)); +ok((-3254343).toString(33) === "-2oicf", "(-3254343).toString(33) = " + (-3254343).toString(33)); +ok((NaN).toString(12) === "NaN", "(NaN).toString(11) = " + (NaN).toString(11)); +ok((Infinity).toString(13) === "Infinity", "(Infinity).toString(11) = " + (Infinity).toString(11)); +for(i=2; i<10; i++) { + equals(1.123, i); + equals(2305843009200000000, i); + equals(5.123, i); + equals(1/(1024*1024*1024*1024*1024*1024*1.9), i); + equals(1024*1024*1024*1024*1024*1024*1.9999, i); + equals(0.0000000000000000001, i); + equals(0.6, i); + equals(4.65661287308e-10, i); + ok((0).toString(i) === "0", "(0).toString("+i+") = " + (0).toString(i)); +} tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Piotr Caban : jscript: Improve to_string implementation.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 15b07c2a36eee94ecbd3bf94df7cd9717a945a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b07c2a36eee94ecbd3bf94d… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Jul 15 12:50:43 2009 +0200 jscript: Improve to_string implementation. --- dlls/jscript/jsutils.c | 27 ++++++++++++++++++--------- dlls/jscript/tests/api.js | 7 +++++++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 4a885a5..d5ffa7f 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -512,6 +512,8 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) const WCHAR nullW[] = {'n','u','l','l',0}; const WCHAR trueW[] = {'t','r','u','e',0}; const WCHAR falseW[] = {'f','a','l','s','e',0}; + const WCHAR NaNW[] = {'N','a','N',0}; + const WCHAR InfinityW[] = {'-','I','n','f','i','n','i','t','y',0}; switch(V_VT(v)) { case VT_EMPTY: @@ -524,16 +526,23 @@ HRESULT to_string(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, BSTR *str) *str = int_to_bstr(V_I4(v)); break; case VT_R8: { - VARIANT strv; - HRESULT hres; - - V_VT(&strv) = VT_EMPTY; - hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); - if(FAILED(hres)) - return hres; + if(isnan(V_R8(v))) + *str = SysAllocString(NaNW); + else if(isinf(V_R8(v))) + *str = SysAllocString(V_R8(v)<0 ? InfinityW : InfinityW+1); + else { + VARIANT strv; + HRESULT hres; + + V_VT(&strv) = VT_EMPTY; + hres = VariantChangeTypeEx(&strv, v, MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT), 0, VT_BSTR); + if(FAILED(hres)) + return hres; - *str = V_BSTR(&strv); - return S_OK; + *str = V_BSTR(&strv); + return S_OK; + } + break; } case VT_BSTR: *str = SysAllocString(V_BSTR(v)); diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index cf70ebc..f4dd74b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -566,6 +566,13 @@ ok(tmp === 0, "(new Number()).valueOf = " + tmp); tmp = Number.prototype.valueOf(); ok(tmp === 0, "Number.prototype.valueOf = " + tmp); +num = new Number(NaN); +ok(num.toString() === "NaN", "num.toString() = " + num.toString()); +num = new Number(-Infinity); +ok(num.toString() === "-Infinity", "num.toString() = " + num.toString()); +num = new Number(Infinity); +ok(num.toString() === "Infinity", "num.toString() = " + num.toString()); + tmp = Math.min(1); ok(tmp === 1, "Math.min(1) = " + tmp);

1 0

Henri Verbeet : d3d10: Implement ID3D10Effect::GetVariableByName().
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: a5d953654248a206ddd68b12ac6c32fa5ea292bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5d953654248a206ddd68b12a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:21 2009 +0200 d3d10: Implement ID3D10Effect::GetVariableByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 254 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 256 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 1dde1c8..60f2aa0 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -58,8 +58,11 @@ struct d3d10_effect_shader_variable } shader; }; +/* ID3D10EffectVariable */ struct d3d10_effect_variable { + const struct ID3D10EffectVariableVtbl *vtbl; + char *name; DWORD buffer_offset; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6ee77b0..37d2dcb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -33,6 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; +static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl; static inline void read_dword(const char **ptr, DWORD *d) { @@ -455,6 +456,8 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons struct d3d10_effect_variable *v = &l->variables[i]; HRESULT hr; + v->vtbl = &d3d10_effect_variable_vtbl; + hr = parse_fx10_variable(v, ptr, data); if (FAILED(hr)) return hr; } @@ -822,7 +825,27 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableB static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_GetVariableByName(ID3D10Effect *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->local_buffer_count; ++i) + { + struct d3d10_effect_local_buffer *l = &This->local_buffers[i]; + unsigned int j; + + for (j = 0; j < l->variable_count; ++j) + { + struct d3d10_effect_variable *v = &l->variables[j]; + + if (!strcmp(v->name, name)) + { + TRACE("Returning variable %p.\n", v); + return (ID3D10EffectVariable *)v; + } + } + } return NULL; } @@ -1128,3 +1151,232 @@ static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = d3d10_effect_pass_Apply, d3d10_effect_pass_ComputeStateBlockMask, }; + +/* ID3D10EffectVariable methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_variable_IsValid(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static struct ID3D10EffectType * STDMETHODCALLTYPE d3d10_effect_variable_GetType(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetDesc(ID3D10EffectVariable *iface, + D3D10_EFFECT_VARIABLE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByIndex( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetAnnotationByName( + ID3D10EffectVariable *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByIndex( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberByName( + ID3D10EffectVariable *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetMemberBySemantic( + ID3D10EffectVariable *iface, LPCSTR semantic) +{ + FIXME("iface %p, semantic \"%s\" stub!\n", iface, semantic); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_variable_GetElement( + ID3D10EffectVariable *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_GetParentConstantBuffer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectScalarVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsScalar( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectVectorVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsVector( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectMatrixVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsMatrix( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectStringVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsString( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderResourceVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShaderResource( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRenderTargetViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRenderTargetView( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilViewVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencilView( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectConstantBuffer * STDMETHODCALLTYPE d3d10_effect_variable_AsConstantBuffer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectShaderVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsShader( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectBlendVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsBlend(ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectDepthStencilVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsDepthStencil( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectRasterizerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsRasterizer( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static struct ID3D10EffectSamplerVariable * STDMETHODCALLTYPE d3d10_effect_variable_AsSampler( + ID3D10EffectVariable *iface) +{ + FIXME("iface %p stub!\n", iface); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_SetRawValue(ID3D10EffectVariable *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_variable_GetRawValue(ID3D10EffectVariable *iface, + void *data, UINT offset, UINT count) +{ + FIXME("iface %p, data %p, offset %u, count %u stub!\n", iface, data, offset, count); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectVariableVtbl d3d10_effect_variable_vtbl = +{ + /* ID3D10EffectVariable methods */ + d3d10_effect_variable_IsValid, + d3d10_effect_variable_GetType, + d3d10_effect_variable_GetDesc, + d3d10_effect_variable_GetAnnotationByIndex, + d3d10_effect_variable_GetAnnotationByName, + d3d10_effect_variable_GetMemberByIndex, + d3d10_effect_variable_GetMemberByName, + d3d10_effect_variable_GetMemberBySemantic, + d3d10_effect_variable_GetElement, + d3d10_effect_variable_GetParentConstantBuffer, + d3d10_effect_variable_AsScalar, + d3d10_effect_variable_AsVector, + d3d10_effect_variable_AsMatrix, + d3d10_effect_variable_AsString, + d3d10_effect_variable_AsShaderResource, + d3d10_effect_variable_AsRenderTargetView, + d3d10_effect_variable_AsDepthStencilView, + d3d10_effect_variable_AsConstantBuffer, + d3d10_effect_variable_AsShader, + d3d10_effect_variable_AsBlend, + d3d10_effect_variable_AsDepthStencil, + d3d10_effect_variable_AsRasterizer, + d3d10_effect_variable_AsSampler, + d3d10_effect_variable_SetRawValue, + d3d10_effect_variable_GetRawValue, +};

1 0

Henri Verbeet : d3d10: Parse effect variables.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: f58405f647049bddde4c602fc6dd5703df91ccd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58405f647049bddde4c602fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:20 2009 +0200 d3d10: Parse effect variables. --- dlls/d3d10/d3d10_private.h | 7 +++++ dlls/d3d10/effect.c | 57 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index b43666e..1dde1c8 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -58,11 +58,18 @@ struct d3d10_effect_shader_variable } shader; }; +struct d3d10_effect_variable +{ + char *name; + DWORD buffer_offset; +}; + struct d3d10_effect_local_buffer { char *name; DWORD data_size; DWORD variable_count; + struct d3d10_effect_variable *variables; }; /* ID3D10EffectPass */ diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0750069..6ee77b0 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -389,6 +389,34 @@ static HRESULT parse_fx10_technique(struct d3d10_effect_technique *t, const char return S_OK; } +static HRESULT parse_fx10_variable(struct d3d10_effect_variable *v, const char **ptr, const char *data) +{ + DWORD offset; + + read_dword(ptr, &offset); + TRACE("Variable name at offset %#x.\n", offset); + + v->name = copy_name(data + offset); + if (!v->name) + { + ERR("Failed to copy name.\n"); + return E_OUTOFMEMORY; + } + TRACE("Variable name: %s.\n", v->name); + + read_dword(ptr, &offset); + TRACE("Variable type info at offset %#x.\n", offset); + + skip_dword_unknown(ptr, 1); + + read_dword(ptr, &v->buffer_offset); + TRACE("Variable offset in buffer: %#x.\n", v->buffer_offset); + + skip_dword_unknown(ptr, 3); + + return S_OK; +} + static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, const char **ptr, const char *data) { unsigned int i; @@ -415,9 +443,20 @@ static HRESULT parse_fx10_local_buffer(struct d3d10_effect_local_buffer *l, cons skip_dword_unknown(ptr, 2); + l->variables = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, l->variable_count * sizeof(*l->variables)); + if (!l->variables) + { + ERR("Failed to allocate variables memory.\n"); + return E_OUTOFMEMORY; + } + for (i = 0; i < l->variable_count; ++i) { - skip_dword_unknown(ptr, 7); + struct d3d10_effect_variable *v = &l->variables[i]; + HRESULT hr; + + hr = parse_fx10_variable(v, ptr, data); + if (FAILED(hr)) return hr; } return S_OK; @@ -634,11 +673,27 @@ static void d3d10_effect_technique_destroy(struct d3d10_effect_technique *t) } } +static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) +{ + TRACE("variable %p.\n", v); + + HeapFree(GetProcessHeap(), 0, v->name); +} + static void d3d10_effect_local_buffer_destroy(struct d3d10_effect_local_buffer *l) { TRACE("local buffer %p.\n", l); HeapFree(GetProcessHeap(), 0, l->name); + if (l->variables) + { + unsigned int i; + for (i = 0; i < l->variable_count; ++i) + { + d3d10_effect_variable_destroy(&l->variables[i]); + } + HeapFree(GetProcessHeap(), 0, l->variables); + } } /* IUnknown methods */

1 0

Henri Verbeet : d3d10: Do all effect object parsing in parse_fx10_object().
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: ddc948b974b9ad8e1ff6dc6e176293431c82aa2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ddc948b974b9ad8e1ff6dc6e1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:19 2009 +0200 d3d10: Do all effect object parsing in parse_fx10_object(). --- dlls/d3d10/effect.c | 38 +++++++++++++++++++------------------- 1 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index ba62cfc..0750069 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -248,43 +248,51 @@ static HRESULT parse_shader(struct d3d10_effect_object *o, const char *data) return parse_dxbc(ptr, dxbc_size, shader_chunk_handler, s); } -static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char *data) +static HRESULT parse_fx10_object(struct d3d10_effect_object *o, const char **ptr, const char *data) { - const char *ptr; + const char *data_ptr; DWORD offset; HRESULT hr; - ptr = data + o->idx_offset; - read_dword(&ptr, &offset); + read_dword(ptr, &o->type); + TRACE("Effect object is of type %#x.\n", o->type); - TRACE("Effect object of type %#x starts at offset %#x.\n", o->type, offset); + skip_dword_unknown(ptr, 2); + + read_dword(ptr, &offset); + TRACE("Effect object idx is at offset %#x.\n", offset); + + data_ptr = data + offset; + read_dword(&data_ptr, &offset); + + TRACE("Effect object starts at offset %#x.\n", offset); /* FIXME: This probably isn't completely correct. */ if (offset == 1) { WARN("Skipping effect object.\n"); - ptr = NULL; + data_ptr = NULL; } else { - ptr = data + offset; + data_ptr = data + offset; } switch (o->type) { case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; case D3D10_EOT_PIXELSHADER: TRACE("Pixel shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; case D3D10_EOT_GEOMETRYSHADER: TRACE("Geometry shader\n"); - hr = parse_shader(o, ptr); + hr = parse_shader(o, data_ptr); break; default: @@ -331,15 +339,7 @@ static HRESULT parse_fx10_pass(struct d3d10_effect_pass *p, const char **ptr, co o->pass = p; - read_dword(ptr, &o->type); - TRACE("Effect object %u is of type %#x.\n", i, o->type); - - skip_dword_unknown(ptr, 2); - - read_dword(ptr, &o->idx_offset); - TRACE("Effect object %u idx is at offset %#x.\n", i, o->idx_offset); - - hr = parse_fx10_object(o, data); + hr = parse_fx10_object(o, ptr, data); if (FAILED(hr)) return hr; }

1 0

Rico Schüller : d3d10: Rename struct d3d10_effect_variable to struct d3d10_effect_object.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 2dd1b37922559bc452032e14739fc8399dbd9fc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dd1b37922559bc452032e147… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Jul 15 12:21:18 2009 +0200 d3d10: Rename struct d3d10_effect_variable to struct d3d10_effect_object. The name d3d10_effect_variable is somewhat misleading, since these aren't actually effect variables as returned by e.g. ID3D10Effect::GetVariableByName(), but effect objects as referenced by effect passes. --- dlls/d3d10/d3d10_private.h | 16 +++--- dlls/d3d10/effect.c | 126 ++++++++++++++++++++++---------------------- 2 files changed, 71 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2dd1b37922559bc452032…

1 0

Henri Verbeet : wined3d: Check the return values for some wgl calls.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: ae8e8ac73f05a4070c85c1b2f43409f197410362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8e8ac73f05a4070c85c1b2f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:17 2009 +0200 wined3d: Check the return values for some wgl calls. --- dlls/wined3d/context.c | 16 ++++++++++++++-- dlls/wined3d/directx.c | 7 ++++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 577f235..1fd7ea2 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -944,7 +944,15 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } ctx = pwglCreateContext(hdc); - if(This->numContexts) pwglShareLists(This->contexts[0]->glCtx, ctx); + if (This->numContexts) + { + if (!pwglShareLists(This->contexts[0]->glCtx, ctx)) + { + DWORD err = GetLastError(); + ERR("wglShareLists(%p, %p) failed, last error %#x.\n", + This->contexts[0]->glCtx, ctx, err); + } + } if(!ctx) { ERR("Failed to create a WGL context\n"); @@ -957,7 +965,11 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar ret = AddContextToArray(This, win_handle, hdc, ctx, pbuffer); if(!ret) { ERR("Failed to add the newly created context to the context list\n"); - pwglDeleteContext(ctx); + if (!pwglDeleteContext(ctx)) + { + DWORD err = GetLastError(); + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx, err); + } if(create_pbuffer) { GL_EXTCALL(wglReleasePbufferDCARB(pbuffer, hdc)); GL_EXTCALL(wglDestroyPbufferARB(pbuffer)); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1ba7ca5..f296cbe 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -213,7 +213,12 @@ static void WineD3D_ReleaseFakeGLContext(struct wined3d_fake_gl_ctx *ctx) ERR_(d3d_caps)("Failed to disable fake GL context.\n"); } - pwglDeleteContext(ctx->gl_ctx); + if (!pwglDeleteContext(ctx->gl_ctx)) + { + DWORD err = GetLastError(); + ERR("wglDeleteContext(%p) failed, last error %#x.\n", ctx->gl_ctx, err); + } + ReleaseDC(ctx->wnd, ctx->dc); DestroyWindow(ctx->wnd); }

1 0

Henri Verbeet : wined3d: Remove the remains of an ATI_fragment_shader hack.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 476c83522b0b8401ef6883d5aafd23e58c1b439c URL: http://source.winehq.org/git/wine.git/?a=commit;h=476c83522b0b8401ef6883d5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 15 12:21:16 2009 +0200 wined3d: Remove the remains of an ATI_fragment_shader hack. This was originally added as a workaround for a Mesa bug by commit ddf52dda15e83eae639ef2ce0ec4071b321ce34f. The other half of the hack has since been removed. This code causes problems when wglDeleteContext() from a different thread causes our current context to be destroyed, since wglGetCurrentContext() will return a destroyed context in that case. That is a flaw in our wgl implementation, since wglDeleteContext() shouldn't allow a context that's current in a different thread to be destroyed, but this hack is a bad idea regardless. --- dlls/wined3d/context.c | 22 +++------------------- 1 files changed, 3 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 6971e68..577f235 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -791,11 +791,11 @@ static int WineD3D_ChoosePixelFormat(IWineD3DDeviceImpl *This, HDC hdc, * *****************************************************************************/ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, HWND win_handle, BOOL create_pbuffer, const WINED3DPRESENT_PARAMETERS *pPresentParms) { - HDC oldDrawable, hdc; HPBUFFERARB pbuffer = NULL; - HGLRC ctx = NULL, oldCtx; WineD3DContext *ret = NULL; unsigned int s; + HGLRC ctx; + HDC hdc; TRACE("(%p): Creating a %s context for render target %p\n", This, create_pbuffer ? "offscreen" : "onscreen", target); @@ -984,12 +984,6 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar list_init(&ret->fbo_list); /* Set up the context defaults */ - oldCtx = pwglGetCurrentContext(); - oldDrawable = pwglGetCurrentDC(); - if(oldCtx && oldDrawable) { - /* See comment in ActivateContext context switching */ - This->frag_pipe->enable_extension((IWineD3DDevice *) This, FALSE); - } if(pwglMakeCurrent(hdc, ctx) == FALSE) { ERR("Cannot activate context to set up defaults\n"); goto out; @@ -1074,17 +1068,7 @@ WineD3DContext *CreateContext(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *tar } LEAVE_GL(); - /* Never keep GL_FRAGMENT_SHADER_ATI enabled on a context that we switch away from, - * but enable it for the first context we create, and reenable it on the old context - */ - if(oldDrawable && oldCtx) { - if (!pwglMakeCurrent(oldDrawable, oldCtx)) - { - ERR("Failed to make previous GL context %p current.\n", oldCtx); - } - } else { - context_set_last_device(This); - } + context_set_last_device(This); This->frag_pipe->enable_extension((IWineD3DDevice *) This, TRUE); return ret;

1 0

Paul Vriens : winedbg: Remove an unneeded pragma from the Swedish translation.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 3c876de7a4a4ab711dd9a3510bf0f849e586cd31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c876de7a4a4ab711dd9a3510… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Jul 15 12:19:05 2009 +0200 winedbg: Remove an unneeded pragma from the Swedish translation. --- programs/winedbg/rsrc_Sv.rc | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/rsrc_Sv.rc b/programs/winedbg/rsrc_Sv.rc index 7a24982..7d7da32 100644 --- a/programs/winedbg/rsrc_Sv.rc +++ b/programs/winedbg/rsrc_Sv.rc @@ -56,5 +56,3 @@ BEGIN IDS_INVALID_PARAMS "Interna fel - ogiltiga parametrar mottogs" IDS_UNIDENTIFIED "(oidentifierad)" END - -#pragma code_page(default)

1 0

Austin English : shell32: More Dutch translations fixes.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: ccfcf8dd21e7175534429572bfebb444940f61d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccfcf8dd21e7175534429572b… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jul 14 22:23:44 2009 -0500 shell32: More Dutch translations fixes. Translations by Vincent Beers. --- dlls/shell32/shell32_Nl.rc | 92 ++++++++++++++++++++++---------------------- 1 files changed, 46 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/shell32_Nl.rc b/dlls/shell32/shell32_Nl.rc index 560c7c7..e3038a1 100644 --- a/dlls/shell32/shell32_Nl.rc +++ b/dlls/shell32/shell32_Nl.rc @@ -25,8 +25,8 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL MENU_001 MENU DISCARDABLE BEGIN - MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grote Pictogrammen", FCIDM_SHVIEW_BIGICON + MENUITEM "&Kleine Pictogrammen", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END @@ -40,13 +40,13 @@ BEGIN BEGIN POPUP "&Bekijken" BEGIN - MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grote Pictogrammen", FCIDM_SHVIEW_BIGICON + MENUITEM "&Kleine Pictogrammen", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR - POPUP "Sorteren &Icons" + POPUP "P&ictogrammen Sorteren" BEGIN MENUITEM "Op &Naam", 0x30 /* column 0 */ MENUITEM "Op &Type", 0x32 /* column 2 */ @@ -55,17 +55,17 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Automatisch", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Uitlijnen Icons", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Pictogrammen Uitlijnen", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Vernieuwen", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Plakken", FCIDM_SHVIEW_INSERT - MENUITEM "Plakken als Link", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Plakken als Snelkoppeling", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Nieuw" BEGIN MENUITEM "Nieuwe &Map", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nieuwe &Link", FCIDM_SHVIEW_NEWLINK + MENUITEM "Nieuwe Sne&lkoppeling", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -81,15 +81,15 @@ MENU_SHV_FILE MENU DISCARDABLE BEGIN POPUP "" BEGIN - MENUITEM "&Selecteer" FCIDM_SHVIEW_OPEN + MENUITEM "&Selecteren" FCIDM_SHVIEW_OPEN MENUITEM "&Verkennen", FCIDM_SHVIEW_EXPLORE - MENUITEM "&Open", FCIDM_SHVIEW_OPEN + MENUITEM "&Openen", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR MENUITEM "K&nippen", FCIDM_SHVIEW_CUT - MENUITEM "&Kopieren", FCIDM_SHVIEW_COPY + MENUITEM "&Kopiëren", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Creëer &Link", FCIDM_SHVIEW_CREATELINK - MENUITEM "Ver&wijder", FCIDM_SHVIEW_DELETE + MENUITEM "Maak Sne&lkoppeling", FCIDM_SHVIEW_CREATELINK + MENUITEM "Ver&wijderen", FCIDM_SHVIEW_DELETE MENUITEM "&Hernoemen", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR MENUITEM "&Eigenschappen", FCIDM_SHVIEW_PROPERTIES @@ -106,15 +106,15 @@ BEGIN POPUP "B&eeld" BEGIN - MENUITEM "&Grote Icons", FCIDM_SHVIEW_BIGICON - MENUITEM "&Kleine Icons", FCIDM_SHVIEW_SMALLICON + MENUITEM "&Grote Pictogrammen", FCIDM_SHVIEW_BIGICON + MENUITEM "&Kleine Pictogrammen", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lijst", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Details", FCIDM_SHVIEW_REPORTVIEW END POPUP "&Help" BEGIN - MENUITEM "&Over Controle Paneel...", IDM_CPANEL_ABOUT + MENUITEM "&Over Configuratiescherm", IDM_CPANEL_ABOUT END END @@ -214,32 +214,32 @@ STRINGTABLE IDS_DESKTOP "Bureaublad" IDS_MYCOMPUTER "Mijn Computer" IDS_RECYCLEBIN_FOLDER_NAME "Vuilnisbak" - IDS_CONTROLPANEL "Controle Paneel" + IDS_CONTROLPANEL "Configuratiescherm" /* context menus */ - IDS_VIEW_LARGE "Grote Icons" - IDS_VIEW_SMALL "&Kleine Icons" + IDS_VIEW_LARGE "Grote Pictogrammen" + IDS_VIEW_SMALL "&Kleine Pictogrammen" IDS_VIEW_LIST "&Lijst" IDS_VIEW_DETAILS "&Details" - IDS_SELECT "Selecteer" - IDS_OPEN "Open" + IDS_SELECT "Selecteren" + IDS_OPEN "Openen" - IDS_CREATEFOLDER_DENIED "Niet mogelijk om nieuwe map te maken: Permissie afgewezen." - IDS_CREATEFOLDER_CAPTION "Fout tijdens creatie van een nieuwe map" - IDS_DELETEITEM_CAPTION "Bevestig bestand verwijdering" - IDS_DELETEFOLDER_CAPTION "Bevestig map verwijdering" + IDS_CREATEFOLDER_DENIED "Niet mogelijk om nieuwe map te maken: Geen permissies." + IDS_CREATEFOLDER_CAPTION "Fout tijdens het maken van een nieuwe map" + IDS_DELETEITEM_CAPTION "Bevestig bestandsverwijdering" + IDS_DELETEFOLDER_CAPTION "Bevestig mapverwijdering" IDS_DELETEITEM_TEXT "Weet u zeker dat u '%1' wilt verwijderen?" IDS_DELETEMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden wilt verwijderen?" IDS_DELETESELECTED_TEXT "Weet u zeker dat u de geselecteerde bestand(en) wilt verwijderen?" - IDS_TRASHITEM_TEXT "Weet u zeker dat u '%1' naar de Vuilnisbak wilt sturen?" - IDS_TRASHFOLDER_TEXT "Weet u zeker dat u '%1' en zijn gehele inhoud naar de Vuilnisbak wilt sturen?" - IDS_TRASHMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden naar de Vuilnisbak wilt sturen?" - IDS_CANTTRASH_TEXT "Bestand '%1' kan niet naar de Vuilnisbak worden gestuurd. Wilt u het dan maar verwijderen?" + IDS_TRASHITEM_TEXT "Weet u zeker dat u '%1' naar de Vuilnisbak wilt verplaatsen?" + IDS_TRASHFOLDER_TEXT "Weet u zeker dat u '%1' en zijn gehele inhoud naar de Vuilnisbak wilt verplaatsen?" + IDS_TRASHMULTIPLE_TEXT "Weet u zeker dat u deze %1 bestanden naar de Vuilnisbak wilt verplaatsen?" + IDS_CANTTRASH_TEXT "Bestand '%1' kan niet naar de Vuilnisbak worden verplaatst. Wilt u het bestand permanent verwijderen?" IDS_OVERWRITEFILE_TEXT "Deze map bevat reeds een bestand genaamd '%1'.\n\nWilt u het vervangen?" - IDS_OVERWRITEFILE_CAPTION "Bevestig het overschrijven van het bestand" + IDS_OVERWRITEFILE_CAPTION "Bevestig bestandsoverschrijving" IDS_OVERWRITEFOLDER_TEXT "Deze map bevat reeds een map genaamd '%1'.\n\n"\ - "Als de bestanden in de doel map dezelfde naam hebben als de bestanden in de\n"\ - "geselecteerde map worden ze overschreven. Wilt u nog steeds de map copieren\n"\ + "Als de bestanden in de doelmap dezelfde naam hebben als de bestanden in de\n"\ + "geselecteerde map zullen ze worden overschreven. Wilt u alsnog de map kopiëren\n"\ "of verplaatsen?" /* message box strings */ @@ -249,30 +249,30 @@ STRINGTABLE IDS_SHUTDOWN_PROMPT "Wilt u uw Wine sessie afsluiten?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Fout tijdens tonen Uitvoeren Bestand venster (interne fout)" - IDS_RUNDLG_BROWSE_ERROR "Fout tijdens tonen Bladeren venster (interne fout)" + IDS_RUNDLG_ERROR "Fout tijdens tonen venster 'Uitvoeren Bestand' (interne fout)" + IDS_RUNDLG_BROWSE_ERROR "Fout tijdens tonen van Bladeren venster (interne fout)" IDS_RUNDLG_BROWSE_CAPTION "Bladeren" IDS_RUNDLG_BROWSE_FILTER "Uitvoerbare bestanden\0*.exe\0Alle bestanden\0*.*\0\0" /* shell folder path default values */ - IDS_PROGRAMS "Start Menu\\Programmas" + IDS_PROGRAMS "Start Menu\\Programma's" IDS_PERSONAL "Mijn Documenten" IDS_FAVORITES "Favorieten" - IDS_STARTUP "Start Menu\\Programmas\\StartUp" + IDS_STARTUP "Start Menu\\Programma's\\Opstarten" IDS_RECENT "Recent" - IDS_SENDTO "Stuur Naar" + IDS_SENDTO "SendTo" IDS_STARTMENU "Start Menu" IDS_MYMUSIC "Mijn Muziek" - IDS_MYVIDEO "Mijn Videos" + IDS_MYVIDEO "Mijn Video's" IDS_DESKTOPDIRECTORY "Bureaublad" IDS_NETHOOD "Netwerkomgeving" IDS_TEMPLATES "Sjablonen" - IDS_APPDATA "Applicatie Data" + IDS_APPDATA "Application Data" IDS_PRINTHOOD "Printeromgeving" - IDS_LOCAL_APPDATA "Lokale Instellingen\\Applicatie Data" - IDS_INTERNET_CACHE "Lokale Instellingen\\Tijdelijke Internet Bestanden" - IDS_COOKIES "Koekies" - IDS_HISTORY "Lokale Instellingen\\Geschiedenis" + IDS_LOCAL_APPDATA "Local Settings\\Application Data" + IDS_INTERNET_CACHE "Local Settings\\Tijdelijke Internetbestanden" + IDS_COOKIES "Cookies" + IDS_HISTORY "Local Settings\\Geschiedenis" IDS_PROGRAM_FILES "Program Files" IDS_MYPICTURES "Mijn Afbeeldingen" IDS_PROGRAM_FILES_COMMON "Program Files\\Common Files" @@ -281,15 +281,15 @@ STRINGTABLE IDS_COMMON_MUSIC "Documenten\\Mijn Muziek" IDS_COMMON_PICTURES "Documenten\\Mijn Afbeeldingen" IDS_COMMON_VIDEO "Documenten\\Mijn Videos" - IDS_CDBURN_AREA "Lokale Instellingen\\Applicatie Data\\Microsoft\\CD Branden" + IDS_CDBURN_AREA "Local Settings\\Applicatie Data\\Microsoft\\CD Branden" IDS_NEWFOLDER "Nieuwe Map" - IDS_CPANEL_TITLE "Wine Controle Paneel" + IDS_CPANEL_TITLE "Wine Configuratiescherm" IDS_CPANEL_NAME "Naam" IDS_CPANEL_DESCRIPTION "Beschrijving" - IDS_SHLEXEC_NOASSOC "Er is geen Windows programma geconfigureerd om dit soort bestanden te openen." + IDS_SHLEXEC_NOASSOC "Er is geen Windows-programma geconfigureerd om dit soort bestanden te openen." } STRINGTABLE

1 0

Michael Stefaniuc : Set the encoding of the remaining German resources to UTF-8.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 9949661c65e5137d7e54d45cc914d713a9a06113 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9949661c65e5137d7e54d45cc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 15 11:52:49 2009 +0200 Set the encoding of the remaining German resources to UTF-8. --- dlls/browseui/rsrc_De.rc | 2 ++ dlls/iccvid/iccvid_De.rc | 2 ++ dlls/localspl/spl_De.rc | 2 ++ dlls/mpr/mpr_De.rc | 2 ++ dlls/msacm32/msacm_De.rc | 2 ++ dlls/msvidc32/msvidc32_De.rc | 2 ++ dlls/oleaut32/oleaut32_De.rc | 2 ++ dlls/sane.ds/sane_De.rc | 2 ++ dlls/shlwapi/shlwapi_De.rc | 2 ++ dlls/wininet/wininet_De.rc | 2 ++ programs/write/De.rc | 2 ++ 11 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/browseui/rsrc_De.rc b/dlls/browseui/rsrc_De.rc index b32400c..9a0b78e 100644 --- a/dlls/browseui/rsrc_De.rc +++ b/dlls/browseui/rsrc_De.rc @@ -19,6 +19,8 @@ #include "resids.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE diff --git a/dlls/iccvid/iccvid_De.rc b/dlls/iccvid/iccvid_De.rc index 3262c91..d1a3cef 100644 --- a/dlls/iccvid/iccvid_De.rc +++ b/dlls/iccvid/iccvid_De.rc @@ -19,6 +19,8 @@ #include "iccvid_private.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/localspl/spl_De.rc b/dlls/localspl/spl_De.rc index 4e6616e..b30e13c 100644 --- a/dlls/localspl/spl_De.rc +++ b/dlls/localspl/spl_De.rc @@ -21,6 +21,8 @@ #include "localspl_private.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/mpr/mpr_De.rc b/dlls/mpr/mpr_De.rc index 662cad5..d8b1298 100644 --- a/dlls/mpr/mpr_De.rc +++ b/dlls/mpr/mpr_De.rc @@ -20,6 +20,8 @@ #include "mprres.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/msacm32/msacm_De.rc b/dlls/msacm32/msacm_De.rc index cd4353a..1f35148 100644 --- a/dlls/msacm32/msacm_De.rc +++ b/dlls/msacm32/msacm_De.rc @@ -20,6 +20,8 @@ #include "wineacm.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL DLG_ACMFORMATCHOOSE_ID DIALOG DISCARDABLE 10, 20, 225, 100 diff --git a/dlls/msvidc32/msvidc32_De.rc b/dlls/msvidc32/msvidc32_De.rc index c31635c..1dc777b 100644 --- a/dlls/msvidc32/msvidc32_De.rc +++ b/dlls/msvidc32/msvidc32_De.rc @@ -19,6 +19,8 @@ #include "msvidc32_private.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/oleaut32/oleaut32_De.rc b/dlls/oleaut32/oleaut32_De.rc index e0ae38b..1dbee3e 100644 --- a/dlls/oleaut32/oleaut32_De.rc +++ b/dlls/oleaut32/oleaut32_De.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE diff --git a/dlls/sane.ds/sane_De.rc b/dlls/sane.ds/sane_De.rc index a1be1e4..3f3e116 100644 --- a/dlls/sane.ds/sane_De.rc +++ b/dlls/sane.ds/sane_De.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 186, 46 diff --git a/dlls/shlwapi/shlwapi_De.rc b/dlls/shlwapi/shlwapi_De.rc index f0de193..f74600f 100644 --- a/dlls/shlwapi/shlwapi_De.rc +++ b/dlls/shlwapi/shlwapi_De.rc @@ -20,6 +20,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 diff --git a/dlls/wininet/wininet_De.rc b/dlls/wininet/wininet_De.rc index 9b168b4..4766589 100644 --- a/dlls/wininet/wininet_De.rc +++ b/dlls/wininet/wininet_De.rc @@ -18,6 +18,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL IDD_PROXYDLG DIALOG LOADONCALL MOVEABLE DISCARDABLE 36, 24, 250, 154 diff --git a/programs/write/De.rc b/programs/write/De.rc index a953576..db175a0 100644 --- a/programs/write/De.rc +++ b/programs/write/De.rc @@ -19,6 +19,8 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE

1 0

Michael Stefaniuc : taskmgr: Convert the German resources to UTF-8.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 0692f0eba4ae44f1309ab273a0bb43a3ca6b38ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=0692f0eba4ae44f1309ab273a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 15 01:45:29 2009 +0200 taskmgr: Convert the German resources to UTF-8. --- programs/taskmgr/De.rc | 120 ++++++++++++++++++++++++----------------------- 1 files changed, 61 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0692f0eba4ae44f1309ab…

1 0

Michael Stefaniuc : shell32: Convert the German resources to UTF-8.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: f92afb876890054523f8f9bf6f47d0878be274d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92afb876890054523f8f9bf6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 15 01:45:39 2009 +0200 shell32: Convert the German resources to UTF-8. --- dlls/shell32/shell32_De.rc | 106 ++++++++++++++++++++++--------------------- 1 files changed, 54 insertions(+), 52 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f92afb876890054523f8f…

1 0

Michael Stefaniuc : user32: Update the German resources and switch them to UTF-8.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 88a58a3e1f90e5621c7b5839f20122bbbfe1c734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a58a3e1f90e5621c7b5839f… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 15 01:45:48 2009 +0200 user32: Update the German resources and switch them to UTF-8. --- dlls/user32/resources/user32_De.rc | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/dlls/user32/resources/user32_De.rc b/dlls/user32/resources/user32_De.rc index 344c516..edb7c30 100644 --- a/dlls/user32/resources/user32_De.rc +++ b/dlls/user32/resources/user32_De.rc @@ -19,31 +19,33 @@ #include "resources.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL SYSMENU MENU LOADONCALL MOVEABLE DISCARDABLE { MENUITEM "&Wiederherstellen", 61728 MENUITEM "&Verschieben", 61456 - MENUITEM "&Gr��e", 61440 + MENUITEM "&Größe", 61440 MENUITEM "Mi&nimieren", 61472 MENUITEM "Ma&ximieren", 61488 MENUITEM SEPARATOR - MENUITEM "&Schlie�en\tAlt-F4", 61536 + MENUITEM "&Schließen\tAlt-F4", 61536 MENUITEM SEPARATOR - MENUITEM "&�ber Wine...", 61761 + MENUITEM "&Über Wine...", 61761 } EDITMENU MENU LOADONCALL MOVEABLE DISCARDABLE { POPUP "" BEGIN - MENUITEM "&R�ckg�ngig", EM_UNDO + MENUITEM "&Rückgängig", EM_UNDO MENUITEM SEPARATOR MENUITEM "&Ausschneiden", WM_CUT MENUITEM "&Kopieren", WM_COPY - MENUITEM "&Einf�gen", WM_PASTE - MENUITEM "&L�schen", WM_CLEAR + MENUITEM "&Einfügen", WM_PASTE + MENUITEM "&Löschen", WM_CLEAR MENUITEM SEPARATOR MENUITEM "&Alles markieren", EM_SETSEL END @@ -54,21 +56,21 @@ STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYS BEGIN ICON "", 1088, 8, 20, 16, 16, WS_CHILD | WS_VISIBLE LTEXT "", 100, 32, 4, 176, 48, WS_CHILD | WS_VISIBLE | WS_GROUP | SS_NOPREFIX - PUSHBUTTON "&OK", 1, 16, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Abbrechen", 2, 64, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Abbr&uch", 3, 112, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Wiederholen", 4, 160, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ignorieren", 5, 208, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Ja", 6, 256, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Nein", 7, 304, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Try Again", 10, 352, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "&Continue", 11, 400, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP - PUSHBUTTON "Help", 9, 448, 56, 40, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&OK", 1, 16, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Abbrechen", 2, 84, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Abbr&uch", 3, 152, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Wiederholen", 4, 220, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ignorieren", 5, 288, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ja", 6, 356, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Nein", 7, 424, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Erneut versuchen", 10, 492, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Fortsetzen", 11, 560, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Hilfe", 9, 628, 56, 60, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP END MDI_MOREWINDOWS DIALOG FIXED IMPURE 20, 20, 232, 122 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Fenster ausw�hlen" +CAPTION "Fenster auswählen" FONT 8, "MS Shell Dlg" BEGIN LISTBOX MDI_IDC_LISTBOX, 5, 7, 222, 90, WS_VSCROLL | WS_HSCROLL /* defined in mdi.h */

1 0

Michael Stefaniuc : winecfg: Convert the German resources to UTF-8.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 47b479d5b6a61bce58dae553ba784972c76501e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47b479d5b6a61bce58dae553b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Jul 15 01:46:07 2009 +0200 winecfg: Convert the German resources to UTF-8. --- programs/winecfg/De.rc | 94 ++++++++++++++++++++++++------------------------ 1 files changed, 47 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=47b479d5b6a61bce58dae…

1 0

Andrew Talbot : dbghelp: Constify some variables.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: f4d2db4c54de2df6416ddfd2dc494045a33f12fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d2db4c54de2df6416ddfd2d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jul 14 23:01:31 2009 +0100 dbghelp: Constify some variables. --- dlls/dbghelp/dbghelp_private.h | 4 ++-- dlls/dbghelp/symbol.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 0ddcb93..0a01409 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -559,7 +559,7 @@ extern struct symt_function* unsigned long addr, unsigned long size, struct symt* type); extern BOOL symt_normalize_function(struct module* module, - struct symt_function* func); + const struct symt_function* func); extern void symt_add_func_line(struct module* module, struct symt_function* func, unsigned source_idx, int line_num, @@ -577,7 +577,7 @@ extern struct symt_block* unsigned pc, unsigned len); extern struct symt_block* symt_close_func_block(struct module* module, - struct symt_function* func, + const struct symt_function* func, struct symt_block* block, unsigned pc); extern struct symt_hierarchy_point* symt_add_function_point(struct module* module, diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 366cade..34d00b2 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -486,7 +486,7 @@ struct symt_block* symt_open_func_block(struct module* module, } struct symt_block* symt_close_func_block(struct module* module, - struct symt_function* func, + const struct symt_function* func, struct symt_block* block, unsigned pc) { assert(func); @@ -518,7 +518,7 @@ struct symt_hierarchy_point* symt_add_function_point(struct module* module, return sym; } -BOOL symt_normalize_function(struct module* module, struct symt_function* func) +BOOL symt_normalize_function(struct module* module, const struct symt_function* func) { unsigned len; struct line_info* dli; @@ -771,7 +771,7 @@ static BOOL send_symbol(const struct sym_enum* se, const struct module_pair* pai return !se->cb(se->sym_info, se->sym_info->Size, se->user); } -static BOOL symt_enum_module(struct module_pair* pair, const regex_t* regex, +static BOOL symt_enum_module(const struct module_pair* pair, const regex_t* regex, const struct sym_enum* se) { void* ptr; @@ -792,7 +792,7 @@ static BOOL symt_enum_module(struct module_pair* pair, const regex_t* regex, return FALSE; } -static inline unsigned where_to_insert(const struct module* module, unsigned high, struct symt_ht* elt) +static inline unsigned where_to_insert(const struct module* module, unsigned high, const struct symt_ht* elt) { unsigned low = 0, mid = high / 2; ULONG64 addr; @@ -848,7 +848,7 @@ static BOOL resort_symbols(struct module* module) return module->sortlist_valid = TRUE; } -static void symt_get_length(struct symt* symt, ULONG64* size) +static void symt_get_length(const struct symt* symt, ULONG64* size) { DWORD type_index;

1 0

Stefan Dösinger : wined3d: Set the depth blit helper texture address mode to clamp.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 3c2fa6aea46a33a48cae13e3af1b9c52f60c2883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2fa6aea46a33a48cae13e3a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 14 19:01:48 2009 +0200 wined3d: Set the depth blit helper texture address mode to clamp. On ATI cards we use the driver's GL_ARB_texture_non_power_of_two emulation to support conditional NP2 textures without having to deal with the denormalized coordinates. The default GL_TEXTURE_2D address mode is incompatible with GL_ARB_texture_rectangle however. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 83d02d4..c7d1c2b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4418,6 +4418,9 @@ void surface_load_ds_location(IWineD3DSurface *iface, DWORD location) { 0, 0, This->currentDesc.Width, This->currentDesc.Height, 0); glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glTexParameteri(bind_target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE); glTexParameteri(bind_target, GL_DEPTH_TEXTURE_MODE_ARB, GL_LUMINANCE); glBindTexture(bind_target, old_binding);

1 0

Stefan Dösinger : wined3d: EXP and EXPP are scalar operations.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 387d337a7035a19f7019e1220164fdbf48f92379 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387d337a7035a19f7019e1220… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 14 23:20:13 2009 +0200 wined3d: EXP and EXPP are scalar operations. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6f7a1f0..0c3ffa1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1555,8 +1555,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_DP3: instruction = "DP3"; break; case WINED3DSIH_DP4: instruction = "DP4"; break; case WINED3DSIH_DST: instruction = "DST"; break; - case WINED3DSIH_EXP: instruction = "EX2"; break; - case WINED3DSIH_EXPP: instruction = "EXP"; break; case WINED3DSIH_FRC: instruction = "FRC"; break; case WINED3DSIH_LIT: instruction = "LIT"; break; case WINED3DSIH_LRP: instruction = "LRP"; break; @@ -2255,7 +2253,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) } } -static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) +static void shader_hw_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; const char *instruction; @@ -2265,8 +2263,10 @@ static void shader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) switch(ins->handler_idx) { - case WINED3DSIH_RSQ: instruction = "RSQ"; break; - case WINED3DSIH_RCP: instruction = "RCP"; break; + case WINED3DSIH_RSQ: instruction = "RSQ"; break; + case WINED3DSIH_RCP: instruction = "RCP"; break; + case WINED3DSIH_EXP: instruction = "EX2"; break; + case WINED3DSIH_EXPP: instruction = "EXP"; break; default: instruction = ""; FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; @@ -4580,8 +4580,8 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ENDIF */ shader_hw_endif, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop, /* WINED3DSIH_ENDREP */ shader_hw_endrep, - /* WINED3DSIH_EXP */ shader_hw_map2gl, - /* WINED3DSIH_EXPP */ shader_hw_map2gl, + /* WINED3DSIH_EXP */ shader_hw_scalar_op, + /* WINED3DSIH_EXPP */ shader_hw_scalar_op, /* WINED3DSIH_FRC */ shader_hw_map2gl, /* WINED3DSIH_IF */ NULL /* Hardcoded into the shader */, /* WINED3DSIH_IFC */ shader_hw_ifc, @@ -4606,10 +4606,10 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_log_pow, - /* WINED3DSIH_RCP */ shader_hw_rsq_rcp, + /* WINED3DSIH_RCP */ shader_hw_scalar_op, /* WINED3DSIH_REP */ shader_hw_rep, /* WINED3DSIH_RET */ shader_hw_ret, - /* WINED3DSIH_RSQ */ shader_hw_rsq_rcp, + /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SETP */ NULL, /* WINED3DSIH_SGE */ shader_hw_map2gl, /* WINED3DSIH_SGN */ shader_hw_sgn,

1 0

André Hentschel : cmd: Update German translation.
by Alexandre Julliard July 15, 2009

July 15, 2009

Module: wine Branch: master Commit: 7d16eed02fe5ee5a2241f8bbd26560b7f6032b07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d16eed02fe5ee5a2241f8bbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jul 14 22:35:13 2009 +0200 cmd: Update German translation. --- programs/cmd/De.rc | 66 ++++++++++++++++++++++++++-------------------------- 1 files changed, 33 insertions(+), 33 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 01a928a..2ad3de1 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -3,6 +3,7 @@ * German Language Support * * Copyright 2004 Henning Gerhardt + * Copyright 2009 André Hentschel * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -27,26 +28,26 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE { - WCMD_ATTRIB, "Hilfe für ATTRIB\n" + WCMD_ATTRIB, "ATTRIB zeigt oder ändert die DOS Dateieigenschaften.\n" WCMD_CALL, "CALL <Batchdateiname> wird in einer Batchdatei genutzt, um Befehle aus\n\ einer anderen Batchdatei auszuführen. Wenn die Batchdatei exisiert, kehrt\n\ -die Kontrolle zu der Datei zurück, die sie gerufen hat. Der CALL Befehl kann\n\ -Parameter zu der rufenden Prozedure übertragen.\n\ +die Kontrolle zu der Datei zurück, die sie aufgerufen hat. Der CALL Befehl kann\n\ +Parameter zu der rufenden Prozedure übergeben.\n\ \n\ Änderungen für das aktuelle Verzeichnis, Umgebungsvariablen usw. werden in\n\ der gerufenen Prozedur gemacht, die sie von der aufgerufenen geerbt hat.\n" - WCMD_CD, "Hilfe für CD\n" - WCMD_CHDIR, "Hilfe für CHDIR\n" + WCMD_CD, "CD ist die Kurzform von CHDIR.\n" + WCMD_CHDIR, "CHDIR Wechselt in ein Verzeichnis.\n" - WCMD_CLS, "CLS löscht den Inhalt der Konsole\n" + WCMD_CLS, "CLS löscht den Bildschirminhalt der Konsole.\n" - WCMD_COPY, "Hilfe für COPY\n" - WCMD_CTTY, "Hilfe für CTTY\n" - WCMD_DATE, "Hilfe für DATE\n" - WCMD_DEL, "Hilfe für DEL\n" - WCMD_DIR, "Hilfe für DIR\n" + WCMD_COPY, "COPY Kopiert eine Datei.\n" + WCMD_CTTY, "CTTY Ändert das Eingabe/Ausgabe - Gerät.\n" + WCMD_DATE, "DATE zeigt oder ändert das Systemdatum.\n" + WCMD_DEL, "DEL löscht eine oder mehrere Dateien\n" + WCMD_DIR, "DIR listet den Inhalt eines Verzeichnisses.\n" WCMD_ECHO, "ECHO <Zeichenkette> zeigt die <Zeichenkette> auf dem aktuellen Terminalgerät.\n\ @@ -58,7 +59,7 @@ ECHO OFF kehrt den Effekt des vorherigen ECHO ON (ECHO ist standardmässig\n\ auf OFF) um. Um den ECHO OFF Befehl nicht anzeigen zu lassen, kann vor dessen\n\ ein @ Zeichen gesetzt werden.\n" - WCMD_ERASE, "Hilfe für ERASE\n" + WCMD_ERASE, "ERASE löscht die angegebenen Dateien.\n" WCMD_FOR, "Der FOR Befehl wird genutzt, um einen Befehl für eine Menge von Dateien\n\ @@ -67,14 +68,14 @@ einzeln auszuführen.\n\ Syntax: FOR %Variable IN (set) DO Befehl\n\ \n\ Die Anforderung das % Zeichen zu verdoppeln, sobald FOR in einer Batchdatei\n\ -benutzt wird, existiert im CMD nicht.\n" +benutzt wird, existiert in CMD nicht.\n" WCMD_GOTO, "Der GOTO Befehl transferiert die Ausführung zu einer anderen Stelle in einer\n\ Batchdatei.\n\ \n\ Die Bezeichnung, die das Ziel eines GOTO's ist, kann bis zu 255 Zeichen lang\n\ -sein, darf aber keine Leerzeichen enthakten (dies ist der Unterschied zu\n\ +sein, darf aber keine Leerzeichen enthalten (dies ist der Unterschied zu\n\ anderen Betriebssystemen). Wenn zwei oder mehr identische Bezeichnungen in\n\ einer Batchdatei existieren, dann wird immer zu der ersten Bezeichnung\n\ gesprungen. Versucht GOTO zu einer nicht vorhanden Bezeichnung zu springen,\n\ @@ -82,7 +83,7 @@ beendet sich die Ausführung der Batchdatei.\n\ \n\ GOTO hat keine Auswirkungen, wenn es interaktiv genutzt wird.\n" - WCMD_HELP, "Hilfe für HELP\n" + WCMD_HELP, "HELP zeigt die Hilfe an\n" WCMD_IF, "IF wird benutzt, um einen Befehl bedingt auszuführen.\n\ @@ -104,8 +105,8 @@ Der Befehl wartet auf die Eingabe einer neuen Bezeichnung für das angegebene\n\ Laufwerk. Sie können sich auch die Laufwerksbezeicnung mit dem VOL - Befehl\n\ anzeigen lassen.\n" - WCMD_MD, "Hilfe für MD\n" - WCMD_MKDIR, "Hilfe für MKDIR\n" + WCMD_MD, "MD ist die Kurzform von MKDIR\n" + WCMD_MKDIR, "MKDIR erstellt ein Verzeichnis\n" WCMD_MOVE, "MOVE verschiebt eine Datei oder ein Verzeichnis zu einem neuen Punkt im\n\ Dateisystem.\n\ @@ -163,10 +164,10 @@ wie 'PROMPT text'.\n" keine Aktion ausgeführt und kann deshalb auch als Kommentar in einer\n\ Batchdatei genutzt werden.\n" - WCMD_REN, "Hilfe für REN\n" - WCMD_RENAME, "Hilfe für RENAME\n" - WCMD_RD, "Hilfe für RD\n" - WCMD_RMDIR, "Hilfe für RMDIR\n" + WCMD_REN, "REN ist die Kurzform von RENAME.\n" + WCMD_RENAME, "RENAME benennt die angegebenen Dateien um.\n" + WCMD_RD, "RD ist die Kurzform von RMDIR.\n" + WCMD_RMDIR, "RMDIR löscht das angegebene Verzeichnis.\n" WCMD_SET, "SET ändert oder zeigt die CMD Umgebungsvariablen an.\n\ @@ -178,8 +179,7 @@ Um eine Umgebungsvariable zu erschaffen oder zu ändern, ist der Syntax nötig:\ SET <Variable>=<Wert>\n\ \n\ Wobei <Variable> und <Wert> Zeichenkette sind. Es dürfen keine Leerzeichen vor\n\ -dem Gleichheitszeichen sein, noch darf der Variablenname in Leerzeichen\n\ -enthalten.\n\ +dem Gleichheitszeichen sein, noch darf der Variablenname Leerzeichen enthalten.\n\ \n\ In Wine werden die Umgebungsvariablen des darunterliegenden Betriebssystems\n\ mit in die Win32 Umgebung eingebunden, deshalb gibt es gewöhnlich mehr Werte\n\ @@ -190,9 +190,9 @@ beeinflussen.\n" WCMD_SHIFT, "SHIFT wird in einer Batchdatei genutzt, um einen Parameter vom Anfang der\n\ Liste zu entfernen, so das der Parameter 2 zu Parameter 1 wird und so weiter.\n\ -Es hat keine Auswirkungen, wenn es von der Befehlszeile gerufen wird.\n" +Es hat keine Auswirkungen, wenn es von der Befehlszeile aus aufgerufen wird.\n" - WCMD_TIME, "Hilfe für TIME\n" + WCMD_TIME, "TIME Setzt oder zeigt die aktuelle Systemzeit an.\n" WCMD_TITLE, "Setzt den Fenstertitel für das CMD - Fenster.\n\ @@ -202,7 +202,7 @@ Syntax: TITLE [Zeichenkette]\n" WCMD_TYPE, "TYPE <Datei> kopiert <Datei> zu dem Konsolengerät (oder dorthin, wohin\n\ dies umgeleitet wurde). Es wird keine Überprüfung vorgenommen, ob die\n\ -Datei lesbarer Text ist.\n" +Datei lesbaren Text enthält.\n" WCMD_VERIFY, "VERIFY wird benutzt, um das Verify Flag zu setzen, zu löschen oder zu\n\ @@ -217,7 +217,7 @@ Das Verify Flag hat keine Funktion in Wine.\n" WCMD_VER, "VER zeigt die aktuelle Version von CMD an.\n" - WCMD_VOL, "Hilfe für VOL\n" + WCMD_VOL, "VOL zeigt die Volumeseriennummer an\n" WCMD_PUSHD, "PUSHD <Verzeichnisname> speichert das aktuelle\n\ Verzeichnis auf einem Stack und wecheselt das Arbeitsverzeichnis\n\ @@ -226,7 +226,7 @@ zu dem angegebenen.\n" WCMD_POPD, "POPD wechselt das Arbeitsverzeichnis zu dem zuletzt\n\ mit PUSHD gespeicherten.\n" - WCMD_MORE, "MORE displays output of files or piped input in pages.\n" + WCMD_MORE, "MORE gibt Dateien und Pipes seitenweise aus.\n" WCMD_EXIT, "EXIT beendet die aktuelle Befehlssitzung und kehrt zum\n\ @@ -234,13 +234,13 @@ Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" WCMD_ALLHELP, "CMD eingebauten Befehle sind:\n\ -ATTRIB\t\tZeigt an oder ändert die DOS Dateieigenschaften\n\ +ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ -CD (CHDIR)\tWechselt in das Verzeichnis\n\ +CD (CHDIR)\tWechselt in ein Verzeichnis\n\ CLS\t\tLöscht den Inhalt der Konsole\n\ COPY\t\tKopiert eine Datei\n\ CTTY\t\tÄndert das Eingabe/Ausgabe - Gerät\n\ -DATE\t\tZeigt an oder ändert das Systemdatum\n\ +DATE\t\tZeigt oder ändert das Systemdatum\n\ DEL (ERASE)\tLöscht eine oder mehrere Dateien\n\ DIR\t\tListet den Inhalt eines Verzeichnisses\n\ ECHO\t\tKopiert den Text direkt zur Konsolenausgabe\n\ @@ -282,7 +282,7 @@ obigen Befehle erhalten.\n" WCMD_NEWTIME, "Geben Sie die neue Zeit ein: " WCMD_MISSINGENV, "Die Umgebungsvariable %s ist nicht definiert\n" WCMD_READFAIL, "'%s' konnte nicht geöffnet werden\n" - WCMD_CALLINSCRIPT, "Cannot call batch label outside of a batch script\n" + WCMD_CALLINSCRIPT, "Kann kein Batch-Label außerhalb eines Batch-Scripts aufrufen\n" WCMD_ALL, "A" WCMD_DELPROMPT, "%s, löschen" WCMD_ECHOPROMPT, "Echo ist %s\n" @@ -296,5 +296,5 @@ obigen Befehle erhalten.\n" WCMD_CONSTITLE,"Wine Befehlsprozessor" WCMD_VERSION,"CMD Version %s\n\n" WCMD_MOREPROMPT, "Mehr? " - WCMD_LINETOOLONG, "The input line is too long.\n" + WCMD_LINETOOLONG, "Die Eingabezeile ist zu lang.\n" }

1 0