June 2013 - Wine-commits - list.winehq.org

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 8c2dda4d083d66ca67428f2ec1b02ae431c12589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2dda4d083d66ca67428f2ec… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Jun 18 22:59:55 2013 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6ae968f..972387f 100644 --- a/po/lt.po +++ b/po/lt.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: 2013-01-23 20:00+0300\n" +"PO-Revision-Date: 2013-06-18 22:58+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -13643,22 +13643,16 @@ msgid "Not yet implemented" msgstr "Dar nerealizuota" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Nepavyko sukurti.\n" +msgstr "Sukūrimo data" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Prieiga nesuteikta.\n" +msgstr "Kreipties data" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Liudijimo kelias" +msgstr "Pakeitimo data" #: winefile.rc:109 msgid "Index/Inode"

1 0

Lauri Kenttä : po: Update Swedish translation.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: fab0c9bea6240e598007ac49f47dbc7b8d64e09b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fab0c9bea6240e598007ac49f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Wed Jun 19 00:20:33 2013 +0300 po: Update Swedish translation. --- po/sv.po | 168 +++++++++++++++++++------------------------------------------ 1 files changed, 53 insertions(+), 115 deletions(-) diff --git a/po/sv.po b/po/sv.po index 1797c1b..e30807b 100644 --- a/po/sv.po +++ b/po/sv.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: 2012-06-06 21:20+0300\n" +"PO-Revision-Date: 2013-06-19 00:18+0300\n" "Last-Translator: Lauri Kenttä <lauri.kentta(a)gmail.com>\n" "Language-Team: none\n" "Language: Swedish\n" @@ -744,7 +744,7 @@ msgstr "Utskriftsformat" #: comdlg32.rc:432 msgid "&Tray:" -msgstr "" +msgstr "&Fack:" #: comdlg32.rc:435 wineps.rc:32 msgid "&Portrait" @@ -860,7 +860,7 @@ msgstr "Lista" #: comdlg32.rc:44 cryptui.rc:193 msgid "Details" -msgstr "Detaljerat" +msgstr "Detaljer" #: comdlg32.rc:45 msgid "Browse to Desktop" @@ -3042,7 +3042,7 @@ msgstr "Koreanska (Johab)" #: gdi32.rc:40 msgid "Symbol" -msgstr "" +msgstr "Symboler" #: gdi32.rc:41 msgid "OEM/DOS" @@ -3050,7 +3050,7 @@ msgstr "OEM/DOS" #: gdi32.rc:42 wldap32.rc:107 msgid "Other" -msgstr "" +msgstr "Annan" #: gphoto2.rc:27 msgid "Files on Camera" @@ -3455,10 +3455,8 @@ msgid "Test Force Feedback" msgstr "Testa kraftåterkoppling" #: joy.rc:64 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Tillgängliga format" +msgstr "Tillgängliga effekter" #: joy.rc:66 msgid "" @@ -3528,7 +3526,7 @@ msgstr "Oterminerad strängkonstant" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "'return' utanför funktion" #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -5152,7 +5150,7 @@ msgstr "Ingen symbol för personifiering.\n" #: winerror.mc:1956 msgid "Can't disable mandatory group.\n" -msgstr "Kan inte avaktivera obligatorisk grupp.\n" +msgstr "Kan inte inaktivera obligatorisk grupp.\n" #: winerror.mc:1961 msgid "No logon servers available.\n" @@ -5236,7 +5234,7 @@ msgstr "Lösenord utgånget.\n" #: winerror.mc:2061 msgid "Account disabled.\n" -msgstr "Kontot avaktiverat.\n" +msgstr "Kontot inaktiverat.\n" #: winerror.mc:2066 msgid "No security ID mapped.\n" @@ -5272,11 +5270,11 @@ msgstr "Felaktig ärvd ACL.\n" #: winerror.mc:2106 msgid "Server disabled.\n" -msgstr "Servern avaktiverad.\n" +msgstr "Servern inaktiverad.\n" #: winerror.mc:2111 msgid "Server not disabled.\n" -msgstr "Servern ej avaktiverad.\n" +msgstr "Servern ej inaktiverad.\n" #: winerror.mc:2116 msgid "Invalid ID authority.\n" @@ -8237,20 +8235,16 @@ msgid "Security Warning" msgstr "Säkerhetsvarning" #: urlmon.rc:32 -#, fuzzy -#| msgid "Do you want to continue anyway?" msgid "Do you want to install this software?" -msgstr "Vill du fortsätta ändå?" +msgstr "Vill du installera denna programvara?" #: urlmon.rc:34 explorer.rc:29 msgid "Location:" msgstr "Plats:" #: urlmon.rc:36 -#, fuzzy -#| msgid "Install/Uninstall" msgid "Don't install" -msgstr "Installera/Avinstallera" +msgstr "Installera inte" #: urlmon.rc:40 msgid "" @@ -8259,22 +8253,16 @@ msgid "" msgstr "" #: urlmon.rc:48 -#, fuzzy -#| msgid "Installation package failed to open.\n" msgid "Installation of component failed: %08x" -msgstr "Installationspaketet öppnades inte.\n" +msgstr "Installation av komponenten misslyckades: %08x" #: urlmon.rc:49 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Installera" +msgstr "Installera (%d)" #: urlmon.rc:50 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Installera" +msgstr "Installera" #: user32.rc:27 user32.rc:40 taskmgr.rc:138 msgctxt "window" @@ -9002,7 +8990,7 @@ msgstr "Lyckades" #: wldap32.rc:28 msgid "Operations Error" -msgstr "" +msgstr "Operationsfel" #: wldap32.rc:29 msgid "Protocol Error" @@ -9995,10 +9983,8 @@ msgid "Wine Command Prompt" msgstr "Wine kommandoprompt" #: cmd.rc:349 -#, fuzzy -#| msgid "CMD Version %1!S!\n" msgid "Wine CMD Version %1!S!\n" -msgstr "CMD Version %1!S!\n" +msgstr "Wine CMD version %1!S!\n" #: cmd.rc:350 msgid "More? " @@ -10038,10 +10024,8 @@ msgid "Expected an operand.\n" msgstr "" #: cmd.rc:359 -#, fuzzy -#| msgid "Unexpected network error.\n" msgid "Expected an operator.\n" -msgstr "Oväntat nätverksfel.\n" +msgstr "Operator förväntades.\n" #: cmd.rc:360 msgid "Mismatch in parentheses.\n" @@ -10100,10 +10084,8 @@ msgid "Connection-specific DNS suffix" msgstr "Anslutningsspecifikt DNS-suffix" #: ipconfig.rc:33 -#, fuzzy -#| msgid "IP address" msgid "IPv4 address" -msgstr "IP-adress" +msgstr "IPv4-adress" #: ipconfig.rc:34 msgid "Hostname" @@ -10146,10 +10128,8 @@ msgid "Default gateway" msgstr "Förvald gateway" #: ipconfig.rc:47 -#, fuzzy -#| msgid "IP address" msgid "IPv6 address" -msgstr "IP-adress" +msgstr "IPv6-adress" #: net.rc:27 msgid "" @@ -10282,152 +10262,116 @@ msgid "The following services are running:\n" msgstr "Följande tjänster körs:\n" #: netstat.rc:27 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Connections" -msgstr "LAN-anslutning" +msgstr "Aktiva anslutningar" #: netstat.rc:28 msgid "Proto" -msgstr "" +msgstr "Proto" #: netstat.rc:29 -#, fuzzy -#| msgid "Email Address" msgid "Local Address" -msgstr "E-postadress" +msgstr "Lokal adress" #: netstat.rc:30 -#, fuzzy -#| msgid "Street Address" msgid "Foreign Address" -msgstr "Postadress" +msgstr "Fjärradress" #: netstat.rc:31 -#, fuzzy -#| msgid "Status" msgid "State" -msgstr "Status" +msgstr "Tillstånd" #: netstat.rc:32 -#, fuzzy -#| msgid "Interfaces" msgid "Interface Statistics" -msgstr "Gränssnitt" +msgstr "Gränssnittsstatistik" #: netstat.rc:33 msgid "Sent" -msgstr "" +msgstr "Skickade" #: netstat.rc:34 msgid "Received" -msgstr "" +msgstr "Mottagna" #: netstat.rc:35 -#, fuzzy -#| msgid "bytes" msgid "Bytes" -msgstr "byte" +msgstr "Byte" #: netstat.rc:36 msgid "Unicast packets" -msgstr "" +msgstr "Unicast-paket" #: netstat.rc:37 msgid "Non-unicast packets" -msgstr "" +msgstr "Icke-unicast-paket" #: netstat.rc:38 -#, fuzzy -#| msgid "Disclaimer" msgid "Discards" -msgstr "Ansvarsfriskrivning" +msgstr "Ignorerade" #: netstat.rc:39 -#, fuzzy -#| msgid "Error" msgid "Errors" msgstr "Fel" #: netstat.rc:40 -#, fuzzy -#| msgid "Unknown port.\n" msgid "Unknown protocols" -msgstr "Okänd port.\n" +msgstr "Okända protokoll" #: netstat.rc:41 msgid "TCP Statistics for IPv4" -msgstr "" +msgstr "TCP-statistik för IPv4" #: netstat.rc:42 -#, fuzzy -#| msgid "LAN Connection" msgid "Active Opens" -msgstr "LAN-anslutning" +msgstr "Öppna aktiva" #: netstat.rc:43 msgid "Passive Opens" -msgstr "" +msgstr "Öppna passiva" #: netstat.rc:44 -#, fuzzy -#| msgid "LAN Connection" msgid "Failed Connection Attempts" -msgstr "LAN-anslutning" +msgstr "Misslyckade anslutningsförsök" #: netstat.rc:45 -#, fuzzy -#| msgid "LAN Connection" msgid "Reset Connections" -msgstr "LAN-anslutning" +msgstr "Återställda anslutningar" #: netstat.rc:46 -#, fuzzy -#| msgid "LAN Connection" msgid "Current Connections" -msgstr "LAN-anslutning" +msgstr "Aktuella anslutningar" #: netstat.rc:47 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Received" -msgstr "Segment låst.\n" +msgstr "Mottagna segment" #: netstat.rc:48 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Segments Sent" -msgstr "Segment låst.\n" +msgstr "Skickade segment" #: netstat.rc:49 msgid "Segments Retransmitted" -msgstr "" +msgstr "Återöverförda segment" #: netstat.rc:50 msgid "UDP Statistics for IPv4" -msgstr "" +msgstr "UDP-statistik för IPv4" #: netstat.rc:51 -#, fuzzy -#| msgid "Segment locked.\n" msgid "Datagrams Received" -msgstr "Segment låst.\n" +msgstr "Mottagna datagram" #: netstat.rc:52 -#, fuzzy -#| msgid "Local Port" msgid "No Ports" -msgstr "Lokal port" +msgstr "Inga portar" #: netstat.rc:53 -#, fuzzy -#| msgid "Error" msgid "Receive Errors" -msgstr "Fel" +msgstr "Mottagna fel" #: netstat.rc:54 msgid "Datagrams Sent" -msgstr "" +msgstr "Skickade datagram" #: notepad.rc:27 msgid "&New\tCtrl+N" @@ -10576,7 +10520,7 @@ msgstr "" #: notepad.rc:136 wordpad.rc:288 msgctxt "accelerator Save" msgid "S" -msgstr "" +msgstr "S" #: notepad.rc:137 msgctxt "accelerator Paste" @@ -13384,7 +13328,7 @@ msgstr "Misslyckades med att spara" #: winedbg.rc:41 msgid "Loading detailed information, please wait..." -msgstr "" +msgstr "Hämtar detaljerna, var god vänta..." #: winefile.rc:26 msgid "&Open\tEnter" @@ -13576,22 +13520,16 @@ msgid "Not yet implemented" msgstr "Inte implementerat ännu" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Kunde inte skapa.\n" +msgstr "Skapad" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Åtkomst nekad.\n" +msgstr "Åtkommen" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Certifieringssökväg" +msgstr "Modifierad" #: winefile.rc:109 msgid "Index/Inode"

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: af3846ddcb81636a9661c01d796956b73d601461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af3846ddcb81636a9661c01d7… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Jun 18 21:07:03 2013 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 122 ++++++++++++++++++++++++++++++----------------------------- 1 files changed, 62 insertions(+), 60 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af3846ddcb81636a9661c…

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 9c6cb7773357c15e7dcd3fb7792debd2dc89ca76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6cb7773357c15e7dcd3fb77… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Jun 19 11:36:19 2013 +0200 po: Update German translation. --- po/de.po | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/po/de.po b/po/de.po index 7a1c4d5..e252f19 100644 --- a/po/de.po +++ b/po/de.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: 2013-01-31 04:40+0100\n" +"PO-Revision-Date: 2013-06-19 11:34+0200\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -13721,22 +13721,16 @@ msgid "Not yet implemented" msgstr "Noch nicht implementiert" #: winefile.rc:106 -#, fuzzy -#| msgid "Creation failed.\n" msgid "Creation date" -msgstr "Erstellung fehlgeschlagen.\n" +msgstr "Erstellungsdatum" #: winefile.rc:107 -#, fuzzy -#| msgid "Access denied.\n" msgid "Access date" -msgstr "Zugriff verweigert.\n" +msgstr "Zugriffsdatum" #: winefile.rc:108 -#, fuzzy -#| msgid "Certification Path" msgid "Modification date" -msgstr "Zertifizierungspfad" +msgstr "Änderungsdatum" #: winefile.rc:109 msgid "Index/Inode"

1 0

Wei-Lun Chao : po: Update Chinese (Taiwan) translation.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 928462d70fc3905d02f99cad17a38fe47c1b2756 URL: http://source.winehq.org/git/wine.git/?a=commit;h=928462d70fc3905d02f99cad1… Author: Wei-Lun Chao <bluebat(a)member.fsf.org> Date: Thu Jun 20 00:16:08 2013 +0800 po: Update Chinese (Taiwan) translation. --- po/zh_TW.po | 446 ++++++++++++++++++++++++++--------------------------------- 1 files changed, 194 insertions(+), 252 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=928462d70fc3905d02f99…

1 0

Alistair Leslie-Hughes : wine.inf: Install msdaps. dll into the correct directory.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: ff9039d94d2f2dc2bd646c23afb4d80cda19b412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff9039d94d2f2dc2bd646c23a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 18 14:10:46 2013 +1000 wine.inf: Install msdaps.dll into the correct directory. --- tools/wine.inf.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 22c9df0..6636a94 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -2540,6 +2540,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,wbem,wmiutils.dll 16422,Internet Explorer,iexplore.exe 16427,System\OLE DB,oledb32.dll +16427,System\OLE DB,msdaps.dll 11,,* [SystemIni]

1 0

Dmitry Timoshkov : gdiplus: get_font_hfont() should ask gdi32 to match font height against the character height instead of cell height .
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 84ef3d484ca52bd403e18248d98bd9343424fb9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ef3d484ca52bd403e18248d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 19 17:23:27 2013 +0900 gdiplus: get_font_hfont() should ask gdi32 to match font height against the character height instead of cell height. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/font.c | 43 ++++++++++++---------------------------- dlls/gdiplus/tests/graphics.c | 1 - 3 files changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 10a6402..dcdc29e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2099,7 +2099,7 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); get_log_fontW(font, graphics, &lfw); - lfw.lfHeight = gdip_round(font_height * rel_height); + lfw.lfHeight = -gdip_round(font_height * rel_height); unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index de6d657..29d4ad5 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -877,26 +877,21 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 1.0); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.5); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.5); /* scale matrix */ status = GdipScaleMatrix(matrix, 2.0, 3.0, MatrixOrderAppend); @@ -926,17 +921,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.05); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -975,17 +967,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.05); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -1026,17 +1015,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine - expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(-100.0, bounds.Y, 0.2); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); @@ -1077,17 +1063,14 @@ todo_wine expect(Ok, status); expectf(0.0, bounds.X); expectf(0.0, bounds.Y); -todo_wine - expectf(height, bounds.Height); + expectf_(height, bounds.Height, 0.1); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, NULL, &bounds); expect(Ok, status); expectf(0.0, bounds.X); -todo_wine - expectf_(-100.0, bounds.Y, 0.05); -todo_wine - expectf(height, bounds.Height); + expectf_(-100.0, bounds.Y, 0.2); + expectf_(height, bounds.Height, 0.2); set_rect_empty(&bounds); status = GdipMeasureDriverString(graphics, (const UINT16 *)string, -1, font, pos, DriverStringOptionsCmapLookup, matrix, &bounds); diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 5de0602..6ed1463 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -3901,7 +3901,6 @@ todo_wine match = fabs(1.0 - margin / rect.X) <= 0.05; ok(match, "Expected %f, got %f\n", margin, rect.X); match = fabs(1.0 - font_height / rect.Height) <= 0.1; -todo_wine ok(match, "Expected %f, got %f\n", font_height, rect.Height); match = fabs(1.0 - bounds.Width / (rect.Width + margin * 2.0)) <= 0.05; ok(match, "Expected %f, got %f\n", bounds.Width, rect.Width + margin * 2.0);

1 0

Alexandre Julliard : Use the official Microsoft definitions for Gaelic languages.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 28ece74fd8a72048191df5fcbde92d21ec7090f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ece74fd8a72048191df5fcb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 12:55:17 2013 +0200 Use the official Microsoft definitions for Gaelic languages. --- dlls/kernel32/locale_rc.rc | 9 +++++---- dlls/kernel32/nls/cor.nls | 2 +- dlls/kernel32/nls/gae.nls | 6 +++--- dlls/kernel32/nls/gdh.nls | 6 +++--- dlls/kernel32/nls/gdv.nls | 4 ++-- dlls/kernel32/tests/locale.c | 4 ++-- dlls/oleaut32/hash.c | 4 ++-- include/winnt.rh | 10 +++++----- tools/widl/hash.c | 6 +++--- tools/wine.inf.in | 4 ++-- tools/wmc/po.c | 11 ++++++----- tools/wrc/po.c | 11 ++++++----- tools/wrc/translation.c | 3 ++- tools/wrc/utils.c | 7 ++++--- 14 files changed, 46 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=28ece74fd8a72048191df…

1 0

Alexandre Julliard : make_unicode: Cache files under their full path name to avoid conflicts.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: 2c4e5ad1a9263ca8cbf69b5b3d33699d12b9ce7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c4e5ad1a9263ca8cbf69b5b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 19 16:05:18 2013 +0200 make_unicode: Cache files under their full path name to avoid conflicts. --- tools/make_unicode | 48 +++++++++++++++++++++++++----------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/tools/make_unicode b/tools/make_unicode index 9d2d8a7..59c75ab 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -24,12 +24,14 @@ use strict; # base URLs for www.unicode.org files my $MAPPINGS = "http://www.unicode.org/Public/MAPPINGS"; my $UNIDATA = "http://www.unicode.org/Public/6.0.0/ucd"; +my $REPORTS = "http://www.unicode.org/reports"; +my $RFCS = "http://www.rfc-editor.org/rfc"; # Sort keys file -my $SORTKEYS = "http://www.unicode.org/reports/tr10/allkeys.txt"; +my $SORTKEYS = "tr10/allkeys.txt"; # RFC3454 (stringprep data) -my $STRINGPREP = "http://www.rfc-editor.org/rfc/rfc3454.txt"; +my $STRINGPREP = "rfc3454.txt"; # Defaults mapping my $DEFAULTS = "tools/unicode-defaults"; @@ -319,16 +321,16 @@ my %joining_forms = ################################################################ # fetch a unicode.org file and open it -sub open_data_file($) +sub open_data_file($$) { - my $url = shift; - (my $name = $url) =~ s/^.*\///; + my ($base, $name) = @_; + (my $dir = "data/$name") =~ s/\/[^\/]+$//; local *FILE; unless (-f "data/$name") { - print "Fetching $url...\n"; - mkdir "data"; - !system "wget", "-q", "-O", "data/$name", $url or die "cannot fetch $url"; + print "Fetching $base/$name...\n"; + system "mkdir", "-p", $dir; + !system "wget", "-q", "-O", "data/$name", "$base/$name" or die "cannot fetch $base/$name"; } open FILE, "<data/$name" or die "cannot open data/$name"; return *FILE; @@ -370,7 +372,7 @@ sub READ_DEFAULTS($) # now build mappings from the decomposition field of the Unicode database - my $UNICODE_DATA = open_data_file "$UNIDATA/UnicodeData.txt"; + my $UNICODE_DATA = open_data_file( $UNIDATA, "UnicodeData.txt" ); while (<$UNICODE_DATA>) { # Decode the fields ... @@ -497,7 +499,7 @@ sub READ_DEFAULTS($) sub READ_FILE($) { my $name = shift; - my $INPUT = open_data_file $name; + my $INPUT = open_data_file( $MAPPINGS, $name ); while (<$INPUT>) { @@ -623,7 +625,7 @@ sub READ_JIS0208_FILE($) $cp2uni[0xa1c0] = 0xff3c; $uni2cp[0xff3c] = 0xa1c0; - my $INPUT = open_data_file $name; + my $INPUT = open_data_file( $MAPPINGS, $name ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -650,7 +652,7 @@ sub READ_SORTKEYS_FILE() my @sortkeys = (); for (my $i = 0; $i < 65536; $i++) { $sortkeys[$i] = [ -1, 0, 0, 0, 0 ] }; - my $INPUT = open_data_file $SORTKEYS; + my $INPUT = open_data_file( $REPORTS, $SORTKEYS ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -757,7 +759,7 @@ sub DUMP_SORTKEYS($@) open OUTPUT,">$filename.new" or die "Cannot create $filename"; printf "Building $filename\n"; printf OUTPUT "/* Unicode collation element table */\n"; - printf OUTPUT "/* generated from %s */\n", $SORTKEYS; + printf OUTPUT "/* generated from %s */\n", "$REPORTS/$SORTKEYS"; printf OUTPUT "/* DO NOT EDIT!! */\n\n"; printf OUTPUT "const unsigned int collation_table[%d] =\n{\n", $ranges*256; @@ -1062,7 +1064,7 @@ sub dump_indic($) my $filename = shift; my @indic_table = ($indic_types{'Other'}) x 65536;; - my $INPUT = open_data_file "$UNIDATA/IndicSyllabicCategory.txt"; + my $INPUT = open_data_file( $UNIDATA, "IndicSyllabicCategory.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1095,7 +1097,7 @@ sub dump_indic($) } close $INPUT; - $INPUT = open_data_file "$UNIDATA/IndicMatraCategory.txt"; + $INPUT = open_data_file( $UNIDATA, "IndicMatraCategory.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1144,7 +1146,7 @@ sub dump_linebreak($) my @break_table = ($break_types{'XX'}) x 65536;; my $next_group = 0; - my $INPUT = open_data_file "$UNIDATA/LineBreak.txt"; + my $INPUT = open_data_file( $UNIDATA, "LineBreak.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1192,7 +1194,7 @@ sub dump_mirroring($) my $filename = shift; my @mirror_table = (); - my $INPUT = open_data_file "$UNIDATA/BidiMirroring.txt"; + my $INPUT = open_data_file( $UNIDATA, "BidiMirroring.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1229,7 +1231,7 @@ sub dump_shaping($) $groups{"No_Joining_Group"} = $next_group++; - my $INPUT = open_data_file "$UNIDATA/ArabicShaping.txt"; + my $INPUT = open_data_file( $UNIDATA, "ArabicShaping.txt" ); while (<$INPUT>) { next if /^\#/; # skip comments @@ -1572,7 +1574,7 @@ sub dump_nameprep($) my @mapping_table = (); my @flags_table = (0) x 65536; - my $INPUT = open_data_file $STRINGPREP; + my $INPUT = open_data_file( $RFCS, $STRINGPREP ); while (<$INPUT>) { next unless /Start\sTable/; @@ -1598,7 +1600,7 @@ sub dump_nameprep($) open OUTPUT,">$filename.new" or die "Cannot create $filename"; print "Building $filename\n"; print OUTPUT "/* Nameprep algorithm related data */\n"; - print OUTPUT "/* generated from $STRINGPREP */\n"; + print OUTPUT "/* generated from $RFCS/$STRINGPREP */\n"; print OUTPUT "/* DO NOT EDIT!! */\n\n"; print OUTPUT "#include \"wine/unicode.h\"\n\n"; @@ -1857,7 +1859,7 @@ sub handle_bestfit_file($$$) my ($lb_cur, $lb_end); my @lb_ranges = (); - my $INPUT = open_data_file "$MAPPINGS/$filename" or die "Cannot open $filename"; + my $INPUT = open_data_file( $MAPPINGS, $filename ) or die "Cannot open $filename"; while (<$INPUT>) { @@ -1961,14 +1963,14 @@ sub HANDLE_FILE(@) @uni2cp = (); # symbol codepage file is special - if ($codepage == 20932) { READ_JIS0208_FILE "$MAPPINGS/$filename"; } + if ($codepage == 20932) { READ_JIS0208_FILE( $filename ); } elsif ($codepage == 20127) { fill_20127_codepage(); } elsif ($filename =~ /\/bestfit/) { handle_bestfit_file( $filename, $has_glyphs, $comment ); return; } - else { READ_FILE "$MAPPINGS/$filename"; } + else { READ_FILE( $filename ); } ADD_DEFAULT_MAPPINGS();

1 0

Alistair Leslie-Hughes : oledb32: Add more database tests.
by Alexandre Julliard 19 Jun '13

19 Jun '13

Module: wine Branch: master Commit: ba16113dc50ad22b8a6ebf1dd0aefce6e25417bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba16113dc50ad22b8a6ebf1dd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 19 08:20:38 2013 +1000 oledb32: Add more database tests. --- dlls/oledb32/tests/database.c | 66 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 65 insertions(+), 1 deletions(-) diff --git a/dlls/oledb32/tests/database.c b/dlls/oledb32/tests/database.c index 216adc6..9a0ee20 100644 --- a/dlls/oledb32/tests/database.c +++ b/dlls/oledb32/tests/database.c @@ -28,9 +28,14 @@ #include "msdadc.h" #include "msdasc.h" #include "shlobj.h" +#include "initguid.h" #include "wine/test.h" +DEFINE_GUID(CSLID_MSDAER, 0xc8b522cf,0x5cf3,0x11ce,0xad,0xe5,0x00,0xaa,0x00,0x44,0x77,0x3d); + +static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; + static void test_GetDataSource(WCHAR *initstring) { IDataInitialize *datainit = NULL; @@ -96,7 +101,6 @@ static void test_database(void) 'J','e','t','.','O','L','E','D','B','.','4','.','0',';', 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';', 'P','e','r','s','i','s','t',' ','S','e','c','u','r','i','t','y',' ','I','n','f','o','=','F','a','l','s','e',';',0}; - static WCHAR initstring_default[] = {'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y',';',0}; static WCHAR initstring_lower[] = {'d','a','t','a',' ','s','o','u','r','c','e','=','d','u','m','m','y',';',0}; IDataInitialize *datainit = NULL; HRESULT hr; @@ -115,11 +119,71 @@ static void test_database(void) test_GetDataSource(initstring_lower); } +static void test_errorinfo(void) +{ + HRESULT hr; + IUnknown *unk = NULL; + + hr = CoCreateInstance(&CSLID_MSDAER, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown,(void**)&unk); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + IErrorInfo *errorinfo; + + hr = IUnknown_QueryInterface(unk, &IID_IErrorInfo, (void**)&errorinfo); + ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + IErrorInfo_Release(errorinfo); + } + + IUnknown_Release(unk); + } +} + +static void test_initializationstring(void) +{ + static WCHAR initstring_msdasql[] = {'P','r','o','v','i','d','e','r','=','M','S','D','A','S','Q','L','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + static WCHAR initstring_sqloledb[] = {'P','r','o','v','i','d','e','r','=','S','Q','L','O','L','E','D','B','.','1',';', + 'D','a','t','a',' ','S','o','u','r','c','e','=','d','u','m','m','y', 0}; + IDataInitialize *datainit = NULL; + IDBInitialize *dbinit = NULL; + HRESULT hr; + WCHAR *initstring = NULL; + + hr = CoCreateInstance(&CLSID_MSDAINITIALIZE, NULL, CLSCTX_INPROC_SERVER, &IID_IDataInitialize,(void**)&datainit); + ok(hr == S_OK, "got %08x\n", hr); + if(SUCCEEDED(hr)) + { + hr = IDataInitialize_GetDataSource(datainit, NULL, CLSCTX_INPROC_SERVER, initstring_default, + &IID_IDBInitialize, (IUnknown**)&dbinit); + if(SUCCEEDED(hr)) + { + hr = IDataInitialize_GetInitializationString(datainit, (IUnknown*)dbinit, 0, &initstring); + ok(hr == S_OK, "got %08x\n", hr); + if(hr == S_OK) + { + trace("Init String: %s\n", wine_dbgstr_w(initstring)); + todo_wine ok(!lstrcmpW(initstring_msdasql, initstring) || + !lstrcmpW(initstring_sqloledb, initstring), "got %s\n", wine_dbgstr_w(initstring)); + CoTaskMemFree(initstring); + } + + IDBInitialize_Release(dbinit); + } + + IDataInitialize_Release(datainit); + } +} + START_TEST(database) { OleInitialize(NULL); test_database(); + test_errorinfo(); + test_initializationstring(); OleUninitialize(); }

1 0