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

Henri Verbeet : wined3d: Use the display format if WINED3DFMT_UNKNOWN is passed as backbuffer format for windowed mode resets.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: dc53f6c2e6b55e1489eb84243fe07e7e9842a0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc53f6c2e6b55e1489eb84243… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:10 2015 +0200 wined3d: Use the display format if WINED3DFMT_UNKNOWN is passed as backbuffer format for windowed mode resets. --- dlls/d3d9/tests/d3d9ex.c | 4 ++-- dlls/d3d9/tests/device.c | 4 ++-- dlls/wined3d/device.c | 13 ++++++++++--- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 6118ce9..0a7fe90 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1064,7 +1064,7 @@ static void test_reset(void) ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); @@ -1100,7 +1100,7 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferWidth == 200, "Got unexpected backbuffer width %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected backbuffer height %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 174fc13..4d48ea8 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1869,7 +1869,7 @@ static void test_reset(void) ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); @@ -1904,7 +1904,7 @@ static void test_reset(void) ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#x.\n", hr); ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); - todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", + ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 870e384..20a0e23 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4331,6 +4331,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, const struct wined3d_swapchain_desc *swapchain_desc, const struct wined3d_display_mode *mode, wined3d_device_reset_cb callback, BOOL reset_state) { + enum wined3d_format_id backbuffer_format = swapchain_desc->backbuffer_format; struct wined3d_resource *resource, *cursor; struct wined3d_swapchain *swapchain; struct wined3d_display_mode m; @@ -4492,10 +4493,16 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, update_desc = TRUE; } - if (swapchain_desc->backbuffer_format != WINED3DFMT_UNKNOWN - && swapchain_desc->backbuffer_format != swapchain->desc.backbuffer_format) + if (backbuffer_format == WINED3DFMT_UNKNOWN) { - swapchain->desc.backbuffer_format = swapchain_desc->backbuffer_format; + if (!swapchain_desc->windowed) + return WINED3DERR_INVALIDCALL; + backbuffer_format = swapchain->original_mode.format_id; + } + + if (backbuffer_format != swapchain->desc.backbuffer_format) + { + swapchain->desc.backbuffer_format = backbuffer_format; update_desc = TRUE; }

1 0

Stefan Dösinger : wined3d: Use finer grained colorkey state invalidation.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: 483d9550c49a0b6fc5cebe916ebfd07f415c35ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=483d9550c49a0b6fc5cebe916… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Apr 14 11:16:23 2015 +0200 wined3d: Use finer grained colorkey state invalidation. --- dlls/wined3d/cs.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 8271634..d66850a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -913,6 +913,13 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: + if (texture == cs->state.textures[0]) + { + device_invalidate_state(cs->device, STATE_COLOR_KEY); + if (!(texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT)) + device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); + } + texture->async.src_blt_color_key = op->color_key; texture->async.color_key_flags |= WINED3D_CKEY_SRC_BLT; break; @@ -936,6 +943,9 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; case WINED3D_CKEY_SRC_BLT: + if (texture == cs->state.textures[0] && texture->async.color_key_flags & WINED3D_CKEY_SRC_BLT) + device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); + texture->async.color_key_flags &= ~WINED3D_CKEY_SRC_BLT; break; @@ -944,9 +954,6 @@ static void wined3d_cs_exec_set_color_key(struct wined3d_cs *cs, const void *dat break; } } - - if (texture->resource.bind_count && op->flags & WINED3D_CKEY_SRC_BLT) - device_invalidate_state(cs->device, STATE_RENDER(WINED3D_RS_COLORKEYENABLE)); } void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Bind sampler objects to the correct texture stage.
by Alexandre Julliard April 15, 2015

April 15, 2015

Module: wine Branch: master Commit: a37099e132eb803ec8820df174cbbde4445885d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37099e132eb803ec8820df17… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 11:07:11 2015 +0200 wined3d: Bind sampler objects to the correct texture stage. On current hardware this generally only makes a difference for vertex textures. This fixes a regression introduced by commit c6232e1d111ae8929c53c02211cde4a9777311fd. --- dlls/wined3d/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 39b0256..7efbf3d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3717,7 +3717,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state if (sampler) { - GL_EXTCALL(glBindSampler(sampler_idx, sampler->name)); + GL_EXTCALL(glBindSampler(mapped_stage, sampler->name)); checkGLcall("glBindSampler"); } }

1 0

Andrew Eikum : shell32: Add more knownfolders.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 80428310610a667fe8c106fd199251015b1548d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80428310610a667fe8c106fd1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Apr 13 08:21:17 2015 -0500 shell32: Add more knownfolders. --- dlls/shell32/shellpath.c | 411 ++++++++++++++++++++++++++++++++++++++--- dlls/shell32/tests/shellpath.c | 61 +++--- 2 files changed, 415 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80428310610a667fe8c10…

1 0

Hugh McMaster : wineconsole: Do not truncate argument strings larger than 256 bytes.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 0516d969ebffa93f1317a9dbf6e4c1a1af457a59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0516d969ebffa93f1317a9dbf… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Apr 8 16:08:08 2015 +1000 wineconsole: Do not truncate argument strings larger than 256 bytes. --- programs/wineconsole/wineconsole.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.c b/programs/wineconsole/wineconsole.c index 3c2faf5..ed5f816 100644 --- a/programs/wineconsole/wineconsole.c +++ b/programs/wineconsole/wineconsole.c @@ -830,13 +830,24 @@ int PASCAL WinMain(HINSTANCE hInst, HINSTANCE hPrev, LPSTR lpCmdLine, INT nCmdSh break; case from_process_name: { - WCHAR buffer[256]; + int len; + WCHAR *buffer; - MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, sizeof(buffer) / sizeof(buffer[0])); + len = MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, NULL, 0); + + buffer = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); + if (!buffer) + return 0; + + MultiByteToWideChar(CP_ACP, 0, wci.ptr, -1, buffer, len); if (!(data = WINECON_Init(hInst, GetCurrentProcessId(), buffer, wci.backend, nCmdShow))) + { + HeapFree(GetProcessHeap(), 0, buffer); return 0; + } ret = WINECON_Spawn(data, buffer); + HeapFree(GetProcessHeap(), 0, buffer); if (!ret) { WINECON_Delete(data);

1 0

Henri Verbeet : d3d8: Update the BackBufferCount after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 69047ed4f7e2b0799f639691b30ac4ad5059b06f URL: http://source.winehq.org/git/wine.git/?a=commit;h=69047ed4f7e2b0799f639691b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:03 2015 +0200 d3d8: Update the BackBufferCount after a successful reset. --- dlls/d3d8/device.c | 1 + dlls/d3d8/tests/device.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 464aced..10c2103 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -670,6 +670,7 @@ static HRESULT WINAPI d3d8_device_Reset(IDirect3DDevice8 *iface, if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, NULL, reset_enum_callback, TRUE))) { + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_POINTSIZE_MIN, 0); device->device_state = D3D8_DEVICE_STATE_OK; } diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 92ec3d0..64c2911 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1359,7 +1359,7 @@ static void test_reset(void) ok(!d3dpp.BackBufferHeight, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); ok(!d3dpp.hDeviceWindow, "Got unexpected hDeviceWindow %p.\n", d3dpp.hDeviceWindow);

1 0

Igor Kotrasinski : dsound: Fix conning formula to correctly interpolate volume.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 65e19a096d911a0a7ee2329d2c8f110fb0008f5e URL: http://source.winehq.org/git/wine.git/?a=commit;h=65e19a096d911a0a7ee2329d2… Author: Igor Kotrasinski <ikk_pl(a)yahoo.co.uk> Date: Sat Apr 11 15:44:14 2015 +0000 dsound: Fix conning formula to correctly interpolate volume. --- dlls/dsound/sound3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index ffd4d45..5eb02a6 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -242,7 +242,7 @@ void DSOUND_Calc3DBuffer(IDirectSoundBufferImpl *dsb) if (flAngle > dwOutsideConeAngle) flAngle = dwOutsideConeAngle; /* this probably isn't the right thing, but it's ok for the time being */ - lVolume += ((dsb->ds3db_ds3db.lConeOutsideVolume)/((dwOutsideConeAngle) - (dwInsideConeAngle))) * flAngle; + lVolume += ((flAngle - dwInsideConeAngle)/(dwOutsideConeAngle - dwInsideConeAngle)) * dsb->ds3db_ds3db.lConeOutsideVolume; } TRACE("conning: Angle = %f deg; InsideConeAngle(/2) = %d deg; OutsideConeAngle(/2) = %d deg; ConeOutsideVolume = %d => adjusting volume to %f\n", flAngle, dsb->ds3db_ds3db.dwInsideConeAngle/2, dsb->ds3db_ds3db.dwOutsideConeAngle/2, dsb->ds3db_ds3db.lConeOutsideVolume, lVolume);

1 0

Henri Verbeet : d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: 3ccac1a71f1650456b389408486f212c4635d919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ccac1a71f1650456b3894084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 14 10:16:02 2015 +0200 d3d9: Update the backbuffer D3DPRESENT_PARAMETERS after a successful reset. --- dlls/d3d9/device.c | 13 +++++++++++++ dlls/d3d9/tests/d3d9ex.c | 6 +++--- dlls/d3d9/tests/device.c | 6 +++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 97c71bb..0b1a77a 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -667,9 +667,22 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, wined3d_swapchain_desc_from_present_parameters(&swapchain_desc, present_parameters); if (SUCCEEDED(hr = wined3d_device_reset(device->wined3d_device, &swapchain_desc, mode ? &wined3d_mode : NULL, reset_enum_callback, !device->d3d_parent->extended))) + { + struct wined3d_swapchain *wined3d_swapchain; + + wined3d_swapchain = wined3d_device_get_swapchain(device->wined3d_device, 0); + wined3d_swapchain_get_desc(wined3d_swapchain, &swapchain_desc); + present_parameters->BackBufferWidth = swapchain_desc.backbuffer_width; + present_parameters->BackBufferHeight = swapchain_desc.backbuffer_height; + present_parameters->BackBufferFormat = d3dformat_from_wined3dformat(swapchain_desc.backbuffer_format); + present_parameters->BackBufferCount = swapchain_desc.backbuffer_count; + device->device_state = D3D9_DEVICE_STATE_OK; + } else if (!device->d3d_parent->extended) + { device->device_state = D3D9_DEVICE_STATE_NOT_RESET; + } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index bd956b6..6118ce9 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -1062,11 +1062,11 @@ static void test_reset(void) hr = IDirect3DDevice9Ex_TestCooperativeLevel(device); ok(hr == D3D_OK, "Got unexpected cooperative level %#x.\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9ecbae0..174fc13 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1867,11 +1867,11 @@ static void test_reset(void) hr = IDirect3DDevice9_TestCooperativeLevel(device1); ok(hr == D3D_OK, "IDirect3DDevice9_TestCooperativeLevel after a successful reset returned %#x\n", hr); - todo_wine ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); - todo_wine ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); + ok(d3dpp.BackBufferWidth == 200, "Got unexpected BackBufferWidth %u.\n", d3dpp.BackBufferWidth); + ok(d3dpp.BackBufferHeight == 150, "Got unexpected BackBufferHeight %u.\n", d3dpp.BackBufferHeight); todo_wine ok(d3dpp.BackBufferFormat == d3ddm.Format, "Got unexpected BackBufferFormat %#x, expected %#x.\n", d3dpp.BackBufferFormat, d3ddm.Format); - todo_wine ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); + ok(d3dpp.BackBufferCount == 1, "Got unexpected BackBufferCount %u.\n", d3dpp.BackBufferCount); ok(!d3dpp.MultiSampleType, "Got unexpected MultiSampleType %u.\n", d3dpp.MultiSampleType); ok(!d3dpp.MultiSampleQuality, "Got unexpected MultiSampleQuality %u.\n", d3dpp.MultiSampleQuality); ok(d3dpp.SwapEffect == D3DSWAPEFFECT_DISCARD, "Got unexpected SwapEffect %#x.\n", d3dpp.SwapEffect);

1 0

Sebastian Lackner : ws2_32: Add a missing call to release_sock_fd.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: ea371a2446eb6befa2954fe5a6428da0e562aa6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea371a2446eb6befa2954fe5a… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Apr 14 07:37:50 2015 +0200 ws2_32: Add a missing call to release_sock_fd. --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2fd2ce1..95ea83c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3091,6 +3091,7 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n if (ret <= 0) { SetLastError(ret == -1 ? wsaErrno() : WSAEINVAL); + release_sock_fd( s, fd ); return FALSE; }

1 0

Bruno Jesus : ws2_32: Convert EBADF errno to ENOTSOCK.
by Alexandre Julliard April 14, 2015

April 14, 2015

Module: wine Branch: master Commit: b69eb168161fcb4397cfa8c10b99a0b00279c354 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b69eb168161fcb4397cfa8c10… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Apr 14 02:02:51 2015 -0300 ws2_32: Convert EBADF errno to ENOTSOCK. --- dlls/ws2_32/socket.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index bfcc755..2fd2ce1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -863,7 +863,6 @@ static UINT sock_get_error( int err ) switch(err) { case EINTR: return WSAEINTR; - case EBADF: return WSAEBADF; case EPERM: case EACCES: return WSAEACCES; case EFAULT: return WSAEFAULT; @@ -872,6 +871,7 @@ static UINT sock_get_error( int err ) case EWOULDBLOCK: return WSAEWOULDBLOCK; case EINPROGRESS: return WSAEINPROGRESS; case EALREADY: return WSAEALREADY; + case EBADF: case ENOTSOCK: return WSAENOTSOCK; case EDESTADDRREQ: return WSAEDESTADDRREQ; case EMSGSIZE: return WSAEMSGSIZE; @@ -2901,9 +2901,6 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) errno = loc_errno; switch (errno) { - case EBADF: - SetLastError(WSAENOTSOCK); - break; case EADDRNOTAVAIL: SetLastError(WSAEINVAL); break; @@ -3360,7 +3357,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3370,7 +3367,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3467,7 +3464,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3519,7 +3516,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return SOCKET_ERROR; if (getsockopt(fd, SOL_SOCKET, SO_ERROR, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3565,7 +3562,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3643,7 +3640,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, &tv, &len) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3668,7 +3665,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (getsockopt(fd, SOL_SOCKET, SO_TYPE, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } else @@ -3829,7 +3826,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3863,7 +3860,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -3898,7 +3895,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, convert_sockopt(&level, &optname); if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) { - SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + SetLastError(wsaErrno()); ret = SOCKET_ERROR; } release_sock_fd( s, fd ); @@ -4164,7 +4161,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID } if ((fd = get_sock_fd( s, 0, NULL )) == -1) return SOCKET_ERROR; if (ioctl(fd, FIONREAD, out_buff ) == -1) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); release_sock_fd( s, fd ); break; } @@ -4182,7 +4179,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID /* SO_OOBINLINE sockets must always return TRUE to SIOCATMARK */ if ((getsockopt(fd, SOL_SOCKET, SO_OOBINLINE, &oob, &oobsize ) == -1) || (!oob && ioctl(fd, SIOCATMARK, &atmark ) == -1)) - status = (errno == EBADF) ? WSAENOTSOCK : wsaErrno(); + status = wsaErrno(); else { /* The SIOCATMARK value read from ioctl() is reversed

1 0