September 2013 - Wine-commits

Stefan Dösinger : wined3d: Check the format block size before creating textures.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: df5a0976e9f28836489e8977122844fe053278b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5a0976e9f28836489e89771… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:12 2013 +0200 wined3d: Check the format block size before creating textures. Sizes of textures and stand-alone surfaces must be multiples of the format's block size for DXTN formats. Since we create a texture for everything (except in ddraw), this check also takes care of stand-alone surfaces. --- dlls/wined3d/texture.c | 8 ++++++++ dlls/wined3d/utils.c | 19 +++++++++++-------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 75ae8af..e60a426 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -41,6 +41,14 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc debug_d3dusage(desc->usage), debug_d3dpool(desc->pool), desc->width, desc->height, desc->depth, device, parent, parent_ops, resource_ops); + if ((format->flags & (WINED3DFMT_FLAG_BLOCKS | WINED3DFMT_FLAG_BLOCKS_NO_VERIFY)) == WINED3DFMT_FLAG_BLOCKS) + { + UINT width_mask = format->block_width - 1; + UINT height_mask = format->block_height - 1; + if (desc->width & width_mask || desc->height & height_mask) + return WINED3DERR_INVALIDCALL; + } + if (FAILED(hr = resource_init(&texture->resource, device, desc->resource_type, format, desc->multisample_type, desc->multisample_quality, desc->usage, desc->pool, desc->width, desc->height, desc->depth, 0, parent, parent_ops, resource_ops))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 61f7df0..9a56031 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -191,18 +191,19 @@ struct wined3d_format_block_info UINT block_width; UINT block_height; UINT block_byte_count; + BOOL verify; }; static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8}, - {WINED3DFMT_DXT2, 4, 4, 16}, - {WINED3DFMT_DXT3, 4, 4, 16}, - {WINED3DFMT_DXT4, 4, 4, 16}, - {WINED3DFMT_DXT5, 4, 4, 16}, - {WINED3DFMT_ATI2N, 4, 4, 16}, - {WINED3DFMT_YUY2, 2, 1, 4}, - {WINED3DFMT_UYVY, 2, 1, 4}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, }; struct wined3d_format_vertex_info @@ -1023,6 +1024,8 @@ static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) format->block_height = format_block_info[i].block_height; format->block_byte_count = format_block_info[i].block_byte_count; format->flags |= WINED3DFMT_FLAG_BLOCKS; + if (!format_block_info[i].verify) + format->flags |= WINED3DFMT_FLAG_BLOCKS_NO_VERIFY; } return TRUE; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 28df2c9..5a8ced0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2916,6 +2916,7 @@ extern enum wined3d_format_id pixelformat_for_depth(DWORD depth) DECLSPEC_HIDDEN #define WINED3DFMT_FLAG_BLOCKS 0x00020000 #define WINED3DFMT_FLAG_HEIGHT_SCALE 0x00040000 #define WINED3DFMT_FLAG_TEXTURE 0x00080000 +#define WINED3DFMT_FLAG_BLOCKS_NO_VERIFY 0x00100000 struct wined3d_rational {

1 0

Stefan Dösinger : d3d9/tests: Test blocked texture creation restrictions.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: b7b028ca4be8562c6ad10ada23ae21ed75068556 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b028ca4be8562c6ad10ada2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:13 2013 +0200 d3d9/tests: Test blocked texture creation restrictions. --- dlls/d3d9/device.c | 8 ++ dlls/d3d9/tests/device.c | 225 ++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 218 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7b028ca4be8562c6ad10…

1 0

Stefan Dösinger : d3d8/tests: Test blocked texture creation restrictions.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 36c15d92e99f27dfd47bf0d4d0321bb476e5e566 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36c15d92e99f27dfd47bf0d4d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:14 2013 +0200 d3d8/tests: Test blocked texture creation restrictions. --- dlls/d3d8/device.c | 8 ++ dlls/d3d8/tests/device.c | 211 +++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 208 insertions(+), 11 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=36c15d92e99f27dfd47bf…

1 0

Stefan Dösinger : ddraw/tests: Test blocked texture creation restrictions.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: f69ba15a92acc4165669e39826aed0398206544a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69ba15a92acc4165669e3982… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:15 2013 +0200 ddraw/tests: Test blocked texture creation restrictions. --- dlls/ddraw/ddraw.c | 20 ++++- dlls/ddraw/surface.c | 10 ++ dlls/ddraw/tests/ddraw4.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 219 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 464 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f69ba15a92acc4165669e…

1 0

Stefan Dösinger : ddraw/tests: Test unsupported texture formats.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: b92928333b42d16667db9b0aa650fcba59a5f069 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b92928333b42d16667db9b0aa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Sep 6 00:11:16 2013 +0200 ddraw/tests: Test unsupported texture formats. --- dlls/ddraw/tests/ddraw1.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 126 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 127 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 505 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b92928333b42d16667db9…

1 0

Andrew Eikum : oleaut32: Improve TYPEDESC encoding for unknown VARTYPEs.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 664e7938cbe9c5d945dd41b24ddf8c7acb2a4e9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=664e7938cbe9c5d945dd41b24… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:11 2013 -0500 oleaut32: Improve TYPEDESC encoding for unknown VARTYPEs. It's not worth printing a FIXME for every VARTYPE we don't happen to list in the switch statement. --- dlls/oleaut32/typelib.c | 57 +++++++++++++++------------------------------- 1 files changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index a27f5f4..9c1127f 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -9142,41 +9142,6 @@ static DWORD WMSFT_append_typedesc(TYPEDESC *desc, WMSFT_TLBFile *file, DWORD *o out_size = &junk2; vt = desc->vt & VT_TYPEMASK; - switch(vt){ - case VT_INT: - subtype = VT_I4; - break; - case VT_UINT: - subtype = VT_UI4; - break; - case VT_VOID: - subtype = VT_EMPTY; - break; - default: - subtype = vt; - break; - } - - switch(vt){ - case VT_INT: - case VT_UINT: - case VT_I1: - case VT_UI1: - case VT_I2: - case VT_UI2: - case VT_I4: - case VT_UI4: - case VT_BOOL: - case VT_R4: - case VT_ERROR: - case VT_BSTR: - case VT_HRESULT: - case VT_CY: - case VT_VOID: - case VT_VARIANT: - *out_mix = subtype; - return 0x80000000 | (subtype << 16) | desc->vt; - } if(vt == VT_PTR || vt == VT_SAFEARRAY){ DWORD mix; @@ -9193,9 +9158,25 @@ static DWORD WMSFT_append_typedesc(TYPEDESC *desc, WMSFT_TLBFile *file, DWORD *o encoded[1] = desc->u.hreftype; *out_mix = 0x7FFF; /* FIXME: Should get TYPEKIND of the hreftype, e.g. TKIND_ENUM => VT_I4 */ }else{ - FIXME("Don't know what to do! VT: 0x%x\n", desc->vt); - *out_mix = desc->vt; - return 0x80000000 | (desc->vt << 16) | desc->vt; + TRACE("Mixing in-place, VT: 0x%x\n", desc->vt); + + switch(vt){ + case VT_INT: + subtype = VT_I4; + break; + case VT_UINT: + subtype = VT_UI4; + break; + case VT_VOID: + subtype = VT_EMPTY; + break; + default: + subtype = vt; + break; + } + + *out_mix = subtype; + return 0x80000000 | (subtype << 16) | desc->vt; } data = file->typdesc_seg.data;

1 0

Andrew Eikum : oleaut32: Apply TKIND_DISPATCH changes to FUNCDESC results from ITypeComp::Bind.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: cb1f4c5387c4440460c3a62ff55306e26474ef10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1f4c5387c4440460c3a62ff… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:17 2013 -0500 oleaut32: Apply TKIND_DISPATCH changes to FUNCDESC results from ITypeComp::Bind. --- dlls/oleaut32/tests/typelib.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 11 +++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index b873ac2..1c398f9 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -1539,6 +1539,7 @@ static void test_CreateTypeLib(SYSKIND sys) { static OLECHAR param2W[] = {'p','a','r','a','m','2',0}; static OLECHAR asdfW[] = {'A','s','d','f',0}; static OLECHAR aliasW[] = {'a','l','i','a','s',0}; + static OLECHAR invokeW[] = {'I','n','v','o','k','e',0}; static OLECHAR *names1[] = {func1W, param1W, param2W}; static OLECHAR *names2[] = {func2W, param1W, param2W}; static OLECHAR *propname[] = {prop1W, param1W}; @@ -1555,6 +1556,7 @@ static void test_CreateTypeLib(SYSKIND sys) { ITypeLib *tl, *stdole; ITypeInfo *interface1, *interface2, *dual, *unknown, *dispatch, *ti; ITypeInfo2 *ti2; + ITypeComp *tcomp; FUNCDESC funcdesc, *pfuncdesc; ELEMDESC elemdesc[5], *edesc; PARAMDESCEX paramdescex; @@ -1569,6 +1571,8 @@ static void test_CreateTypeLib(SYSKIND sys) { VARIANT cust_data; HRESULT hres; TYPEKIND kind; + DESCKIND desckind; + BINDPTR bindptr; switch(sys){ case SYS_WIN32: @@ -3443,6 +3447,34 @@ static void test_CreateTypeLib(SYSKIND sys) { ok(typeattr->wMinorVerNum == 0, "wMinorVerNum = %d\n", typeattr->wMinorVerNum); ITypeInfo_ReleaseTypeAttr(ti, typeattr); + hres = ITypeInfo_GetTypeComp(ti, &tcomp); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ITypeComp_Bind(tcomp, invokeW, 0, INVOKE_FUNC, &interface1, &desckind, &bindptr); + ok(hres == S_OK, "got %08x\n", hres); + ok(desckind == DESCKIND_FUNCDESC, "got wrong desckind: 0x%x\n", desckind); + ok(bindptr.lpfuncdesc->memid == 0x60010003, "got %x\n", bindptr.lpfuncdesc->memid); + ok(bindptr.lpfuncdesc->lprgscode == NULL, "got %p\n", bindptr.lpfuncdesc->lprgscode); + ok(bindptr.lpfuncdesc->lprgelemdescParam != NULL, "got %p\n", bindptr.lpfuncdesc->lprgelemdescParam); + ok(bindptr.lpfuncdesc->funckind == FUNC_DISPATCH, "got 0x%x\n", bindptr.lpfuncdesc->funckind); + ok(bindptr.lpfuncdesc->invkind == INVOKE_FUNC, "got 0x%x\n", bindptr.lpfuncdesc->invkind); + ok(bindptr.lpfuncdesc->callconv == CC_STDCALL, "got 0x%x\n", bindptr.lpfuncdesc->callconv); + ok(bindptr.lpfuncdesc->cParams == 8, "got %d\n", bindptr.lpfuncdesc->cParams); + ok(bindptr.lpfuncdesc->cParamsOpt == 0, "got %d\n", bindptr.lpfuncdesc->cParamsOpt); +#ifdef _WIN64 + if(sys == SYS_WIN32) + todo_wine ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); + else +#endif + ok(bindptr.lpfuncdesc->oVft == 6 * sizeof(void*), "got %x\n", bindptr.lpfuncdesc->oVft); + ok(bindptr.lpfuncdesc->cScodes == 0, "got %d\n", bindptr.lpfuncdesc->cScodes); + ok(bindptr.lpfuncdesc->elemdescFunc.tdesc.vt == VT_VOID, "got %d\n", bindptr.lpfuncdesc->elemdescFunc.tdesc.vt); + ok(bindptr.lpfuncdesc->wFuncFlags == FUNCFLAG_FRESTRICTED, "got 0x%x\n", bindptr.lpfuncdesc->wFuncFlags); + + ITypeInfo_ReleaseFuncDesc(interface1, bindptr.lpfuncdesc); + ITypeInfo_Release(interface1); + ITypeComp_Release(tcomp); + hres = ITypeInfo_GetRefTypeOfImplType(ti, -1, &hreftype); ok(hres == S_OK, "got %08x\n", hres); ok(hreftype == -2, "got wrong hreftype: %x\n", hreftype); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 9c1127f..72d53a0 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -8475,7 +8475,7 @@ static HRESULT WINAPI ITypeComp_fnBind( for(fdc = 0; fdc < This->cFuncs; ++fdc){ pFDesc = &This->funcdescs[fdc]; - if (!strcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { + if (!lstrcmpiW(TLB_get_bstr(pFDesc->Name), szName)) { if (!wFlags || (pFDesc->funcdesc.invkind & wFlags)) break; else @@ -8508,7 +8508,7 @@ static HRESULT WINAPI ITypeComp_fnBind( return S_OK; } } - /* FIXME: search each inherited interface, not just the first */ + if (hr == DISP_E_MEMBERNOTFOUND && This->impltypes) { /* recursive search */ ITypeInfo *pTInfo; @@ -8524,6 +8524,13 @@ static HRESULT WINAPI ITypeComp_fnBind( { hr = ITypeComp_Bind(pTComp, szName, lHash, wFlags, ppTInfo, pDescKind, pBindPtr); ITypeComp_Release(pTComp); + if (SUCCEEDED(hr) && *pDescKind == DESCKIND_FUNCDESC && + This->typekind == TKIND_DISPATCH) + { + FUNCDESC *tmp = pBindPtr->lpfuncdesc; + hr = TLB_AllocAndInitFuncDesc(tmp, &pBindPtr->lpfuncdesc, TRUE); + SysFreeString((BSTR)tmp); + } return hr; } WARN("Could not search inherited interface!\n");

1 0

Andrew Eikum : oleaut32: Correct TRACE statement.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 52b1adcd6ecfe077207209acd585a0db754db3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=52b1adcd6ecfe077207209acd… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri Sep 6 07:13:23 2013 -0500 oleaut32: Correct TRACE statement. --- dlls/oleaut32/typelib.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 72d53a0..18c1e19 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5080,8 +5080,8 @@ static HRESULT WINAPI ITypeLib2_fnIsName( *pfName=FALSE; ITypeLib2_fnIsName_exit: - TRACE("(%p)slow! search for %s: %s found!\n", This, - debugstr_w(szNameBuf), *pfName?"NOT":""); + TRACE("(%p)slow! search for %s: %sfound!\n", This, + debugstr_w(szNameBuf), *pfName ? "" : "NOT "); return S_OK; }

1 0

Bruno Jesus : ws2_32: Add parameters TRACE for WS_EnumProtocols.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: 0b03dc93e96edec9c5d0aad0e4f8344d084b5c9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b03dc93e96edec9c5d0aad0e… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:13:53 2013 -0300 ws2_32: Add parameters TRACE for WS_EnumProtocols. --- dlls/ws2_32/socket.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index a916772..38b47fc 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1704,6 +1704,9 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I size = items * (unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA)); + TRACE("unicode %d, protocols %p, buffer %p, length %p %d, items %d, required %d\n", + unicode, protocols, buffer, len, len ? *len : 0, items, size); + if (*len < size || !buffer) { *len = size;

1 0

Bruno Jesus : ws2_32: Fix SO_ACCEPTCONN on BSD systems.
by Alexandre Julliard 06 Sep '13

06 Sep '13

Module: wine Branch: master Commit: b2170d845dda1570967a0f367e0d2222e985bd70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2170d845dda1570967a0f367… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Fri Sep 6 09:14:00 2013 -0300 ws2_32: Fix SO_ACCEPTCONN on BSD systems. --- dlls/ws2_32/socket.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 38b47fc..d1256c1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2855,7 +2855,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_ACCEPTCONN: case WS_SO_BROADCAST: case WS_SO_DEBUG: case WS_SO_ERROR: @@ -2875,7 +2874,20 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; + case WS_SO_ACCEPTCONN: + if ( (fd = get_sock_fd( s, 0, NULL )) == -1) + return SOCKET_ERROR; + if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) + { + SetLastError((errno == EBADF) ? WSAENOTSOCK : wsaErrno()); + ret = SOCKET_ERROR; + } + + /* BSD returns != 0 while Windows return exact == 1 */ + if (*(int *)optval) *(int *)optval = 1; + release_sock_fd( s, fd ); + return ret; case WS_SO_DONTLINGER: { struct linger lingval;

1 0