April 2012 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetStreamSource ().
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 9936ec0c1c0bb9facae4008be2c6f1c99b138857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9936ec0c1c0bb9facae4008be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:03 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetStreamSource(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index e497ce7..3d8642d 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2492,6 +2492,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(IDirect3DDevice9Ex *i { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_buffer *retStream = NULL; + IDirect3DVertexBuffer9Impl *buffer_impl; HRESULT hr; TRACE("iface %p, stream_idx %u, buffer %p, offset %p, stride %p.\n", @@ -2505,7 +2506,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetStreamSource(IDirect3DDevice9Ex *i hr = wined3d_device_get_stream_source(This->wined3d_device, StreamNumber, &retStream, OffsetInBytes, pStride); if (SUCCEEDED(hr) && retStream) { - *pStream = wined3d_buffer_get_parent(retStream); + buffer_impl = wined3d_buffer_get_parent(retStream); + *pStream = &buffer_impl->IDirect3DVertexBuffer9_iface; IDirect3DVertexBuffer9_AddRef(*pStream); wined3d_buffer_decref(retStream); }

1 0

Hans Leidekker : fusion: Add locking around operations on the assembly cache.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 93f292506c4fefa126474ad323362e2bc9bfd3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f292506c4fefa126474ad32… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 30 09:34:15 2012 +0200 fusion: Add locking around operations on the assembly cache. --- dlls/fusion/asmcache.c | 56 ++++++++++++++++++++++++++++++++++++------------ 1 files changed, 42 insertions(+), 14 deletions(-) diff --git a/dlls/fusion/asmcache.c b/dlls/fusion/asmcache.c index d0b45c7..e6a2a65 100644 --- a/dlls/fusion/asmcache.c +++ b/dlls/fusion/asmcache.c @@ -41,6 +41,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(fusion); +static const WCHAR cache_mutex_nameW[] = + {'_','_','W','I','N','E','_','F','U','S','I','O','N','_','C','A','C','H','E','_','M','U','T','E','X','_','_',0}; + static BOOL create_full_path(LPCWSTR path) { LPWSTR new_path; @@ -126,6 +129,7 @@ typedef struct { IAssemblyCache IAssemblyCache_iface; LONG ref; + HANDLE lock; } IAssemblyCacheImpl; static inline IAssemblyCacheImpl *impl_from_IAssemblyCache(IAssemblyCache *iface) @@ -166,17 +170,29 @@ static ULONG WINAPI IAssemblyCacheImpl_AddRef(IAssemblyCache *iface) static ULONG WINAPI IAssemblyCacheImpl_Release(IAssemblyCache *iface) { - IAssemblyCacheImpl *This = impl_from_IAssemblyCache(iface); - ULONG refCount = InterlockedDecrement(&This->ref); + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); + ULONG refCount = InterlockedDecrement( &cache->ref ); - TRACE("(%p)->(ref before = %u)\n", This, refCount + 1); + TRACE("(%p)->(ref before = %u)\n", cache, refCount + 1); if (!refCount) - HeapFree(GetProcessHeap(), 0, This); - + { + CloseHandle( cache->lock ); + HeapFree( GetProcessHeap(), 0, cache ); + } return refCount; } +static void cache_lock( IAssemblyCacheImpl *cache ) +{ + WaitForSingleObject( cache->lock, INFINITE ); +} + +static void cache_unlock( IAssemblyCacheImpl *cache ) +{ + ReleaseMutex( cache->lock ); +} + static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface, DWORD dwFlags, LPCWSTR pszAssemblyName, @@ -184,6 +200,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface ULONG *pulDisposition) { HRESULT hr; + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); IAssemblyName *asmname, *next = NULL; IAssemblyEnum *asmenum = NULL; WCHAR *p, *path = NULL; @@ -202,6 +219,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_UninstallAssembly(IAssemblyCache *iface if (FAILED( hr )) return hr; + cache_lock( cache ); + hr = CreateAssemblyEnum( &asmenum, NULL, asmname, ASM_CACHE_GAC, NULL ); if (FAILED( hr )) goto done; @@ -253,6 +272,7 @@ done: if (next) IAssemblyName_Release( next ); if (asmenum) IAssemblyEnum_Release( asmenum ); HeapFree( GetProcessHeap(), 0, path ); + cache_unlock( cache ); return hr; } @@ -261,6 +281,7 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface LPCWSTR pszAssemblyName, ASSEMBLY_INFO *pAsmInfo) { + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); IAssemblyName *asmname, *next = NULL; IAssemblyEnum *asmenum = NULL; HRESULT hr; @@ -281,6 +302,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_QueryAssemblyInfo(IAssemblyCache *iface if (FAILED(hr)) return hr; + cache_lock( cache ); + hr = CreateAssemblyEnum(&asmenum, NULL, asmname, ASM_CACHE_GAC, NULL); if (FAILED(hr)) goto done; @@ -303,7 +326,7 @@ done: IAssemblyName_Release(asmname); if (next) IAssemblyName_Release(next); if (asmenum) IAssemblyEnum_Release(asmenum); - + cache_unlock( cache ); return hr; } @@ -331,9 +354,10 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, LPCWSTR pszManifestFilePath, LPCFUSION_INSTALL_REFERENCE pRefData) { - static const WCHAR format[] = - {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; - + static const WCHAR format[] = {'%','s','\\','%','s','\\','%','s','_','_','%','s','\\',0}; + static const WCHAR ext_exe[] = {'.','e','x','e',0}; + static const WCHAR ext_dll[] = {'.','d','l','l',0}; + IAssemblyCacheImpl *cache = impl_from_IAssemblyCache(iface); ASSEMBLY *assembly; LPWSTR filename; LPWSTR name = NULL; @@ -345,9 +369,6 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, LPWSTR ext; HRESULT hr; - static const WCHAR ext_exe[] = {'.','e','x','e',0}; - static const WCHAR ext_dll[] = {'.','d','l','l',0}; - TRACE("(%p, %d, %s, %p)\n", iface, dwFlags, debugstr_w(pszManifestFilePath), pRefData); @@ -382,6 +403,8 @@ static HRESULT WINAPI IAssemblyCacheImpl_InstallAssembly(IAssemblyCache *iface, if (FAILED(hr)) goto done; + cache_lock( cache ); + get_assembly_directory(asmdir, MAX_PATH, assembly_get_architecture(assembly)); sprintfW(path, format, asmdir, name, version, token); @@ -404,6 +427,7 @@ done: HeapFree(GetProcessHeap(), 0, version); HeapFree(GetProcessHeap(), 0, asmpath); assembly_release(assembly); + cache_unlock( cache ); return hr; } @@ -438,9 +462,13 @@ HRESULT WINAPI CreateAssemblyCache(IAssemblyCache **ppAsmCache, DWORD dwReserved cache->IAssemblyCache_iface.lpVtbl = &AssemblyCacheVtbl; cache->ref = 1; - + cache->lock = CreateMutexW( NULL, FALSE, cache_mutex_nameW ); + if (!cache->lock) + { + HeapFree( GetProcessHeap(), 0, cache ); + return HRESULT_FROM_WIN32( GetLastError() ); + } *ppAsmCache = &cache->IAssemblyCache_iface; - return S_OK; }

1 0

Henri Verbeet : d3dx9: Add a FIXME for unsupported filter types to D3DXLoadSurfaceFromMemory().
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: c8ae37a9a936d9872960f3fa0eff6daccc470e5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8ae37a9a936d9872960f3fa0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:06 2012 +0200 d3dx9: Add a FIXME for unsupported filter types to D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 78a48f8..65b6059 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1039,6 +1039,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, } else /* if ((dwFilter & 0xf) == D3DX_FILTER_POINT) */ { + if ((dwFilter & 0xf) != D3DX_FILTER_POINT) + FIXME("Unhandled filter %#x.\n", dwFilter); + /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ point_filter_simple_data(pSrcMemory, SrcPitch, src_size, srcformatdesc,

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_GetSurfaceLevel( ).
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 605e6b743c3dd4fa00a4ab3a33138e04d7670754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=605e6b743c3dd4fa00a4ab3a3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:04 2012 +0200 d3d9: Properly retrieve an interface pointer in d3d9_texture_2d_GetSurfaceLevel(). --- dlls/d3d9/texture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 7891596..6387e2d 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -326,6 +326,7 @@ static HRESULT WINAPI d3d9_texture_2d_GetSurfaceLevel(IDirect3DTexture9 *iface, { struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface9Impl *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); @@ -336,7 +337,8 @@ static HRESULT WINAPI d3d9_texture_2d_GetSurfaceLevel(IDirect3DTexture9 *iface, return D3DERR_INVALIDCALL; } - *surface = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_resource_get_parent(sub_resource); + *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetIndices( ).
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: c208d973f68360f87d3359037818ad1d7a518506 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c208d973f68360f87d3359037… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:02 2012 +0200 d3d9: Properly retrieve an interface pointer in IDirect3DDevice9Impl_GetIndices(). --- dlls/d3d9/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 987867c..e497ce7 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2575,6 +2575,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(IDirect3DDevice9Ex *iface, { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_buffer *retIndexData = NULL; + IDirect3DIndexBuffer9Impl *buffer_impl; HRESULT hr; TRACE("iface %p, buffer %p.\n", iface, ppIndexData); @@ -2587,7 +2588,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetIndices(IDirect3DDevice9Ex *iface, hr = wined3d_device_get_index_buffer(This->wined3d_device, &retIndexData); if (SUCCEEDED(hr) && retIndexData) { - *ppIndexData = wined3d_buffer_get_parent(retIndexData); + buffer_impl = wined3d_buffer_get_parent(retIndexData); + *ppIndexData = &buffer_impl->IDirect3DIndexBuffer9_iface; IDirect3DIndexBuffer9_AddRef(*ppIndexData); wined3d_buffer_decref(retIndexData); }

1 0

Francois Gouget : iphlpapi/tests: Fix compilation on systems that don' t support nameless unions.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: e0212511fcc16601921eff2afcb3771c8786a538 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0212511fcc16601921eff2af… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun Apr 29 11:34:20 2012 +0200 iphlpapi/tests: Fix compilation on systems that don't support nameless unions. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 7ab5cff..002f30f 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -605,7 +605,7 @@ static void testSetTcpEntry(void) ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_INVALID_PARAMETER, "got %u, expected %u\n", ret, ERROR_INVALID_PARAMETER); - row.dwState = MIB_TCP_STATE_DELETE_TCB; + U(row).dwState = MIB_TCP_STATE_DELETE_TCB; ret = pSetTcpEntry(&row); todo_wine ok( ret == ERROR_MR_MID_NOT_FOUND || broken(ret == ERROR_INVALID_PARAMETER), "got %u, expected %u\n", ret, ERROR_MR_MID_NOT_FOUND);

1 0

Jacek Caban : oleaut32: Added BSTR cache implementation.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: d53bdeca62b42b881347f7faf58932377635b3ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=d53bdeca62b42b881347f7faf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 27 17:34:28 2012 +0200 oleaut32: Added BSTR cache implementation. --- dlls/oleaut32/oleaut.c | 233 +++++++++++++++++++++++++----------------------- 1 files changed, 122 insertions(+), 111 deletions(-) diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c index 0586e15..8cbc819 100644 --- a/dlls/oleaut32/oleaut.c +++ b/dlls/oleaut32/oleaut.c @@ -42,8 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); -static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ - /****************************************************************************** * BSTR {OLEAUT32} * @@ -71,6 +69,70 @@ static BOOL BSTR_bCache = TRUE; /* Cache allocations to minimise alloc calls? */ * 'Inside OLE, second edition' by Kraig Brockshmidt. */ +static BOOL bstr_cache_enabled; + +static CRITICAL_SECTION cs_bstr_cache; +static CRITICAL_SECTION_DEBUG cs_bstr_cache_dbg = +{ + 0, 0, &cs_bstr_cache, + { &cs_bstr_cache_dbg.ProcessLocksList, &cs_bstr_cache_dbg.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": bstr_cache") } +}; +static CRITICAL_SECTION cs_bstr_cache = { &cs_bstr_cache_dbg, -1, 0, 0, 0, 0 }; + +typedef struct { + unsigned short head; + unsigned short cnt; + DWORD *buf[6]; +} bstr_cache_entry_t; + +#define BUCKET_SIZE 16 + +static bstr_cache_entry_t bstr_cache[0x10000/BUCKET_SIZE]; + +static inline size_t bstr_alloc_size(size_t size) +{ + return (size+sizeof(DWORD)+BUCKET_SIZE) & ~(BUCKET_SIZE-1); +} + +static inline bstr_cache_entry_t *get_cache_entry(size_t size) +{ + unsigned cache_idx = (size+sizeof(DWORD)-1)/BUCKET_SIZE; + return bstr_cache_enabled && cache_idx < sizeof(bstr_cache)/sizeof(*bstr_cache) + ? bstr_cache + cache_idx + : NULL; +} + +static DWORD *alloc_bstr(size_t size) +{ + bstr_cache_entry_t *cache_entry = get_cache_entry(size); + + if(cache_entry) { + DWORD *ret = NULL; + + EnterCriticalSection(&cs_bstr_cache); + + if(!cache_entry->cnt) { + cache_entry = get_cache_entry(size+BUCKET_SIZE); + if(cache_entry && !cache_entry->cnt) + cache_entry = NULL; + } + + if(cache_entry) { + ret = cache_entry->buf[cache_entry->head++]; + cache_entry->head %= sizeof(cache_entry->buf)/sizeof(*cache_entry->buf); + cache_entry->cnt--; + } + + LeaveCriticalSection(&cs_bstr_cache); + + if(ret) + return ret; + } + + return HeapAlloc(GetProcessHeap(), 0, bstr_alloc_size(size)); +} + /****************************************************************************** * SysStringLen [OLEAUT32.7] * @@ -177,24 +239,28 @@ BSTR WINAPI SysAllocString(LPCOLESTR str) */ void WINAPI SysFreeString(BSTR str) { - DWORD* bufferPointer; + bstr_cache_entry_t *cache_entry; + DWORD *ptr; - /* NULL is a valid parameter */ - if(!str) return; + if(!str) + return; - /* - * We have to be careful when we free a BSTR pointer, it points to - * the beginning of the string but it skips the byte count contained - * before the string. - */ - bufferPointer = (DWORD*)str; + ptr = (DWORD*)str-1; + cache_entry = get_cache_entry(*ptr+sizeof(WCHAR)); + if(cache_entry) { + EnterCriticalSection(&cs_bstr_cache); - bufferPointer--; + if(cache_entry->cnt < sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)) { + cache_entry->buf[(cache_entry->head+cache_entry->cnt)%((sizeof(cache_entry->buf)/sizeof(*cache_entry->buf)))] = ptr; + cache_entry->cnt++; + LeaveCriticalSection(&cs_bstr_cache); + return; + } - /* - * Free the memory from its "real" origin. - */ - HeapFree(GetProcessHeap(), 0, bufferPointer); + LeaveCriticalSection(&cs_bstr_cache); + } + + HeapFree(GetProcessHeap(), 0, ptr); } /****************************************************************************** @@ -215,61 +281,28 @@ void WINAPI SysFreeString(BSTR str) */ BSTR WINAPI SysAllocStringLen(const OLECHAR *str, unsigned int len) { - DWORD bufferSize; - DWORD* newBuffer; - WCHAR* stringBuffer; + DWORD size, *ptr; + BSTR ret; /* Detect integer overflow. */ if (len >= ((UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))/sizeof(WCHAR))) return NULL; - /* - * Find the length of the buffer passed-in, in bytes. - */ - bufferSize = len * sizeof (WCHAR); - - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - bufferSize + sizeof(WCHAR) + sizeof(DWORD)); - /* - * If the memory allocation failed, return a null pointer. - */ - if (!newBuffer) - return NULL; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = bufferSize; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, bufferSize); - else - memset(newBuffer, 0, bufferSize); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (WCHAR*)newBuffer; - stringBuffer[len] = '\0'; + size = len*sizeof(WCHAR); + ptr = alloc_bstr(size + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = size; + ret = (BSTR)(ptr+1); + if(str) { + memcpy(ret, str, size); + ret[len] = 0; + }else { + memset(ret, 0, size+sizeof(WCHAR)); + } - return stringBuffer; + return ret; } /****************************************************************************** @@ -299,12 +332,13 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) if (*old!=NULL) { BSTR old_copy = *old; DWORD newbytelen = len*sizeof(WCHAR); - DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,newbytelen+sizeof(WCHAR)+sizeof(DWORD)); + DWORD *ptr = HeapReAlloc(GetProcessHeap(),0,((DWORD*)*old)-1,bstr_alloc_size(newbytelen+sizeof(WCHAR))); *old = (BSTR)(ptr+1); *ptr = newbytelen; /* Subtle hidden feature: The old string data is still there * when 'in' is NULL! * Some Microsoft program needs it. + * FIXME: Is it a sideeffect of BSTR caching? */ if (str && old_copy!=str) memmove(*old, str, newbytelen); (*old)[len] = 0; @@ -340,55 +374,27 @@ int WINAPI SysReAllocStringLen(BSTR* old, const OLECHAR* str, unsigned int len) */ BSTR WINAPI SysAllocStringByteLen(LPCSTR str, UINT len) { - DWORD* newBuffer; - char* stringBuffer; + DWORD *ptr; + char *ret; /* Detect integer overflow. */ if (len >= (UINT_MAX-sizeof(WCHAR)-sizeof(DWORD))) return NULL; - /* - * Allocate a new buffer to hold the string. - * don't forget to keep an empty spot at the beginning of the - * buffer for the character count and an extra character at the - * end for the NULL. - */ - newBuffer = HeapAlloc(GetProcessHeap(), 0, - len + sizeof(WCHAR) + sizeof(DWORD)); - - /* - * If the memory allocation failed, return a null pointer. - */ - if (newBuffer==0) - return 0; - - /* - * Copy the length of the string in the placeholder. - */ - *newBuffer = len; - - /* - * Skip the byte count. - */ - newBuffer++; - - /* - * Copy the information in the buffer. - * Since it is valid to pass a NULL pointer here, we'll initialize the - * buffer to nul if it is the case. - */ - if (str != 0) - memcpy(newBuffer, str, len); - - /* - * Make sure that there is a nul character at the end of the - * string. - */ - stringBuffer = (char *)newBuffer; - stringBuffer[len] = 0; - stringBuffer[len+1] = 0; + ptr = alloc_bstr(len + sizeof(WCHAR)); + if(!ptr) + return NULL; + + *ptr = len; + ret = (char*)(ptr+1); + if(str) { + memcpy(ret, str, len); + ret[len] = ret[len+1] = 0; + }else { + memset(ret, 0, len+sizeof(WCHAR)); + } - return (LPWSTR)stringBuffer; + return (BSTR)ret; } /****************************************************************************** @@ -440,11 +446,12 @@ INT WINAPI SysReAllocString(LPBSTR old,LPCOLESTR str) * Nothing. * * NOTES - * See BSTR. + * SetOaNoCache does not release cached strings, so it leaks by design. */ void WINAPI SetOaNoCache(void) { - BSTR_bCache = FALSE; + TRACE("\n"); + bstr_cache_enabled = FALSE; } static const WCHAR _delimiter[] = {'!',0}; /* default delimiter apparently */ @@ -840,6 +847,10 @@ HRESULT WINAPI DllCanUnloadNow(void) */ BOOL WINAPI DllMain(HINSTANCE hInstDll, DWORD fdwReason, LPVOID lpvReserved) { + static const WCHAR oanocacheW[] = {'o','a','n','o','c','a','c','h','e',0}; + + bstr_cache_enabled = !GetEnvironmentVariableW(oanocacheW, NULL, 0); + return OLEAUTPS_DllMain( hInstDll, fdwReason, lpvReserved ); }

1 0

Henri Verbeet : d3dx9: Use proper size types in D3DXLoadSurfaceFromMemory() .
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: 5ebd6652ca62515c15a98e02df608d037798e2f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ebd6652ca62515c15a98e02d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 29 20:52:05 2012 +0200 d3dx9: Use proper size types in D3DXLoadSurfaceFromMemory(). --- dlls/d3dx9_36/surface.c | 80 +++++++++++++++++++++++----------------------- 1 files changed, 40 insertions(+), 40 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 567282c..78a48f8 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -729,11 +729,8 @@ static void format_from_vec4(const PixelFormatDesc *format, const struct vec4 *s * Pixels outsize the source rect are blacked out. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, - CONST PixelFormatDesc *srcformat, - BYTE *dest, UINT destpitch, POINT destsize, - CONST PixelFormatDesc *destformat, - D3DCOLOR colorkey) +static void copy_simple_data(const BYTE *src, UINT srcpitch, SIZE src_size, const PixelFormatDesc *srcformat, + BYTE *dest, UINT destpitch, SIZE dst_size, const PixelFormatDesc *destformat, D3DCOLOR colorkey) { struct argb_conversion_info conv_info, ck_conv_info; const PixelFormatDesc *ck_format = NULL; @@ -744,8 +741,8 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, ZeroMemory(channels, sizeof(channels)); init_argb_conversion_info(srcformat, destformat, &conv_info); - minwidth = (srcsize.x < destsize.x) ? srcsize.x : destsize.x; - minheight = (srcsize.y < destsize.y) ? srcsize.y : destsize.y; + minwidth = (src_size.cx < dst_size.cx) ? src_size.cx : dst_size.cx; + minheight = (src_size.cy < dst_size.cy) ? src_size.cy : dst_size.cy; if (colorkey) { @@ -806,11 +803,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, destptr += destformat->bytes_per_pixel; } - if(srcsize.x < destsize.x) /* black out remaining pixels */ - ZeroMemory(destptr, destformat->bytes_per_pixel * (destsize.x - srcsize.x)); + if (src_size.cx < dst_size.cx) /* black out remaining pixels */ + memset(destptr, 0, destformat->bytes_per_pixel * (dst_size.cx - src_size.cx)); } - if(srcsize.y < destsize.y) /* black out remaining pixels */ - ZeroMemory(dest + srcsize.y * destpitch, destpitch * (destsize.y - srcsize.y)); + if (src_size.cy < dst_size.cy) /* black out remaining pixels */ + memset(dest + src_size.cy * destpitch, 0, destpitch * (dst_size.cy - src_size.cy)); } /************************************************************ @@ -821,11 +818,8 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, * using a point filter. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, - CONST PixelFormatDesc *srcformat, - BYTE *dest, UINT destpitch, POINT destsize, - CONST PixelFormatDesc *destformat, - D3DCOLOR colorkey) +static void point_filter_simple_data(const BYTE *src, UINT srcpitch, SIZE src_size, const PixelFormatDesc *srcformat, + BYTE *dest, UINT destpitch, SIZE dst_size, const PixelFormatDesc *destformat, D3DCOLOR colorkey) { struct argb_conversion_info conv_info, ck_conv_info; const PixelFormatDesc *ck_format = NULL; @@ -843,12 +837,14 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsi init_argb_conversion_info(srcformat, ck_format, &ck_conv_info); } - for(y = 0;y < destsize.y;y++) { + for (y = 0; y < dst_size.cy; ++y) + { BYTE *destptr = dest + y * destpitch; - const BYTE *bufptr = src + srcpitch * (y * srcsize.y / destsize.y); + const BYTE *bufptr = src + srcpitch * (y * src_size.cy / dst_size.cy); - for(x = 0;x < destsize.x;x++) { - const BYTE *srcptr = bufptr + (x * srcsize.x / destsize.x) * srcformat->bytes_per_pixel; + for (x = 0; x < dst_size.cx; ++x) + { + const BYTE *srcptr = bufptr + (x * src_size.cx / dst_size.cx) * srcformat->bytes_per_pixel; DWORD val; /* extract source color components */ @@ -944,7 +940,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, CONST PixelFormatDesc *srcformatdesc, *destformatdesc; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; - POINT srcsize, destsize; + SIZE src_size, dst_size; HRESULT hr; TRACE("(%p, %p, %p, %p, %x, %u, %p, %p %u, %#x)\n", pDestSurface, pDestPalette, pDestRect, pSrcMemory, @@ -957,18 +953,22 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, IDirect3DSurface9_GetDesc(pDestSurface, &surfdesc); - srcsize.x = pSrcRect->right - pSrcRect->left; - srcsize.y = pSrcRect->bottom - pSrcRect->top; - if( !pDestRect ) { - destsize.x = surfdesc.Width; - destsize.y = surfdesc.Height; - } else { + src_size.cx = pSrcRect->right - pSrcRect->left; + src_size.cy = pSrcRect->bottom - pSrcRect->top; + if (!pDestRect) + { + dst_size.cx = surfdesc.Width; + dst_size.cy = surfdesc.Height; + } + else + { if(pDestRect->left > pDestRect->right || pDestRect->right > surfdesc.Width) return D3DERR_INVALIDCALL; if(pDestRect->top > pDestRect->bottom || pDestRect->bottom > surfdesc.Height) return D3DERR_INVALIDCALL; if(pDestRect->left < 0 || pDestRect->top < 0) return D3DERR_INVALIDCALL; - destsize.x = pDestRect->right - pDestRect->left; - destsize.y = pDestRect->bottom - pDestRect->top; - if(destsize.x == 0 || destsize.y == 0) return D3D_OK; + dst_size.cx = pDestRect->right - pDestRect->left; + dst_size.cy = pDestRect->bottom - pDestRect->top; + if (!dst_size.cx || !dst_size.cy) + return D3D_OK; } srcformatdesc = get_format_info(SrcFormat); @@ -980,11 +980,11 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, return E_NOTIMPL; if (SrcFormat == surfdesc.Format - && destsize.x == srcsize.x - && destsize.y == srcsize.y) /* Simple copy. */ + && dst_size.cx == src_size.cx + && dst_size.cy == src_size.cy) /* Simple copy. */ { - UINT row_block_count = ((srcsize.x + srcformatdesc->block_width - 1) / srcformatdesc->block_width); - UINT row_count = (srcsize.y + srcformatdesc->block_height - 1) / srcformatdesc->block_height; + UINT row_block_count = ((src_size.cx + srcformatdesc->block_width - 1) / srcformatdesc->block_width); + UINT row_count = (src_size.cy + srcformatdesc->block_height - 1) / srcformatdesc->block_height; const BYTE *src_addr; BYTE *dst_addr; UINT row; @@ -992,9 +992,9 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if (pSrcRect->left & (srcformatdesc->block_width - 1) || pSrcRect->top & (srcformatdesc->block_height - 1) || (pSrcRect->right & (srcformatdesc->block_width - 1) - && srcsize.x != surfdesc.Width) + && src_size.cx != surfdesc.Width) || (pSrcRect->bottom & (srcformatdesc->block_height - 1) - && srcsize.y != surfdesc.Height)) + && src_size.cy != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(pSrcRect)); return D3DXERR_INVALIDDATA; @@ -1033,16 +1033,16 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(LPDIRECT3DSURFACE9 pDestSurface, if ((dwFilter & 0xf) == D3DX_FILTER_NONE) { - copy_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + copy_simple_data(pSrcMemory, SrcPitch, src_size, srcformatdesc, + lockrect.pBits, lockrect.Pitch, dst_size, destformatdesc, Colorkey); } else /* if ((dwFilter & 0xf) == D3DX_FILTER_POINT) */ { /* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ - point_filter_simple_data(pSrcMemory, SrcPitch, srcsize, srcformatdesc, - lockrect.pBits, lockrect.Pitch, destsize, destformatdesc, + point_filter_simple_data(pSrcMemory, SrcPitch, src_size, srcformatdesc, + lockrect.pBits, lockrect.Pitch, dst_size, destformatdesc, Colorkey); }

1 0

Nikolay Sivov : msxml3: Test for attribute value normalization.
by Alexandre Julliard April 30, 2012

April 30, 2012

Module: wine Branch: master Commit: fc7aea37f65471b0cb68f837f7f801c761aa992b URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc7aea37f65471b0cb68f837f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Apr 28 13:20:06 2012 +0400 msxml3: Test for attribute value normalization. --- dlls/msxml3/tests/saxreader.c | 51 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cb1a088..73c16b9 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -866,6 +866,34 @@ static struct call_entry xmlspaceattr_test_alternate[] = { { CH_ENDTEST } }; +/* attribute value normalization test */ +static const char attribute_normalize[] = + "<?xml version=\"1.0\" ?>\n" + "<a attr1=\" \r \n \tattr_value A \t \r \n\r\n \n\"/>\n"; + +static struct attribute_entry attribute_norm_attrs[] = { + { "", "attr1", "attr1", " attr_value A " }, + { NULL } +}; + +static struct call_entry attribute_norm[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, S_OK }, + { CH_STARTDOCUMENT, 0, 0, S_OK }, + { CH_STARTELEMENT, 6, 4, S_OK, "", "a", "a", attribute_norm_attrs }, + { CH_ENDELEMENT, 6, 4, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 0, 0, S_OK }, + { CH_ENDTEST } +}; + +static struct call_entry attribute_norm_alt[] = { + { CH_PUTDOCUMENTLOCATOR, 1, 0, S_OK }, + { CH_STARTDOCUMENT, 1, 22, S_OK }, + { CH_STARTELEMENT, 8, 3, S_OK, "", "a", "a", attribute_norm_attrs }, + { CH_ENDELEMENT, 8, 3, S_OK, "", "a", "a" }, + { CH_ENDDOCUMENT, 9, 0, S_OK }, + { CH_ENDTEST } +}; + static const char xmlspace_attr[] = "<?xml version=\"1.0\" encoding=\"UTF-16\"?>" "<a xml:space=\"preserve\"> Some text data </a>"; @@ -2170,6 +2198,29 @@ static void test_saxreader(void) hr = ISAXXMLReader_putFeature(reader, _bstr_("http://xml.org/sax/features/namespace-prefixes"), VARIANT_TRUE); EXPECT_HR(hr, S_OK); + /* attribute normalization */ + CreateStreamOnHGlobal(NULL, TRUE, &stream); + size.QuadPart = strlen(attribute_normalize); + IStream_SetSize(stream, size); + IStream_Write(stream, attribute_normalize, strlen(attribute_normalize), &written); + pos.QuadPart = 0; + IStream_Seek(stream, pos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)stream; + + if (IsEqualGUID(table->clsid, &CLSID_SAXXMLReader40) || + IsEqualGUID(table->clsid, &CLSID_SAXXMLReader60)) + { + test_seq = attribute_norm_alt; + } + else + test_seq = attribute_norm; + + set_expected_seq(test_seq); + hr = ISAXXMLReader_parse(reader, var); + EXPECT_HR(hr, S_OK); + ok_sequence(sequences, CONTENT_HANDLER_INDEX, test_seq, "attribute value normalization", TRUE); + ISAXXMLReader_Release(reader); table++; }

1 0

André Hentschel : Wine 1.5.3 freigegeben (try 2)
by Jeremy Newman April 30, 2012

April 30, 2012

Module: website Branch: master Commit: 64b095566a4e0b3615b4bccdb0dd4e8d82afc644 URL: http://source.winehq.org/git/website.git/?a=commit;h=64b095566a4e0b3615b4bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Apr 27 21:11:51 2012 +0200 Wine 1.5.3 freigegeben (try 2) --- news/de/2012042701.xml | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/news/de/2012042701.xml b/news/de/2012042701.xml new file mode 100644 index 0000000..38857bf --- /dev/null +++ b/news/de/2012042701.xml @@ -0,0 +1,17 @@ +<news> +<date>27. April 2012</date> +<title>Wine 1.5.3 freigegeben</title> +<body> + Die Entwicklungsversion 1.5.3 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.5.3">Neuerungen (en)</a> in dieser Version: +<ul> + <li>Unterstützung zur Verfolgung der Grenzen des Grafikzeichenbereichs.</li> + <li>Einige Fehlerbehebungen am eigenen Internet Explorer.</li> + <li>Unterstützung für das Anzeigen von ARM Code im Wine Debugger.</li> + <li>Verschiedene DirectMusic Verbesserungen.</li> + <li>Bessere Namensraum Unterstützung in MSXML.</li> + <li>Verschiedene Fehlerbehebungen.</li> +</ul> +Der Quellcode ist jetzt <a href="http://prdownloads.sourceforge.net/wine/wine-1.5.3.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0