April 2017 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetSamplers().
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: ce6cb4aeb553b2cfc74561923d2b460e48627f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce6cb4aeb553b2cfc74561923… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:51 2017 +0200 d3d11: Implement d3d11_immediate_context_HSSetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6552d78..b6031b4 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1165,8 +1165,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_hs_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Piotr Caban : gdi32: Allocate smaller buffer in delete_external_font_keys helper.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 93def703cfe7ce25a18c964774a9a0977f603dcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=93def703cfe7ce25a18c96477… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 12:39:23 2017 +0200 gdi32: Allocate smaller buffer in delete_external_font_keys helper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index d627e7e..75d680f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3210,9 +3210,9 @@ static void delete_external_font_keys(void) &valuelen, &datalen, NULL, NULL); valuelen++; /* returned value doesn't include room for '\0' */ valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); - data = HeapAlloc(GetProcessHeap(), 0, datalen * sizeof(WCHAR)); + data = HeapAlloc(GetProcessHeap(), 0, datalen); - dlen = datalen * sizeof(WCHAR); + dlen = datalen; vlen = valuelen; i = 0; while(RegEnumValueW(external_key, i++, valueW, &vlen, NULL, &type, data,

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSSetSamplers().
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: aff0026e688433ed2fbffd2c60efae856f79c75a URL: http://source.winehq.org/git/wine.git/?a=commit;h=aff0026e688433ed2fbffd2c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:53 2017 +0200 d3d11: Implement d3d11_immediate_context_DSSetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index b6031b4..095908d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1242,8 +1242,21 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState *const *samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct d3d_sampler_state *sampler = unsafe_impl_from_ID3D11SamplerState(samplers[i]); + + wined3d_device_set_ds_sampler(device->wined3d_device, start_slot + i, + sampler ? sampler->wined3d_sampler : NULL); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSSetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Michael Stefaniuc : dswave/tests: Use a void* instead of void** outer IUnknown argument.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 504b01cb3e9e079ea74775142baee2af0c866222 URL: http://source.winehq.org/git/wine.git/?a=commit;h=504b01cb3e9e079ea74775142… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 13:49:07 2017 +0200 dswave/tests: Use a void* instead of void** outer IUnknown argument. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/tests/dswave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dswave/tests/dswave.c b/dlls/dswave/tests/dswave.c index ee0c0fd..531afb5 100644 --- a/dlls/dswave/tests/dswave.c +++ b/dlls/dswave/tests/dswave.c @@ -50,7 +50,7 @@ static void test_COM(void) HRESULT hr; /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectSoundWave, (IUnknown*)&dmo, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_DirectSoundWave, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dmo); ok(hr == CLASS_E_NOAGGREGATION, "DirectSoundWave create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);

1 0

Michael Stefaniuc : dsound/tests: Use a void* instead of void** outer IUnknown argument.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 33e0ca45500e9260b7f5ab6a160d63b0e7ad5b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33e0ca45500e9260b7f5ab6a1… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Apr 25 13:49:06 2017 +0200 dsound/tests: Use a void* instead of void** outer IUnknown argument. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/tests/dsound.c | 2 +- dlls/dsound/tests/dsound8.c | 2 +- dlls/dsound/tests/duplex.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 78364ed..1ccb8f9 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -189,7 +189,7 @@ static void IDirectSound_tests(void) "failed: %08x\n", rc); /* COM aggregation */ - rc=CoCreateInstance(&CLSID_DirectSound, (IUnknown*)&dso, CLSCTX_INPROC_SERVER, + rc=CoCreateInstance(&CLSID_DirectSound, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IDirectSound, (void**)&dso); ok(rc==CLASS_E_NOAGGREGATION || broken(rc==DSERR_INVALIDPARAM), "DirectMusicPerformance create failed: %08x, expected CLASS_E_NOAGGREGATION\n", rc); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index b093312..53b3d47 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -1132,7 +1132,7 @@ static void test_COM(void) HRESULT hr; /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectSound8, (IUnknown*)&ds, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_DirectSound8, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&ds8); ok(hr == CLASS_E_NOAGGREGATION, "DirectSound create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index 739811d..ecdebdc 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -239,7 +239,7 @@ static void test_COM(void) HRESULT hr; /* COM aggregation */ - hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, (IUnknown*)&dsfd, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_DirectSoundFullDuplex, (IUnknown*)0xdeadbeef, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void**)&dsfd); ok(hr == CLASS_E_NOAGGREGATION, "DirectSoundFullDuplex create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr);

1 0

Nikolay Sivov : uxtheme/tests: Remove some trace messages.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 2b8cf542459c0d112bd4acd63026d74ece04029e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8cf542459c0d112bd4acd63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 26 10:34:28 2017 +0300 uxtheme/tests: Remove some trace messages. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/tests/system.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 1842be4..beba353 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -752,37 +752,16 @@ START_TEST(system) { init_funcs(); - /* No real functional tests will be done (yet). The current tests + /* No real functional theme API tests will be done (yet). The current tests * only show input/return behaviour */ - /* IsThemeActive, IsAppThemed and IsThemePartDefined*/ - trace("Starting test_IsThemed()\n"); test_IsThemed(); - - /* GetWindowTheme */ - trace("Starting test_GetWindowTheme()\n"); test_GetWindowTheme(); - - /* SetWindowTheme */ - trace("Starting test_SetWindowTheme()\n"); test_SetWindowTheme(); - - /* OpenThemeData, a bit more functional now */ - trace("Starting test_OpenThemeData()\n"); test_OpenThemeData(); - - /* OpenThemeDataEx */ - trace("Starting test_OpenThemeDataEx()\n"); test_OpenThemeDataEx(); - - /* GetCurrentThemeName */ - trace("Starting test_GetCurrentThemeName()\n"); test_GetCurrentThemeName(); - - /* CloseThemeData */ - trace("Starting test_CloseThemeData()\n"); test_CloseThemeData(); - test_buffered_paint(); }

1 0

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 401ec369cce618e5a73c43ff48e3e3bde0665448 URL: http://source.winehq.org/git/wine.git/?a=commit;h=401ec369cce618e5a73c43ff4… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Wed Apr 26 14:44:32 2017 +0800 po: Update Simplified Chinese translation. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/zh_CN.po | 302 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 135 insertions(+), 167 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=401ec369cce618e5a73c4…

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 7fda9dcf5889a2f4245d882a5aa84665d8b6f61b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fda9dcf5889a2f4245d882a5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Apr 26 10:29:23 2017 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 027a4af..212285c 100644 --- a/po/ru.po +++ b/po/ru.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: 2017-04-21 14:36+0300\n" +"PO-Revision-Date: 2017-04-26 10:24+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -12101,10 +12101,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: не удалось удалить класс «%1».\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: строка «%1» не распознана.\n" +msgstr "regedit: некорректный формат строки.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 0351f7ed93b68a7fc47153fb3206e79c28833033 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0351f7ed93b68a7fc47153fb3… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Apr 26 09:06:25 2017 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2cd4fa6..07ab574 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: 2017-03-22 23:05+0300\n" +"PO-Revision-Date: 2017-04-26 09:05+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -9383,7 +9383,7 @@ msgstr "Atributas ar reikšmė egzistuoja" #: wldap32.rc:53 msgid "Invalid Syntax" -msgstr "Neteisinga sintaksė" +msgstr "Netinkama sintaksė" #: wldap32.rc:64 msgid "No Such Object" @@ -12107,10 +12107,8 @@ msgid "regedit: Unable to delete the registry class '%1'.\n" msgstr "regedit: Nepavyko pašalinti registro klasės „%1“.\n" #: regedit.rc:398 -#, fuzzy -#| msgid "regedit: The line '%1' was not recognized.\n" msgid "regedit: The line contains invalid syntax.\n" -msgstr "regedit: Eilutė „%1“ neatpažinta.\n" +msgstr "regedit: Eilutėje yra netinkama sintaksė.\n" #: regedit.rc:163 msgid "Quits the registry editor"

1 0

Alistair Leslie-Hughes : mfplat: Implement MFCreateAttributes.
by Alexandre Julliard April 26, 2017

April 26, 2017

Module: wine Branch: master Commit: 06f8c263c2bda30f1b08f98e8e8f0030e89b00e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f8c263c2bda30f1b08f98e8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Apr 21 01:48:12 2017 +0000 mfplat: Implement MFCreateAttributes. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 392 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- include/mfapi.h | 1 + 3 files changed, 394 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=06f8c263c2bda30f1b08f…

1 0