wine-commits November 2018

wine-commits@winehq.org

2 participants
951 discussions

Henri Verbeet : wined3d: Allow binding scratch textures.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 54d63891f3b1245b485b37d3a3b139301a7b01cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=54d63891f3b1245b485b37d3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 18 22:27:15 2018 +0330 wined3d: Allow binding scratch textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 6 ++---- dlls/d3d9/tests/device.c | 6 ++---- dlls/wined3d/device.c | 6 ------ 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 862dbb4..5669009 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9055,8 +9055,7 @@ static void test_resource_access(void) if (SUCCEEDED(IDirect3DSurface8_GetContainer(surface, &IID_IDirect3DBaseTexture8, (void **)&texture))) { hr = IDirect3DDevice8_SetTexture(device, 0, texture); - todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); IDirect3DBaseTexture8_Release(texture); @@ -9121,8 +9120,7 @@ static void test_resource_access(void) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice8_SetTexture(device, 0, (IDirect3DBaseTexture8 *)texture); - todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice8_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index ee7d0c6..4e620d5 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12888,8 +12888,7 @@ static void test_resource_access(void) if (SUCCEEDED(IDirect3DSurface9_GetContainer(surface, &IID_IDirect3DBaseTexture9, (void **)&texture))) { hr = IDirect3DDevice9_SetTexture(device, 0, texture); - todo_wine_if(surface_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); IDirect3DBaseTexture9_Release(texture); @@ -12954,8 +12953,7 @@ static void test_resource_access(void) ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); - todo_wine_if(volume_desc.Pool == D3DPOOL_SCRATCH) - ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_SetTexture(device, 0, NULL); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 50ce89a..2ae9235 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3467,12 +3467,6 @@ HRESULT CDECL wined3d_device_set_texture(struct wined3d_device *device, return WINED3D_OK; } - if (texture && texture->resource.usage & WINED3DUSAGE_SCRATCH) - { - WARN("Rejecting attempt to set scratch texture.\n"); - return WINED3DERR_INVALIDCALL; - } - if (device->recording) device->recording->changed.textures |= 1u << stage;

1 0

Henri Verbeet : wined3d: Validate that the view resource has depth/ stencil bind flags in wined3d_device_set_depth_stencil_view().
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 87871e75e432acc9853fc1ae6c55852c8823cc2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=87871e75e432acc9853fc1ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 18 22:27:14 2018 +0330 wined3d: Validate that the view resource has depth/stencil bind flags in wined3d_device_set_depth_stencil_view(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 13 ++++++++----- dlls/d3d8/tests/device.c | 5 ++--- dlls/d3d9/device.c | 5 +++-- dlls/d3d9/tests/device.c | 5 ++--- dlls/wined3d/device.c | 14 ++++++++++++-- include/wine/wined3d.h | 2 +- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 476e3e1..67996a7 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1438,12 +1438,15 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, original_dsv = wined3d_device_get_depth_stencil_view(device->wined3d_device); rtv = ds_impl ? d3d8_surface_acquire_rendertarget_view(ds_impl) : NULL; - wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); d3d8_surface_release_rendertarget_view(ds_impl, rtv); - rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; - if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) - wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); - d3d8_surface_release_rendertarget_view(rt_impl, rtv); + if (SUCCEEDED(hr)) + { + rtv = render_target ? d3d8_surface_acquire_rendertarget_view(rt_impl) : NULL; + if (render_target && FAILED(hr = wined3d_device_set_rendertarget_view(device->wined3d_device, 0, rtv, TRUE))) + wined3d_device_set_depth_stencil_view(device->wined3d_device, original_dsv); + d3d8_surface_release_rendertarget_view(rt_impl, rtv); + } wined3d_mutex_unlock(); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 9f1d816..862dbb4 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9069,9 +9069,8 @@ static void test_resource_access(void) ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, surface); - todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) - ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), - "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice8_SetRenderTarget(device, backbuffer, depth_stencil); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index dd40dda..eed3a04 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1903,16 +1903,17 @@ static HRESULT WINAPI d3d9_device_SetDepthStencilSurface(IDirect3DDevice9Ex *ifa struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_surface *ds_impl = unsafe_impl_from_IDirect3DSurface9(depth_stencil); struct wined3d_rendertarget_view *rtv; + HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); wined3d_mutex_lock(); rtv = ds_impl ? d3d9_surface_acquire_rendertarget_view(ds_impl) : NULL; - wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); + hr = wined3d_device_set_depth_stencil_view(device->wined3d_device, rtv); d3d9_surface_release_rendertarget_view(ds_impl, rtv); wined3d_mutex_unlock(); - return D3D_OK; + return hr; } static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *iface, IDirect3DSurface9 **depth_stencil) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index aca578d..ee7d0c6 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12902,9 +12902,8 @@ static void test_resource_access(void) ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); - todo_wine_if(!(surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL)) - ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), - "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); + ok(hr == (surface_desc.Usage & D3DUSAGE_DEPTHSTENCIL ? D3D_OK : D3DERR_INVALIDCALL), + "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, depth_stencil); ok(hr == D3D_OK, "Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b1a322e..50ce89a 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4504,17 +4504,25 @@ HRESULT CDECL wined3d_device_set_rendertarget_view(struct wined3d_device *device return WINED3D_OK; } -void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view) +HRESULT CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, + struct wined3d_rendertarget_view *view) { struct wined3d_rendertarget_view *prev; TRACE("device %p, view %p.\n", device, view); + if (view && !(view->resource->bind_flags & WINED3D_BIND_DEPTH_STENCIL)) + { + WARN("View resource %p has incompatible %s bind flags.\n", + view->resource, wined3d_debug_bind_flags(view->resource->bind_flags)); + return WINED3DERR_INVALIDCALL; + } + prev = device->fb.depth_stencil; if (prev == view) { TRACE("Trying to do a NOP SetRenderTarget operation.\n"); - return; + return WINED3D_OK; } if ((device->fb.depth_stencil = view)) @@ -4522,6 +4530,8 @@ void CDECL wined3d_device_set_depth_stencil_view(struct wined3d_device *device, wined3d_cs_emit_set_depth_stencil_view(device->cs, view); if (prev) wined3d_rendertarget_view_decref(prev); + + return WINED3D_OK; } static struct wined3d_texture *wined3d_device_create_cursor_texture(struct wined3d_device *device, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 70b27bb..f8e201c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2399,7 +2399,7 @@ void __cdecl wined3d_device_set_cursor_position(struct wined3d_device *device, int x_screen_space, int y_screen_space, DWORD flags); HRESULT __cdecl wined3d_device_set_cursor_properties(struct wined3d_device *device, UINT x_hotspot, UINT y_hotspot, struct wined3d_texture *texture, unsigned int sub_resource_idx); -void __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, +HRESULT __cdecl wined3d_device_set_depth_stencil_view(struct wined3d_device *device, struct wined3d_rendertarget_view *view); HRESULT __cdecl wined3d_device_set_dialog_box_mode(struct wined3d_device *device, BOOL enable_dialogs); void __cdecl wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader);

1 0

Henri Verbeet : d3d9/tests: Add a resource access test.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 081602c4f75774bbbdc4f28d222bd0fa8d8c3350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=081602c4f75774bbbdc4f28d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 18 22:27:13 2018 +0330 d3d9/tests: Add a resource access test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 427 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 427 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=081602c4f75774bbbdc4…

1 0

Henri Verbeet : d3d8/tests: Add a resource access test.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 054c79101c47b7fb5f311c5ac847a179c6c7430d URL: https://source.winehq.org/git/wine.git/?a=commit;h=054c79101c47b7fb5f311c5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Nov 18 22:27:12 2018 +0330 d3d8/tests: Add a resource access test. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 424 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 424 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=054c79101c47b7fb5f31…

1 0

Piotr Caban : msvcrt: Add _vscprintf_l implementation.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 381e549b8138126635d65652d58c6c0801b4c25c URL: https://source.winehq.org/git/wine.git/?a=commit;h=381e549b8138126635d65652… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 16 22:55:30 2018 +0100 msvcrt: Add _vscprintf_l implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ 8 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 151d6ae..d9f9271 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1446,7 +1446,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index abb6ada..e0508bb 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1803,7 +1803,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 8b7b154..c9547bc 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1821,7 +1821,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index d293900..c1f6e0b 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1515,7 +1515,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) msvcr120._vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) msvcr120._vscprintf_l @ cdecl _vscprintf_p(str ptr) msvcr120._vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) msvcr120._vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) msvcr120._vscwprintf diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index aa89792..1f78197 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1125,7 +1125,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cf604b7..2181a8f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1101,7 +1101,7 @@ @ stub _vprintf_p_l @ stub _vprintf_s_l @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -@ stub _vscprintf_l +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p(str ptr) MSVCRT__vscprintf_p @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index e4d0aad..d71d37a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1058,7 +1058,7 @@ # stub _vprintf_s_l(str ptr ptr) @ cdecl _utime(str ptr) @ cdecl _vscprintf(str ptr) MSVCRT__vscprintf -# stub _vscprintf_l(str ptr ptr) +@ cdecl _vscprintf_l(str ptr ptr) MSVCRT__vscprintf_l @ cdecl _vscprintf_p_l(str ptr ptr) MSVCRT__vscprintf_p_l @ cdecl _vscwprintf(wstr ptr) MSVCRT__vscwprintf @ cdecl _vscwprintf_l(wstr ptr ptr) MSVCRT__vscwprintf_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 27c9eb8..a6d7c1f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1017,6 +1017,15 @@ int CDECL MSVCRT__vscprintf( const char *format, __ms_va_list valist ) } /********************************************************************* + * _vscprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vscprintf_l(const char *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + return MSVCRT_vsnprintf_l(NULL, INT_MAX, format, locale, valist); +} + +/********************************************************************* * _vscprintf_p_l (MSVCRT.@) */ int CDECL MSVCRT__vscprintf_p_l(const char *format,

1 0

André Hentschel : kernel32: Add stub case for ARM64 in GetSystemInfo.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 014f9c09294dd3945dc4e943e697ae52c3f2c844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=014f9c09294dd3945dc4e943… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Nov 16 22:51:18 2018 +0100 kernel32: Add stub case for ARM64 in GetSystemInfo. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46092 Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/cpu.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c index 89482a6..84385c7 100644 --- a/dlls/kernel32/cpu.c +++ b/dlls/kernel32/cpu.c @@ -157,6 +157,9 @@ VOID WINAPI GetSystemInfo( default: si->dwProcessorType = PROCESSOR_ARM920; } break; + case PROCESSOR_ARCHITECTURE_ARM64: + si->dwProcessorType = 0; + break; default: FIXME("Unknown processor architecture %x\n", sci.Architecture); si->dwProcessorType = 0;

1 0

Michael Stefaniuc : wintab32: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 000c708e3b13cfe733ad092b17753ea747d39e79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=000c708e3b13cfe733ad092b… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:37 2018 +0100 wintab32: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintab32/wintab32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 3037963..fe535fa 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -89,7 +89,7 @@ static HMODULE load_graphics_driver(void) HKEY hkey; DWORD size; WCHAR path[MAX_PATH]; - WCHAR key[(sizeof(key_pathW) + sizeof(displayW)) / sizeof(WCHAR) + 40]; + WCHAR key[ARRAY_SIZE(key_pathW) + ARRAY_SIZE(displayW) + 40]; UINT guid_atom = HandleToULong( GetPropW( GetDesktopWindow(), display_device_guid_propW )); if (!guid_atom) return 0;

1 0

Michael Stefaniuc : services: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 82c8c88b95e420b1e4b406786b63c7ad769bbe00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82c8c88b95e420b1e4b40678… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:39 2018 +0100 services: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1973d27..3de46bd 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -664,7 +664,7 @@ static LPWSTR service_get_pipe_name(void) { static const WCHAR format[] = { '\\','\\','.','\\','p','i','p','e','\\', 'n','e','t','\\','N','t','C','o','n','t','r','o','l','P','i','p','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD service_current = 0; DWORD len, value = -1; LONG ret; @@ -776,7 +776,7 @@ static DWORD add_winedevice_service(const struct service_entry *service, WCHAR * struct service_entry **entry) { static const WCHAR format[] = {'W','i','n','e','d','e','v','i','c','e','%','u',0}; - static WCHAR name[sizeof(format)/sizeof(WCHAR) + 10]; /* strlenW("4294967295") */ + static WCHAR name[ARRAY_SIZE(format) + 10]; /* strlenW("4294967295") */ static DWORD current = 0; struct scmdatabase *db = service->db; DWORD err;

1 0

Gabriel Ivăncescu : shell32/autocomplete: Move the auto-suggest listbox along with the edit control.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 2c03e0c67d371f9e2d2e771a09b9e8d4620bcaf2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c03e0c67d371f9e2d2e771a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:04 2018 +0200 shell32/autocomplete: Move the auto-suggest listbox along with the edit control. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index c9bf9ff..236ba15 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -611,6 +611,15 @@ static LRESULT APIENTRY ACEditSubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, /* Reset the enumerator if it's not visible anymore */ if (!IsWindowVisible(hwnd)) free_enum_strs(This); break; + case WM_WINDOWPOSCHANGED: + { + WINDOWPOS *pos = (WINDOWPOS*)lParam; + + if ((pos->flags & (SWP_NOMOVE | SWP_NOSIZE)) != (SWP_NOMOVE | SWP_NOSIZE) && + This->hwndListBox && IsWindowVisible(This->hwndListBox)) + show_listbox(This); + break; + } case WM_KEYDOWN: return ACEditSubclassProc_KeyDown(This, hwnd, uMsg, wParam, lParam); case WM_CHAR:

1 0

Gabriel Ivăncescu : shell32/autocomplete: Retrieve the count in show_listbox.
by Alexandre Julliard 19 Nov '18

19 Nov '18

Module: wine Branch: master Commit: 7ac4c0ea8c7079988eb162ba447d81896848fd65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ac4c0ea8c7079988eb162ba… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 16 17:38:03 2018 +0200 shell32/autocomplete: Retrieve the count in show_listbox. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/autocomplete.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6d8988b..c9bf9ff 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -193,15 +193,16 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) if (reset) free_enum_strs(ac); } -static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +static void show_listbox(IAutoCompleteImpl *ac) { RECT r; - UINT width, height; + UINT cnt, width, height; GetWindowRect(ac->hwndEdit, &r); SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + cnt = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); width = r.right - r.left; @@ -404,7 +405,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; - UINT cnt, start, end; + UINT start, end; if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ @@ -432,15 +433,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, if (end == 0) return FALSE; } - cnt = end - start; SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, end - start, 0); for (; start < end; start++) SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); - show_listbox(ac, cnt); + show_listbox(ac); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; }

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
96
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 November 2018