March 2012 - Wine-commits - list.winehq.org

Huw Davies : gdi32: Correctly propagate the enumproc's return value.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 41fb856961449fdb303ec9c1ffa7d6073ff86254 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41fb856961449fdb303ec9c1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 14 14:15:13 2012 +0000 gdi32: Correctly propagate the enumproc's return value. --- dlls/gdi32/font.c | 7 +++++-- dlls/gdi32/tests/font.c | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 4191904..74a7e27 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -121,6 +121,7 @@ struct font_enum LPARAM lpData; BOOL unicode; HDC hdc; + INT retval; }; /* @@ -721,6 +722,7 @@ static INT CALLBACK FONT_EnumInstance( const LOGFONTW *plf, const TEXTMETRICW *p ptm = (TEXTMETRICW *)&tmA; } ret = pfe->lpEnumFunc( plf, ptm, fType, pfe->lpData ); + pfe->retval = ret; } return ret; } @@ -745,10 +747,11 @@ static INT FONT_EnumFontFamiliesEx( HDC hDC, LPLOGFONTW plf, FONTENUMPROCW efpro fe.lpData = lParam; fe.unicode = unicode; fe.hdc = hDC; - ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); + fe.retval = 1; + ret = physdev->funcs->pEnumFonts( physdev, plf, FONT_EnumInstance, (LPARAM)&fe ); release_dc_ptr( dc ); } - return ret; + return ret ? fe.retval : 0; } /*********************************************************************** diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d004cf4..d104452 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -3756,6 +3756,11 @@ static INT CALLBACK enum_all_fonts_proc(const LOGFONT *elf, const TEXTMETRIC *nt return 1; } +static INT CALLBACK enum_with_magic_retval_proc(const LOGFONT *elf, const TEXTMETRIC *ntm, DWORD type, LPARAM lparam) +{ + return lparam; +} + static void test_EnumFonts(void) { int ret; @@ -3777,6 +3782,10 @@ static void test_EnumFonts(void) hdc = CreateCompatibleDC(0); + /* check that the enumproc's retval is returned */ + ret = EnumFontFamilies(hdc, NULL, enum_with_magic_retval_proc, 0xcafe); + ok(ret == 0xcafe, "got %08x\n", ret); + ret = EnumFontFamilies(hdc, "Arial", enum_fonts_proc, (LPARAM)&lf); ok(!ret, "font Arial is not enumerated\n"); ret = strcmp(lf.lfFaceName, "Arial");

1 0

Jacek Caban : jscript: Get rid of no longer needed caller argument from builtin_invoke_t.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 84ed86c4311dcf00b839ccef2b3a613a2b7ecc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=84ed86c4311dcf00b839ccef2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 14 12:32:43 2012 +0100 jscript: Get rid of no longer needed caller argument from builtin_invoke_t. --- dlls/jscript/activex.c | 2 +- dlls/jscript/array.c | 41 +++++++++--------- dlls/jscript/bool.c | 8 ++-- dlls/jscript/date.c | 98 ++++++++++++++++++++++---------------------- dlls/jscript/dispex.c | 8 ++-- dlls/jscript/error.c | 20 ++++---- dlls/jscript/function.c | 46 ++++++++++---------- dlls/jscript/global.c | 106 +++++++++++++++++++++++----------------------- dlls/jscript/jscript.h | 4 +- dlls/jscript/math.c | 36 ++++++++-------- dlls/jscript/number.c | 16 ++++---- dlls/jscript/object.c | 16 ++++---- dlls/jscript/regexp.c | 24 +++++----- dlls/jscript/string.c | 102 ++++++++++++++++++++++---------------------- dlls/jscript/vbarray.c | 14 +++--- 15 files changed, 270 insertions(+), 271 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=84ed86c4311dcf00b839c…

1 0

Jacek Caban : mshtml: Wine Gecko 1.5 release.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 23c6fddea3251a870e5bdfc2af174f39a3b00493 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23c6fddea3251a870e5bdfc2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 14 14:45:32 2012 +0100 mshtml: Wine Gecko 1.5 release. --- dlls/appwiz.cpl/addons.c | 6 +- dlls/mshtml/htmlelem.c | 70 +------- dlls/mshtml/htmlelem2.c | 153 +++--------------- dlls/mshtml/mutation.c | 10 +- dlls/mshtml/nsiface.idl | 410 +++++++++++++++++++++++++++------------------ dlls/mshtml/nsio.c | 74 ++++++--- 6 files changed, 333 insertions(+), 390 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=23c6fddea3251a870e5bd…

1 0

Christian Costa : d3drm: Fix some tests conditions.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 02333447996cd90717a23a5623212383230aae80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02333447996cd90717a23a562… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 09:06:19 2012 +0100 d3drm: Fix some tests conditions. --- dlls/d3drm/meshbuilder.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 5885062..9b037c1 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1163,7 +1163,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* TRACE("Found object type whose GUID = %s\n", debugstr_guid(pGuid)); - if (!IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) + if (IsEqualGUID(pGuid, &TID_D3DRMMeshNormals)) { DWORD tmp; @@ -1179,7 +1179,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* This->pNormals = HeapAlloc(GetProcessHeap(), 0, This->nb_normals * sizeof(D3DVECTOR)); memcpy(This->pNormals, ptr + sizeof(DWORD), This->nb_normals * sizeof(D3DVECTOR)); } - else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) + else if (IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) { hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) @@ -1193,7 +1193,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* memcpy(This->pCoords2d, ptr + sizeof(DWORD), This->nb_coords2d * sizeof(Coords2d)); } - else if(!IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) + else if (IsEqualGUID(pGuid, &TID_D3DRMMeshMaterialList)) { FIXME("MeshMaterialList not supported yet, ignoring...\n"); }

1 0

Christian Costa : d3drm: Get data from the right objects (sub-objects).
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 5b1cc4682b52d08c05343a952d0396ed7b520878 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b1cc4682b52d08c05343a952… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 09:06:51 2012 +0100 d3drm: Get data from the right objects (sub-objects). --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 9b037c1..0cb3ea7 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1167,7 +1167,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* { DWORD tmp; - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end; @@ -1181,7 +1181,7 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* } else if (IsEqualGUID(pGuid, &TID_D3DRMMeshTextureCoords)) { - hr = IDirectXFileData_GetData(pData, NULL, &size, (void**)&ptr); + hr = IDirectXFileData_GetData(pData2, NULL, &size, (void**)&ptr); if (hr != DXFILE_OK) goto end;

1 0

Christian Costa : d3drm: Complete Load method by adding normals indices and terminating null DWORD to faces data + tests .
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 7294b417e3af9df28a08b06554140f3a91defba3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7294b417e3af9df28a08b0655… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Mar 14 09:06:59 2012 +0100 d3drm: Complete Load method by adding normals indices and terminating null DWORD to faces data + tests. --- dlls/d3drm/meshbuilder.c | 84 +++++++++++++++++++++++++++++++++++++----- dlls/d3drm/tests/d3drm.c | 91 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 164 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7294b417e3af9df28a08b…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 610b04421c1a572d43fbffe876cfa9a3bb07c4e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610b04421c1a572d43fbffe87… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 14 12:21:20 2012 +0300 po: Update Russian translation. --- po/ru.po | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-) diff --git a/po/ru.po b/po/ru.po index 927d43d..532fd6a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -2186,16 +2186,12 @@ msgstr "" "содержаться в файлах следующих форматов:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Сообщения CMS/PKCS #7 (.p7b)" +msgstr "Сообщения CMS/PKCS #7 (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Формат обмена личной информацией/PKCS #12 (.pfx, .p12)" +msgstr "Формат обмена личной информацией/PKCS #12 (*.pfx, *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2340,32 +2336,24 @@ msgid "Select the format you want to use:" msgstr "Выберите формат для экспорта:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "X.509 в кодировке &DER (.cer)" +msgstr "X.509 в кодировке &DER (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X.509 в кодировке Ba&se64 (.cer):" +msgstr "X.509 в кодировке Ba&se64 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "Сообщение &CMS/PKCS #7 (.p7b)" +msgstr "Сообщение &CMS/PKCS #7 (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "&По возможности включить все сертификаты в путь сертификации" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "&Формат обмена личной информацией/PKCS #12 (.pfx)" +msgstr "&Формат обмена личной информацией/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12708,9 +12696,8 @@ msgid "Select an executable file" msgstr "Выберите исполняемый файл" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "&Автоопределение" +msgstr "Автоопределение" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: c5c46a9ae5ad5352444495a7401596fc9b356a3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5c46a9ae5ad5352444495a74… Author: Julian Rüger <jr98(a)gmx.net> Date: Wed Mar 14 16:51:11 2012 +0100 po: Update German translation. --- po/de.po | 91 ++++++++++++++++++++++++++----------------------------------- 1 files changed, 39 insertions(+), 52 deletions(-) diff --git a/po/de.po b/po/de.po index b5aed4d..8d7c47a 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: 2012-03-07 04:28+0100\n" +"PO-Revision-Date: 2012-03-14 16:50+0100\n" "Last-Translator: Julian Rüger\n" "Language-Team: none\n" "Language: German\n" @@ -2186,16 +2186,12 @@ msgstr "" "Vertrauenslisten in einer Datei folgender Formate gespeichert werden:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)" +msgstr "Syntaxstandard kryptografischer Nachrichten/PKCS #7 Messages (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Privater Informationsaustausch/PKCS #12 (.pfx, .p12)" +msgstr "Privater Informationsaustausch/PKCS #12 (*.pfx; *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2337,32 +2333,24 @@ msgid "Select the format you want to use:" msgstr "Wählen Sie das gewünschte Format:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-codiertes X.509 (.cer)" +msgstr "&DER-kodiertes X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "B&ase64-codiertes X.509 (.cer):" +msgstr "B&ase64-kodiertes X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "&Syntaxstandard kryptografischer Meldungen/PKCS #7 Zertifikate (.p7b)" +msgstr "&Syntaxstandard kryptografischer Nachrichten/PKCS #7-Nachricht (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "&Wenn möglich alle Zertifikate im Zertifizierungspfad einbeziehen" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "&Privater Informationsaustausch/PKCS #12 (.pfx)" +msgstr "&Privater Informationsaustausch/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12356,17 +12344,17 @@ msgid "" "executable.\n" "Do you want to remove the uninstall entry from the registry?" msgstr "" -"Die Ausführung des Entfernungsbefehls '%s' ist fehlgeschlagen, " -"wahrscheinlich durch eine fehlende, ausführbare Datei.\n" -"Möchten Sie, dass der Anwendungseintrag aus der Registry entfernt wird?" +"Die Ausführung des Deinstallationsbefehls '%s' ist fehlgeschlagen, " +"wahrscheinlich fehlt die ausführbare Datei.\n" +"Möchten Sie den Anwendungseintrag aus der Registry entfernen?" #: view.rc:33 msgid "&Pan" -msgstr "&Verschieben" +msgstr "B&ildausschnitt" #: view.rc:35 msgid "&Scale to Window" -msgstr "&Passend ins Fenster" +msgstr "&An Fenstergröße anpassen" #: view.rc:37 msgid "&Left" @@ -12386,7 +12374,7 @@ msgstr "Warten auf Programm" #: wineboot.rc:32 msgid "Terminate Process" -msgstr "Programm beenden" +msgstr "Prozess beenden" #: wineboot.rc:33 msgid "" @@ -12395,10 +12383,10 @@ msgid "" "\n" "If you terminate the process you may lose all unsaved data." msgstr "" -"Ein Abmelden oder Herunterfahren wird simuliert, aber dieses Programm " +"Ein simuliertes Abmelden oder Herunterfahren ist im Gange, aber das Programm " "reagiert nicht.\n" "\n" -"Wenn Sie das Programm beenden, können Sie ungesicherte Daten verlieren." +"Wenn Sie den Prozess beenden, könnten Sie ungesicherte Daten verlieren." #: wineboot.rc:39 msgid "Wine" @@ -12415,14 +12403,14 @@ msgid "" "Free Software Foundation; either version 2.1 of the License, or (at your " "option) any later version." msgstr "" -"Diese Bibliothek ist freie Software; Sie dürfen sie unter den Bedingungen " -"der GNU Lesser General Public License, wie von der Free Software Foundation " +"Dieses Programm ist freie Software; Sie dürfen es unter den Bedingungen der " +"GNU Lesser General Public License, wie von der Free Software Foundation " "veröffentlicht, weiterverteilen und/oder modifizieren; entweder gemäß " "Version 2.1 der Lizenz oder (nach Ihrer Option) jeder späteren Version." #: winecfg.rc:134 msgid "Windows registration information" -msgstr "Windows Registrierungs Informationen" +msgstr "Windows Registrierungs-Informationen" #: winecfg.rc:135 msgid "&Owner:" @@ -12443,9 +12431,9 @@ msgid "" "or per-application settings in those tabs as well." msgstr "" "Wine kann für jede Anwendung eine unterschiedliche Windows-Version " -"nachahmen. Dieser Reiter ist mit den Bibliothek- und Grafik-Reiter " -"verknüpft, damit entweder systemweite oder anwendungsabhängige Einstellungen " -"in diesen Reitern vorgenommen werden können." +"nachahmen. Dieser Reiter ist mit den Reitern 'Bibliotheken' und 'Grafik' " +"verknüpft, so dass Sie entweder systemweite oder anwendungsabhängige " +"Einstellungen in diesen Reitern vornehmen können." #: winecfg.rc:150 msgid "&Add application..." @@ -12457,7 +12445,7 @@ msgstr "Anw. &entfernen" #: winecfg.rc:152 msgid "&Windows Version:" -msgstr "&Windows Version:" +msgstr "&Windows-Version:" #: winecfg.rc:160 msgid "Window settings" @@ -12493,7 +12481,7 @@ msgstr "Dies ist ein Beispieltext in 10 Punkt Tahoma" #: winecfg.rc:182 msgid "DLL overrides" -msgstr "DLL Überschreibungen" +msgstr "DLL-Überschreibungen" #: winecfg.rc:183 msgid "" @@ -12523,7 +12511,7 @@ msgstr "&Bearbeiten..." #: winecfg.rc:196 msgid "Edit Override" -msgstr "Bearbeite Überschreibung" +msgstr "Überschreibung bearbeiten" #: winecfg.rc:199 msgid "Load order" @@ -12555,7 +12543,7 @@ msgstr "Laufwerksbuchstaben wählen" #: winecfg.rc:223 msgid "Drive mappings" -msgstr "Laufwerkszuordnung" +msgstr "Laufwerkszuordnungen" #: winecfg.rc:224 msgid "" @@ -12599,11 +12587,11 @@ msgstr "S&erien-Nr.:" #: winecfg.rc:249 msgid "Show &dot files" -msgstr "Zeige D&ot-Dateien an" +msgstr "D&ot-Dateien anzeigen" #: winecfg.rc:256 msgid "Driver diagnostics" -msgstr "Treiber Diagnose" +msgstr "Treiberdiagnose" #: winecfg.rc:258 msgid "Defaults" @@ -12667,11 +12655,11 @@ msgstr "Laufwerke" #: winecfg.rc:33 msgid "Select the Unix target directory, please." -msgstr "Bitte wählen Sie das Ziel-Unix-Verzeichnis." +msgstr "Bitte wählen Sie das Unix-Zielverzeichnis." #: winecfg.rc:34 msgid "Hide &Advanced" -msgstr "nicht &Erweitert" +msgstr "&Erw. ausblenden" #: winecfg.rc:36 msgid "(No Theme)" @@ -12739,19 +12727,19 @@ msgid "" "Are you sure you want to do this?" msgstr "" "Das Ändern der Ladereihenfolge dieser Bibliothek wird nicht empfohlen.\n" -"Sind Sie sich sicher, dass Sie dies möchten?" +"Sind Sie sicher, dass Sie dies tun möchten?" #: winecfg.rc:52 msgid "Warning: system library" -msgstr "Achtung: Systembibliothek" +msgstr "Warnung: Systembibliothek" #: winecfg.rc:53 msgid "native" -msgstr "Native (Windows)" +msgstr "Native" #: winecfg.rc:54 msgid "builtin" -msgstr "Builtin (Wine)" +msgstr "Builtin" #: winecfg.rc:55 msgid "native, builtin" @@ -12782,9 +12770,8 @@ msgid "Select an executable file" msgstr "Ausführbares Programm auswählen" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "&Automatisch" +msgstr "Automatisch" #: winecfg.rc:67 msgid "Local hard disk" @@ -12808,10 +12795,10 @@ msgid "" "\n" "Each drive must have a letter, from A to Z, so you cannot have more than 26." msgstr "" -"Sie können keine weiteren Laufwerke mehr hinzufügen.\n" +"Sie können keine weiteren Laufwerke hinzufügen.\n" "\n" -"Jedes Laufwerk muss einen Buchstaben besitzen, von A bis Z, deshalb können " -"Sie nicht mehr als 26 haben." +"Jedes Laufwerk muss einen Buchstaben besitzen, von A bis Z, daher können Sie " +"nicht mehr als 26 Laufwerke definieren." #: winecfg.rc:72 msgid "System drive" @@ -12847,8 +12834,8 @@ msgid "" msgstr "" "Sie haben kein Laufwerk C. Das ist nicht so gut.\n" "\n" -"Vergessen Sie nicht, im Laufwerke-Reiter „Hinzufügen“ zu klicken um eins zu " -"erstellen!\n" +"Vergessen Sie nicht, im Reiter 'Laufwerke' ein solches anzulegen, indem Sie " +"auf 'Hinzufügen' klicken!\n" #: winecfg.rc:90 msgid "Controls Background"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: 945c5bba4610ad04d4c7a2340835a1ab788f9ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=945c5bba4610ad04d4c7a2340… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Mar 13 20:57:21 2012 +0200 po: Update Lithuanian translation. --- po/lt.po | 30 +++++++++--------------------- 1 files changed, 9 insertions(+), 21 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6e438a6..85c26b9 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: 2012-03-01 21:21+0300\n" +"PO-Revision-Date: 2012-03-13 20:55+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -2190,16 +2190,13 @@ msgstr "" "atšauktų liudijimų sąrašą ar patikintų liudijimų sąrašą:" #: cryptui.rc:296 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimai (.p7b)" +msgstr "" +"Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimai (*.p7b)" #: cryptui.rc:298 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Asmeninės informacijos mainai/PKCS #12 (.pfx, .p12)" +msgstr "Asmeninės informacijos mainai/PKCS #12 (*.pfx, *.p12)" #: cryptui.rc:300 cryptui.rc:78 cryptui.rc:159 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2342,33 +2339,25 @@ msgid "Select the format you want to use:" msgstr "Išrinkite formatą, kurį norite naudoti:" #: cryptui.rc:405 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "&DER-užkoduotas X.509 (.cer)" +msgstr "&DER-užkoduotas X.509 (*.cer)" #: cryptui.rc:407 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "Ba&se64-užkoduotas X.509 (.cer):" +msgstr "Ba&se64-užkoduotas X.509 (*.cer):" #: cryptui.rc:409 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" msgstr "" -"&Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimas (.p7b)" +"&Kriptografinio pranešimo sintaksės standarto/PKCS #7 pranešimas (*.p7b)" #: cryptui.rc:411 msgid "&Include all certificates in the certification path if possible" msgstr "&Jei įmanoma, apimti visus liudijimus liudijimų kelyje" #: cryptui.rc:413 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "&Asmeninės informacijos mainai/PKCS #12 (.pfx)" +msgstr "&Asmeninės informacijos mainai/PKCS #12 (*.pfx)" #: cryptui.rc:415 msgid "Incl&ude all certificates in the certification path if possible" @@ -12720,9 +12709,8 @@ msgid "Select an executable file" msgstr "Pasirinkite vykdomąjį failą" #: winecfg.rc:66 -#, fuzzy msgid "Autodetect" -msgstr "Automatiškai &aptikti" +msgstr "Automatiškai aptikti" #: winecfg.rc:67 msgid "Local hard disk"

1 0

Hans Leidekker : include: Add the IAssemblyName interface.
by Alexandre Julliard 14 Mar '12

14 Mar '12

Module: wine Branch: master Commit: cc3d2101305253fa51d1be485e18a8bdab4447c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3d2101305253fa51d1be485… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Mar 14 09:43:56 2012 +0100 include: Add the IAssemblyName interface. --- include/winsxs.idl | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 95 insertions(+), 0 deletions(-) diff --git a/include/winsxs.idl b/include/winsxs.idl index 202b91f..b425b2f 100644 --- a/include/winsxs.idl +++ b/include/winsxs.idl @@ -21,6 +21,7 @@ import "oleidl.idl"; interface IAssemblyCache; interface IAssemblyCacheItem; +interface IAssemblyName; typedef struct _FUSION_INSTALL_REFERENCE_ { @@ -99,4 +100,98 @@ interface IAssemblyCacheItem : IUnknown HRESULT AbortItem(); } +[ + object, + uuid(cd193bc0-b4bc-11D2-9833-00c04fc31d2e), + pointer_default(unique), + local +] +interface IAssemblyName : IUnknown +{ + typedef [public] enum + { + ASM_NAME_PUBLIC_KEY, + ASM_NAME_PUBLIC_KEY_TOKEN, + ASM_NAME_HASH_VALUE, + ASM_NAME_NAME, + ASM_NAME_MAJOR_VERSION, + ASM_NAME_MINOR_VERSION, + ASM_NAME_BUILD_NUMBER, + ASM_NAME_REVISION_NUMBER, + ASM_NAME_CULTURE, + ASM_NAME_PROCESSOR_ID_ARRAY, + ASM_NAME_OSINFO_ARRAY, + ASM_NAME_HASH_ALGID, + ASM_NAME_ALIAS, + ASM_NAME_CODEBASE_URL, + ASM_NAME_CODEBASE_LASTMOD, + ASM_NAME_NULL_PUBLIC_KEY, + ASM_NAME_NULL_PUBLIC_KEY_TOKEN, + ASM_NAME_CUSTOM, + ASM_NAME_NULL_CUSTOM, + ASM_NAME_MVID, + ASM_NAME_MAX_PARAMS + } ASM_NAME; + + typedef [public] enum + { + ASM_DISPLAYF_VERSION = 0x1, + ASM_DISPLAYF_CULTURE = 0x2, + ASM_DISPLAYF_PUBLIC_KEY_TOKEN = 0x4, + ASM_DISPLAYF_PUBLIC_KEY = 0x8, + ASM_DISPLAYF_CUSTOM = 0x10, + ASM_DISPLAYF_PROCESSORARCHITECTURE = 0x20, + ASM_DISPLAYF_LANGUAGEID = 0x40 + } ASM_DISPLAY_FLAGS; + + HRESULT SetProperty( + [in] DWORD id, + [in] LPVOID property, + [in] DWORD size); + + HRESULT GetProperty( + [in] DWORD id, + [out] LPVOID buffer, + [in][out] LPDWORD buflen); + + HRESULT Finalize(); + + HRESULT GetDisplayName( + [out] LPWSTR buffer, + [in][out] LPDWORD buflen, + [in] DWORD flags); + + HRESULT Reserved( + [in] REFIID riid, + [in] IUnknown *pUnkReserved1, + [in] IUnknown *pUnkReserved2, + [in] LPCOLESTR szReserved, + [in] LONGLONG llReserved, + [in] LPVOID pvReserved, + [in] DWORD cbReserved, + [out] LPVOID *ppReserved); + + HRESULT GetName( + [in][out] LPDWORD buflen, + [out] LPWSTR buffer); + + HRESULT GetVersion( + [out] LPDWORD hi, + [out] LPDWORD low); + + HRESULT IsEqual( + [in] IAssemblyName *name, + [in] DWORD flags); + + HRESULT Clone( + [out] IAssemblyName **name); +} + +typedef [unique] IAssemblyName *LPASSEMBLYNAME; +typedef [public] enum +{ + CANOF_PARSE_DISPLAY_NAME = 0x1, + CANOF_SET_DEFAULT_VALUES = 0x2 +} CREATE_ASM_NAME_OBJ_FLAGS; + cpp_quote("HRESULT WINAPI CreateAssemblyCache(IAssemblyCache**,DWORD);")

1 0