wine-commits September 2013

wine-commits@winehq.org

2 participants
645 discussions

Stefan Dösinger : ddraw: Enumerate DXT2 and DXT4.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 22fc22d28b655aff30a3f0517af1fd5086cf9e71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22fc22d28b655aff30a3f0517… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:15 2013 +0200 ddraw: Enumerate DXT2 and DXT4. --- dlls/ddraw/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 449b5b8..9be17c1 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -1073,7 +1073,9 @@ static HRESULT d3d_device7_EnumTextureFormats(IDirect3DDevice7 *iface, WINED3DFMT_P8_UINT, /* FOURCC codes */ WINED3DFMT_DXT1, + WINED3DFMT_DXT2, WINED3DFMT_DXT3, + WINED3DFMT_DXT4, WINED3DFMT_DXT5, };

1 0

Stefan Dösinger : ddraw: Create managed pool textures.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: b88daee3bce083f8121117e9d0bece715eb8490c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88daee3bce083f8121117e9d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:14 2013 +0200 ddraw: Create managed pool textures. The surfaces are already in WINED3D_POOL_MANAGED. --- dlls/ddraw/surface.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 6435774..b7136e1 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5607,9 +5607,9 @@ HRESULT ddraw_surface_create_texture(struct ddraw_surface *surface, DWORD surfac else layers = 1; - /* DDSCAPS_SYSTEMMEMORY textures are in WINED3D_POOL_SYSTEM_MEM. - * Should I forward the MANAGED cap to the managed pool? */ - if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) + if (desc->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + pool = WINED3D_POOL_MANAGED; + else if (desc->ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY) pool = WINED3D_POOL_SYSTEM_MEM; else pool = WINED3D_POOL_DEFAULT;

1 0

Stefan Dösinger : ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 8da09ba196e6e9256ae93698729aa69776ff5270 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8da09ba196e6e9256ae936987… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Sep 4 23:19:20 2013 +0200 ddraw/tests: Test DDCAPS2_TEXTUREMANAGE compatibility, with other flags. --- dlls/ddraw/ddraw.c | 15 +++++++ dlls/ddraw/tests/ddraw4.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 96 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 207 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 26f1984..652d20b 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2699,6 +2699,21 @@ static HRESULT CreateSurface(struct ddraw *ddraw, DDSURFACEDESC2 *DDSD, } } + if (DDSD->ddsCaps.dwCaps2 & DDSCAPS2_TEXTUREMANAGE) + { + if (!(DDSD->ddsCaps.dwCaps & DDSCAPS_TEXTURE)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used without DDSCAPS_TEXTURE, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + if (DDSD->ddsCaps.dwCaps & (DDSCAPS_VIDEOMEMORY | DDSCAPS_SYSTEMMEMORY)) + { + WARN("DDSCAPS2_TEXTUREMANAGE used width DDSCAPS_VIDEOMEMORY " + "or DDSCAPS_SYSTEMMEMORY, returning DDERR_INVALIDCAPS.\n"); + return DDERR_INVALIDCAPS; + } + } + /* According to the msdn this flag is ignored by CreateSurface */ if (DDSD->dwSize >= sizeof(DDSURFACEDESC2)) DDSD->ddsCaps.dwCaps2 &= ~DDSCAPS2_MIPMAPSUBLEVEL; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index fbaa6ca..b0e014d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3819,6 +3819,101 @@ static void test_coop_level_activateapp(void) IDirectDraw4_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw4 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface4 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw4 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw4_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw4_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw4_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw4_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface4_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface4_Release(surface); + } + + IDirectDraw4_Release(ddraw); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -3849,4 +3944,5 @@ START_TEST(ddraw4) test_coop_level_versions(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 2ed1b94..5197ccea 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3633,6 +3633,101 @@ static void test_coop_level_activateapp(void) IDirectDraw7_Release(ddraw); } +static void test_texturemanage(void) +{ + IDirectDraw7 *ddraw; + HRESULT hr; + DDSURFACEDESC2 ddsd; + IDirectDrawSurface7 *surface; + unsigned int i; + DDCAPS hal_caps, hel_caps; + DWORD needed_caps = DDSCAPS_TEXTURE | DDSCAPS_VIDEOMEMORY; + static const struct + { + DWORD caps_in, caps2_in; + HRESULT hr; + DWORD caps_out, caps2_out; + } + tests[] = + { + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, DDSCAPS2_TEXTUREMANAGE}, + {DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_VIDEOMEMORY | DDSCAPS_TEXTURE | DDSCAPS_LOCALVIDMEM, 0}, + {DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY | DDSCAPS_TEXTURE, 0}, + + {0, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_SYSTEMMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, DDSCAPS2_TEXTUREMANAGE, DDERR_INVALIDCAPS, + ~0U, ~0U}, + {DDSCAPS_VIDEOMEMORY, 0, DD_OK, + DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY, 0}, + {DDSCAPS_SYSTEMMEMORY, 0, DD_OK, + DDSCAPS_SYSTEMMEMORY, 0}, + }; + + if (!(ddraw = create_ddraw())) + { + skip("Failed to create IDirectDraw7 object, skipping tests.\n"); + return; + } + + hr = IDirectDraw7_SetCooperativeLevel(ddraw, NULL, DDSCL_NORMAL); + ok(SUCCEEDED(hr), "Failed to set cooperative level, hr %#x.\n", hr); + + memset(&hal_caps, 0, sizeof(hal_caps)); + hal_caps.dwSize = sizeof(hal_caps); + memset(&hel_caps, 0, sizeof(hel_caps)); + hel_caps.dwSize = sizeof(hel_caps); + hr = IDirectDraw7_GetCaps(ddraw, &hal_caps, &hel_caps); + ok(SUCCEEDED(hr), "Failed to get caps, hr %#x.\n", hr); + if ((hal_caps.ddsCaps.dwCaps & needed_caps) != needed_caps) + { + skip("Managed textures not supported, skipping managed texture test.\n"); + IDirectDraw7_Release(ddraw); + return; + } + + for (i = 0; i < sizeof(tests) / sizeof(*tests); i++) + { + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.ddsCaps.dwCaps = tests[i].caps_in; + ddsd.ddsCaps.dwCaps2 = tests[i].caps2_in; + ddsd.dwWidth = 4; + ddsd.dwHeight = 4; + + hr = IDirectDraw7_CreateSurface(ddraw, &ddsd, &surface, NULL); + ok(hr == tests[i].hr, "Got unexpected, hr %#x, case %u.\n", hr, i); + if (FAILED(hr)) + continue; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + hr = IDirectDrawSurface7_GetSurfaceDesc(surface, &ddsd); + ok(SUCCEEDED(hr), "Failed to get surface desc, hr %#x.\n", hr); + + ok(ddsd.ddsCaps.dwCaps == tests[i].caps_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps_out, ddsd.ddsCaps.dwCaps, i); + ok(ddsd.ddsCaps.dwCaps2 == tests[i].caps2_out, + "Input caps %#x, %#x, expected output caps %#x, got %#x, case %u.\n", + tests[i].caps_in, tests[i].caps2_in, tests[i].caps2_out, ddsd.ddsCaps.dwCaps2, i); + + IDirectDrawSurface7_Release(surface); + } + + IDirectDraw7_Release(ddraw); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -3671,4 +3766,5 @@ START_TEST(ddraw7) test_fog_special(); test_lighting_interface_versions(); test_coop_level_activateapp(); + test_texturemanage(); }

1 0

Stefan Dösinger : wined3d: Use the ftoa helper function in the ARB shader backend.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: b73464a41337992c612e14035375c0da70d7eb36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b73464a41337992c612e14035… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:12 2013 +0200 wined3d: Use the ftoa helper function in the ARB shader backend. This is the ARB equivalent to e0494afa007a1d1ba2f4b649beedca27cb20808e. --- dlls/wined3d/arb_program_shader.c | 94 ++++++++++++++++++++++--------------- dlls/wined3d/glsl_shader.c | 76 +++++------------------------- dlls/wined3d/shader.c | 5 ++ dlls/wined3d/utils.c | 49 +++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 ++ 5 files changed, 127 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b73464a41337992c612e1…

1 0

Stefan Dösinger : wined3d: Don' t clamp texture lookups in the ARB fixed function fragment pipe.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 37c4f3a88c0cb11248e92a6834c7352b0a969445 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37c4f3a88c0cb11248e92a683… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Sep 5 10:42:11 2013 +0200 wined3d: Don't clamp texture lookups in the ARB fixed function fragment pipe. --- dlls/wined3d/arb_program_shader.c | 20 +++++++------------- 1 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index aad30e9..9f02d21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6176,7 +6176,7 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con BOOL luminance_used[MAX_TEXTURES] = {FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE}; UINT lowest_disabled_stage; const char *textype; - const char *instr, *sat; + const char *instr; char colorcor_dst[8]; GLuint ret; DWORD arg0, arg1, arg2; @@ -6316,12 +6316,6 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con default: textype = "unexpected_textype"; break; } - if (settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP - || settings->op[stage].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) - sat = ""; - else - sat = "_SAT"; - if(settings->op[stage].projected == proj_none) { instr = "TEX"; } else if(settings->op[stage].projected == proj_count4 || @@ -6356,8 +6350,8 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con shader_addline(&buffer, "ADD ret, ret, fragment.texcoord[%u];\n", stage); } - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); if (settings->op[stage - 1].cop == WINED3D_TOP_BUMPENVMAP_LUMINANCE) { shader_addline(&buffer, "MAD_SAT ret.x, tex%u.z, luminance%u.x, luminance%u.y;\n", @@ -6367,11 +6361,11 @@ static GLuint gen_arbfp_ffp_shader(const struct ffp_frag_settings *settings, con } else if(settings->op[stage].projected == proj_count3) { shader_addline(&buffer, "MOV ret, fragment.texcoord[%u];\n", stage); shader_addline(&buffer, "MOV ret.w, ret.z;\n"); - shader_addline(&buffer, "%s%s tex%u, ret, texture[%u], %s;\n", - instr, sat, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, ret, texture[%u], %s;\n", + instr, stage, stage, textype); } else { - shader_addline(&buffer, "%s%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", - instr, sat, stage, stage, stage, textype); + shader_addline(&buffer, "%s tex%u, fragment.texcoord[%u], texture[%u], %s;\n", + instr, stage, stage, stage, textype); } sprintf(colorcor_dst, "tex%u", stage);

1 0

Bruno Jesus : ws2_32: Cope with invalid protocols in WSAEnumProtocols.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 1d1faa0283727ddec8855ee877bf7033b9869d37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d1faa0283727ddec8855ee87… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Sep 5 09:56:19 2013 -0300 ws2_32: Cope with invalid protocols in WSAEnumProtocols. --- dlls/ws2_32/socket.c | 45 +++++++++++++++++++++-------- dlls/ws2_32/tests/protocol.c | 64 ++++++++++++++++++++++++++++++++++++++---- 2 files changed, 91 insertions(+), 18 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1c72ce5..a916772 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -191,6 +191,16 @@ static const GUID ProviderIdIPX = { 0x11058240, 0xbe47, 0x11cf, static const GUID ProviderIdSPX = { 0x11058241, 0xbe47, 0x11cf, { 0x95, 0xc8, 0x00, 0x80, 0x5f, 0x48, 0xa1, 0x92 } }; +static const INT valid_protocols[] = +{ + WS_IPPROTO_TCP, + WS_IPPROTO_UDP, + NSPROTO_IPX, + NSPROTO_SPX, + NSPROTO_SPXII, + 0 +}; + #if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) # define LINUX_BOUND_IF struct interface_filter { @@ -1259,6 +1269,14 @@ static inline BOOL supported_pf(int pf) } } +static inline BOOL supported_protocol(int protocol) +{ + int i; + for (i = 0; i < sizeof(valid_protocols) / sizeof(valid_protocols[0]); i++) + if (protocol == valid_protocols[i]) + return TRUE; + return FALSE; +} /**********************************************************************/ @@ -1665,11 +1683,10 @@ static INT WS_EnterSingleProtocolA( INT protocol, WSAPROTOCOL_INFOA* info ) return ret; } -static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) +static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_INFOW buffer, LPDWORD len ) { - INT i = 0; + INT i = 0, items = 0; DWORD size = 0; - INT local[] = { WS_IPPROTO_TCP, WS_IPPROTO_UDP, NSPROTO_IPX, NSPROTO_SPX, NSPROTO_SPXII, 0 }; union _info { LPWSAPROTOCOL_INFOA a; @@ -1677,11 +1694,15 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW } info; info.w = buffer; - if (!protocols) protocols = local; + if (!protocols) protocols = valid_protocols; - while (protocols[i]) i++; + while (protocols[i]) + { + if(supported_protocol(protocols[i++])) + items++; + } - size = i * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); if (*len < size || !buffer) { @@ -1690,20 +1711,20 @@ static INT WS_EnumProtocols( BOOL unicode, LPINT protocols, LPWSAPROTOCOL_INFOW return SOCKET_ERROR; } - for (i = 0; protocols[i]; i++) + for (i = items = 0; protocols[i]; i++) { if (unicode) { - if (WS_EnterSingleProtocolW( protocols[i], &info.w[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolW( protocols[i], &info.w[items] ) != SOCKET_ERROR) + items++; } else { - if (WS_EnterSingleProtocolA( protocols[i], &info.a[i] ) == SOCKET_ERROR) - break; + if (WS_EnterSingleProtocolA( protocols[i], &info.a[items] ) != SOCKET_ERROR) + items++; } } - return i; + return items; } /************************************************************************** diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 2b95381..1b9a429 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -60,9 +60,10 @@ static void test_service_flags(int family, int version, int socktype, int protoc static void test_WSAEnumProtocolsA(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOA info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsA( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); @@ -80,8 +81,6 @@ static void test_WSAEnumProtocolsA(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsA( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -96,13 +95,41 @@ static void test_WSAEnumProtocolsA(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsA( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsA() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsA( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsA() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } static void test_WSAEnumProtocolsW(void) { - INT ret; + INT ret, i, j, found; DWORD len = 0, error; WSAPROTOCOL_INFOW info, *buffer; + INT ptest[] = {0xdead, IPPROTO_TCP, 0xcafe, IPPROTO_UDP, 0xbeef, 0}; ret = WSAEnumProtocolsW( NULL, NULL, &len ); ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); @@ -120,8 +147,6 @@ static void test_WSAEnumProtocolsW(void) if (buffer) { - INT i; - ret = WSAEnumProtocolsW( NULL, buffer, &len ); ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", WSAGetLastError() ); @@ -136,6 +161,33 @@ static void test_WSAEnumProtocolsW(void) HeapFree( GetProcessHeap(), 0, buffer ); } + + /* Test invalid protocols in the list */ + ret = WSAEnumProtocolsW( ptest, NULL, &len ); + ok( ret == SOCKET_ERROR, "WSAEnumProtocolsW() succeeded unexpectedly\n"); + error = WSAGetLastError(); + ok( error == WSAENOBUFS, "Expected 10055, received %d\n", error); + + buffer = HeapAlloc( GetProcessHeap(), 0, len ); + + if (buffer) + { + ret = WSAEnumProtocolsW( ptest, buffer, &len ); + ok( ret != SOCKET_ERROR, "WSAEnumProtocolsW() failed unexpectedly: %d\n", + WSAGetLastError() ); + ok( ret >= 2, "Expected at least 2 items, received %d\n", ret); + + for (i = found = 0; i < ret; i++) + for (j = 0; j < sizeof(ptest) / sizeof(ptest[0]); j++) + if (buffer[i].iProtocol == ptest[j]) + { + found |= 1 << j; + break; + } + ok(found == 0x0A, "Expected 2 bits represented as 0xA, received 0x%x\n", found); + + HeapFree( GetProcessHeap(), 0, buffer ); + } } START_TEST( protocol )

1 0

Jacek Caban : cryptnet: Removed unused typedefs.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 533730de7f0f09eee7179b78166857367cf2fb95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=533730de7f0f09eee7179b781… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Sep 5 12:19:13 2013 +0200 cryptnet: Removed unused typedefs. --- dlls/cryptnet/cryptnet_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index da66e66..35d6609 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1812,14 +1812,14 @@ typedef struct _CERT_REVOCATION_PARA_NO_EXTRA_FIELDS { HCERTSTORE *rgCertStore; HCERTSTORE hCrlStore; LPFILETIME pftTimeToUse; -} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS, *PCERT_REVOCATION_PARA_NO_EXTRA_FIELDS; +} CERT_REVOCATION_PARA_NO_EXTRA_FIELDS; typedef struct _OLD_CERT_REVOCATION_STATUS { DWORD cbSize; DWORD dwIndex; DWORD dwError; DWORD dwReason; -} OLD_CERT_REVOCATION_STATUS, *POLD_CERT_REVOCATION_STATUS; +} OLD_CERT_REVOCATION_STATUS; /*********************************************************************** * CertDllVerifyRevocation (CRYPTNET.@)

1 0

Hans Leidekker : rpcrt4: Add support for NTLM and Negotiate.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 9ea95f4105cb2c68ff823c822130000e22807675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ea95f4105cb2c68ff823c822… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Sep 4 15:01:10 2013 +0200 rpcrt4: Add support for NTLM and Negotiate. --- dlls/rpcrt4/rpc_transport.c | 550 +++++++++++++++++++++++++++++++++++++------ 1 files changed, 472 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ea95f4105cb2c68ff823…

1 0

Jactry Zeng : riched20/tests: Add tests of ITextDocument_Open.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: a8d87afe1ca9754190326503ce94ef2cdd41a2df URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8d87afe1ca9754190326503c… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Wed Sep 4 19:04:19 2013 +0800 riched20/tests: Add tests of ITextDocument_Open. --- dlls/riched20/tests/richole.c | 247 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 237 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8d87afe1ca9754190326…

1 0

Nikolay Sivov : ntdll: Inherit default activation context from creation thread.
by Alexandre Julliard 05 Sep '13

05 Sep '13

Module: wine Branch: master Commit: 93c59714c0ba67cb9215433125a414eeee8633e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93c59714c0ba67cb921543312… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 5 11:35:17 2013 +0400 ntdll: Inherit default activation context from creation thread. --- dlls/kernel32/tests/thread.c | 14 +++++++++++--- dlls/ntdll/thread.c | 17 ++++++++++++++++- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 0f3564f..33797d8 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -287,7 +287,6 @@ static DWORD WINAPI thread_actctx_func(void *p) cur = (void*)0xdeadbeef; ret = pGetCurrentActCtx(&cur); ok(ret, "thread GetCurrentActCtx failed, %u\n", GetLastError()); -todo_wine ok(cur == param->handle, "got %p, expected %p\n", cur, param->handle); param->thread_context = cur; @@ -1550,6 +1549,17 @@ static void test_thread_actctx(void) ok(b, "GetCurentActCtx failed: %u\n", GetLastError()); ok(handle == 0, "active context %p\n", handle); + /* without active context */ + param.thread_context = (void*)0xdeadbeef; + param.handle = NULL; + thread = CreateThread(NULL, 0, thread_actctx_func, &param, 0, &tid); + ok(thread != NULL, "failed, got %u\n", GetLastError()); + + ret = WaitForSingleObject(thread, 1000); + ok(ret == WAIT_OBJECT_0, "wait timeout\n"); + ok(param.thread_context == NULL, "got wrong thread context %p\n", param.thread_context); + CloseHandle(thread); + b = pActivateActCtx(context, &cookie); ok(b, "activation failed: %u\n", GetLastError()); @@ -1568,7 +1578,6 @@ static void test_thread_actctx(void) ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); -todo_wine ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); CloseHandle(thread); @@ -1579,7 +1588,6 @@ todo_wine ret = WaitForSingleObject(thread, 1000); ok(ret == WAIT_OBJECT_0, "wait timeout\n"); -todo_wine ok(param.thread_context == context, "got wrong thread context %p, %p\n", param.thread_context, context); CloseHandle(thread); diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 703e83c..9c34c0c 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -432,7 +432,7 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * pthread_attr_t attr; struct ntdll_thread_data *thread_data; struct startup_info *info = NULL; - HANDLE handle = 0; + HANDLE handle = 0, actctx = 0; TEB *teb = NULL; DWORD tid = 0; int request_pipe[2]; @@ -497,6 +497,21 @@ NTSTATUS WINAPI RtlCreateUserThread( HANDLE process, const SECURITY_DESCRIPTOR * teb->StaticUnicodeString.Buffer = teb->StaticUnicodeBuffer; teb->StaticUnicodeString.MaximumLength = sizeof(teb->StaticUnicodeBuffer); + /* create default activation context frame for new thread */ + RtlGetActiveActivationContext(&actctx); + if (actctx) + { + RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; + + frame = RtlAllocateHeap(GetProcessHeap(), 0, sizeof(*frame)); + frame->Previous = NULL; + frame->ActivationContext = actctx; + frame->Flags = 0; + teb->ActivationContextStack.ActiveFrame = frame; + + RtlAddRefActivationContext(actctx); + } + info = (struct startup_info *)(teb + 1); info->teb = teb; info->entry_point = start;

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
65
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 September 2013