October 2006 - Wine-Commits

Rob Shearman : oleaut32: Free allocated memory on typelib and typeinfo destruction.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: b3d024a7bb96ed04bfc75c2fec01e70d61af6f5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3d024a7bb96ed04bfc75c2fe… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:39:21 2006 +0100 oleaut32: Free allocated memory on typelib and typeinfo destruction. --- dlls/oleaut32/typelib.c | 109 +++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 100 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 0863c30..cdf2fe1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -999,6 +999,7 @@ typedef struct tagITypeInfoImpl const ITypeInfo2Vtbl *lpVtbl; const ITypeCompVtbl *lpVtblTypeComp; LONG ref; + BOOL no_free_data; /* don't free data structurees */ TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ int index; /* index in this typelib; */ @@ -3546,6 +3547,9 @@ static ULONG WINAPI ITypeLib2_fnRelease( if (!ref) { + TLBImpLib *pImpLib, *pImpLibNext; + TLBCustData *pCustData, *pCustDataNext; + /* remove cache entry */ if(This->path) { @@ -3557,7 +3561,6 @@ static ULONG WINAPI ITypeLib2_fnRelease( LeaveCriticalSection(&cache_section); HeapFree(GetProcessHeap(), 0, This->path); } - /* FIXME destroy child objects */ TRACE(" destroying ITypeLib(%p)\n",This); if (This->Name) @@ -3584,6 +3587,25 @@ static ULONG WINAPI ITypeLib2_fnRelease( This->HelpStringDll = NULL; } + for (pCustData = This->pCustData; pCustData; pCustData = pCustDataNext) + { + VariantClear(&pCustData->data); + + pCustDataNext = pCustData->next; + TLB_Free(pCustData); + } + + /* FIXME: free arrays inside elements of This->pTypeDesc */ + TLB_Free(This->pTypeDesc); + + for (pImpLib = This->pImpLibs; pImpLib; pImpLib = pImpLibNext) + { + TLB_Free(pImpLib->name); + + pImpLibNext = pImpLib->next; + TLB_Free(pImpLib); + } + if (This->pTypeInfo) /* can be NULL */ ITypeInfo_Release((ITypeInfo*) This->pTypeInfo); HeapFree(GetProcessHeap(),0,This); @@ -4367,14 +4389,17 @@ static ULONG WINAPI ITypeInfo_fnRelease( it means that function is called by ITypeLib2_Release */ ITypeLib2_Release((ITypeLib2*)This->pTypeLib); } else { - static int once = 0; - if (!once) - { - once = 1; - FIXME("destroy child objects\n"); - } + TLBFuncDesc *pFInfo, *pFInfoNext; + TLBVarDesc *pVInfo, *pVInfoNext; + TLBImplType *pImpl, *pImplNext; + TLBRefType *pRefType,*pRefTypeNext; + TLBCustData *pCustData, *pCustDataNext; TRACE("destroying ITypeInfo(%p)\n",This); + + if (This->no_free_data) + goto finish_free; + if (This->Name) { SysFreeString(This->Name); @@ -4393,6 +4418,65 @@ static ULONG WINAPI ITypeInfo_fnRelease( This->DllName = 0; } + for (pFInfo = This->funclist; pFInfo; pFInfo = pFInfoNext) + { + UINT i; + for(i = 0;i < pFInfo->funcdesc.cParams; i++) + { + ELEMDESC *elemdesc = &pFInfo->funcdesc.lprgelemdescParam[i]; + if (elemdesc->u.paramdesc.wParamFlags & PARAMFLAG_FHASDEFAULT) + { + VariantClear(&elemdesc->u.paramdesc.pparamdescex->varDefaultValue); + TLB_Free(elemdesc->u.paramdesc.pparamdescex); + } + SysFreeString(pFInfo->pParamDesc[i].Name); + } + TLB_Free(pFInfo->funcdesc.lprgelemdescParam); + TLB_Free(pFInfo->pParamDesc); + for (pCustData = This->pCustData; pCustData; pCustData = pCustDataNext) + { + VariantClear(&pCustData->data); + + pCustDataNext = pCustData->next; + TLB_Free(pCustData); + } + SysFreeString(pFInfo->HelpString); + SysFreeString(pFInfo->Name); + + pFInfoNext = pFInfo->next; + TLB_Free(pFInfo); + } + for (pVInfo = This->varlist; pVInfo; pVInfo = pVInfoNext) + { + if (pVInfo->vardesc.varkind == VAR_CONST) + { + VariantClear(pVInfo->vardesc.u.lpvarValue); + TLB_Free(pVInfo->vardesc.u.lpvarValue); + } + SysFreeString(pVInfo->Name); + pVInfoNext = pVInfo->next; + TLB_Free(pVInfo); + } + for(pImpl = This->impltypelist; pImpl; pImpl = pImplNext) + { + for (pCustData = pImpl->pCustData; pCustData; pCustData = pCustDataNext) + { + VariantClear(&pCustData->data); + + pCustDataNext = pCustData->next; + TLB_Free(pCustData); + } + pImplNext = pImpl->next; + TLB_Free(pImpl); + } + for(pRefType = This->reflist; pRefType; pRefType = pRefTypeNext) + { + pRefTypeNext = pRefType->next; + TLB_Free(pRefType); + } + TLB_Free(This->pCustData); + +finish_free: if (This->next) { ITypeInfo_Release((ITypeInfo*)This->next); @@ -5783,14 +5867,21 @@ static HRESULT WINAPI ITypeInfo_fnGetRef * copy the contents of the structs. */ *pTypeInfoImpl = *This; - pTypeInfoImpl->ref = 1; + pTypeInfoImpl->ref = 0; /* change the type to interface */ pTypeInfoImpl->TypeAttr.typekind = TKIND_INTERFACE; *ppTInfo = (ITypeInfo*) pTypeInfoImpl; - ITypeInfo_AddRef((ITypeInfo*) pTypeInfoImpl); + /* we use data structures from This, so we need to keep a reference + * to it to stop it being destroyed and signal to the new instance to + * not free its data structures when it is destroyed */ + pTypeInfoImpl->no_free_data = TRUE; + pTypeInfoImpl->next = This; + ITypeInfo_AddRef((ITypeInfo*) This); + + ITypeInfo_AddRef(*ppTInfo); result = S_OK;

1 0

Rob Shearman : oleaut32: Fix some reference count and memory leaks in the typelib marshaling code.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: d1b15c8ed7c2859d3fd1c9d824448947b47d6e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1b15c8ed7c2859d3fd1c9d82… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:38:20 2006 +0100 oleaut32: Fix some reference count and memory leaks in the typelib marshaling code. --- dlls/oleaut32/tmarshal.c | 56 ++++++++++++++++++++++++++++----------------- 1 files changed, 35 insertions(+), 21 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 759c74c..9749120 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -315,7 +315,7 @@ _get_typeinfo_for_iid(REFIID riid, IType ITypeLib_Release(tl); return hres; } - /* FIXME: do this? ITypeLib_Release(tl); */ + ITypeLib_Release(tl); return hres; } @@ -417,6 +417,7 @@ TMProxyImpl_Release(LPRPCPROXYBUFFER ifa if (This->chanbuf) IRpcChannelBuffer_Release(This->chanbuf); VirtualFree(This->asmstubs, 0, MEM_RELEASE); HeapFree(GetProcessHeap(), 0, This->lpvtbl); + ITypeInfo_Release(This->tinfo); CoTaskMemFree(This); } return refCount; @@ -675,6 +676,7 @@ serialize_param( derefhere=FALSE; break; } + ITypeInfo_ReleaseTypeAttr(tinfo, tattr); ITypeInfo_Release(tinfo2); } @@ -762,18 +764,20 @@ serialize_param( break; } case TKIND_ALIAS: - return serialize_param(tinfo2,writeit,debugout,dealloc,&tattr->tdescAlias,arg,buf); + hres = serialize_param(tinfo2,writeit,debugout,dealloc,&tattr->tdescAlias,arg,buf); + break; case TKIND_ENUM: hres = S_OK; if (debugout) TRACE_(olerelay)("%x",*arg); if (writeit) hres = xbuf_add(buf,(LPBYTE)arg,sizeof(DWORD)); - return hres; + break; default: FIXME("Unhandled typekind %d\n",tattr->typekind); hres = E_FAIL; break; } + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); ITypeInfo_Release(tinfo2); return hres; } @@ -1001,6 +1005,7 @@ deserialize_param( derefhere=FALSE; break; } + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); ITypeInfo_Release(tinfo2); } /* read it in all cases, we need to know if we have @@ -1080,6 +1085,8 @@ deserialize_param( hres = ITypeInfo2_GetVarDesc(tinfo2, i, &vdesc); if (hres) { ERR("Could not get vardesc of %d\n",i); + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); + ITypeInfo_Release(tinfo2); return hres; } hres = deserialize_param( @@ -1098,19 +1105,21 @@ deserialize_param( break; } case TKIND_ALIAS: - return deserialize_param(tinfo2,readit,debugout,alloc,&tattr->tdescAlias,arg,buf); + hres = deserialize_param(tinfo2,readit,debugout,alloc,&tattr->tdescAlias,arg,buf); + break; case TKIND_ENUM: if (readit) { hres = xbuf_get(buf,(LPBYTE)arg,sizeof(DWORD)); if (hres) ERR("Failed to read enum (4 byte)\n"); } if (debugout) TRACE_(olerelay)("%x",*arg); - return hres; + break; default: ERR("Unhandled typekind %d\n",tattr->typekind); hres = E_FAIL; break; } + ITypeInfo_ReleaseTypeAttr(tinfo2, tattr); } if (hres) ERR("failed to stuballoc in TKIND_RECORD.\n"); @@ -1165,9 +1174,6 @@ _get_funcdesc( if (fname) *fname = NULL; if (iname) *iname = NULL; - *tactual = tinfo; - ITypeInfo_AddRef(*tactual); - while (1) { hres = ITypeInfoImpl_GetInternalFuncDesc(tinfo, i, fdesc); @@ -1204,6 +1210,8 @@ _get_funcdesc( ITypeInfo_GetDocumentation(tinfo,(*fdesc)->memid,fname,NULL,NULL,NULL); if (iname) ITypeInfo_GetDocumentation(tinfo,-1,iname,NULL,NULL,NULL); + *tactual = tinfo; + ITypeInfo_AddRef(*tactual); return S_OK; } i++; @@ -1709,12 +1717,12 @@ TMStubImpl_Invoke( const FUNCDESC *fdesc; TMStubImpl *This = (TMStubImpl *)iface; HRESULT hres; - DWORD *args, res, *xargs, nrofargs; + DWORD *args = NULL, res, *xargs, nrofargs; marshal_state buf; UINT nrofnames; BSTR names[10]; BSTR iname = NULL; - ITypeInfo *tinfo; + ITypeInfo *tinfo = NULL; TRACE("...\n"); @@ -1753,8 +1761,9 @@ TMStubImpl_Invoke( if (iname && !lstrcmpW(iname, IDispatchW)) { ERR("IDispatch cannot be marshaled by the typelib marshaler\n"); - ITypeInfo_Release(tinfo); - return E_UNEXPECTED; + hres = E_UNEXPECTED; + SysFreeString (iname); + goto exit; } if (iname) SysFreeString (iname); @@ -1771,7 +1780,11 @@ TMStubImpl_Invoke( for (i=0;i<fdesc->cParams;i++) nrofargs += _argsize(fdesc->lprgelemdescParam[i].tdesc.vt); args = HeapAlloc(GetProcessHeap(),0,(nrofargs+1)*sizeof(DWORD)); - if (!args) return E_OUTOFMEMORY; + if (!args) + { + hres = E_OUTOFMEMORY; + goto exit; + } /* Allocate all stuff used by call. */ xargs = args+1; @@ -1817,7 +1830,7 @@ TMStubImpl_Invoke( __ENDTRY if (hres != S_OK) - return hres; + goto exit; buf.curoff = 0; @@ -1842,14 +1855,8 @@ TMStubImpl_Invoke( hres = xbuf_add (&buf, (LPBYTE)&res, sizeof(DWORD)); - for (i = 0; i < nrofnames; i++) - SysFreeString(names[i]); - if (hres != S_OK) - return hres; - - ITypeInfo_Release(tinfo); - HeapFree(GetProcessHeap(), 0, args); + goto exit; xmsg->cbBuffer = buf.curoff; hres = IRpcChannelBuffer_GetBuffer(rpcchanbuf, xmsg, &This->iid); @@ -1859,6 +1866,13 @@ TMStubImpl_Invoke( if (hres == S_OK) memcpy(xmsg->Buffer, buf.base, buf.curoff); +exit: + for (i = 0; i < nrofnames; i++) + SysFreeString(names[i]); + + ITypeInfo_Release(tinfo); + HeapFree(GetProcessHeap(), 0, args); + HeapFree(GetProcessHeap(), 0, buf.base); TRACE("returning\n");

1 0

Rob Shearman : oleaut32: Fix memory leaks after calling ITypeInfo::GetNames .
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 0fa33bb69b6669d251d4a3ffc09abbcbd58209b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fa33bb69b6669d251d4a3ffc… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:29:09 2006 +0100 oleaut32: Fix memory leaks after calling ITypeInfo::GetNames. --- dlls/oleaut32/tmarshal.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index ac4d407..759c74c 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -741,16 +741,6 @@ serialize_param( ERR("Could not get vardesc of %d\n",i); return hres; } - /* Need them for hack below */ - /* - memset(names,0,sizeof(names)); - hres = ITypeInfo_GetNames(tinfo2,vdesc->memid,names,sizeof(names)/sizeof(names[0]),&nrofnames); - if (nrofnames > sizeof(names)/sizeof(names[0])) { - ERR("Need more names!\n"); - } - if (!hres && debugout) - TRACE_(olerelay)("%s=",relaystr(names[0])); - */ elem2 = &vdesc->elemdescVar; tdesc2 = &elem2->tdesc; hres = serialize_param( @@ -1382,6 +1372,8 @@ xCall(LPVOID retptr, int method, TMProxy hres = remoteresult; exit: + for (i = 0; i < nrofnames; i++) + SysFreeString(names[i]); HeapFree(GetProcessHeap(),0,buf.base); IRpcChannelBuffer_Release(chanbuf); ITypeInfo_Release(tinfo); @@ -1849,6 +1841,10 @@ TMStubImpl_Invoke( } hres = xbuf_add (&buf, (LPBYTE)&res, sizeof(DWORD)); + + for (i = 0; i < nrofnames; i++) + SysFreeString(names[i]); + if (hres != S_OK) return hres;

1 0

Rob Shearman : ole32: Fix some memory leaks in the marshal tests.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: e1ee3b4de3ab33b5170c7b981a8ff632cf86138c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ee3b4de3ab33b5170c7b981… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:28:58 2006 +0100 ole32: Fix some memory leaks in the marshal tests. --- dlls/ole32/tests/marshal.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index f2fce85..d4f6b78 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -756,6 +756,7 @@ static DWORD CALLBACK no_couninitialize_ hr = CoUnmarshalInterface(ncu_params->stream, &IID_IClassFactory, (void **)&pProxy); ok_ole_success(hr, CoUnmarshalInterface); + IStream_Release(ncu_params->stream); ok_more_than_one_lock(); @@ -824,6 +825,7 @@ static void test_tableweak_marshal_and_u IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IClassFactory, (void **)&pProxy2); + IStream_Release(pStream); ok_ole_success(hr, CoUnmarshalInterface); ok_more_than_one_lock(); @@ -1998,6 +2000,7 @@ static void test_ROT(void) ok_ole_success(hr, GetRunningObjectTable); hr = IRunningObjectTable_Register(pROT, 0, (IUnknown*)&Test_ClassFactory, pMoniker, &dwCookie); ok_ole_success(hr, IRunningObjectTable_Register); + IMoniker_Release(pMoniker); ok_more_than_one_lock();

1 0

Rob Shearman : comctl32: Fix imagelist leak in tests.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: c932790dcf03bee253c68e940a7f827e8351ded0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c932790dcf03bee253c68e940… Author: Rob Shearman <rob(a)codeweavers.com> Date: Mon Oct 23 11:28:46 2006 +0100 comctl32: Fix imagelist leak in tests. --- dlls/comctl32/tests/imagelist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 16741d7..f863455 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -283,6 +283,8 @@ #undef SIZEY1 #undef SIZEX2 #undef SIZEY2 #undef HOTSPOTS_MAX + ImageList_Destroy(himl2); + ImageList_Destroy(himl1); DestroyWindow(hwnd); }

1 0

Dmitry Timoshkov : user32: Make the test pass for GetClassName called on a small buffer.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 33d5da5bda5530f46d1c6c15f9edc6f373204393 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d5da5bda5530f46d1c6c15f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 23 19:06:59 2006 +0900 user32: Make the test pass for GetClassName called on a small buffer. --- dlls/user/class.c | 31 +++++++++++++++++++++++++++---- dlls/user/tests/class.c | 4 ++-- 2 files changed, 29 insertions(+), 6 deletions(-) diff --git a/dlls/user/class.c b/dlls/user/class.c index b158ece..855bbe9 100644 --- a/dlls/user/class.c +++ b/dlls/user/class.c @@ -63,6 +63,7 @@ typedef struct tagCLASS static struct list class_list = LIST_INIT( class_list ); #define CLASS_OTHER_PROCESS ((CLASS *)1) +#define MAX_ATOM_LEN 255 /* from dlls/kernel32/atom.c */ /*********************************************************************** * get_class_ptr @@ -956,9 +957,20 @@ DWORD WINAPI SetClassLongA( HWND hwnd, I */ INT WINAPI GetClassNameA( HWND hwnd, LPSTR buffer, INT count ) { - INT ret = GlobalGetAtomNameA( GetClassLongA( hwnd, GCW_ATOM ), buffer, count ); + char tmpbuf[MAX_ATOM_LEN + 1]; + INT ret; - TRACE("%p %s %x\n",hwnd, debugstr_a(buffer), count); + TRACE("%p %p %d\n", hwnd, buffer, count); + + if (count <= 0) return 0; + + ret = GlobalGetAtomNameA( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 ); + if (ret) + { + ret = min(count - 1, ret); + memcpy(buffer, tmpbuf, ret); + buffer[ret] = 0; + } return ret; } @@ -968,9 +980,20 @@ INT WINAPI GetClassNameA( HWND hwnd, LPS */ INT WINAPI GetClassNameW( HWND hwnd, LPWSTR buffer, INT count ) { - INT ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), buffer, count ); + WCHAR tmpbuf[MAX_ATOM_LEN + 1]; + INT ret; - TRACE("%p %s %x\n",hwnd, debugstr_w(buffer), count); + TRACE("%p %p %d\n", hwnd, buffer, count); + + if (count <= 0) return 0; + + ret = GlobalGetAtomNameW( GetClassLongW( hwnd, GCW_ATOM ), tmpbuf, MAX_ATOM_LEN + 1 ); + if (ret) + { + ret = min(count - 1, ret); + memcpy(buffer, tmpbuf, ret * sizeof(WCHAR)); + buffer[ret] = 0; + } return ret; } diff --git a/dlls/user/tests/class.c b/dlls/user/tests/class.c index 5a6a979..d3c173a 100644 --- a/dlls/user/tests/class.c +++ b/dlls/user/tests/class.c @@ -414,8 +414,8 @@ static void test_instances(void) DestroyWindow( hwnd2 ); r = GetClassName( hwnd, buffer, 4 ); - todo_wine ok( r == 3, "return wrong\n"); - ok( !strcmp( buffer, "__t"), "name wrong\n"); + ok( r == 3, "expected 3, got %d\n", r ); + ok( !strcmp( buffer, "__t"), "name wrong: %s\n", buffer ); ok( UnregisterClassA( name, kernel32 ), "Unregister failed for kernel32\n" );

1 0

Dmitry Timoshkov : oleaut32: Make QueryPathOfRegTypeLib test pass under Wine.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 20c40e065915bee591fe6ef028a61c5d4692e69b URL: http://source.winehq.org/git/wine.git/?a=commit;h=20c40e065915bee591fe6ef02… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 23 20:28:37 2006 +0900 oleaut32: Make QueryPathOfRegTypeLib test pass under Wine. --- dlls/oleaut32/tests/typelib.c | 4 --- dlls/oleaut32/typelib.c | 56 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 4808bf4..ccc5b26 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -541,13 +541,9 @@ static void test_QueryPathOfRegTypeLib(v { 1, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, { 3, 0, S_OK, {'f','a','k','e','_','3','_','0','.','d','l','l',0 } }, { 3, 1, S_OK, {'f','a','k','e','_','3','_','1','.','d','l','l',0 } }, -#if 0 /* todo: enable once properly implemented */ { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, -#endif { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, -#if 0 /* todo: enable once properly implemented */ { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, -#endif { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } }; static const WCHAR base[] = {'f','a','k','e',0}; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index c6dd2aa..0863c30 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -149,6 +149,55 @@ #define FromLEWords(X,Y) /*nothing*/ #define FromLEDWords(X,Y) /*nothing*/ #endif +/* + * Find a typelib key which matches a requested maj.min version. + */ +static BOOL find_typelib_key( REFGUID guid, WORD *wMaj, WORD *wMin ) +{ + static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; + WCHAR buffer[60]; + char key_name[16]; + DWORD len, i; + INT best_min = -1; + HKEY hkey; + + memcpy( buffer, typelibW, sizeof(typelibW) ); + StringFromGUID2( guid, buffer + strlenW(buffer), 40 ); + + if (RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey ) != ERROR_SUCCESS) + return FALSE; + + len = sizeof(key_name); + i = 0; + while (RegEnumKeyExA(hkey, i++, key_name, &len, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) + { + INT v_maj, v_min; + + if (sscanf(key_name, "%u.%u", &v_maj, &v_min) == 2) + { + TRACE("found %s: %u.%u\n", debugstr_w(buffer), v_maj, v_min); + + if (*wMaj == v_maj) + { + if (*wMin == v_min) + { + best_min = v_min; + break; /* exact match */ + } + if (v_min > best_min) best_min = v_min; + } + } + len = sizeof(key_name); + } + RegCloseKey( hkey ); + if (best_min >= 0) + { + *wMin = best_min; + return TRUE; + } + return FALSE; +} + /* get the path of a typelib key, in the form "Typelib\\<guid>\\<maj>.<min>" */ /* buffer must be at least 60 characters long */ static WCHAR *get_typelib_key( REFGUID guid, WORD wMaj, WORD wMin, WCHAR *buffer ) @@ -230,6 +279,7 @@ HRESULT WINAPI QueryPathOfRegTypeLib( TRACE_(typelib)("(%s, %x.%x, 0x%x, %p)\n", debugstr_guid(guid), wMaj, wMin, lcid, path); + if (!find_typelib_key( guid, &wMaj, &wMin )) return TYPE_E_LIBNOTREGISTERED; get_typelib_key( guid, wMaj, wMin, buffer ); res = RegOpenKeyExW( HKEY_CLASSES_ROOT, buffer, 0, KEY_READ, &hkey ); @@ -708,7 +758,7 @@ HRESULT WINAPI UnRegisterTypeLib( } /* Try and open the key to the type library. */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, keyName, 0, KEY_READ | KEY_WRITE, &key) != S_OK) { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, keyName, 0, KEY_READ | KEY_WRITE, &key) != ERROR_SUCCESS) { result = E_INVALIDARG; goto end; } @@ -742,7 +792,7 @@ HRESULT WINAPI UnRegisterTypeLib( get_interface_key( &typeAttr->guid, subKeyName ); /* Delete its bits */ - if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != S_OK) { + if (RegOpenKeyExW(HKEY_CLASSES_ROOT, subKeyName, 0, KEY_WRITE, &subKey) != ERROR_SUCCESS) { goto enddeleteloop; } RegDeleteKeyW(subKey, ProxyStubClsidW); @@ -770,7 +820,7 @@ enddeleteloop: tmpLength = sizeof(subKeyName)/sizeof(WCHAR); deleteOtherStuff = TRUE; i = 0; - while(RegEnumKeyExW(key, i++, subKeyName, &tmpLength, NULL, NULL, NULL, NULL) == S_OK) { + while(RegEnumKeyExW(key, i++, subKeyName, &tmpLength, NULL, NULL, NULL, NULL) == ERROR_SUCCESS) { tmpLength = sizeof(subKeyName)/sizeof(WCHAR); /* if its not FLAGS or HELPDIR, then we must keep the rest of the key */

1 0

Dmitry Timoshkov : oleaut32: Add a test for QueryPathOfRegTypeLib.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: a1914dbbb803945f1cb3896bbfb1fa4bc2d88f34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1914dbbb803945f1cb3896bb… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 23 00:01:24 2006 +0900 oleaut32: Add a test for QueryPathOfRegTypeLib. --- dlls/oleaut32/tests/Makefile.in | 2 +- dlls/oleaut32/tests/typelib.c | 95 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/Makefile.in b/dlls/oleaut32/tests/Makefile.in index 0aa57bb..7510f3b 100644 --- a/dlls/oleaut32/tests/Makefile.in +++ b/dlls/oleaut32/tests/Makefile.in @@ -3,7 +3,7 @@ TOPOBJDIR = ../../.. SRCDIR = @srcdir@ VPATH = @srcdir@ TESTDLL = oleaut32.dll -IMPORTS = oleaut32 ole32 gdi32 kernel32 +IMPORTS = oleaut32 ole32 shlwapi rpcrt4 user32 gdi32 advapi32 kernel32 EXTRALIBS = -luuid CTESTS = \ diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 94a74ce..4808bf4 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -2,6 +2,7 @@ * ITypeLib and ITypeInfo test * * Copyright 2004 Jacek Caban + * Copyright 2006 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -29,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "oleauto.h" #include "ocidl.h" +#include "shlwapi.h" #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) @@ -488,10 +490,103 @@ static void test_TypeInfo(void) ITypeLib_Release(pTypeLib); } +static BOOL do_typelib_reg_key(GUID *uid, WORD maj, WORD min, LPCWSTR base, BOOL remove) +{ + static const WCHAR typelibW[] = {'T','y','p','e','l','i','b','\\',0}; + static const WCHAR formatW[] = {'\\','%','u','.','%','u','\\','0','\\','w','i','n','3','2',0}; + static const WCHAR format2W[] = {'%','s','_','%','u','_','%','u','.','d','l','l',0}; + WCHAR buf[128]; + HKEY hkey; + BOOL ret = TRUE; + + memcpy(buf, typelibW, sizeof(typelibW)); + StringFromGUID2(uid, buf + lstrlenW(buf), 40); + + if (remove) + { +todo_wine { + ok(SHDeleteKeyW(HKEY_CLASSES_ROOT, buf) == ERROR_SUCCESS, "SHDeleteKey failed\n"); +} + return TRUE; + } + + wsprintfW(buf + lstrlenW(buf), formatW, maj, min ); + + if (RegCreateKeyExW(HKEY_CLASSES_ROOT, buf, 0, NULL, 0, + KEY_WRITE, NULL, &hkey, NULL) != ERROR_SUCCESS) + { + trace("RegCreateKeyExW failed\n"); + return FALSE; + } + + wsprintfW(buf, format2W, base, maj, min); + if (RegSetValueExW(hkey, NULL, 0, REG_SZ, + (BYTE *)buf, (lstrlenW(buf) + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) + { + trace("RegSetValueExW failed\n"); + ret = FALSE; + } + RegCloseKey(hkey); + return ret; +} + +static void test_QueryPathOfRegTypeLib(void) +{ + static const struct test_data + { + WORD maj, min; + HRESULT ret; + const WCHAR path[16]; + } td[] = { + { 1, 0, TYPE_E_LIBNOTREGISTERED, { 0 } }, + { 3, 0, S_OK, {'f','a','k','e','_','3','_','0','.','d','l','l',0 } }, + { 3, 1, S_OK, {'f','a','k','e','_','3','_','1','.','d','l','l',0 } }, +#if 0 /* todo: enable once properly implemented */ + { 3, 22, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, +#endif + { 3, 37, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, +#if 0 /* todo: enable once properly implemented */ + { 3, 40, S_OK, {'f','a','k','e','_','3','_','3','7','.','d','l','l',0 } }, +#endif + { 4, 0, TYPE_E_LIBNOTREGISTERED, { 0 } } + }; + static const WCHAR base[] = {'f','a','k','e',0}; + UINT i; + RPC_STATUS status; + GUID uid; + WCHAR uid_str[40]; + HRESULT ret; + BSTR path; + + status = UuidCreate(&uid); + ok(!status, "UuidCreate error %08lx\n", status); + + StringFromGUID2(&uid, uid_str, 40); + /*trace("GUID: %s\n", wine_dbgstr_w(uid_str));*/ + + if (!do_typelib_reg_key(&uid, 3, 0, base, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 1, base, 0)) return; + if (!do_typelib_reg_key(&uid, 3, 37, base, 0)) return; + + for (i = 0; i < sizeof(td)/sizeof(td[0]); i++) + { + ret = QueryPathOfRegTypeLib(&uid, td[i].maj, td[i].min, 0, &path); + ok(ret == td[i].ret, "QueryPathOfRegTypeLib(%u.%u) returned %08x\n", td[i].maj, td[i].min, ret); + if (ret == S_OK) + { + ok(!lstrcmpW(td[i].path, path), "typelib %u.%u path doesn't match\n", td[i].maj, td[i].min); + SysFreeString(path); + } + } + + do_typelib_reg_key(&uid, 0, 0, NULL, 1); +} + START_TEST(typelib) { ref_count_test(wszStdOle2); test_TypeComp(); test_CreateDispTypeInfo(); test_TypeInfo(); + test_QueryPathOfRegTypeLib(); }

1 0

Mikołaj Zalewski : shlwapi: Test and fix StrRStrI[AW].
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: 7b170df2eeddabeda1f3451f7037ae847e9a275a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b170df2eeddabeda1f3451f7… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 19:54:18 2006 +0200 shlwapi: Test and fix StrRStrI[AW]. --- dlls/shlwapi/string.c | 38 ++++++++++++++++++++------------------ dlls/shlwapi/tests/string.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/dlls/shlwapi/string.c b/dlls/shlwapi/string.c index b8a046d..50d81db 100644 --- a/dlls/shlwapi/string.c +++ b/dlls/shlwapi/string.c @@ -639,7 +639,6 @@ LPWSTR WINAPI StrStrW(LPCWSTR lpszStr, L */ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, LPCSTR lpszEnd, LPCSTR lpszSearch) { - LPSTR lpszRet = NULL; WORD ch1, ch2; INT iLen; @@ -650,24 +649,26 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, L if (!lpszEnd) lpszEnd = lpszStr + lstrlenA(lpszStr); + if (lpszEnd == lpszStr) + return NULL; if (IsDBCSLeadByte(*lpszSearch)) - ch1 = *lpszSearch << 8 | lpszSearch[1]; + ch1 = *lpszSearch << 8 | (UCHAR)lpszSearch[1]; else ch1 = *lpszSearch; iLen = lstrlenA(lpszSearch); - while (lpszStr <= lpszEnd && *lpszStr) + do { - ch2 = IsDBCSLeadByte(*lpszStr)? *lpszStr << 8 | lpszStr[1] : *lpszStr; + lpszEnd = CharPrevA(lpszStr, lpszEnd); + ch2 = IsDBCSLeadByte(*lpszEnd)? *lpszEnd << 8 | (UCHAR)lpszEnd[1] : *lpszEnd; if (!ChrCmpIA(ch1, ch2)) { - if (!StrCmpNIA(lpszStr, lpszSearch, iLen)) - lpszRet = (LPSTR)lpszStr; + if (!StrCmpNIA(lpszEnd, lpszSearch, iLen)) + return (LPSTR)lpszEnd; } - lpszStr = CharNextA(lpszStr); - } - return lpszRet; + } while (lpszEnd > lpszStr); + return NULL; } /************************************************************************* @@ -677,7 +678,6 @@ LPSTR WINAPI StrRStrIA(LPCSTR lpszStr, L */ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, LPCWSTR lpszEnd, LPCWSTR lpszSearch) { - LPWSTR lpszRet = NULL; INT iLen; TRACE("(%s,%s)\n", debugstr_w(lpszStr), debugstr_w(lpszSearch)); @@ -687,19 +687,21 @@ LPWSTR WINAPI StrRStrIW(LPCWSTR lpszStr, if (!lpszEnd) lpszEnd = lpszStr + strlenW(lpszStr); + if (lpszEnd == lpszStr) + return NULL; iLen = strlenW(lpszSearch); - - while (lpszStr <= lpszEnd && *lpszStr) + + do { - if (!ChrCmpIW(*lpszSearch, *lpszStr)) + lpszEnd = CharPrevW(lpszStr, lpszEnd); + if (!ChrCmpIW(*lpszSearch, *lpszEnd)) { - if (!StrCmpNIW(lpszStr, lpszSearch, iLen)) - lpszRet = (LPWSTR)lpszStr; + if (!StrCmpNIW(lpszEnd, lpszSearch, iLen)) + return (LPWSTR)lpszEnd; } - lpszStr = CharNextW(lpszStr); - } - return lpszRet; + } while (lpszEnd > lpszStr); + return NULL; } /************************************************************************* diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 71533af..209a3c8 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -683,6 +683,45 @@ static void test_StrCpyNXW(void) dest + 5, lpszRes, dest[0], dest[1], dest[2], dest[3], dest[4], dest[5], dest[6], dest[7]); } +#define check_strrstri(type, str, pos, needle, exp) \ + ret##type = StrRStrI##type(str, str+pos, needle); \ + ok(ret##type == (exp), "Type " #type ", expected %p but got %p (string base %p)\n", \ + (exp), ret##type, str); + +static void test_StrRStrI() +{ + static const CHAR szTest[] = "yAxxxxAy"; + static const CHAR szTest2[] = "ABABABAB"; + static const WCHAR wszTest[] = {'y','A','x','x','x','x','A','y',0}; + static const WCHAR wszTest2[] = {'A','B','A','B','A','B','A','B',0}; + + static const WCHAR wszPattern1[] = {'A',0}; + static const WCHAR wszPattern2[] = {'a','X',0}; + static const WCHAR wszPattern3[] = {'A','y',0}; + static const WCHAR wszPattern4[] = {'a','b',0}; + LPWSTR retW; + LPSTR retA; + + check_strrstri(A, szTest, 4, "A", szTest+1); + check_strrstri(A, szTest, 4, "aX", szTest+1); + check_strrstri(A, szTest, 4, "Ay", NULL); + check_strrstri(W, wszTest, 4, wszPattern1, wszTest+1); + check_strrstri(W, wszTest, 4, wszPattern2, wszTest+1); + check_strrstri(W, wszTest, 4, wszPattern3, NULL); + + check_strrstri(A, szTest2, 4, "ab", szTest2+2); + check_strrstri(A, szTest2, 3, "ab", szTest2+2); + check_strrstri(A, szTest2, 2, "ab", szTest2); + check_strrstri(A, szTest2, 1, "ab", szTest2); + check_strrstri(A, szTest2, 0, "ab", NULL); + check_strrstri(W, wszTest2, 4, wszPattern4, wszTest2+2); + check_strrstri(W, wszTest2, 3, wszPattern4, wszTest2+2); + check_strrstri(W, wszTest2, 2, wszPattern4, wszTest2); + check_strrstri(W, wszTest2, 1, wszPattern4, wszTest2); + check_strrstri(W, wszTest2, 0, wszPattern4, NULL); + +} + static void test_SHAnsiToAnsi(void) { char dest[8]; @@ -760,6 +799,7 @@ START_TEST(string) test_StrRetToBSTR(); test_StrCpyNXA(); test_StrCpyNXW(); + test_StrRStrI(); test_SHAnsiToAnsi(); test_SHUnicodeToUnicode(); }

1 0

Mikołaj Zalewski : shlwapi/tests: Disable the StrFromTimeInterval tests as they are language-dependent.
by Alexandre Julliard Oct. 23, 2006

Oct. 23, 2006

Module: wine Branch: master Commit: ef8151b3793cbf08abf3800aa6881c13e282781e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8151b3793cbf08abf3800aa… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Oct 22 19:52:41 2006 +0200 shlwapi/tests: Disable the StrFromTimeInterval tests as they are language-dependent. --- dlls/shlwapi/tests/string.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/string.c b/dlls/shlwapi/tests/string.c index 802811d..71533af 100644 --- a/dlls/shlwapi/tests/string.c +++ b/dlls/shlwapi/tests/string.c @@ -750,7 +750,11 @@ START_TEST(string) test_StrFormatKBSizeA(); test_StrFormatKBSizeW(); } - test_StrFromTimeIntervalA(); + if (0) + { + /* language-dependent test. FIXME: how to detect the language? */ + test_StrFromTimeIntervalA(); + } test_StrCmpA(); test_StrCmpW(); test_StrRetToBSTR();

1 0