September 2013 - Wine-commits

Henri Verbeet : wined3d: Avoid some forward declarations.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 0be8e524c6352498667d9cf780a570471a674782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0be8e524c6352498667d9cf78… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:42 2013 +0200 wined3d: Avoid some forward declarations. --- dlls/wined3d/surface.c | 1270 ++++++++++++++++++++++++------------------------ 1 files changed, 631 insertions(+), 639 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0be8e524c6352498667d9…

1 0

Henri Verbeet : d3dx9: Avoid LPWSTR.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 2a24b11af553fa472c86b6b9a0de968bbcc441be URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a24b11af553fa472c86b6b9a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:43 2013 +0200 d3dx9: Avoid LPWSTR. --- dlls/d3dx9_36/effect.c | 12 ++++++++---- dlls/d3dx9_36/mesh.c | 22 +++++++++++++--------- dlls/d3dx9_36/shader.c | 12 ++++++++++-- dlls/d3dx9_36/surface.c | 14 +++++++------- dlls/d3dx9_36/texture.c | 9 +++++---- 5 files changed, 43 insertions(+), 26 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3c252e5..2b8d2aa 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5531,11 +5531,14 @@ HRESULT WINAPI D3DXCreateEffectFromFileExA(struct IDirect3DDevice9 *device, cons const D3DXMACRO *defines, struct ID3DXInclude *include, const char *skipconstants, DWORD flags, struct ID3DXEffectPool *pool, struct ID3DXEffect **effect, struct ID3DXBuffer **compilationerrors) { - LPWSTR srcfileW; + WCHAR *srcfileW; HRESULT ret; DWORD len; - TRACE("(void): relay\n"); + TRACE("device %p, srcfile %s, defines %p, include %p, skipconstants %s, " + "flags %#x, pool %p, effect %p, compilationerrors %p.\n", + device, debugstr_a(srcfile), defines, include, debugstr_a(skipconstants), + flags, pool, effect, compilationerrors); if (!srcfile) return D3DERR_INVALIDCALL; @@ -5660,11 +5663,12 @@ HRESULT WINAPI D3DXCreateEffectCompilerFromFileW(const WCHAR *srcfile, const D3D HRESULT WINAPI D3DXCreateEffectCompilerFromFileA(const char *srcfile, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXEffectCompiler **effectcompiler, ID3DXBuffer **parseerrors) { - LPWSTR srcfileW; + WCHAR *srcfileW; HRESULT ret; DWORD len; - TRACE("(void): relay\n"); + TRACE("srcfile %s, defines %p, include %p, flags %#x, effectcompiler %p, parseerrors %p.\n", + debugstr_a(srcfile), defines, include, flags, effectcompiler, parseerrors); if (!srcfile) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index f38a79e..19c92b9 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3673,12 +3673,14 @@ HRESULT WINAPI D3DXLoadMeshHierarchyFromXA(const char *filename, DWORD options, struct ID3DXAllocateHierarchy *alloc_hier, struct ID3DXLoadUserData *load_user_data, D3DXFRAME **frame_hierarchy, struct ID3DXAnimationController **anim_controller) { + WCHAR *filenameW; HRESULT hr; int len; - LPWSTR filenameW; - TRACE("(%s, %x, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, - device, alloc_hier, load_user_data, frame_hierarchy, anim_controller); + TRACE("filename %s, options %#x, device %p, alloc_hier %p, " + "load_user_data %p, frame_hierarchy %p, anim_controller %p.\n", + debugstr_a(filename), options, device, alloc_hier, + load_user_data, frame_hierarchy, anim_controller); if (!filename) return D3DERR_INVALIDCALL; @@ -4025,12 +4027,14 @@ HRESULT WINAPI D3DXLoadMeshFromXA(const char *filename, DWORD options, struct ID struct ID3DXBuffer **adjacency, struct ID3DXBuffer **materials, struct ID3DXBuffer **effect_instances, DWORD *num_materials, struct ID3DXMesh **mesh) { + WCHAR *filenameW; HRESULT hr; int len; - LPWSTR filenameW; - TRACE("(%s, %x, %p, %p, %p, %p, %p, %p)\n", debugstr_a(filename), options, - device, adjacency, materials, effect_instances, num_materials, mesh); + TRACE("filename %s, options %#x, device %p, adjacency %p, materials %p, " + "effect_instances %p, num_materials %p, mesh %p.\n", + debugstr_a(filename), options, device, adjacency, materials, + effect_instances, num_materials, mesh); if (!filename) return D3DERR_INVALIDCALL; @@ -4943,12 +4947,12 @@ HRESULT WINAPI D3DXCreateTeapot(struct IDirect3DDevice9 *device, HRESULT WINAPI D3DXCreateTextA(struct IDirect3DDevice9 *device, HDC hdc, const char *text, float deviation, float extrusion, struct ID3DXMesh **mesh, struct ID3DXBuffer **adjacency, GLYPHMETRICSFLOAT *glyphmetrics) { + WCHAR *textW; HRESULT hr; int len; - LPWSTR textW; - TRACE("(%p, %p, %s, %f, %f, %p, %p, %p)\n", device, hdc, - debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); + TRACE("device %p, hdc %p, text %s, deviation %.8e, extrusion %.8e, mesh %p, adjacency %p, glyphmetrics %p.\n", + device, hdc, debugstr_a(text), deviation, extrusion, mesh, adjacency, glyphmetrics); if (!text) return D3DERR_INVALIDCALL; diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index 66a38ab..e2c227f 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -284,10 +284,13 @@ struct D3DXIncludeImpl { HRESULT WINAPI D3DXAssembleShaderFromFileA(const char *filename, const D3DXMACRO *defines, ID3DXInclude *include, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages) { - LPWSTR filename_w = NULL; + WCHAR *filename_w; DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, flags %#x, shader %p, error_messages %p.\n", + debugstr_a(filename), defines, include, flags, shader, error_messages); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); @@ -387,10 +390,15 @@ HRESULT WINAPI D3DXCompileShaderFromFileA(const char *filename, const D3DXMACRO ID3DXInclude *include, const char *entrypoint, const char *profile, DWORD flags, ID3DXBuffer **shader, ID3DXBuffer **error_messages, ID3DXConstantTable **constant_table) { - LPWSTR filename_w = NULL; + WCHAR *filename_w; DWORD len; HRESULT ret; + TRACE("filename %s, defines %p, include %p, entrypoint %s, profile %s, " + "flags %#x, shader %p, error_messages %p, constant_table %p.\n", + debugstr_a(filename), defines, include, debugstr_a(entrypoint), + debugstr_a(profile), flags, shader, error_messages, constant_table); + if (!filename) return D3DXERR_INVALIDDATA; len = MultiByteToWideChar(CP_ACP, 0, filename, -1, NULL, 0); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 2f4499e..c6e0c04 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -901,11 +901,11 @@ HRESULT WINAPI D3DXGetImageInfoFromFileInMemory(const void *data, UINT datasize, */ HRESULT WINAPI D3DXGetImageInfoFromFileA(LPCSTR file, D3DXIMAGE_INFO *info) { - LPWSTR widename; + WCHAR *widename; HRESULT hr; int strlength; - TRACE("(%s, %p): relay\n", debugstr_a(file), info); + TRACE("file %s, info %p.\n", debugstr_a(file), info); if( !file ) return D3DERR_INVALIDCALL; @@ -1188,7 +1188,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(IDirect3DSurface9 *dst_surface, const PALETTEENTRY *dst_palette, const RECT *dst_rect, const char *src_file, const RECT *src_rect, DWORD filter, D3DCOLOR color_key, D3DXIMAGE_INFO *src_info) { - LPWSTR pWidename; + WCHAR *src_file_w; HRESULT hr; int strlength; @@ -1201,12 +1201,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromFileA(IDirect3DSurface9 *dst_surface, return D3DERR_INVALIDCALL; strlength = MultiByteToWideChar(CP_ACP, 0, src_file, -1, NULL, 0); - pWidename = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*pWidename)); - MultiByteToWideChar(CP_ACP, 0, src_file, -1, pWidename, strlength); + src_file_w = HeapAlloc(GetProcessHeap(), 0, strlength * sizeof(*src_file_w)); + MultiByteToWideChar(CP_ACP, 0, src_file, -1, src_file_w, strlength); hr = D3DXLoadSurfaceFromFileW(dst_surface, dst_palette, dst_rect, - pWidename, src_rect, filter, color_key, src_info); - HeapFree(GetProcessHeap(), 0, pWidename); + src_file_w, src_rect, filter, color_key, src_info); + HeapFree(GetProcessHeap(), 0, src_file_w); return hr; } diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index f0b5569..416ca13 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -719,13 +719,14 @@ HRESULT WINAPI D3DXCreateTextureFromFileExA(struct IDirect3DDevice9 *device, con D3DPOOL pool, DWORD filter, DWORD mipfilter, D3DCOLOR colorkey, D3DXIMAGE_INFO *srcinfo, PALETTEENTRY *palette, struct IDirect3DTexture9 **texture) { - LPWSTR widename; + WCHAR *widename; HRESULT hr; DWORD len; - TRACE("(%p, %s, %u, %u, %u, %x, %x, %x, %u, %u, %x, %p, %p, %p): relay\n", - device, debugstr_a(srcfile), width, height, miplevels, usage, format, pool, filter, - mipfilter, colorkey, srcinfo, palette, texture); + TRACE("device %p, srcfile %s, width %u, height %u, miplevels %u, usage %#x, format %#x, " + "pool %#x, filter %#x, mipfilter %#x, colorkey 0x%08x, srcinfo %p, palette %p, texture %p.\n", + device, debugstr_a(srcfile), width, height, miplevels, usage, format, + pool, filter, mipfilter, colorkey, srcinfo, palette, texture); if (!device || !srcfile || !texture) return D3DERR_INVALIDCALL;

1 0

Henri Verbeet : d3dx9: Avoid LPCSTR.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 75511e351cee1514a6c1c81e66a9bac2b111555a URL: http://source.winehq.org/git/wine.git/?a=commit;h=75511e351cee1514a6c1c81e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Sep 2 09:45:44 2013 +0200 d3dx9: Avoid LPCSTR. --- dlls/d3dx9_36/effect.c | 4 +- dlls/d3dx9_36/shader.c | 46 +++++++++++++------------- dlls/d3dx9_36/skin.c | 18 +++++----- dlls/d3dx9_36/surface.c | 2 +- dlls/d3dx9_36/tests/asm.c | 7 ++-- dlls/d3dx9_36/tests/effect.c | 36 ++++++++++---------- dlls/d3dx9_36/tests/mesh.c | 19 ++++++---- dlls/d3dx9_36/tests/shader.c | 48 ++++++++++++++------------- include/d3dx9anim.h | 30 ++++++++-------- include/d3dx9core.h | 2 +- include/d3dx9effect.h | 75 ++++++++++++++++++++++------------------- include/d3dx9mesh.h | 4 +- include/d3dx9shader.h | 24 +++++++------ include/d3dx9tex.h | 4 +- include/d3dx9xof.h | 9 +++-- 15 files changed, 170 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75511e351cee1514a6c1c…

1 0

Marcus Meissner : kernel32/tests: Avoid leaving com handle open (Coverity).
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: b084d7a4f8ff8b05b230271f76dd9c0c1f871b1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b084d7a4f8ff8b05b230271f7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 10:16:48 2013 +0200 kernel32/tests: Avoid leaving com handle open (Coverity). --- dlls/kernel32/tests/comm.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index e5264c8..6970cf9 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -1036,7 +1036,7 @@ static void test_LoopbackCtsRts(void) if (dcb.fRtsControl == RTS_CONTROL_HANDSHAKE) { trace("RTS_CONTROL_HANDSHAKE is set, so don't manipulate RTS\n"); - CloseHandle(hcom); + CloseHandle(hcom); return; } ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n"); @@ -1180,6 +1180,7 @@ static void test_LoopbackDtrRing(void) if (dcb.fDtrControl == DTR_CONTROL_HANDSHAKE) { trace("DTR_CONTROL_HANDSHAKE is set, so don't manipulate DTR\n"); + CloseHandle(hcom); return; } ok(GetCommModemStatus(hcom, &defaultStat), "GetCommModemStatus failed\n"); @@ -1592,6 +1593,7 @@ static void test_WaitRing(void) ok((ret = GetCommModemStatus(hcom, &defaultStat)), "GetCommModemStatus failed\n"); if (!ret) { skip("modem status failed -> skip.\n"); + CloseHandle(hcom); return; } if(defaultStat & MS_RING_ON) @@ -1668,7 +1670,7 @@ static void test_WaitDcd(void) if (dcb.fDtrControl == DTR_CONTROL_DISABLE) { trace("DTR_CONTROL_HANDSHAKE is set, so don't manipulate DTR\n"); - CloseHandle(hcom); + CloseHandle(hcom); return; } args[0]= TIMEOUT >>1;

1 0

Marcus Meissner : rpcrt4: Free url in error paths (Coverity).
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: d138a1e43dab10e5a77aee2499583545e83e41fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d138a1e43dab10e5a77aee249… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sat Aug 31 10:56:52 2013 +0200 rpcrt4: Free url in error paths (Coverity). --- dlls/rpcrt4/rpc_transport.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 8932f10..c004f66 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -2533,12 +2533,16 @@ static RPC_STATUS rpcrt4_ncacn_http_open(RpcConnection* Connection) return RPC_S_SERVER_UNAVAILABLE; } status = insert_authorization_header(httpc->in_request, httpc->common.QOS); - if (status != RPC_S_OK) + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, url); return status; + } status = insert_cookie_header(httpc->in_request, Connection->CookieAuth); - if (status != RPC_S_OK) + if (status != RPC_S_OK) { + HeapFree(GetProcessHeap(), 0, url); return status; + } httpc->out_request = HttpOpenRequestW(httpc->session, wszVerbOut, url, NULL, NULL, wszAcceptTypes, flags, (DWORD_PTR)httpc->async_data);

1 0

Nikolay Sivov : kernel32/tests: Some tests for 'comInterfaceProxyStub' data .
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 26dc7990398973136c89d3781bdbb2dec22161c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26dc7990398973136c89d3781… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 10:34:12 2013 +0400 kernel32/tests: Some tests for 'comInterfaceProxyStub' data. --- dlls/kernel32/tests/actctx.c | 92 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 90 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index a4e6655..39c105a 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -84,11 +84,13 @@ static const char manifest2[] = "</dependency>" "</assembly>"; -DEFINE_GUID(IID_CoTest, 0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x11, 0x11, 0x22, 0x22, 0x33, 0x33); -DEFINE_GUID(IID_TlibTest, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_CoTest, 0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x11, 0x11, 0x22, 0x22, 0x33, 0x33); +DEFINE_GUID(IID_TlibTest, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_TlibTest2, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); DEFINE_GUID(IID_TlibTest3, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); DEFINE_GUID(IID_TlibTest4, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x58); +DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" @@ -107,6 +109,15 @@ static const char manifest3[] = " miscStatusThumbnail=\"alignable\"" " miscStatusDocPrint=\"simpleframe,setclientsitefirst\"" " />" +" <comInterfaceProxyStub " +" name=\"Iifaceps\"" +" tlbid=\"{99999999-8888-7777-6666-555555555558}\"" +" iid=\"{66666666-8888-7777-6666-555555555555}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555556}\"" +" threadingModel=\"Free\"" +" numMethods=\"10\"" +" baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" +" />" "</file>" "</assembly>"; @@ -1203,6 +1214,82 @@ todo_wine { ok_(__FILE__, line)(!memcmp(comclass, comclass2, comclass->size), "got wrong data\n"); } +enum ifaceps_mask +{ + NumMethods = 1, + BaseIface = 2 +}; + +struct ifacepsredirect_data +{ + ULONG size; + DWORD mask; + GUID iid; + ULONG nummethods; + GUID tlbid; + GUID base; + ULONG name_len; + ULONG name_offset; +}; + +static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const GUID *tlbid, const GUID *base, ULONG exid, int line) +{ + struct ifacepsredirect_data *ifaceps; + ACTCTX_SECTION_KEYED_DATA data; + BOOL ret; + + memset(&data, 0xfe, sizeof(data)); + data.cbSize = sizeof(data); + + ret = pFindActCtxSectionGuid(0, NULL, + ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION, + iid, &data); +todo_wine + ok_(__FILE__, line)(ret, "FindActCtxSectionGuid failed: %u\n", GetLastError()); + if (!ret) + { + skip("iterface redirection search is not supported\n"); + return; + } + + ifaceps = (struct ifacepsredirect_data*)data.lpData; + + ok_(__FILE__, line)(data.cbSize == sizeof(data), "data.cbSize=%u\n", data.cbSize); + ok_(__FILE__, line)(data.ulDataFormatVersion == 1, "data.ulDataFormatVersion=%u\n", data.ulDataFormatVersion); + ok_(__FILE__, line)(data.lpData != NULL, "data.lpData == NULL\n"); + ok_(__FILE__, line)(ifaceps->size == sizeof(*ifaceps), "got %d for header size\n", ifaceps->size); + if (data.lpData && ifaceps->size == sizeof(*ifaceps)) + { + ULONG len; + + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", debugstr_guid(&ifaceps->tlbid)); + ok_(__FILE__, line)(ifaceps->name_len > 0, "got modulename len %d\n", ifaceps->name_len); + ok_(__FILE__, line)(ifaceps->name_offset == ifaceps->size, "got progid offset %d\n", ifaceps->name_offset); + + /* data length is simply header length + string data length including nulls */ + len = ifaceps->size + ifaceps->name_len + sizeof(WCHAR); + ok_(__FILE__, line)(data.ulLength == len, "got wrong data length %d, expected %d\n", data.ulLength, len); + + /* mask purpose is to indicate if attribute was specified, for testing purposes assume that manifest + always has non-zero value for it */ + if (ifaceps->mask & NumMethods) + ok_(__FILE__, line)(ifaceps->nummethods != 0, "got nummethods %d\n", ifaceps->nummethods); + if (ifaceps->mask & BaseIface) + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->base, base), "got base %s\n", debugstr_guid(&ifaceps->base)); + } + + ok_(__FILE__, line)(data.lpSectionGlobalData == NULL, "data.lpSectionGlobalData != NULL\n"); + ok_(__FILE__, line)(data.ulSectionGlobalDataLength == 0, "data.ulSectionGlobalDataLength=%u\n", + data.ulSectionGlobalDataLength); + ok_(__FILE__, line)(data.lpSectionBase != NULL, "data.lpSectionBase == NULL\n"); + ok_(__FILE__, line)(data.ulSectionTotalLength > 0, "data.ulSectionTotalLength=%u\n", + data.ulSectionTotalLength); + ok_(__FILE__, line)(data.hActCtx == NULL, "data.hActCtx=%p\n", data.hActCtx); + ok_(__FILE__, line)(data.ulAssemblyRosterIndex == exid, "data.ulAssemblyRosterIndex=%u, expected %u\n", + data.ulAssemblyRosterIndex, exid); +} + static void test_wndclass_section(void) { static const WCHAR cls1W[] = {'1','.','2','.','3','.','4','!','w','n','d','C','l','a','s','s','1',0}; @@ -1522,6 +1609,7 @@ static void test_actctx(void) test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, 1, __LINE__); test_find_string_fail(); b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError());

1 0

Nikolay Sivov : kernel32/tests: Some tests for ' comInterfaceExternalProxyStub' data.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 3c0b7ba0297a9afaadec8d4071d7c2402d868c74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c0b7ba0297a9afaadec8d407… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 30 11:20:10 2013 +0400 kernel32/tests: Some tests for 'comInterfaceExternalProxyStub' data. --- dlls/kernel32/tests/actctx.c | 25 ++++++++++++++++++++++--- 1 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 39c105a..059ce44 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -91,6 +91,8 @@ DEFINE_GUID(IID_TlibTest3, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0 DEFINE_GUID(IID_TlibTest4, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x58); DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); +DEFINE_GUID(IID_Iifaceps2, 0x76666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_PS32, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); static const char manifest3[] = "<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" @@ -119,6 +121,14 @@ static const char manifest3[] = " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" "</file>" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps2\"" +" tlbid=\"{99999999-8888-7777-6666-555555555558}\"" +" iid=\"{76666666-8888-7777-6666-555555555555}\"" +" proxyStubClsid32=\"{66666666-8888-7777-6666-555555555556}\"" +" numMethods=\"10\"" +" baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" +" />" "</assembly>"; static const char manifest_wndcls1[] = @@ -1232,7 +1242,8 @@ struct ifacepsredirect_data ULONG name_offset; }; -static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const GUID *tlbid, const GUID *base, ULONG exid, int line) +static void test_find_ifaceps_redirection(HANDLE handle, const GUID *iid, const GUID *tlbid, const GUID *base, + const GUID *ps32, ULONG exid, int line) { struct ifacepsredirect_data *ifaceps; ACTCTX_SECTION_KEYED_DATA data; @@ -1262,7 +1273,14 @@ todo_wine { ULONG len; - ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + /* for external proxy stubs it contains a value from 'proxyStubClsid32' */ + if (ps32) + { + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, ps32), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + } + else + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->iid, iid), "got wrong iid %s\n", debugstr_guid(&ifaceps->iid)); + ok_(__FILE__, line)(IsEqualGUID(&ifaceps->tlbid, tlbid), "got wrong tlid %s\n", debugstr_guid(&ifaceps->tlbid)); ok_(__FILE__, line)(ifaceps->name_len > 0, "got modulename len %d\n", ifaceps->name_len); ok_(__FILE__, line)(ifaceps->name_offset == ifaceps->size, "got progid offset %d\n", ifaceps->name_offset); @@ -1609,7 +1627,8 @@ static void test_actctx(void) test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_dll_redirection(handle, testlib_dll, 1, __LINE__); test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); - test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); test_find_string_fail(); b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError());

1 0

Nikolay Sivov : ntdll: Store all interface redirection data in context.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 9c44cb4f0f3192ac14ee271a9bb60b9aef33aa0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c44cb4f0f3192ac14ee271a9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 10:54:23 2013 +0400 ntdll: Store all interface redirection data in context. --- dlls/kernel32/tests/actctx.c | 9 ++++ dlls/ntdll/actctx.c | 90 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 90 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 059ce44..f764f7a 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -92,6 +92,7 @@ DEFINE_GUID(IID_TlibTest4, 0x99999999, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0 DEFINE_GUID(IID_Iifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_Ibifaceps, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x57); DEFINE_GUID(IID_Iifaceps2, 0x76666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); +DEFINE_GUID(IID_Iifaceps3, 0x86666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x55); DEFINE_GUID(IID_PS32, 0x66666666, 0x8888, 0x7777, 0x66, 0x66, 0x55, 0x55, 0x55, 0x55, 0x55, 0x56); static const char manifest3[] = @@ -129,6 +130,13 @@ static const char manifest3[] = " numMethods=\"10\"" " baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" " />" +" <comInterfaceExternalProxyStub " +" name=\"Iifaceps3\"" +" tlbid=\"{99999999-8888-7777-6666-555555555558}\"" +" iid=\"{86666666-8888-7777-6666-555555555555}\"" +" numMethods=\"10\"" +" baseInterface=\"{66666666-8888-7777-6666-555555555557}\"" +" />" "</assembly>"; static const char manifest_wndcls1[] = @@ -1629,6 +1637,7 @@ static void test_actctx(void) test_find_com_redirection(handle, &IID_CoTest, &IID_TlibTest, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_ifaceps_redirection(handle, &IID_Iifaceps2, &IID_TlibTest4, &IID_Ibifaceps, &IID_PS32, 1, __LINE__); + test_find_ifaceps_redirection(handle, &IID_Iifaceps3, &IID_TlibTest4, &IID_Ibifaceps, NULL, 1, __LINE__); test_find_string_fail(); b = pDeactivateActCtx(0, cookie); ok(b, "DeactivateActCtx failed: %u\n", GetLastError()); diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index adc1ec0..c2fec11 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -242,6 +242,12 @@ struct comclassredirect_data DWORD miscstatusdocprint; }; +enum ifaceps_mask +{ + NumMethods = 1, + BaseIface = 2 +}; + /* Sections structure. @@ -339,8 +345,13 @@ struct entity } comclass; struct { WCHAR *iid; + WCHAR *base; + WCHAR *tlib; WCHAR *name; - } proxy; + WCHAR *ps32; /* only stored for 'comInterfaceExternalProxyStub' */ + DWORD mask; + ULONG nummethods; + } ifaceps; struct { WCHAR *name; @@ -478,6 +489,9 @@ static const WCHAR miscstatusiconW[] = {'m','i','s','c','S','t','a','t','u','s', static const WCHAR miscstatuscontentW[] = {'m','i','s','c','S','t','a','t','u','s','C','o','n','t','e','n','t',0}; static const WCHAR miscstatusthumbnailW[] = {'m','i','s','c','S','t','a','t','u','s','T','h','u','m','b','n','a','i','l',0}; static const WCHAR miscstatusdocprintW[] = {'m','i','s','c','S','t','a','t','u','s','D','o','c','P','r','i','n','t',0}; +static const WCHAR baseInterfaceW[] = {'b','a','s','e','I','n','t','e','r','f','a','c','e',0}; +static const WCHAR nummethodsW[] = {'n','u','m','M','e','t','h','o','d','s',0}; +static const WCHAR proxyStubClsid32W[] = {'p','r','o','x','y','S','t','u','b','C','l','s','i','d','3','2',0}; static const WCHAR activatewhenvisibleW[] = {'a','c','t','i','v','a','t','e','w','h','e','n','v','i','s','i','b','l','e',0}; static const WCHAR actslikebuttonW[] = {'a','c','t','s','l','i','k','e','b','u','t','t','o','n',0}; @@ -722,8 +736,10 @@ static void free_entity_array(struct entity_array *array) RtlFreeHeap(GetProcessHeap(), 0, entity->u.comclass.progid); break; case ACTIVATION_CONTEXT_SECTION_COM_INTERFACE_REDIRECTION: - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.iid); - RtlFreeHeap(GetProcessHeap(), 0, entity->u.proxy.name); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.iid); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.base); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.ps32); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.ifaceps.name); break; case ACTIVATION_CONTEXT_SECTION_COM_TYPE_LIBRARY_REDIRECTION: RtlFreeHeap(GetProcessHeap(), 0, entity->u.typelib.tlbid); @@ -1377,6 +1393,26 @@ static BOOL parse_com_class_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll, str return ret; } +static BOOL parse_nummethods(const xmlstr_t *str, struct entity *entity) +{ + const WCHAR *curr; + ULONG num = 0; + + for (curr = str->ptr; curr < str->ptr + str->len; curr++) + { + if (*curr >= '0' && *curr <= '9') + num = num * 10 + *curr - '0'; + else + { + ERR("wrong numeric value %s\n", debugstr_xmlstr(str)); + return FALSE; + } + } + entity->u.ifaceps.nummethods = num; + + return TRUE; +} + static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redirect* dll) { xmlstr_t attr_name, attr_value; @@ -1390,11 +1426,29 @@ static BOOL parse_cominterface_proxy_stub_elem(xmlbuf_t* xmlbuf, struct dll_redi { if (xmlstr_cmp(&attr_name, iidW)) { - if (!(entity->u.proxy.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; } - if (xmlstr_cmp(&attr_name, nameW)) + else if (xmlstr_cmp(&attr_name, nameW)) + { + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + { + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + entity->u.ifaceps.mask |= BaseIface; + } + else if (xmlstr_cmp(&attr_name, nummethodsW)) + { + if (!(parse_nummethods(&attr_value, entity))) return FALSE; + entity->u.ifaceps.mask |= NumMethods; + } + else if (xmlstr_cmp(&attr_name, tlbidW)) + { + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; + } + /* not used */ + else if (xmlstr_cmp(&attr_name, proxyStubClsid32W) || xmlstr_cmp(&attr_name, threadingmodelW)) { - if (!(entity->u.proxy.name = xmlstrdupW(&attr_value))) return FALSE; } else { @@ -1646,11 +1700,29 @@ static BOOL parse_com_interface_external_proxy_stub_elem(xmlbuf_t* xmlbuf, { if (xmlstr_cmp(&attr_name, iidW)) { - if (!(entity->u.proxy.iid = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.iid = xmlstrdupW(&attr_value))) return FALSE; } - if (xmlstr_cmp(&attr_name, nameW)) + else if (xmlstr_cmp(&attr_name, nameW)) + { + if (!(entity->u.ifaceps.name = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, baseInterfaceW)) + { + if (!(entity->u.ifaceps.base = xmlstrdupW(&attr_value))) return FALSE; + entity->u.ifaceps.mask |= BaseIface; + } + else if (xmlstr_cmp(&attr_name, nummethodsW)) + { + if (!(parse_nummethods(&attr_value, entity))) return FALSE; + entity->u.ifaceps.mask |= NumMethods; + } + else if (xmlstr_cmp(&attr_name, proxyStubClsid32W)) + { + if (!(entity->u.ifaceps.ps32 = xmlstrdupW(&attr_value))) return FALSE; + } + else if (xmlstr_cmp(&attr_name, tlbidW)) { - if (!(entity->u.proxy.name = xmlstrdupW(&attr_value))) return FALSE; + if (!(entity->u.ifaceps.tlib = xmlstrdupW(&attr_value))) return FALSE; } else {

1 0

Nikolay Sivov : ntdll: Implement interface redirection section.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 21c1706f7942a61d4348a82541256b9337571ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21c1706f7942a61d4348a8254… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Sep 2 11:02:14 2013 +0400 ntdll: Implement interface redirection section. --- dlls/kernel32/tests/actctx.c | 6 - dlls/ntdll/actctx.c | 243 ++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 235 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21c1706f7942a61d4348a…

1 0

Stefan Dösinger : ddraw: Gracefully handle recursive SetCooperativeLevel calls.
by Alexandre Julliard 02 Sep '13

02 Sep '13

Module: wine Branch: master Commit: 769dd6d158ea1ef66e33a1416724511cc4eaf1e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=769dd6d158ea1ef66e33a1416… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 2 11:22:30 2013 +0200 ddraw: Gracefully handle recursive SetCooperativeLevel calls. --- dlls/ddraw/ddraw.c | 55 ++++++++++++++++++++++++-------------------- dlls/ddraw/ddraw_private.h | 1 + 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 420c400..26f1984 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -778,21 +778,29 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, wined3d_mutex_lock(); + if (ddraw->flags & DDRAW_SCL_RECURSIVE) + { + WARN("Recursive call, returning DD_OK.\n"); + hr = DD_OK; + goto done; + } + ddraw->flags |= DDRAW_SCL_RECURSIVE; + /* Tests suggest that we need one of them: */ if(!(cooplevel & (DDSCL_SETFOCUSWINDOW | DDSCL_NORMAL | DDSCL_EXCLUSIVE ))) { TRACE("Incorrect cooplevel flags, returning DDERR_INVALIDPARAMS\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if ((cooplevel & DDSCL_CREATEDEVICEWINDOW) && !(cooplevel & DDSCL_EXCLUSIVE)) { WARN("DDSCL_CREATEDEVICEWINDOW requires DDSCL_EXCLUSIVE.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } /* Handle those levels first which set various hwnds */ @@ -810,13 +818,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, | DDSCL_FULLSCREEN)) { WARN("Called with incompatible flags, returning DDERR_INVALIDPARAMS.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } hr = ddraw_set_focus_window(ddraw, window); - wined3d_mutex_unlock(); - return hr; + goto done; } if (cooplevel & DDSCL_EXCLUSIVE) @@ -824,8 +831,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!(cooplevel & DDSCL_FULLSCREEN) || !(window || (cooplevel & DDSCL_CREATEDEVICEWINDOW))) { WARN("DDSCL_EXCLUSIVE requires DDSCL_FULLSCREEN and a window.\n"); - wined3d_mutex_unlock(); - return DDERR_INVALIDPARAMS; + hr = DDERR_INVALIDPARAMS; + goto done; } if (cooplevel & DDSCL_CREATEDEVICEWINDOW) @@ -835,8 +842,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!ddraw->focuswindow && !(cooplevel & DDSCL_SETFOCUSWINDOW)) { WARN("No focus window set.\n"); - wined3d_mutex_unlock(); - return DDERR_NOFOCUSWINDOW; + hr = DDERR_NOFOCUSWINDOW; + goto done; } device_window = CreateWindowExA(0, DDRAW_WINDOW_CLASS_NAME, "DirectDrawDeviceWnd", @@ -845,8 +852,8 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (!device_window) { ERR("Failed to create window, last error %#x.\n", GetLastError()); - wined3d_mutex_unlock(); - return E_FAIL; + hr = E_FAIL; + goto done; } ShowWindow(device_window, SW_SHOW); @@ -861,15 +868,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, { if (!window) { - wined3d_mutex_unlock(); - return DDERR_NOHWND; + hr = DDERR_NOHWND; + goto done; } if (FAILED(hr = ddraw_set_focus_window(ddraw, window))) - { - wined3d_mutex_unlock(); - return hr; - } + goto done; } window = device_window; @@ -910,8 +914,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr = wined3d_stateblock_create(ddraw->wined3d_device, WINED3D_SBT_ALL, &stateblock))) { ERR("Failed to create stateblock, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } wined3d_stateblock_capture(stateblock); @@ -968,8 +971,7 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, if (FAILED(hr)) { ERR("Failed to acquire focus window, hr %#x.\n", hr); - wined3d_mutex_unlock(); - return hr; + goto done; } } @@ -991,9 +993,12 @@ static HRESULT ddraw_set_cooperative_level(struct ddraw *ddraw, HWND window, ddraw->dest_window = window; TRACE("SetCooperativeLevel retuning DD_OK\n"); + hr = DD_OK; +done: + ddraw->flags &= ~DDRAW_SCL_RECURSIVE; wined3d_mutex_unlock(); - return DD_OK; + return hr; } static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND window, DWORD flags) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 299d6ca..781d163 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -54,6 +54,7 @@ struct FvfToDecl #define DDRAW_RESTORE_MODE 0x00000004 #define DDRAW_NO3D 0x00000008 #define DDRAW_SCL_DDRAW1 0x00000010 +#define DDRAW_SCL_RECURSIVE 0x00000020 #define DDRAW_STRIDE_ALIGNMENT 8

1 0