September 2015 - Wine-Commits

Hugh McMaster : regsvr32: Use correct exit code when DllRegisterServer, DllUnregisterServer and DllInstall fail.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 76162a4ea8519b1ea1396c2164bcd9098bdd52ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=76162a4ea8519b1ea1396c216… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Sep 3 19:29:42 2015 +1000 regsvr32: Use correct exit code when DllRegisterServer, DllUnregisterServer and DllInstall fail. --- programs/regsvr32/regsvr32.c | 6 +++--- programs/regsvr32/regsvr32.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/regsvr32/regsvr32.c b/programs/regsvr32/regsvr32.c index 9f4764c..e560d32 100644 --- a/programs/regsvr32/regsvr32.c +++ b/programs/regsvr32/regsvr32.c @@ -133,7 +133,7 @@ static int RegisterDll(const WCHAR* strDll) if(FAILED(hr)) { output_write(STRING_REGISTER_FAILED, strDll); - return -1; + return DLLSERVER_FAILED; } output_write(STRING_REGISTER_SUCCESSFUL, strDll); @@ -156,7 +156,7 @@ static int UnregisterDll(const WCHAR* strDll) if(FAILED(hr)) { output_write(STRING_UNREGISTER_FAILED, strDll); - return -1; + return DLLSERVER_FAILED; } output_write(STRING_UNREGISTER_SUCCESSFUL, strDll); @@ -182,7 +182,7 @@ static int InstallDll(BOOL install, const WCHAR *strDll, const WCHAR *command_li output_write(STRING_INSTALL_FAILED, strDll); else output_write(STRING_UNINSTALL_FAILED, strDll); - return -1; + return DLLSERVER_FAILED; } if (install) output_write(STRING_INSTALL_SUCCESSFUL, strDll); diff --git a/programs/regsvr32/regsvr32.h b/programs/regsvr32/regsvr32.h index 949d282..82a14ca 100644 --- a/programs/regsvr32/regsvr32.h +++ b/programs/regsvr32/regsvr32.h @@ -22,6 +22,7 @@ #define INVALID_ARG 1 #define LOADLIBRARY_FAILED 3 #define GETPROCADDRESS_FAILED 4 +#define DLLSERVER_FAILED 5 /* Resource strings */ #define STRING_HEADER 1000

1 0

Józef Kucia : d3d11/tests: Add test for 3D texture interfaces.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 8821a1462ba50ff5b94aa5c06398d436988b464f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8821a1462ba50ff5b94aa5c06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:49 2015 +0200 d3d11/tests: Add test for 3D texture interfaces. --- dlls/d3d11/tests/d3d11.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 155 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6a9d710..a5e6945 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -488,6 +488,160 @@ static void test_create_texture3d(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_texture3d_interfaces(void) +{ + ID3D10Texture3D *d3d10_texture; + D3D11_TEXTURE3D_DESC desc; + ID3D11Texture3D *texture; + IDXGISurface *surface; + ID3D11Device *device; + unsigned int i; + ULONG refcount; + HRESULT hr; + + static const struct test + { + BOOL implements_d3d10_interfaces; + UINT bind_flags; + UINT misc_flags; + UINT expected_bind_flags; + UINT expected_misc_flags; + } + desc_conversion_tests[] = + { + { + TRUE, + D3D11_BIND_SHADER_RESOURCE, 0, + D3D10_BIND_SHADER_RESOURCE, 0 + }, + { + TRUE, + D3D11_BIND_UNORDERED_ACCESS, 0, + D3D11_BIND_UNORDERED_ACCESS, 0 + }, + { + FALSE, + 0, D3D11_RESOURCE_MISC_RESOURCE_CLAMP, + 0, 0 + }, + { + TRUE, + 0, D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + 0, D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX + }, + }; + + if (!(device = create_device(NULL))) + { + skip("Failed to create ID3D11Device.\n"); + return; + } + + desc.Width = 64; + desc.Height = 64; + desc.Depth = 64; + desc.MipLevels = 0; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = D3D11_BIND_RENDER_TARGET; + desc.CPUAccessFlags = 0; + desc.MiscFlags = 0; + + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 3d texture, hr %#x.\n", hr); + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_ID3D10Texture3D, (void **)&d3d10_texture); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Texture should implement ID3D10Texture3D.\n"); + if (SUCCEEDED(hr)) ID3D10Texture3D_Release(d3d10_texture); + ID3D11Texture3D_Release(texture); + + if (FAILED(hr)) + { + win_skip("3D textures do not implement ID3D10Texture3D.\n"); + ID3D11Device_Release(device); + return; + } + + for (i = 0; i < sizeof(desc_conversion_tests) / sizeof(*desc_conversion_tests); ++i) + { + const struct test *current = &desc_conversion_tests[i]; + D3D10_TEXTURE3D_DESC d3d10_desc; + ID3D10Device *d3d10_device; + + desc.Width = 64; + desc.Height = 64; + desc.Depth = 64; + desc.MipLevels = 1; + desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + desc.Usage = D3D11_USAGE_DEFAULT; + desc.BindFlags = current->bind_flags; + desc.CPUAccessFlags = 0; + desc.MiscFlags = current->misc_flags; + + hr = ID3D11Device_CreateTexture3D(device, &desc, NULL, &texture); + /* Shared resources are not supported by REF and WARP devices. */ + ok(SUCCEEDED(hr) || broken(hr == E_OUTOFMEMORY), + "Test %u: Failed to create a 3d texture, hr %#x.\n", i, hr); + if (FAILED(hr)) + { + win_skip("Failed to create ID3D11Texture3D, skipping test %u.\n", i); + continue; + } + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); + ok(hr == E_NOINTERFACE, "Texture should not implement IDXGISurface.\n"); + + hr = ID3D11Texture3D_QueryInterface(texture, &IID_ID3D10Texture3D, (void **)&d3d10_texture); + ID3D11Texture3D_Release(texture); + + if (current->implements_d3d10_interfaces) + { + ok(SUCCEEDED(hr), "Test %u: Texture should implement ID3D10Texture3D.\n", i); + } + else + { + todo_wine ok(hr == E_NOINTERFACE, "Test %u: Texture should not implement ID3D10Texture3D.\n", i); + if (SUCCEEDED(hr)) ID3D10Texture3D_Release(d3d10_texture); + continue; + } + + ID3D10Texture3D_GetDesc(d3d10_texture, &d3d10_desc); + + ok(d3d10_desc.Width == desc.Width, + "Test %u: Got unexpected Width %u.\n", i, d3d10_desc.Width); + ok(d3d10_desc.Height == desc.Height, + "Test %u: Got unexpected Height %u.\n", i, d3d10_desc.Height); + ok(d3d10_desc.Depth == desc.Depth, + "Test %u: Got unexpected Depth %u.\n", i, d3d10_desc.Depth); + ok(d3d10_desc.MipLevels == desc.MipLevels, + "Test %u: Got unexpected MipLevels %u.\n", i, d3d10_desc.MipLevels); + ok(d3d10_desc.Format == desc.Format, + "Test %u: Got unexpected Format %u.\n", i, d3d10_desc.Format); + ok(d3d10_desc.Usage == (D3D10_USAGE)desc.Usage, + "Test %u: Got unexpected Usage %u.\n", i, d3d10_desc.Usage); + ok(d3d10_desc.BindFlags == current->expected_bind_flags, + "Test %u: Got unexpected BindFlags %#x.\n", i, d3d10_desc.BindFlags); + ok(d3d10_desc.CPUAccessFlags == desc.CPUAccessFlags, + "Test %u: Got unexpected CPUAccessFlags %#x.\n", i, d3d10_desc.CPUAccessFlags); + ok(d3d10_desc.MiscFlags == current->expected_misc_flags, + "Test %u: Got unexpected MiscFlags %#x.\n", i, d3d10_desc.MiscFlags); + + d3d10_device = (ID3D10Device *)0xdeadbeef; + ID3D10Texture3D_GetDevice(d3d10_texture, &d3d10_device); + todo_wine ok(!d3d10_device, "Test %u: Got unexpected device pointer %p, expected NULL.\n", i, d3d10_device); + if (d3d10_device) ID3D10Device_Release(d3d10_device); + + ID3D10Texture3D_Release(d3d10_texture); + } + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -495,4 +649,5 @@ START_TEST(d3d11) test_create_texture2d(); test_texture2d_interfaces(); test_create_texture3d(); + test_texture3d_interfaces(); }

1 0

Józef Kucia : d3d11: Implement private data methods for ID3D11Texture3D.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 3f5d0fab9c298576dffeddde49275f3133985329 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f5d0fab9c298576dffeddde4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Sep 3 00:06:51 2015 +0200 d3d11: Implement private data methods for ID3D11Texture3D. --- dlls/d3d11/texture.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index aa4beaf..dbb9a27 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -1,5 +1,6 @@ /* * Copyright 2009 Henri Verbeet for CodeWeavers + * Copyright 2015 Józef Kucia for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -640,25 +641,31 @@ static void STDMETHODCALLTYPE d3d11_texture3d_GetDevice(ID3D11Texture3D *iface, static HRESULT STDMETHODCALLTYPE d3d11_texture3d_GetPrivateData(ID3D11Texture3D *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d_get_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateData(ID3D11Texture3D *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); - return E_NOTIMPL; + return d3d_set_private_data(&texture->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d11_texture3d_SetPrivateDataInterface(ID3D11Texture3D *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d_texture3d *texture = impl_from_ID3D11Texture3D(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&texture->private_store, guid, data); } static void STDMETHODCALLTYPE d3d11_texture3d_GetType(ID3D11Texture3D *iface,

1 0

Florian Pelz : po: German translation: Fix hyphenation.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 1970014d8411b8b97f5908d504fd39e2a8cd9ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1970014d8411b8b97f5908d50… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:08 2015 +0200 po: German translation: Fix hyphenation. --- po/de.po | 352 +++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 176 insertions(+), 176 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1970014d8411b8b97f590…

1 0

Florian Pelz : po: German translation: Fix capitalization.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 1cc73b990fb39cd26be54ada7b574e4144693f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cc73b990fb39cd26be54ada7… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:09 2015 +0200 po: German translation: Fix capitalization. --- po/de.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/po/de.po b/po/de.po index 091c77f..2be3703 100644 --- a/po/de.po +++ b/po/de.po @@ -187,7 +187,7 @@ msgstr "Software" msgid "" "Allows you to install new software, or remove existing software from your " "computer." -msgstr "Erlaubt es ihnen, neue Software hinzuzufügen oder zu entfernen." +msgstr "Erlaubt es Ihnen, neue Software hinzuzufügen oder zu entfernen." #: appwiz.rc:33 taskmgr.rc:262 winecfg.rc:33 msgid "Applications" @@ -806,7 +806,7 @@ msgstr "Datei nicht gefunden" #: comdlg32.rc:33 msgid "Please verify that the correct file name was given" -msgstr "Bitte überprüfen sie, ob der korrekte Dateiname angegeben wurde" +msgstr "Bitte überprüfen Sie, ob der korrekte Dateiname angegeben wurde" #: comdlg32.rc:34 msgid "" @@ -958,7 +958,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "Dieser Wert liegt nicht auf der Seite.\n" -"Bitte geben sie einen Wert zwischen %1!d! und %2!d! an." +"Bitte geben Sie einen Wert zwischen %1!d! und %2!d! an." #: comdlg32.rc:60 msgid "The 'from' entry cannot exceed the 'to' entry." @@ -2184,10 +2184,10 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Dieser Assistent hilft Ihnen Zertifikate, Zertifikatssperrlisten und " "Zertifikatsvertrauenslisten aus einer Datei zu importieren.\n" "\n" -"Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " +"Ein Zertifikat dient zur Identifikation von Ihnen oder Ihrem Computer. Es " "kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " "und Zertifikatsvertrauenslisten.\n" @@ -2319,10 +2319,10 @@ msgid "" "\n" "To continue, click Next." msgstr "" -"Dieser Assistent hilft ihnen Zertifikate, Zertifikatssperrlisten und " +"Dieser Assistent hilft Ihnen Zertifikate, Zertifikatssperrlisten und " "Zertifikatsvertrauenslisten in eine Datei zu exportieren.\n" "\n" -"Ein Zertifikat dient zur Identifikation von Ihnen oder ihrem Computer. Es " +"Ein Zertifikat dient zur Identifikation von Ihnen oder Ihrem Computer. Es " "kann auch für die Authentifizierung und zum Unterzeichnen genutzt werden. " "Zertifikatsspeicher sind Sammlungen von Zertifikaten, Zertifikatssperrlisten " "und Zertifikatsvertrauenslisten.\n" @@ -2913,7 +2913,7 @@ msgstr "Passwort eingeben" #: cryptui.rc:173 msgid "You may password-protect a private key." -msgstr "Der private Schlüssel sollte Passwortgeschützt sein." +msgstr "Der private Schlüssel sollte passwortgeschützt sein." #: cryptui.rc:174 msgid "The passwords do not match." @@ -8350,7 +8350,7 @@ msgstr "" "\n" "Wenn Dateien im Zielordner die gleichen Namen haben,\n" "werden diese durch Inhalte des Quellordners ersetzt.\n" -"Möchten sie trotzdem fortfahren?" +"Möchten Sie trotzdem fortfahren?" #: shell32.rc:238 msgid "New Folder" @@ -8499,7 +8499,7 @@ msgid "" "When installed, an ActiveX component has full access to your computer. Do " "not click install unless you have absolute trust in the above source." msgstr "" -"Eine installierte ActiveX-Komponente hat Vollzugriff auf ihren Computer. " +"Eine installierte ActiveX-Komponente hat Vollzugriff auf Ihren Computer. " "Klicken Sie nicht auf Installieren, wenn Sie der obigen Quelle nicht absolut " "vertrauen." @@ -8769,7 +8769,7 @@ msgid "" "The current MIDI setup is damaged. Copy the original MIDIMAP.CFG file to the " "Windows SYSTEM directory, and then try again." msgstr "" -"Das aktuelle MIDI-Setup ist beschädigt. Kopieren sie die ursprüngliche Datei " +"Das aktuelle MIDI-Setup ist beschädigt. Kopieren Sie die ursprüngliche Datei " "MIDIMAP.CFG in das Windows-Systemverzeichnis und versuchen Sie es erneut." #: winmm.rc:60 @@ -9646,7 +9646,7 @@ msgstr "COPY <Dateiname> kopiert eine Datei.\n" #: cmd.rc:56 msgid "CTTY changes the input/output device.\n" -msgstr "CTTY Ändert das Eingabe/Ausgabe - Gerät.\n" +msgstr "CTTY ändert das Eingabe/Ausgabe - Gerät.\n" #: cmd.rc:59 msgid "DATE shows or changes the system date.\n" @@ -10008,7 +10008,7 @@ msgstr "" #: cmd.rc:237 msgid "TIME sets or shows the current system time.\n" -msgstr "TIME Setzt oder zeigt die aktuelle Systemzeit an.\n" +msgstr "TIME setzt oder zeigt die aktuelle Systemzeit an.\n" #: cmd.rc:240 msgid "TITLE <string> sets the window title for the cmd window.\n" @@ -10238,7 +10238,7 @@ msgstr "" #: cmd.rc:353 msgid "Are you sure?" -msgstr "Sind sie sicher?" +msgstr "Sind Sie sicher?" #: cmd.rc:354 xcopy.rc:43 msgctxt "Yes key" @@ -12098,11 +12098,11 @@ msgstr "" #: taskkill.rc:38 msgid "Process with PID %1!u! was forcibly terminated.\n" -msgstr "Prozess mit der PID %1!u! wurde zum beenden gezwungen.\n" +msgstr "Prozess mit der PID %1!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:39 msgid "Process \"%1\" with PID %2!u! was forcibly terminated.\n" -msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum beenden gezwungen.\n" +msgstr "Prozess \"%1\" mit der PID %2!u! wurde zum Beenden gezwungen.\n" #: taskkill.rc:40 msgid "Error: Could not find process \"%1\".\n" @@ -12110,7 +12110,7 @@ msgstr "Fehler: Konnte Prozess \"%1\" nicht finden.\n" #: taskkill.rc:41 msgid "Error: Unable to enumerate the process list.\n" -msgstr "Fehler: Konnte die Prozessliste nicht Enumerieren.\n" +msgstr "Fehler: Konnte die Prozessliste nicht enumerieren.\n" #: taskkill.rc:42 msgid "Error: Unable to terminate process \"%1\".\n"

1 0

Nikolay Sivov : dwrite: Remove GetFaceNames() hack for simulated case.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 7581b11d2b01fd01c4f56778218e98bafa74358f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7581b11d2b01fd01c4f567782… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:25 2015 +0300 dwrite: Remove GetFaceNames() hack for simulated case. --- dlls/dwrite/font.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 3daab79..0970f3a 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1240,47 +1240,9 @@ static BOOL WINAPI dwritefont_IsSymbolFont(IDWriteFont2 *iface) static HRESULT WINAPI dwritefont_GetFaceNames(IDWriteFont2 *iface, IDWriteLocalizedStrings **names) { - static const WCHAR boldobliqueW[] = {'B','o','l','d',' ','O','b','l','i','q','u','e',0}; - struct dwrite_font *This = impl_from_IDWriteFont2(iface); - IDWriteLocalizedStrings *strings; - const WCHAR *name; - HRESULT hr; - TRACE("(%p)->(%p)\n", This, names); - - *names = NULL; - - if (This->data->simulations == DWRITE_FONT_SIMULATIONS_NONE) - return clone_localizedstring(This->data->names, names); - - switch (This->data->simulations) { - case DWRITE_FONT_SIMULATIONS_BOLD|DWRITE_FONT_SIMULATIONS_OBLIQUE: - name = boldobliqueW; - break; - case DWRITE_FONT_SIMULATIONS_BOLD: - name = boldW; - break; - case DWRITE_FONT_SIMULATIONS_OBLIQUE: - name = obliqueW; - break; - default: - ERR("unknown simulations %d\n", This->data->simulations); - return E_FAIL; - } - - hr = create_localizedstrings(&strings); - if (FAILED(hr)) return hr; - - hr = add_localizedstring(strings, enusW, name); - if (FAILED(hr)) { - IDWriteLocalizedStrings_Release(strings); - return hr; - } - - *names = strings; - - return S_OK; + return clone_localizedstring(This->data->names, names); } static HRESULT WINAPI dwritefont_GetInformationalStrings(IDWriteFont2 *iface,

1 0

Florian Pelz : po: German translation: Fix grammar errors.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 9a52351f9b3acebd9f188b54c492fc14a3a97dda URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a52351f9b3acebd9f188b54c… Author: Florian Pelz <pelzflorian(a)pelzflorian.de> Date: Wed Sep 2 15:40:11 2015 +0200 po: German translation: Fix grammar errors. --- po/de.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index 806eff2..091c77f 100644 --- a/po/de.po +++ b/po/de.po @@ -9494,7 +9494,7 @@ msgstr "Kann nicht zum LDAP-Server verbinden" #: wldap32.rc:122 msgid "Operation not supported by this version of the LDAP protocol" -msgstr "Operation durch diese Version des LDAP-Protokoll nicht unterstützt" +msgstr "Operation durch diese Version des LDAP-Protokolls nicht unterstützt" #: wldap32.rc:123 msgid "Specified control was not found in message" @@ -11200,7 +11200,7 @@ msgstr "Wine-Registrierungs-Editor ausführen" #: oleview.rc:110 msgid "Quit the application. Prompts to save changes" -msgstr "Anwendung beenden. Frag ob Änderungen zu speichern sind" +msgstr "Anwendung beenden. Fragt ob Änderungen zu speichern sind" #: oleview.rc:111 msgid "Create an instance of the selected object" @@ -12266,7 +12266,7 @@ msgstr "&Neuer Task..." #: taskmgr.rc:364 msgid "&Show processes from all users" -msgstr "P&rozesse aller Benutzern anzeigen" +msgstr "P&rozesse aller Benutzer anzeigen" #: taskmgr.rc:372 msgid "CPU usage" @@ -12719,7 +12719,7 @@ msgstr "Wechselt den Fokus zu dem Prozess des ausgewählten Tasks" #: taskmgr.rc:229 msgid "Restores the Task Manager from its hidden state" -msgstr "Stellt den Task-Manager von seiner versteckten Status wieder her" +msgstr "Stellt den Task-Manager aus seinem versteckten Status wieder her" #: taskmgr.rc:230 msgid "Removes the process from the system" @@ -13779,7 +13779,7 @@ msgstr "Dies ist ein Test" #: wineconsole.rc:44 msgid "wineconsole: Couldn't parse event id\n" -msgstr "wineconsole: Ereignis-ID konnte nicht geparsed werden\n" +msgstr "wineconsole: Ereignis-ID konnte nicht geparset werden\n" #: wineconsole.rc:45 msgid "wineconsole: Invalid backend\n"

1 0

Nikolay Sivov : dwrite: Increase a number of allocated family slots for system collection.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: 30108c730e9d38c1af7d253bad764136615db2ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=30108c730e9d38c1af7d253ba… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:55 2015 +0300 dwrite: Increase a number of allocated family slots for system collection. --- dlls/dwrite/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 0970f3a..baa5ace 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1866,10 +1866,10 @@ static HRESULT init_font_collection(struct dwrite_fontcollection *collection, BO collection->IDWriteFontCollection_iface.lpVtbl = &fontcollectionvtbl; collection->ref = 1; collection->family_count = 0; - collection->family_alloc = 2; + collection->family_alloc = is_system ? 30 : 5; collection->is_system = is_system; - collection->family_data = heap_alloc(sizeof(*collection->family_data)*2); + collection->family_data = heap_alloc(sizeof(*collection->family_data) * collection->family_alloc); if (!collection->family_data) return E_OUTOFMEMORY;

1 0

Nikolay Sivov : dwrite: Add simulated oblique faces.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: a10d75e597df5484c8d62e5832190ab6d02c187c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10d75e597df5484c8d62e583… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:36:01 2015 +0300 dwrite: Add simulated oblique faces. --- dlls/dwrite/font.c | 116 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 87 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a10d75e597df5484c8d62…

1 0

Nikolay Sivov : dwrite: Add simulated bold faces for each family when appropriate.
by Alexandre Julliard Sept. 3, 2015

Sept. 3, 2015

Module: wine Branch: master Commit: e38d9bc68e5ab7a436ca52dc8154af84b4b56147 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e38d9bc68e5ab7a436ca52dc8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 3 07:35:35 2015 +0300 dwrite: Add simulated bold faces for each family when appropriate. --- dlls/dwrite/font.c | 231 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 183 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e38d9bc68e5ab7a436ca5…

1 0