November 2012 - Wine-Devel - list.winehq.org

Add data members to interface data structures?
by Max TenEyck Woodbury Nov. 9, 2012

Nov. 9, 2012

Would a patch that allows data members to be hacked into interface data structures be acceptable? Specifically, this would add sequences that follow this template: #ifdef <iface>_IFACE_DATA <iface>_IFACE_DATA #endif /* <iface>_IFACE_DATA defined */ for each inherited interface, in order.

1 0

Re: [PATCH 1/3] dmloader: COM cleanup of IDirectMusicLoader object.
by Nikolay Sivov Nov. 9, 2012

Nov. 9, 2012

On 11/6/2012 20:47, Christian Costa wrote: > --- > dlls/dmloader/dmloader_private.h | 16 +++--- > dlls/dmloader/loader.c | 107 +++++++++++++++++++++++--------------- > 2 files changed, 73 insertions(+), 50 deletions(-) > > diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h > index 47a794c..913f3a6 100644 > --- a/dlls/dmloader/dmloader_private.h > +++ b/dlls/dmloader/dmloader_private.h > @@ -91,14 +91,14 @@ typedef struct _WINE_LOADER_OPTION { > * IDirectMusicLoaderImpl implementation structure > */ > struct IDirectMusicLoaderImpl { > - /* VTABLEs */ > - const IDirectMusicLoader8Vtbl *LoaderVtbl; > - /* reference counter */ > - LONG dwRef; > - /* simple cache (linked list) */ > - struct list *pObjects; > - /* settings for certain object classes */ > - struct list *pClassSettings; > + /* VTABLEs */ > + IDirectMusicLoader8 IDirectMusicLoader8_iface; > + /* reference counter */ > + LONG dwRef; > + /* simple cache (linked list) */ > + struct list *pObjects; > + /* settings for certain object classes */ > + struct list *pClassSettings; > }; Please remove useless comments like VTABLES and reference counter and strip names from prefix, e.g. dwRef->ref. > > /* contained object entry */ > diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c > index cfb3de9..54108c7 100644 > --- a/dlls/dmloader/loader.c > +++ b/dlls/dmloader/loader.c > @@ -21,6 +21,11 @@ > > WINE_DEFAULT_DEBUG_CHANNEL(dmloader); > > +static inline IDirectMusicLoaderImpl* impl_from_IDirectMusicLoader8(IDirectMusicLoader8 *iface) > +{ > + return CONTAINING_RECORD(iface, IDirectMusicLoaderImpl, IDirectMusicLoader8_iface); > +} > + > static HRESULT DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface); > static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); > static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache); > @@ -69,8 +74,9 @@ static BOOL DMUSIC_IsValidLoadableClass (REFCLSID pClassID) { > */ > /* IUnknown/IDirectMusicLoader(8) part: */ > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface (LPDIRECTMUSICLOADER8 iface, REFIID riid, LPVOID *ppobj) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface(LPDIRECTMUSICLOADER8 iface, REFIID riid, LPVOID *ppobj) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > > TRACE("(%p, %s, %p)\n",This, debugstr_dmguid(riid), ppobj); > if (IsEqualIID (riid, &IID_IUnknown) || > @@ -85,15 +91,17 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface ( > return E_NOINTERFACE; > } > > -static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > TRACE("(%p): AddRef from %d\n", This, This->dwRef); > return InterlockedIncrement (&This->dwRef); > } What I also meant is these names are redundant, something like directmusicloader_AddRef() is enough, of course you could use mixed casing in names if you want, there's no strict guidelines for that afaik. > > -static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > - > +static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > + > DWORD dwRef = InterlockedDecrement (&This->dwRef); > TRACE("(%p): ReleaseRef to %d\n", This, This->dwRef); > if (dwRef == 0) { > @@ -107,8 +115,9 @@ static ULONG WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_Release (LPDIRECTM > return dwRef; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID* ppv) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject(LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID* ppv) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > HRESULT result = S_OK; > HRESULT ret = S_OK; /* used at the end of function, to determine whether everything went OK */ > > @@ -361,8 +370,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (LPDIR > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject(LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > LPSTREAM pStream; > LPDIRECTMUSICOBJECT pObject; > DMUS_OBJECTDESC Desc; > @@ -483,9 +493,10 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetObject (LPDIR > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirectory (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzPath, BOOL fClear) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirectory(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzPath, BOOL fClear) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > WCHAR wszCurrentPath[MAX_PATH]; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %s, %d)\n", This, debugstr_dmguid(rguidClass), debugstr_w(pwzPath), fClear); > FIXME(": fClear ignored\n"); > DMUSIC_GetLoaderSettings (iface, rguidClass, wszCurrentPath, NULL); > @@ -496,14 +507,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_SetSearchDirecto > return DMUSIC_SetLoaderSettings (iface, rguidClass, pwzPath, NULL); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzFileExtension, WCHAR* pwzScanFileName) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, WCHAR* pwzFileExtension, WCHAR* pwzScanFileName) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > static const WCHAR wszAny[] = {'*',0}; > WIN32_FIND_DATAW FileData; > HANDLE hSearch; > WCHAR wszSearchString[MAX_PATH]; > WCHAR *p; > HRESULT result; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %p, %p)\n", This, debugstr_dmguid(rguidClass), pwzFileExtension, pwzScanFileName); > if (IsEqualGUID (rguidClass, &GUID_DirectMusicAllTypes) || !DMUSIC_IsValidLoadableClass(rguidClass)) { > ERR(": rguidClass invalid CLSID\n"); > @@ -550,13 +562,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ScanDirectory (L > } while (1); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject (LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject(LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC Desc; > HRESULT result = DMUS_E_LOADER_OBJECTNOTFOUND; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry = NULL; > > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %p)\n", This, pObject); > > /* get descriptor */ > @@ -630,13 +643,14 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CacheObject (LPD > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject(LPDIRECTMUSICLOADER8 iface, IDirectMusicObject* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC Desc; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry = NULL; > HRESULT result = S_FALSE; > > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %p)\n", This, pObject); > > if(!pObject) return E_POINTER; > @@ -695,10 +709,11 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObject (L > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidClass)); > > LIST_FOR_EACH (pEntry, This->pObjects) { > @@ -714,8 +729,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ClearCache (LPDI > return S_OK; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, BOOL fEnable) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, BOOL fEnable) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > BOOL bCurrent; > TRACE("(%p, %s, %d)\n", This, debugstr_dmguid(rguidClass), fEnable); > DMUSIC_GetLoaderSettings (iface, rguidClass, NULL, &bCurrent); > @@ -725,11 +741,12 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnableCache (LPD > return DMUSIC_SetLoaderSettings (iface, rguidClass, NULL, &fEnable); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc) { > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClass, DWORD dwIndex, LPDMUS_OBJECTDESC pDesc) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DWORD dwCount = 0; > struct list *pEntry; > LPWINE_LOADER_ENTRY pObjectEntry; > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > TRACE("(%p, %s, %d, %p)\n", This, debugstr_dmguid(rguidClass), dwIndex, pDesc); > > DM_STRUCT_INIT(pDesc); > @@ -755,13 +772,15 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_EnumObject (LPDI > return S_FALSE; > } > > -static void WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CollectGarbage (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static void WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_CollectGarbage(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > FIXME("(%p): stub\n", This); > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByUnknown (LPDIRECTMUSICLOADER8 iface, IUnknown* pObject) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByUnknown(LPDIRECTMUSICLOADER8 iface, IUnknown* pObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > HRESULT result; > LPDIRECTMUSICOBJECT pObjectInterface; > > @@ -781,8 +800,9 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_ReleaseObjectByU > return result; > } > > -static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile (LPDIRECTMUSICLOADER8 iface, REFGUID rguidClassID, REFIID iidInterfaceID, WCHAR* pwzFilePath, void** ppObject) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile(LPDIRECTMUSICLOADER8 iface, REFGUID rguidClassID, REFIID iidInterfaceID, WCHAR* pwzFilePath, void** ppObject) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > DMUS_OBJECTDESC ObjDesc; > WCHAR wszLoaderSearchPath[MAX_PATH]; > > @@ -859,7 +879,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > *ppobj = NULL; > return E_OUTOFMEMORY; > } > - obj->LoaderVtbl = &DirectMusicLoader_Loader_Vtbl; > + obj->IDirectMusicLoader8_iface.lpVtbl = &DirectMusicLoader_Loader_Vtbl; > obj->dwRef = 0; /* will be inited with QueryInterface */ > /* init cache/alias list */ > obj->pObjects = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); > @@ -867,7 +887,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > /* init settings */ > obj->pClassSettings = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(struct list)); > list_init (obj->pClassSettings); > - DMUSIC_InitLoaderSettings ((LPDIRECTMUSICLOADER8)obj); > + DMUSIC_InitLoaderSettings(&obj->IDirectMusicLoader8_iface); > > /* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */ > DM_STRUCT_INIT(&Desc); > @@ -875,7 +895,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > Desc.guidClass = CLSID_DirectMusicCollection; > Desc.guidObject = GUID_DefaultGMCollection; > DMUSIC_GetDefaultGMPath (Desc.wszFileName); > - IDirectMusicLoader_SetObject ((LPDIRECTMUSICLOADER8)obj, &Desc); > + IDirectMusicLoader_SetObject(&obj->IDirectMusicLoader8_iface, &Desc); > /* and now the workaroundTM for "invalid" default DLS; basically, > my tests showed that if GUID chunk is present in default DLS > collection, loader treats it as "invalid" and returns > @@ -889,12 +909,13 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > > lock_module(); > > - return IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface ((LPDIRECTMUSICLOADER8)obj, lpcGUID, ppobj); > + return IDirectMusicLoader_QueryInterface(&obj->IDirectMusicLoader8_iface, lpcGUID, ppobj); > } > > /* help function for retrieval of search path and caching option for certain class */ > -static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT DMUSIC_GetLoaderSettings(LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > TRACE(": (%p, %s, %p, %p)\n", This, debugstr_dmguid(pClassID), wszSearchPath, pbCache); > > @@ -912,8 +933,9 @@ static HRESULT DMUSIC_GetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl > } > > /* help function for setting search path and caching option for certain class */ > -static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > +static HRESULT DMUSIC_SetLoaderSettings(LPDIRECTMUSICLOADER8 iface, REFGUID pClassID, WCHAR* wszSearchPath, LPBOOL pbCache) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > struct list *pEntry; > HRESULT result = S_FALSE; /* in case pClassID != GUID_DirectMusicAllTypes and not a valid CLSID */ > TRACE(": (%p, %s, %p, %p)\n", This, debugstr_dmguid(pClassID), wszSearchPath, pbCache); > @@ -935,9 +957,10 @@ static HRESULT DMUSIC_SetLoaderSettings (LPDIRECTMUSICLOADER8 iface, REFGUID pCl > return result; > } > > -static HRESULT DMUSIC_InitLoaderSettings (LPDIRECTMUSICLOADER8 iface) { > - ICOM_THIS_MULTI(IDirectMusicLoaderImpl, LoaderVtbl, iface); > - > +static HRESULT DMUSIC_InitLoaderSettings(LPDIRECTMUSICLOADER8 iface) > +{ > + IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); > + > /* hard-coded list of classes */ > static REFCLSID classes[] = { > &CLSID_DirectMusicAudioPathConfig, > > > >

5 21

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib
by Nikolay Sivov Nov. 9, 2012

Nov. 9, 2012

On 11/7/2012 11:36, Tatyana Fokina wrote: Hi, Tatyana. Some comments: > dlls/oleaut32/tests/Makefile.in | 1 + > dlls/oleaut32/tests/typelib2.c | 69 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 70 insertions(+) > create mode 100644 dlls/oleaut32/tests/typelib2.c You don't need a separate file for this, please use typelib.c > + hr = CreateTypeLib2(SYS_WIN32, jsdeb, (ICreateTypeLib2 **)&ctl2); > + if(hr != S_OK) > + { > + skip ("CreateTypeLib2 failed\n"); > + return; > + } > + > + hr = ICreateTypeLib2_CreateTypeInfo(ctl2, jsname, TKIND_DISPATCH, &cti); > + if(hr != S_OK) > + { > + skip ("ICreateTypeLib2_CreateTypeInfo failed\n"); > + return; > + } That's not what skip() is for. Also you leak on second return and you don't need a cast for ctl2. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(!hr)ITypeLib_Release(tl); Please test return value for S_OK here, again you don't need a cast here. > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, &Index); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on Index\n"); > + if(!hr)ITypeLib_Release(tl); > + > + hr = ITypeInfo2_GetContainingTypeLib(ti2, (ITypeLib **)&tl, pIndex); > + ok(!hr, " ITypeInfo2_GetContainingTypeLib failed on pIndex = NULL\n"); > + if(!hr)ITypeLib_Release(tl); What are you trying to do with index pointer?

2 1

Re: scrrun: Implement IDictionary get_HashVal (try 3)
by Nikolay Sivov Nov. 8, 2012

Nov. 8, 2012

On 11/8/2012 12:31, Alistair Leslie-Hughes wrote: > Hi, > Thanks Piotr for your help. > > Changelog: > scrrun: Implement IDictionary get_HashVal > +static LONG create_hash_val_float(float fval) > +{ > + TRACE("val = %f\n", fval); > + > + if(isinf(fval)) > + return 0; > + > + return (*((DWORD*)&fval)) % 1201; > +} Emm, do you just mean (DWORD)fval here? If you always hash it as DWORD why not use DWORD argument? And isinf() will stay for float types in your switch(...). > - FIXME("(%p)->(%p %p)\n", This, Key, HashVal); > + TRACE("(%p)->(%s %s)\n", This, debugstr_variant(Key), debugstr_variant(HashVal)); Tracing HashVal is not useful this way. > + case VT_R8: > + V_I4(HashVal) = create_hash_val_float(V_R8(Key)); > + break; > + case VT_I4: > + V_I4(HashVal) = create_hash_val_float(V_I4(Key)); > + break; That's confusing, I mean the way you treat integer type here.

3 2

shell32: Increase dde_connect res value
by Ken Sharp Nov. 8, 2012

Nov. 8, 2012

Evening all, http://bugs.winehq.org/show_bug.cgi?id=26830 is easily solved by http://bugs.winehq.org/attachment.cgi?id=34184 but I don't know if this will break anything. I cannot find a reference as to why it needs to be set to 256, but there must be a reason for this. Anyone any ideas? Thanks, Ken

2 1

Re: gdiplus: Store transformation matrix directly in the objects.
by Vincent Povirk Nov. 8, 2012

Nov. 8, 2012

Apparently GpMatrix as value type is a thing now. Patch looks good to me.

1 0

Re: [PATCH 2/2] oleaut32: If pointers (ppTLib or pIndex in ITypeInfo2_fnGetContainingTypeLib) are null, we simply ignore it.[resend]
by Huw Davies Nov. 8, 2012

Nov. 8, 2012

On Thu, Nov 08, 2012 at 06:13:33PM +0400, Tatyana Fokina wrote: > + if(ppTLib) > + { > *ppTLib = (ITypeLib *)&This->typelib->ITypeLib2_iface; > ICreateTypeLib_AddRef((ICreateTypeLib*)This->typelib); > + } > + > + if(pIndex) > *pIndex = This->typeinfo->typekind >> 16; Please indent.

1 0

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib [try 2]
by Huw Davies Nov. 8, 2012

Nov. 8, 2012

On Thu, Nov 08, 2012 at 06:13:28PM +0400, Tatyana Fokina wrote: > + hr = CreateTypeLib2(SYS_WIN32, jsdeb, (ICreateTypeLib2 **)&ctl2); > + ok_ole_success(hr, CreateTypeLib2); > + > + hr = ICreateTypeLib2_CreateTypeInfo(ctl2, jsname, TKIND_DISPATCH, &cti); > + ok_ole_success(hr, ICreateTypeLib2_CreateTypeInfo); Please don't use obscure strings like 'jsdeb.tlb' use something like 'test.tlb'. You don't need the casts here or further down. > + > + hr = ICreateTypeInfo_QueryInterface(cti, &IID_ITypeInfo2, (void**)&ti2); > + ok_ole_success(hr, ICreateTypeInfo2_QueryInterface); > + if (SUCCEEDED(hr)) > + { There's no need to put this inside an if block. QI isn't going to fail. Also your indentation is first four spaces, then two - keep it at four. Huw.

1 0

[PATCH 1/3] winmm: Prefer using MMSYSERR_* over AUDCLNT_E_* from mmdevapi. (resend)
by Joerg-Cyril.Hoehle＠t-systems.com Nov. 8, 2012

Nov. 8, 2012

Hi, what's up with this patch series? Regards, Jörg Höhle

1 0

Re: [PATCH] tools/wine.inf.in: Added UTF8 bom header. (resend)
by Dmitry Timoshkov Nov. 8, 2012

Nov. 8, 2012

Qian Hong <fracting(a)gmail.com> wrote: > Added comment as Dan suggested. Thanks Dmitry, Dan and Nikolay for comments > and advice. Also I'm appreciated for any other ideas to resolve Bug 32136. So, how is this supposed to work under Windows? -- Dmitry.

3 7

Re: msi: Fix some leaks (coverity)
by Hans Leidekker Nov. 8, 2012

Nov. 8, 2012

On Thu, 2012-11-08 at 01:32 +0100, Frédéric Delanoy wrote: > diff --git a/dlls/msi/action.c b/dlls/msi/action.c > index f9ab550..8a6c952 100644 > --- a/dlls/msi/action.c > +++ b/dlls/msi/action.c > @@ -5809,7 +5809,16 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) > { > int len = strlenW(file->TargetPath) + strlenW(args) + 2; > if (!(image_path = msi_alloc(len * sizeof(WCHAR)))) > + { > + msi_free(name); > + msi_free(disp); > + msi_free(load_order); > + msi_free(serv_name); > + msi_free(pass); > + msi_free(depends); > + msi_free(args); > return ERROR_OUTOFMEMORY; > + } This function already has a 'done' label where memory is freed. Why not make the return value a variable and jump to the label instead of repeating these statements? > strcpyW(image_path, file->TargetPath); > strcatW(image_path, szSpace); > @@ -6070,6 +6079,7 @@ static BOOL stop_service_dependents(SC_HANDLE scm, SC_HANDLE service) > goto error; > } > > + msi_free(dependencies); > return TRUE; Same here. > > error: > diff --git a/dlls/msi/files.c b/dlls/msi/files.c > index 11913ef..98d7513 100644 > --- a/dlls/msi/files.c > +++ b/dlls/msi/files.c > @@ -336,6 +336,7 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) > if (rc != ERROR_SUCCESS) > { > ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); > + msi_free(mi); > return ERROR_FUNCTION_FAILED; > } > if (!file->Component->Enabled) continue; > @@ -513,6 +514,7 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) > if (rc != ERROR_SUCCESS) > { > ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); > + msi_free(mi); > return ERROR_FUNCTION_FAILED; > } > comp->Action = msi_get_component_action( package, comp ); And here.

1 0

Re: [PATCH 2/2] mstask/tests: Add tests for SetTargetComputer [try 2]
by Marvin Nov. 7, 2012

Nov. 7, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22825 Your paranoid android. === WNT4WSSP6 (32 bit task_scheduler) === task_scheduler.c:46: Test failed: CTaskScheduler CoCreateInstance failed: 80040154 task_scheduler.c:91: Test failed: CTaskScheduler CoCreateInstance failed: 80040154 task_scheduler.c:115: Test failed: CTaskScheduler CoCreateInstance failed: 80040154 task_scheduler.c:156: Test failed: CTaskScheduler CoCreateInstance failed: 80040154

1 0

Re: [PATCH 1/5] ddraw: Avoid LPDIRECTDRAW.
by Marvin Nov. 7, 2012

Nov. 7, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22823 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: ntdll: Fixed some heap allocation stalls
by Matteo Bruni Nov. 7, 2012

Nov. 7, 2012

2012/11/2 Steaphan Greene <steaphan(a)gmail.com>: > Running a game in wine showed it performing terribly. I traced this to the > fact that it allocates and deallocates tiny memory chunks over and over (I > suspect it's in C++ and passing things by value everywhere). This led to > huge stalls because the heap bins weren't fine-grained enough (these > differed in size in steps of 8 bytes, but the bins differed by 16+, so it > spent a lot of time searching each bin for a bigger block). I added more > fine-grained sizes to the smaller end of this, and now it runs faster in > wine than it does natively. :) > > This was run on Debian squeeze, amd64. > > Note, this is my first submission to wine in nearly 15 years. So, of > course, everything has changed with how this works now. Hope I have this > all right. > > --- > dlls/ntdll/heap.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c > index a9044714..eb7406b 100644 > --- a/dlls/ntdll/heap.c > +++ b/dlls/ntdll/heap.c > @@ -116,7 +116,9 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); > /* Max size of the blocks on the free lists */ > static const SIZE_T HEAP_freeListSizes[] = > { > - 0x10, 0x20, 0x30, 0x40, 0x60, 0x80, 0x100, 0x200, 0x400, 0x1000, ~0UL > + 0x10, 0x18, 0x20, 0x28, 0x30, 0x38, 0x40, 0x48, 0x50, 0x58, 0x60, 0x68, > + 0x70, 0x78, 0x80, 0x88, 0x90, 0x98, 0xA0, 0xA8, 0xB0, 0xB8, 0xC0, 0xC8, > + 0xD0, 0xD8, 0xE0, 0E88, 0xF0, 0xF8, 0x100, 0x200, 0x400, 0x1000, ~0UL > }; > #define HEAP_NB_FREE_LISTS (sizeof(HEAP_freeListSizes)/sizeof(HEAP_freeListSizes[0])) That 0E88 looks quite wrong ;) Apart from that, although I'm not an expert for this code, this patch looks reasonable to me. Maybe we don't want so many free lists, but I don't see big downsides for that (e.g. the linear search can be replaced by a binary search, if need be). Maybe adding a smaller list at the start (e.g. 0x8) makes sense too?

3 4

Re: [PATCH 1/2] winmm/tests: Add more mmioSeek tests.
by Dmitry Timoshkov Nov. 7, 2012

Nov. 7, 2012

Akihiro Sagawa <sagawa.aki(a)gmail.com> wrote: > +static void test_mmioSeek(void) > +{ > + HMMIO hmmio; > + MMIOINFO mmio; > + LONG end, pos, size = sizeof(RIFF_buf), offset = 16; > + char test_file[MAX_PATH]; > + MMRESULT res; > + > + { > + /* test memory file */ Please avoid creating nested blocks this way, it's confusing and doesn't add readability of any kind. -- Dmitry.

1 0

Fwd: Bug#566351: libgcrypt11: should not change user id as a side effect
by Dan Kegel Nov. 7, 2012

Nov. 7, 2012

After gstreamer, gcrypt is also dropping support for alternative thread libraries. Good thing secur32/schannel_gnutls.c doesn't use it. (Right?) - Dan ---------- Forwarded message ---------- From: Werner Koch <wk(a)gnupg.org> Date: Wed, Nov 7, 2012 at 1:31 AM Subject: Re: Bug#566351: libgcrypt11: should not change user id as a side effect To: Andreas Metzler <ametzler(a)downhill.at.eu.org> Cc: gcrypt-devel(a)gnupg.org, 566351(a)bugs.debian.org On Sat, 3 Nov 2012 18:29, ametzler(a)downhill.at.eu.org said: > comment sums it up: > <https://bugs.launchpad.net/debian/+source/sudo/+bug/423252/comments/72> Well, it is the usual problem with inter-library dependencies. We will never be able to get this right. The DSO is just not designed to work with completely independent libraries. I don't like to say, but in this regard Windows DLLs are a better solution. Although we can't solve all the problems we will be able to solve the thread initialization problem. Libgcrypt 1.6 will ignore the thread callbacks and assume pthread. Semaphores are then used for locking and provide a way to do thread-safe initialization. The hopefully minor drawback is that one needs to link against librt. > + case GCRYCTL_SET_THREAD_CBS: > + err = ath_install (va_arg (arg_ptr, void *), any_init_done); > +- if (! err) > +- global_init (); Okay, if that works, fine. It might break other things; I don't know. There are enough selftests to hopefully detect such a break (in particular in FIPS mode). Salam-Shalom, Werner -- Die Gedanken sind frei. Ausnahmen regelt ein Bundesgesetz. _______________________________________________ Gcrypt-devel mailing list Gcrypt-devel(a)gnupg.org http://lists.gnupg.org/mailman/listinfo/gcrypt-devel

2 1

Re: gdiplus: Avoid GdipCloneMatrix calls for the the graphics transformation matrix.
by Vincent Povirk Nov. 7, 2012

Nov. 7, 2012

I won't comment on whether using GpMatrix as a value type within gdiplus generally is a good idea, but semantically this looks correct to me.

1 0

Re: [PATCH 1/2] oleaut32/tests: Add test for ITypeInfo2_fnGetContainingTypeLib
by Marvin Nov. 7, 2012

Nov. 7, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22807 Your paranoid android. === WNT4WSSP6 (32 bit typelib2) === typelib2: unhandled exception c0000005 at 65360E09 === WXPPROSP3 (32 bit typelib2) === typelib2: unhandled exception c0000005 at 7713844F === W2K3R2SESP2 (32 bit typelib2) === typelib2: unhandled exception c0000005 at 77D1BA1C

1 0

[PATCH 2/2] oleaut32: If pointers (ppTLib or pIndex in ITypeInfo2_fnGetContainingTypeLib) are null, we simply ignore it.
by Tatyana Fokina Nov. 7, 2012

Nov. 7, 2012

1 0

Re: shell32: initialize fAnyOperationsAborted in SHFileOperation (try 2)
by Marvin Nov. 6, 2012

Nov. 6, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22786 Your paranoid android. === WNT4WSSP6 (32 bit shlfileop) === shlfileop.c:2244: Test failed: SHGetNewLinkInfoA succeeded

1 0

Re: shell32: initialize fAnyOperationsAborted in SHFileOperation
by Marvin Nov. 6, 2012

Nov. 6, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22785 Your paranoid android. === WNT4WSSP6 (32 bit shlfileop) === shlfileop.c:2244: Test failed: SHGetNewLinkInfoA succeeded

1 0

Re: iphlapi: Fix some leaks (coverity)
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Frédéric Delanoy <frederic.delanoy(a)gmail.com> writes: > @@ -1520,8 +1521,8 @@ DWORD WINAPI GetIpAddrTable(PMIB_IPADDRTABLE pIpAddrTable, PULONG pdwSize, BOOL > sizeof(MIB_IPADDRROW), IpAddrTableSorter); > ret = NO_ERROR; > } > - HeapFree(GetProcessHeap(), 0, table); > } > + HeapFree(GetProcessHeap(), 0, table); > } That's not the correct fix. -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [1/2] gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString. Take 2.
by Vincent Povirk Nov. 6, 2012

Nov. 6, 2012

Series looks good to me, thanks.

1 0

Re: msi: Fix some leaks (coverity)
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Frédéric Delanoy <frederic.delanoy(a)gmail.com> writes: > @@ -151,15 +151,23 @@ static UINT propvar_changetype(PROPVARIANT *changed, PROPVARIANT *property, VART > { > HRESULT hr; > HMODULE propsys = LoadLibraryA("propsys.dll"); > + > + if (!propsys) > + { > + ERR("Failed to load propsys.dll: %u\n", GetLastError()); > + return ERROR_DLL_NOT_FOUND; > + } > pPropVariantChangeType = (void *)GetProcAddress(propsys, "PropVariantChangeType"); > > if (!pPropVariantChangeType) > { > ERR("PropVariantChangeType function missing!\n"); > + FreeLibrary(propsys); > return ERROR_FUNCTION_FAILED; > } > > hr = pPropVariantChangeType(changed, property, 0, vt); > + FreeLibrary(propsys); You don't want to load/unload the library on every call. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0.
by Sam Edwards Nov. 6, 2012

Nov. 6, 2012

On Nov 6, 2012, at 3:45, Henri Verbeet <hverbeet(a)gmail.com> wrote: > Yeah, we'll want a similar test for d3d8. Okay, I'll write that as soon as the d3d9 test is accepted. > You're probably looking for AdjustWindowRect() and SetWindowPos(). Thank you, I didn't know about AdjustWindowRect(), but why SetWindowPos()? Is this preferred over MoveWindow() for any reason? > Testing the viewport dimensions is useful, but it probably wouldn't > hurt to check the swapchain's presentation parameters and the > backbuffer's surface desc as well. Good catch, I forgot to copy the relevant code for that. Thanks, Sam

1 0

Re: widl: Ignore -app_mode option
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Jacek Caban <jacek(a)codeweavers.com> writes: > It also changes getopt_long to getopt_long_only, making argument parsing > less strict. Please also update the man page and the usage message. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/3] dmloader: Display new ref in AddRef and Release.
by Alistair Leslie-Hughes Nov. 6, 2012

Nov. 6, 2012

Hi, On 6/11/2012 7:05 PM, Christian Costa wrote: > static HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject(LPDIRECTMUSICLOADER8 iface, LPDMUS_OBJECTDESC pDesc, REFIID riid, LPVOID* ppv) > @@ -880,7 +884,7 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppob > return E_OUTOFMEMORY; > } > obj->IDirectMusicLoader8_iface.lpVtbl = &DirectMusicLoader_Loader_Vtbl; > - obj->dwRef = 0; /* will be inited with QueryInterface */ > + obj->ref = 0; /* Will be inited with QueryInterface */ Shouldn't obj->ref start at 1 or else it will never be freed. Best Regards Alistair Leslie-Hughes

3 2

Re: [PATCH] d3d9/tests: Add test for IDirect3DDevice9_Reset with BackBufferWidth/Height = 0.
by Henri Verbeet Nov. 6, 2012

Nov. 6, 2012

On 6 November 2012 05:01, Sam Edwards <cfsworks(a)gmail.com> wrote: > Perhaps a similar test is necessary in other Direct3D versions, but I > haven't yet looked into it. > Yeah, we'll want a similar test for d3d8. > + /* For resizing the window, we need to know the nonclient area size */ > + ok(GetWindowRect(hwnd, &winsize), "GetWindowRect failed\n"); > + nonclient_width = winsize.right-winsize.left; > + nonclient_height = winsize.bottom-winsize.top; > + ok(GetClientRect(hwnd, &winsize), "GetClientRect failed\n"); > + nonclient_width -= winsize.right; > + nonclient_height -= winsize.bottom; ... > + ok(MoveWindow(hwnd, 0, 0, 200+nonclient_width, 150+nonclient_height, FALSE), > + "MoveWindow failed\n"); You're probably looking for AdjustWindowRect() and SetWindowPos(). > + hr = IDirect3DDevice9_GetViewport(device1, &vp); > + ok(hr == D3D_OK, "IDirect3DDevice9_GetViewport failed with %08x\n", hr); > + if(SUCCEEDED(hr)) > + { > + ok(vp.X == 0, "D3DVIEWPORT->X = %d\n", vp.X); > + ok(vp.Y == 0, "D3DVIEWPORT->Y = %d\n", vp.Y); > + todo_wine ok(vp.Width == 200, "D3DVIEWPORT->Width = %d\n", vp.Width); > + todo_wine ok(vp.Height == 150, "D3DVIEWPORT->Height = %d\n", vp.Height); > + ok(vp.MinZ == 0, "D3DVIEWPORT->MinZ = %f\n", vp.MinZ); > + ok(vp.MaxZ == 1, "D3DVIEWPORT->MaxZ = %f\n", vp.MaxZ); > + } Testing the viewport dimensions is useful, but it probably wouldn't hurt to check the swapchain's presentation parameters and the backbuffer's surface desc as well.

1 0

Re: [1/3] gdiplus: Add a test to check transformation order in GdipMeasureDriverString.
by Vincent Povirk Nov. 6, 2012

Nov. 6, 2012

Thanks for writing tests. It turns out I was a bit confused when I asked for them. For some reason, I was was under the impression that GdipMeasureDriverString would return a measurement in device coordinates, when it should have been obvious to me that it returns world coordinates. Looking back at the existing tests confirms that, since the measurements are the same with a NULL matrix regardless of world transform. That means the test I wanted doesn't answer the question I wanted answered. I'm sorry I created extra work for you with my mistake. The approach of rotating and scaling still works, but it requires drawing text and visually inspecting the output. I've written and attached a test program that does that (with a matrix that rotates by 90 degrees and a world transform with a much greater scale on the Y axis than the X axis). It shows that things work as I expected. The text is stretched vertically AFTER the rotation is applied, and it's easy to see the difference between native's behavior and your patch. It also appears that the origin point (and presumably the later points as well) should not have the matrix applied to it. It looks to me like your patch does not transform the points in the GDI32 codepath, and thus gets the origin point correct in the testcase. It does transform them in the SOFTWARE codepath, and if I force that codepath to be taken, the text draws outside the bounds of the window. So the matrix shouldn't be passed to transform_and_round_points, and it's not necessary to add a matrix argument to that function.

2 1

Re: [PATCH 2/4] msvcrt: Improved _atoflt_l precision
by Alexandre Julliard Nov. 6, 2012

Nov. 6, 2012

Piotr Caban <piotr(a)codeweavers.com> writes: > --- > dlls/msvcrt/string.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M msvcr90.dll -T ../../.. -p msvcr90_test.exe.so msvcr90.c && touch msvcr90.ok msvcr90.c:895: Test failed: got ret 0, expected ret 4, for 1e-39 make: *** [msvcr90.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] tools/wine.inf.in: Added UTF8 bom header.
by Dmitry Timoshkov Nov. 6, 2012

Nov. 6, 2012

Qian Hong <fracting(a)gmail.com> wrote: > This patch solve the wine side of Bug 32136. Why is this needed? wine.inf.in doesn't contain non ASCII strings. -- Dmitry.

2 3

Re: [PATCH] kernel32: Save and restore LastError in OutputDebugStringA
by Dmitry Timoshkov Nov. 6, 2012

Nov. 6, 2012

Andrew Eikum <aeikum(a)codeweavers.com> wrote: > +static void test_OutputDebugString(void) > +{ > + if(!pOutputDebugStringA){ > + win_skip("OutputDebugStringA missing\n"); > + return; > + } Is there a reson to load OutputDebugStringA dynamically? -- Dmitry.

1 0

Re: [PATCH 2/2] mstask/tests: Add tests for GetTargetComputer [resend]
by Marvin Nov. 5, 2012

Nov. 5, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22777 Your paranoid android. === WNT4WSSP6 (32 bit task_scheduler) === task_scheduler.c:44: Test failed: CTaskScheduler CoCreateInstance failed: 80040154 task_scheduler.c:89: Test failed: CTaskScheduler CoCreateInstance failed: 80040154 task_scheduler.c:113: Test failed: CTaskScheduler CoCreateInstance failed: 80040154

1 0

Re: [PATCH] kernel32: Save and restore LastError in OutputDebugStringA
by Marvin Nov. 5, 2012

Nov. 5, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22772 Your paranoid android. === WNT4WSSP6 (32 bit debugger) === debugger.c:679: Test failed: OutputDebugString modified LastError: 0x2 === W2KPROSP4 (32 bit debugger) === debugger.c:679: Test failed: OutputDebugString modified LastError: 0x2 === WXPPROSP3 (32 bit debugger) === debugger.c:679: Test failed: OutputDebugString modified LastError: 0x2

1 0

Netflix (was: [PATCH 1/7] advapi: Implement SetSecurityInfo on top of NtSetSecurityObject.)
by Stefan Dösinger Nov. 5, 2012

Nov. 5, 2012

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Am 2012-11-04 06:46, schrieb Erich E. Hoover: > Once this patch series has been applied then Netflix (using > Silverlight 4.x) will successfully load and play movies and TV > shows, Out of curiosity, how does the video playback part of Netflix perform? I imagine that it is using DirectDraw overlays or Direct3D9 YUV surfaces, which are somewhat supported, but have many rough edges. Is playback performant enough for full HD videos? How does the CPU usage compare to Windows? Stefan -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQIcBAEBAgAGBQJQl9YQAAoJEN0/YqbEcdMwlF4P/3s2AiUWuc9XBLKeWqEfPdwq SLt0Hmx9MVHbiWt9SojsLZDGc79OImA18Ay8k98T3igH30KHLm7lUbCcYrczrVsQ cFrJ0Lrz5clYWrJR6bw0UckQEYXYdgb+EZte4laq9Y7HoIsg+gw9Z+tF86qDarZ+ +DNAOejD5ybiUBEBZ0JvBr/pSmsj9OXFLFJ1CxxZituUMnyk/mK7Uet+1Pid/XqA lIkid9NQa7Wi/+EB3XD82mUtTopgyzWGeT36GszFnybWQCBjQ0jjAj4Qip5RQZ61 CgBREvjCs/qqPA15BinHcpCWZytC7HjROwHEpmm4I3UssSDBXwCkqQ0Q4mPIwRct rOsvWdZmoYHT/aI7JbJo4y9oWBackGeJrtiaXOigoXE1z/v+dtu/ha9yhOj4rUsd wEVyffTsqsEID4XJLkchrHB0uWe/YQrnNTLKkjVEWvaogl1lqJr79wiq7Z46iH0D U63XQQnqMgw1RXnvd8YjqWgUFvOnkveXrHxKPeYQkNxN88hvXLdPjah/tWBZpt8q 9IDURMZ/kNdJNF7E5ziwu0ulGZ9dsvQ8YtbIh6oWP+7zXax3m8N7Gl7dkKl+ltOS 1UgJgTuXkEnv25FDPFucWN2/hlrw9AT3msghl3n4ItuX5NouhlU7MvZR2P+9P/TC bTK3AwL1hmZZxLgCgWWd =QJTC -----END PGP SIGNATURE-----

2 1

Re: [PATCH 3/7] advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo (try 3).
by Charles Davis Nov. 5, 2012

Nov. 5, 2012

On Nov 4, 2012, at 1:30 AM, Erich E. Hoover wrote: > This patch implements GetNamedSecurityInfoW on top of the more > fundamental GetSecurityInfo function, permitting the return of more > accurate ownership information for files. PlayReady uses this > information to determine if its files have the appropriate > permissions, without the correct permissions it will attempt to recopy > the individualization file (and fail). Additionally, this patch adds > tests for retrieving the ACL information set on files. > > This version fixes some problems in the tests on older Windows > versions, sorry I didn't catch that earlier. It now also fixes a > mistake I made between testing try 2 and pushing it out :/ > + hfile = CreateFileW( name, access, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, > + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, 0 ); Only works on files right now, huh? You might then want to check to make sure the caller says it's a file by comparing the 'type' against SE_FILE_OBJECT, and return ERROR_CALL_NOT_IMPLEMENTED if they didn't. After all, part of the point of that parameter is to tell you which function you need to call to open the object in the first place :). (Same for patch 2.) Chip

2 3

Re: [PATCH] kernel32: Better stubs for SetVolumeMountPoint.
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Johannes Obermayr <johannesobermayr(a)gmx.de> writes: > + /* Abort if already mounted */ > + if (GetVolumeNameForVolumeMountPointW(path, (LPWSTR)volume, MAX_PATH)) > + { You can't do that. > +/************************************************************************ > + * SetVolumeMountPointA (KERNEL32.@) > + */ > +BOOL WINAPI SetVolumeMountPointA(LPCSTR path, LPCSTR volume) > +{ > + FIXME("(%s, %s), stub!\n", debugstr_a(path), debugstr_a(volume)); > + > + return FALSE; > +} Please implement this by calling the W function. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] jscript: Added more enumerable attribute tests
by Marvin Nov. 5, 2012

Nov. 5, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22760 Your paranoid android. === WNT4WSSP6 (32 bit) === No test summary line found === W2KPROSP4 (32 bit) === No test summary line found === WXPPROSP3 (32 bit) === No test summary line found === W2K3R2SESP2 (32 bit) === No test summary line found === WVISTAADM (32 bit) === No test summary line found === W2K8SE (32 bit) === No test summary line found === W7PRO (32 bit) === No test summary line found === W7PROX64 (32 bit) === No test summary line found === TEST64_W7SP1 (32 bit) === No test summary line found === W7PROX64 (64 bit) === No test summary line found === TEST64_W7SP1 (64 bit) === No test summary line found

1 0

Re: [2/2] opengl32: Implement the wglUseFontOutlines WGL_FONT_LINES format (resend)
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Sam Edwards <cfsworks(a)gmail.com> writes: > Also review carefully: I use if(format) instead of if(format == > WGL_FONT_POLYGONS) because WGL_FONT_POLYGONS isn't defined anywhere in > Wine. You should add the define in the appropriate header and make use of it. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 2/5] mstask/tests: Avoid test failures on NT4
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Detlef Riekenberg <wine.dev(a)web.de> writes: > This is not visible with winetest (mstask.dll: n/a), but > testbot results for mstask test patches would be marked as failed. That's a testbot bug. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/5] mstask: Implement ITaskScheduler_GetTargetComputer
by Alexandre Julliard Nov. 5, 2012

Nov. 5, 2012

Detlef Riekenberg <wine.dev(a)web.de> writes: > @@ -28,6 +28,22 @@ typedef struct > LONG ref; > } TaskSchedulerImpl; > > +static LPWSTR get_unc_computername(void) > +{ > + static WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 3]; /* extra space for two '\' and a zero */ > + DWORD len = MAX_COMPUTERNAME_LENGTH + 1; /* extra space for the zero */ > + > + if (*buffer) > + return buffer; > + > + if (!GetComputerNameW(buffer + 2, &len)) > + return NULL; > + > + buffer[1] = '\\'; > + buffer[0] = '\\'; > + return buffer; > +} You don't need a static buffer. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/7] server: Store and return security attributes with extended file attributes (try 2).
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22726 Your paranoid android. === W2KPROSP4 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x10000000 != 0x03) === WXPPROSP3 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W2K3R2SESP2 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === WVISTAADM (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W2K8SE (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PRO (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PROX64 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === TEST64_W7SP1 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PROX64 (64 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === TEST64_W7SP1 (64 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4428: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03)

1 0

Re: [PATCH 3/7] advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo (try 2).
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22724 Your paranoid android. === W2KPROSP4 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x10000000 != 0x03) === WXPPROSP3 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W2K3R2SESP2 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === WVISTAADM (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W2K8SE (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PRO (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PROX64 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === TEST64_W7SP1 (32 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === W7PROX64 (64 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03) === TEST64_W7SP1 (64 bit security) === security.c:4417: Test failed: Current User ACE has unexpected flags (0x1f01ff != 0x03) security.c:4429: Test failed: Administators Group ACE has unexpected flags (0x1f01ff != 0x03)

1 0

Re: [PATCH 6/7] ntdll: Inherit security attributes from parent directories.
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22708 Your paranoid android. === WNT4WSSP6 (32 bit directory) === Timeout

1 0

Re: [PATCH 5/7] server: Store and return security attributes with extended file attributes.
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22707 Your paranoid android. === WNT4WSSP6 (32 bit directory) === Timeout

1 0

Re: [PATCH 5/7] server: Store and return security attributes with extended file attributes.
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22706 Your paranoid android. === WNT4WSSP6 (32 bit security) === Timeout === W2KPROSP4 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). security.c:4429: Test failed: Administators Group ACE != Administators Group SID. security.c:4432: Test failed: Administators Group ACE has unexpected mask (0x10000000 != 0x1f01ff) === WXPPROSP3 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W2K3R2SESP2 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). === WVISTAADM (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W2K8SE (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). === W7PRO (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W7PROX64 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === TEST64_W7SP1 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W7PROX64 (64 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === TEST64_W7SP1 (64 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2).

1 0

Re: [PATCH 4/7] server: Create directories with the specified security attributes.
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22705 Your paranoid android. === WNT4WSSP6 (32 bit directory) === Timeout

1 0

Re: [PATCH 3/7] advapi: Implement GetNamedSecurityInfoW on top of GetSecurityInfo.
by Marvin Nov. 4, 2012

Nov. 4, 2012

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at http://testbot.winehq.org/JobDetails.pl?Key=22704 Your paranoid android. === WNT4WSSP6 (32 bit security) === Timeout === W2KPROSP4 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). security.c:4429: Test failed: Administators Group ACE != Administators Group SID. security.c:4432: Test failed: Administators Group ACE has unexpected mask (0x10000000 != 0x1f01ff) === WXPPROSP3 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W2K3R2SESP2 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). === WVISTAADM (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W2K8SE (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (5 != 2). === W7PRO (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W7PROX64 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === TEST64_W7SP1 (32 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === W7PROX64 (64 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2). === TEST64_W7SP1 (64 bit security) === security.c:4411: Test failed: GetAclInformation returned unexpected entry count (6 != 2).

1 0

VBSCRIPT.DLL errors with CorelDRAW 12 installer (Wine 1.5.15)
by Gerold Jens Wucherpfennig Nov. 3, 2012

Nov. 3, 2012

(I just bought Windows 8, so in return I want to spend some time and money to wine...) Hi, can someone help me with CorelDRAW 12: http://appdb.winehq.org/objectManager.php?sClass=version&iId=2390&iTestingI… Wine 1.5.15 vanilla without external DLLs Output from setup.exe in output.txt (only uniq lines saved; error code 67 on exit) vbscript errors (lines copied from output.txt): fixme:vbscript:parse_script parser failed on parsing L"1\r\nConst msiInstallStateAdvertise = 1\r\nConst msiInstallStateAbsent = 2\r\nConst msiInstallStateLocal = 3\r\nConst msiInstallStateSource = 4\r\nConst msiInstallStateDefault = 5\r\nDim nRemoveVBAEN:nRemoveVBAEN = 0\r\nDim nRemoveVBACZ:nRemoveVBACZ = 0\r\nDim nRemoveVBANL:nRemoveVBAPL = 0\r\n\r\nOn "... fixme:vbscript:parse_script parser failed on parsing L"1\r\nConst msiInstallStateAdvertise = 1\r\nConst msiInstallStateAbsent = 2\r\nConst msiInstallStateLocal = 3\r\nConst msiInstallStateSource = 4\r\nConst msiInstallStateDefault = 5\r\nDim nRemoveVBAEN:nRemoveVBAEN = 0\r\nDim nRemoveVBACZ:nRemoveVBACZ = 0\r\nDim nRemoveVBANL:nRemoveVBAPL = 0\r\n\r\nOn "... fixme:vbscript:parse_script parser failed on parsing L"1\r\nConst msiInstallStateAdvertise = 1\r\nConst msiInstallStateAbsent = 2\r\nConst msiInstallStateLocal = 3\r\nConst msiInstallStateSource = 4\r\nConst msiInstallStateDefault = 5\r\n\r\nOn Error Resume Next\r\n\r\nIf (IsFeatureSelected(\"FontNav\") = True) Then\r\n If ((Session.Property(\"PLLANG\""... fixme:vbscript:parse_script parser failed on parsing L"1\r\nConst msiInstallStateAdvertise = 1\r\nConst msiInstallStateAbsent = 2\r\nConst msiInstallStateLocal = 3\r\nConst msiInstallStateSource = 4\r\nConst msiInstallStateDefault = 5\r\n\r\nOn Error Resume Next\r\n\r\nIf (IsFeatureSelected(\"FontNav\") = True) Then\r\n If ((Session.Property(\"PLLANG\""... fixme:vbscript:parse_script parser failed on parsing L"1\r\nConst msiInstallStateAdvertise = 1\r\nConst msiInstallStateAbsent = 2\r\nConst msiInstallStateLocal = 3\r\nConst msiInstallStateSource = 4\r\nConst msiInstallStateDefault = 5\r\n\r\nOn Error Resume Next\r\n\t\r\nIf (IsFeatureExists(\"LocalInstallsOnly\")=\"1\") Then\r\n\tIf ((Session.Property(\""... Best Regards, Gerold

2 3

re: ntdll: Fixed some heap allocation stalls
by Dan Kegel Nov. 3, 2012

Nov. 3, 2012

Which game were you testing?

4 3