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

Jactry Zeng : po: Update Simplified Chinese translation.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Piotr Caban : gdi32: Allocate smaller buffer in delete_external_font_keys helper.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Piotr Caban : gdi32: Only delete unmodified font keys in delete_external_font_keys.
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 3471b59ae03ffba90226b9bb07089dbcdbe29ac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3471b59ae03ffba90226b9bb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 25 12:39:29 2017 +0200 gdi32: Only delete unmodified font keys in delete_external_font_keys. 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 | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 75d680f..8956720 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -3183,9 +3183,10 @@ static void update_reg_entries(void) static void delete_external_font_keys(void) { HKEY winnt_key = 0, win9x_key = 0, external_key = 0; - DWORD dlen, vlen, datalen, valuelen, i, type; + DWORD dlen, plen, vlen, datalen, valuelen, i, type, path_type; LPWSTR valueW; LPVOID data; + BYTE *path; if(RegCreateKeyExW(HKEY_LOCAL_MACHINE, winnt_font_reg_key, 0, NULL, 0, KEY_ALL_ACCESS, NULL, &winnt_key, NULL) != ERROR_SUCCESS) { @@ -3211,19 +3212,28 @@ static void delete_external_font_keys(void) valuelen++; /* returned value doesn't include room for '\0' */ valueW = HeapAlloc(GetProcessHeap(), 0, valuelen * sizeof(WCHAR)); data = HeapAlloc(GetProcessHeap(), 0, datalen); + path = HeapAlloc(GetProcessHeap(), 0, datalen); dlen = datalen; vlen = valuelen; i = 0; while(RegEnumValueW(external_key, i++, valueW, &vlen, NULL, &type, data, &dlen) == ERROR_SUCCESS) { + plen = dlen; + if (RegQueryValueExW(winnt_key, valueW, 0, &path_type, path, &plen) == ERROR_SUCCESS && + type == path_type && dlen == plen && !memcmp(data, path, plen)) + RegDeleteValueW(winnt_key, valueW); + + plen = dlen; + if (RegQueryValueExW(win9x_key, valueW, 0, &path_type, path, &plen) == ERROR_SUCCESS && + type == path_type && dlen == plen && !memcmp(data, path, plen)) + RegDeleteValueW(win9x_key, valueW); - RegDeleteValueW(winnt_key, valueW); - RegDeleteValueW(win9x_key, valueW); /* reset dlen and vlen */ dlen = datalen; vlen = valuelen; } + HeapFree(GetProcessHeap(), 0, path); HeapFree(GetProcessHeap(), 0, data); HeapFree(GetProcessHeap(), 0, valueW);

1 0

Nikolay Sivov : uxtheme/tests: Remove some trace messages.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Michael Stefaniuc : dsound/tests: Use a void* instead of void** outer IUnknown argument.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Michael Stefaniuc : dswave/tests: Use a void* instead of void** outer IUnknown argument.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Alistair Leslie-Hughes : mfplat: Implement MFCreateAttributes.
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Józef Kucia : wined3d: Introduce wined3d_device_set_hs_sampler().
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 007e05765c4e20a0c28148eb25bb3fa7dee7ab72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007e05765c4e20a0c28148eb2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:50 2017 +0200 wined3d: Introduce wined3d_device_set_hs_sampler(). 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/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f5825be..220167a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2693,6 +2693,14 @@ void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx, view); } +void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_HULL, idx, sampler); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 11e7777..9dc8265 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -137,6 +137,7 @@ @ cdecl wined3d_device_set_gs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hs_cb(ptr long ptr) @ cdecl wined3d_device_set_hs_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_hs_sampler(ptr long ptr) @ cdecl wined3d_device_set_hull_shader(ptr ptr) @ cdecl wined3d_device_set_index_buffer(ptr ptr long long) @ cdecl wined3d_device_set_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 55a4ed9..6db8a6f 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2332,6 +2332,8 @@ void __cdecl wined3d_device_set_gs_sampler(struct wined3d_device *device, UINT i void __cdecl wined3d_device_set_hs_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_hs_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_hs_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader); void __cdecl wined3d_device_set_index_buffer(struct wined3d_device *device, struct wined3d_buffer *index_buffer, enum wined3d_format_id format_id, unsigned int offset);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSSetSamplers().
by Alexandre Julliard 26 Apr '17

26 Apr '17

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

Józef Kucia : wined3d: Introduce wined3d_device_set_ds_sampler().
by Alexandre Julliard 26 Apr '17

26 Apr '17

Module: wine Branch: master Commit: 75bc118ff220459a78f81dc599829926f18f41b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75bc118ff220459a78f81dc59… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 26 13:19:52 2017 +0200 wined3d: Introduce wined3d_device_set_ds_sampler(). 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/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 220167a..c901e9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2740,6 +2740,14 @@ void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx, view); } +void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler) +{ + TRACE("device %p, idx %u, sampler %p.\n", device, idx, sampler); + + wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9dc8265..9b8de3e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -130,6 +130,7 @@ @ cdecl wined3d_device_set_domain_shader(ptr ptr) @ cdecl wined3d_device_set_ds_cb(ptr long ptr) @ cdecl wined3d_device_set_ds_resource_view(ptr long ptr) +@ cdecl wined3d_device_set_ds_sampler(ptr long ptr) @ cdecl wined3d_device_set_gamma_ramp(ptr long long ptr) @ cdecl wined3d_device_set_geometry_shader(ptr ptr) @ cdecl wined3d_device_set_gs_cb(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 6db8a6f..0d85cb4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2322,6 +2322,8 @@ void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, str void __cdecl wined3d_device_set_ds_cb(struct wined3d_device *device, unsigned int idx, struct wined3d_buffer *buffer); void __cdecl wined3d_device_set_ds_resource_view(struct wined3d_device *device, unsigned int idx, struct wined3d_shader_resource_view *view); +void __cdecl wined3d_device_set_ds_sampler(struct wined3d_device *device, + unsigned int idx, struct wined3d_sampler *sampler); void __cdecl wined3d_device_set_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, DWORD flags, const struct wined3d_gamma_ramp *ramp); void __cdecl wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0