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

Andrew Eikum : mmdevapi: Indicate data flow direction in IMMDevice:: GetId result.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 06c1f255f8eda03b8749420bc81f4fbd2655afdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=06c1f255f8eda03b8749420bc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:47 2012 -0500 mmdevapi: Indicate data flow direction in IMMDevice::GetId result. --- dlls/mmdevapi/devenum.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 501ea4c..866aa06 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -629,7 +629,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) MMDevice *This = impl_from_IMMDevice(iface); WCHAR *str; GUID *id = &This->devguid; - static const WCHAR formatW[] = { '{','0','.','0','.','0','.','0','0','0','0','0','0','0','0','}','.', + static const WCHAR formatW[] = { '{','0','.','0','.','%','u','.','0','0','0','0','0','0','0','0','}','.', '{','%','0','8','X','-','%','0','4','X','-', '%','0','4','X','-','%','0','2','X','%','0','2','X','-', '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', @@ -641,7 +641,7 @@ static HRESULT WINAPI MMDevice_GetId(IMMDevice *iface, WCHAR **itemid) *itemid = str = CoTaskMemAlloc(56 * sizeof(WCHAR)); if (!str) return E_OUTOFMEMORY; - wsprintfW( str, formatW, id->Data1, id->Data2, id->Data3, + wsprintfW( str, formatW, This->flow, id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); TRACE("returning %s\n", wine_dbgstr_w(str));

1 0

Piotr Caban : wininet: Don't delete locked entry in DeleteUrlCacheEntry.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: d1ecb6d9ba1f11eba0a2b832369af225ddee4151 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1ecb6d9ba1f11eba0a2b8323… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:34:35 2012 +0200 wininet: Don't delete locked entry in DeleteUrlCacheEntry. --- dlls/wininet/tests/urlcache.c | 5 ----- dlls/wininet/urlcache.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index 3b4627c..93ad333 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -571,9 +571,7 @@ static void test_urlcacheA(void) if (pDeleteUrlCacheEntryA) { ret = pDeleteUrlCacheEntryA(TEST_URL); - todo_wine ok(!ret, "Expected failure\n"); - todo_wine ok(GetLastError() == ERROR_SHARING_VIOLATION, "Expected ERROR_SHARING_VIOLATION, got %d\n", GetLastError()); check_file_exists(filenameA); @@ -582,9 +580,7 @@ static void test_urlcacheA(void) lpCacheEntryInfo = HeapAlloc(GetProcessHeap(), 0, cbCacheEntryInfo); memset(lpCacheEntryInfo, 0, cbCacheEntryInfo); ret = GetUrlCacheEntryInfo(TEST_URL, lpCacheEntryInfo, &cbCacheEntryInfo); - todo_wine ok(ret, "GetUrlCacheEntryInfo failed with error %d\n", GetLastError()); - todo_wine ok(lpCacheEntryInfo->CacheEntryType & DELETED_CACHE_ENTRY, "CacheEntryType hasn't DELETED_CACHE_ENTRY set, (flags %08x)\n", lpCacheEntryInfo->CacheEntryType); @@ -594,7 +590,6 @@ static void test_urlcacheA(void) { check_file_exists(filenameA); ret = pUnlockUrlCacheEntryFileA(TEST_URL, 0); - todo_wine ok(ret, "UnlockUrlCacheEntryFileA failed: %d\n", GetLastError()); /* By unlocking the already-deleted cache entry, the file associated * with it is deleted.. diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index fb9e701..f4a47b1 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2139,7 +2139,17 @@ static BOOL DeleteUrlCacheEntryInternal(LPURLCACHE_HEADER pHeader, SetLastError(ERROR_FILE_NOT_FOUND); return FALSE; } + pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry; + if ((pHashEntry->dwHashKey & ((1<<HASHTABLE_FLAG_BITS)-1)) == HASHTABLE_LOCK) + { + /* FIXME: implement timeout object unlocking */ + TRACE("Trying to delete locked entry\n"); + pUrlEntry->CacheEntryType |= DELETED_CACHE_ENTRY; + SetLastError(ERROR_SHARING_VIOLATION); + return FALSE; + } + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) { if (pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles) @@ -2234,7 +2244,11 @@ BOOL WINAPI UnlockUrlCacheEntryFileA( } pUrlEntry->dwUseCount--; if (!pUrlEntry->dwUseCount) + { URLCache_HashEntrySetFlags(pHashEntry, HASHTABLE_URL); + if (pUrlEntry->CacheEntryType & DELETED_CACHE_ENTRY) + DeleteUrlCacheEntryInternal(pHeader, pHashEntry); + } URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0

Piotr Caban : wininet: Don't overwrite locked entry in CommitUrlCacheEntry.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: c9983b11597f4ad29f171229e05a998498c28b0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9983b11597f4ad29f171229e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:35:00 2012 +0200 wininet: Don't overwrite locked entry in CommitUrlCacheEntry. --- dlls/wininet/urlcache.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f4a47b1..155a0e9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2678,6 +2678,14 @@ static BOOL CommitUrlCacheEntryInternal( if (URLCache_FindHash(pHeader, lpszUrlNameA, &pHashEntry)) { + if ((pHashEntry->dwHashKey & ((1<<HASHTABLE_FLAG_BITS)-1)) == HASHTABLE_LOCK) + { + /* FIXME: implement timeout object unlocking */ + FIXME("Trying to overwrite locked entry\n"); + SetLastError(ERROR_SHARING_VIOLATION); + goto cleanup; + } + FIXME("entry already in cache - don't know what to do!\n"); /* * SetLastError(ERROR_FILE_NOT_FOUND);

1 0

Henri Verbeet : ddraw/tests: Add some QueryInterface() tests for devices.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 9804ebcd9e63b460a905f48a4265b2b05e828124 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9804ebcd9e63b460a905f48a4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:36 2012 +0200 ddraw/tests: Add some QueryInterface() tests for devices. --- dlls/ddraw/tests/ddraw1.c | 76 +++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw2.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 67 +++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 67 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 285 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9804ebcd9e63b460a905f…

1 0

Henri Verbeet : dxgi: Don' t return a pointer to the implementation in dxgi_surface_inner_QueryInterface ().
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 719eeea2ae2f0b43b246ba7576f0d8d65e2ef71b URL: http://source.winehq.org/git/wine.git/?a=commit;h=719eeea2ae2f0b43b246ba757… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:37 2012 +0200 dxgi: Don't return a pointer to the implementation in dxgi_surface_inner_QueryInterface(). --- dlls/dxgi/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 4a5ea02..374832b 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -43,7 +43,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_inner_QueryInterface(IUnknown *ifa || IsEqualGUID(riid, &IID_IUnknown)) { IDXGISurface_AddRef(&This->IDXGISurface_iface); - *object = This; + *object = &This->IDXGISurface_iface; return S_OK; }

1 0

Henri Verbeet : d3dx9: Don' t return a pointer to the implementation in ID3DXSpriteImpl_QueryInterface( ).
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 45c7b47b065c5f5876e96e7d1e130292fa626625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45c7b47b065c5f5876e96e7d1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:38 2012 +0200 d3dx9: Don't return a pointer to the implementation in ID3DXSpriteImpl_QueryInterface(). --- dlls/d3dx9_36/sprite.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index d81e13f..a8cbb53 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -69,17 +69,21 @@ static inline ID3DXSpriteImpl *impl_from_ID3DXSprite(ID3DXSprite *iface) return CONTAINING_RECORD(iface, ID3DXSpriteImpl, ID3DXSprite_iface); } -static HRESULT WINAPI ID3DXSpriteImpl_QueryInterface(ID3DXSprite *iface, REFIID riid, void **object) +static HRESULT WINAPI ID3DXSpriteImpl_QueryInterface(ID3DXSprite *iface, REFIID riid, void **out) { - ID3DXSpriteImpl *This = impl_from_ID3DXSprite(iface); + TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); - TRACE("(%p): QueryInterface from %s\n", This, debugstr_guid(riid)); - if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ID3DXSprite)) { + if (IsEqualGUID(riid, &IID_ID3DXSprite) + || IsEqualGUID(riid, &IID_IUnknown)) + { IUnknown_AddRef(iface); - *object=This; + *out = iface; return S_OK; } - WARN("(%p)->(%s, %p): not found\n", iface, debugstr_guid(riid), *object); + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); + + *out = NULL; return E_NOINTERFACE; }

1 0

Andrew Eikum : dmusic: Check correct return code.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 9c79ba8a04d0a7a1721a2090c31d6e7629efd746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c79ba8a04d0a7a1721a2090c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 13:00:16 2012 -0500 dmusic: Check correct return code. --- dlls/dmusic/dmusic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index ba12f98..ef3143f 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -142,7 +142,7 @@ static HRESULT WINAPI IDirectMusic8Impl_EnumPort(LPDIRECTMUSIC8 iface, DWORD ind HRESULT hr; hr = CoCreateInstance(&CLSID_DirectMusicSynth, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicSynth8, (void**)&synth); if (SUCCEEDED(hr)) - IDirectMusicSynth8_GetPortCaps(synth, port_caps); + hr = IDirectMusicSynth8_GetPortCaps(synth, port_caps); if (SUCCEEDED(hr)) TRACE("Enumerating port: %s\n", debugstr_w(port_caps->wszDescription)); if (synth)

1 0

Erich Hoover : ntdll: Fix section header heap deadlock.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 48174b6d1eee8f6f5a8abd38668bad23f7a7762f URL: http://source.winehq.org/git/wine.git/?a=commit;h=48174b6d1eee8f6f5a8abd386… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Apr 5 10:36:33 2012 -0600 ntdll: Fix section header heap deadlock. --- dlls/ntdll/virtual.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 7c2b1a9..d67f2d5 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1122,7 +1122,8 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz { IMAGE_DOS_HEADER *dos; IMAGE_NT_HEADERS *nt; - IMAGE_SECTION_HEADER *sec, *sections = NULL; + IMAGE_SECTION_HEADER sections[96]; + IMAGE_SECTION_HEADER *sec; IMAGE_DATA_DIRECTORY *imports; NTSTATUS status = STATUS_CONFLICTING_ADDRESSES; int i; @@ -1168,15 +1169,10 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz memset( ptr + header_size, 0, header_end - (ptr + header_size) ); if ((char *)(nt + 1) > header_end) goto error; header_start = (char*)&nt->OptionalHeader+nt->FileHeader.SizeOfOptionalHeader; + if (nt->FileHeader.NumberOfSections > sizeof(sections)/sizeof(*sections)) goto error; if (header_start + sizeof(*sections) * nt->FileHeader.NumberOfSections > header_end) goto error; /* Some applications (e.g. the Steam version of Borderlands) map over the top of the section headers, * copying the headers into local memory is necessary to properly load such applications. */ - sections = RtlAllocateHeap( GetProcessHeap(), 0, sizeof(*sections) * nt->FileHeader.NumberOfSections); - if (!sections) - { - status = STATUS_NO_MEMORY; - goto error; - } memcpy(sections, header_start, sizeof(*sections) * nt->FileHeader.NumberOfSections); sec = sections; @@ -1374,7 +1370,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz } done: - RtlFreeHeap( GetProcessHeap(), 0, sections ); view->mapping = dup_mapping; view->map_protect = map_vprot; server_leave_uninterrupted_section( &csVirtual, &sigset ); @@ -1387,7 +1382,6 @@ static NTSTATUS map_image( HANDLE hmapping, int fd, char *base, SIZE_T total_siz return STATUS_SUCCESS; error: - RtlFreeHeap( GetProcessHeap(), 0, sections ); if (view) delete_view( view ); server_leave_uninterrupted_section( &csVirtual, &sigset ); if (dup_mapping) NtClose( dup_mapping );

1 0

Henri Verbeet : ddraw: Fix querying device interfaces in IDirect3DDeviceImpl_7_QueryInterface().
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: e13de0adf85a9cca97864885dfeda5a1ef156a72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13de0adf85a9cca97864885d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:34 2012 +0200 ddraw: Fix querying device interfaces in IDirect3DDeviceImpl_7_QueryInterface(). Version 7 devices can only return the version 7 interface. The other versions can only return earlier interfaces. --- dlls/ddraw/device.c | 30 ++++++++---------------------- 1 files changed, 8 insertions(+), 22 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index a1daa3f..e766940 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -117,33 +117,19 @@ IDirect3DDeviceImpl_7_QueryInterface(IDirect3DDevice7 *iface, *obj = iface; } - /* Direct3DDevice */ - else if ( IsEqualGUID( &IID_IDirect3DDevice , refiid ) ) + if (This->version == 7) { - *obj = &This->IDirect3DDevice_iface; - TRACE("(%p) Returning IDirect3DDevice interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3DDevice2 , refiid ) ) { - *obj = &This->IDirect3DDevice2_iface; - TRACE("(%p) Returning IDirect3DDevice2 interface at %p\n", This, *obj); + if (IsEqualGUID(&IID_IDirect3DDevice7, refiid)) + *obj = iface; } - else if ( IsEqualGUID( &IID_IDirect3DDevice3 , refiid ) ) { + else if (IsEqualGUID(&IID_IDirect3DDevice3, refiid) && This->version == 3) *obj = &This->IDirect3DDevice3_iface; - TRACE("(%p) Returning IDirect3DDevice3 interface at %p\n", This, *obj); - } - else if ( IsEqualGUID( &IID_IDirect3DDevice7 , refiid ) ) { - *obj = &This->IDirect3DDevice7_iface; - TRACE("(%p) Returning IDirect3DDevice7 interface at %p\n", This, *obj); - } - - /* DirectDrawSurface */ + else if (IsEqualGUID(&IID_IDirect3DDevice2, refiid) && This->version >= 2) + *obj = &This->IDirect3DDevice2_iface; + else if (IsEqualGUID(&IID_IDirect3DDevice, refiid)) + *obj = &This->IDirect3DDevice_iface; else if (IsEqualGUID(&IID_IDirectDrawSurface, refiid) && This->version == 1) - { *obj = &This->target->IDirectDrawSurface_iface; - TRACE("Returning IDirectDrawSurface interface %p.\n", *obj); - } - - /* Unknown interface */ else { WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(refiid));

1 0

Henri Verbeet : ddraw: Version 1 devices are aggregated by the surface that created them.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: cf30899f1afa304860e44b6e5f960464ffd6667f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf30899f1afa304860e44b6e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 5 19:55:35 2012 +0200 ddraw: Version 1 devices are aggregated by the surface that created them. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 6 +- dlls/ddraw/device.c | 268 +++++++++++++++++++++++-------------------- dlls/ddraw/surface.c | 24 +++-- dlls/ddraw/tests/d3d.c | 1 - 5 files changed, 165 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cf30899f1afa304860e44…

1 0