February 2017 - Wine-commits

Bruno Jesus : ws2_32: Cope with NULL address in connect() call.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: dcf258685e9deb72c2b7d4bae9d0c667b727d090 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf258685e9deb72c2b7d4bae… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sun Feb 26 22:25:43 2017 -0300 ws2_32: Cope with NULL address in connect() call. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 7 +++++-- dlls/ws2_32/tests/sock.c | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3c8c806..f0e8f2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1731,14 +1731,17 @@ static inline BOOL supported_protocol(int protocol) /**********************************************************************/ -/* Returns the length of the converted address if successful, 0 if it was too small to - * start with. +/* Returns the length of the converted address if successful, 0 if it was too + * small to start with or unknown family or invalid address buffer. */ static unsigned int ws_sockaddr_ws2u(const struct WS_sockaddr* wsaddr, int wsaddrlen, union generic_unix_sockaddr *uaddr) { unsigned int uaddrlen = 0; + if (!wsaddr) + return 0; + switch (wsaddr->sa_family) { #ifdef HAS_IPX diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 59a23d7..b42c078 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5841,6 +5841,11 @@ static void test_events(int useMessages) goto end; } + SetLastError(0xdeadbeef); + ret = connect(src, NULL, 0); + ok(ret == SOCKET_ERROR, "expected -1, got %d\n", ret); + ok(GetLastError() == WSAEFAULT, "expected 10014, got %d\n", GetLastError()); + ret = connect(src, (struct sockaddr*)&addr, sizeof(addr)); if (ret == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK) {

1 0

Matteo Bruni : wined3d: Don' t require a separate sRGB GL texture if the format doesn' t support sRGB reads.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: ce77ef4ea0d38c9fe21584bbc777249f65092a57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce77ef4ea0d38c9fe21584bbc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:24 2017 +0100 wined3d: Don't require a separate sRGB GL texture if the format doesn't support sRGB reads. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7950011..4ccef50 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3914,11 +3914,11 @@ static inline void context_apply_state(struct wined3d_context *context, static inline BOOL needs_separate_srgb_gl_texture(const struct wined3d_context *context, const struct wined3d_texture *texture) { - unsigned int flags = texture->resource.format_flags; + unsigned int flags = texture->resource.format_flags + & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); return (!context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE] - || (flags & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) - != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)) + || (flags && flags != (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) && context->d3d_info->wined3d_creation_flags & WINED3D_SRGB_READ_WRITE_CONTROL; }

1 0

Matteo Bruni : wined3d: Fix querying texture-related limits on core profile.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 4f8c502ea75afe2dd01acf8288f0d1a90a333d87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8c502ea75afe2dd01acf828… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:25 2017 +0100 wined3d: Fix querying texture-related limits on core profile. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 5b1605d..2b4fa10 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3346,8 +3346,8 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) gl_info->limits.blends = 1; gl_info->limits.buffers = 1; - gl_info->limits.textures = 1; - gl_info->limits.texture_coords = 1; + gl_info->limits.textures = 0; + gl_info->limits.texture_coords = 0; for (i = 0; i < WINED3D_SHADER_TYPE_COUNT; ++i) gl_info->limits.uniform_blocks[i] = 0; gl_info->limits.fragment_samplers = 1; @@ -3412,23 +3412,33 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) } if (gl_info->supported[ARB_MULTITEXTURE]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); - gl_info->limits.textures = min(MAX_TEXTURES, gl_max); - TRACE("Max textures: %d.\n", gl_info->limits.textures); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); + gl_info->limits.textures = min(MAX_TEXTURES, gl_max); + TRACE("Max textures: %d.\n", gl_info->limits.textures); + + if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + { + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); + } + else + { + gl_info->limits.texture_coords = gl_info->limits.textures; + } + TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); + } - if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) + if (gl_info->supported[ARB_FRAGMENT_PROGRAM] || gl_info->supported[ARB_FRAGMENT_SHADER]) { - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &gl_max); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &gl_max); gl_info->limits.fragment_samplers = gl_max; } else { - gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); - gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); + gl_info->limits.fragment_samplers = gl_info->limits.textures; } - TRACE("Max texture coords: %d.\n", gl_info->limits.texture_coords); TRACE("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); if (gl_info->supported[ARB_VERTEX_SHADER]) @@ -3475,6 +3485,12 @@ static void wined3d_adapter_init_limits(struct wined3d_gl_info *gl_info) TRACE("Max vertex attributes: %u.\n", gl_info->limits.vertex_attribs); gl_info->limits.graphics_samplers = gl_info->limits.combined_samplers; } + else + { + gl_info->limits.textures = 1; + gl_info->limits.texture_coords = 1; + } + if (gl_info->supported[ARB_VERTEX_BLEND]) { gl_info->gl_ops.gl.p_glGetIntegerv(GL_MAX_VERTEX_UNITS_ARB, &gl_max);

1 0

Matteo Bruni : ddraw: Get rid of multiple interfaces from vertex buffer objects.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: 68709850f17d04bb908b5d4069dd06d1a0773f47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68709850f17d04bb908b5d406… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Feb 24 19:37:26 2017 +0100 ddraw: Get rid of multiple interfaces from vertex buffer objects. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/ddraw_private.h | 2 +- dlls/ddraw/device.c | 4 +- dlls/ddraw/vertexbuffer.c | 164 +++------------------------------------------ 4 files changed, 12 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=68709850f17d04bb908b5…

1 0

Nikolay Sivov : dxgi: Fix naming in error traces.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: cb2b733b5a2f39b9fd7fa0f63c02663babb0a60d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb2b733b5a2f39b9fd7fa0f63… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:13 2017 +0300 dxgi: Fix naming in error traces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/device.c b/dlls/dxgi/device.c index 268b6f0..9e62e25 100644 --- a/dlls/dxgi/device.c +++ b/dlls/dxgi/device.c @@ -175,7 +175,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_CreateSurface(IWineDXGIDevice *ifac hr = IWineDXGIDevice_QueryInterface(iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent); if (FAILED(hr)) { - ERR("Device should implement IWineD3DDeviceParent\n"); + ERR("Device should implement IWineDXGIDeviceParent\n"); return E_FAIL; } @@ -405,7 +405,7 @@ HRESULT dxgi_device_init(struct dxgi_device *device, struct dxgi_device_layer *l if (FAILED(hr = IWineDXGIDevice_QueryInterface(&device->IWineDXGIDevice_iface, &IID_IWineDXGIDeviceParent, (void **)&dxgi_device_parent))) { - ERR("DXGI device should implement IWineD3DDeviceParent.\n"); + ERR("DXGI device should implement IWineDXGIDeviceParent.\n"); IUnknown_Release(device->child_layer); wined3d_private_store_cleanup(&device->private_store); wined3d_mutex_unlock();

1 0

Nikolay Sivov : ddraw: Remove references to IWineD3DDevice that doesn' t exist anymore.
by Alexandre Julliard 28 Feb '17

28 Feb '17

Module: wine Branch: master Commit: f55a10a07d5918c59cd8019a713ba4f4646987bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f55a10a07d5918c59cd8019a7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Feb 25 09:10:15 2017 +0300 ddraw: Remove references to IWineD3DDevice that doesn't exist anymore. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/ddraw.c | 4 +--- dlls/ddraw/device.c | 50 ++++++-------------------------------------------- dlls/ddraw/palette.c | 2 -- 3 files changed, 7 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f55a10a07d5918c59cd80…

1 0

Henri Verbeet : wined3d: Get rid of the depth/ stencil FIXME in texture_resource_sub_resource_unmap().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: e3f55717e2e1230fd2243c6dc5aa42e6895b3cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3f55717e2e1230fd2243c6dc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:31 2017 +0100 wined3d: Get rid of the depth/stencil FIXME in texture_resource_sub_resource_unmap(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 1746404..20a6c0e 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1957,10 +1957,6 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso if (!(sub_resource->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(texture->swapchain); } - else if (resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL)) - { - FIXME("Depth / stencil buffer locking is not implemented.\n"); - } --sub_resource->map_count; if (!--resource->map_count && texture->update_map_binding)

1 0

Henri Verbeet : wined3d: Implement depth fills in the CPU blitter.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: f0b6873734c201f0b228b6ef2fac6d07b50d388c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6873734c201f0b228b6ef2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:32 2017 +0100 wined3d: Implement depth fills in the CPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1ac2e5f..51200d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2975,10 +2975,8 @@ static BOOL cpu_blit_supported(const struct wined3d_gl_info *gl_info, const RECT *src_rect, DWORD src_usage, enum wined3d_pool src_pool, const struct wined3d_format *src_format, const RECT *dst_rect, DWORD dst_usage, enum wined3d_pool dst_pool, const struct wined3d_format *dst_format) { - if (blit_op == WINED3D_BLIT_OP_COLOR_FILL) - { + if (blit_op == WINED3D_BLIT_OP_COLOR_FILL || blit_op == WINED3D_BLIT_OP_DEPTH_FILL) return TRUE; - } return FALSE; } @@ -3208,15 +3206,12 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int } /* First, all the 'source-less' blits */ - if (flags & WINED3D_BLT_COLOR_FILL) + if (flags & (WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL)) { hr = _Blt_ColorFill(dbuf, dst_width, dst_height, bpp, dst_map.row_pitch, fx->fill_color); - flags &= ~WINED3D_BLT_COLOR_FILL; + flags &= ~(WINED3D_BLT_COLOR_FILL | WINED3D_BLT_DEPTH_FILL); } - if (flags & WINED3D_BLT_DEPTH_FILL) - FIXME("WINED3D_BLT_DEPTH_FILL needs to be implemented!\n"); - /* Now the 'with source' blits. */ if (src_texture) { @@ -3587,8 +3582,20 @@ static HRESULT cpu_blit_depth_fill(struct wined3d_device *device, struct wined3d_rendertarget_view *view, const RECT *rect, DWORD clear_flags, float depth, DWORD stencil) { - FIXME("Depth/stencil filling not implemented by cpu_blit.\n"); - return WINED3DERR_INVALIDCALL; + const struct wined3d_box box = {rect->left, rect->top, rect->right, rect->bottom, 0, 1}; + struct wined3d_color color = {depth, 0.0f, 0.0f, 0.0f}; + static const struct wined3d_box src_box; + struct wined3d_blt_fx fx; + + if (clear_flags != WINED3DCLEAR_ZBUFFER) + { + FIXME("clear_flags %#x not implemented.\n", clear_flags); + return WINED3DERR_INVALIDCALL; + } + + fx.fill_color = wined3d_format_convert_from_float(view->format, &color); + return surface_cpu_blt(texture_from_resource(view->resource), view->sub_resource_idx, + &box, NULL, 0, &src_box, WINED3D_BLT_DEPTH_FILL, &fx, WINED3D_TEXF_POINT); } static void cpu_blit_blit_surface(struct wined3d_device *device, enum wined3d_blit_op op, DWORD filter,

1 0

Henri Verbeet : ddraw/tests: Test depth fill results in test_color_fill().
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 2cc9b854b10a973424c89d246d048612d77a4418 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2cc9b854b10a973424c89d246… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Feb 24 08:10:33 2017 +0100 ddraw/tests: Test depth fill results in test_color_fill(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 39 ++++++++++++++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 36 ++++++++++++++++++++++++++++++++++-- dlls/ddraw/tests/ddraw7.c | 36 ++++++++++++++++++++++++++++++++++-- 4 files changed, 144 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2cc9b854b10a973424c89…

1 0

Alex Henrie : user32: Include space for ampersands when determining MessageBox size.
by Alexandre Julliard 24 Feb '17

24 Feb '17

Module: wine Branch: master Commit: 0a2f9f54ebfef4adc3e0438ffcb9cf531ac1ba73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2f9f54ebfef4adc3e0438ff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Fri Feb 24 01:08:36 2017 -0700 user32: Include space for ampersands when determining MessageBox size. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/msgbox.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/msgbox.c b/dlls/user32/msgbox.c index 2ba98c9..0839f97 100644 --- a/dlls/user32/msgbox.c +++ b/dlls/user32/msgbox.c @@ -261,8 +261,8 @@ static void MSGBOX_OnInit(HWND hwnd, LPMSGBOXPARAMSW lpmb) /* Get the text size */ GetClientRect(GetDlgItem(hwnd, MSGBOX_IDTEXT), &rect); rect.top = rect.left = rect.bottom = 0; - DrawTextW( hdc, lpszText, -1, &rect, - DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT); + DrawTextW(hdc, lpszText, -1, &rect, + DT_LEFT | DT_EXPANDTABS | DT_WORDBREAK | DT_CALCRECT | DT_NOPREFIX); /* Min text width corresponds to space for the buttons */ tleft = ileft; if (iwidth) tleft += ileft + iwidth;

1 0