- wine-devel - winehq.org

Re: [PATCH 1/2] gdi32: Ignore contours containing one point in get_glyph_outline function
by Piotr Caban 09 Nov '12

09 Nov '12

Please ignore this patches for now, the tests are broken.

1 0

Re: [PATCH 1/2] user32: Add tests for MapWindowPoints, ClientToScreen and ScreenToClient.
by Alexandre Julliard 09 Nov '12

09 Nov '12

Christian Costa <titan.costa(a)gmail.com> writes: > + SetLastError(0xdeadbeef); > + n = MapWindowPoints(wnd, NULL, NULL, 0); > + err = GetLastError(); > + ok(n == ((window_rect.top << 16) | window_rect.left), "Got %x (%d, %d), expected %x (%d, %d)\n", > + n, (n << 16) >> 16, n >> 16, window_rect.left, window_rect.top, (window_rect.top << 16) | window_rect.left); > + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); > + > + SetLastError(0xdeadbeef); > + n = MapWindowPoints(NULL, wnd, NULL, 0); > + err = GetLastError(); > + ok(n == ((-window_rect.top << 16) | (-window_rect.left & 0xffff)), "Got %x (%d, %d), expected %x (%d, %d)\n", > + n, (n << 16) >> 16, n >> 16, (-window_rect.top << 16) | (-window_rect.left & 0xffff), -window_rect.left, -window_rect.top); > + ok(err == 0xdeadbeef, "Got %x, expected %x\n", err, 0xdeadbeef); Testing last error on success is not useful. Also please use MAKELONG and related macros instead of doing it by hand. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH 2/2] gdi32: Added GetGlyphOutlineW tests on glyph that contains empty contour
by Marvin 09 Nov '12

09 Nov '12

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=22852 Your paranoid android. === WVISTAADM (32 bit font) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Add data members to interface data structures?
by Max TenEyck Woodbury 09 Nov '12

09 Nov '12

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 09 Nov '12

09 Nov '12

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 09 Nov '12

09 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 08 Nov '12

08 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

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 07 Nov '12

07 Nov '12

1 0

Re: shell32: initialize fAnyOperationsAborted in SHFileOperation (try 2)
by Marvin 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

Series looks good to me, thanks.

1 0

Re: msi: Fix some leaks (coverity)
by Alexandre Julliard 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 06 Nov '12

06 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

-----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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 05 Nov '12

05 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 04 Nov '12

04 Nov '12

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 03 Nov '12

03 Nov '12

(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 03 Nov '12

03 Nov '12

Which game were you testing?

4 3

Re: [PATCH 4/4] msvcp90: Use critical sections in mutex object (try2)
by Alexandre Julliard 02 Nov '12

02 Nov '12

Piotr Caban <piotr(a)codeweavers.com> writes: > try2: > - free allocated memory in mutex_dtor > --- > dlls/msvcp100/misc.c | 18 ++++++++++++++---- > dlls/msvcp100/msvcp.h | 2 +- > dlls/msvcp60/misc.c | 16 ++++++++++++---- > dlls/msvcp71/misc.c | 18 ++++++++++++++---- > dlls/msvcp71/msvcp.h | 2 +- > dlls/msvcp90/misc.c | 18 ++++++++++++++---- > dlls/msvcp90/msvcp90.h | 2 +- > 7 files changed, 57 insertions(+), 19 deletions(-) It doesn't work here: ../../../tools/runtest -q -P wine -M msvcp90.dll -T ../../.. -p msvcp90_test.exe.so ios.c && touch ios.ok err:ntdll:RtlpWaitForCriticalSection section 0x111448 "misc.c: _Mutex critical section" wait timed out in thread 0025, blocked by 0000, retrying (60 sec) wine: Critical section 00111448 wait failed at address 0x7bc373e2 (thread 0025), starting debugger... Unhandled exception: wait failed on critical section 0x00111448 in 32-bit code (0x7bc373e2). -- Alexandre Julliard julliard(a)winehq.org

1 0

re: Call for papers - FOSDEM 2013
by Dan Kegel 02 Nov '12

02 Nov '12

Francois wrote: > (*) A particularly interesting one to me is testing untrusted code on > real hardware (with possible approaches being direct access to a > graphics card from within a VM I had some fun googling your wishlist. Presumably you've seen some of these links already: http://wiki.xen.org/wiki/Xen_VGA_Passthrough http://arstechnica.com/information-technology/2012/10/nvidias-vgx-cards-bri… > or network booting (plus remote > controlled power switch?), Grub tricks). http://www.amd64.org/support/automated-test-infrastructure.html looks like it does all of the above? http://developer.amd.com/tools/opensource/AMDTapper/Pages/default.aspx A few other possibly interesting links: http://wiki.debian.org/GrubReboot http://www.passmark.com/products/rebooter.htm http://people.redhat.com/mrodrigu/slides/linuxcon-2011-autotest-lmr There are many similar pages, all somewhat buried, stale, and possibly too specific. > Another may be testing on non-VM friendly OSes, specifically Mac OS X, > though that may just be a matter of doing a more in-depth Google search > to find a legal and libvirt-compatible solution. vmware seems to work, though I haven't tried it myself yet: http://lsimons.wordpress.com/2011/06/02/libvirt-vmware-fusion-mac-os-x/ - Dan

1 0

Re: scrrun: Implement IDictionary get_HashVal (try 2)
by Piotr Caban 02 Nov '12

02 Nov '12

On 11/02/12 10:49, Alistair Leslie-Hughes wrote: +static LONG create_hash_val(BSTR name) +{ + LONG hash = 0; + int len = SysStringLen(name); The hash should be unsigned. + if(V_VT(Key) != VT_R8) + hr = VariantChangeType(&real, Key, 0, VT_R8); I'm not sure if you want to use VariantChangeType here. I guess it's better to support few basic types and print a fixme message if type is not supported. + if(!isinf(fval)) Probably NaN is handled differently as well. port.h header is missing. + V_VT(&key) = VT_R8; + V_R8(&key) = INFINITE; You can't use INFINITE here.

1 0

Re: [PATCH 10/25] mciseq: Limit concurrency when starting to play.
by Andrew Eikum 01 Nov '12

01 Nov '12

That's a lot of patches! In the future, please try to send no more than about 5 at a time, until each batch is committed. That's much easier to review. I reviewed the first 12, and will do the rest after those are committed. Just reading the patches, I didn't notice any show-stoppers. Overall looks good to me. A couple of thoughts below. On Thu, Oct 04, 2012 at 01:49:13PM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: >+ switch (wmm->dwStatus) { >+ case MCI_MODE_PLAY: >+ case MCI_MODE_PAUSE: >+ wmm->dwStatus = MCI_MODE_STOP; >+ } This is weird. You're "missing" a break, and it seems like an if statement would be more appropriate here, anyway. Aside from that, you introduce a scary magic number, 0x78B0. I guess that's the MIDI sound off + control message. It would be nice if it was a proper symbol, but native's headers don't give us MIDI symbols, and there are a lot to define. So maybe it's not worth it. Anyway, something to think about cleaning up in the future. Thanks for improving this code! Andrew

5 16

Re: [PATCH 1/3] advapi: Return the current user as the owner of files (resend 4).
by Alexandre Julliard 01 Nov '12

01 Nov '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This particular patch changes the ACL-reported owner of files from the > "world" (S-1-1-0) to the current user (usually S-1-5-21-0-0-0-1000). I'm not sure that's much better. We should try to determine the actual ownership. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: winhttp: Fix the error returned from WinHttpGetProxyForUrl when autodetection fails.
by Marvin 01 Nov '12

01 Nov '12

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=22654 Your paranoid android. === WXPPROSP3 (32 bit winhttp) === winhttp.c:2405: Test failed: got 80072ee2 winhttp.c:2411: Test failed: got 8000000a

2 1

Re: gdiplus: Add support for extra transformation in GdipMeasureDriverString and GdipDrawDriverString.
by Vincent Povirk 31 Oct '12

31 Oct '12

> @@ -6337,6 +6345,11 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT > pt[2].X = 0.0; > pt[2].Y = 1.0; > GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); > + if (matrix) > + { > + GpMatrix xform = *matrix; > + GdipTransformMatrixPoints(&xform, pt, 3); > + } > rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ > (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); > rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ Without tests, I can only guess, but I think it's more likely that this matrix transform should be applied before the world->device transform. Apart from questions of whether this is correct behavior, the patch looks good to me.

2 4

Re: vbscript/tests: Skip some of the weekday tests if the first day of the week is not Sunday.
by Jacek Caban 31 Oct '12

31 Oct '12

Hi Huw, On 10/31/12 12:04, Huw Davies wrote: > --- > dlls/vbscript/tests/api.vbs | 17 +++++++++-------- > 1 files changed, 9 insertions(+), 8 deletions(-) Did you see those failures on Windows? test.winehq.org shows only some Linux failures, which suggests that the problem is in implementation, not tests. Jacek

2 1

Re: vbscript/tests: Skip some of the weekday tests if the first day of the week is not Sunday.
by Marvin 31 Oct '12

31 Oct '12

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=22625 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: [PATCH] services: Fix non common sizeof usages. (resend)
by Alexandre Julliard 31 Oct '12

31 Oct '12

Christian Costa <titan.costa(a)gmail.com> writes: > Use parentesis is more common in Wine code and this makes all sizeof conform to file style anyway. You can clean this up if you are changing the code for other reasons, but otherwise there's no reason to do this. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: hh: Avoid handle leak (coverity)
by Alexandre Julliard 31 Oct '12

31 Oct '12

Frédéric Delanoy <frederic.delanoy(a)gmail.com> writes: > @@ -27,9 +27,13 @@ int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR cmdline, int cmds > > HMODULE hModule; > DOWINMAIN *doWinMain; > + int res; > > hModule = LoadLibraryA("hhctrl.ocx"); > doWinMain = (DOWINMAIN*) GetProcAddress(hModule, "doWinMain"); > > - return doWinMain(hInst, cmdline); > + res = doWinMain(hInst, cmdline); > + FreeLibrary(hModule); > + > + return res; Freeing things on process exit is not useful. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 6) (resend)
by Dmitry Timoshkov 31 Oct '12

31 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > Based ont a patch of Rico Schuller. I'd suggest to make sure that the test with appropriate todo_wine statements is accepted first, and only then start thinking about a proper fix, or even leave creating the fix to someone else. -- Dmitry.

2 1

What parts of gettext does Wine need at runtime?
by Scott Ritchie 31 Oct '12

31 Oct '12

Is libgettextpo0 (in 32 and 64 bit) sufficient? Or do we need the sort of utilities in the gettext-base package? I'm trying to fix https://bugs.launchpad.net/ubuntu/precise/+source/gettext/+bug/954029 which was largely caused by my overcautiousness here.

2 1

Re: [PATCH 3/4] msvcp90: in istream<>::tellg don't use sentry
by Piotr Caban 30 Oct '12

30 Oct '12

On 10/30/12 10:16 PM, Daniel Lehman wrote: + tpos.pos = 0xdeadbeefdeadbeef; Long long constants are not supported in C89. You can use 0xdeadbeef here.

1 0

xapofx1_3.dll?
by Joerg-Cyril.Hoehle＠t-systems.com 30 Oct '12

30 Oct '12

Hi, why does Wine include a stub xapofx1_1.dll but no xapofx1_3.dll? Installing Wallace & Gromit 102 "The Last Resort" / "Urlaub unter Tage" adds xapofx1_3.dll XAudio2_4.dll and X3DAudio1_6.dll to system32 (though IIRC I asked the installer not to care about DirectX). This app loads none of these libraries (well, I solely tested winecfg's default xp mode, not w7. Presumably those dlls are only relevant since Vista with mmdevapi and the app uses DSound on older systems). http://bugs.winehq.org/show_bug.cgi?id=27279 is about apps linked against this dll such that they won't even start. Regards, Jörg Höhle

2 1

Re: scrrun: Add basic IDictionary getHasVal support
by Piotr Caban 30 Oct '12

30 Oct '12

Hi, On 10/30/12 09:51, Alistair Leslie-Hughes wrote: +static LONG create_hash_val(BSTR name) +{ + LONG hash = 0; + int len = SysStringLen(name); + int i; + + for(i =0; i < len; i++) + { + hash += name[i]; + } + + return hash; +} This hashing function will have lots of conflicts when used in hash-table. It's quite easy to guess how it's done in native dll: for(i=0; i<len; i++) hash = (hash<<4) + hash + name[i]; hash %= 1201; It would be nice to add some tests for strings containing '\0' characters and for other VARIANT types. I don't know how scrrun stores data internally, if it's using a hash-table, the function may change after adding some elements.

1 0

Re: ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE)
by Alexandre Julliard 30 Oct '12

30 Oct '12

<Joerg-Cyril.Hoehle(a)t-systems.com> writes: > You know this patch from March this year. Initially, this patch was > the first of 2-3. I decided to release it on its own after finding > out yesterday that in July, Fran,cois Gouget added a todo_wine for a > bug that I fixed monthes earlier! Now I had to augment my patch > with a one-liner removing that todo_wine from kernel32/tests. > > Let me thank him for writing a test case that demonstrates the > effectiveness of my patch. Or lack thereof ;-) ../../../tools/runtest -q -P wine -M kernel32.dll -T ../../.. -p kernel32_test.exe.so sync.c && touch sync.ok sync.c:808: Test failed: Timer callback 0 expected 1 got 0 sync.c:1166: Tests skipped: one-time initialization API not supported make[1]: *** [sync.ok] Error 1 -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 4/5] include: Don't add d3d8 LP* interface typedefs for __WINESRC__.
by Alexandre Julliard 30 Oct '12

30 Oct '12

Henri Verbeet <hverbeet(a)codeweavers.com> writes: > @@ -1128,6 +1105,21 @@ DECLARE_INTERFACE_(IDirect3DDevice8,IUnknown) > #define IDirect3DDevice8_DeletePatch(p,a) (p)->DeletePatch(a) > #endif > > +#ifndef __WINESRC__ > +typedef struct IDirect3D8 *LPDIRECT3D8; > +typedef struct IDirect3DDevice8 *LPDIRECT3DDEVICE8; > +typedef struct IDirect3DResource8 *LPDIRECT3DRESOURCE8, *PDIRECT3DRESOURCE8; > +typedef struct IDirect3DVertexBuffer8 *LPDIRECT3DVERTEXBUFFER8, *PDIRECT3DVERTEXBUFFER8; > +typedef struct IDirect3DVolume8 *LPDIRECT3DVOLUME8, *PDIRECT3DVOLUME8; > +typedef struct IDirect3DSwapChain8 *LPDIRECT3DSWAPCHAIN8, *PDIRECT3DSWAPCHAIN8; > +typedef struct IDirect3DSurface8 *LPDIRECT3DSURFACE8, *PDIRECT3DSURFACE8; > +typedef struct IDirect3DIndexBuffer8 *LPDIRECT3DINDEXBUFFER8, *PDIRECT3DINDEXBUFFER8; > +typedef struct IDirect3DBaseTexture8 *LPDIRECT3DBASETEXTURE8, *PDIRECT3DBASETEXTURE8; > +typedef struct IDirect3DTexture8 *LPDIRECT3DTEXTURE8, *PDIRECT3DTEXTURE8; > +typedef struct IDirect3DCubeTexture8 *LPDIRECT3DCUBETEXTURE8, *PDIRECT3DCUBETEXTURE8; > +typedef struct IDirect3DVolumeTexture8 *LPDIRECT3DVOLUMETEXTURE8, *PDIRECT3DVOLUMETEXTURE8; > +#endif I don't think we want to do that sort of thing, otherwise we'll end up with ifdef __WINESRC__ all over the standard headers. If we really want to disable interface typedefs this should be done in a generic way, preferably when generating headers from idl. -- Alexandre Julliard julliard(a)winehq.org

3 3

Re: [PATCH] kernel32: Implement CompareStringOrdinal. (try 2)
by Nikolay Sivov 30 Oct '12

30 Oct '12

On 10/30/2012 01:43, Christian Costa wrote: > Try 2: > - Don't use CompareStringEx. > - Add tests > --- > dlls/kernel32/kernel32.spec | 1 + > dlls/kernel32/locale.c | 28 ++++++++++++++++++++ > dlls/kernel32/tests/locale.c | 60 +++++++++++++++++++++++++++++++++++++++++- > 3 files changed, 88 insertions(+), 1 deletion(-) > > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index b7efa0f..0bd1adc 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -201,6 +201,7 @@ > @ stdcall CompareStringA(long long str long str long) > @ stdcall CompareStringW(long long wstr long wstr long) > @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) > +@ stdcall CompareStringOrdinal(wstr long wstr long long) > @ stdcall ConnectNamedPipe(long ptr) > @ stub ConsoleMenuControl > @ stub ConsoleSubst > diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c > index c41442c..07eb688 100644 > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c > @@ -3047,6 +3047,34 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, > return ret; > } > > +/****************************************************************************** > + * CompareStringOrdinal (KERNEL32.@) > + */ > +INT WINAPI CompareStringOrdinal(const WCHAR *str1, INT len1, const WCHAR *str2, INT len2, BOOL ignore_case) > +{ > + int ret, len; > + > + if (!str1 || !str2) > + { > + SetLastError(ERROR_INVALID_PARAMETER); > + return 0; > + } > + if (len1 < 0) len1 = strlenW(str1); > + if (len2 < 0) len2 = strlenW(str2); > + > + len = min(len1, len2); > + if (ignore_case) > + ret = strncmpiW(str1, str2, len); > + else > + ret = strncmpW(str1, str2, len); > + > + if ((ret < 0) || (!ret && (len1 < len2))) > + return CSTR_LESS_THAN; > + else if ((ret > 0) || (!ret && (len1 > len2))) > + return CSTR_GREATER_THAN; > + return CSTR_EQUAL; > +} > + This is almost the same as your first try. You're testing a trivial case only - ASCII range. I feel like it should behave more like memcmp for case insensitive comparison, that's what documentation mildly suggests.

3 6

Re: vbscript: Added support for more builtin constants
by Marvin 30 Oct '12

30 Oct '12

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=22595 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: [PATCH] wininet: TLS fallback mechanism (take2)
by Alexandre Julliard 29 Oct '12

29 Oct '12

Hiroshi Miura <miurahr(a)linux.com> writes: > +#ifdef SONAME_LIBSSL > + /* can't connect if we are already connected */ > + if (connection->ssl_s) > + { > + ERR("already connected\n"); > + return ERROR_INTERNET_CANNOT_CONNECT; > + } > + > + /* connect with given TLS options */ > + res = netcon_secure_connect_setup(connection, get_tls_option()); > + if (res == ERROR_SUCCESS) > + return res; You missed some #ifdefs, this won't compile. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: crypt32: Avoid double free in CRYPT_LoadSIP on error path (coverity))
by Nikolay Sivov 29 Oct '12

29 Oct '12

On 10/29/2012 11:33, Frédéric Delanoy wrote: > FreeLibrary(temp) can be called twice on error. > > CID 714004 > --- > > error: > FreeLibrary(lib); > - FreeLibrary(temp); > + if (temp != NULL) FreeLibrary(temp); > SetLastError(TRUST_E_SUBJECT_FORM_UNKNOWN); > return FALSE; > } This is useless, FreeLibrary() checks for NULL.

2 1

Re: [PATCH] kernel32: Implement CompareStringOrdinal.
by Nikolay Sivov 29 Oct '12

29 Oct '12

On 10/29/2012 00:53, Christian Costa wrote: > --- > dlls/kernel32/kernel32.spec | 1 + > dlls/kernel32/locale.c | 8 ++++++++ > 2 files changed, 9 insertions(+) > > diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec > index b7efa0f..0bd1adc 100644 > --- a/dlls/kernel32/kernel32.spec > +++ b/dlls/kernel32/kernel32.spec > @@ -201,6 +201,7 @@ > @ stdcall CompareStringA(long long str long str long) > @ stdcall CompareStringW(long long wstr long wstr long) > @ stdcall CompareStringEx(wstr long wstr long wstr long ptr ptr long) > +@ stdcall CompareStringOrdinal(wstr long wstr long long) > @ stdcall ConnectNamedPipe(long ptr) > @ stub ConsoleMenuControl > @ stub ConsoleSubst > diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c > index c41442c..83de815 100644 > --- a/dlls/kernel32/locale.c > +++ b/dlls/kernel32/locale.c > @@ -3047,6 +3047,14 @@ INT WINAPI CompareStringA(LCID lcid, DWORD flags, > return ret; > } > > +/****************************************************************************** > + * CompareStringOrdinal (KERNEL32.@) > + */ > +INT WINAPI CompareStringOrdinal(LPCWSTR str1, INT len1, LPCWSTR str2, INT len2, BOOL ignore_case) > +{ > + return CompareStringEx(NULL, ignore_case ? NORM_IGNORECASE : 0, str1, len1, str2, len2, NULL, NULL, 0); > +} > + > /************************************************************************* > * lstrcmp (KERNEL32.@) > * lstrcmpA (KERNEL32.@) This is not a way to do it, it doesn't simply work as that. See http://msdn.microsoft.com/en-us/library/windows/desktop/dd318144%28v=vs.85%… And it need tests of course.

2 1

Re: [PATCH 1/2] msvcp90: set eof state in istream<>::peek if got eof
by Alexandre Julliard 29 Oct '12

29 Oct '12

Daniel Lehman <dlehman(a)esri.com> writes: > +static void test_istream_peek(void) > +{ > + unsigned short testus, nextus; > + basic_stringstream_wchar wss; > + basic_stringstream_char ss; > + basic_string_wchar wstr; > + basic_string_char str; > + IOSB_iostate state; > + int i, next, peek; > + wchar_t wide[64]; > + > + struct _test_istream_peek { > + const char *str; > + int peek; > + int next; > + IOSB_iostate state; > + } tests[] = { > + { "", EOF, EOF, IOSTATE_eofbit }, > + { "ABCDEF", 'A', 'A', IOSTATE_goodbit }, > + }; > + > + for(i=0; i<sizeof(tests)/sizeof(tests[0]); i++) { > + /* char version */ > + call_func2(p_basic_string_char_ctor_cstr, &str, tests[i].str); > + call_func4(p_basic_stringstream_char_ctor_str, &ss, &str, OPENMODE_out|OPENMODE_in, TRUE); > + > + peek = (int)call_func1(p_basic_istream_char_peek, &ss.base.base1); > + state = (IOSB_iostate)call_func1(p_ios_base_rdstate, &ss.basic_ios.base); > + next = (int)call_func1(p_basic_istream_char_get, &ss.base.base1); 'peek' is not tested anywhere. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdiplus: fix rounding error (?)
by Vincent Povirk 29 Oct '12

29 Oct '12

That was the worst possible defence of this patch, but I think it should be included. What it's actually doing is removing the duplicated logic between the earlier bit of GdipDrawString, where out-of-range sizes are set to 1 << 23, and this if statement where we only apply a clipping rectangle if the sizes are out of range. We could also have added a check for e.g. scaled_rect.Width >= INT_MAX here, but I think it's better that we don't duplicate the logic.

1 0

Re: dplayx: Reorder some code to avoid memory leaks (coverity)
by Rico Schüller 29 Oct '12

29 Oct '12

On 28.10.2012 16:13, André Hentschel wrote: > - lpGData->lpRemoteData = lpNewData; > + lpGData->lpRemoteData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( dwDataSize ) ); > + CopyMemory( lpGData->lpRemoteData, lpData, dwDataSize ); > lpGData->dwRemoteDataSize = dwDataSize; > - lpPData->lpRemoteData = lpNewData; > + lpPData->lpRemoteData = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof( dwDataSize ) ); > + CopyMemory( lpPData->lpRemoteData, lpData, dwDataSize ); > lpPData->dwRemoteDataSize = dwDataSize; Is the HEAP_ZERO_MEMORY really needed? You may kill that too while you change those lines. Cheers Rico

2 1

Re: [3/5] d3dx9: Introduce a function for copying pixels.
by Christian Costa 29 Oct '12

29 Oct '12

> > pixel_format = get_format_info(src_desc.Format); > - if (pixel_format->type != FORMAT_ARGB) > - { > - FIXME("Unsupported pixel format %#x\n", src_desc.Format); > - return E_NOTIMPL; > - } > + if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; > > Doesn't this still require a FIXME or at least a WARN?

2 1

Re: vbscript: Added support for negative constants
by Marvin 29 Oct '12

29 Oct '12

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=22550 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: [PATCH] Potential reference count races
by Nikolay Sivov 29 Oct '12

29 Oct '12

On 10/28/2012 17:44, Max TenEyck Woodbury wrote: > On 10/28/2012 02:40 AM, Nikolay Sivov wrote: >> On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: >>> From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> >>> >>> I have been looking at the Microsoft COM and related documentations >>> and noticed that they emphatically recommend using the Interlocked... >>> functions when manipulating reference counts. I managed to set up a >>> search that showed where many of the reference count updates occur and >>> was somewhat surprised at how often this advice was not followed. >> It doesn't mean it always has to be followed. > True in a limited sense, but there is a good reason behind their > recommendation. Unless there is a good reason not to do so, this > particular piece of advice should be followed. COM objects in wine follow this recommendation in general, even object itself is not thread safe. This doesn't mean however that you need this every time you have some kind of refcount of any sort. > >>> While I have not converted every reference count update to use the >>> Interlocked... functions, this set of patches fixes a fair number of >>> them. >>> >>> These are not associated with any particular bug report; they are simply >>> a general precaution against operations that are known to be associated >>> with race conditions. >> This precaution doesn't work in general. It's not enough to atomically >> update refcount to make an implementation thread safe. Also not everything >> is supposed to be thread safe in a first place. >> > First, explain what does not have to be thread safe. Anything really, COM objects in particular if you were talking about them. > I believe that > application may try to use multiple threads anywhere, so everything > that can be made thread safe, should be. No. > Using interlocks on the > reference count updates is a necessary step for thread safety. You > are correct that it is not sufficient, but it is necessary. Again, it depends. > >> Changes like this: >> >>> - for (i=0;i<howmuch;i++) >>> + for (i=0;i<howmuch;++i) >>> TRACE("notify at %d to %p\n", >>> notify[i].dwOffset,notify[i].hEventNotify); >> are not helpful at all. > The post increment and decrement operation are specified as saving > the original value for use in the evaluation of the expression they > are part of and modifying the underlying stored value. In expressions > like this, that saved value is then discarded. The optimization phase > of the compilation usually removes both the save and discard operations. Sure, but I don't think it's enough to justify such changes all over the place, in existing code. > > Murphy's law suggests that this might cause problems at some point when > least desired. Please don't do this. > > Specifying the unnecessary use of a temporary store is a bad habit to > have. You should tell the compiler exactly what needs to be done, not > throw in extraneous operations. > > So, the use of a post operator where a prefix operator is sufficient, > while almost certainly harmless, is still technically a mistake. > > At the minimum, these changes provide examples of the correct way these > statements should be coded. So, I have to disagree, although very > mildly, that changes like that are not helpful. This kind of change > does not deserve a separate patch, but should be perfectly acceptable as > an adjunct to other patches.

4 4

Re: [PATCH] Remove potential reference count races
by Nikolay Sivov 29 Oct '12

29 Oct '12

On 10/28/2012 18:00, Max TenEyck Woodbury wrote: > On 10/28/2012 03:13 AM, Nikolay Sivov wrote: >> On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: >>> From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> >>> >>> --- >>> dlls/shlwapi/thread.c | 4 ++-- >>> 1 files changed, 2 insertions(+), 2 deletions(-) >>> >>> diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c >>> index eb2c35d..43e0433 100644 >>> --- a/dlls/shlwapi/thread.c >>> +++ b/dlls/shlwapi/thread.c >>> @@ -157,7 +157,7 @@ static ULONG WINAPI threadref_AddRef(IUnknown *iface) >>> threadref * This = impl_from_IUnknown(iface); >>> TRACE("(%p)\n", This); >>> - return InterlockedIncrement(This->ref); >>> + return InterlockedIncrement(&This->ref); >>> } >>> static ULONG WINAPI threadref_Release(IUnknown *iface) >>> @@ -167,7 +167,7 @@ static ULONG WINAPI threadref_Release(IUnknown >>> *iface) >>> TRACE("(%p)\n", This); >>> - refcount = InterlockedDecrement(This->ref); >>> + refcount = InterlockedDecrement(&This->ref); >>> if (!refcount) >>> HeapFree(GetProcessHeap(), 0, This); >>> >> Did you try to build this? >> >> > Yes, it built. I don't submit stuff that causes the compiler to barf > unless I am completely totally zonked from lack of sleep and this was > not what happened here. I will admit that I have not looked at the > build and test logs closely, so there may be problems I missed. > These changes I wrong that's what I'm saying. P.S. please CC wine-devel list in your replies.

2 1

on UTF-8, other Unicode encodings and WinAPI
by Saulius Krasuckas 28 Oct '12

28 Oct '12

Proposal with probably several insights: http://www.utf8everywhere.org/ Lyrical, older version: http://www.joelonsoftware.com/articles/Unicode.html S.

1 0

VBSCRIPT.DLL errors with CorelDRAW 12 installer (Wine 1.1.15)
by Gerold Jens Wucherpfennig 28 Oct '12

28 Oct '12

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 1

Re: [PATCH] Remove potential reference count races
by Nikolay Sivov 28 Oct '12

28 Oct '12

On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> > > --- > dlls/shlwapi/thread.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/shlwapi/thread.c b/dlls/shlwapi/thread.c > index eb2c35d..43e0433 100644 > --- a/dlls/shlwapi/thread.c > +++ b/dlls/shlwapi/thread.c > @@ -157,7 +157,7 @@ static ULONG WINAPI threadref_AddRef(IUnknown *iface) > threadref * This = impl_from_IUnknown(iface); > > TRACE("(%p)\n", This); > - return InterlockedIncrement(This->ref); > + return InterlockedIncrement(&This->ref); > } > > static ULONG WINAPI threadref_Release(IUnknown *iface) > @@ -167,7 +167,7 @@ static ULONG WINAPI threadref_Release(IUnknown *iface) > > TRACE("(%p)\n", This); > > - refcount = InterlockedDecrement(This->ref); > + refcount = InterlockedDecrement(&This->ref); > if (!refcount) > HeapFree(GetProcessHeap(), 0, This); > Did you try to build this?

1 0

Re: [PATCH] Remove potential reference count races
by Nikolay Sivov 28 Oct '12

28 Oct '12

On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> > > --- > dlls/jscript/engine.h | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > Take a look at http://source.winehq.org/git/wine.git/commit/79a30a4e0ae3a7ef640fa38e3a9f77…

1 0

Re: [PATCH] Potential reference count races
by Nikolay Sivov 28 Oct '12

28 Oct '12

On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> > > I have been looking at the Microsoft COM and related documentations > and noticed that they emphatically recomend using the Interlocked... > functions when manipulating reference counts. I managed to set up a > search that showed where many of the reference count updates occur and > was somewhat surprised at how often this advice was not followed. It doesn't mean it always has to be followed. > > While I have not converted every reference count update to use the > Interlocked... functions, this set of patches fixes a fair number of > them. > > These are not associated with any particular bug report; they are simply > a general precausion against operations that are known to be associated > with race conditions. This precaution doesn't work in general. It's not enough to atomically update refcount to make an implementation thread safe. Also not everything is supposed to be thread safe in a first place. Changes like this: > - for (i=0;i<howmuch;i++) > + for (i=0;i<howmuch;++i) > TRACE("notify at %d to %p\n", > notify[i].dwOffset,notify[i].hEventNotify); are not helpful at all. > > The patches are independent of each other. They are NOT a series. >

1 0

Re: [PATCH] Remove potential reference count races.
by Nikolay Sivov 28 Oct '12

28 Oct '12

On 10/28/2012 04:59, max(a)mtew.isa-geek.net wrote: > From: Max TenEyck Woodbury <max(a)mtew.isa-geek.net> > > --- > dlls/gdi32/freetype.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c > index 6af977c..3379c6e 100644 > --- a/dlls/gdi32/freetype.c > +++ b/dlls/gdi32/freetype.c > @@ -3820,7 +3820,7 @@ static struct font_mapping *map_font_file( const char *name ) > { > if (mapping->dev == st.st_dev && mapping->ino == st.st_ino) > { > - mapping->refcount++; > + InterlockedIncrement(&mapping->refcount); > close( fd ); > return mapping; > } > @@ -3850,7 +3850,7 @@ error: > > static void unmap_font_file( struct font_mapping *mapping ) > { > - if (!--mapping->refcount) > + if (!InterlockedDecrement(&mapping->refcount)) > { > list_remove( &mapping->entry ); > munmap( mapping->data, mapping->size ); How does it help exactly and what is the problem with this code?

1 0

Re: [PATCH] wininet: TLS fallback mechanism (take2)
by Hiroshi Miura 27 Oct '12

27 Oct '12

Hi, My updated patch which is Message-ID: <5089BDA7.3040806(a)linux.com> is not properly treated in http://source.winehq.org/patches http://source.winehq.org/patches/data/91337 New one is removed, and the one that make compile error in older openssl is tagged as new. Hiroshi Miura wrote: > OpenSSL 1.0.x now support TLSv1.1 and TLSv1.2. > Sometimes TLSv1.1/1.2 negotiation fails bacause of combination > of server/client ssl library versions. > It fixes the error connecting Evernote server with evernote client. > http://bugs.winehq.org/show_bug.cgi?id=30598 > > It has also mechanism enable/disable TLSv1.1/1.2 by registry entry under > SYSTEM/CurrentControlSet/Control/SecurityProvider/SCHANNEL/Protocols/ > where is as same place as Windows7. > TLSv1.1/1.2 is enabled when the registry entry does not exist. > > Signed-off-by: Hiroshi Miura <miurahr(a)linux.com> > --- > dlls/wininet/netconnection.c | 169 ++++++++++++++++++++++++++++++++---------- > 1 file changed, 130 insertions(+), 39 deletions(-) > > diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c > index c944ff3..9b5f7e7 100644 > --- a/dlls/wininet/netconnection.c > +++ b/dlls/wininet/netconnection.c <snip> > +#ifdef SSL_OP_NO_TLSv1_2 > +static long get_tls_option(void) { > + long tls_option; <snip> Hiroshi

1 0

Re: [PATCH 3/3] winmm: Call IsFormatSupported for WAVE_FORMAT_QUERY only.
by Andrew Eikum 26 Oct '12

26 Oct '12

Ran tests on all four backends and everything seems okay. On Fri, Oct 26, 2012 at 10:31:33AM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Hi, > > With the previous code in place, we can derive sane values for WAVE_FORMAT_QUERY. > > Given the amount of work and side-effects that the audio backends perform, better not > open them twice with IsFormatSupported then Initialize. Just use one or the other. > > Regards, > Jörg Höhle >

1 0

Re: ntdll: Do not execute callbacks past DeleteTimer(INVALID_HANDLE_VALUE)
by Marvin 26 Oct '12

26 Oct '12

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=22495 Your paranoid android. === WVISTAADM (32 bit sync) === sync.c:946: Test failed: DeleteTimerQueueTimer

2 1

Re: [PATCH(1/1)] wininet: TLS fallback mechanism
by Alexandre Julliard 25 Oct '12

25 Oct '12

"Hiroshi Miura(@osmf)" <miurahr(a)osmf.jp> writes: > OpenSSL 1.0.x now support TLSv1.1 and TLSv1.2. > Sometimes TLSv1.1/1.2 negotiation fails because of combination > of server/client ssl library versions. > It fixes the error connecting Evernote server with evernote client. > http://bugs.winehq.org/show_bug.cgi?id=30598 > > It has a mechanism to fallback to SSLv3/TLSv1 when fails with TLSv1.1/1.2. > > It has also mechanism enable/disable TLSv1.1/1.2 by registry entry under > SYSTEM/CurrentControlSet/Control/SecurityProvider/SCHANNEL/Protocols/ > where is as same place as Windows7. > TLSv1.1/1.2 is enabled when the registry entry does not exist. It doesn't build on older openssl: gcc -m32 -c -I. -I. -I../../include -I../../include -D__WINESRC__ -D_WINX32_ -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing -Wdeclaration-after-statement -Wstrict-prototypes -Wwrite-strings -gstabs+ -fno-omit-frame-pointer -Wpointer-arith -I/usr/local/include/freetype2 -I/usr/local/include -g -O2 -o netconnection.o netconnection.c netconnection.c: In function 'get_tls_option': netconnection.c:478: error: 'SSL_OP_NO_TLSv1_2' undeclared (first use in this function) netconnection.c:478: error: (Each undeclared identifier is reported only once netconnection.c:478: error: for each function it appears in.) netconnection.c:486: error: 'SSL_OP_NO_TLSv1_1' undeclared (first use in this function) netconnection.c: In function 'NETCON_secure_connect': netconnection.c:925: error: 'SSL_OP_NO_TLSv1_1' undeclared (first use in this function) netconnection.c:925: error: 'SSL_OP_NO_TLSv1_2' undeclared (first use in this function) make[1]: *** [netconnection.o] Error 1 -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH 3/5] d3dx9_36: Implement ID3DXFileImpl_CreateEnumObject with stubbed ID3DXFileEnumObject interface. (try 5)
by Nikolay Sivov 25 Oct '12

25 Oct '12

On 10/25/2012 10:34, Christian Costa wrote: > --- > dlls/d3dx9_36/xfile.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++- > 1 file changed, 170 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c > index ebaefaf..32c3edd 100644 > --- a/dlls/d3dx9_36/xfile.c > +++ b/dlls/d3dx9_36/xfile.c > @@ -32,12 +32,123 @@ typedef struct { > IDirectXFile *dxfile; > } ID3DXFileImpl; > > +typedef struct { > + ID3DXFileEnumObject ID3DXFileEnumObject_iface; > + LONG ref; > + IDirectXFileEnumObject *dxfile_enum_object; > +} ID3DXFileEnumObjectImpl; You remove that field in next patch anyway.

2 1

Re: [PATCH 4/5] d3dx9_36: Implement ID3DXFileEnumObjectImpl_GetChildren & ID3DXFileEnumObjectImpl_GetChild and add stubbed interface for ID3DXFileData. (try 4)
by Nikolay Sivov 25 Oct '12

25 Oct '12

On 10/25/2012 10:34, Christian Costa wrote: > > + > +static HRESULT WINAPI ID3DXFileDataImpl_Create(IDirectXFileObject *dxfile_object, ID3DXFileData **ret_iface) > +{ > + ID3DXFileDataImpl *object; > + > + TRACE("(%p, %p)\n", dxfile_object, ret_iface); > + > + *ret_iface = NULL; > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); > + if (!object) > + { > + ERR("Out of memory\n"); > + return E_OUTOFMEMORY; > + } > + > + object->ID3DXFileData_iface.lpVtbl = &ID3DXFileData_Vtbl; > + object->ref = 1; > + object->dxfile_object = (IDirectXFileData*)dxfile_object; > + > + *ret_iface = &object->ID3DXFileData_iface; > + > + return S_OK; > +} > + You don't need WINAPI for it. > > + ret = ID3DXFileDataImpl_Create((IDirectXFileObject*)data_object, &object->children[object->nb_children]); It seems you're casting it back and forth, is it possible to use proper type for data_object? > + { > + (&object->ID3DXFileEnumObject_iface)->lpVtbl->Release(&object->ID3DXFileEnumObject_iface); Hmm, what's wrong with object->ID3DXFileEnumObject_iface.lpVtbl->Release ?

2 1

Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType. (try 5)
by Nikolay Sivov 25 Oct '12

25 Oct '12

On 10/25/2012 10:34, Christian Costa wrote: > --- > dlls/d3dx9_36/xfile.c | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/dlls/d3dx9_36/xfile.c b/dlls/d3dx9_36/xfile.c > index a1e0596..4c216da 100644 > --- a/dlls/d3dx9_36/xfile.c > +++ b/dlls/d3dx9_36/xfile.c > @@ -154,9 +154,19 @@ static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) > > static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) > { > - FIXME("(%p)->(%p): stub\n", iface, guid); > + ID3DXFileDataImpl *This = impl_from_ID3DXFileData(iface); > + const GUID *dxfile_guid; > + HRESULT ret; > > - return E_NOTIMPL; > + TRACE("(%p)->(%p)\n", iface, guid); > + > + ret = IDirectXFileData_GetType(This->dxfile_object, &dxfile_guid); > + if (ret != S_OK) > + return ret; > + > + *guid = *dxfile_guid; > + > + return S_OK; > } > Why not simply forward to IDirectXFileData here? What is all the surrounding code for?

2 1

Add tests fo D3DXSHRotateZ
by Nozomi Kodama 25 Oct '12

25 Oct '12

Hello, Is this patch not good enough to be commited? Nozomi

1 0

Re: [PATCH 1/5] d3dx9_36: Implement D3DXFileCreate. (try 3)
by Dmitry Timoshkov 25 Oct '12

25 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, void **ret_iface) > +{ > + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface); > + > + if (IsEqualGUID(riid, &IID_IUnknown) || > + IsEqualGUID(riid, &IID_ID3DXFile)) > + { > + iface->lpVtbl->AddRef(iface); Isn't there an appropriate xxx_AddRef() macro? > + *ret_iface = iface; > + return S_OK; > + } > + > + ERR("(%p)->(%s, %p), not found\n", iface, debugstr_guid(riid), ret_iface); FIXME seems more appropriate here. > + *ret_iface = NULL; > + return E_NOINTERFACE; > +} ... > +HRESULT WINAPI D3DXFileCreate(ID3DXFile **dxfile) > +{ > + ID3DXFileImpl *object; > + > + TRACE("(%p)\n", dxfile); > + > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); What's the reason for HEAP_ZERO_MEMORY here? > + if (!object) > + { > + ERR("Out of memory\n"); > + return E_OUTOFMEMORY; > + } The ERR() is useless here, just return E_OUTOFMEMORY in such situations. -- Dmitry.

5 13

[PATCH(0/1)] wininet: TLS fallback mechanism
by Hiroshi Miura(＠osmf) 24 Oct '12

24 Oct '12

Hi, Evernote windows client on Wine/OpenSSL 1.0.1/Ubuntu12.04/12.10 cannot connect its server. It is caused by server is only support TLS1.0/SSL3.0, but client ask TLS1.1/1.2 and then server returns that session is fails. A wininet in Microsoft Windows7 implementation has a behavior to re-try by TLS1.0 after TLS1.2 fails and got FIN from server. This patch enabled fall back mechanism to SSLv3/TLSv1. It is also a response for Alexandre's suggestion. >> How do you think whether we should implement similar way or not? >> If we adopt similar fall back mechanism, compatibility may become well, >> but is it good behavior? > > If it's possible to implement some sort of automatic fall back, that > would certainly be preferable. > > -- > Alexandre Julliard Hiroshi Hiroshi Miura (1): wininet: TLS fallback mechanism dlls/wininet/netconnection.c | 163 ++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 39 deletions(-) -- 1.7.9.5

2 1

windowscodecs questions.
by Max TenEyck Woodbury 24 Oct '12

24 Oct '12

Background: I am trying to improve the performance/reliability of GuildWars2 under wine. In particular, PNG handling seems very slow, so I am looking at windowscodecs and I seem to be misunderstanding some things. I have read the PNG spec. First: The CRC check. The spec says that a 'chunk' contains a four byte size of data field, a four byte 'chunk identifier', the data and a CRC32 of the data. I found some code that reads a generic chunk. I see where the size and type are read, where a correctly sized record is allocated and where the data is read into the record. There is a 'FIXME' that asks about checking the CRC, but no code to actually read or check the CRC. I added code to read and check the CRC to my working copy of the git tree. That threw off the block synchronization, so I think there is code someplace else that either checks or skips the CRC, but I have not found it after a few hours searching for it. An indication on where to look and other advice would be very helpful at this time. Second: At least two of the methods GuildWars2 wants to use are stubbed. To implement those methods, the frame section of the WIC object should contain an array (or something with similar properties) of pointers to chunks. From what I have read about WIC, other formats could use a similar array. Some could even use an array of pointers to frames. Before I go messing with that level of change, I think I should listen to other peoples opinions of the subject. Third: On a very broad level, the whole OLE implementation seems to be very messed up. In particular, the usual practice for doing inheritance in C does not seem to be being used. That practice is to have the elements common to the base and extending object be placed at the beginning of the implementing data structures. While the member names need not be the same in all instances, the function, type and order of the common elements must be the same for economical implementation. This has been done for the basic object; all start with a pointer to the 'vtable'. What I think should follow is the critical section lock structure and, for 'IUnknown', the reference count. What I see is that these common elements are placed more or less at random in each extended object. Is there any reason, other than inertia, that at least these two fields should not be moved to the beginning of implementing objects. This can be done one object at a time and would allow the changed objects to use a common implementation of 'AddRef' at least, and another common routine or macro that handles the critical part of 'Release'.

2 2

[PATCH 5/6] dsound: rework ugly mixer logic
by Joerg-Cyril.Hoehle＠t-systems.com 24 Oct '12

24 Oct '12

Hi, Maarten Lankhorst wrote: >only oss4 and (maybe, just guessing?) coreaudio don't support float MacOS' CoreAudio supports floats. Actually, given that it's an entire audio pipeline like quartz, I bet it even prefers floats. >I also refer you to GetStreamLatency where I was getting the period from, >Please take it from me: IT'S OK TO FAIL THOSE MMDEVAPI PERIOD TESTS, I agree that some tests are extremely strict and that a "good enough" driver could work extremely well in practice despite failing some tests. However, please specify exactly which tests you have in mind so that we all talk about the same set. >BUT PLEASE DON'T LIE ABOUT THE HARDWARE CAPABILITIES REGARDING >TO MINIMUM PERIOD, DEFAULT PERIOD AND STREAM LATENCY. The reasoning is as follows: First, tests show that native exhibits a 10ms period, hence we can assume that every PC SW has been tested with that period only. Using another period in Wine might reveal bugs in the apps, but users would blame Wine. This is why I've been arguing no later than last week in bug #28622, comment #58 that Wine should fully decouple ALSA/OSS periods from the published 10ms mmdevapi periods. OTOH, winecoreaudio has been using 20ms periods since day 1 in 2011. I'm not aware of bugs in bugzilla caused by that deviation. Second, the shared mode audio engine IMHO presents an abstraction over any particular HW, providing the same behviour on all machines and eliminating the need for app X to talk to or work around bugs in sound driver Y. Thus I wonder why you talk about hardware capabilities at all. IOW the shared mode caps are: fixed period=10ms and unlimited buffer (MSDN says 2s). a) Minimum Period Why do you care? It's only relevant in exclusive mode. I'd say that minimum = shared mode default period is a reasonable value. And if default=10ms, minimum = 5ms seems ok if it has been tested and works well. OTOH, 200 periods and wakeups per second may be unrealistic as we alreadty struggle to sustain 100. Do you know an app that uses mmdevapi in exclusive mode? b) Default Period == shared mode audio engin period The target is 10ms, see above. Yet we could make exemptions: for instance, we might observe that all apps using mmdevapi use it via the XAudio2 libraries and that XA2 is well debugged and would bear a larger period, e.g. 50ms. There should be a registry setting for users to play with. I'm not happy with Wine's DSound+WinMM->mmdevapi. That may be a good move for MS, but it's a bad move for Wine. Wine's audio drivers don't bang the HW, they have huge SW stacks like PA or Jack in their back. c) Stream Latency Bear in mind that the mmdevapi stream latency is a static property of an audio SW transformation graph. It does not vary if some buffer is full or empty. It is unlike snd_pcm_delay. I believe winealsa outputs a reasonable stream latency. One may argue that it is too low: as winealsa always buffers 3 periods internally the latency should count those. I kept it low because native's mmdevapi is reported to introduce 30-40ms delays yet its GetStreamLatency ignores that and reports values like 10.6666ms. Perhaps we are wrong about GetStreamLatency. Perhaps it's always a local call to one element of the audio transformation graph and should never sum other elements itself. Perhaps the app should use some enumeration facility to walk the audio graph and sum each element's latency? Perhaps there's some native graph element that would report said 30-40ms latency? Regards, Jörg Höhle

4 4

vcomp: single-threaded implementation of _vcomp_fork (try 6)
by Joerg-Cyril.Hoehle＠t-systems.com 24 Oct '12

24 Oct '12

Hi, Alexandre Julliard wrote: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > + __ms_va_list valist; >it's ugly to use varargs only as a hack to get a pointer to the first >argument. Would taking the address of &wrapper (as in asm("...","r=&wrapper") or any C code like "void* stack = &wrapper") suffice to tell the x64 compiler to save register parameters into their allocated stack locations? My belief was that this is specifically the magic performed when the compiler sees a [__ms_]va_list. You seem to imply that va_list is superfluous and that taking the address of any parameter (not necessarily &wrapper but &ifval or &nargs too) would achieve the same effect: all 4 registers rcx, rdx, r8 and r9 get saved to the stack such that the & abstraction works even when the user performs pointer arithmetic. This is the effect that Dan Kegel needs for vcomp. In such a case he would use &wrapper, bypass va_list and correct the stack-relative offsets in the x86 and x64 assembly code by one pointer unit. Regards, Jörg Höhle

3 3

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 3)
by Dmitry Timoshkov 24 Oct '12

24 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > { > + DWORD error = GetLastError(); > + > + if (!hwnd) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + > + SetLastError( 0xdeadbeef ); > MapWindowPoints( hwnd, 0, lppnt, 1 ); > + > + if (GetLastError() != 0xdeadbeef) > + return FALSE; > + > + SetLastError(error); > return TRUE; > } As been said before these games with saving/restoring last error value are broken. -- Dmitry.

3 3

Re: [PATCH 1/2] user32: Remove redundant sizeof check.
by Ken Thomases 24 Oct '12

24 Oct '12

On Oct 24, 2012, at 3:24 AM, Michael Stefaniuc wrote: > @@ -1330,9 +1330,6 @@ static HICON CURSORICON_LoadFromFile( LPCWSTR filename, > } > > dir = (const CURSORICONFILEDIR*) bits; > - if ( filesize < sizeof(*dir) ) > - goto end; > - > if ( filesize < (sizeof(*dir) + sizeof(dir->idEntries[0])*(dir->idCount-1)) ) > goto end; > That doesn't seem redundant to me. It's not safe to access dir->idCount if the file isn't known to be big enough. Regards, Ken

2 1

Re: d3dx9_36/tests: Fix sizeof to be more portable (coverity)
by Henri Verbeet 24 Oct '12

24 Oct '12

On 24 October 2012 02:05, André Hentschel <nerv(a)dawncrow.de> wrote: > face_remap = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, > - tc[i].num_faces*sizeof(face_remap)); > + tc[i].num_faces*sizeof(DWORD*)); > I'm don't know what Coverity actually says about this, but this looks just as wrong to me. It's probably supposed to be "sizeof(*face_remap)".

2 1

Re: [PATCH 3/3] ntdll: Add NULL test for NtQuerySystemInformation with SystemProcessInformation.
by Marvin 23 Oct '12

23 Oct '12

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=22435 Your paranoid android. === W7PROX64 (32 bit info) === info.c:297: Test failed: Expected STATUS_ACCESS_VIOLATION got c0000017 === TEST64_W7SP1 (32 bit info) === info.c:297: Test failed: Expected STATUS_ACCESS_VIOLATION got c0000017

1 0

Re: [PATCH 3/3] mshtml: Added HTML comments in VBScript code tests
by Marvin 23 Oct '12

23 Oct '12

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=22431 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 1/3] ntdll: Implement nanosecond precision file time storage (try 2).
by Alexandre Julliard 23 Oct '12

23 Oct '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > @@ -2048,17 +2048,26 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io, > > if (info->LastAccessTime.QuadPart || info->LastWriteTime.QuadPart) > { > +#ifdef HAVE_FUTIMENS > + struct timespec tv[2]; > +#else > struct timeval tv[2]; > +#endif > + int ret; > > if (!info->LastAccessTime.QuadPart || !info->LastWriteTime.QuadPart) > { > - > - tv[0].tv_sec = tv[0].tv_usec = 0; > - tv[1].tv_sec = tv[1].tv_usec = 0; > + memset(&tv, 0x0, sizeof(tv)); > if (!fstat( fd, &st )) > { > tv[0].tv_sec = st.st_atime; > tv[1].tv_sec = st.st_mtime; > +#if defined(HAVE_FUTIMENS) && defined(HAVE_STRUCT_STAT_ST_ATIM) > + tv[0].tv_nsec = st.st_atim.tv_nsec; > +#endif > +#if defined(HAVE_FUTIMENS) && defined(HAVE_STRUCT_STAT_ST_MTIM) > + tv[1].tv_nsec = st.st_mtim.tv_nsec; > +#endif You want UTIME_OMIT. Also please try to cut down on the number of #ifdefs. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType. (try 2)
by Rico Schüller 23 Oct '12

23 Oct '12

On 22.10.2012 23:57, Christian Costa wrote: > -static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID* guid) > +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID *guid) > > - ID3DXFileDataImpl* object; > + ID3DXFileDataImpl *object; One minor thing: I'd put that fixes in patch 4/5. It doesn't make much sense to add a line and change the style in the next patch from the same series. I think it's better to correct this when it is added in the first place. Cheers Rico

1 0

Re: [PATCH 1/5] d3dx9_36: Implement D3DXFileCreate.
by Jacek Caban 23 Oct '12

23 Oct '12

On 10/22/12 10:13 PM, Rico Schüller wrote: > On 22.10.2012 21:27, Christian Costa wrote: >> +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, LPVOID *ret_iface) >> + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); >> + ID3DXFileImpl* object; > Please be a bit more consistent across your patch... There are a lot more occurrences where you mix both usages. His usage seems natural when you think about using 'This' as analogy to 'this' in C++ implementation. That said, it's really a matter of taste, but such analogy feels natural when you work with COM. And by that logic, the patch is consistent. It uses 'object' as name of global function, which is not member of any class-like thing. Christian, there were some informal attempts to limit usage of stuff like LPVOID (and really any LP* types). It would be nice if you could avoid it in your patches. Jacek

4 3

Re: [PATCH 4/5] d3dx9_36: Implement ID3DXFileEnumObjectImpl_GetChildren & ID3DXFileEnumObjectImpl_GetChild and add stubbed interface for ID3DXFileData.
by Rico Schüller 23 Oct '12

23 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > +static HRESULT WINAPI ID3DXFileDataImpl_GetType(ID3DXFileData *iface, GUID* guid) Spacing. msdn says "const GUID *pType" see http://msdn.microsoft.com/en-us/library/windows/desktop/bb205843%28v=vs.85%…. Is it a bug in msdn? > + ID3DXFileDataImpl* object; *object? > + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ID3DXFileDataImpl)); I'd use sizeof(*object), but that's probably only a matter of taste.

3 3

Re: winex11: Never use a surface for embedded windows, even for the parents. (Regression)
by Christian Inci 22 Oct '12

22 Oct '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, this patch is causing CS:GO (Counter Strike: Global Offensive) to exit silently on startup. (Commit: 5fae649bdf14fb63b8d44984eda6edd1094a3314) - -Chris -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://www.enigmail.net/ iQIcBAEBAgAGBQJQhbWdAAoJEC7OUg5VIFIFgw8QAI+9slyGg+G5T6mEEq1O5f3l 3AMOqCBVQ7F8mhBCqC8JhiMkjJRnJ8cRupXflPl5+iugXrhxHWxM49G/stJ9kqeQ m/uSwX+CSBUR/I2kBeYYljJtD28QEthjUP/X6VMTHsQKvInmyjZKXN5PXuLWwmq4 p1ZayBAixRNu0sLEDkH2vsRjRm0Ehla3YMFU6JkAH9mQcBl6x4V8Ii6E89onAC1i sV4x8ASHnnb8p4/I9m/mScmO1WAN/TnCQyh/QEXCgA/FFHvkSWNN7liDqRgRbNeM Ozx2Cj6UctzQpeHH7XeTzFQRHXY37cRcRvVVKU56yOC3N5hxK0ncXVWD2BflqBYZ C2cOwZpmzw3iG00csDjEWoLsZH0jw0foQNl5Nx/DWPyqqtY6hVT8++F80b1WroIM 47AcNeY9NakaDkBVnvmy0YeiVH0QIhZlT2L6h4LlogjIF6gl4m5kVBcGKCYAgF9C kqcGCg+CIlRqbDeEBto07GnDDDeuvG5NoCU3W2iB6xydBsEAfzj5xyOafbmueJuc JN7pBPgMfONmpg3RhkZgkiGFKlkA7URxTxHuQZsElBeKJiE2VkeZ4obXOf+YbPkc pTtQBIhkSXlStnxSJtKc6sY683YSoQinewGgHVV3qrbWhpPlz6ONQJjfifFhY3DO Vyakqk3iDicIg76kVuM6 =WTR3 -----END PGP SIGNATURE-----

1 0

Re: [PATCH 2/5] d3dx9_36: Implement ID3DXFileImpl_RegisterTemplates.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > } ID3DXFileImpl; > > > - > static inline ID3DXFileImpl *impl_from_ID3DXFile(ID3DXFile *iface) It doesn't make much sense to add an empty line and remove it in the next patch.

1 0

Re: [PATCH 5/5] d3dx9_36: Implement ID3DXFileDataImpl_GetType.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:28, Christian Costa wrote: > static HRESULT WINAPI ID3DXFileDataImpl_Unlock(ID3DXFileData *iface) > { > + > FIXME("(%p)->(): stub\n", iface); Why?

1 0

Re: [PATCH 1/5] d3dx9_36: Implement D3DXFileCreate.
by Rico Schüller 22 Oct '12

22 Oct '12

On 22.10.2012 21:27, Christian Costa wrote: > +static HRESULT WINAPI ID3DXFileImpl_QueryInterface(ID3DXFile *iface, REFIID riid, LPVOID *ret_iface) > > + ID3DXFileImpl *This = impl_from_ID3DXFile(iface); > > + ID3DXFileImpl* object; Please be a bit more consistent across your patch... There are a lot more occurrences where you mix both usages.

1 0

Re: [PATCH 6/8] ntdll: Standardize on sysconf to detect the number of processors for all platforms.
by Alexandre Julliard 22 Oct '12

22 Oct '12

James Eder <jimportal(a)gmail.com> writes: > @@ -1010,6 +1010,16 @@ static inline void get_cpuinfo(SYSTEM_CPU_INFORMATION* info) > */ > void fill_cpu_info(void) > { > + long num; > + > + num = sysconf(_SC_NPROCESSORS_ONLN); > + if (num < 1) > + { > + num = 1; > + WARN("Failed to detect the number of processors.\n"); > + } > + NtCurrentTeb()->Peb->NumberOfProcessors = num; Have you verified that this works correctly on all the platforms you are changing? -- Alexandre Julliard julliard(a)winehq.org

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 2)
by Alexandre Julliard 22 Oct '12

22 Oct '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -236,20 +236,32 @@ BOOL WINAPI GetClientRect( HWND hwnd, LPRECT rect ) > > > /******************************************************************* > - * ClientToScreen (USER32.@) > + * ClientToScreen (USER32.@) > */ > BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > { > + if (!IsWindow( hwnd )) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + You should never use IsWindow(). Handles should be checked at the point where they are used. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] try2 wineboot: detect correct processor name and vendorID, use Intel Pentium 4 as fallback
by Patrick Rudolph 22 Oct '12

22 Oct '12

This patch super-seeds my previous attempt ID 91173. This time I used do_cpuid from ntdll / wbemprox. If cpuid is not available, the default "Intel Pentium 4" string is used. I modified get_processor_name to remove leading white-spaces. I also updated the code for Identifier REG_SZ. This applies to 64bit wine only, as 32bit still reports x86.

1 0

Re: [PATCH 5/6] dsound: rework ugly mixer logic
by Andrew Eikum 22 Oct '12

22 Oct '12

Mostly good cleanup in this one. Some thoughts below... On Tue, Oct 16, 2012 at 02:06:29PM +0200, Maarten Lankhorst wrote: > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index feef787..7817b88 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -73,10 +73,8 @@ struct DirectSoundDevice > - DWORD writelead, buflen, state, playpos, mixpos; > + DWORD writelead, buflen, aclen, fraglen, state, playpos, pad; If you're introducing new variables, surely you can come up with something more descriptive than "aclen." Something like "ac_buffer_frames," maybe? I'm a big fan of units on my variable names so mistakes like "pos_bytes = ac_frames;" are obvious. Similar for "pad," maybe something like "in_mmdev_bytes" (Is that actually used any more after your patches? You could re-use it if not.) > @@ -209,7 +207,6 @@ HRESULT DSOUND_PrimaryCreate(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryDestroy(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryPlay(DirectSoundDevice *device) DECLSPEC_HIDDEN; > HRESULT DSOUND_PrimaryStop(DirectSoundDevice *device) DECLSPEC_HIDDEN; > -HRESULT DSOUND_PrimaryGetPosition(DirectSoundDevice *device, LPDWORD playpos, LPDWORD writepos) DECLSPEC_HIDDEN; Good riddance. > @@ -682,147 +623,100 @@ static void DSOUND_PerformMix(DirectSoundDevice *device) > LeaveCriticalSection(&device->mixlock); > return; > } > - > - to_mix_frags = device->prebuf - (pad * device->pwfx->nBlockAlign + device->fraglen - 1) / device->fraglen; > - > - to_mix_bytes = to_mix_frags * device->fraglen; > - > - if(device->in_mmdev_bytes > 0){ > - DWORD delta_bytes = min(to_mix_bytes, device->in_mmdev_bytes); > - device->in_mmdev_bytes -= delta_bytes; > - device->playing_offs_bytes += delta_bytes; > - device->playing_offs_bytes %= device->buflen; > + block = device->pwfx->nBlockAlign; Bleh. Do we really need to alias that? > + if (maxq > device->fraglen * 3) > + maxq = device->fraglen * 3; > + This seems to be replacing ds_snd_queue_max, right? Why remove the configurability? Why 3 instead of the old default of 10? This should be a separate patch at least. > + writepos = (device->playpos + pad) % device->buflen; > > if (device->priolevel != DSSCL_WRITEPRIMARY) { > - BOOL recover = FALSE, all_stopped = FALSE; > - DWORD playpos, writepos, writelead, maxq, prebuff_max, prebuff_left, size1, size2; > - LPVOID buf1, buf2; > + BOOL all_stopped = FALSE; > int nfiller; > + BOOL native = device->normfunction == normfunctions[4]; > + DWORD bpp = device->pwfx->wBitsPerSample>>3; Again, do we need to alias that? > -static DWORD DSOUND_fraglen(DirectSoundDevice *device) > -{ > - REFERENCE_TIME period; > - HRESULT hr; > - DWORD ret; > - > - hr = IAudioClient_GetDevicePeriod(device->client, &period, NULL); > - if(FAILED(hr)){ > - /* just guess at 10ms */ > - WARN("GetDevicePeriod failed: %08x\n", hr); > - ret = MulDiv(device->pwfx->nBlockAlign, device->pwfx->nSamplesPerSec, 100); > - }else > - ret = MulDiv(device->pwfx->nSamplesPerSec * device->pwfx->nBlockAlign, period, 10000000); > - > - ret -= ret % device->pwfx->nBlockAlign; > - return ret; > -} > - ... > + device->fraglen = MulDiv(device->pwfx->nSamplesPerSec, period, 10000000) * device->pwfx->nBlockAlign; This should be a separate patch. I don't have an argument /against/ it, but why do you prefer 10ms over whatever the driver prefers? Andrew

3 3

Re: [PATCH 4/6] dsound: Use event based threads
by Andrew Eikum 22 Oct '12

22 Oct '12

I like it. Before I can give a sign-off, I need to run it through my usual battery of tests on all the platforms. I'll do that after patch 3 gets figured out. Some thoughts below... On Tue, Oct 16, 2012 at 02:06:28PM +0200, Maarten Lankhorst wrote: > + /* ALSA is retarded, add a timeout.. */ > + ret = WaitForSingleObject(dev->sleepev, dev->sleeptime); No arguments here :) but I'm curious what you mean. Presumably winealsa isn't sending events when it ought to? I know Jorg has discovered that failure, I wonder if it's worth testing and fixing across all the drivers. > diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c > index 94bdf9c..9d9fa27 100644 > --- a/dlls/dsound/primary.c > +++ b/dlls/dsound/primary.c > @@ -170,6 +172,7 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > device->pwfx->wFormatTag = WAVE_FORMAT_PCM; > device->pwfx->cbSize = 0; > } > + IAudioClient_SetEventHandle(device->client, device->sleepev); > > hres = IAudioClient_GetService(device->client, &IID_IAudioRenderClient, > (void**)&device->render); > @@ -203,6 +206,19 @@ HRESULT DSOUND_ReopenDevice(DirectSoundDevice *device, BOOL forcewave) > WARN("GetService failed: %08x\n", hres); > return hres; > } > + /* Now kick off the timer so the event fires periodically */ > + IAudioClient_Start(device->client); > + > + IAudioClient_GetStreamLatency(device->client, &period); I'm a big fan of error checking (or at least reporting), so these unchecked calls make me nervous. They'll probably never fail, but if they do, I think they should fail loudly. Andrew

2 2

Re: [PATCH 5/5] services: Added tests for service thread termination without setting service state to stopped
by Marvin 22 Oct '12

22 Oct '12

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=22392 Your paranoid android. === WVISTAADM (32 bit service) === service.c:397: Test failed: status.dwCurrentState = 3 service.c:411: Test failed: status.dwCurrentState = 3 === W2K8SE (32 bit service) === service.c:397: Test failed: status.dwCurrentState = 3 service.c:411: Test failed: status.dwCurrentState = 3

1 0

ntdll feature detection patch set
by James Eder 22 Oct '12

22 Oct '12

I've been kicking this patch set around in my local git tree for a while and I want to get it out there for comments and maybe even inclusion in Wine. Seeing some comments in another thread about wineboot made me think I should get these patches out rather than holding onto them much longer. I feel fairly good about the first 6 patches. They're small, bite-sized, and all x86/x86_64 so I can test them easily. However, the last two in the series are some what large and do things with ARM and PowerPC code. While it looks good to me, I don't have hardware or a build environment for them. I may have some ARM+Linux hardware in the coming months but I doubt I'll ever see a PowerPC come my way. If you have a build environment for ARM or PowerPC I would very much appreciate some feedback. Also I did some greping and found two other locations in Wine with similar do_cpuid type functions: dlls/wbemprox/builtin.c and dlls/dbghelp/minidump.c. Would it be worthwhile to have the function in a common header somewhere? -- Jim

2 1

Re: [PATCH 4/4] mshtml: Added more events tests
by Marvin 22 Oct '12

22 Oct '12

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=22386 Your paranoid android. === 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: [PATCH 2/2] d3dxof: Use sizeof(GUID) instead of hardcoding the value.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Christian Costa <titan.costa(a)gmail.com> writes: > @@ -599,7 +599,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetId(IDirectXFileData* iface, LPGUID > if (!pGuid) > return DXFILEERR_BADVALUE; > > - memcpy(pGuid, &This->pobj->class_id, 16); > + memcpy(pGuid, &This->pobj->class_id, sizeof(GUID)); Using normal assignments would be even better. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/4] mshtml: Fixed attribute object caching logic
by Marvin 22 Oct '12

22 Oct '12

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=22384 Your paranoid android. === 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: d3dx9_36: Add tests for D3DXSHRotateZ
by Rico Schüller 22 Oct '12

22 Oct '12

On 19.10.2012 13:15, Nozomi Kodama wrote: > This patch adds tests for the patch sent by Rico for D3DXSHRotateZ. > > Moreover, I changed const in CONST in the declaration of the function in > order to uniformize with the file. > + const FLOAT angle[] = ... I'd prefer "const" because it is used a little bit more often than CONST, but it is only a matter of taste. git grep "[ (,]const " | wc -l ~61k git grep "[ (,]CONST " | wc -l ~1.2k > + if ( i >= square || ( (order >= D3DXSH_MAXORDER) && ( i >= D3DXSH_MAXORDER * D3DXSH_MAXORDER ) ) ) > + if (l > 0) I'd write it "if (i >= square || ((... for consistency. > + ok(relative_error(expected, out_temp[i]) < admitted_error, "angle %f, order %u index %u, Expected %f, received %f\n", angle[j], order, i, expected, out_temp[i]); Expected -> expected? (2 times) > + expected = table[36 * (l + 3 * j ) + i]; The spacing looks a bit ugly. Cheers Rico

4 3

Re: [PATCH 5/8] ntdll: Add detection for PF_SSE_DAZ_MODE_AVAILABLE
by Chris Robinson 22 Oct '12

22 Oct '12

On 10/20/2012 05:40 PM, James Eder wrote: > + /* Intel says we need a zeroed 16-byte aligned buffer */ > + char buffer[512 + 16]; > + XMM_SAVE_AREA32 *state = (XMM_SAVE_AREA32 *)(((ULONG_PTR)buffer + 15) & ~15); > + memset(buffer, 0, sizeof(buffer)); > + > + __asm__ __volatile__( "fxsave %0" : "=m" (*state) : "m" (*state) ); Wouldn't this be simpler? DECLSPEC_ALIGN(16) XMM_SAVE_AREA32 state; memset(state, 0, sizeof(state)); __asm__ __volatile__("fxsave %0" : "=m" (*&state) : "m" (*&state)); May also want to make sure the two structs are packed.

4 7

re: [PATCH] services: Fix some weird sizeof usages.
by Dan Kegel 21 Oct '12

21 Oct '12

Christian Costa wrote: ... --- a/programs/services/rpc.c +++ b/programs/services/rpc.c ... @@ -952,7 +952,7 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } - if (!r || count != sizeof *result) + if (!r || count != sizeof(*result)) I was curious about this, so I looked around a bit. There are about 800 instances of sizeof without parens in Wine vs. 34628 with. I would have thought "Heck, this is just like return without parentheses, it emphasizes that it's not a function call, maybe it's a good idea." But it seems it's only legal to use it without parentheses for values; you need the parentheses when getting sizeof a type. cf. c89: http://web.archive.org/web/20040907153347/http://danpop.home.cern.ch/danpop… http://bytes.com/topic/c/answers/478596-using-sizeof-without-parentheses Does anybody feel strongly one way or the other?

2 1

Re: [PATCH 2/2] d3dxof: Use sizeof(GUID) instead of hardcoding the value.
by Rico Schüller 21 Oct '12

21 Oct '12

Why is there a "static guid" used in GetType? What happens if you query: hr = IDirectXFileData_GetType(lpDirectXFileData, &clsid_type); hr = IDirectXFileData_GetType(lpDirectXFileData2, &clsid_type2); Are thy both containing the value to clsid_type2 then? Do clsid_type and clsid_type2 match in that case to the same pointer both pointing to the same static guid? I don't see a test for this. Why doesn't *pguid = &This->pobj->type; do the job in that case? While trying to check the cases above, I got the following problem... Under which circumstances is the test_dump test run? It looks like the tests are never run because there is no objects.txt, see: hFile = CreateFileA("objects.txt", GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL); if (hFile == INVALID_HANDLE_VALUE) return; CloseHandle(hFile); All machines (http://test.winehq.org/data/tests/d3dxof:d3dxof.html) seem to run 107 tests or skip all of them, which is the same on my machine (I got 107 tests), so none of them is running the whole test_dump ... How is this supposed to work? Cheers Rico On 21.10.2012 14:50, Christian Costa wrote: > @@ -647,7 +647,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_GetType(IDirectXFileData* iface, cons > if (!pguid) > return DXFILEERR_BADVALUE; > > - memcpy(&guid, &This->pobj->type, 16); > + memcpy(&guid, &This->pobj->type, sizeof(GUID)); > *pguid = &guid; > > return DXFILE_OK;

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them. (try 2)
by Rico Schüller 21 Oct '12

21 Oct '12

I think we also need a test to prove that "return MapWindowPoints( hwnd, 0, lppnt, 1 ) != 0;" is wrong. I'd probably split the changes to ScreenToClient/ClientToScreen and MapWindowPoints, because they are not necessarily bound together. What about something like: wnd2 = CreateWindow("static", "wnd2", WS_POPUP, 0, 0, 150, 150, NULL, NULL, NULL, NULL); ok(wnd2 != NULL, "CreateWindow failed\n"); SetLastError(0xdeadbeef); p.x = p.y = 0; ret = ScreenToClient(wnd2, &p); err = GetLastError(); ok(ret, "ScreenToClient() failed\n"); ok(p.x == 0 && p.y == 0, "Failed got(%d, %d), expected (%d, %d)\n", p.x, p.y, 0, 0); ok(err == 0xdeadbeef, "GetLastError failed, got %x, expected %x\n", err, 0xdeadbeef); Also msdn says: "Do not use ScreenToClient when in a mirroring situation, that is, when changing from left-to-right layout to right-to-left layout. Instead, use MapWindowPoints. For more information, see "Window Layout and Mirroring" in Window Features." We may also check that case. So they may not share the exact same steps. Cheers Rico On 20.10.2012 12:27, Christian Costa wrote: > Based ont a patch of Rico Schuller. > > Try 2: > - Test window handle in ClienToScreen and ScreenToClient instead of relying on GetLastError(). > - Don't rename params. > --- > dlls/user32/tests/win.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++ > dlls/user32/winpos.c | 28 +++++- > 2 files changed, 237 insertions(+), 4 deletions(-)

2 3

Re: [PATCH 1/1] d3dx9/tests: Move device creation to main func.
by Henri Verbeet 21 Oct '12

21 Oct '12

2012/10/21 Rico Schüller <kgbricola(a)web.de>: > --- We've generally been moving in the opposite direction for the D3D tests, having each set of tests create its own device, window, etc. instead. This makes the tests much more self-contained, which in turn makes it much easier to debug if you have failures on some setup. I.e., you don't have to worry about some obscure render state that was set 15 tests ago, but affects every test in between, or some memory corruption due to a driver bug that only becomes visible when you're adding a new test. The ddraw/d3d8/d3d9 visual tests are particular bad in that regard. See also e.g. ddraw:ddraw7, etc., or to a lesser extent some of the more recent d3d8/d3d9:device tests.

2 1

Re: [PATCH] wineboot: detect correct processor name and vendorID, use Intel Pentium 4 as fallback
by Eric Pouech 20 Oct '12

20 Oct '12

Le 20/10/2012 12:42, Patrick Rudolph a écrit : > This patch need lots of testing, since I can only test it on linux > using an Intel CPU. > Please tests on other OS and systems, too. please use the ntdll or kernel32 relevant API so that you don't have to copy the same code A+

3 4

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ClientToScreen( HWND wnd, LPPOINT point ) > { > - MapWindowPoints( hwnd, 0, lppnt, 1 ); > + DWORD error = GetLastError(); > + > + if (!wnd) > + { > + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); > + return FALSE; > + } > + > + SetLastError( 0xdeadbeef ); > + MapWindowPoints( wnd, 0, point, 1 ); > + > + if (GetLastError() != 0xdeadbeef) > + return FALSE; > + > + SetLastError(error); > return TRUE; > } All this logic with saving/restoring last error code is wrong (here and in another places), there is no need for that. -- Dmitry.

2 1

Re: [PATCH] user32: Fix error handling in MapWindowPoints, ClientToScreen and ScreenToClient and add tests for them.
by Dmitry Timoshkov 20 Oct '12

20 Oct '12

Christian Costa <titan.costa(a)gmail.com> wrote: > -BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) > +BOOL WINAPI ScreenToClient( HWND wnd, LPPOINT point ) Please stick to commonly used 'hwnd' for a window handle, renaming 'lppnt' to 'point' is also not justified. -- Dmitry.

2 1

Re: [PATCH 6/6] dsound: remove now unused variables
by Andrew Eikum 19 Oct '12

19 Oct '12

Be nice if you could split this up and squash it into the previous patches. Andrew On Tue, Oct 16, 2012 at 02:06:30PM +0200, Maarten Lankhorst wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > No longer influence anything, so zap them. > --- > dlls/dsound/dsound_main.c | 17 ----------------- > dlls/dsound/dsound_private.h | 4 ---- > 2 files changed, 21 deletions(-) > > diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c > index 3fded64..607c3d4 100644 > --- a/dlls/dsound/dsound_main.c > +++ b/dlls/dsound/dsound_main.c > @@ -29,7 +29,6 @@ > * Handle static buffers - put those in hardware, non-static not in hardware > * Hardware DuplicateSoundBuffer > * Proper volume calculation for 3d buffers > - * Remove DS_HEL_FRAGS and use mixer fragment length for it > */ > > #include <stdarg.h> > @@ -92,9 +91,6 @@ WCHAR wine_vxd_drv[] = { 'w','i','n','e','m','m','.','v','x','d', 0 }; > > /* All default settings, you most likely don't want to touch these, see wiki on UsefulRegistryKeys */ > int ds_hel_buflen = 32768 * 2; > -int ds_snd_queue_max = 10; > -int ds_default_sample_rate = 44100; > -int ds_default_bits_per_sample = 16; > static HINSTANCE instance; > > /* > @@ -147,23 +143,10 @@ void setup_dsound_options(void) > if (!get_config_key( hkey, appkey, "HelBuflen", buffer, MAX_PATH )) > ds_hel_buflen = atoi(buffer); > > - if (!get_config_key( hkey, appkey, "SndQueueMax", buffer, MAX_PATH )) > - ds_snd_queue_max = atoi(buffer); > - > - > - if (!get_config_key( hkey, appkey, "DefaultSampleRate", buffer, MAX_PATH )) > - ds_default_sample_rate = atoi(buffer); > - > - if (!get_config_key( hkey, appkey, "DefaultBitsPerSample", buffer, MAX_PATH )) > - ds_default_bits_per_sample = atoi(buffer); > - > if (appkey) RegCloseKey( appkey ); > if (hkey) RegCloseKey( hkey ); > > TRACE("ds_hel_buflen = %d\n", ds_hel_buflen); > - TRACE("ds_snd_queue_max = %d\n", ds_snd_queue_max); > - TRACE("ds_default_sample_rate = %d\n", ds_default_sample_rate); > - TRACE("ds_default_bits_per_sample = %d\n", ds_default_bits_per_sample); > } > > static const char * get_device_id(LPCGUID pGuid) > diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h > index 7817b88..bdd3a37 100644 > --- a/dlls/dsound/dsound_private.h > +++ b/dlls/dsound/dsound_private.h > @@ -31,10 +31,6 @@ > #include "wine/list.h" > > extern int ds_hel_buflen DECLSPEC_HIDDEN; > -extern int ds_snd_queue_max DECLSPEC_HIDDEN; > -extern int ds_snd_shadow_maxsize DECLSPEC_HIDDEN; > -extern int ds_default_sample_rate DECLSPEC_HIDDEN; > -extern int ds_default_bits_per_sample DECLSPEC_HIDDEN; > > /***************************************************************************** > * Predeclare the interface implementation structures > -- > 1.7.11.3 > > >

1 0

Re: [PATCH 3/5] wined3d: Implement WINED3DSIH_ROUND_NI in the GLSL shader backend.
by Matteo Bruni 19 Oct '12

19 Oct '12

2012/10/18 Henri Verbeet <hverbeet(a)codeweavers.com>: > --- > dlls/wined3d/glsl_shader.c | 3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c > index 57119e1..993b547 100644 > --- a/dlls/wined3d/glsl_shader.c > +++ b/dlls/wined3d/glsl_shader.c > @@ -2530,6 +2530,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) > case WINED3DSIH_EXP: instruction = "exp2"; break; > case WINED3DSIH_DSX: instruction = "dFdx"; break; > case WINED3DSIH_DSY: instruction = "ycorrection.y * dFdy"; break; > + case WINED3DSIH_ROUND_NI: instruction = "floor"; break; Hmm, does ROUND_NI really translate to floor() (as opposed to round()) or is that because round() is not supported in GLSL 1.20? In the latter case maybe a FIXME would help.

2 2

Re: ntdll: Don't use strncasecmp for _strnicmp implementation
by Marcus Meissner 19 Oct '12

19 Oct '12

On Tue, Oct 16, 2012 at 12:38:51PM +0200, Jacek Caban wrote: > --- > dlls/ntdll/string.c | 12 +++++++++++- > dlls/ntdll/tests/string.c | 33 +++++++++++++++++++++++++++++++++ > 2 files changed, 44 insertions(+), 1 deletions(-) > > > diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c > index 716dbdf..288e910 100644 > --- a/dlls/ntdll/string.c > +++ b/dlls/ntdll/string.c > @@ -254,7 +254,17 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) > */ > int __cdecl _strnicmp( LPCSTR str1, LPCSTR str2, size_t n ) > { > - return strncasecmp( str1, str2, n ); > + int ret = 0; > + > + /* 32-bit Windows return only -1,0,1 values */ > + while(n--) { > + if(!*str1) > + return sizeof(void*) == 4 ? (*str2 ? -1 : 0) : -(unsigned char)*str2; > + if((ret = tolower(*str1++) - tolower(*str2++))) > + return sizeof(void*) == 4 ? (ret > 0 ? 1 : -1) : ret; > + } Errm. Why not int ret = strncasecmp( str1, str2, n ); if (ret < 0 ) return -1; if (ret > 0 ) return 1; return 0; Ciao, Marcus

3 5

Re: vcomp: single-threaded implementation of _vcomp_fork (try 6)
by Alexandre Julliard 19 Oct '12

19 Oct '12

Dan Kegel <dank(a)kegel.com> writes: > +void WINAPIV _vcomp_fork(BOOL ifval, int nargs, void *wrapper, ...) > +{ > + __ms_va_list valist; > + TRACE("(%d, %d, %p, ...)\n", ifval, nargs, wrapper); > + __ms_va_start(valist, wrapper); > + _vcomp_fork_call_wrapper(wrapper, nargs, valist); > + __ms_va_end(valist); > +} It's not a real varargs function, as you noted in the comments, so it's ugly to use varargs only as a hack to get a pointer to the first argument. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: [PATCH 1/3] ntdll: Implement nanosecond precision file time storage.
by Alexandre Julliard 19 Oct '12

19 Oct '12

"Erich E. Hoover" <ehoover(a)mymail.mines.edu> writes: > This series of patches provides a fix for Bug #31858 (Netflix Internet > Connection Problem). With this particular patch the POSIX.1-2008 > futimens() function is used to replace the BSD futimes() function, > allowing for nanosecond precision of recorded file times. This would need a configure check. -- Alexandre Julliard julliard(a)winehq.org

1 0

"Survey about gaming on linux"
by Saulius Krasuckas 19 Oct '12

19 Oct '12

The post: http://www.linuxforums.org/forum/coffee-lounge/192526-survey-about-gaming-l… The results containing one item about using Wine: https://docs.google.com/spreadsheet/viewanalytics?formkey=dEI5dEx1SGw5TEJMW… S.

2 1

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Daniel Santos 19 Oct '12

19 Oct '12

On 10/16/2012 01:12 PM, Christian Costa wrote: > + /* Choose point inside the client area */ > + point.x = rect.right / 2 - 50; > + point.y = rect.bottom / 2 - 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); > + > + /* Choose point outside the client area */ > + point.x = rect.right / 2 + 50; > + point.y = rect.bottom / 2 + 50; > + ret = ScreenToClient(wnd, &point); > + ok(ret, "ScreenToClient failed with %#x\n", GetLastError()); > + ret = MapWindowPoints(NULL, wnd, &point, 1); > + ok(ret, "MapWindowPoints failed with %#x\n", GetLastError()); When I do these tests, I like throwing every stupid thing I can possibly come up with (and I'm gifted and coming up with stupid things) but always get shot down because I can't produce an example of a real-world app doing it. So here's one from LoTRO: 8.385:0009:Call user32.ScreenToClient(00000000,0033fd68) ret=006d4d87 And if you don't return zero when it does this, the game crashes resulting in my in-box filling up from desperate game addicts posting to appdb. So if you can please include the below in your patch, I can omit it from mine (see http://bugs.winehq.org/show_bug.cgi?id=31979) and thank you! + /* LoTRO will do this and crash if we don't return zero, precious indeed! */ + ret = ScreenToClient( NULL, &point ); + ok(!ret, "ScreenToClient didn't fail as expected (got %d)\n", ret); Daniel

3 3

Re: [PATCH 2/7] gdi32/tests: Fixed broken bitmap font metrics test on CJK locales.
by Qian Hong 18 Oct '12

18 Oct '12

Hello, On Fri, Oct 19, 2012 at 2:11 AM, Qian Hong <fracting(a)gmail.com> wrote: > Including Arabic, Chinese, English, Dutch, Japanese, Russian > Forgot to say, we have no Korean system in our testbot vms, so I tested this patch locally with Korean Windows 8 preview. -- Regards, Qian Hong - Sent from Ubuntu http://www.ubuntu.com/

1 0

Re: jscript: Don't release possible NULL pointer (coverity)
by Jacek Caban 18 Oct '12

18 Oct '12

Hi André, On 10/18/12 00:14, André Hentschel wrote: > CID 735258 > > --- > dlls/jscript/regexp.c | 4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) > > diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c > index bdff445..71474c7 100644 > --- a/dlls/jscript/regexp.c > +++ b/dlls/jscript/regexp.c > @@ -3378,7 +3378,9 @@ static HRESULT do_regexp_match_next(script_ctx_t *ctx, RegExpInstance *regexp, D > last_match = jsstr_alloc_len(str, len); > if(!last_match) > return E_OUTOFMEMORY; > - jsstr_release(ctx->last_match); > + > + if(ctx->last_match) > + jsstr_release(ctx->last_match); > ctx->last_match = last_match; ctx->last_match should always be a valid string. I guess coverity is confused by earlier compare to NULL, which is a leftover after string representation change. We should use jsstr_t here to avoid allocation anyway, I will send a patch. Thanks, Jacek

1 0

Re: (resend) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 18 Oct '12

18 Oct '12

On Oct 16, 2012, at 2:15 PM, Aric Stewart wrote: > @@ -1052,6 +1079,7 @@ static inline int size_to_slot(int size) > case 16: return 0; > case 32: return 1; > case 48: return 2; > + case 64: return 2; /* Classic Mode */ > case 128: return 3; > case 256: return 4; > case 512: return 5; If an ICO has both a 48x48 and a 64x64 entry (improbable, I know), then the 48x48 should be preferred. So, you need additional logic to pick the best index for a slot in platform_write_icon(). Track the best-so-far's width and prefer the smaller. Beyond that, perhaps the scaling should be put into the ICNS encoder rather than convert_to_native_icon(). That is, if it's handed a size that doesn't fit properly into one of the predefined slots, it would scale down to the next lower size. Although it might be better to synthesize a 32x32 rather than a 48x48 from a 64x64. *shrug* -Ken

5 6

Re: advapi32: Only require a domain in the username for CRED_PERSIST_ENTERPRISE credentials.
by Marvin 18 Oct '12

18 Oct '12

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=22306 Your paranoid android. === WXPPROSP3 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168 === W2K3R2SESP2 (32 bit cred) === cred.c:128: Test failed: CredWriteA failed with error 2202 cred.c:131: Test failed: CredDeleteA failed with error 1168 cred.c:135: Test failed: CredWriteA failed with error 1312 cred.c:138: Test failed: CredDeleteA failed with error 1168 cred.c:149: Test failed: CredWriteA failed with error 2202 cred.c:152: Test failed: CredDeleteA failed with error 1168

1 0

Re: msvcp: free facet and _Locimp in Locimp dtor
by Piotr Caban 18 Oct '12

18 Oct '12

On 10/17/12 02:35, Daniel Lehman wrote: @@ -7241,10 +7241,11 @@ void __thiscall locale__Locimp_dtor(locale__Locimp *this) MSVCP_size_t i; for(i=0; i<this->facet_cnt; i++) if(this->facetvec[i] && locale_facet__Decref(this->facetvec[i])) - call_locale_facet_vector_dtor(this->facetvec[i], 0); + call_locale_facet_vector_dtor(this->facetvec[i], 1); MSVCRT_operator_delete(this->facetvec); MSVCP_basic_string_char_dtor(&this->name); + MSVCRT_operator_delete(this); } } Memory allocated for locale__Locimp object should be freed in locale class (locale_dtor function). You can't delete it here. Cheers, Piotr

2 4

Re: gdiplus: fix font test when liberation fonts are installed
by Dmitry Timoshkov 18 Oct '12

18 Oct '12

Austin English <austinenglish(a)gmail.com> wrote: > + ok(!lstrcmp(lf.lfFaceName, "Arial") || > + !lstrcmp(lf.lfFaceName, "Liberation Sans"), "wrong face name %s\n", lf.lfFaceName); The tests are supposed to reflect Windows behaviour, what Windows version does return "Liberation Sans" in this test? -- Dmitry.

2 2

re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Dan Kegel 17 Oct '12

17 Oct '12

Jason wrote: >>It's clearly time to start splitting WCMD_for into several helper functions. > > I completely agree, and it was definitely on my radar to do... its really > ugly code in there (I take responsibility for a lot of that!) as it has > been a slow incremental increase in what we actually supported... I was > aiming to get a set of working /f tests before I did such a reshuffle as > that is the last of the functionality that for was missing (ie I could > ensure I keep it all working), but will prioritize it if you want it before > that. Seems like it makes sense to add as many tests as possible before refactoring, but if they're messy to submit without also fixing the problems they find, go ahead and keep them local for now... just don't forget to submit them asap. I must say, it's awesome how you're tearing into the cmd problems! - Dan

1 0

Re: shell32/tests: Test ShellExecute()'s URL handling.
by Marvin 17 Oct '12

17 Oct '12

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=22302 Your paranoid android. === WNT4WSSP6 (32 bit shlexec) === shlexec.c:1800: Test failed: ShellExecute(file="notaproto://foo") succeeded: rc=2 shlexec.c:1803: Test failed: ShellExecute(file="fakeproto://foo/bar") expected SE_ERR_ACCESSDENIED got rc=2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar.lnk") Got different return value with empty string: 42 2 shlexec.c:137: Test failed: ShellExecute(file="file://shlproto://foo/bar") WaitForSingleObject returned 258 shlexec.c:152: Test failed: ShellExecute(file="file://shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=42 === W2KPROSP4 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=5 === WVISTAADM (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W2K8SE (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PRO (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (32 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (64 bit shlexec) === shlexec.c:1843: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2

1 0

Re: [PATCH] winmm: Load winealsa if winepulse is found
by Austin English 17 Oct '12

17 Oct '12

On Tue, Oct 16, 2012 at 5:10 AM, Maarten Lankhorst <m.b.lankhorst(a)gmail.com> wrote: > From: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> > > Fixes midi on winepulse > --- > dlls/winmm/lolvldrv.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/dlls/winmm/lolvldrv.c b/dlls/winmm/lolvldrv.c > index f387323..3b1be27 100644 > --- a/dlls/winmm/lolvldrv.c > +++ b/dlls/winmm/lolvldrv.c > @@ -543,7 +543,10 @@ static void MMDRV_Init(void) > drvA = HeapAlloc(GetProcessHeap(), 0, size); > WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, drvA, size, NULL, NULL); > > - MMDRV_Install(drvA, drvA, FALSE); > + if (!strcasecmp(drvA, "winepulse.drv")) > + MMDRV_Install("winealsa.drv", "winealsa.drv", 0); > + else > + MMDRV_Install(drvA, drvA, FALSE); > > HeapFree(GetProcessHeap(), 0, drvA); > PropVariantClear(&pv); > -- > 1.7.11.3 Shouldn't this be part of the winepulse patch itself? It will never get used in Wine, as is... -- -Austin

2 1

Re: d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

My bad. My patch pass the tests but not yours. Can you check these facts? Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

2 2

Re: (try 3) programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Icns format
by Ken Thomases 17 Oct '12

17 Oct '12

On Oct 17, 2012, at 9:50 AM, Aric Stewart wrote: > - if (iconDirEntries[i].wBitCount >= best[slot].maxBits) > + if (((best[slot].maxBits && !scaled) || (!best[slot].maxBits) || (scaled && best[slot].scaled)) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) This could be more clearly written as: if ((!scaled || !best[slot].maxBits || best[slot].scaled) && (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled))) or even: if (scaled && best[slot].maxBits && !best[slot].scaled) continue; /* don't replace unscaled with scaled */ if (iconDirEntries[i].wBitCount >= best[slot].maxBits || (!scaled && best[slot].scaled)) That is, your left side of the outer && has redundancies and all the negatives make it hard to penetrate. -Ken

1 0

Re: [PATCH 4/6] [cmd] Add for /f parsingkeyword parsing, add support for skip=
by Alexandre Julliard 17 Oct '12

17 Oct '12

Ann and Jason Edmeades <jason(a)edmeades.me.uk> writes: > Parse the options you can provide with for /f to control the > subsequent parsing, and add support for the simplest (skip). > @@ -1546,6 +1545,13 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { > int itemNum; > CMD_LIST *thisCmdStart; > int parameterNo = 0; > + WCHAR forf_eol=0; > + int forf_skip=0; > + WCHAR forf_delims[256]; > + WCHAR forf_tokens[MAXSTRING]; > + BOOL forf_usebackq = FALSE; > + static const WCHAR forf_defaultdelims[] = {' ', '\t'}; > + static const WCHAR forf_defaulttokens[] = {'1'}; It's clearly time to start splitting WCMD_for into several helper functions. -- Alexandre Julliard julliard(a)winehq.org

2 1

[PATCH] krnl386.exe: Implement INT 33h function 15h
by Christian Costa 17 Oct '12

17 Oct '12

1 0

Re: [PATCH 20/25] mciseq: Check stop condition after sleeping. (Try 5)
by Marcus Meissner 17 Oct '12

17 Oct '12

On Wed, Oct 17, 2012 at 10:36:44AM +0200, Joerg-Cyril.Hoehle(a)t-systems.com wrote: > Please note that the patch queue failed to detect some superseded patches: > > 90588: I should not have named that 17/25 in the first place. > 90672 + 90674: the original 20-21/25 were never marked superseded by later patches. > 90841+ 90482: try 3 was superseded by try 4, now superseded by this try 5. I would suggest to resubmit your queue in smaller batches (like eg. 5 pieces per day) and wait for it to get applied. In the current state testbot will not be run on the sequence I think. Ciao, Marcus

1 0

Re: testbot/lib: If we cannot open the log file, then log to stderr.
by Christian Costa 17 Oct '12

17 Oct '12

Hi François, While your are at it. I would like to do a suggestion. Indeed that would be great to be able to download some files along with the test. Typically for me avi files and dlls (or .drv) would be great ! :D Thanks Christian, 2012/10/15 Francois Gouget <fgouget(a)codeweavers.com> > --- > testbot/lib/WineTestBot/Log.pm | 16 +++++++--------- > 1 file changed, 7 insertions(+), 9 deletions(-) > > diff --git a/testbot/lib/WineTestBot/Log.pm > b/testbot/lib/WineTestBot/Log.pm > index 6883968..7de6dcb 100644 > --- a/testbot/lib/WineTestBot/Log.pm > +++ b/testbot/lib/WineTestBot/Log.pm > @@ -38,20 +38,18 @@ sub LogMsg(@) > if (!defined $logfile) > { > my $oldumask = umask(002); > - if (open($logfile, ">>", "$LogDir/log")) > - { > - # Flush after each print > - my $tmp=select($logfile); > - $| = 1; > - select($tmp); > - } > - else > + if (!open($logfile, ">>", "$LogDir/log")) > { > require File::Basename; > print STDERR File::Basename::basename($0), ":warning: could not > open '$LogDir/log' for writing: $!\n"; > - $logfile = undef; > + open($logfile, ">>&=", 2); > } > umask($oldumask); > + > + # Flush after each print > + my $tmp=select($logfile); > + $| = 1; > + select($tmp); > } > print $logfile scalar localtime, " ", @_ if ($logfile); > } > -- > 1.7.10.4 > > > >

4 10

Re: [PATCH 3/3] mshtml: Added more ActiveX loading and script binding tests
by Marvin 17 Oct '12

17 Oct '12

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=22282 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Tr : d3dx9_36 [patch 1/3]: Fix the case out = in for D3DXSHRotateZ
by Nozomi Kodama 17 Oct '12

17 Oct '12

Hi Both your patch and mine fail to pass the attached tests. More thoughts are needed. Nozomi >Hi Nozomi, > >the huge arrays, the loop, it looks a bit ugly. Your implementation makes the D3DXSHRotateZ function a >bit more compatible. What comes into my mind is: >D3DXSHRotateZ(out, y, 1,25f, in); >D3DXSHRotateZ(out, y, 1,25f, out); >D3DXSHRotateZ(out, y, 1,25f, &out[x]); // x ... 1 - y * y >D3DXSHRotateZ(&out[x], y, 1,25f, out); // x ... 1 - y * y > >Do the last 2 also work and are they producing the same values as native? > >Attached is a simple hack to succeed your test, it has some major stuff which needs to be fixed first, but >nevertheless, please have a look. I think the implementation could be a lot smaller and faster. What do you >think? I'd like to hear your opinion, before you try to send a patch. > >+FLOAT * WINAPI D3DXSHRotateZ(FLOAT *out, UINT order, FLOAT angle, CONST FLOAT *in) >There is a double space after "order,". > >Cheers >Rico

1 0

Re: [PATCH 5/5] ddraw/tests: Add some display mode set / restore tests with multiple ddraw objects.
by Marvin 16 Oct '12

16 Oct '12

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=22275 Your paranoid android. === WNT4WSSP6 (32 bit ddraw2) === ddraw2.c:2526: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2543: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2551: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2553: Test failed: Got unexpected screen width 800. ddraw2.c:2555: Test failed: Got unexpected screen height 600. ddraw2.c:2574: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2582: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2584: Test failed: Got unexpected screen width 800. ddraw2.c:2586: Test failed: Got unexpected screen height 600. ddraw2.c:2606: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2608: Test failed: Got unexpected screen width 800. ddraw2.c:2610: Test failed: Got unexpected screen height 600. ddraw2.c:2615: Test failed: Got unexpected screen width 800. ddraw2.c:2617: Test failed: Got unexpected screen height 600. ddraw2.c:2630: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2638: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw2.c:2640: Test failed: Got unexpected screen width 800. ddraw2.c:2642: Test failed: Got unexpected screen height 600. ddraw2.c:2650: Test failed: Got unexpected screen width 800. ddraw2.c:2652: Test failed: Got unexpected screen height 600. ddraw2.c:2664: Test failed: SetDipslayMode failed, hr 0x887600e1. === WNT4WSSP6 (32 bit ddraw1) === ddraw1.c:2389: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2406: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2414: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2416: Test failed: Got unexpected screen width 800. ddraw1.c:2418: Test failed: Got unexpected screen height 600. ddraw1.c:2437: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2445: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2447: Test failed: Got unexpected screen width 800. ddraw1.c:2449: Test failed: Got unexpected screen height 600. ddraw1.c:2469: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2471: Test failed: Got unexpected screen width 800. ddraw1.c:2473: Test failed: Got unexpected screen height 600. ddraw1.c:2478: Test failed: Got unexpected screen width 800. ddraw1.c:2480: Test failed: Got unexpected screen height 600. ddraw1.c:2493: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2501: Test failed: SetDipslayMode failed, hr 0x887600e1. ddraw1.c:2503: Test failed: Got unexpected screen width 800. ddraw1.c:2505: Test failed: Got unexpected screen height 600. ddraw1.c:2513: Test failed: Got unexpected screen width 800. ddraw1.c:2515: Test failed: Got unexpected screen height 600. ddraw1.c:2527: Test failed: SetDipslayMode failed, hr 0x887600e1.

1 0

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Henri Verbeet 16 Oct '12

16 Oct '12

On 16 October 2012 20:12, Christian Costa <titan.costa(a)gmail.com> wrote: > + //SetWindowPos(wnd, NULL, 0, 0, rect.right / 2, rect.bottom / 2, 0); C99 comment. I don't think these are very interesting cases though, it's probably more interesting what happens with e.g. a destroyed window, or a fullscreen window.

3 3

Re: [PATCH] user32: Add tests showing that MapWindowPoints, ClientToScreen and ScreenToClient never fail.
by Austin English 16 Oct '12

16 Oct '12

On Tue, Oct 16, 2012 at 11:12 AM, Christian Costa <titan.costa(a)gmail.com> wrote: ... > + wnd = CreateWindowA("static", NULL, 0, 0, 0, rect.right / 2, rect.bottom / 2, 0, 0, 0, 0); > + //SetWindowPos(wnd, NULL, 0, 0, rect.right / 2, rect.bottom / 2, 0); Leftover debug code. Cheers, Austin

2 1

Re: programs/winemenubuilder: scale 64x64 classic icons to 48x48 for Mac OS/X
by Alexandre Julliard 16 Oct '12

16 Oct '12

Aric Stewart <aric(a)codeweavers.com> writes: > @@ -403,6 +404,13 @@ static HRESULT convert_to_native_icon(IStream *icoFile, int *indices, int numInd > WINE_ERR("error 0x%08X creating IWICBitmapDecoder\n", hr); > goto end; > } > +#ifdef __APPLE__ > + hr = IWICImagingFactory_CreateBitmapScaler(factory, &scaler); > + if (FAILED(hr)) > + { > + WINE_WARN("error 0x%08X creating IWICBitmapScaler\n", hr); > + } > +#endif Please try to do that without adding #ifdefs in generic functions. -- Alexandre Julliard julliard(a)winehq.org

2 2

Re: [PATCH] cmd: Properly handle multibyte characters in batch files.
by Alexandre Julliard 16 Oct '12

16 Oct '12

Akihiro Sagawa <sagawa.aki(a)gmail.com> writes: > @@ -244,7 +244,8 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) > > if (!WCMD_is_console_handle(h) && i != charsRead) { > /* Sets file pointer to the start of the next line, if any */ > - filepos.QuadPart += i + 1 + (buf[i] == '\r' ? 1 : 0); > + INT bytes = WideCharToMultiByte(GetConsoleCP(), 0, buf, i, NULL, 0, NULL, NULL); > + filepos.QuadPart += bytes + 1 + (buf[i] == '\r' ? 1 : 0); There's no guarantee that all characters would round-trip properly, this should be based on the original multibyte length somehow. -- Alexandre Julliard julliard(a)winehq.org

1 0

user32 tests patch
by Christian Costa 16 Oct '12

16 Oct '12

Forget my user32 patch. MapWindowPoints tests are wrong.

1 0

Re: [PATCH 2/6] d3dcompiler: Improve a Nvidia GPU recognition fallback.
by Matteo Bruni 16 Oct '12

16 Oct '12

Ehh, this patch should have been called something like "wined3d: Improve a Nvidia GPU recognition fallback.", but well...

1 0

Re: [PATCH 7/8] mshtml: Added IHTMLScriptElement::put_src tests
by Marvin 16 Oct '12

16 Oct '12

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=22264 Your paranoid android. === 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: dwrite: Implement GetMetrics() for IDWriteFont
by Dmitry Timoshkov 16 Oct '12

16 Oct '12

Nikolay Sivov <nsivov(a)codeweavers.com> wrote: > + static const WCHAR arialW[] = {'A','r','i','a','l',0}; Please don't use fonts which Wine doesn't provide. Testing Tahoma is fine. -- Dmitry.

2 1

Re: [PATCH] user32: Don't ignore return value of MapWindowPoints
by Nikolay Sivov 16 Oct '12

16 Oct '12

On 10/16/2012 04:10, danielfsantos(a)att.net wrote: > ScreenToClient should return zero if the operation fails, but is always > returning TRUE. This patch corrects the problem and solves a crash bug > in Lord of the Rings Online (bug #31979) > > Credit for this patch goes to some one else, as yet unidentified, since > it originally came from a closed forum for beta testers of the LoTRO > Riders of Rohan expansion and the forum has subsequently been wiped. > --- > dlls/user32/winpos.c | 3 +-- > 1 files changed, 1 insertions(+), 2 deletions(-) > > diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c > index 5a2f1f2..3855b19 100644 > --- a/dlls/user32/winpos.c > +++ b/dlls/user32/winpos.c > @@ -250,8 +250,7 @@ BOOL WINAPI ClientToScreen( HWND hwnd, LPPOINT lppnt ) > */ > BOOL WINAPI ScreenToClient( HWND hwnd, LPPOINT lppnt ) > { > - MapWindowPoints( 0, hwnd, lppnt, 1 ); > - return TRUE; > + return MapWindowPoints( 0, hwnd, lppnt, 1 ) != 0; > } > This needs a test.

1 0

Re: [3/4] comctl32: fix notifications and return value when collapsing already collapsed node (rebased)
by Nikolay Sivov 15 Oct '12

15 Oct '12

Hi, Daniel. You forgot a patch.

2 1

Re: jscript: Move 'inline' to the beginning of the declaration.
by Francois Gouget 15 Oct '12

15 Oct '12

On Mon, 15 Oct 2012, Michael Stefaniuc wrote: [...] > --- a/dlls/jscript/jsstr.h > +++ b/dlls/jscript/jsstr.h > @@ -28,7 +28,7 @@ struct _jsstr_t { > > #define JSSTR_FLAG_NULLBSTR 1 > > -static unsigned inline jsstr_length(jsstr_t *str) > +inline static unsigned jsstr_length(jsstr_t *str) 'static inline' is the more common format in Wine (4166 occurences versus 0 for 'inline static'). But yes, moving it before the return type makes sense. -- Francois Gouget <fgouget(a)free.fr> http://fgouget.free.fr/ Any sufficiently advanced bug is indistinguishable from a feature. -- from some indian guy

1 0

Re: [2/4] comctl32: do not send TVN_ITEMEXPANDING when expanding item with no children
by Alexandre Julliard 15 Oct '12

15 Oct '12

Daniel Jelinski <djelinski1(a)gmail.com> writes: > From 4ce8e5ea93897e03e1c3bbd0be90c9179890a37a Mon Sep 17 00:00:00 2001 > From: Daniel Jelinski <djelinski1(a)gmail.com> > Date: Thu, 27 Sep 2012 21:06:48 +0200 > Subject: comctl32/treeview: do not send TVN_ITEMEXPANDING when expanding item > with no children > > also, send it when re-expanding expanded item or re-collapsing collapsed one. > Tests in later commit (look for VK_ADD/VK_SUBSTRACT) This causes the explorerframe tests to hang. -- Alexandre Julliard julliard(a)winehq.org

1 0

d3d9 implementation
by Luchezar Belev 15 Oct '12

15 Oct '12

hello i have been writing some d3d9/d3d8 implementation on top of opengl as a pet project i mainly work on it under windows, but also made it run under wine. i thought you guys might find it interesting to try it out. It works fine with all the games i got - there are no major problems. they are guild wars (1), wow, league of legends, tomb raider underworld, titan quest, skyrim. it requires opengl 3.3 or higher. attached is zip archive with binaries (2 files) and a readme. (i'm not sure i want to give away the sources yet.)

2 1

Re: [PATCH] d3d9/tests: Do not crash, when CreateTexture failed
by Henri Verbeet 15 Oct '12

15 Oct '12

On 14 October 2012 01:12, Detlef Riekenberg <wine.dev(a)web.de> wrote: > Needed to avoid a crash on an Intel integrated graphics. > http://test.winehq.org/data/ee59341721b90e58165a7bb12cbf2906fbd680d1/xp_dr-… > It should probably use CheckDeviceFormat() before even creating the device.

1 0

Re: vbscript: Added Chr implementation
by Marvin 15 Oct '12

15 Oct '12

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=22203 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: [PATCH 1/1] include/basetsd.h: fix bad casting
by Dan Kegel 15 Oct '12

15 Oct '12

In general, patches to wine should have some demonstrated benefit, either by increasing the number of passing conformance tests, or by making some app work better, or both. Your current patch doesn't seem to do either of these things. Getting into a pissing match with AJ about patent and copyright law is not a good strategy for potential contributors to wine. He generally knows his stuff, and I think he's right in this case. If I were you, I'd go off and reflect for a while, then pick some other way to contribute.

3 4

Re: ole32/tests: Add tests for IRunnableObject_Run call.
by Dmitry Timoshkov 15 Oct '12

15 Oct '12

Roman Dadkov <romand(a)etersoft.ru> wrote: > + hr = CLSIDFromProgID(WordApp, &clsid); > + if (SUCCEEDED(hr)) > + { > + hr = CoCreateInstance(&clsid, NULL, CLSCTX_ALL, &IID_IUnknown, (void **)&pUnknown); > + ok_ole_success(hr, "CoCreateInstance"); > + > + hr = IUnknown_QueryInterface(pUnknown, &IID_IRunnableObject, (void**)&pRunnableObject); > + ok_ole_success(hr, "IUnknown_QueryInterface"); > + if (FAILED(hr)) Shouldn't 'SUCCEEDED(hr)' be used here instead? > + { > + hr = IRunnableObject_Run(pRunnableObject, NULL); > + ok_ole_success(hr, "IRunnableObject_Run"); > + } > + } Probably you should add Release() calls where appropriate. -- Dmitry.

1 0

Fwd: Re: [PATCH 1/1] include/basetsd.h: fix bad casting
by Max TenEyck Woodbury 13 Oct '12

13 Oct '12

On 10/12/2012 10:25 PM, Dan Kegel wrote: > Hi Max, > here's a little test program that shows that your patch changes how > UIntToPtr works: > > #include <stdio.h> > #include <stdint.h> > > #define UIntToPtrA(i) ((void *)(intptr_t)((unsigned int)i)) > #define UIntToPtrB(i) ((void *)(intptr_t)(i)) > > int main(int argc, char **argv) > { > short x = 65534; > printf("%d -> %p\n", x, UIntToPtrA(x)); > printf("%d -> %p\n", x, UIntToPtrB(x)); > return 0; > } > > On a 64 bit machine, this outputs > > -2 -> 0xfffffffe > -2 -> 0xfffffffffffffffe > > This could change the behavior of functions that call UIntToPtr, like > say EnumResourceTypesA(). > > I would suggest writing a conformance test to expose whether the > change brings Wine closer to native behavior, or further away, adding > that to your patch, and then verifying with winetestbot that the patch > improves wine's conformance. > > My guess is that the current behavior is right, but hey, the test will > show what's really up. > - Dan > I 'greped' the entire wine tree for uses of these macros. There was only a couple places where the argument was an expression and in those cases I did not see that the change would cause problems. Frankly, I do not think I could come up with a test where the change would make a difference. I am submitting the patch against the weird possibility that such a case does exist. The change is strictly preventative maintenance with just a hint of aesthetic improvement to make them coordinate with the 'Handle' variants of these macros. Now, if you are going to tell me that these definitions were *copied* from a Microsoft *source* rather than derived from a Microsoft specification, you would have a point, but then there would be a whole bunch of copyright issues that would need to be worked through.

2 2

Fwd: Re: [PATCH 1/1] include/basetsd.h: fix bad casting
by Max TenEyck Woodbury 13 Oct '12

13 Oct '12

On 10/12/2012 09:49 PM, Dmitry Timoshkov wrote: > Max TenEyck Woodbury <max(a)mtew.isa-geek.net> wrote: > >>>> -#define IntToPtr(i) ((void *)(INT_PTR)((INT)i)) >>>> -#define UIntToPtr(ui) ((void *)(UINT_PTR)((UINT)ui)) >>>> -#define LongToPtr(l) ((void *)(LONG_PTR)((LONG)l)) >>>> -#define ULongToPtr(ul) ((void *)(ULONG_PTR)((ULONG)ul)) >>>> +#define IntToPtr(i) ((void *)(INT_PTR)(i)) >>>> +#define UIntToPtr(ui) ((void *)(UINT_PTR)(ui)) >>>> +#define LongToPtr(l) ((void *)(LONG_PTR)(l)) >>>> +#define ULongToPtr(ul) ((void *)(ULONG_PTR)(ul)) >>> >>> You forgot to explain what's bad with it. >>> >> >> The original applied the extra conversion to ONLY THE FIRST >> component of the expression, not to the WHOLE expression. That >> can (although it's not likely to) cause hard to diagnose problems. > > What 'the first component' are you talking about? This code is win32 only. > 'i', 'ui', 'l' and 'ul' are parameters to the macros, When the macros are used, you put in an expression as the argument to the macro. As originally written for example, the cast to LONG in ((LONG)l) is applied to only the first component of the expression substituted in place of 'l'. In order to get the cast to apply to the whole expression, you need parenthesis around the parameter. That is literally (l). Then the cast applies to the whole expression. That is (LONG_PTR)(l) casts the entire expression substituted into 'l' to a LONG_PTR value. The macros that convert to 'Handle' rather than 'Ptr' do this properly. In the vast majority of cases the expression substituted into 'l' is a simple variable and there is no problem. In almost all of the remaining cases, casting the first element of the expression coerces the rest of the expression to the proper type. In rare cases, other elements of the expression might force the expression's value to some other type. In most of those cases the cast to LONG_PTR fixes the problem. In a really odd case there might be a problem caused by the extra cast to LONG. Since that cast is buried in a macro definition, it will be difficult to spot that cast as the source of such a problem from the source code. The original definitions include three casts in sequence. The first of those casts is done improperly. Even if it were done properly, the next cast in the sequence makes it redundant. I removed the improper cast since it IS redundant. NUFF SAID?

1 0

Re: [PATCH 1/1] include/basetsd.h: fix bad casting
by Dmitry Timoshkov 13 Oct '12

13 Oct '12

Max TenEyck Woodbury <max(a)mtew.isa-geek.net> wrote: > -#define IntToPtr(i) ((void *)(INT_PTR)((INT)i)) > -#define UIntToPtr(ui) ((void *)(UINT_PTR)((UINT)ui)) > -#define LongToPtr(l) ((void *)(LONG_PTR)((LONG)l)) > -#define ULongToPtr(ul) ((void *)(ULONG_PTR)((ULONG)ul)) > +#define IntToPtr(i) ((void *)(INT_PTR)(i)) > +#define UIntToPtr(ui) ((void *)(UINT_PTR)(ui)) > +#define LongToPtr(l) ((void *)(LONG_PTR)(l)) > +#define ULongToPtr(ul) ((void *)(ULONG_PTR)(ul)) You forgot to explain what's bad with it. -- Dmitry.

3 3

Re: [PATCH] regedit: err() on printing
by Dmitry Timoshkov 12 Oct '12

12 Oct '12

Marcus Meissner <meissner(a)suse.de> wrote: > + ERR("printing is not yet implemented.\n"); Printing a FIXME seems more appropriate. -- Dmitry.

2 1

Re: TestBot job 22150 results: [2/3] dwrite: Implement GetWeight() for IDWriteFont
by Nikolay Sivov 12 Oct '12

12 Oct '12

This is caused by previously committed patches while testbot was resting, I'll fix these failures after today series gets in if it's okay.

1 0

Re: [PATCH 4/6] include: Added definitions used by OpenFileById. (try 2)
by Dmitry Timoshkov 12 Oct '12

12 Oct '12

"Vincas Miliūnas" <vincas.miliunas(a)gmail.com> wrote: > * Renamed DUMMYUNIONNAME to u. ... > +typedef struct _FILE_ID_DESCRIPTOR { > + DWORD dwSize; > + FILE_ID_TYPE Type; > + union { > + LARGE_INTEGER FileId; > + GUID ObjectId; > + } u; > +} FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; This change is clearly wrong. -- Dmitry.

3 5

Re: [PATCH 1/4] jscript: Use custom string container instead of BSTR.
by Charles Davis 12 Oct '12

12 Oct '12

On Oct 11, 2012, at 4:16 AM, Jacek Caban wrote: > This patch alone makes SunSpider 0.9 17x faster. Seems to me that something is really wrong with our BSTR implementation if replacing it with a home-grown implementation speeds this up by a factor of 17. Chip

2 1

Re: [1/3] scrrun: Implement IDictionary_Add and Count (try 2)
by Henri Verbeet 12 Oct '12

12 Oct '12

On 9 October 2012 11:26, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > Changelog: > scrrun: Implement IDictionary_Add and Count > Actually, does it ever make sense to use a linked list at all to implement a dictionary? It seems to me that if you only ever have a handful of entries a simple array would be better suited, while if you have more than that you'd want some kind of search tree or a hash table.

3 2

Fwd: [1/3] scrrun: Implement IDictionary_Add and Count (try 2)
by Per Johansson 12 Oct '12

12 Oct '12

On Fri, Oct 12, 2012 at 8:48 AM, Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> wrote: > I will have a look at some sort of hash table. > I'd use wine existing tree implementation, unless there's some specific reason to use a hash table. Hash tables are good in theory but with in practice trees are just as effective in my experience (especially AVL trees). Regards, -- Per Johansson

1 0

Re: [PATCH] amstream: Display new ref in AddRef and Release.
by Nikolay Sivov 12 Oct '12

12 Oct '12

On 10/12/2012 00:46, Christian Costa wrote: > --- > dlls/amstream/mediastreamfilter.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) > > diff --git a/dlls/amstream/mediastreamfilter.c b/dlls/amstream/mediastreamfilter.c > index ee9d970..0e56a68 100644 > --- a/dlls/amstream/mediastreamfilter.c > +++ b/dlls/amstream/mediastreamfilter.c > @@ -133,17 +133,21 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i > > static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface) > { > - return BaseFilterImpl_AddRef((IBaseFilter*)iface); > + ULONG ref = BaseFilterImpl_AddRef((IBaseFilter*)iface); > + > + TRACE("(%p)->(): new ref = %u\n", iface, ref); > + > + return ref; > } You should get rid of casts like that. Also I don't see a reason to print anything but refcount itself life (%p)->(%u). > > static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) > { > IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); > - ULONG refCount = BaseFilterImpl_Release((IBaseFilter*)iface); > + ULONG ref = BaseFilterImpl_Release((IBaseFilter*)iface); > > - TRACE("(%p)->() Release from %d\n", iface, refCount + 1); > + TRACE("(%p)->(): new ref = %u\n", iface, ref); > > - if (!refCount) > + if (!ref) > { > int i; > for (i = 0; i < This->nb_streams; i++) > @@ -154,7 +158,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) > HeapFree(GetProcessHeap(), 0, This); > } > > - return refCount; > + return ref; > } > > /*** IPersist methods ***/ > > > >

2 1

Re: [PATCH] amstream: Check params in IAMMultiMediaStreamImpl_OpenFile.
by Nikolay Sivov 12 Oct '12

12 Oct '12

On 10/12/2012 00:59, Christian Costa wrote: > --- > dlls/amstream/amstream.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > > - TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(pszFileName), dwFlags); > + TRACE("(%p/%p)->(%s,%x)\n", This, iface, debugstr_w(filename), flags); > + > + if (!filename) > + return E_POINTER; > + > + if (flags & ~(AMMSF_NOCLOCK | AMMSF_NORENDER | AMMSF_RENDERALLSTREAMS | AMMSF_RENDERTOEXISTING | AMMSF_RUN)) > + return E_INVALIDARG; This needs tests.

1 0

Re: [1/3] cmd/tests: Show name of current test file on standard output
by Alexandre Julliard 11 Oct '12

11 Oct '12

Frédéric Delanoy <frederic.delanoy(a)gmail.com> writes: > When there are several test files, indicates which file error line numbers relate to, making > "debugging" easier. That's what trace() is for. -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: gdi32: use HandleToULong inline function to convert handle to index instead of casting
by Dmitry Timoshkov 11 Oct '12

11 Oct '12

Daniel Lehman <dlehman(a)esri.com> wrote: > 0xffffffff000026a8 becomes 0xc00009aa instead of just 0x9aa It can't, the code explicitly casts handle to unsigned before the shift. -- Dmitry.

3 2

Re: [2/2] shlwapi/tests: Add more PathCreateFromUrl() tests.
by Marvin 11 Oct '12

11 Oct '12

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=22127 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [PATCH 1/4] jscript: Use custom string container instead of BSTR.
by Henri Verbeet 11 Oct '12

11 Oct '12

On 11 October 2012 12:16, Jacek Caban <jacek(a)codeweavers.com> wrote: > > +struct _jsstr_t { > + unsigned length_flags; > + unsigned ref; > + WCHAR str[1]; > +}; It's probably much too late for jscript, and perhaps Wine in general, but strictly speaking the _t suffix is reserved by POSIX.

2 1

Re: [PATCH 5/6] mshtml: Added createStyleSheet and get_styleSheet tests
by Marvin 11 Oct '12

11 Oct '12

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=22123 Your paranoid android. === WVISTAADM (32 bit dom) === Failure running script in VM: The specified guest user must be logged in interactively to perform this operation

1 0

Re: msvcp90: fix parsing in num_get<>::_Getifld
by Piotr Caban 11 Oct '12

11 Oct '12

On 10/11/12 00:27, Daniel Lehman wrote: - if(!base && first->strbuf && first->val==digits[0]) { + if(first->strbuf && first->val==digits[0]) { + found_zero = TRUE; istreambuf_iterator_wchar_inc(first); if(first->strbuf && (first->val==mb_to_wc('x', &this->cvt) || first->val==mb_to_wc('x', &this->cvt))) { There's a comparision to 'x' 2 times, one of them should be 'X'. Cheers, Piotr

1 0

Re: [PATCH 17/25] winmm/tests: Add initial set of MCI MIDI tests (incl. DeleteFile)
by Marvin 11 Oct '12

11 Oct '12

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=22026 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

2 1

Re: [PATCH 4/4] mshtml: Added IHTMLDocument::get_charset implementation
by Marvin 11 Oct '12

11 Oct '12

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=22114 Your paranoid android. === WINEBUILD (build) === Patch failed to apply

1 0

Re: [1/2] dinput/tests: Test for DIPROP_INSTANCENAME and DIPROP_GUIDANDPATH
by Marvin 11 Oct '12

11 Oct '12

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=22112 Your paranoid android. === WINEBUILD (build) === Make failed

1 0

Re: wined3d: recognize Radeon HD 6670
by Henri Verbeet 11 Oct '12

11 Oct '12

On 5 October 2012 22:12, Austin English <austinenglish(a)gmail.com> wrote: > Fixes http://bugs.winehq.org/show_bug.cgi?id=31891 > That doesn't look right (and doesn't do what you think it does anyway), did you verify this against the Windows driver? It probably just needs an entry to map "HD 6670" to CARD_AMD_RADEON_HD6600, although it's a bit curious that most of the existing entries for NI have generic strings like "HD 6600".

2 1

Re: shell32: Standardize on the ShellExecuteEx() terminology.
by Marvin 11 Oct '12

11 Oct '12

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=22104 Your paranoid android. === WNT4WSSP6 (32 bit shlexec) === shlexec.c:1420: Test failed: ShellExecuteEx(mask="0x200", verb="Params23456", file="C:\TEMP\wt1.tmp\test file.shlexec", params="p2 "p3" "p4 is lost"): the cmdline is ' "p2" "p3" "p3" "" ""' instead of ' "p2" "p3" "" "" ""' === W2KPROSP4 (32 bit shlexec) === shlexec.c:1420: Test failed: ShellExecuteEx(mask="0x200", verb="Params23456", file="C:\DOCUME~1\winetest\LOCALS~1\Temp\wt1.tmp\test file.shlexec", params="p2 "p3" "p4 is lost"): the cmdline is ' "p2" "p3" "p3" "" ""' instead of ' "p2" "p3" "" "" ""'

1 0

Re: shell32/tests: Test ShellExecute()'s URL handling.
by Marvin 11 Oct '12

11 Oct '12

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=22103 Your paranoid android. === WNT4WSSP6 (32 bit shlexec) === shlexec.c:1438: Test failed: ShellExecuteEx(mask="0x200", verb="Params23456", file="C:\TEMP\wt1.tmp\test file.shlexec", params="p2 "p3" "p4 is lost"): the cmdline is ' "p2" "p3" "p3" "" ""' instead of ' "p2" "p3" "" "" ""' shlexec.c:1790: Test failed: ShellExecute(file="notaproto://foo") succeeded: rc=2 shlexec.c:1793: Test failed: ShellExecute(file="fakeproto://foo/bar") expected SE_ERR_ACCESSDENIED got rc=2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:152: Test failed: ShellExecute(file="shlproto://foo/bar.lnk") Got different return value with empty string: 42 2 shlexec.c:1822: Test failed: argvA4 expected 'shlproto://C:\TEMP\wt1.tmp/bar', got 'shlproto://%TMPDIR%/bar' shlexec.c:137: Test failed: ShellExecute(file="file://shlproto://foo/bar") WaitForSingleObject returned 258 shlexec.c:152: Test failed: ShellExecute(file="file://shlproto://foo/bar") Got different return value with empty string: 42 2 shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=42 === W2KPROSP4 (32 bit shlexec) === shlexec.c:1438: Test failed: ShellExecuteEx(mask="0x200", verb="Params23456", file="C:\DOCUME~1\winetest\LOCALS~1\Temp\wt1.tmp\test file.shlexec", params="p2 "p3" "p4 is lost"): the cmdline is ' "p2" "p3" "p3" "" ""' instead of ' "p2" "p3" "" "" ""' shlexec.c:1822: Test failed: argvA4 expected 'shlproto://C:\DOCUME~1\winetest\LOCALS~1\Temp\wt1.tmp/bar', got 'shlproto://%TMPDIR%/bar' shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=5 === WVISTAADM (32 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W2K8SE (32 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PRO (32 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (32 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (32 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === W7PROX64 (64 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2 === TEST64_W7SP1 (64 bit shlexec) === shlexec.c:1833: Test failed: ShellExecute(file="file://shlproto://foo/bar") succeeded: rc=2

1 0

Re: vbscript: Fixed tests on some non-English configs (without '.' as decimal point)
by Marvin 11 Oct '12

11 Oct '12

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=22091 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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel