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

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

July 9, 2009

Module: wine Branch: master Commit: d6a9ef91d10550c69dbb4812df920d1a37e9a19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6a9ef91d10550c69dbb4812d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:52:56 2009 +0200 view: Convert the German resources to UTF-8. --- programs/view/De.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/programs/view/De.rc b/programs/view/De.rc index b77fc82..736f7bf 100644 --- a/programs/view/De.rc +++ b/programs/view/De.rc @@ -21,6 +21,8 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL /* @@ -33,7 +35,7 @@ VIEW MENU BEGIN POPUP "&Datei" BEGIN - MENUITEM "&�ffnen", IDM_OPEN + MENUITEM "&Öffnen", IDM_OPEN MENUITEM "&Beenden", IDM_EXIT END POPUP "&Verschieben" @@ -68,5 +70,5 @@ END STRINGTABLE DISCARDABLE BEGIN - IDS_DESCRIPTION "Regul�rer Metafile Betrachter" + IDS_DESCRIPTION "Regulärer Metafile Betrachter" END

1 0

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

July 9, 2009

Module: wine Branch: master Commit: fa544bbebae853070c5f365aaa0900ef06ae047d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa544bbebae853070c5f365aa… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:52:47 2009 +0200 uninstaller: Convert the German resources to UTF-8. --- programs/uninstaller/De.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/programs/uninstaller/De.rc b/programs/uninstaller/De.rc index fb19621..58f5427 100644 --- a/programs/uninstaller/De.rc +++ b/programs/uninstaller/De.rc @@ -20,9 +20,11 @@ #include "resource.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_APPNAME, "Wine Anwendungsentferner" - IDS_UNINSTALLFAILED, "Die Ausf�hrung des Entfernungsbefehls '%s' ist fehlgeschlagen, wahrscheinlich durch eine fehlende, ausf�hrbare Datei.\r\nM�chten Sie, dass der Anwendungseintrag aus der Registry entfernt wird?" + IDS_UNINSTALLFAILED, "Die Ausführung des Entfernungsbefehls '%s' ist fehlgeschlagen, wahrscheinlich durch eine fehlende, ausführbare Datei.\r\nMöchten Sie, dass der Anwendungseintrag aus der Registry entfernt wird?" }

1 0

Michael Stefaniuc : wineps.drv: Convert the German resources to UTF-8.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 6c24ec186cebf8e9f1bd4fb357c6cdd07c03734a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c24ec186cebf8e9f1bd4fb35… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:52:41 2009 +0200 wineps.drv: Convert the German resources to UTF-8. --- dlls/wineps.drv/wps_De.rc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/wps_De.rc b/dlls/wineps.drv/wps_De.rc index 9ebaf3c..7ff88ec 100644 --- a/dlls/wineps.drv/wps_De.rc +++ b/dlls/wineps.drv/wps_De.rc @@ -18,6 +18,8 @@ #include "psdlg.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 @@ -25,7 +27,7 @@ STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE CAPTION "Papier" FONT 8, "MS Shell Dlg" { - LTEXT "&Papiergr��e:", -1, 10, 6, 100, 8 + LTEXT "&Papiergröße:", -1, 10, 6, 100, 8 LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | WS_TABSTOP GROUPBOX "Ausrichtung", -1, 10, 80, 200, 50

1 0

Alexandre Julliard : ntdll: Display write watch status in virtual traces.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 58afa8acebe96197e02b65d75b2d51586258735c URL: http://source.winehq.org/git/wine.git/?a=commit;h=58afa8acebe96197e02b65d75… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:21:59 2009 +0200 ntdll: Display write watch status in virtual traces. --- dlls/ntdll/virtual.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 6ce5331..32e7d93 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -156,7 +156,7 @@ static const char *VIRTUAL_GetProtStr( BYTE prot ) { static char buffer[6]; buffer[0] = (prot & VPROT_COMMITTED) ? 'c' : '-'; - buffer[1] = (prot & VPROT_GUARD) ? 'g' : '-'; + buffer[1] = (prot & VPROT_GUARD) ? 'g' : ((prot & VPROT_WRITEWATCH) ? 'H' : '-'); buffer[2] = (prot & VPROT_READ) ? 'r' : '-'; buffer[3] = (prot & VPROT_WRITECOPY) ? 'W' : ((prot & VPROT_WRITE) ? 'w' : '-'); buffer[4] = (prot & VPROT_EXEC) ? 'x' : '-';

1 0

Michael Stefaniuc : winspool.drv: Convert the German resources to UTF-8.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 32f33a3e6d70ed886e4ef0204ec0cb241842dcc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32f33a3e6d70ed886e4ef0204… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:52:43 2009 +0200 winspool.drv: Convert the German resources to UTF-8. --- dlls/winspool.drv/De.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/De.rc b/dlls/winspool.drv/De.rc index b207af4..3490477 100644 --- a/dlls/winspool.drv/De.rc +++ b/dlls/winspool.drv/De.rc @@ -20,6 +20,8 @@ #include "wspool.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 @@ -35,7 +37,7 @@ END STRINGTABLE DISCARDABLE { - IDS_CAPTION "Lokaler Anschlu�" - IDS_FILE_EXISTS "Die Ausgabedatei existiert schon. Dr�cken Sie OK zum �berschreiben." + IDS_CAPTION "Lokaler Anschluß" + IDS_FILE_EXISTS "Die Ausgabedatei existiert schon. Drücken Sie OK zum Überschreiben." IDS_CANNOT_OPEN "Die Ausgabedatei konnte nicht erzeugt werden." }

1 0

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

July 9, 2009

Module: wine Branch: master Commit: 346e7806976b929281e0ae9718142b6cf0cd5ae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=346e7806976b929281e0ae971… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:52:36 2009 +0200 shdoclc: Convert the German resources to UTF-8. --- dlls/shdoclc/De.rc | 70 ++++++++++++++++++++++++++------------------------- 1 files changed, 36 insertions(+), 34 deletions(-) diff --git a/dlls/shdoclc/De.rc b/dlls/shdoclc/De.rc index f2fd672..f41619f 100644 --- a/dlls/shdoclc/De.rc +++ b/dlls/shdoclc/De.rc @@ -20,6 +20,8 @@ #include "shdoclc.h" +#pragma code_page(65001) + LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE @@ -37,19 +39,19 @@ IDR_BROWSE_CONTEXT_MENU MENU { POPUP "Standard" { - MENUITEM "&Zur�ck", IDM_GOBACKWARD - MENUITEM "V&orw�rts", IDM_GOFORWARD + MENUITEM "&Zurück", IDM_GOBACKWARD + MENUITEM "V&orwärts", IDM_GOFORWARD MENUITEM SEPARATOR MENUITEM "&Speichere Hintergrund als...", IDM_SAVEBACKGROUND MENUITEM "Als Hintergrund", IDM_SETWALLPAPER MENUITEM "Hintergrund &kopieren", IDM_COPYBACKGROUND MENUITEM "Als Desktopelement einrichten...", IDM_SETDESKTOPITEM MENUITEM SEPARATOR - MENUITEM "Alles &ausw�hlen", IDM_SELECTALL - MENUITEM "Ein&f�gen", IDM_PASTE + MENUITEM "Alles &auswählen", IDM_SELECTALL + MENUITEM "Ein&fügen", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "Erzeuge &Verkn�pfung", IDM_CREATESHORTCUT - MENUITEM "Zu &Favoriten hinzuf�gen", IDM_ADDFAVORITES + MENUITEM "Erzeuge &Verknüpfung", IDM_CREATESHORTCUT + MENUITEM "Zu &Favoriten hinzufügen", IDM_ADDFAVORITES MENUITEM "&Quelltextansicht", IDM_VIEWSOURCE MENUITEM SEPARATOR MENUITEM "&Textkodierung", IDM_LANGUAGE @@ -63,8 +65,8 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Bild" { - MENUITEM "&�ffne Verweis", IDM_FOLLOWLINKC - MENUITEM "�ffne Verweis in neuem Fenster", IDM_FOLLOWLINKN + MENUITEM "&Öffne Verweis", IDM_FOLLOWLINKC + MENUITEM "Öffne Verweis in neuem Fenster", IDM_FOLLOWLINKN MENUITEM "Speichere &Ziel als...", IDM_SAVETARGET MENUITEM "&Drucke Ziel", IDM_PRINTTARGET MENUITEM SEPARATOR @@ -78,10 +80,10 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "Verk&n�pfung kopieren", IDM_COPYSHORTCUT - MENUITEM "Ein&f�gen", IDM_PASTE + MENUITEM "Verk&nüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "Zu &Favoriten hinzuf�gen...", IDM_ADDFAVORITES + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDFAVORITES MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "&Eigenschaften", IDM_PROPERTIES @@ -89,20 +91,20 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "Steuerung" { - MENUITEM "&R�ckg�ngig", IDM_UNDO + MENUITEM "&Rückgängig", IDM_UNDO MENUITEM SEPARATOR MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "Ein&f�gen", IDM_PASTE - MENUITEM "&L�schen", IDM_DELETE + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM "&Löschen", IDM_DELETE MENUITEM SEPARATOR MENUITEM SEPARATOR - MENUITEM "Alles &ausw�hlen", IDM_SELECTALL + MENUITEM "Alles &auswählen", IDM_SELECTALL } POPUP "Tabelle" { - POPUP "&Ausw�hlen" + POPUP "&Auswählen" { MENUITEM "&Zelle", IDM_CELLSELECT MENUITEM "Zei&le", IDM_ROWSELECT @@ -119,25 +121,25 @@ IDR_BROWSE_CONTEXT_MENU MENU { MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "Ein&f�gen", IDM_PASTE - MENUITEM "Alles &ausw�hlen", IDM_SELECTALL + MENUITEM "Ein&fügen", IDM_PASTE + MENUITEM "Alles &auswählen", IDM_SELECTALL MENUITEM "&Drucken", IDM_PRINT MENUITEM SEPARATOR } POPUP "Anker" { - MENUITEM "&�ffnen", IDM_FOLLOWLINKC - MENUITEM "Im &neuen Fenster �ffnen", IDM_FOLLOWLINKN + MENUITEM "&Öffnen", IDM_FOLLOWLINKC + MENUITEM "Im &neuen Fenster öffnen", IDM_FOLLOWLINKN MENUITEM "Speichere &Ziel als...", IDM_SAVETARGET MENUITEM "&Drucke Ziel", IDM_PRINTTARGET MENUITEM SEPARATOR MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "&Verkn�pfung kopieren", IDM_COPYSHORTCUT - MENUITEM "Ein&f�gen", IDM_PASTE + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "Zu &Favoriten hinzuf�gen...", IDM_ADDFAVORITES + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDFAVORITES MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "&Eigenschaften", IDM_PROPERTIES @@ -150,8 +152,8 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "DYNSRC Bild" { - MENUITEM "&�ffne Verweis", IDM_FOLLOWLINKC - MENUITEM "�ffne Verweis in &neuem Fenster", IDM_FOLLOWLINKN + MENUITEM "&Öffne Verweis", IDM_FOLLOWLINKC + MENUITEM "Öffne Verweis in &neuem Fenster", IDM_FOLLOWLINKN MENUITEM "Speichere &Ziel als...", IDM_SAVETARGET MENUITEM "&Drucke Ziel", IDM_PRINTTARGET MENUITEM SEPARATOR @@ -162,10 +164,10 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "&Verkn�pfung kopieren", IDM_COPYSHORTCUT - MENUITEM "Ein&f�gen", IDM_PASTE + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "Ein&fügen", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "Zu &Favoriten hinzuf�gen...", IDM_ADDFAVORITES + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDFAVORITES MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "Abspielen", IDM_DYNSRCPLAY @@ -175,8 +177,8 @@ IDR_BROWSE_CONTEXT_MENU MENU POPUP "ART Bild" { - MENUITEM "&�ffne Verweis", IDM_FOLLOWLINKC - MENUITEM "�ffne Verweis in &neuem Fenster", IDM_FOLLOWLINKN + MENUITEM "&Öffne Verweis", IDM_FOLLOWLINKC + MENUITEM "Öffne Verweis in &neuem Fenster", IDM_FOLLOWLINKN MENUITEM "Speichere &Ziel als...", IDM_SAVETARGET MENUITEM "&Drucke Ziel", IDM_PRINTTARGET MENUITEM SEPARATOR @@ -187,14 +189,14 @@ IDR_BROWSE_CONTEXT_MENU MENU MENUITEM SEPARATOR MENUITEM "Aus&schneiden", IDM_CUT MENUITEM "&Kopieren", IDM_COPY - MENUITEM "&Verkn�pfung kopieren", IDM_COPYSHORTCUT - MENUITEM "&Einf�gen", IDM_PASTE + MENUITEM "&Verknüpfung kopieren", IDM_COPYSHORTCUT + MENUITEM "&Einfügen", IDM_PASTE MENUITEM SEPARATOR - MENUITEM "Zu &Favoriten hinzuf�gen...", IDM_ADDFAVORITES + MENUITEM "Zu &Favoriten hinzufügen...", IDM_ADDFAVORITES MENUITEM SEPARATOR MENUITEM "Abspielen", IDM_IMGARTPLAY MENUITEM "Anhalten", IDM_IMGARTSTOP - MENUITEM "R�ckspulen", IDM_IMGARTREWIND + MENUITEM "Rückspulen", IDM_IMGARTREWIND MENUITEM SEPARATOR MENUITEM SEPARATOR MENUITEM "&Eigenschaften", IDM_PROPERTIES

1 0

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

July 9, 2009

Module: wine Branch: master Commit: 4b18e8d21aaf4c7c88094fa99b236d5a6f946a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b18e8d21aaf4c7c88094fa99… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 9 13:53:16 2009 +0200 cmd: Convert the German resources to UTF-8. --- programs/cmd/De.rc | 160 ++++++++++++++++++++++++++-------------------------- 1 files changed, 81 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4b18e8d21aaf4c7c88094…

1 0

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

July 9, 2009

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

1 0

Frédéric Delanoy : winspool.drv: Convert French resources to UTF-8.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: c308622546e7cc86e9ed75a0fe6fa50399f3cf53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c308622546e7cc86e9ed75a0f… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 14:52:53 2009 +0200 winspool.drv: Convert French resources to UTF-8. --- dlls/winspool.drv/Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/winspool.drv/Fr.rc b/dlls/winspool.drv/Fr.rc index 12bf359..40d9c23 100644 --- a/dlls/winspool.drv/Fr.rc +++ b/dlls/winspool.drv/Fr.rc @@ -20,6 +20,9 @@ #include "wspool.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL FILENAME_DIALOG DIALOG LOADONCALL MOVEABLE DISCARDABLE 6, 18, 245, 47 @@ -27,7 +30,7 @@ STYLE DS_CONTEXTHELP | DS_MODALFRAME | DS_SETFONT | DS_SETFOREGROUND | WS_POPUPW CAPTION "Imprimer dans un fichier" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "&Fichier de sortie�:", -1, 7, 13, 194, 13, WS_VISIBLE + LTEXT "&Fichier de sortie :", -1, 7, 13, 194, 13, WS_VISIBLE EDITTEXT EDITBOX, 6, 28, 174, 12, WS_VISIBLE | ES_AUTOHSCROLL DEFPUSHBUTTON "OK", IDOK, 199, 10, 40, 14, WS_VISIBLE PUSHBUTTON "Annuler", IDCANCEL, 199, 27, 40, 14, WS_VISIBLE @@ -36,6 +39,6 @@ END STRINGTABLE DISCARDABLE { IDS_CAPTION "Port local" - IDS_FILE_EXISTS "Le fichier de sortie existe d�j�. Cliquez sur OK pour l'�craser." - IDS_CANNOT_OPEN "Impossible de cr�er le fichier de sortie." + IDS_FILE_EXISTS "Le fichier de sortie existe déjà. Cliquez sur OK pour l'écraser." + IDS_CANNOT_OPEN "Impossible de créer le fichier de sortie." }

1 0

Frédéric Delanoy : mshtml: Convert French resources to UTF-8.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 0a2380f98213906da8483ed594404ec3c753c276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2380f98213906da8483ed59… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Jul 9 14:57:45 2009 +0200 mshtml: Convert French resources to UTF-8. --- dlls/mshtml/Fr.rc | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/Fr.rc b/dlls/mshtml/Fr.rc index 4d45d51..c7671d4 100644 --- a/dlls/mshtml/Fr.rc +++ b/dlls/mshtml/Fr.rc @@ -21,13 +21,16 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { - IDS_HTMLDISABLED "Le rendu HTML est actuellement d�sactiv�." + IDS_HTMLDISABLED "Le rendu HTML est actuellement désactivé." IDS_HTMLDOCUMENT "Document HTML" - IDS_DOWNLOADING "T�l�chargement..." + IDS_DOWNLOADING "Téléchargement..." IDS_INSTALLING "Installation..." } @@ -36,9 +39,9 @@ STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMEN CAPTION "Programme d'installation de Gecko pour Wine" FONT 8, "MS Shell Dlg" { - LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la pr�sence du moteur de rendu Gecko de Mozilla " \ + LTEXT "Cette application essaie d'afficher une page HTML. Wine requiert la présence du moteur de rendu Gecko de Mozilla " \ "pour afficher cette page. Cliquez sur Installer si vous souhaitez que Wine " \ - "t�l�charge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT + "télécharge et installe automatiquement Gecko.", ID_DWL_STATUS, 10, 10, 240, 40, SS_LEFT CONTROL "Progression", ID_DWL_PROGRESS, PROGRESS_CLASSA, WS_BORDER|PBS_SMOOTH, 10, 50, 240, 12 DEFPUSHBUTTON "&Installer", ID_DWL_INSTALL, 200, 70, 50, 15, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Annuler", IDCANCEL, 140, 70, 50, 15, WS_GROUP | WS_TABSTOP @@ -50,9 +53,9 @@ CAPTION "Hyperlien" FONT 8, "MS Shell Dlg" { GROUPBOX "Informations sur l'hyperlien", -1, 5, 5, 190, 55 - LTEXT "&Type�:", -1, 10, 22, 20, 10 + LTEXT "&Type :", -1, 10, 22, 20, 10 COMBOBOX IDC_TYPE, 35, 20, 45, 100, WS_TABSTOP | WS_GROUP | WS_VSCROLL | CBS_DROPDOWNLIST | CBS_HASSTRINGS - LTEXT "&URL�:", -1, 10, 42, 20, 10 + LTEXT "&URL :", -1, 10, 42, 20, 10 EDITTEXT IDC_URL, 35, 40, 150, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP

1 0

Alexandre Julliard : ws2_32: Check buffers before recvmsg() to trigger write watches.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 48656f5596beecd956be60661d5a8e6eab24e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=48656f5596beecd956be60661… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 9 15:21:30 2009 +0200 ws2_32: Check buffers before recvmsg() to trigger write watches. --- dlls/ws2_32/socket.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5516260..464e890 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4409,6 +4409,12 @@ INT WINAPI WSARecvFrom( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, wsa->first_iovec = 0; for (i = 0; i < dwBufferCount; i++) { + /* check buffer first to trigger write watches */ + if (IsBadWritePtr( lpBuffers[i].buf, lpBuffers[i].len )) + { + err = WSAEFAULT; + goto error; + } wsa->iovec[i].iov_base = lpBuffers[i].buf; wsa->iovec[i].iov_len = lpBuffers[i].len; }

1 0

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

July 9, 2009

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

1 0

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

July 9, 2009

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

1 0

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

July 9, 2009

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

1 0

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

July 9, 2009

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

1 0

Alexandre Julliard : winebuild: Dump resource data as dwords to reduce the output file size.
by Alexandre Julliard July 9, 2009

July 9, 2009

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

1 0

Alexandre Julliard : configure: Apply makedep flags when doing automatic dependencies.
by Alexandre Julliard July 9, 2009

July 9, 2009

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

1 0

Francois Gouget : winapi/c_parser: Badly indenting a closing brace should be a warning, not an error.
by Alexandre Julliard July 9, 2009

July 9, 2009

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

1 0

Francois Gouget : winapi/c_parser: Remove special cases for DEFINE_SHLGUID( ) and ICOM_DEFINE().
by Alexandre Julliard July 9, 2009

July 9, 2009

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

1 0

Alexandre Julliard : winetest: Create a separate resource file with the SHA1 build id.
by Alexandre Julliard July 9, 2009

July 9, 2009

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

1 0

Stefan Dösinger : wined3d: Update Nvidia driver versions.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: c0e5c8f4819f3a1cbcd41074da14b987a53947d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0e5c8f4819f3a1cbcd41074d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 7 17:24:34 2009 +0200 wined3d: Update Nvidia driver versions. --- dlls/wined3d/directx.c | 50 ++++++++++++++++++++++++------------------------ 1 files changed, 25 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c7ac0fa..1f5a750 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -800,31 +800,31 @@ static const struct driver_version_information driver_version_table[] = {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE, "NVIDIA GeForce 256", 7, 1, 8, 6 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2_MX, "NVIDIA GeForce2 MX/MX 400", 9, 6, 4, 3 }, {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE2, "NVIDIA GeForce2 GTS/GeForce2 Pro", 7, 1, 8, 6 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 4, 3 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7341 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8044 }, - {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8044 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE3, "NVIDIA GeForce3", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_MX, "NVIDIA GeForce4 MX 460", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE4_TI4200, "NVIDIA GeForce4 Ti 4200", 9, 6, 10, 9371 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5200, "NVIDIA GeForce FX 5200", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5600, "NVIDIA GeForce FX 5600", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCEFX_5800, "NVIDIA GeForce FX 5800", 7, 15, 11, 7516 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6200, "NVIDIA GeForce 6200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6600GT, "NVIDIA GeForce 6600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_6800, "NVIDIA GeForce 6800", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7300, "NVIDIA GeForce Go 7300", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7400, "NVIDIA GeForce Go 7400", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7600, "NVIDIA GeForce 7600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_7800GT, "NVIDIA GeForce 7800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8300GS, "NVIDIA GeForce 8300 GS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600GT, "NVIDIA GeForce 8600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8600MGT, "NVIDIA GeForce 8600M GT", 7, 15, 11, 8585 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_8800GTS, "NVIDIA GeForce 8800 GTS", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9200, "NVIDIA GeForce 9200", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX260, "NVIDIA GeForce GTX 260", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX275, "NVIDIA GeForce GTX 275", 7, 15, 11, 8618 }, + {VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", 7, 15, 11, 8618 }, /* ATI cards. The driver versions are somewhat similar, but not quite the same. Let's hardcode. */ {VENDOR_ATI, CARD_ATI_RADEON_9500, "ATI Radeon 9500", 6, 14, 10, 6764 },

1 0

Stefan Dösinger : wined3d: Add Intel GMA X3100 to our card DB.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: cfd06529809401bbf23c96483d8b54478b89ce28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cfd06529809401bbf23c96483… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jul 7 15:59:50 2009 +0200 wined3d: Add Intel GMA X3100 to our card DB. --- dlls/wined3d/directx.c | 9 +++++++-- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d3f56ce..c7ac0fa 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1858,8 +1858,13 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } break; case VENDOR_INTEL: - if (strstr(gl_renderer, "GMA 950") - || strstr(gl_renderer, "945GM")) + if(strstr(gl_renderer, "X3100")) + { + /* MacOS calls the card GMA X3100, Google findings also suggest the name GM965 */ + gl_info->gl_card = CARD_INTEL_X3100; + vidmem = 128; + } + else if (strstr(gl_renderer, "GMA 950") || strstr(gl_renderer, "945GM")) { /* MacOS calls the card GMA 950, but everywhere else the PCI ID is named 945GM */ gl_info->gl_card = CARD_INTEL_I945GM; diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index ee15d35..42efdf7 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -3378,6 +3378,7 @@ typedef enum _GL_Cards { CARD_INTEL_I915G = 0x2582, CARD_INTEL_I915GM = 0x2592, CARD_INTEL_I945GM = 0x27a2, /* Same as GMA 950?? */ + CARD_INTEL_X3100 = 0x2a02, /* found in macs. Same as GMA 965? */ } GL_Cards; #define WINE_DEFAULT_VIDMEM 64*1024*1024

1 0

Juan Lang : winhttp: Simplify netconn_resolve when using getaddrinfo.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 831c87c141aad3c006ec7765ef1fa93990ab91f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=831c87c141aad3c006ec7765e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:39:10 2009 -0700 winhttp: Simplify netconn_resolve when using getaddrinfo. --- dlls/winhttp/net.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index f362a8b..caa83bf 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -590,17 +590,21 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); return FALSE; } - if (*sa_len < sizeof(struct sockaddr_in)) + if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); freeaddrinfo( res ); return FALSE; } - *sa_len = sizeof(struct sockaddr_in); - memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &((struct sockaddr_in *)sa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - ((struct sockaddr_in *)sa)->sin_family = res->ai_family; - ((struct sockaddr_in *)sa)->sin_port = htons( port ); + *sa_len = res->ai_addrlen; + memcpy( sa, res->ai_addr, res->ai_addrlen ); + /* Copy port */ + switch (res->ai_family) + { + case AF_INET: + ((struct sockaddr_in *)sa)->sin_port = htons( port ); + break; + } freeaddrinfo( res ); #else

1 0

Juan Lang : winhttp: Support IPv6 addresses in open_connection.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: d48eade7fbcfd554a31cbb5bfd1503a555f126ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48eade7fbcfd554a31cbb5bf… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:40:04 2009 -0700 winhttp: Support IPv6 addresses in open_connection. --- dlls/winhttp/request.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d9147d3..af1d5ad 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -710,11 +710,15 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, return ret; } +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + static BOOL open_connection( request_t *request ) { connect_t *connect; const void *addr; - char address[32]; + char address[INET6_ADDRSTRLEN]; WCHAR *addressW; INTERNET_PORT port; socklen_t slen; @@ -733,6 +737,9 @@ static BOOL open_connection( request_t *request ) case AF_INET: addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&connect->sockaddr)->sin6_addr; + break; default: WARN("unsupported address family %d\n", connect->sockaddr.ss_family); return FALSE;

1 0

Stefan Dösinger : wined3d: An indirect address op can adjust min and max at the same time.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 37b73478f1876769943206571f11b4022a7d1f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37b73478f1876769943206571… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 8 09:20:12 2009 +0200 wined3d: An indirect address op can adjust min and max at the same time. --- dlls/wined3d/baseshader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 12fc28c..411665e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -304,10 +304,14 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh { if (shader_type != WINED3D_SHADER_TYPE_PIXEL) { - if (reg->idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + if (reg->idx < ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + { ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = reg->idx; - else if (reg->idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + } + if (reg->idx > ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + { ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = reg->idx; + } } reg_maps->usesrelconstF = TRUE; }

1 0

Juan Lang : winhttp: Support IPv6 in netconn_resolve.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 3d9809b12996b97b3217e4d9eab4743313d962e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d9809b12996b97b3217e4d9e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:41:17 2009 -0700 winhttp: Support IPv6 in netconn_resolve. --- dlls/winhttp/net.c | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index caa83bf..181ff02 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -581,15 +581,25 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, #ifdef HAVE_GETADDRINFO memset( &hints, 0, sizeof(struct addrinfo) ); + /* Prefer IPv4 to IPv6 addresses, since some web servers do not listen on + * their IPv6 addresses even though they have IPv6 addresses in the DNS. + */ hints.ai_family = AF_INET; ret = getaddrinfo( hostname, NULL, &hints, &res ); - heap_free( hostname ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); - return FALSE; + TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(hostnameW), gai_strerror(ret)); + hints.ai_family = AF_INET6; + ret = getaddrinfo( hostname, NULL, &hints, &res ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); + heap_free( hostname ); + return FALSE; + } } + heap_free( hostname ); if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); @@ -604,9 +614,13 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, case AF_INET: ((struct sockaddr_in *)sa)->sin_port = htons( port ); break; + case AF_INET6: + ((struct sockaddr_in6 *)sa)->sin6_port = htons( port ); + break; } freeaddrinfo( res ); + return TRUE; #else EnterCriticalSection( &cs_gethostbyname ); @@ -631,8 +645,8 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, sin->sin_port = htons( port ); LeaveCriticalSection( &cs_gethostbyname ); -#endif return TRUE; +#endif } const void *netconn_get_certificate( netconn_t *conn )

1 0

Juan Lang : winhttp: Convert connect_t' s address type from a struct sockaddr_in to a struct sockaddr_storage.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 646b9cae800a3e7dfb944b132ed7ec94833c994b URL: http://source.winehq.org/git/wine.git/?a=commit;h=646b9cae800a3e7dfb944b132… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:39:37 2009 -0700 winhttp: Convert connect_t's address type from a struct sockaddr_in to a struct sockaddr_storage. --- dlls/winhttp/request.c | 16 +++++++++++++--- dlls/winhttp/winhttp_private.h | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f088c40..d9147d3 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -713,6 +713,7 @@ BOOL WINAPI WinHttpQueryHeaders( HINTERNET hrequest, DWORD level, LPCWSTR name, static BOOL open_connection( request_t *request ) { connect_t *connect; + const void *addr; char address[32]; WCHAR *addressW; INTERNET_PORT port; @@ -727,16 +728,25 @@ static BOOL open_connection( request_t *request ) slen = sizeof(connect->sockaddr); if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen )) return FALSE; - inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); + switch (connect->sockaddr.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&connect->sockaddr)->sin_addr; + break; + default: + WARN("unsupported address family %d\n", connect->sockaddr.ss_family); + return FALSE; + } + inet_ntop( connect->sockaddr.ss_family, addr, address, sizeof(address) ); addressW = strdupAW( address ); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_NAME_RESOLVED, addressW, strlenW(addressW) + 1 ); - TRACE("connecting to %s:%u\n", address, ntohs(connect->sockaddr.sin_port)); + TRACE("connecting to %s:%u\n", address, port); send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_CONNECTING_TO_SERVER, addressW, 0 ); - if (!netconn_create( &request->netconn, connect->sockaddr.sin_family, SOCK_STREAM, 0 )) + if (!netconn_create( &request->netconn, connect->sockaddr.ss_family, SOCK_STREAM, 0 )) { heap_free( addressW ); return FALSE; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 750acf5..2143953 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -110,7 +110,7 @@ typedef struct LPWSTR password; INTERNET_PORT hostport; INTERNET_PORT serverport; - struct sockaddr_in sockaddr; + struct sockaddr_storage sockaddr; } connect_t; typedef struct

1 0

Juan Lang : winhttp: Change type of netconn_resolve from struct sockaddr_in * to struct sockaddr * .
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: cc619639d2dcc4d375ec5fcef7a46216b3c113b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc619639d2dcc4d375ec5fcef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Jul 8 10:35:01 2009 -0700 winhttp: Change type of netconn_resolve from struct sockaddr_in * to struct sockaddr *. --- dlls/winhttp/net.c | 29 ++++++++++++++++++++++------- dlls/winhttp/request.c | 4 +++- dlls/winhttp/winhttp_private.h | 2 +- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 79e6789..f362a8b 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -566,7 +566,7 @@ DWORD netconn_set_timeout( netconn_t *netconn, BOOL send, int value ) return ERROR_SUCCESS; } -BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in *sa ) +BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr *sa, socklen_t *sa_len ) { char *hostname; #ifdef HAVE_GETADDRINFO @@ -574,6 +574,7 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * int ret; #else struct hostent *he; + struct sockaddr_in *sin = (struct sockaddr_in *)sa; #endif if (!(hostname = strdupWA( hostnameW ))) return FALSE; @@ -589,10 +590,17 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * TRACE("failed to get address of %s (%s)\n", debugstr_w(hostnameW), gai_strerror(ret)); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + freeaddrinfo( res ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sa->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - sa->sin_family = res->ai_family; - sa->sin_port = htons( port ); + memcpy( &((struct sockaddr_in *)sa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); + ((struct sockaddr_in *)sa)->sin_family = res->ai_family; + ((struct sockaddr_in *)sa)->sin_port = htons( port ); freeaddrinfo( res ); #else @@ -606,10 +614,17 @@ BOOL netconn_resolve( WCHAR *hostnameW, INTERNET_PORT port, struct sockaddr_in * LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + LeaveCriticalSection( &cs_gethostbyname ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( sa, 0, sizeof(struct sockaddr_in) ); - memcpy( &sa->sin_addr, he->h_addr, he->h_length ); - sa->sin_family = he->h_addrtype; - sa->sin_port = htons( port ); + memcpy( &sin->sin_addr, he->h_addr, he->h_length ); + sin->sin_family = he->h_addrtype; + sin->sin_port = htons( port ); LeaveCriticalSection( &cs_gethostbyname ); #endif diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index ddfac13..f088c40 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -716,6 +716,7 @@ static BOOL open_connection( request_t *request ) char address[32]; WCHAR *addressW; INTERNET_PORT port; + socklen_t slen; if (netconn_connected( &request->netconn )) return TRUE; @@ -724,7 +725,8 @@ static BOOL open_connection( request_t *request ) send_callback( &request->hdr, WINHTTP_CALLBACK_STATUS_RESOLVING_NAME, connect->servername, strlenW(connect->servername) + 1 ); - if (!netconn_resolve( connect->servername, port, &connect->sockaddr )) return FALSE; + slen = sizeof(connect->sockaddr); + if (!netconn_resolve( connect->servername, port, (struct sockaddr *)&connect->sockaddr, &slen )) return FALSE; inet_ntop( connect->sockaddr.sin_family, &connect->sockaddr.sin_addr, address, sizeof(address) ); addressW = strdupAW( address ); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 823d0ae..750acf5 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -211,7 +211,7 @@ BOOL netconn_get_next_line( netconn_t *, char *, DWORD * ); BOOL netconn_init( netconn_t *, BOOL ); BOOL netconn_query_data_available( netconn_t *, DWORD * ); BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ); -BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_in * ); +BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr *, socklen_t * ); BOOL netconn_secure_connect( netconn_t * ); BOOL netconn_send( netconn_t *, const void *, size_t, int, int * ); DWORD netconn_set_timeout( netconn_t *, BOOL, int );

1 0

Francois Gouget : winapi: Modify parse_c_typedef() to get rid of the $finished variable.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: def8d4f40157bafd7a4ee0553750252ccfb6d98c URL: http://source.winehq.org/git/wine.git/?a=commit;h=def8d4f40157bafd7a4ee0553… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:11 2009 +0200 winapi: Modify parse_c_typedef() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 60 ++++++++++++++++----------------------------- 1 files changed, 21 insertions(+), 39 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 27f5317..3a00039 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1569,60 +1569,49 @@ sub parse_c_typedef($$$$) my $line = $$refline; my $column = $$refcolumn; - my $type; - if (!$self->_parse_c("typedef", \$_, \$line, \$column)) { return 0; } - my $finished = 0; - - if ($finished) { - # Nothing - } elsif ($self->parse_c_enum(\$_, \$line, \$column)) { - $finished = 1; - } - - my $kind; - my $_name; - my @field_type_names; - my @field_names; - my @names; - if ($finished) { - # Nothing - } elsif ($self->parse_c_struct_union(\$_, \$line, \$column, - \$kind, \$_name, \@field_type_names, \@field_names, \@names)) + my ($kind, $name, @field_type_names, @field_names, @names); + my ($linkage, $type_name); + if ($self->parse_c_enum(\$_, \$line, \$column)) +{ + # Nothing to do + } + elsif ($self->parse_c_struct_union(\$_, \$line, \$column, + \$kind, \$name, \@field_type_names, \@field_names, \@names)) { my $base_name; - foreach my $name (@names) + foreach my $_name (@names) { - if ($name =~ /^\w+$/) + if ($_name =~ /^\w+$/) { - $base_name = $name; + $base_name = $_name; last; } } - $base_name="$kind $_name" if (!defined $base_name and defined $_name); + $base_name="$kind $name" if (!defined $base_name and defined $name); $base_name=$kind if (!defined $base_name); - foreach my $name (@names) { - if ($name =~ /^\w+$/) { + foreach my $_name (@names) { + if ($_name =~ /^\w+$/) { my $type = $self->{CREATE_TYPE}(); $type->kind($kind); - $type->_name($_name); - $type->name($name); + $type->_name($name); + $type->name($_name); $type->field_type_names([@field_type_names]); $type->field_names([@field_names]); $self->{FOUND_TYPE}($type); - } elsif ($name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { + } elsif ($_name =~ /^(\*+)\s*(?:RESTRICTED_POINTER\s+)?(\w+)$/) { my $type_name = "$base_name $1"; - $name = $2; + $_name = $2; my $type = $self->{CREATE_TYPE}(); $type->kind(""); - $type->name($name); + $type->name($_name); $type->field_type_names([$type_name]); $type->field_names([""]); @@ -1631,16 +1620,9 @@ sub parse_c_typedef($$$$) $self->_parse_c_error($_, $line, $column, "typedef 2"); } } - - $finished = 1; } - - my $linkage; - my $type_name; - my $name; - if ($finished) { - # Nothing - } elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) { + elsif ($self->parse_c_variable(\$_, \$line, \$column, \$linkage, \$type_name, \$name)) + { $type_name =~ s/\s+/ /g; if(defined($type_name) && defined($name)) {

1 0

Henri Verbeet : wined3d: Rename "SHADER_BUFFER" to something sane.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 40b411958bd6dba819d92eea8b796da9762de804 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40b411958bd6dba819d92eea8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:08 2009 +0200 wined3d: Rename "SHADER_BUFFER" to something sane. --- dlls/wined3d/arb_program_shader.c | 140 +++++++++++++++++++------------------ dlls/wined3d/baseshader.c | 12 ++-- dlls/wined3d/glsl_shader.c | 50 +++++++------- dlls/wined3d/wined3d_private.h | 27 ++++---- 4 files changed, 116 insertions(+), 113 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=40b411958bd6dba819d92…

1 0

Henri Verbeet : wined3d: Reuse the shader buffer between shaders.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: bddc4d3f0d5b999d56a7049f34272cd7d1dae692 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bddc4d3f0d5b999d56a7049f3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:07 2009 +0200 wined3d: Reuse the shader buffer between shaders. --- dlls/wined3d/baseshader.c | 9 +++- dlls/wined3d/glsl_shader.c | 117 +++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 65 insertions(+), 62 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bddc4d3f0d5b999d56a70…

1 0

Henri Verbeet : wined3d: Allow shader_buffer_init() to fail.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 483d552e219310ef9962a8ce0e365c8f5d2c0663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d552e219310ef9962a8ce0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:09 2009 +0200 wined3d: Allow shader_buffer_init() to fail. --- dlls/wined3d/arb_program_shader.c | 26 ++++++++++++++++++++++---- dlls/wined3d/baseshader.c | 9 ++++++++- dlls/wined3d/glsl_shader.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c0ad40..e48d5e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4006,7 +4006,12 @@ static struct arb_ps_compiled_shader *find_arb_pshader(IWineD3DPixelShaderImpl * pixelshader_update_samplers(&shader->baseShader.reg_maps, ((IWineD3DDeviceImpl *)shader->baseShader.device)->stateBlock->textures); - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_pshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -4076,7 +4081,12 @@ static struct arb_vs_compiled_shader *find_arb_vshader(IWineD3DVertexShaderImpl shader_data->gl_shaders[shader_data->num_gl_shaders].args = *args; - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } + ret = shader_arb_generate_vshader(shader, &buffer, args, &shader_data->gl_shaders[shader_data->num_gl_shaders]); shader_buffer_free(&buffer); @@ -5541,7 +5551,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, IWi } /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } shader_addline(&buffer, "!!ARBfp1.0\n"); @@ -6304,7 +6318,11 @@ static GLuint gen_yuv_shader(IWineD3DDeviceImpl *device, enum yuv_fixup yuv_fixu struct arbfp_blit_priv *priv = device->blit_priv; /* Shader header */ - shader_buffer_init(&buffer); + if (!shader_buffer_init(&buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + return 0; + } ENTER_GL(); GL_EXTCALL(glGenProgramsARB(1, &shader)); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 2f9410a..3590d21 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -146,10 +146,17 @@ void shader_buffer_clear(struct wined3d_shader_buffer *buffer) buffer->newline = TRUE; } -void shader_buffer_init(struct wined3d_shader_buffer *buffer) +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer) { buffer->buffer = HeapAlloc(GetProcessHeap(), 0, SHADER_PGMSIZE); + if (!buffer->buffer) + { + ERR("Failed to allocate shader buffer memory.\n"); + return FALSE; + } + shader_buffer_clear(buffer); + return TRUE; } void shader_buffer_free(struct wined3d_shader_buffer *buffer) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3433201..07b1cb2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4456,7 +4456,11 @@ static HRESULT shader_glsl_alloc(IWineD3DDevice *iface) { struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); SIZE_T stack_size = wined3d_log2i(max(GL_LIMITS(vshader_constantsF), GL_LIMITS(pshader_constantsF))) + 1; - shader_buffer_init(&priv->shader_buffer); + if (!shader_buffer_init(&priv->shader_buffer)) + { + ERR("Failed to initialize shader buffer.\n"); + goto fail; + } priv->stack = HeapAlloc(GetProcessHeap(), 0, stack_size * sizeof(*priv->stack)); if (!priv->stack) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ecc3ee3..164e3bb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2601,7 +2601,7 @@ typedef struct IWineD3DBaseShaderImpl { } IWineD3DBaseShaderImpl; void shader_buffer_clear(struct wined3d_shader_buffer *buffer); -void shader_buffer_init(struct wined3d_shader_buffer *buffer); +BOOL shader_buffer_init(struct wined3d_shader_buffer *buffer); void shader_buffer_free(struct wined3d_shader_buffer *buffer); void shader_cleanup(IWineD3DBaseShader *iface); void shader_dump_src_param(const struct wined3d_shader_src_param *param,

1 0

Francois Gouget : winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 6f5ae45846584223f0cc97af6db87668235f1105 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f5ae45846584223f0cc97af6… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:52:08 2009 +0200 winapi: Introduce a pseudo-loop in parse_c_variable() to get rid of the $finished variable. --- tools/winapi/c_parser.pm | 212 ++++++++++++++++++++++------------------------ 1 files changed, 103 insertions(+), 109 deletions(-) diff --git a/tools/winapi/c_parser.pm b/tools/winapi/c_parser.pm index 5841185..27f5317 100644 --- a/tools/winapi/c_parser.pm +++ b/tools/winapi/c_parser.pm @@ -1710,126 +1710,120 @@ sub parse_c_variable($$$$$$$) } } - my $finished = 0; - - if($finished) { - # Nothing - } elsif(/^$/) { - return 0; - } elsif (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); - - if(defined($_name)) { - $type = "$kind $_name { }"; - } else { - $type = "$kind { }"; - } + return 0 if(/^$/); - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { - $type = "$sign$1"; - $name = $2; - - if (defined($3)) { - my $bits = $4; - local $_ = $3; - if (/^\[/) { - $type .= $_; - } elsif (/^:/) { - $type .= ":$bits"; - } elsif (/^\{/) { - # Nothing - } - } - - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { - $type = "$sign$1:$2"; - $name = ""; - $type = $self->_format_c_type($type); - - $finished = 1; - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { - $type = $self->_format_c_type("$sign$1$3"); - $name = $2; - - $finished = 1; - } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific - $type = $match; - $finished = 1; - } else { - $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); - $finished = 1; - } - - if($finished) { - # Nothing - } elsif($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific - $type = $match; - $finished = 1; - } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific - \$_, \$line, \$column, \$match)) + finished: while (1) { - $type = $match; - $finished = 1; - } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { - $type = $match; - $finished = 1; - } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { - my $kind = $1; - my $_name = $2; - $self->_update_c_position($&, \$line, \$column); + if (s/^(enum\s+|interface\s+|struct\s+|union\s+)((?:MSVCRT|WS)$\s*\w+\s*$|\w+)?\s*\{\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "$kind $_name { }"; + } else { + $type = "$kind { }"; + } - if(defined($_name)) { - $type = "struct $_name { }"; - } else { - $type = "struct { }"; - } - } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { - $type = $&; - $type =~ s/\s//g; - } else { - return 0; - } + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s+DECLSPEC_ALIGN$.*?$|\s*(?:const\s*|volatile\s*)?\*)*)\s*(\w+)\s*(\[.*?\]$|:\s*(\d+)$|\{)?//s) { + $type = "$sign$1"; + $name = $2; + + if (defined($3)) { + my $bits = $4; + local $_ = $3; + if (/^\[/) { + $type .= $_; + } elsif (/^:/) { + $type .= ":$bits"; + } elsif (/^\{/) { + # Nothing + } + } - # $output->write("*** $type: '$_'\n"); + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*)\s*:\s*(\d+)$//s) { + $type = "$sign$1:$2"; + $name = ""; + $type = $self->_format_c_type($type); + + last finished; + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+\b(?:\s*\*)*\s*$\s*(?:$CALL_CONVENTION)?(?:\s*\*)*)\s*(\w+)\s*($\s*$.*?$)$//s) { + $type = $self->_format_c_type("$sign$1$3"); + $name = $2; + + last finished; + } elsif($self->_parse_c('DEFINE_GUID', \$_, \$line, \$column, \$match)) { # Windows specific + $type = $match; + last finished; + } else { + $self->_parse_c_warning($_, $line, $column, "variable", "'$_'"); + last finished; + } - # $self->_parse_c_warning($_, $line, $column, "variable2", ""); + if($self->_parse_c('SEQ_DEFINEBUF', \$_, \$line, \$column, \$match)) { # Linux specific + $type = $match; + last finished; + } elsif($self->_parse_c('DEFINE_REGS_ENTRYPOINT_\w+|DPQ_DECL_\w+|HANDLER_DEF|IX86_ONLY', # Wine specific + \$_, \$line, \$column, \$match)) + { + $type = $match; + last finished; + } elsif($self->_parse_c('(?:struct\s+)?ICOM_VTABLE\s*$\w+$', \$_, \$line, \$column, \$match)) { + $type = $match; + last finished; + } elsif(s/^(enum|interface|struct|union)(?:\s+(\w+))?\s*\{.*?\}\s*//s) { + my $kind = $1; + my $_name = $2; + $self->_update_c_position($&, \$line, \$column); + + if(defined($_name)) { + $type = "struct $_name { }"; + } else { + $type = "struct { }"; + } + } elsif(s/^((?:enum\s+|interface\s+|struct\s+|union\s+)?\w+)\s*(?:\*\s*)*//s) { + $type = $&; + $type =~ s/\s//g; + } else { + return 0; + } - if($finished) { - # Nothing - } elsif(s/^WINAPI\s*//) { - $self->_update_c_position($&, \$line, \$column); - } + # $output->write("*** $type: '$_'\n"); - if($finished) { - # Nothing - } elsif(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { - $self->_update_c_position($&, \$line, \$column); + # $self->_parse_c_warning($_, $line, $column, "variable2", ""); - $name = $1; - $name =~ s/\s//g; + if(s/^WINAPI\s*//) { + $self->_update_c_position($&, \$line, \$column); + } - $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); - if(s/^\)//) { $column++; } - $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + if(s/^($(?:$CALL_CONVENTION)?\s*\*?\s*(?:$CALL_CONVENTION)?\w+\s*(?:\[[^\]]*\]\s*)*$)\s*$//) { + $self->_update_c_position($&, \$line, \$column); - if(!s/^(?:=\s*|,\s*|$)//) { - return 0; - } - } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { - $self->_update_c_position($&, \$line, \$column); + $name = $1; + $name =~ s/\s//g; - $name = $1; - $name =~ s/\s//g; - } elsif(/^$/) { - $name = ""; - } else { - return 0; + $self->_parse_c_until_one_of("\$", \$_, \$line, \$column); + if(s/^\)//) { $column++; } + $self->_parse_c_until_one_of("\\S", \$_, \$line, \$column); + + if(!s/^(?:=\s*|,\s*|$)//) { + return 0; + } + } elsif(s/^(?:\*\s*)*(?:const\s+|volatile\s+)?(\w+)\s*(?:\[[^\]]*\]\s*)*\s*(?:=\s*|,\s*|$)//) { + $self->_update_c_position($&, \$line, \$column); + + $name = $1; + $name =~ s/\s//g; + } elsif(/^$/) { + $name = ""; + } else { + return 0; + } + last finished; } # $output->write("$type: $name: '$_'\n");

1 0

Anders Jonsson : winemine: Add Swedish translation.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: c2ef4e79fcbd1bd7776abdf2aaa89404b2d0fa4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2ef4e79fcbd1bd7776abdf2a… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Thu Jul 9 09:52:01 2009 +0200 winemine: Add Swedish translation. --- programs/winemine/Makefile.in | 1 + programs/winemine/Sv.rc | 98 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 99 insertions(+), 0 deletions(-) diff --git a/programs/winemine/Makefile.in b/programs/winemine/Makefile.in index 7e5d91b..7146d92 100644 --- a/programs/winemine/Makefile.in +++ b/programs/winemine/Makefile.in @@ -30,6 +30,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Tr.rc \ Zh.rc \ rsrc.rc diff --git a/programs/winemine/Sv.rc b/programs/winemine/Sv.rc new file mode 100644 index 0000000..498feb7 --- /dev/null +++ b/programs/winemine/Sv.rc @@ -0,0 +1,98 @@ +/* + * WineMine + * Swedish Language Support + * + * Copyright 2000 Joshua Thielen + * Copyright 2003 Marcelo Duarte + * Copyright 2008 Daniel Nylander <po(a)danielnylander.se> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE { + IDS_APPNAME, "Minor" + IDS_NOBODY, "Ingen" + IDS_ABOUT, "Copyright 2000 Joshua Thielen" +} + +MENU_WINEMINE MENU DISCARDABLE +{ + POPUP "A&lternativ" { + MENUITEM "&Nytt\tF2", IDM_NEW + MENUITEM SEPARATOR + MENUITEM "&Markera fråga", IDM_MARKQ + MENUITEM SEPARATOR + MENUITEM "Ny&börjare", IDM_BEGINNER + MENUITEM "&Avancerad", IDM_ADVANCED + MENUITEM "&Expert", IDM_EXPERT + MENUITEM "An&passad...", IDM_CUSTOM + MENUITEM SEPARATOR + MENUITEM "A&vsluta\tAlt+X", IDM_EXIT + } + POPUP "&Info" { + MENUITEM "&Snabbaste tider...", IDM_TIMES + MENUITEM "&Om", IDM_ABOUT + } +} + +DLG_TIMES DIALOG DISCARDABLE 0, 0, 160, 80 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Snabbaste tider" +{ + GROUPBOX "Snabbaste tider", -1, 10, 10, 140, 45 + LTEXT "Nybörjare", -1, 20, 20, 40, 8 + LTEXT "Avancerad", -1, 20, 30, 40, 8 + LTEXT "Expert", -1, 20, 40, 40, 8 + LTEXT "999", IDC_TIME1, 70, 20, 15, 8 + LTEXT "999", IDC_TIME2, 70, 30, 15, 8 + LTEXT "999", IDC_TIME3, 70, 40, 15, 8 + LTEXT "", IDC_NAME1, 90, 20, 55, 8 + LTEXT "", IDC_NAME2, 90, 30, 55, 8 + LTEXT "", IDC_NAME3, 90, 40, 55, 8 + DEFPUSHBUTTON "OK", IDOK, 55, 60, 50, 15 +} + +DLG_CONGRATS DIALOG DISCARDABLE 0, 0, 160, 60 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Gratulerar!" +{ + LTEXT "Ange ditt namn", -1, 10, 10, 150, 10 + EDITTEXT IDC_EDITNAME, 25, 20, 110, 12 + DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15 +} + +DLG_CUSTOM DIALOG DISCARDABLE 0, 0, 100, 100 +STYLE DS_MODALFRAME | DS_3DLOOK | + WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP +CAPTION "Anpassat spel" +{ + LTEXT "Rader", -1, 5, 5, 30, 10 + LTEXT "Kolumner", -1, 5, 35, 35, 10 + LTEXT "Minor", -1, 5, 65, 30, 10 + EDITTEXT IDC_EDITROWS, 5, 15, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITCOLS, 5, 45, 20, 12, ES_NUMBER + EDITTEXT IDC_EDITMINES, 5, 75, 20, 12, ES_NUMBER + DEFPUSHBUTTON "OK", IDOK, 40, 30, 50, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 40, 50, 50, 15 +}

1 0

Henri Verbeet : wined3d: Fix some cast-qual warnings.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 9cf78880022626080d6ee69a2ed4b7cd7e436d48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf78880022626080d6ee69a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:11 2009 +0200 wined3d: Fix some cast-qual warnings. --- dlls/wined3d/baseshader.c | 8 ++++---- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/glsl_shader.c | 6 +++--- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 3590d21..12fc28c 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -750,7 +750,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } reg_maps->loop_depth = max_loop_depth; - This->baseShader.functionLength = ((char *)pToken - (char *)byte_code); + This->baseShader.functionLength = ((const char *)pToken - (const char *)byte_code); return WINED3D_OK; } @@ -925,13 +925,13 @@ static void shader_dump_register(const struct wined3d_shader_register *reg, switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)reg->immconst_data); + TRACE("%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index bed6d84..bd5ddba 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -577,7 +577,7 @@ static ULONG STDMETHODCALLTYPE buffer_AddRef(IWineD3DBuffer *iface) } /* Context activation is done by the caller. */ -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This) +BYTE *buffer_get_sysmem(struct wined3d_buffer *This) { /* AllocatedMemory exists if the buffer is double buffered or has no buffer object at all */ if(This->resource.allocatedMemory) return This->resource.allocatedMemory; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 34266e9..82a5fb8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1335,13 +1335,13 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - sprintf(register_name, "%.8e", *(float *)reg->immconst_data); + sprintf(register_name, "%.8e", *(const float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: sprintf(register_name, "vec4(%.8e, %.8e, %.8e, %.8e)", - *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], - *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); + *(const float *)&reg->immconst_data[0], *(const float *)&reg->immconst_data[1], + *(const float *)&reg->immconst_data[2], *(const float *)&reg->immconst_data[3]); break; default: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 164e3bb..d8c56e7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2395,7 +2395,7 @@ struct wined3d_buffer extern const IWineD3DBufferVtbl wined3d_buffer_vtbl; const BYTE *buffer_get_memory(IWineD3DBuffer *iface, UINT offset, GLuint *buffer_object); -const BYTE *buffer_get_sysmem(struct wined3d_buffer *This); +BYTE *buffer_get_sysmem(struct wined3d_buffer *This); /* IWineD3DRendertargetView */ struct wined3d_rendertarget_view

1 0

Anders Jonsson : winemine: Add ellipses for menu entries that open new dialog windows.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 046e00beeffc570b780a6b8dc7e6a57b686d0a26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=046e00beeffc570b780a6b8dc… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Wed Mar 4 01:59:35 2009 +0100 winemine: Add ellipses for menu entries that open new dialog windows. --- programs/winemine/En.rc | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winemine/En.rc b/programs/winemine/En.rc index 634a3e8..dfb37e5 100644 --- a/programs/winemine/En.rc +++ b/programs/winemine/En.rc @@ -40,12 +40,12 @@ MENU_WINEMINE MENU DISCARDABLE MENUITEM "&Beginner", IDM_BEGINNER MENUITEM "&Advanced", IDM_ADVANCED MENUITEM "&Expert", IDM_EXPERT - MENUITEM "&Custom", IDM_CUSTOM + MENUITEM "&Custom...", IDM_CUSTOM MENUITEM SEPARATOR MENUITEM "E&xit\tAlt+X", IDM_EXIT } POPUP "&Info" { - MENUITEM "&Fastest Times", IDM_TIMES + MENUITEM "&Fastest Times...", IDM_TIMES MENUITEM "&About", IDM_ABOUT } }

1 0

Henri Verbeet : wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader().
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 95d9b1271fd513dc63eb27adef20079e53c8ab3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=95d9b1271fd513dc63eb27ade… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 9 09:56:10 2009 +0200 wined3d: Get rid of the useless "fragcolor" variable in shader_glsl_generate_pshader(). --- dlls/wined3d/glsl_shader.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07b1cb2..34266e9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3676,7 +3676,6 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct { const struct shader_reg_maps *reg_maps = &This->baseShader.reg_maps; CONST DWORD *function = This->baseShader.function; - const char *fragcolor; const WineD3D_GL_Info *gl_info = &((IWineD3DDeviceImpl *)This->baseShader.device)->adapter->gl_info; struct shader_glsl_ctx_priv priv_ctx; @@ -3718,16 +3717,15 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - fragcolor = "gl_FragData[0]"; if(args->srgb_correction) { - shader_addline(buffer, "tmp0.xyz = pow(%s.xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", - fragcolor, srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", + srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, srgb_sub_high, srgb_sub_high, srgb_sub_high); - shader_addline(buffer, "tmp1.xyz = %s.xyz * srgb_mul_low.xyz;\n", fragcolor); - shader_addline(buffer, "%s.x = %s.x < srgb_comparison.x ? tmp1.x : tmp0.x;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.y = %s.y < srgb_comparison.y ? tmp1.y : tmp0.y;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s.z = %s.z < srgb_comparison.z ? tmp1.z : tmp0.z;\n", fragcolor, fragcolor); - shader_addline(buffer, "%s = clamp(%s, 0.0, 1.0);\n", fragcolor, fragcolor); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * srgb_mul_low.xyz;\n"); + shader_addline(buffer, "gl_FragData[0].x = gl_FragData[0].x < srgb_comparison.x ? tmp1.x : tmp0.x;\n"); + shader_addline(buffer, "gl_FragData[0].y = gl_FragData[0].y < srgb_comparison.y ? tmp1.y : tmp0.y;\n"); + shader_addline(buffer, "gl_FragData[0].z = gl_FragData[0].z < srgb_comparison.z ? tmp1.z : tmp0.z;\n"); + shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } /* Pixel shader < 3.0 do not replace the fog stage. * This implements linear fog computation and blending. @@ -3743,19 +3741,19 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "float fogstart = -1.0 / (gl_Fog.end - gl_Fog.start);\n"); shader_addline(buffer, "float fogend = gl_Fog.end * -fogstart;\n"); shader_addline(buffer, "float Fog = clamp(gl_FogFragCoord * fogstart + fogend, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP: /* Fog = e^(-gl_Fog.density * gl_FogFragCoord) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; case FOG_EXP2: /* Fog = e^(-(gl_Fog.density * gl_FogFragCoord)^2) */ shader_addline(buffer, "float Fog = exp(-gl_Fog.density * gl_Fog.density * gl_FogFragCoord * gl_FogFragCoord);\n"); shader_addline(buffer, "Fog = clamp(Fog, 0.0, 1.0);\n"); - shader_addline(buffer, "%s.xyz = mix(gl_Fog.color.xyz, %s.xyz, Fog);\n", fragcolor, fragcolor); + shader_addline(buffer, "gl_FragData[0].xyz = mix(gl_Fog.color.xyz, gl_FragData[0].xyz, Fog);\n"); break; } }

1 0

Nikolay Sivov : comctl32/listview: Fix selection and focus rectangles on reordered list (report mode).
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 6c0c08af02cfd4054073e683c3d7a1120bd990fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c0c08af02cfd4054073e683c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 02:58:11 2009 +0400 comctl32/listview: Fix selection and focus rectangles on reordered list (report mode). --- dlls/comctl32/listview.c | 59 ++++++++++++++++++++++++++++++--------------- 1 files changed, 39 insertions(+), 20 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index cd1d0d5..73781b2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4120,6 +4120,45 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS if (nSubItem && infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) nmlvcd.clrTextBk = CLR_NONE; + /* FIXME: temporary hack */ + rcSelect.left = rcLabel.left; + + /* draw the selection background, if we're drawing the main item */ + if (nSubItem == 0) + { + /* in icon mode, the label rect is really what we want to draw the + * background for */ + if (infoPtr->uView == LV_VIEW_ICON) + rcSelect = rcLabel; + + if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) + { + /* we have to update left focus bound too if item isn't in leftmost column + and reduce right box bound */ + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + { + INT leftmost; + + if ((leftmost = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, 0, 0))) + { + INT Originx = pos.x - LISTVIEW_GetColumnInfo(infoPtr, 0)->rcHeader.left; + INT index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + + rcBox.right = LISTVIEW_GetColumnInfo(infoPtr, index)->rcHeader.right + Originx; + rcSelect.left = LISTVIEW_GetColumnInfo(infoPtr, leftmost)->rcHeader.left + Originx; + } + } + + rcSelect.right = rcBox.right; + } + + if (nmlvcd.clrTextBk != CLR_NONE) + ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, NULL, 0, NULL); + /* store new focus rectangle */ + if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; + } + /* state icons */ if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && (nSubItem == 0)) { @@ -4144,26 +4183,6 @@ static BOOL LISTVIEW_DrawItem(LISTVIEW_INFO *infoPtr, HDC hdc, INT nItem, INT nS /* Don't bother painting item being edited */ if (infoPtr->hwndEdit && nItem == infoPtr->nEditLabelItem && nSubItem == 0) goto postpaint; - - /* FIXME: temporary hack */ - rcSelect.left = rcLabel.left; - - /* draw the selection background, if we're drawing the main item */ - if (nSubItem == 0) - { - /* in icon mode, the label rect is really what we want to draw the - * background for */ - if (infoPtr->uView == LV_VIEW_ICON) - rcSelect = rcLabel; - - if (infoPtr->uView == LV_VIEW_DETAILS && (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)) - rcSelect.right = rcBox.right; - - if (nmlvcd.clrTextBk != CLR_NONE) - ExtTextOutW(hdc, rcSelect.left, rcSelect.top, ETO_OPAQUE, &rcSelect, 0, 0, 0); - /* store new focus rectangle */ - if (infoPtr->nFocusedItem == nItem) infoPtr->rcFocus = rcSelect; - } /* figure out the text drawing flags */ uFormat = (infoPtr->uView == LV_VIEW_ICON ? (lprcFocus ? LV_FL_DT_FLAGS : LV_ML_DT_FLAGS) : LV_SL_DT_FLAGS);

1 0

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

July 9, 2009

Module: wine Branch: master Commit: 45e9d0d2cbf537137284c96ec841e73f7d8881f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e9d0d2cbf537137284c96ec… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:24:55 2009 +0200 shlwapi: Fix French translation. --- dlls/shlwapi/shlwapi_Fr.rc | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/shlwapi_Fr.rc b/dlls/shlwapi/shlwapi_Fr.rc index 26cada0..745b4fd 100644 --- a/dlls/shlwapi/shlwapi_Fr.rc +++ b/dlls/shlwapi/shlwapi_Fr.rc @@ -20,11 +20,14 @@ #include "resource.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL IDD_ERR_DIALOG DIALOG MOVEABLE DISCARDABLE 0, 0, 220, 60 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Erreur!" +CAPTION "Erreur !" FONT 8, "MS Shell Dlg" { LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20

1 0

Hwang YunSong : cryptdlg: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 246c99916d73028709d7f4da876cc71f4554e8a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=246c99916d73028709d7f4da8… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:08:31 2009 +0900 cryptdlg: Updated Korean resource. --- dlls/cryptdlg/cryptdlg_Ko.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Ko.rc b/dlls/cryptdlg/cryptdlg_Ko.rc index 548a74d..e9a6d9d 100644 --- a/dlls/cryptdlg/cryptdlg_Ko.rc +++ b/dlls/cryptdlg/cryptdlg_Ko.rc @@ -29,7 +29,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "��å �ĺ��: " IDS_POLICY_QUALIFIER_INFO "��å �� " IDS_POLICY_QUALIFIER_ID "��å �� ̵�=" - IDS_CPS "CPS" + IDS_CPS "CPS"/*�� */ IDS_USER_NOTICE "�� " IDS_QUALIFIER "��" IDS_NOTICE_REF "�� "

1 0

Rein Klazes : comdlg32: Fix a problem with resizing a customized file dialog.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: a73175fd11f398184deb316bde1daac9ec682e5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a73175fd11f398184deb316bd… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Jul 9 09:36:04 2009 +0200 comdlg32: Fix a problem with resizing a customized file dialog. --- dlls/comdlg32/filedlg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index eb92c0d..faed51a 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1117,9 +1117,6 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) if(fodInfos->DlgInfos.hwndCustomDlg && (fodInfos->ofnInfos->Flags & (OFN_ENABLETEMPLATE | OFN_ENABLETEMPLATEHANDLE))) { - GetClientRect(hwnd, &rc); - DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, - 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); for( ctrl = GetWindow( fodInfos->DlgInfos.hwndCustomDlg, GW_CHILD); ctrl ; ctrl = GetWindow( ctrl, GW_HWNDNEXT)) { @@ -1142,6 +1139,11 @@ static LRESULT FILEDLG95_OnWMSize(HWND hwnd, WPARAM wParam, LPARAM lParam) SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); } } + /* size the custom dialog at the end: some applications do some + * control re-arranging at this point */ + GetClientRect(hwnd, &rc); + DeferWindowPos( hdwp,fodInfos->DlgInfos.hwndCustomDlg, NULL, + 0, 0, rc.right, rc.bottom, SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); } EndDeferWindowPos( hdwp); /* should not be needed */

1 0

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

July 9, 2009

Module: wine Branch: master Commit: dc4463e142ea9e041bdf9d02396c62ef4c3d17be URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc4463e142ea9e041bdf9d023… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 15:32:48 2009 +0200 msrle32: Fix French translation. --- dlls/msrle32/msrle_Fr.rc | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/msrle32/msrle_Fr.rc b/dlls/msrle32/msrle_Fr.rc index 001d37e..f45892c 100644 --- a/dlls/msrle32/msrle_Fr.rc +++ b/dlls/msrle32/msrle_Fr.rc @@ -1,7 +1,7 @@ /* * French resource file for MS-RLE * - * Copyright 2002 Michael G�nnewig + * Copyright 2002 Michael Günnewig * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,11 +20,14 @@ #include "msrle_private.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_NAME "WINE-MS-RLE" - IDS_DESCRIPTION "Wine: d�codeur/encodeur vid�o MS-RLE" - IDS_ABOUT "Wine: d�codeur/encodeur vid�o MS-RLE\nCopyright 2002 par Michael G�nnewig" + IDS_DESCRIPTION "Wine : codec vidéo MS-RLE" + IDS_ABOUT "Wine : codec vidéo MS-RLE\nCopyright 2002 par Michael Günnewig" }

1 0

Frédéric Delanoy : appwiz.cpl: Fix French translation & UI display.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 1cd85126950e8b5123d6750a5e9a4ad8632d1d9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd85126950e8b5123d6750a5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jul 8 18:11:59 2009 +0200 appwiz.cpl: Fix French translation & UI display. --- dlls/appwiz.cpl/Fr.rc | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/dlls/appwiz.cpl/Fr.rc b/dlls/appwiz.cpl/Fr.rc index 0c860b3..4c29010 100644 --- a/dlls/appwiz.cpl/Fr.rc +++ b/dlls/appwiz.cpl/Fr.rc @@ -1,5 +1,5 @@ /* -* Ressources fran�aises pour Ajout/suppression de programmes +* Ressources françaises pour Ajout/Suppression de programmes * * Copyright 2008 David Adam * @@ -21,6 +21,9 @@ #include "res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE @@ -29,28 +32,28 @@ STRINGTABLE IDS_CPL_DESC, "Vous permet d'installer un nouveau logiciel, ou supprimer un logiciel existant de votre ordinateur." IDS_TAB1_TITLE, "Applications" - IDS_UNINSTALL_FAILED, "Impossible d'ex�cuter le d�sinstalleur '%s'. Voulez-vous supprimer l'entr�e de d�sinstallation de ce programme dans la base de registres ?" - IDS_NOT_SPECIFIED, "Non sp�cifi�" + IDS_UNINSTALL_FAILED, "Impossible d'exécuter le désinstalleur « %s ». Voulez-vous supprimer l'entrée de désinstallation de ce programme de la base de registre ?" + IDS_NOT_SPECIFIED, "Non spécifié" IDS_COLUMN_NAME, "Nom" - IDS_COLUMN_PUBLISHER, "�diteur" + IDS_COLUMN_PUBLISHER, "Éditeur" IDS_COLUMN_VERSION, "Version" IDS_INSTALL_FILTER, "Programmes d'installation\0*instal*.exe;*setup*.exe;*.msi\0Programmes (*.exe)\0*.exe\0Tous les fichiers (*.*)\0*.*\0\0" } IDD_MAIN DIALOG 0, 0, 320, 220 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Installation/D�sinstallation" +CAPTION "Installation/Désinstallation" FONT 8, "MS Shell Dlg" { -CONTROL "Pour installer un nouveau programme � partir d'une disquette, d'un cdrom ou de votre 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, 246, 26, 64, 14 +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 "", -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 Modifier/Supprimer.", 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 "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 - CONTROL "&Infos de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL "Modifier/&Supprimer", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 240, 198, 70, 14 + CONTROL "&Informations de support", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 150, 198, 87, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 } @@ -60,15 +63,15 @@ CAPTION "Informations de support" FONT 8, "MS Shell Dlg" { CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 - CONTROL "Les informations suivantes peuvent �tre utilis�es pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 - CONTROL "�diteur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 - CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 - CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 - CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 - CONTROL "T�l�phone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 - CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 - CONTROL "Mises � jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 - CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "Les informations suivantes peuvent être utilisées pour obtenir du support technique pour %s :", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Éditeur :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 54, 8 + CONTROL "Version :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 54, 8 + CONTROL "Contact :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 54, 8 + CONTROL "Support :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 54, 8 + CONTROL "Téléphone :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 54, 8 + CONTROL "Lisez-moi :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 54, 8 + CONTROL "Mises à jour :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 54, 8 + CONTROL "Commentaires :", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 54, 8 CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8

1 0

Hwang YunSong : notepad: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 3ce23c9802fe1a201e5c449acfca93db1766e92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce23c9802fe1a201e5c449ac… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:17:03 2009 +0900 notepad: Updated Korean resource. --- programs/notepad/Ko.rc | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/programs/notepad/Ko.rc b/programs/notepad/Ko.rc index b838cbf..56167de 100644 --- a/programs/notepad/Ko.rc +++ b/programs/notepad/Ko.rc @@ -114,12 +114,22 @@ STRING_TOOLARGE, "%s �ٸ� ��⸦ ��Ͻʽÿ�." STRING_NOTEXT, "�Է�� ϴ�.\ \n�� Է�� õ��Ͻʽÿ�" -STRING_DOESNOTEXIST, "%s\n�� ϴ�.\n\n \ +STRING_DOESNOTEXIST, "%s\ �� ϴ�.\n\n \ �� ðڽ��ϱ�?" -STRING_NOTSAVED, "%s\n�� Ǿ��ϴ�.\n\n \ +STRING_NOTSAVED, "%s\ �� Ǿ��ϴ�.\n\n \ �� Ͻðڽ��ϱ�?" STRING_NOTFOUND, "%s ��ڿ�� ã�� ϴ�." STRING_OUT_OF_MEMORY, "�� ۾�� Ϸ��ϴ� �� ʿ�� ޸𸮰� ��մϴ�.\ -\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�.\n" +\n�� ޸�� Ȯ��ϱ� �� ϳ� �̻�� α׷�� ݾ� �ֽʽÿ�." + +STRING_UNICODE_LE, "��ڵ� (UTF-16)" +STRING_UNICODE_BE, "��ڵ� (UTF-16 ��-��)" + +STRING_LOSS_OF_UNICODE_CHARACTERS, "%s\n\ +��ڵ� ��ڸ� ��ϰ� �ִ� �� %s ��ڵ�� \n\ +�� ϸ� �� ս�� Դϴ�.\n\ +�� ڸ� ��Ϸ�� Ҹ� Ŭ��ϰ�, ��ڵ� ��Ӵٿ�� ڵ� \n\ +�ɼ� �� ϳ�� Ͻʽÿ�t.\n\ +��Ͻðڽ��ϱ�?" }

1 0

Hwang YunSong : crypt32: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 755abeda015e14314348a52af3064bee02308429 URL: http://source.winehq.org/git/wine.git/?a=commit;h=755abeda015e14314348a52af… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:04:31 2009 +0900 crypt32: Updated Korean resource. --- dlls/crypt32/crypt32_Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/crypt32_Ko.rc b/dlls/crypt32/crypt32_Ko.rc index 1a05353..0d83815 100644 --- a/dlls/crypt32/crypt32_Ko.rc +++ b/dlls/crypt32/crypt32_Ko.rc @@ -175,6 +175,7 @@ STRINGTABLE DISCARDABLE IDS_LOCALIZEDNAME_CA "�߰� �� " IDS_LOCALIZEDNAME_ADDRESSBOOK "�ٸ� ��" IDS_LOCALIZEDNAME_TRUSTEDPUBLISHER "�ŷ�� ִ� ��" + IDS_LOCALIZEDNAME_DISALLOWED "�ŷ� �� " } STRINGTABLE DISCARDABLE

1 0

Hwang YunSong : cryptui: Updated Korean resource.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: 7cecc0cb8255ff9f0492599900e368e31869dd84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cecc0cb8255ff9f049259990… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Thu Jul 9 16:12:45 2009 +0900 cryptui: Updated Korean resource. --- dlls/cryptui/cryptui_Ko.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_Ko.rc b/dlls/cryptui/cryptui_Ko.rc index 6cbf6fe..2533a4e 100644 --- a/dlls/cryptui/cryptui_Ko.rc +++ b/dlls/cryptui/cryptui_Ko.rc @@ -404,22 +404,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "�� :", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-��ȣȭ�� X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-��ȣȭ�� X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "��ȣ �޽�� ǥ��/PKCS #7 �޽��(&C) (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "�� ο� �ִ� �� (&I)", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "�� ȯ(&P)/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "�� ο� �ִ� �� (&U)", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "�� ȣȭ ��(&E)", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "��Ⱑ ��ϸ� �� Ű ��(&K)", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0

Francois Gouget : urlmon/tests: Fix two ok() trailing '\n's.
by Alexandre Julliard July 9, 2009

July 9, 2009

Module: wine Branch: master Commit: a4f4fd2a77371a8f99e30a92aa3623db5e6733b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4f4fd2a77371a8f99e30a92a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Jul 9 09:51:58 2009 +0200 urlmon/tests: Fix two ok() trailing '\n's. --- dlls/urlmon/tests/sec_mgr.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index 07d409e..a6fb6bb 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -294,12 +294,12 @@ static void test_CoInternetCreateZoneManager(void) return; hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IUnknown, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk); hr = IInternetZoneManager_QueryInterface(zonemgr, &IID_IInternetZoneManager, (void **) &punk); - ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)n", hr, punk); + ok(SUCCEEDED(hr), "got 0x%x with %p (expected Success)\n", hr, punk); if (punk) IUnknown_Release(punk);

1 0

Austin English : notepad: Fix English resource line breaks.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: b0f53e1920e33ca970d29b47f6419a95c2ff9a28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0f53e1920e33ca970d29b47f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Jul 8 01:10:40 2009 -0500 notepad: Fix English resource line breaks. --- programs/notepad/En.rc | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/programs/notepad/En.rc b/programs/notepad/En.rc index fb774cf..15439b1 100644 --- a/programs/notepad/En.rc +++ b/programs/notepad/En.rc @@ -120,14 +120,13 @@ STRING_TOOLARGE, "File '%s' is too large for note Please use a different editor." STRING_NOTEXT, "You didn't enter any text. \ \nPlease type something and try again" -STRING_DOESNOTEXIST, "File '%s'\ndoes not exist\n\n \ +STRING_DOESNOTEXIST, "File '%s' does not exist\n\n \ Do you want to create a new file ?" -STRING_NOTSAVED, "File '%s'\nhas been modified\n\n \ +STRING_NOTSAVED, "File '%s' has been modified\n\n \ Would you like to save the changes ?" STRING_NOTFOUND, "'%s' could not be found." STRING_OUT_OF_MEMORY, "Not enough memory to complete this \ -task.\nClose one or more applications to increase the amount of\nfree \ -memory." +task.\nClose one or more applications to increase the amount of free memory." STRING_UNICODE_LE, "Unicode (UTF-16)" STRING_UNICODE_BE, "Unicode (UTF-16 big-endian)"

1 0

Andrew Eikum : gdiplus: Implement GdipSaveGraphics and GdipRestoreGraphics.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: 1ef13941f6d80b4f1413f888cd753c8619ebaea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ef13941f6d80b4f1413f888c… Author: Andrew Eikum <andrew(a)brightnightgames.com> Date: Tue Jul 7 22:30:49 2009 -0500 gdiplus: Implement GdipSaveGraphics and GdipRestoreGraphics. --- dlls/gdiplus/graphics.c | 21 ++------------------- dlls/gdiplus/tests/graphics.c | 24 ++++++++---------------- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 12f1e26..b59814e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3322,15 +3322,7 @@ GpStatus WINGDIPAPI GdipResetWorldTransform(GpGraphics *graphics) GpStatus WINGDIPAPI GdipRestoreGraphics(GpGraphics *graphics, GraphicsState state) { - static int calls; - - if(!graphics) - return InvalidParameter; - - if(!(calls++)) - FIXME("graphics state not implemented\n"); - - return Ok; + return GdipEndContainer(graphics, state); } GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, @@ -3349,16 +3341,7 @@ GpStatus WINGDIPAPI GdipRotateWorldTransform(GpGraphics *graphics, REAL angle, GpStatus WINGDIPAPI GdipSaveGraphics(GpGraphics *graphics, GraphicsState *state) { - static int calls; - - if(!graphics || !state) - return InvalidParameter; - - if(!(calls++)) - FIXME("graphics state not implemented\n"); - - *state = 0xdeadbeef; - return Ok; + return GdipBeginContainer2(graphics, state); } GpStatus WINGDIPAPI GdipBeginContainer2(GpGraphics *graphics, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 23aa717..6fd49f7 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -137,8 +137,7 @@ static void test_save_restore(void) stat = GdipRestoreGraphics(graphics1, state_a); expect(Ok, stat); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -154,12 +153,10 @@ static void test_save_restore(void) expect(Ok, stat); GdipRestoreGraphics(graphics1, state_b); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -176,16 +173,13 @@ static void test_save_restore(void) GdipSetInterpolationMode(graphics1, InterpolationModeHighQualityBilinear); GdipRestoreGraphics(graphics1, state_b); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_c); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipDeleteGraphics(graphics1); log_state(state_a, &state_log); @@ -204,12 +198,10 @@ static void test_save_restore(void) GdipSetInterpolationMode(graphics2, InterpolationModeNearestNeighbor); GdipRestoreGraphics(graphics1, state_a); GdipGetInterpolationMode(graphics1, &mode); - todo_wine - expect(InterpolationModeBilinear, mode); + expect(InterpolationModeBilinear, mode); GdipRestoreGraphics(graphics2, state_b); GdipGetInterpolationMode(graphics2, &mode); - todo_wine - expect(InterpolationModeBicubic, mode); + expect(InterpolationModeBicubic, mode); GdipDeleteGraphics(graphics1); GdipDeleteGraphics(graphics2);

1 0

Juan Lang : cryptui: Increase control width to support larger fonts.
by Alexandre Julliard July 8, 2009

July 8, 2009

Module: wine Branch: master Commit: a83f1c93c32e45159fa33b85f80f07dc731ea11f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a83f1c93c32e45159fa33b85f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Jul 6 09:38:27 2009 -0700 cryptui: Increase control width to support larger fonts. --- dlls/cryptui/cryptui_En.rc | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 1335f0e..957fe98 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -419,22 +419,22 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "Select the format you want to use:", -1, 21,1,195,10 AUTORADIOBUTTON "&DER-encoded X.509 (.cer)", - IDC_EXPORT_FORMAT_DER, 31,18,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP + IDC_EXPORT_FORMAT_DER, 31,18,240,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "Ba&se64-encoded X.509 (.cer):", - IDC_EXPORT_FORMAT_BASE64, 31,30,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_BASE64, 31,30,240,12, BS_AUTORADIOBUTTON AUTORADIOBUTTON "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)", - IDC_EXPORT_FORMAT_CMS, 31,42,200,12, BS_AUTORADIOBUTTON + IDC_EXPORT_FORMAT_CMS, 31,42,240,12, BS_AUTORADIOBUTTON CHECKBOX "&Include all certificates in the certification path if possible", - IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_CMS_INCLUDE_CHAIN, 44,57,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED AUTORADIOBUTTON "&Personal Information Exchange/PKCS #12 (.pfx)", - IDC_EXPORT_FORMAT_PFX, 31,72,200,12, BS_AUTORADIOBUTTON|WS_DISABLED + IDC_EXPORT_FORMAT_PFX, 31,72,240,12, BS_AUTORADIOBUTTON|WS_DISABLED CHECKBOX "Incl&ude all certificates in the certification path if possible", - IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,200,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED + IDC_EXPORT_PFX_INCLUDE_CHAIN, 44,87,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "&Enable strong encryption", - IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,200,8, + IDC_EXPORT_PFX_STRONG_ENCRYPTION, 44,102,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED CHECKBOX "Delete the private &key if the export is successful", - IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,200,8, + IDC_EXPORT_PFX_DELETE_PRIVATE_KEY, 44,117,240,8, BS_AUTOCHECKBOX|WS_TABSTOP|WS_DISABLED END

1 0