wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Frédéric Delanoy : po: Update French translation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 8c3f52ef2a0036ec6e9a7879403be41014d8c64c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3f52ef2a0036ec6e9a78794… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Sep 7 08:31:01 2011 +0200 po: Update French translation. --- po/fr.po | 42 ++++++++++++++++++++++++------------------ 1 files changed, 24 insertions(+), 18 deletions(-) diff --git a/po/fr.po b/po/fr.po index 6a52776..6144dc9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-08-30 20:11+0100\n" +"PO-Revision-Date: 2011-09-06 22:11+0100\n" "Last-Translator: Frédéric Delanoy <frederic.delanoy(a)gmail.com>\n" "Language-Team: none\n" "Language: French\n" @@ -694,7 +694,6 @@ msgid "Prefer Signed Data" msgstr "Préférer les données signées" #: crypt32.rc:53 cryptdlg.rc:31 -#, fuzzy msgctxt "Certification Practice Statement" msgid "CPS" msgstr "Énoncé des pratiques de certification (CPS)" @@ -1233,7 +1232,6 @@ msgid "Subject Type=" msgstr "Type de sujet =" #: crypt32.rc:195 -#, fuzzy msgctxt "Certificate Authority" msgid "CA" msgstr "AC" @@ -1264,7 +1262,6 @@ msgid "Access Method=" msgstr "Méthode d'accès =" #: crypt32.rc:202 -#, fuzzy msgctxt "Online Certificate Status Protocol" msgid "OCSP" msgstr "OCSP" @@ -2029,14 +2026,12 @@ msgid "Default MidiOut Device" msgstr "Périphérique MidiOut par défaut" #: dinput.rc:34 -#, fuzzy msgid "Action" -msgstr "Activation" +msgstr "Action" #: dinput.rc:35 -#, fuzzy msgid "Object" -msgstr "&Objet" +msgstr "Objet" #: dxdiagn.rc:25 msgid "Regional Setting" @@ -2364,9 +2359,8 @@ msgid "URI to be encoded contains invalid characters" msgstr "L'URI à coder contient des caractères invalides" #: jscript.rc:48 -#, fuzzy msgid "URI to be decoded is incorrect" -msgstr "L'URI à coder contient des caractères invalides" +msgstr "L'URI à décoder est incorrecte" #: jscript.rc:50 msgid "Array length must be a finite positive integer" @@ -6760,19 +6754,16 @@ msgid "%ld bytes" msgstr "%ld octets" #: shlwapi.rc:28 -#, fuzzy msgctxt "time unit: hours" msgid " hr" msgstr " h" #: shlwapi.rc:29 -#, fuzzy msgctxt "time unit: minutes" msgid " min" msgstr " min" #: shlwapi.rc:30 -#, fuzzy msgctxt "time unit: seconds" msgid " sec" msgstr " s" @@ -7768,6 +7759,26 @@ msgid "" "and all subfolders.\n" "/D Processes folders as well.\n" msgstr "" +"ATTRIB - Affiche ou modifie les attributs de fichiers.\n" +"\n" +"Syntaxe :\n" +"ATTRIB [+R | -R] [+A | -A ] [+S | -S] [+H | -H] [lecteur:][chemin]" +"[nomFichier]\n" +"\t [/S [/D]]\n" +"\n" +"où\n" +"\n" +"+ Définit un attribut.\n" +"- Supprime un attribut.\n" +"R Attribut de fichier en lecture seule.\n" +"A Attribut de fichier archive.\n" +"S Attribut de fichier système.\n" +"H Attribut de fichier caché.\n" +"[lecteur:][chemin][nomFichier]\n" +"Spécifie un ou plusieurs fichiers à faire traiter par attrib.\n" +"/S Traite les fichiers correspondants dans le dossier courant\n" +"et tous les sous-dossiers.\n" +"/D Traite également les dossiers.\n" #: clock.rc:29 msgid "Ana&log" @@ -9983,12 +9994,10 @@ msgid "&Realtime" msgstr "Temps &réel" #: taskmgr.rc:160 -#, fuzzy msgid "&Above Normal" msgstr "&Supérieure à la normale" #: taskmgr.rc:164 -#, fuzzy msgid "&Below Normal" msgstr "&Inférieure à la normale" @@ -11365,13 +11374,11 @@ msgid "Pages" msgstr "Pages" #: wordpad.rc:172 -#, fuzzy msgctxt "unit: centimeter" msgid "cm" msgstr "cm" #: wordpad.rc:173 -#, fuzzy msgctxt "unit: inch" msgid "in" msgstr "po" @@ -11381,7 +11388,6 @@ msgid "inch" msgstr "pouces" #: wordpad.rc:175 -#, fuzzy msgctxt "unit: point" msgid "pt" msgstr "pt"

1 0

Francois Gouget : po: Remove English strings from the Esperanto translation .
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: de9c307492426c06c995ae15a3d65085a2b18084 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de9c307492426c06c995ae15a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 23:11:24 2011 +0200 po: Remove English strings from the Esperanto translation. --- po/eo.po | 63 ++++++++++--------------------------------------------------- 1 files changed, 11 insertions(+), 52 deletions(-) diff --git a/po/eo.po b/po/eo.po index dcd5fd0..508010e 100644 --- a/po/eo.po +++ b/po/eo.po @@ -1893,9 +1893,8 @@ msgid "Certificate Export Wizard" msgstr "" #: cryptui.rc:148 -#, fuzzy msgid "Export Format" -msgstr "Normal" +msgstr "" #: cryptui.rc:149 msgid "Choose the format in which the content will be saved." @@ -1934,9 +1933,8 @@ msgid "Serialized Certificate Store (*.sst)" msgstr "" #: cryptui.rc:160 -#, fuzzy msgid "File Format" -msgstr "Normal" +msgstr "" #: cryptui.rc:161 msgid "Include all certificates in certificate path" @@ -2487,14 +2485,12 @@ msgid "Out of paper\n" msgstr "Elæerpita papero; " #: winerror.mc:171 -#, fuzzy msgid "Write fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:176 -#, fuzzy msgid "Read fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:181 msgid "General failure\n" @@ -2583,9 +2579,8 @@ msgid "Print cancelled\n" msgstr "" #: winerror.mc:286 -#, fuzzy msgid "Network name deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:291 msgid "Network access denied\n" @@ -3250,9 +3245,8 @@ msgid "Not registry file\n" msgstr "Tekstdosieroj (*.txt)" #: winerror.mc:1106 -#, fuzzy msgid "Key deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:1111 msgid "No registry log space\n" @@ -3667,9 +3661,8 @@ msgid "Moving the replacement file failed\n" msgstr "" #: winerror.mc:1611 -#, fuzzy msgid "The journal is being deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:1616 msgid "The journal is not active\n" @@ -5311,9 +5304,8 @@ msgid "Already awaiting printer handle\n" msgstr "" #: winerror.mc:3611 -#, fuzzy msgid "Printer deleted\n" -msgstr "Date deleted" +msgstr "" #: winerror.mc:3616 #, fuzzy @@ -5492,7 +5484,6 @@ msgid "insert disk %s" msgstr "enþovu la diskon %s" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5524,35 +5515,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -6414,9 +6376,8 @@ msgstr "" "&Fermu" #: shell32.rc:127 -#, fuzzy msgid "&About Control Panel" -msgstr "&About Control Panel..." +msgstr "" #: shell32.rc:135 shell32.rc:139 winefile.rc:112 msgid "Size" @@ -9275,9 +9236,8 @@ msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" #: regedit.rc:201 -#, fuzzy msgid "(Default)" -msgstr "Default" +msgstr "" #: regedit.rc:202 msgid "(value not set)" @@ -10898,9 +10858,8 @@ msgid "&Statusbar" msgstr "" #: wordpad.rc:73 -#, fuzzy msgid "&Options..." -msgstr "&Options" +msgstr "" #: wordpad.rc:75 msgid "&Insert"

1 0

Francois Gouget : po: Remove English strings from the Romansh translation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: f593672598601a157639acac7167d332072cccc8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f593672598601a157639acac7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 23:09:24 2011 +0200 po: Remove English strings from the Romansh translation. --- po/rm.po | 116 ++++++++++++++++++++++---------------------------------------- 1 files changed, 41 insertions(+), 75 deletions(-) diff --git a/po/rm.po b/po/rm.po index 3d7d0d4..c28edd8 100644 --- a/po/rm.po +++ b/po/rm.po @@ -24,9 +24,8 @@ msgid "" msgstr "" #: appwiz.rc:30 taskmgr.rc:262 winecfg.rc:30 -#, fuzzy msgid "Applications" -msgstr "&Options" +msgstr "" #: appwiz.rc:32 msgid "" @@ -173,9 +172,8 @@ msgid "My Computer" msgstr "" #: comdlg32.rc:41 -#, fuzzy msgid "System Folders" -msgstr "Use system colors" +msgstr "" #: comdlg32.rc:42 msgid "Local Hard Drives" @@ -512,9 +510,8 @@ msgid "Power save mode; " msgstr "" #: comdlg32.rc:87 -#, fuzzy msgid "Default Printer; " -msgstr "Default" +msgstr "" #: comdlg32.rc:88 msgid "There are %d documents in the queue" @@ -1860,9 +1857,8 @@ msgid "Certificate Export Wizard" msgstr "" #: cryptui.rc:148 -#, fuzzy msgid "Export Format" -msgstr "Normal" +msgstr "" #: cryptui.rc:149 msgid "Choose the format in which the content will be saved." @@ -1901,9 +1897,8 @@ msgid "Serialized Certificate Store (*.sst)" msgstr "" #: cryptui.rc:160 -#, fuzzy msgid "File Format" -msgstr "Normal" +msgstr "" #: cryptui.rc:161 msgid "Include all certificates in certificate path" @@ -1977,9 +1972,8 @@ msgid "Object" msgstr "" #: dxdiagn.rc:25 -#, fuzzy msgid "Regional Setting" -msgstr "Default" +msgstr "" #: dxdiagn.rc:26 msgid "%uMB used, %uMB available" @@ -2071,9 +2065,8 @@ msgid "Sync" msgstr "" #: hhctrl.rc:47 wordpad.rc:155 -#, fuzzy msgid "Options" -msgstr "&Options" +msgstr "" #: hhctrl.rc:48 ieframe.rc:64 msgid "Forward" @@ -2440,14 +2433,12 @@ msgid "Out of paper\n" msgstr "" #: winerror.mc:171 -#, fuzzy msgid "Write fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:176 -#, fuzzy msgid "Read fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:181 msgid "General failure\n" @@ -2458,9 +2449,8 @@ msgid "Sharing violation\n" msgstr "" #: winerror.mc:191 -#, fuzzy msgid "Lock violation\n" -msgstr "&Options" +msgstr "" #: winerror.mc:196 msgid "Wrong disk\n" @@ -2599,9 +2589,8 @@ msgid "Invalid parameter\n" msgstr "" #: winerror.mc:366 -#, fuzzy msgid "Net write fault\n" -msgstr "Default" +msgstr "" #: winerror.mc:371 msgid "No process slots\n" @@ -3501,9 +3490,8 @@ msgid "Single-instance application\n" msgstr "" #: winerror.mc:1491 -#, fuzzy msgid "Real-mode application\n" -msgstr "&Options" +msgstr "" #: winerror.mc:1496 msgid "Invalid DLL\n" @@ -5487,9 +5475,8 @@ msgid "tool tip" msgstr "" #: oleacc.rc:41 -#, fuzzy msgid "application" -msgstr "&Options" +msgstr "" #: oleacc.rc:42 msgid "document" @@ -6195,9 +6182,8 @@ msgid "New &Link" msgstr "&Rivir" #: shell32.rc:71 -#, fuzzy msgid "Properties" -msgstr "&Options" +msgstr "" #: shell32.rc:82 msgctxt "recycle bin" @@ -6350,9 +6336,8 @@ msgid "Templates" msgstr "" #: shell32.rc:210 -#, fuzzy msgid "Application Data" -msgstr "&Options" +msgstr "" #: shell32.rc:211 #, fuzzy @@ -6444,9 +6429,8 @@ msgid "Status" msgstr "" #: shell32.rc:149 -#, fuzzy msgid "Location" -msgstr "&Options" +msgstr "" #: shell32.rc:150 msgid "Model" @@ -7516,9 +7500,8 @@ msgid "Digi&tal" msgstr "" #: clock.rc:32 notepad.rc:50 winefile.rc:64 wordpad.rc:81 -#, fuzzy msgid "&Font..." -msgstr "Fonts" +msgstr "" #: clock.rc:34 msgid "&Without Titlebar" @@ -8065,9 +8048,8 @@ msgid "Wine Explorer" msgstr "Wine ag�d" #: explorer.rc:29 -#, fuzzy msgid "Location:" -msgstr "&Options" +msgstr "" #: hostname.rc:27 msgid "Usage: hostname\n" @@ -8140,9 +8122,8 @@ msgid "DHCP enabled" msgstr "" #: ipconfig.rc:46 -#, fuzzy msgid "Default gateway" -msgstr "Default" +msgstr "" #: net.rc:27 msgid "" @@ -8250,9 +8231,8 @@ msgid "Connection is being made" msgstr "" #: net.rc:49 -#, fuzzy msgid "Reconnecting" -msgstr "Default" +msgstr "" #: net.rc:40 msgid "The following services are running:\n" @@ -8651,9 +8631,8 @@ msgid "All Objects" msgstr "" #: oleview.rc:133 -#, fuzzy msgid "Application IDs" -msgstr "&Options" +msgstr "" #: oleview.rc:134 msgid "Type Libraries" @@ -8676,9 +8655,8 @@ msgid "Implementation" msgstr "" #: oleview.rc:140 -#, fuzzy msgid "Activation" -msgstr "&Options" +msgstr "" #: oleview.rc:142 msgid "CoGetClassObject failed." @@ -8730,9 +8708,8 @@ msgid "&Copy...\tF8" msgstr "Capchar" #: progman.rc:35 -#, fuzzy msgid "&Properties\tAlt+Enter" -msgstr "&Options" +msgstr "" #: progman.rc:37 msgid "&Execute..." @@ -8968,9 +8945,8 @@ msgid "Modify Binary Data..." msgstr "" #: regedit.rc:109 -#, fuzzy msgid "&Export..." -msgstr "Fonts" +msgstr "" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" @@ -9023,9 +8999,8 @@ msgid "Win9x/NT4 Registry files (REGEDIT4)" msgstr "" #: regedit.rc:201 -#, fuzzy msgid "(Default)" -msgstr "Default" +msgstr "" #: regedit.rc:202 msgid "(value not set)" @@ -9313,9 +9288,8 @@ msgid "&High" msgstr "" #: taskmgr.rc:58 taskmgr.rc:162 -#, fuzzy msgid "&Normal" -msgstr "Normal" +msgstr "" #: taskmgr.rc:60 taskmgr.rc:166 msgid "&Low" @@ -9330,9 +9304,8 @@ msgid "&Select Columns..." msgstr "" #: taskmgr.rc:69 taskmgr.rc:258 -#, fuzzy msgid "&CPU History" -msgstr "History" +msgstr "" #: taskmgr.rc:71 taskmgr.rc:259 msgid "&One Graph, All CPUs" @@ -9403,14 +9376,12 @@ msgid "&Realtime" msgstr "" #: taskmgr.rc:160 -#, fuzzy msgid "&Above Normal" -msgstr "Normal" +msgstr "" #: taskmgr.rc:164 -#, fuzzy msgid "&Below Normal" -msgstr "Normal" +msgstr "" #: taskmgr.rc:169 msgid "Set &Affinity..." @@ -9934,9 +9905,8 @@ msgid "disabled" msgstr "" #: winecfg.rc:58 -#, fuzzy msgid "Default Settings" -msgstr "Default" +msgstr "" #: winecfg.rc:59 msgid "Wine Programs (*.exe,*.exe.so)" @@ -10095,9 +10065,8 @@ msgid "Message Box Text" msgstr "" #: winecfg.rc:112 -#, fuzzy msgid "Application Workspace" -msgstr "&Options" +msgstr "" #: winecfg.rc:113 msgid "Window Frame" @@ -10156,9 +10125,8 @@ msgid "Menu Bar" msgstr "" #: wineconsole.rc:26 -#, fuzzy msgid "Set &Defaults" -msgstr "Default" +msgstr "" #: wineconsole.rc:28 msgid "&Mark" @@ -10275,9 +10243,8 @@ msgid "Re&name..." msgstr "&Annotaziun..." #: winefile.rc:31 -#, fuzzy msgid "Propert&ies\tAlt+Enter" -msgstr "&Options" +msgstr "" #: winefile.rc:33 msgid "&Run..." @@ -10483,19 +10450,19 @@ msgstr "&Definir..." #: winhlp32.rc:45 msgid "History" -msgstr "History" +msgstr "" #: winhlp32.rc:48 winhlp32.rc:69 msgid "Small" -msgstr "Small" +msgstr "" #: winhlp32.rc:49 winhlp32.rc:70 msgid "Normal" -msgstr "Normal" +msgstr "" #: winhlp32.rc:50 winhlp32.rc:71 msgid "Large" -msgstr "Large" +msgstr "" #: winhlp32.rc:54 #, fuzzy @@ -10530,7 +10497,7 @@ msgstr "Sbagl cun leger la datoteca d'ag�d `%s'" #: winhlp32.rc:85 msgid "Summary" -msgstr "Summary" +msgstr "" #: winhlp32.rc:84 msgid "&Index" @@ -10542,11 +10509,11 @@ msgstr "Datotecas d'ag�d (*.hlp)" #: winhlp32.rc:89 msgid "Cannot find '%s'. Do you want to find this file yourself?" -msgstr "Cannot find '%s'. Do you want to find this file yourself?" +msgstr "" #: winhlp32.rc:90 msgid "Cannot find a richedit implementation... Aborting" -msgstr "Cannot find a richedit implementation... Aborting" +msgstr "" #: winhlp32.rc:91 msgid "Help topics: " @@ -10630,9 +10597,8 @@ msgid "&Date and time..." msgstr "" #: wordpad.rc:79 -#, fuzzy msgid "F&ormat" -msgstr "Normal" +msgstr "" #: wordpad.rc:82 wordpad.rc:105 msgid "&Bullet points"

1 0

Francois Gouget : po: Remove English strings from the Danish translation.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: a2b51522477a3fd114efcc03eda0e9dda71a51cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b51522477a3fd114efcc03e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Sep 6 23:08:40 2011 +0200 po: Remove English strings from the Danish translation. --- po/da.po | 93 ++++++++++++++----------------------------------------------- 1 files changed, 22 insertions(+), 71 deletions(-) diff --git a/po/da.po b/po/da.po index be2a8c2..b3792d9 100644 --- a/po/da.po +++ b/po/da.po @@ -56,7 +56,7 @@ msgstr "Udgiver" #: appwiz.rc:37 cryptui.rc:51 msgid "Version" -msgstr "Version" +msgstr "" #: appwiz.rc:38 msgid "Installation programs" @@ -846,11 +846,8 @@ msgid "Serial Number" msgstr "" #: crypt32.rc:84 -#, fuzzy msgid "CA Version" msgstr "" -"CMD Version %s\n" -"\n" #: crypt32.rc:85 msgid "Cross CA Version" @@ -873,11 +870,8 @@ msgid "Enrollment Name Value Pair" msgstr "" #: crypt32.rc:90 -#, fuzzy msgid "OS Version" msgstr "" -"CMD Version %s\n" -"\n" #: crypt32.rc:91 msgid "Enrollment CSP" @@ -944,11 +938,8 @@ msgid "CMC Status Info" msgstr "" #: crypt32.rc:107 -#, fuzzy msgid "CMC Extensions" msgstr "" -"CMD Version %s\n" -"\n" #: crypt32.rc:108 msgid "CMC Attributes" @@ -1143,9 +1134,8 @@ msgid "Smart Card Logon" msgstr "" #: crypt32.rc:156 cryptui.rc:139 -#, fuzzy msgid "Digital Rights" -msgstr "&Digital" +msgstr "" #: crypt32.rc:157 cryptui.rc:135 msgid "Qualified Subordination" @@ -1156,9 +1146,8 @@ msgid "Key Recovery" msgstr "" #: crypt32.rc:159 cryptui.rc:137 -#, fuzzy msgid "Document Signing" -msgstr "Argument mangler\n" +msgstr "" #: crypt32.rc:160 msgid "IP security IKE intermediate" @@ -1584,11 +1573,8 @@ msgid "Version 1 Fields Only" msgstr "" #: cryptui.rc:48 -#, fuzzy msgid "Extensions Only" msgstr "" -"CMD Version %s\n" -"\n" #: cryptui.rc:49 #, fuzzy @@ -1648,7 +1634,7 @@ msgstr "" #: cryptui.rc:62 shell32.rc:251 ipconfig.rc:41 msgid "Description" -msgstr "Description" +msgstr "" #: cryptui.rc:63 #, fuzzy @@ -1934,9 +1920,8 @@ msgid "Certificate Export Wizard" msgstr "" #: cryptui.rc:148 -#, fuzzy msgid "Export Format" -msgstr "F&ormat" +msgstr "" #: cryptui.rc:149 msgid "Choose the format in which the content will be saved." @@ -1975,9 +1960,8 @@ msgid "Serialized Certificate Store (*.sst)" msgstr "" #: cryptui.rc:160 -#, fuzzy msgid "File Format" -msgstr "F&ormat" +msgstr "" #: cryptui.rc:161 msgid "Include all certificates in certificate path" @@ -2086,9 +2070,8 @@ msgid "&Home" msgstr "Hjem" #: hhctrl.rc:60 -#, fuzzy msgid "&Stop" -msgstr "Stop" +msgstr "" #: hhctrl.rc:61 shdoclc.rc:56 msgid "&Refresh" @@ -2282,9 +2265,8 @@ msgid "&Help" msgstr "&Hjælp" #: ieframe.rc:57 -#, fuzzy msgid "&About Internet Explorer" -msgstr "Wine Internet Explorer" +msgstr "" #: ieframe.rc:67 #, fuzzy @@ -3211,7 +3193,7 @@ msgstr "Ugyldig adresse\n" #: winerror.mc:976 msgid "Arithmetic overflow\n" -msgstr "Arithmetic overflow\n" +msgstr "" #: winerror.mc:981 msgid "Pipe connected\n" @@ -4472,7 +4454,7 @@ msgstr "Ugyldig hook filter\n" #: winerror.mc:2531 msgid "Invalid filter procedure\n" -msgstr "Invalid filter procedure\n" +msgstr "" #: winerror.mc:2536 msgid "Hook procedure needs module handle\n" @@ -5222,7 +5204,7 @@ msgstr "Ugyldigt printer navn\n" #: winerror.mc:3421 msgid "Printer already exists\n" -msgstr "Printer already exists\n" +msgstr "" #: winerror.mc:3426 msgid "Invalid printer command\n" @@ -5559,7 +5541,6 @@ msgid "insert disk %s" msgstr "indsæt disk '%s'" #: msi.rc:30 -#, fuzzy msgid "" "Windows Installer %s\n" "\n" @@ -5591,35 +5572,6 @@ msgid "" "\t/help\n" "\t/?\n" msgstr "" -"Windows Installer %s\n" -"\n" -"Usage:\n" -"msiexec command {required parameter} [optional parammeter]\n" -"\n" -"Install a product:\n" -"\t/i {package|productcode} [property]\n" -"\t/package {package|productcode} [property]\n" -"\t/a package [property]\n" -"Repair an installation:\n" -"\t/f[p|o|e|d|c|a|u|m|s|v] {package|productcode}\n" -"Uninstall a product:\n" -"\t/uninstall {package|productcode} [property]\n" -"\t/x {package|productcode} [property]\n" -"Advertise a product:\n" -"\t/j[u|m] package [/t transform] [/g languageid]\n" -"Apply a patch:\n" -"\t/p patchpackage [property]\n" -"\t/p patchpackage /a package [property]\n" -"Log and UI Modifiers for above commands:\n" -"\t/l[*][i|w|e|a|r|u|c|m|o|p|v|][+|!] logfile\n" -"\t/q{|n|b|r|f|n+|b+|b-}\n" -"Register MSI Service:\n" -"\t/y\n" -"Unregister MSI Service:\n" -"\t/z\n" -"Display this help:\n" -"\t/help\n" -"\t/?\n" #: msi.rc:57 msgid "enter which folder contains %s" @@ -5755,9 +5707,8 @@ msgid "grouping" msgstr "" #: oleacc.rc:48 -#, fuzzy msgid "separator" -msgstr "Separator" +msgstr "" #: oleacc.rc:49 msgid "tool bar" @@ -7704,7 +7655,7 @@ msgstr "Kunne ikke gemme filen." #: wldap32.rc:27 msgid "Success" -msgstr "Success" +msgstr "" #: wldap32.rc:28 msgid "Operations Error" @@ -8676,7 +8627,7 @@ msgstr "Mere? " #: cmd.rc:323 msgid "The input line is too long.\n" -msgstr "The input line is too long.\n" +msgstr "" #: dxdiag.rc:27 msgid "DirectX Diagnostic Tool" @@ -9006,7 +8957,7 @@ msgstr "&Om Notesblok" #: notepad.rc:66 msgid "Page &p" -msgstr "Page &p" +msgstr "Side &p" #: notepad.rc:68 msgid "Notepad" @@ -9692,7 +9643,7 @@ msgstr "Ændre binærdata" #: regedit.rc:109 msgid "&Export..." -msgstr "&Export..." +msgstr "" #: regedit.rc:134 msgid "Contains commands for working with the whole registry" @@ -10198,7 +10149,7 @@ msgstr "Opgavebehandler" #: taskmgr.rc:182 msgid "Create New Task" -msgstr "Create New Task" +msgstr "" #: taskmgr.rc:187 msgid "Runs a new program" @@ -10682,7 +10633,7 @@ msgstr "Shell folder" #: winecfg.rc:46 msgid "Links to" -msgstr "Links to" +msgstr "" #: winecfg.rc:42 msgid "Wine configuration for %s" @@ -11340,7 +11291,7 @@ msgstr "Fejl ved indlæsning af filen `%s'" #: winhlp32.rc:85 msgid "Summary" -msgstr "Summary" +msgstr "" #: winhlp32.rc:84 msgid "&Index" @@ -11473,7 +11424,7 @@ msgstr "&Om Wine Wordpad" #: wordpad.rc:130 msgid "Automatic" -msgstr "Automatic" +msgstr "" #: wordpad.rc:136 msgid "All documents (*.*)" @@ -11545,11 +11496,11 @@ msgstr "Én side" #: wordpad.rc:167 msgid "Zoom in" -msgstr "Zoom in" +msgstr "" #: wordpad.rc:168 msgid "Zoom out" -msgstr "Zoom out" +msgstr "" #: wordpad.rc:170 msgid "Page"

1 0

Christian Costa : cmd: Launch the command with the /? option for external commands shipped with cmd.exe.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: ccbae4fa6e17b2bb50b8cff89c9a65f9742e0285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccbae4fa6e17b2bb50b8cff89… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Sep 7 09:10:06 2011 +0200 cmd: Launch the command with the /? option for external commands shipped with cmd.exe. --- programs/cmd/builtins.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 7063eb7..1320b32 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -67,6 +67,10 @@ static const WCHAR parmY[] = {'/','Y','\0'}; static const WCHAR parmNoY[] = {'/','-','Y','\0'}; static const WCHAR nullW[] = {'\0'}; +const WCHAR externals[][10] = { + {'A','T','T','R','I','B','\0'} +}; + /************************************************************************** * WCMD_ask_confirm * @@ -1330,6 +1334,7 @@ void WCMD_give_help (const WCHAR *command) { WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { + /* Display help message for builtin command */ for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, command, -1, inbuilt[i], -1) == CSTR_EQUAL) { @@ -1337,6 +1342,18 @@ void WCMD_give_help (const WCHAR *command) { return; } } + /* Launch the command with the /? option for external commands shipped with cmd.exe */ + for (i = 0; i <= (sizeof(externals)/sizeof(externals[0])); i++) { + if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + command, -1, externals[i], -1) == CSTR_EQUAL) { + WCHAR cmd[128]; + static const WCHAR helpW[] = {' ', '/','?','\0'}; + strcpyW(cmd, command); + strcatW(cmd, helpW); + WCMD_run_program(cmd, 0); + return; + } + } WCMD_output (WCMD_LoadMessage(WCMD_NOCMDHELP), command); } return;

1 0

Christian Costa : cmd: Remove attrib from builtins list.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 4aa865ed7680aa98d514053e0ebbf1cc77e16801 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aa865ed7680aa98d514053e0… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Sep 7 09:09:59 2011 +0200 cmd: Remove attrib from builtins list. --- po/ar.po | 164 +++++++++++++++++++++++------------------------ po/bg.po | 164 +++++++++++++++++++++++------------------------ po/ca.po | 164 +++++++++++++++++++++++------------------------ po/cs.po | 165 +++++++++++++++++++++++------------------------ po/da.po | 164 +++++++++++++++++++++++------------------------ po/de.po | 164 +++++++++++++++++++++++------------------------ po/el.po | 164 +++++++++++++++++++++++------------------------ po/en.po | 164 +++++++++++++++++++++++------------------------ po/en_US.po | 164 +++++++++++++++++++++++------------------------ po/eo.po | 164 +++++++++++++++++++++++------------------------ po/es.po | 164 +++++++++++++++++++++++------------------------ po/fa.po | 164 +++++++++++++++++++++++------------------------ po/fi.po | 164 +++++++++++++++++++++++------------------------ po/fr.po | 164 +++++++++++++++++++++++------------------------ po/he.po | 164 +++++++++++++++++++++++------------------------ po/hi.po | 164 +++++++++++++++++++++++------------------------ po/hu.po | 164 +++++++++++++++++++++++------------------------ po/it.po | 164 +++++++++++++++++++++++------------------------ po/ja.po | 164 +++++++++++++++++++++++------------------------ po/ko.po | 164 +++++++++++++++++++++++------------------------ po/lt.po | 164 +++++++++++++++++++++++------------------------ po/ml.po | 164 +++++++++++++++++++++++------------------------ po/nb_NO.po | 164 +++++++++++++++++++++++------------------------ po/nl.po | 164 +++++++++++++++++++++++------------------------ po/or.po | 164 +++++++++++++++++++++++------------------------ po/pa.po | 164 +++++++++++++++++++++++------------------------ po/pl.po | 164 +++++++++++++++++++++++------------------------ po/pt_BR.po | 164 +++++++++++++++++++++++------------------------ po/pt_PT.po | 164 +++++++++++++++++++++++------------------------ po/rm.po | 164 +++++++++++++++++++++++------------------------ po/ro.po | 164 +++++++++++++++++++++++------------------------ po/ru.po | 164 +++++++++++++++++++++++------------------------ po/sk.po | 164 +++++++++++++++++++++++------------------------ po/sl.po | 164 +++++++++++++++++++++++------------------------ po/sr_RS(a)cyrillic.po | 164 +++++++++++++++++++++++------------------------ po/sr_RS(a)latin.po | 164 +++++++++++++++++++++++------------------------ po/sv.po | 164 +++++++++++++++++++++++------------------------ po/te.po | 164 +++++++++++++++++++++++------------------------ po/th.po | 164 +++++++++++++++++++++++------------------------ po/tr.po | 164 +++++++++++++++++++++++------------------------ po/uk.po | 164 +++++++++++++++++++++++------------------------ po/wa.po | 164 +++++++++++++++++++++++------------------------ po/wine.pot | 164 +++++++++++++++++++++++------------------------ po/zh_CN.po | 164 +++++++++++++++++++++++------------------------ po/zh_TW.po | 164 +++++++++++++++++++++++------------------------ programs/cmd/cmd.rc | 1 - programs/cmd/wcmd.h | 93 +++++++++++++------------- programs/cmd/wcmdmain.c | 1 - 48 files changed, 3646 insertions(+), 3830 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4aa865ed7680aa98d5140…

1 0

Alistair Leslie-Hughes : msxml3: Correct Objsafe tests for older msxml3.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: e108c2dbed783982132aa19fa3cfb8bb7fce230f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e108c2dbed783982132aa19fa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Sep 7 08:25:54 2011 +1000 msxml3: Correct Objsafe tests for older msxml3. --- dlls/msxml3/tests/domdoc.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 42b3b05..22fb3ae 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4458,10 +4458,10 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); ok_(__FILE__,line)(enabled == INTERFACESAFE_FOR_UNTRUSTED_CALLER, "Expected INTERFACESAFE_FOR_UNTRUSTED_CALLER got %08x\n", enabled); - ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_CALLER) || + ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, - "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", supported); + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " + "got %08x\n", supported); hr = IObjectSafety_SetInterfaceSafetyOptions(safety, NULL, INTERFACESAFE_FOR_UNTRUSTED_DATA, @@ -4469,12 +4469,13 @@ static void _test_IObjectSafety_common(unsigned line, IObjectSafety *safety) ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); hr = IObjectSafety_GetInterfaceSafetyOptions(safety, NULL, &supported, &enabled); ok_(__FILE__,line)(hr == S_OK, "ret %08x\n", hr ); - ok_(__FILE__,line)(enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), - "expected INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA got %08x\n", enabled); - ok_(__FILE__,line)(broken(supported == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + ok_(__FILE__,line)(broken(enabled == INTERFACESAFE_FOR_UNTRUSTED_DATA) || + enabled == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA), + "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA) got %08x\n", enabled); + ok_(__FILE__,line)(broken(supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA)) || supported == (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER) /* msxml3 SP8+ */, "Expected (INTERFACESAFE_FOR_UNTRUSTED_CALLER | INTERFACESAFE_FOR_UNTRUSTED_DATA | INTERFACE_USES_SECURITY_MANAGER), " - "got %08x\n", supported); + "got %08x\n", supported); } static void test_XMLHTTP(void)

1 0

Stefan Dösinger : ddraw: Add tests for dwZBufferBitDepth and dwMipMapCount values.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 73f9dd1c30a0046ebd7be9934f8dc952bf7d4c3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=73f9dd1c30a0046ebd7be9934… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 4 23:41:41 2011 +0200 ddraw: Add tests for dwZBufferBitDepth and dwMipMapCount values. --- dlls/ddraw/tests/dsurface.c | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a307579..6b23c70 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4137,7 +4137,7 @@ static void zbufferbitdepth_test(void) U2(ddsd).dwZBufferBitDepth); } -static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name) +static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const char *name, DWORD z_bit_depth) { IDirectDrawSurface *surface; IDirectDrawSurface7 *surface7; @@ -4166,6 +4166,8 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const if (expect_pf) { ok(out.dwFlags & DDSD_PIXELFORMAT, "%s surface: Expected DDSD_PIXELFORMAT to be set\n", name); + ok(out2.dwFlags & DDSD_PIXELFORMAT, + "%s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); } else { @@ -4176,12 +4178,20 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const if (expect_zd) { ok(out.dwFlags & DDSD_ZBUFFERBITDEPTH, "%s surface: Expected DDSD_ZBUFFERBITDEPTH to be set\n", name); + ok(U2(out).dwZBufferBitDepth == z_bit_depth, "ZBufferBitDepth is %u, expected %u\n", + U2(out).dwZBufferBitDepth, z_bit_depth); ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + /* dwMipMapCount and dwZBufferBitDepth share the same union */ + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } else { ok(!(out.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Expected DDSD_ZBUFFERBITDEPTH not to be set\n", name); + ok(U2(out).dwZBufferBitDepth == 0, "ZBufferBitDepth is %u, expected 0\n", U2(out).dwZBufferBitDepth); + ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), + "%s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } reset_ddsd(&out); @@ -4208,6 +4218,11 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const ok(!(out.dwFlags & DDSD_PIXELFORMAT), "Lock %s surface: Expected DDSD_PIXELFORMAT not to be set\n", name); } + if (out.dwFlags & DDSD_ZBUFFERBITDEPTH) + ok(U2(out).dwZBufferBitDepth == z_bit_depth, "ZBufferBitDepth is %u, expected %u\n", + U2(out).dwZBufferBitDepth, z_bit_depth); + else + ok(U2(out).dwZBufferBitDepth == 0, "ZBufferBitDepth is %u, expected 0\n", U2(out).dwZBufferBitDepth); } hr = IDirectDrawSurface7_Lock(surface7, NULL, &out2, 0, NULL); @@ -4221,6 +4236,7 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const "Lock %s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), "Lock %s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + ok(U2(out2).dwMipMapCount == 0, "dwMipMapCount is %u, expected 0\n", U2(out2).dwMipMapCount); } IDirectDrawSurface7_Release(surface7); @@ -4248,12 +4264,12 @@ static void pixelformat_flag_test(void) ddsd.dwWidth = 64; ddsd.dwHeight = 64; ddsd.ddsCaps.dwCaps = DDSCAPS_OFFSCREENPLAIN; - test_ddsd(&ddsd, TRUE, FALSE, "offscreen plain"); + test_ddsd(&ddsd, TRUE, FALSE, "offscreen plain", ~0U); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_CAPS; ddsd.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE; - test_ddsd(&ddsd, TRUE, FALSE, "primary"); + test_ddsd(&ddsd, TRUE, FALSE, "primary", ~0U); reset_ddsd(&ddsd); ddsd.dwFlags = DDSD_CAPS | DDSD_WIDTH | DDSD_HEIGHT | DDSD_ZBUFFERBITDEPTH; @@ -4261,7 +4277,7 @@ static void pixelformat_flag_test(void) ddsd.dwHeight = 64; U2(ddsd).dwZBufferBitDepth = 16; ddsd.ddsCaps.dwCaps = DDSCAPS_ZBUFFER; - test_ddsd(&ddsd, FALSE, TRUE, "Z buffer"); + test_ddsd(&ddsd, FALSE, TRUE, "Z buffer", 16); } static void set_surface_desc_test(void)

1 0

Stefan Dösinger : ddraw: Add tests for DDSD_PIXELFORMAT and DDSD_ZBUFFERBITDEPTH in Lock.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 4466d6223b3810c3b4341942a1bf2c040558a901 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4466d6223b3810c3b4341942a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 28 19:14:11 2011 +0200 ddraw: Add tests for DDSD_PIXELFORMAT and DDSD_ZBUFFERBITDEPTH in Lock. --- dlls/ddraw/tests/dsurface.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index a300d5e..a307579 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -4184,6 +4184,45 @@ static void test_ddsd(DDSURFACEDESC *ddsd, BOOL expect_pf, BOOL expect_zd, const ok(!(out.dwFlags & DDSD_ZBUFFERBITDEPTH), "%s surface: Expected DDSD_ZBUFFERBITDEPTH not to be set\n", name); } + reset_ddsd(&out); + hr = IDirectDrawSurface_Lock(surface, NULL, &out, 0, NULL); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface_Unlock(surface, NULL); + ok(SUCCEEDED(hr), "IDirectDrawSurface_GetSurfaceDesc failed, hr %#x.\n", hr); + + /* DDSD_ZBUFFERBITDEPTH is never set on Nvidia, but follows GetSurfaceDesc rules on AMD */ + if (!expect_zd) + { + ok(!(out.dwFlags & DDSD_ZBUFFERBITDEPTH), + "Lock %s surface: Expected DDSD_ZBUFFERBITDEPTH not to be set\n", name); + } + + /* DDSD_PIXELFORMAT follows GetSurfaceDesc rules */ + if (expect_pf) + { + ok(out.dwFlags & DDSD_PIXELFORMAT, "%s surface: Expected DDSD_PIXELFORMAT to be set\n", name); + } + else + { + ok(!(out.dwFlags & DDSD_PIXELFORMAT), + "Lock %s surface: Expected DDSD_PIXELFORMAT not to be set\n", name); + } + } + + hr = IDirectDrawSurface7_Lock(surface7, NULL, &out2, 0, NULL); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_Lock failed, hr %#x.\n", hr); + if (SUCCEEDED(hr)) + { + hr = IDirectDrawSurface7_Unlock(surface7, NULL); + ok(SUCCEEDED(hr), "IDirectDrawSurface7_Unlock failed, hr %#x.\n", hr); + /* DDSD_PIXELFORMAT is always set, DDSD_ZBUFFERBITDEPTH never */ + ok(out2.dwFlags & DDSD_PIXELFORMAT, + "Lock %s surface: Expected DDSD_PIXELFORMAT to be set in DDSURFACEDESC2\n", name); + ok(!(out2.dwFlags & DDSD_ZBUFFERBITDEPTH), + "Lock %s surface: Did not expect DDSD_ZBUFFERBITDEPTH to be set in DDSURFACEDESC2\n", name); + } + IDirectDrawSurface7_Release(surface7); IDirectDrawSurface_Release(surface); }

1 0

Stefan Dösinger : ddraw: Convert DDSURFACEDESC2 in lock.
by Alexandre Julliard 07 Sep '11

07 Sep '11

Module: wine Branch: master Commit: 029c5a6cf1785901d7f0591da2b54bf639220839 URL: http://source.winehq.org/git/wine.git/?a=commit;h=029c5a6cf1785901d7f0591da… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Sep 4 23:33:52 2011 +0200 ddraw: Convert DDSURFACEDESC2 in lock. --- dlls/ddraw/surface.c | 104 +++++++++++++++++++++++++++++++++++--------------- 1 files changed, 73 insertions(+), 31 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index abe3eed..081d4e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -875,18 +875,14 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ -static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, +static HRESULT WINAPI surface_lock(IDirectDrawSurfaceImpl *This, RECT *Rect, DDSURFACEDESC2 *DDSD, DWORD Flags, HANDLE h) { - IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); WINED3DLOCKED_RECT LockedRect; HRESULT hr; - TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", - iface, wine_dbgstr_rect(Rect), DDSD, Flags, h); - - if(!DDSD) - return DDERR_INVALIDPARAMS; + TRACE("This %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + This, wine_dbgstr_rect(Rect), DDSD, Flags, h); /* This->surface_desc.dwWidth and dwHeight are changeable, thus lock */ EnterCriticalSection(&ddraw_cs); @@ -897,14 +893,6 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, * for the supported values. The others are ignored by WineD3D */ - if(DDSD->dwSize != sizeof(DDSURFACEDESC) && - DDSD->dwSize != sizeof(DDSURFACEDESC2)) - { - WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", DDSD->dwSize); - LeaveCriticalSection(&ddraw_cs); - return DDERR_INVALIDPARAMS; - } - /* Windows zeroes this if the rect is invalid */ DDSD->lpSurface = 0; @@ -954,6 +942,23 @@ static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, return DD_OK; } +static HRESULT WINAPI ddraw_surface7_Lock(IDirectDrawSurface7 *iface, + RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE h) +{ + IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface7(iface); + TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", + iface, wine_dbgstr_rect(rect), surface_desc, flags, h); + + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + return surface_lock(This, rect, surface_desc, flags, h); +} + static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect, DDSURFACEDESC2 *surface_desc, DWORD flags, HANDLE h) { @@ -961,49 +966,86 @@ static HRESULT WINAPI ddraw_surface4_Lock(IDirectDrawSurface4 *iface, RECT *rect TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + return surface_lock(This, rect, surface_desc, flags, h); } static HRESULT WINAPI ddraw_surface3_Lock(IDirectDrawSurface3 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface3(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } static HRESULT WINAPI ddraw_surface2_Lock(IDirectDrawSurface2 *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface2(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member - * - * TODO: Test DDSD_ZBUFFERBITDEPTH behavior */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, DDSURFACEDESC *surface_desc, DWORD flags, HANDLE h) { IDirectDrawSurfaceImpl *This = impl_from_IDirectDrawSurface(iface); + DDSURFACEDESC2 surface_desc2; + HRESULT hr; TRACE("iface %p, rect %s, surface_desc %p, flags %#x, h %p.\n", iface, wine_dbgstr_rect(rect), surface_desc, flags, h); - /* All versions of Lock() accept both sizeof(DDSURFACEDESC) and - * sizeof(DDSURFACEDESC2) structures and do not touch the dwSize member */ - return ddraw_surface7_Lock(&This->IDirectDrawSurface7_iface, - rect, (DDSURFACEDESC2 *)surface_desc, flags, h); + if (!surface_desc) return DDERR_INVALIDPARAMS; + if (surface_desc->dwSize != sizeof(DDSURFACEDESC) && + surface_desc->dwSize != sizeof(DDSURFACEDESC2)) + { + WARN("Invalid structure size %d, returning DDERR_INVALIDPARAMS\n", surface_desc->dwSize); + return DDERR_INVALIDPARAMS; + } + + surface_desc2.dwSize = surface_desc->dwSize; + hr = surface_lock(This, rect, &surface_desc2, flags, h); + DDSD2_to_DDSD(&surface_desc2, surface_desc); + surface_desc->dwSize = surface_desc2.dwSize; + return hr; } /*****************************************************************************

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011