wine-commits June 2013

wine-commits@winehq.org

2 participants
411 discussions

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

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

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

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

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

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

Hans Leidekker : msi/tests: Avoid test failures caused by broken MsiGetFileVersionA.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: 407584fd3ebaadc8a7ca62a18d47023393e2d37e URL: http://source.winehq.org/git/wine.git/?a=commit;h=407584fd3ebaadc8a7ca62a18… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 18 16:55:57 2013 +0200 msi/tests: Avoid test failures caused by broken MsiGetFileVersionA. --- dlls/msi/tests/msi.c | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index 1bffbf9..5df72e9 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -4010,8 +4010,15 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, version, &versz, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + if (langchecksz && !langsz) + { + win_skip("broken MsiGetFileVersionA detected\n"); + HeapFree(GetProcessHeap(), 0, vercheck); + HeapFree(GetProcessHeap(), 0, langcheck); + return; + } ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); @@ -4029,7 +4036,7 @@ static void test_MsiGetFileVersion(void) lstrcpyA(lang, "lang"); r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(strstr(lang, langcheck) != NULL, "Expected %s in %s\n", langcheck, lang); + ok(strstr(lang, langcheck) != NULL, "Expected \"%s\" in \"%s\"\n", langcheck, lang); /* check neither version nor language */ r = MsiGetFileVersionA(path, NULL, NULL, NULL, NULL); @@ -4053,7 +4060,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, NULL); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(version, vercheck, 4), - "Expected first 4 characters of %s, got %s\n", vercheck, version); + "Expected first 4 characters of \"%s\", got \"%s\"\n", vercheck, version); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); /* pcchLangBuf not big enough */ @@ -4062,7 +4069,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, NULL, NULL, lang, &langsz); ok(r == ERROR_MORE_DATA, "Expected ERROR_MORE_DATA, got %d\n", r); ok(!strncmp(lang, langcheck, 2), - "Expected first character of %s, got %s\n", langcheck, lang); + "Expected first character of \"%s\", got \"%s\"\n", langcheck, lang); ok(langsz >= langchecksz, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf big enough, pcchLangBuf not big enough */ @@ -4072,7 +4079,7 @@ static void test_MsiGetFileVersion(void) r = MsiGetFileVersionA(path, version, &versz, NULL, &langsz); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); ok(versz == verchecksz, "Expected %d, got %d\n", verchecksz, versz); - ok(!lstrcmpA(version, vercheck), "Expected %s, got %s\n", vercheck, version); + ok(!lstrcmpA(version, vercheck), "Expected \"%s\", got \"%s\"\n", vercheck, version); ok(langsz >= langchecksz && langsz < MAX_PATH, "Expected %d >= %d\n", langsz, langchecksz); /* pcchVersionBuf not big enough, pcchLangBuf big enough */

1 0

Hans Leidekker : wbemprox/tests: Mark a test result as broken.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: cd51d513c4c171f8fe755878cde6fbdbad4dfcd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd51d513c4c171f8fe755878c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jun 18 16:55:33 2013 +0200 wbemprox/tests: Mark a test result as broken. --- dlls/wbemprox/tests/query.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index f09da91..8134e3a 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -583,7 +583,7 @@ static void test_notification_query_async( IWbemServices *services ) prev_sink_refs = sink_refs; hr = IWbemServices_ExecNotificationQueryAsync( services, wql, query, 0, NULL, &sink ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr ); - ok( sink_refs > prev_sink_refs, "got %u refs\n", sink_refs ); + ok( sink_refs > prev_sink_refs || broken(!sink_refs), "got %u refs\n", sink_refs ); hr = IWbemServices_CancelAsyncCall( services, &sink ); ok( hr == S_OK || broken(hr == WBEM_E_NOT_FOUND), "got %08x\n", hr );

1 0

Ken Thomases : winemac: Cope with apps which return multiple DROPEFFECTs from IDropTarget:: DragEnter() and DragOver().
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: 300b231107388c38c89fdfe74415706486394fb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300b231107388c38c89fdfe74… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Jun 18 05:42:42 2013 -0500 winemac: Cope with apps which return multiple DROPEFFECTs from IDropTarget::DragEnter() and DragOver(). --- dlls/winemac.drv/dragdrop.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index f7e797b..612a868 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -307,12 +307,11 @@ static DWORD drag_operations_to_dropeffects(uint32_t ops) */ static uint32_t dropeffect_to_drag_operation(DWORD effect, uint32_t ops) { - switch (effect) - { - case DROPEFFECT_COPY: return (ops & DRAG_OP_COPY) ? DRAG_OP_COPY : DRAG_OP_GENERIC; - case DROPEFFECT_MOVE: return DRAG_OP_MOVE; - case DROPEFFECT_LINK: return (ops & DRAG_OP_LINK) ? DRAG_OP_LINK : DRAG_OP_GENERIC; - } + if (effect & DROPEFFECT_LINK && ops & DRAG_OP_LINK) return DRAG_OP_LINK; + if (effect & DROPEFFECT_COPY && ops & DRAG_OP_COPY) return DRAG_OP_COPY; + if (effect & DROPEFFECT_MOVE && ops & DRAG_OP_MOVE) return DRAG_OP_MOVE; + if (effect & DROPEFFECT_LINK && ops & DRAG_OP_GENERIC) return DRAG_OP_GENERIC; + if (effect & DROPEFFECT_COPY && ops & DRAG_OP_GENERIC) return DRAG_OP_GENERIC; return DRAG_OP_NONE; }

1 0

André Hentschel : ws2_32: Don' t use autoheader styled define.
by Alexandre Julliard 18 Jun '13

18 Jun '13

Module: wine Branch: master Commit: f208e9ef07f07e4bf608a5f1128a646d89eb7d17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f208e9ef07f07e4bf608a5f11… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Jun 17 21:56:52 2013 +0200 ws2_32: Don't use autoheader styled define. --- dlls/ws2_32/socket.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 80b317a..98bb426 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -98,7 +98,7 @@ #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> -# define HAVE_IPX +# define HAS_IPX #elif defined(HAVE_LINUX_IPX_H) # ifdef HAVE_ASM_TYPES_H # include <asm/types.h> @@ -107,7 +107,7 @@ # include <linux/types.h> # endif # include <linux/ipx.h> -# define HAVE_IPX +# define HAS_IPX #endif #ifdef HAVE_LINUX_IRDA_H @@ -115,7 +115,7 @@ # include <linux/types.h> # endif # include <linux/irda.h> -# define HAVE_IRDA +# define HAS_IRDA #endif #ifdef HAVE_POLL_H @@ -153,7 +153,7 @@ #include "wine/exception.h" #include "wine/unicode.h" -#ifdef HAVE_IPX +#ifdef HAS_IPX # include "wsnwlink.h" #endif @@ -438,7 +438,7 @@ static const int ws_af_map[][2] = MAP_OPTION( AF_UNSPEC ), MAP_OPTION( AF_INET ), MAP_OPTION( AF_INET6 ), -#ifdef HAVE_IPX +#ifdef HAS_IPX MAP_OPTION( AF_IPX ), #endif #ifdef AF_IRDA @@ -1218,11 +1218,11 @@ static inline BOOL supported_pf(int pf) case WS_AF_INET: case WS_AF_INET6: return TRUE; -#ifdef HAVE_IPX +#ifdef HAS_IPX case WS_AF_IPX: return TRUE; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_AF_IRDA: return TRUE; #endif @@ -1244,7 +1244,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd switch (wsaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case WS_AF_IPX: { const struct WS_sockaddr_ipx* wsipx=(const struct WS_sockaddr_ipx*)wsaddr; @@ -1302,7 +1302,7 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd memcpy(&uin->sin_addr,&win->sin_addr,4); /* 4 bytes = 32 address bits */ break; } -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_AF_IRDA: { struct sockaddr_irda *uin = (struct sockaddr_irda *)uaddr; const SOCKADDR_IRDA *win = (const SOCKADDR_IRDA *)wsaddr; @@ -1335,12 +1335,12 @@ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsadd case sizeof(struct WS_sockaddr_in): uaddrlen = sizeof(struct sockaddr_in); break; -#ifdef HAVE_IPX +#ifdef HAS_IPX case sizeof(struct WS_sockaddr_ipx): uaddrlen = sizeof(struct sockaddr_ipx); break; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case sizeof(SOCKADDR_IRDA): uaddrlen = sizeof(struct sockaddr_irda); break; @@ -1364,7 +1364,7 @@ static BOOL is_sockaddr_bound(const struct sockaddr *uaddr, int uaddrlen) { switch (uaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case AF_IPX: FIXME("don't know how to tell if IPX socket is bound, assuming it is!\n"); return TRUE; @@ -1396,7 +1396,7 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws switch(uaddr->sa_family) { -#ifdef HAVE_IPX +#ifdef HAS_IPX case AF_IPX: { const struct sockaddr_ipx* uipx=(const struct sockaddr_ipx*)uaddr; @@ -1436,7 +1436,7 @@ static int ws_sockaddr_u2ws(const struct sockaddr* uaddr, struct WS_sockaddr* ws } break; #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case AF_IRDA: { const struct sockaddr_irda *uin = (const struct sockaddr_irda *)uaddr; SOCKADDR_IRDA *win = (SOCKADDR_IRDA *)wsaddr; @@ -1772,7 +1772,7 @@ static int WS2_send( int fd, struct ws2_async *wsa ) return -1; } -#if defined(HAVE_IPX) && defined(SOL_IPX) +#if defined(HAS_IPX) && defined(SOL_IPX) if(wsa->addr->sa_family == WS_AF_IPX) { struct sockaddr_ipx* uipx = (struct sockaddr_ipx*)hdr.msg_name; @@ -2806,7 +2806,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; } /* end switch(optname) */ }/* end case WS_SOL_SOCKET */ -#ifdef HAVE_IPX +#ifdef HAS_IPX case NSPROTO_IPX: { struct WS_sockaddr_ipx addr; @@ -2872,7 +2872,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } /* end case NSPROTO_IPX */ #endif -#ifdef HAVE_IRDA +#ifdef HAS_IRDA case WS_SOL_IRLMP: switch(optname) { @@ -4342,7 +4342,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, } break; /* case WS_SOL_SOCKET */ -#ifdef HAVE_IPX +#ifdef HAS_IPX case NSPROTO_IPX: switch(optname) {

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
42
Older →

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 June 2013