May 2013 - Wine-Commits - list.winehq.org

Alexandre Julliard : wined3d: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 02d56bd3a217a20a6e2aa8e53bbb8f6c099b47fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=02d56bd3a217a20a6e2aa8e53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:30:43 2013 +0200 wined3d: Don't bother to unregister classes at process exit. --- dlls/wined3d/wined3d_main.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index f49e5bc..50bee78 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -521,18 +521,15 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) return wined3d_dll_init(hInstDLL); case DLL_PROCESS_DETACH: + if (lpv) break; return wined3d_dll_destroy(hInstDLL); case DLL_THREAD_DETACH: - { if (!context_set_current(NULL)) { ERR("Failed to clear current context.\n"); } return TRUE; - } - - default: - return TRUE; } + return TRUE; }

1 0

Alexandre Julliard : ole32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 5e95368e0a40df0cba8c238ff43652631d840585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e95368e0a40df0cba8c238ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:25:29 2013 +0200 ole32: Don't bother to unregister classes at process exit. --- dlls/ole32/compobj.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1857ac7..e007440 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -4449,9 +4449,9 @@ HRESULT Handler_DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) /*********************************************************************** * DllMain (OLE32.@) */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID reserved) { - TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, fImpLoad); + TRACE("%p 0x%x %p\n", hinstDLL, fdwReason, reserved); switch(fdwReason) { case DLL_PROCESS_ATTACH: @@ -4460,6 +4460,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad) break; case DLL_PROCESS_DETACH: + if (reserved) break; COMPOBJ_UninitProcess(); RPC_UnregisterAllChannelHooks(); COMPOBJ_DllList_Free();

1 0

Alexandre Julliard : wintab32: Don' t bother to unregister classes at process exit.
by Alexandre Julliard May 14, 2013

May 14, 2013

Module: wine Branch: master Commit: 9cf94e30b2ef8140faca7c0268a1ef08329446f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cf94e30b2ef8140faca7c026… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 14 11:27:40 2013 +0200 wintab32: Don't bother to unregister classes at process exit. --- dlls/wintab32/wintab32.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wintab32/wintab32.c b/dlls/wintab32/wintab32.c index 51cba6a..0633ea8 100644 --- a/dlls/wintab32/wintab32.c +++ b/dlls/wintab32/wintab32.c @@ -99,12 +99,9 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpReserved) return FALSE; break; case DLL_PROCESS_DETACH: + if (lpReserved) break; TRACE("Detaching\n"); - if (hwndDefault) - { - DestroyWindow(hwndDefault); - hwndDefault = 0; - } + if (hwndDefault) DestroyWindow(hwndDefault); TABLET_Unregister(); DeleteCriticalSection(&csTablet); break;

1 0

Jacek Caban : ole32: Error handling clean up in local_server_thread.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: b4cc5a2114592a5e336ba353688f04db6da0bdfb URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4cc5a2114592a5e336ba3536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 13 12:31:31 2013 +0200 ole32: Error handling clean up in local_server_thread. --- dlls/ole32/rpc.c | 26 +++++++------------------- 1 files changed, 7 insertions(+), 19 deletions(-) diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 5070117..6259380 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1917,16 +1917,12 @@ static DWORD WINAPI local_server_thread(LPVOID param) DWORD ret; ret = WaitForMultipleObjects(2, handles, FALSE, INFINITE); if (ret != WAIT_OBJECT_0) - { - CloseHandle(hPipe); break; - } } /* client already connected isn't an error */ else if (error != ERROR_PIPE_CONNECTED) { ERR("ConnectNamedPipe failed with error %d\n", GetLastError()); - CloseHandle(hPipe); break; } } @@ -1935,20 +1931,14 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Stat(pStm,&ststg,STATFLAG_NONAME); if (hres) - { - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; - } + break; seekto.u.LowPart = 0; seekto.u.HighPart = 0; hres = IStream_Seek(pStm,seekto,STREAM_SEEK_SET,&newpos); if (hres) { FIXME("IStream_Seek failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); - return hres; + break; } buflen = ststg.cbSize.u.LowPart; @@ -1957,10 +1947,8 @@ static DWORD WINAPI local_server_thread(LPVOID param) hres = IStream_Read(pStm,buffer,buflen,&res); if (hres) { FIXME("Stream Read failed, %x\n",hres); - CloseHandle(hPipe); - CloseHandle(pipe_event); HeapFree(GetProcessHeap(),0,buffer); - return hres; + break; } WriteFile(hPipe,buffer,buflen,&res,&ovl); @@ -1974,22 +1962,22 @@ static DWORD WINAPI local_server_thread(LPVOID param) if (!multi_use) { TRACE("single use object, shutting down pipe %s\n", debugstr_w(pipefn)); - CloseHandle(hPipe); break; } new_pipe = CreateNamedPipeW( pipefn, PIPE_ACCESS_DUPLEX | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE|PIPE_WAIT, PIPE_UNLIMITED_INSTANCES, 4096, 4096, 500 /* 0.5 second timeout */, NULL ); - CloseHandle(hPipe); if (new_pipe == INVALID_HANDLE_VALUE) { FIXME("pipe creation failed for %s, le is %u\n", debugstr_w(pipefn), GetLastError()); - CloseHandle(pipe_event); - return 1; + break; } + CloseHandle(hPipe); hPipe = new_pipe; } + CloseHandle(pipe_event); + CloseHandle(hPipe); return 0; }

1 0

Hans Leidekker : winhttp: Fix a memory leak.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 93637828b4b07708cbcebc0aadf5f8a44b3b9121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93637828b4b07708cbcebc0aa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 13 12:17:36 2013 +0200 winhttp: Fix a memory leak. Reported by Marcus Meissner. --- dlls/winhttp/request.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 3238aa5..436a02f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1582,6 +1582,8 @@ static BOOL do_authorization( request_t *request, DWORD target, DWORD scheme_fla { ERR("authentication scheme changed from %s to %s\n", debugstr_w(auth_schemes[authinfo->scheme].str), debugstr_w(auth_value)); + destroy_authinfo( authinfo ); + *auth_ptr = NULL; return FALSE; } in.BufferType = SECBUFFER_TOKEN;

1 0

André Hentschel : d3drm/tests: Add more face tests.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 0867e377681de28fd52e3a7b70f97da44669c98b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0867e377681de28fd52e3a7b7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:55:47 2013 +0200 d3drm/tests: Add more face tests. --- dlls/d3drm/tests/d3drm.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 84 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index db9d623..f82af5f 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -677,6 +677,8 @@ static void test_Face(void) IDirect3DRMFace *face1; IDirect3DRMFace2 *face2; IDirect3DRMFaceArray *array1; + D3DRMLOADMEMORY info; + D3DVECTOR v1[4], n1[4], v2[4], n2[4]; DWORD count; CHAR cname[64] = {0}; int icount; @@ -812,6 +814,88 @@ static void test_Face(void) icount = IDirect3DRMFace2_GetVertexCount(face2); ok(!icount, "wrong VertexCount: %i\n", icount); + info.lpMemory = data_ok; + info.dSize = strlen(data_ok); + hr = IDirect3DRMMeshBuilder3_Load(MeshBuilder3, &info, NULL, D3DRMLOAD_FROMMEMORY, NULL, NULL); + ok(hr == D3DRM_OK, "Cannot load mesh data (hr = %x)\n", hr); + + icount = IDirect3DRMMeshBuilder3_GetVertexCount(MeshBuilder3); + ok(icount == 4, "Wrong number of vertices %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetNormalCount(MeshBuilder3); + ok(icount == 4, "Wrong number of normals %d (must be 4)\n", icount); + + icount = IDirect3DRMMeshBuilder3_GetFaceCount(MeshBuilder3); + todo_wine + ok(icount == 4, "Wrong number of faces %d (must be 4)\n", icount); + + count = 4; + hr = IDirect3DRMMeshBuilder3_GetVertices(MeshBuilder3, 0, &count, v1); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of vertices %d (must be 4)\n", count); + + hr = IDirect3DRMMeshBuilder3_GetNormals(MeshBuilder3, 0, &count, n1); + ok(hr == D3DRM_OK, "Cannot get normals information (hr = %x)\n", hr); + ok(count == 4, "Wrong number of normals %d (must be 4)\n", count); + + array1 = NULL; + hr = IDirect3DRMMeshBuilder3_GetFaces(MeshBuilder3, &array1); + todo_wine + ok(hr == D3DRM_OK, "Cannot get FaceArray (hr = %x)\n", hr); + todo_wine + ok(array1 != NULL, "pArray = %p\n", array1); + if (array1) + { + IDirect3DRMFace *face; + count = IDirect3DRMFaceArray_GetSize(array1); + ok(count == 4, "count = %u\n", count); + hr = IDirect3DRMFaceArray_GetElement(array1, 1, &face); + ok(hr == D3DRM_OK, "Cannot get face (hr = %x)\n", hr); + IDirect3DRMFace_GetVertices(face, &count, v2, n2); + ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); + ok(count == 3, "Wrong number of vertices %d (must be 3)\n", count); + ok(U1(v2[0]).x == U1(v1[0]).x, "Wrong component v2[0].x = %f (expected %f)\n", + U1(v2[0]).x, U1(v1[0]).x); + ok(U1(v2[0]).y == U1(v1[0]).y, "Wrong component v2[0].y = %f (expected %f)\n", + U1(v2[0]).y, U1(v1[0]).y); + ok(U1(v2[0]).z == U1(v1[0]).z, "Wrong component v2[0].z = %f (expected %f)\n", + U1(v2[0]).z, U1(v1[0]).z); + ok(U1(v2[1]).x == U1(v1[1]).x, "Wrong component v2[1].x = %f (expected %f)\n", + U1(v2[1]).x, U1(v1[1]).x); + ok(U1(v2[1]).y == U1(v1[1]).y, "Wrong component v2[1].y = %f (expected %f)\n", + U1(v2[1]).y, U1(v1[1]).y); + ok(U1(v2[1]).z == U1(v1[1]).z, "Wrong component v2[1].z = %f (expected %f)\n", + U1(v2[1]).z, U1(v1[1]).z); + ok(U1(v2[2]).x == U1(v1[2]).x, "Wrong component v2[2].x = %f (expected %f)\n", + U1(v2[2]).x, U1(v1[2]).x); + ok(U1(v2[2]).y == U1(v1[2]).y, "Wrong component v2[2].y = %f (expected %f)\n", + U1(v2[2]).y, U1(v1[2]).y); + ok(U1(v2[2]).z == U1(v1[2]).z, "Wrong component v2[2].z = %f (expected %f)\n", + U1(v2[2]).z, U1(v1[2]).z); + + ok(U1(n2[0]).x == U1(n1[0]).x, "Wrong component n2[0].x = %f (expected %f)\n", + U1(n2[0]).x, U1(n1[0]).x); + ok(U1(n2[0]).y == U1(n1[0]).y, "Wrong component n2[0].y = %f (expected %f)\n", + U1(n2[0]).y, U1(n1[0]).y); + ok(U1(n2[0]).z == U1(n1[0]).z, "Wrong component n2[0].z = %f (expected %f)\n", + U1(n2[0]).z, U1(n1[0]).z); + ok(U1(n2[1]).x == U1(n1[1]).x, "Wrong component n2[1].x = %f (expected %f)\n", + U1(n2[1]).x, U1(n1[1]).x); + ok(U1(n2[1]).y == U1(n1[1]).y, "Wrong component n2[1].y = %f (expected %f)\n", + U1(n2[1]).y, U1(n1[1]).y); + ok(U1(n2[1]).z == U1(n1[1]).z, "Wrong component n2[1].z = %f (expected %f)\n", + U1(n2[1]).z, U1(n1[1]).z); + ok(U1(n2[2]).x == U1(n1[2]).x, "Wrong component n2[2].x = %f (expected %f)\n", + U1(n2[2]).x, U1(n1[2]).x); + ok(U1(n2[2]).y == U1(n1[2]).y, "Wrong component n2[2].y = %f (expected %f)\n", + U1(n2[2]).y, U1(n1[2]).y); + ok(U1(n2[2]).z == U1(n1[2]).z, "Wrong component n2[2].z = %f (expected %f)\n", + U1(n2[2]).z, U1(n1[2]).z); + + IDirect3DRMFace_Release(face); + IDirect3DRMFaceArray_Release(array1); + } + IDirect3DRMFace2_Release(face2); IDirect3DRMMeshBuilder3_Release(MeshBuilder3); IDirect3DRM3_Release(d3drm3);

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: 60aaed781c0c7dc5ce39aaf846bc1c3bb7d5e8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60aaed781c0c7dc5ce39aaf84… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:54:04 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormals. --- dlls/d3drm/meshbuilder.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 549a5dd..eecf629 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2379,13 +2379,19 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_SetNormals(IDirect3DRMMeshBuil } static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_GetNormals(IDirect3DRMMeshBuilder3 *iface, - DWORD IndexFirst, DWORD *count, D3DVECTOR *vector) + DWORD IndexFirst, DWORD *ncount, D3DVECTOR *normals) { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); + DWORD count = This->nb_normals - IndexFirst; - FIXME("(%p)->(%u,%p,%p): stub\n", This, IndexFirst, count, vector); + TRACE("(%p)->(%u,%p,%p)\n", This, IndexFirst, ncount, normals); - return E_NOTIMPL; + if (ncount) + *ncount = count; + if (normals && This->nb_normals) + memcpy(normals, This->pNormals + IndexFirst, count * sizeof(D3DVECTOR)); + + return D3DRM_OK; } static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuilder3* iface)

1 0

André Hentschel : d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: edacd0772e6c57f637477def8d3bd6800b752991 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edacd0772e6c57f637477def8… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun May 12 23:53:40 2013 +0200 d3drm: Implement IDirect3DRMMeshBuilder3_GetNormalCount. --- dlls/d3drm/meshbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 07dc3fd..549a5dd 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -2392,9 +2392,9 @@ static int WINAPI IDirect3DRMMeshBuilder3Impl_GetNormalCount(IDirect3DRMMeshBuil { IDirect3DRMMeshBuilderImpl *This = impl_from_IDirect3DRMMeshBuilder3(iface); - FIXME("(%p)->(): stub\n", This); + TRACE("(%p)->()\n", This); - return E_NOTIMPL; + return This->nb_normals; } static const struct IDirect3DRMMeshBuilder3Vtbl Direct3DRMMeshBuilder3_Vtbl =

1 0

Nikolay Sivov : comctl32: Fix tics rectangle width/height.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: eaad1cdea8f4d265ae1d8e99e68feb9b3709356a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaad1cdea8f4d265ae1d8e99e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun May 12 17:27:47 2013 +0400 comctl32: Fix tics rectangle width/height. --- dlls/comctl32/trackbar.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index da11843..50c44d5 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -499,12 +499,12 @@ TRACKBAR_DrawOneTic (const TRACKBAR_INFO *infoPtr, HDC hdc, LONG ticPos, int fla offsetthumb = (infoPtr->rcThumb.bottom - infoPtr->rcThumb.top)/2; rcTics.left = infoPtr->rcThumb.left - 2; rcTics.right = infoPtr->rcThumb.right + 2; - rcTics.top = infoPtr->rcChannel.top + offsetthumb + 1; - rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb; + rcTics.top = infoPtr->rcChannel.top + offsetthumb; + rcTics.bottom = infoPtr->rcChannel.bottom - offsetthumb - 1; } else { offsetthumb = (infoPtr->rcThumb.right - infoPtr->rcThumb.left)/2; - rcTics.left = infoPtr->rcChannel.left + offsetthumb + 1; - rcTics.right = infoPtr->rcChannel.right - offsetthumb; + rcTics.left = infoPtr->rcChannel.left + offsetthumb; + rcTics.right = infoPtr->rcChannel.right - offsetthumb - 1; rcTics.top = infoPtr->rcThumb.top - 2; rcTics.bottom = infoPtr->rcThumb.bottom + 2; }

1 0

Alistair Leslie-Hughes : oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR.
by Alexandre Julliard May 13, 2013

May 13, 2013

Module: wine Branch: master Commit: d72787521e09d1ce8287b8b2175412586488d07d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d72787521e09d1ce8287b8b21… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 13 12:29:22 2013 +1000 oledb32: Implement GetConversionSize DBTYPE_VARIANT->DBTYPE_WSTR. --- dlls/oledb32/convert.c | 14 ++++++++++++++ dlls/oledb32/tests/convert.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 3d7d23d..65a2bf6 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -1113,6 +1113,20 @@ static HRESULT WINAPI convert_GetConversionSize(IDataConvert* iface, { switch (src_type) { + case DBTYPE_VARIANT: + { + VARIANT v; + + VariantInit(&v); + if ((hr = VariantChangeType(&v, (VARIANT*)src, 0, VT_BSTR)) == S_OK) + { + *dst_len = (SysStringLen(V_BSTR(&v)) + 1) * sizeof(WCHAR); + VariantClear(&v); + } + else + return hr; + } + break; case DBTYPE_STR: if(src_len) *dst_len = (*src_len + 1) * sizeof(WCHAR); diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 7f3e3ee..64562b1 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2339,6 +2339,7 @@ static void test_getconversionsize(void) BSTR str; static WCHAR strW[] = {'t','e','s','t',0}; static char strTest[] = "test"; + VARIANT var; /* same way as CanConvert fails here */ dst_len = 0; @@ -2394,6 +2395,33 @@ static void test_getconversionsize(void) hr = IDataConvert_GetConversionSize(convert, DBTYPE_STR, DBTYPE_WSTR, &src_len, &dst_len, strTest); ok(hr == S_OK, "got 0x%08x\n", hr); ok(dst_len == 42, "%ld\n", dst_len); + + dst_len = 0; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, NULL, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = SysAllocString(strW); + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(dst_len == 10, "%ld\n", dst_len); + VariantClear(&var); + + dst_len = 0; + src_len = 20; + V_VT(&var) = VT_I4; + V_I4(&var) = 4; + hr = IDataConvert_GetConversionSize(convert, DBTYPE_VARIANT, DBTYPE_WSTR, &src_len, &dst_len, &var); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine ok(dst_len == 110, "%ld\n", dst_len); + VariantClear(&var); + } static void test_converttovar(void)

1 0