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

Robert van Herk : msi: Fixed MsiGetFileHashW for empty files.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: f87c4a36ddc1a32af392e45b0af1feff8c388852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f87c4a36ddc1a32af392e45b0… Author: Robert van Herk <mijnspamboxje(a)hotmail.com> Date: Thu Apr 5 13:08:08 2012 +0200 msi: Fixed MsiGetFileHashW for empty files. --- dlls/msi/msi.c | 34 ++++++++++++++++++++++------------ dlls/msi/tests/msi.c | 6 ++++++ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 53ae641..4d18265 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -4014,24 +4014,34 @@ UINT WINAPI MsiGetFileHashW( LPCWSTR szFilePath, DWORD dwOptions, } length = GetFileSize( handle, NULL ); - mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); - if (mapping) + if (length) { - p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); - if (p) + mapping = CreateFileMappingW( handle, NULL, PAGE_READONLY, 0, 0, NULL ); + if (mapping) { - MD5_CTX ctx; + p = MapViewOfFile( mapping, FILE_MAP_READ, 0, 0, length ); + if (p) + { + MD5_CTX ctx; - MD5Init( &ctx ); - MD5Update( &ctx, p, length ); - MD5Final( &ctx ); - UnmapViewOfFile( p ); + MD5Init( &ctx ); + MD5Update( &ctx, p, length ); + MD5Final( &ctx ); + UnmapViewOfFile( p ); - memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); - r = ERROR_SUCCESS; + memcpy( pHash->dwData, ctx.digest, sizeof pHash->dwData ); + r = ERROR_SUCCESS; + } + CloseHandle( mapping ); } - CloseHandle( mapping ); } + else + { + /* Empty file -> set hash to 0 */ + memset( pHash->dwData, 0, sizeof pHash->dwData ); + r = ERROR_SUCCESS; + } + CloseHandle( handle ); return r; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index f12af78..8768d2a 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -417,6 +417,12 @@ static const struct MSIFILEHASHINFO hash; } hash_data[] = { + { "", 0, + { HASHSIZE, + { 0, 0, 0, 0 }, + }, + }, + { "abc", 0, { HASHSIZE, { 0x98500190, 0xb04fd23c, 0x7d3f96d6, 0x727fe128 },

1 0

Michael Stefaniuc : dmime: DirectMusicSegment doesn' t supports COM aggregation.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: f998b267d6dcf1a8c930256995c11ed50e330320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f998b267d6dcf1a8c93025699… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 6 00:15:24 2012 +0200 dmime: DirectMusicSegment doesn't supports COM aggregation. --- dlls/dmime/segment.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 6dd5e02..e0d082d 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -1291,7 +1291,12 @@ static const IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI DMUSIC_CreateDirectMusicSegmentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { IDirectMusicSegment8Impl* obj; - + + if (pUnkOuter) { + *ppobj = NULL; + return CLASS_E_NOAGGREGATION; + } + obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicSegment8Impl)); if (NULL == obj) { *ppobj = NULL;

1 0

Michael Stefaniuc : dmime/tests: Add some COM tests for DirectMusicSegment.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: edcf723bab1d6512bc81ce64b1d3c873e281f0f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edcf723bab1d6512bc81ce64b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Apr 6 00:22:49 2012 +0200 dmime/tests: Add some COM tests for DirectMusicSegment. --- dlls/dmime/tests/performance.c | 53 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index 931478c..684642b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include <stdarg.h> #include <windef.h> #include <initguid.h> @@ -239,6 +241,55 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_dms_COM(void) +{ + IDirectMusicSegment8 *dms = (IDirectMusicSegment8*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *stream; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, (IUnknown*)&dms, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dms); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicSegment create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dms, "dms = %p\n", dms); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectSound, (void**)&dms); + ok(hr == E_NOINTERFACE, + "DirectMusicSegment create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount */ + hr = CoCreateInstance(&CLSID_DirectMusicSegment, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicSegment8, (void**)&dms); + ok(hr == S_OK, "DirectMusicSegment create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicSegment8_AddRef(dms); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + IDirectMusicSegment8_AddRef(dms); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IPersistStream, (void**)&stream); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + hr = IDirectMusicSegment8_QueryInterface(dms, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_Release(unk); + ok (refcount == 3, "refcount == %u, expected 3\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + ok (refcount == 2, "refcount == %u, expected 2\n", refcount); + refcount = IPersistStream_Release(stream); + ok (refcount == 1, "refcount == %u, expected 1\n", refcount); + refcount = IDirectMusicSegment8_Release(dms); + ok (refcount == 0, "refcount == %u, expected 0\n", refcount); +} + START_TEST( performance ) { HRESULT hr; @@ -258,5 +309,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_dms_COM(); + CoUninitialize(); }

1 0

Jacek Caban : urlmon: Build more appropriate user agent string.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 6f9e33083860fc64fded56a71e09a98994aa7ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f9e33083860fc64fded56a71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 6 12:34:12 2012 +0200 urlmon: Build more appropriate user agent string. The registry value we used previously seems to be ignored by recent IEs. --- dlls/urlmon/session.c | 45 ++++++++++++++++++++++++++------------------- 1 files changed, 26 insertions(+), 19 deletions(-) diff --git a/dlls/urlmon/session.c b/dlls/urlmon/session.c index 5da194b..ce6ab4e 100644 --- a/dlls/urlmon/session.c +++ b/dlls/urlmon/session.c @@ -532,31 +532,38 @@ static LPWSTR user_agent; static void ensure_useragent(void) { - DWORD size = sizeof(DWORD), res, type; - HKEY hkey; - - static const WCHAR user_agentW[] = {'U','s','e','r',' ','A','g','e','n','t',0}; + OSVERSIONINFOW info = {sizeof(info)}; + const WCHAR *os_type, *is_nt; + WCHAR buf[512]; + BOOL is_wow; + + static const WCHAR formatW[] = + {'M','o','z','i','l','l','a','/','4','.','0', + ' ','(','c','o','m','p','a','t','i','b','l','e',';', + ' ','M','S','I','E',' ','8','.','0',';', + ' ','W','i','n','d','o','w','s',' ','%','s','%','d','.','%','d',';', + ' ','%','s',';',' ','T','r','i','d','e','n','t','/','5','.','0',')',0}; + static const WCHAR ntW[] = {'N','T',' ',0}; + static const WCHAR win32W[] = {'W','i','n','3','2',0}; + static const WCHAR win64W[] = {'W','i','n','6','4',0}; + static const WCHAR wow64W[] = {'W','O','W','6','4',0}; + static const WCHAR emptyW[] = {0}; if(user_agent) return; - res = RegOpenKeyW(HKEY_CURRENT_USER, internet_settings_keyW, &hkey); - if(res != ERROR_SUCCESS) - return; + GetVersionExW(&info); + is_nt = info.dwPlatformId == VER_PLATFORM_WIN32_NT ? ntW : emptyW; - res = RegQueryValueExW(hkey, user_agentW, NULL, &type, NULL, &size); - if(res == ERROR_SUCCESS && type == REG_SZ) { - user_agent = heap_alloc(size); - res = RegQueryValueExW(hkey, user_agentW, NULL, &type, (LPBYTE)user_agent, &size); - if(res != ERROR_SUCCESS) { - heap_free(user_agent); - user_agent = NULL; - } - }else { - WARN("Could not find User Agent value: %u\n", res); - } + if(sizeof(void*) == 8) + os_type = win64W; + else if(IsWow64Process(GetCurrentProcess(), &is_wow) && is_wow) + os_type = wow64W; + else + os_type = win32W; - RegCloseKey(hkey); + sprintfW(buf, formatW, is_nt, info.dwMajorVersion, info.dwMinorVersion, os_type); + user_agent = heap_strdupW(buf); } LPWSTR get_useragent(void)

1 0

Piotr Caban : ddraw: Improve GetScanLine stub so it' s usable for timing related tasks.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 5c85f96f33b71b8e8991d6ecbbafac9b1306cb4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c85f96f33b71b8e8991d6ecb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Apr 6 14:49:54 2012 +0200 ddraw: Improve GetScanLine stub so it's usable for timing related tasks. --- dlls/ddraw/ddraw.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 20df445..2ef51da 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1964,8 +1964,8 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_display_mode mode; - static DWORD cur_scanline; static BOOL hide = FALSE; + DWORD time, frame_progress, lines; TRACE("iface %p, line %p.\n", iface, Scanline); @@ -1982,11 +1982,20 @@ static HRESULT WINAPI ddraw7_GetScanLine(IDirectDraw7 *iface, DWORD *Scanline) /* Fake the line sweeping of the monitor */ /* FIXME: We should synchronize with a source to keep the refresh rate */ - *Scanline = cur_scanline++; - /* Assume 20 scan lines in the vertical blank */ - if (cur_scanline >= mode.height + 20) - cur_scanline = 0; + /* Simulate a 60Hz display */ + time = GetTickCount(); + frame_progress = time & 15; /* time % (1000 / 60) */ + if (!frame_progress) + { + *Scanline = 0; + return DDERR_VERTICALBLANKINPROGRESS; + } + + /* Convert frame_progress to estimated scan line. Return any line from + * block determined by time. Some lines may be never returned */ + lines = mode.height / 15; + *Scanline = (frame_progress - 1) * lines + time % lines; return DD_OK; }

1 0

Piotr Caban : wininet: Don't reserve space for directory in URL cache entry .
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 4254bdbfb2c4651b16f7faef54e4821121e886a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4254bdbfb2c4651b16f7faef5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:35:27 2012 +0200 wininet: Don't reserve space for directory in URL cache entry. --- dlls/wininet/urlcache.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 155a0e9..bba81de 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2727,7 +2727,8 @@ static BOOL CommitUrlCacheEntryInternal( goto cleanup; } - lpszLocalFileName += (DIR_LENGTH + 1); /* "1234WXYZ\" */ + lpszLocalFileName += DIR_LENGTH + 1; + pchLocalFileName += DIR_LENGTH + 1; } dwBytesNeeded = DWORD_ALIGN(dwBytesNeeded + strlen(lpszUrlNameA) + 1); @@ -2800,7 +2801,7 @@ static BOOL CommitUrlCacheEntryInternal( strcpy((LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl, lpszUrlNameA); if (dwOffsetLocalFileName) - strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName + DIR_LENGTH + 1); + strcpy((LPSTR)((LPBYTE)pUrlEntry + dwOffsetLocalFileName), pchLocalFileName); if (dwOffsetHeader) memcpy((LPBYTE)pUrlEntry + dwOffsetHeader, lpHeaderInfo, dwHeaderSize); if (dwOffsetFileExtension)

1 0

Piotr Caban : wininet: Return error code in URLCache_FindFirstFreeEntry function.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: dab1f7c38eaecaf3de38adb75848ecbc93bde11e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dab1f7c38eaecaf3de38adb75… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:35:46 2012 +0200 wininet: Return error code in URLCache_FindFirstFreeEntry function. --- dlls/wininet/urlcache.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index bba81de..5fac89a 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -786,11 +786,11 @@ static inline void URLCache_Allocation_BlockAllocate(BYTE * AllocationTable, DWO * sets ppEntry to point to it. * * RETURNS - * TRUE if it had enough space - * FALSE if it couldn't find enough space + * ERROR_SUCCESS when free memory block was found + * Any other Win32 error code if the entry could not be added * */ -static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry) +static DWORD URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlocksNeeded, CACHEFILE_ENTRY ** ppEntry) { LPBYTE AllocationTable = (LPBYTE)pHeader + ALLOCATION_TABLE_OFFSET; DWORD dwBlockNumber; @@ -814,11 +814,11 @@ static BOOL URLCache_FindFirstFreeEntry(URLCACHE_HEADER * pHeader, DWORD dwBlock for (index = 0; index < dwBlocksNeeded * BLOCKSIZE / sizeof(DWORD); index++) ((DWORD*)*ppEntry)[index] = 0xdeadbeef; (*ppEntry)->dwBlocksUsed = dwBlocksNeeded; - return TRUE; + return ERROR_SUCCESS; } } - FIXME("Grow file\n"); - return FALSE; + + return ERROR_HANDLE_DISK_FULL; } /*********************************************************************** @@ -1381,14 +1381,11 @@ static DWORD URLCache_AddEntryToHash(LPURLCACHE_HEADER pHeader, LPCSTR lpszUrl, */ static DWORD URLCache_CreateHashTable(LPURLCACHE_HEADER pHeader, HASH_CACHEFILE_ENTRY *pPrevHash, HASH_CACHEFILE_ENTRY **ppHash) { - DWORD dwOffset; + DWORD dwOffset, error; int i; - if (!URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)ppHash)) - { - FIXME("no free space for hash table\n"); - return ERROR_DISK_FULL; - } + if ((error = URLCache_FindFirstFreeEntry(pHeader, 0x20, (CACHEFILE_ENTRY **)ppHash)) != ERROR_SUCCESS) + return error; dwOffset = (BYTE *)*ppHash - (BYTE *)pHeader; @@ -2755,12 +2752,8 @@ static BOOL CommitUrlCacheEntryInternal( dwBytesNeeded += BLOCKSIZE; } - if (!URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry)) - { - ERR("no free entries\n"); - error = ERROR_DISK_FULL; + if ((error = URLCache_FindFirstFreeEntry(pHeader, dwBytesNeeded / BLOCKSIZE, &pEntry)) != ERROR_SUCCESS) goto cleanup; - } /* FindFirstFreeEntry fills in blocks used */ pUrlEntry = (URL_CACHEFILE_ENTRY *)pEntry;

1 0

Piotr Caban : wininet: Implement urlcache index growing.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: 91296abb6324029a6b81445bcc3e2c5c5fcf755b URL: http://source.winehq.org/git/wine.git/?a=commit;h=91296abb6324029a6b81445bc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 5 21:50:31 2012 +0200 wininet: Implement urlcache index growing. --- dlls/wininet/urlcache.c | 144 ++++++++++++++++++++++++++++++++++------------ 1 files changed, 106 insertions(+), 38 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=91296abb6324029a6b814…

1 0

Andrew Eikum : mmdevapi: Store device interface in registry.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: e6638bd86f6f5d3666ef71efea0d2214dd84ab9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6638bd86f6f5d3666ef71efe… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:40 2012 -0500 mmdevapi: Store device interface in registry. --- dlls/mmdevapi/devenum.c | 9 +++++++++ dlls/mmdevapi/tests/propstore.c | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index b41bfa5..501ea4c 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -268,6 +268,10 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st WCHAR guidstr[39]; DWORD i; + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + for (i = 0; i < MMDevice_count; ++i) { MMDevice *device = MMDevice_head[i]; @@ -319,10 +323,15 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st if (!RegCreateKeyExW(key, reg_properties, 0, NULL, 0, KEY_WRITE|KEY_READ, NULL, &keyprop, NULL)) { PROPVARIANT pv; + pv.vt = VT_LPWSTR; pv.u.pwszVal = name; MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); + + pv.u.pwszVal = guidstr; + MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); + RegCloseKey(keyprop); } RegCloseKey(key); diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index a16dee1..482e439 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -64,6 +64,23 @@ static void test_propertystore(IPropertyStore *store) ok(pv.vt == VT_EMPTY, "Key should not be found\n"); } +static void test_deviceinterface(IPropertyStore *store) +{ + HRESULT hr; + PROPVARIANT pv; + + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + + pv.vt = VT_EMPTY; + hr = IPropertyStore_GetValue(store, &deviceinterface_key, &pv); + ok(hr == S_OK, "GetValue failed: %08x\n", hr); + ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); + trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); + CoTaskMemFree(pv.u.pwszVal); +} + START_TEST(propstore) { HRESULT hr; @@ -109,6 +126,7 @@ START_TEST(propstore) if (store) { test_propertystore(store); + test_deviceinterface(store); IPropertyStore_Release(store); } IMMDevice_Release(dev);

1 0

Andrew Eikum : winmm: Support DRV_QUERYDEVICEINTERFACE in waveXxxMessage.
by Alexandre Julliard 06 Apr '12

06 Apr '12

Module: wine Branch: master Commit: d022cc1ddfecd7c8a942ea29d18e0cdb0fe5a5de URL: http://source.winehq.org/git/wine.git/?a=commit;h=d022cc1ddfecd7c8a942ea29d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Apr 5 14:16:44 2012 -0500 winmm: Support DRV_QUERYDEVICEINTERFACE in waveXxxMessage. --- dlls/winmm/tests/wave.c | 4 +- dlls/winmm/waveform.c | 129 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 8a070b3..111dd1c 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -919,8 +919,8 @@ static void wave_out_test_device(UINT_PTR device) nameA=NULL; rc=waveOutMessage((HWAVEOUT)device, DRV_QUERYDEVICEINTERFACESIZE, (DWORD_PTR)&size, 0); - ok(rc==MMSYSERR_NOERROR || rc==MMSYSERR_INVALPARAM || - rc==MMSYSERR_NOTSUPPORTED, + ok(rc==MMSYSERR_NOERROR || broken(rc==MMSYSERR_INVALPARAM || + rc==MMSYSERR_NOTSUPPORTED), "waveOutMessage(%s): failed to get interface size, rc=%s\n", dev_name(device),wave_out_error(rc)); if (rc==MMSYSERR_NOERROR) { diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index c7d3118..d4dc9aa 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -169,6 +169,13 @@ typedef struct _WINMM_ControlDetails { DWORD flags; } WINMM_ControlDetails; +typedef struct _WINMM_QueryInterfaceInfo { + BOOL is_out; + UINT index; + WCHAR *str; + UINT *len_bytes; +} WINMM_QueryInterfaceInfo; + static LRESULT WOD_Open(WINMM_OpenInfo *info); static LRESULT WOD_Close(HWAVEOUT hwave); static LRESULT WID_Open(WINMM_OpenInfo *info); @@ -2014,6 +2021,92 @@ static LRESULT MXD_SetControlDetails(WINMM_ControlDetails *details) return MMSYSERR_NOERROR; } +static LRESULT DRV_QueryDeviceInterface(WINMM_QueryInterfaceInfo *info) +{ + WINMM_MMDevice *mmdevice; + IMMDevice *device; + IPropertyStore *ps; + PROPVARIANT pv; + DWORD len_bytes; + HRESULT hr; + + static const PROPERTYKEY deviceinterface_key = { + {0x233164c8, 0x1b2c, 0x4c7d, {0xbc, 0x68, 0xb6, 0x71, 0x68, 0x7a, 0x25, 0x67}}, 1 + }; + + if(WINMM_IsMapper(info->index)){ + if(info->str){ + if(*info->len_bytes < sizeof(WCHAR)) + return MMSYSERR_INVALPARAM; + *info->str = 0; + }else + *info->len_bytes = sizeof(WCHAR); + return MMSYSERR_NOERROR; + } + + if(info->is_out){ + if(info->index >= g_outmmdevices_count) + return MMSYSERR_INVALHANDLE; + + mmdevice = &g_out_mmdevices[info->index]; + }else{ + if(info->index >= g_inmmdevices_count) + return MMSYSERR_INVALHANDLE; + + mmdevice = &g_in_mmdevices[info->index]; + } + + hr = IMMDeviceEnumerator_GetDevice(g_devenum, mmdevice->dev_id, + &device); + if(FAILED(hr)){ + WARN("Device %s unavailable: %08x\n", wine_dbgstr_w(mmdevice->dev_id), hr); + return MMSYSERR_ERROR; + } + + hr = IMMDevice_OpenPropertyStore(device, STGM_READ, &ps); + if(FAILED(hr)){ + WARN("OpenPropertyStore failed: %08x\n", hr); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + + PropVariantInit(&pv); + hr = IPropertyStore_GetValue(ps, &deviceinterface_key, &pv); + if(FAILED(hr)){ + WARN("GetValue failed: %08x\n", hr); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + if(pv.vt != VT_LPWSTR){ + WARN("Got unexpected property type: %u\n", pv.vt); + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_ERROR; + } + + len_bytes = (lstrlenW(pv.u.pwszVal) + 1) * sizeof(WCHAR); + + if(info->str){ + if(len_bytes > *info->len_bytes){ + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + return MMSYSERR_INVALPARAM; + } + + memcpy(info->str, pv.u.pwszVal, len_bytes); + }else + *info->len_bytes = len_bytes; + + PropVariantClear(&pv); + IPropertyStore_Release(ps); + IMMDevice_Release(device); + + return MMSYSERR_NOERROR; +} + static LRESULT CALLBACK WINMM_DevicesMsgProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { @@ -2030,6 +2123,9 @@ static LRESULT CALLBACK WINMM_DevicesMsgProc(HWND hwnd, UINT msg, WPARAM wparam, return MXD_GetControlDetails((WINMM_ControlDetails*)wparam); case MXDM_SETCONTROLDETAILS: return MXD_SetControlDetails((WINMM_ControlDetails*)wparam); + case DRV_QUERYDEVICEINTERFACESIZE: + case DRV_QUERYDEVICEINTERFACE: + return DRV_QueryDeviceInterface((WINMM_QueryInterfaceInfo*)wparam); } return DefWindowProcW(hwnd, msg, wparam, lparam); } @@ -2781,6 +2877,21 @@ static UINT WINMM_QueryInstanceID(UINT device, WCHAR *str, DWORD_PTR len, return MMSYSERR_NOERROR; } +static UINT get_device_interface(UINT msg, BOOL is_out, UINT index, WCHAR *out, ULONG *out_len) +{ + WINMM_QueryInterfaceInfo info; + + if(!WINMM_StartDevicesThread()) + return MMSYSERR_ERROR; + + info.is_out = is_out; + info.index = index; + info.str = out; + info.len_bytes = out_len; + + return SendMessageW(g_devices_hwnd, msg, (DWORD_PTR)&info, 0); +} + /************************************************************************** * waveOutMessage [WINMM.@] */ @@ -2795,6 +2906,15 @@ UINT WINAPI waveOutMessage(HWAVEOUT hWaveOut, UINT uMessage, (DWORD_PTR*)dwParam1, TRUE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveOut), (WCHAR*)dwParam1, dwParam2, TRUE); + case DRV_QUERYDEVICEINTERFACESIZE: + return get_device_interface(DRV_QUERYDEVICEINTERFACESIZE, TRUE, HandleToULong(hWaveOut), + NULL, (ULONG*)dwParam1); + case DRV_QUERYDEVICEINTERFACE: + { + ULONG size = dwParam2; + return get_device_interface(DRV_QUERYDEVICEINTERFACE, TRUE, HandleToULong(hWaveOut), + (WCHAR*)dwParam1, &size); + } case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET: @@ -3185,6 +3305,15 @@ UINT WINAPI waveInMessage(HWAVEIN hWaveIn, UINT uMessage, (DWORD_PTR*)dwParam1, FALSE); case DRV_QUERYFUNCTIONINSTANCEID: return WINMM_QueryInstanceID(HandleToULong(hWaveIn), (WCHAR*)dwParam1, dwParam2, FALSE); + case DRV_QUERYDEVICEINTERFACESIZE: + return get_device_interface(DRV_QUERYDEVICEINTERFACESIZE, FALSE, HandleToULong(hWaveIn), + NULL, (ULONG*)dwParam1); + case DRV_QUERYDEVICEINTERFACE: + { + ULONG size = dwParam2; + return get_device_interface(DRV_QUERYDEVICEINTERFACE, FALSE, HandleToULong(hWaveIn), + (WCHAR*)dwParam1, &size); + } case DRV_QUERYMAPPABLE: return MMSYSERR_NOERROR; case DRVM_MAPPER_PREFERRED_GET:

1 0