July 2010 - Wine-commits - list.winehq.org

Vincent Povirk : ole32: Remove an unused variable.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: b7dbfcbd48bd7d4352c2ff188805972f732f2b17 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7dbfcbd48bd7d4352c2ff188… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:01:00 2010 -0500 ole32: Remove an unused variable. --- dlls/ole32/storage32.c | 2 -- dlls/ole32/storage32.h | 6 ------ 2 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 0eefb09..64db9f6 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -2673,8 +2673,6 @@ static HRESULT StorageImpl_Construct( This->base.reverted = 0; - This->hFile = hFile; - /* * Initialize the big block cache. */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 7f0a6d5..4baa099 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -336,12 +336,6 @@ struct StorageImpl struct StorageBaseImpl base; /* - * The following data members are specific to the Storage32Impl - * class - */ - HANDLE hFile; /* Physical support for the Docfile */ - - /* * File header */ WORD bigBlockSizeBits;

1 0

Vincent Povirk : ole32: Flush the ILockBytes object of a storage on commit and final release.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 5116b979b212981efa5312ac0fa47147d92f9295 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5116b979b212981efa5312ac0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Jul 17 13:07:21 2010 -0500 ole32: Flush the ILockBytes object of a storage on commit and final release. Some ILockBytes objects will not really write changes until their Flush method is called. Also, further optimizations to the storage implementation will involve caching writes, which will have to be flushed at times. --- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage32.c | 55 +++++++++++++++++++++++++++++++++++++++------- dlls/ole32/storage32.h | 6 +++++ 3 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index bfecbc7..1fdb963 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -517,7 +517,7 @@ static HRESULT WINAPI StgStreamImpl_Commit( return STG_E_REVERTED; } - return S_OK; + return StorageBaseImpl_Flush(This->parentStorage); } /*** diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 64db9f6..185b8b0 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -92,6 +92,7 @@ static StorageInternalImpl* StorageInternalImpl_Construct(StorageBaseImpl* paren DWORD openFlags, DirRef storageDirEntry); static void StorageImpl_Destroy(StorageBaseImpl* iface); static void StorageImpl_Invalidate(StorageBaseImpl* iface); +static HRESULT StorageImpl_Flush(StorageBaseImpl* iface); static BOOL StorageImpl_ReadBigBlock(StorageImpl* This, ULONG blockIndex, void* buffer); static BOOL StorageImpl_WriteBigBlock(StorageImpl* This, ULONG blockIndex, const void* buffer); static void StorageImpl_SetNextBlockInChain(StorageImpl* This, ULONG blockIndex, ULONG nextBlock); @@ -1815,16 +1816,15 @@ static HRESULT WINAPI StorageBaseImpl_MoveElementTo( * Ensures that any changes made to a storage object open in transacted mode * are reflected in the parent storage * - * NOTES - * Wine doesn't implement transacted mode, which seems to be a basic - * optimization, so we can ignore this stub for now. + * In a non-transacted mode, this ensures all cached writes are completed. */ static HRESULT WINAPI StorageImpl_Commit( IStorage* iface, DWORD grfCommitFlags)/* [in] */ { - FIXME("(%p %d): stub\n", iface, grfCommitFlags); - return S_OK; + StorageBaseImpl* const base=(StorageBaseImpl*)iface; + TRACE("(%p %d)\n", iface, grfCommitFlags); + return StorageBaseImpl_Flush(base); } /************************************************************************* @@ -2625,6 +2625,7 @@ static const StorageBaseImplVtbl StorageImpl_BaseVtbl = { StorageImpl_Destroy, StorageImpl_Invalidate, + StorageImpl_Flush, StorageImpl_GetFilename, StorageImpl_CreateDirEntry, StorageImpl_BaseWriteDirEntry, @@ -2868,6 +2869,8 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) int i; TRACE("(%p)\n", This); + StorageImpl_Flush(iface); + StorageImpl_Invalidate(iface); BlockChainStream_Destroy(This->smallBlockRootChain); @@ -2882,6 +2885,13 @@ static void StorageImpl_Destroy(StorageBaseImpl* iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageImpl_Flush(StorageBaseImpl* iface) +{ + StorageImpl *This = (StorageImpl*) iface; + + return ILockBytes_Flush(This->lockBytes); +} + /****************************************************************************** * Storage32Impl_GetNextFreeBigBlock * @@ -4525,9 +4535,12 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( else dir_root_ref = This->entries[root_entry->data.dirRootEntry].newTransactedParentEntry; + hr = StorageBaseImpl_Flush(This->transactedParent); + /* Update the storage to use the new data in one step. */ - hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, - root_entry->transactedParentEntry, &data); + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_ReadDirEntry(This->transactedParent, + root_entry->transactedParentEntry, &data); if (SUCCEEDED(hr)) { @@ -4540,6 +4553,11 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( root_entry->transactedParentEntry, &data); } + /* Try to flush after updating the root storage, but if the flush fails, keep + * going, on the theory that it'll either succeed later or the subsequent + * writes will fail. */ + StorageBaseImpl_Flush(This->transactedParent); + if (SUCCEEDED(hr)) { /* Destroy the old now-orphaned data. */ @@ -4579,6 +4597,9 @@ static HRESULT WINAPI TransactedSnapshotImpl_Commit( TransactedSnapshotImpl_DestroyTemporaryCopy(This, DIRENTRY_NULL); } + if (SUCCEEDED(hr)) + hr = StorageBaseImpl_Flush(This->transactedParent); + return hr; } @@ -4642,6 +4663,12 @@ static void TransactedSnapshotImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT TransactedSnapshotImpl_Flush(StorageBaseImpl* iface) +{ + /* We only need to flush when committing. */ + return S_OK; +} + static HRESULT TransactedSnapshotImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) { TransactedSnapshotImpl* This = (TransactedSnapshotImpl*) iface; @@ -4896,6 +4923,7 @@ static const StorageBaseImplVtbl TransactedSnapshotImpl_BaseVtbl = { TransactedSnapshotImpl_Destroy, TransactedSnapshotImpl_Invalidate, + TransactedSnapshotImpl_Flush, TransactedSnapshotImpl_GetFilename, TransactedSnapshotImpl_CreateDirEntry, TransactedSnapshotImpl_WriteDirEntry, @@ -5042,6 +5070,13 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) HeapFree(GetProcessHeap(), 0, This); } +static HRESULT StorageInternalImpl_Flush(StorageBaseImpl* iface) +{ + StorageInternalImpl* This = (StorageInternalImpl*) iface; + + return StorageBaseImpl_Flush(This->parentStorage); +} + static HRESULT StorageInternalImpl_GetFilename(StorageBaseImpl* iface, LPWSTR *result) { StorageInternalImpl* This = (StorageInternalImpl*) iface; @@ -5130,8 +5165,9 @@ static HRESULT WINAPI StorageInternalImpl_Commit( IStorage* iface, DWORD grfCommitFlags) /* [in] */ { - FIXME("(%p,%x): stub\n", iface, grfCommitFlags); - return S_OK; + StorageBaseImpl* base = (StorageBaseImpl*) iface; + TRACE("(%p,%x)\n", iface, grfCommitFlags); + return StorageBaseImpl_Flush(base); } /****************************************************************************** @@ -5474,6 +5510,7 @@ static const StorageBaseImplVtbl StorageInternalImpl_BaseVtbl = { StorageInternalImpl_Destroy, StorageInternalImpl_Invalidate, + StorageInternalImpl_Flush, StorageInternalImpl_GetFilename, StorageInternalImpl_CreateDirEntry, StorageInternalImpl_WriteDirEntry, diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index 4baa099..9e7fe10 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -234,6 +234,7 @@ struct StorageBaseImpl struct StorageBaseImplVtbl { void (*Destroy)(StorageBaseImpl*); void (*Invalidate)(StorageBaseImpl*); + HRESULT (*Flush)(StorageBaseImpl*); HRESULT (*GetFilename)(StorageBaseImpl*,LPWSTR*); HRESULT (*CreateDirEntry)(StorageBaseImpl*,const DirEntry*,DirRef*); HRESULT (*WriteDirEntry)(StorageBaseImpl*,DirRef,const DirEntry*); @@ -255,6 +256,11 @@ static inline void StorageBaseImpl_Invalidate(StorageBaseImpl *This) This->baseVtbl->Invalidate(This); } +static inline HRESULT StorageBaseImpl_Flush(StorageBaseImpl *This) +{ + return This->baseVtbl->Flush(This); +} + static inline HRESULT StorageBaseImpl_GetFilename(StorageBaseImpl *This, LPWSTR *result) { return This->baseVtbl->GetFilename(This, result);

1 0

Piotr Caban : msxml3: Improve QName_from_xmlChar implementation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: bf263947e7eff1351e7b9bc6a43c7beb9b3746f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf263947e7eff1351e7b9bc6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:06:27 2010 +0200 msxml3: Improve QName_from_xmlChar implementation. --- dlls/msxml3/saxreader.c | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b81a47e..a09f4ea 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -180,7 +180,6 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) { DWORD dLen, dLast; - LPWSTR str; BSTR bstr; if(!name) return NULL; @@ -190,16 +189,13 @@ static BSTR QName_from_xmlChar(const xmlChar *prefix, const xmlChar *name) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, NULL, 0) + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, NULL, 0); - str = heap_alloc(dLen * sizeof(WCHAR)); - if(!str) + bstr = SysAllocStringLen(NULL, dLen-1); + if(!bstr) return NULL; - dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, str, dLen); - str[dLast-1] = ':'; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &str[dLast], dLen-dLast); - bstr = SysAllocString(str); - - heap_free(str); + dLast = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)prefix, -1, bstr, dLen); + bstr[dLast-1] = ':'; + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)name, -1, &bstr[dLast], dLen-dLast); return bstr; }

1 0

Piotr Caban : msxml3: Improve bstr_from_xmlCharN implementation.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 7a22365674612122896ec5005406a45c25995de4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a22365674612122896ec5005… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:06:53 2010 +0200 msxml3: Improve bstr_from_xmlCharN implementation. --- dlls/msxml3/saxreader.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a09f4ea..5381d95 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -158,7 +158,6 @@ static int namespacePop(saxlocator *locator) static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) { DWORD dLen; - LPWSTR str; BSTR bstr; if (!buf) @@ -166,13 +165,11 @@ static BSTR bstr_from_xmlCharN(const xmlChar *buf, int len) dLen = MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, NULL, 0); if(len != -1) dLen++; - str = heap_alloc(dLen * sizeof (WCHAR)); - if (!str) + bstr = SysAllocStringLen(NULL, dLen-1); + if (!bstr) return NULL; - MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, str, dLen); - if(len != -1) str[dLen-1] = '\0'; - bstr = SysAllocString(str); - heap_free(str); + MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)buf, len, bstr, dLen); + if(len != -1) bstr[dLen-1] = '\0'; return bstr; }

1 0

Piotr Caban : wininet: Fix reporting errors in callbacks.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 3cfc7132be4709a199ed81bb883503a1715fea09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cfc7132be4709a199ed81bb8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:07:43 2010 +0200 wininet: Fix reporting errors in callbacks. --- dlls/wininet/http.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 54895bb..fc6e351 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3685,7 +3685,7 @@ lend: HTTP_ReceiveRequestData(lpwhr, TRUE); else { - iar.dwResult = 0; + iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)lpwhr->hdr.hInternet : 0); iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, @@ -3769,7 +3769,7 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *lpwhr, DWORD dwFlags, DWORD_PT } } - iar.dwResult = (DWORD_PTR)lpwhr->hdr.hInternet; + iar.dwResult = (res==ERROR_SUCCESS ? (DWORD_PTR)lpwhr->hdr.hInternet : 0); iar.dwError = res; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext,

1 0

Piotr Caban : wininet: Delete authorization data on unsucessful login.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 98fb747aa9a2d04cbb676ef6ee4a4e91fbad1a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98fb747aa9a2d04cbb676ef6e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Jul 17 14:08:11 2010 +0200 wininet: Delete authorization data on unsucessful login. --- dlls/wininet/http.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index fc6e351..57c4f75 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3621,6 +3621,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, break; } } + + if(!loop_next) { + TRACE("Cleaning wrong authorization data\n"); + destroy_authinfo(lpwhr->pAuthInfo); + lpwhr->pAuthInfo = NULL; + } } if (dwStatusCode == HTTP_STATUS_PROXY_AUTH_REQ) { @@ -3637,6 +3643,12 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *lpwhr, LPCWSTR lpszHeaders, break; } } + + if(!loop_next) { + TRACE("Cleaning wrong proxy authorization data\n"); + destroy_authinfo(lpwhr->pProxyAuthInfo); + lpwhr->pProxyAuthInfo = NULL; + } } } }

1 0

Vincent Povirk : oleaut32: Add test for dibs vs. ddbs in IPicture.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 6799aaf34a0d599492ea7e8dabae1cb3c77a1f96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6799aaf34a0d599492ea7e8da… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 14:19:28 2010 -0500 oleaut32: Add test for dibs vs. ddbs in IPicture. --- dlls/oleaut32/tests/olepicture.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index ab4fb48..2259437 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -216,6 +216,13 @@ test_pic_with_stream(LPSTREAM stream, unsigned int imgsize) ok(hres == S_OK,"IPicture_get_Handle does not return S_OK, but 0x%08x\n", hres); ok(handle != 0, "IPicture_get_Handle returns a NULL handle, but it should be non NULL\n"); + if (handle) + { + BITMAP bmp; + GetObject((HGDIOBJ)handle, sizeof(BITMAP), &bmp); + todo_wine ok(bmp.bmBits != 0, "not a dib\n"); + } + width = 0; hres = IPicture_get_Width (pic, &width); ok(hres == S_OK,"IPicture_get_Width does not return S_OK, but 0x%08x\n", hres);

1 0

Vincent Povirk : user32: Don' t dump structures of some ambiguous listview messages.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 1ebdd6b94506237f5f687e4b48f1e29df5916730 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ebdd6b94506237f5f687e4b4… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 15:11:04 2010 -0500 user32: Don't dump structures of some ambiguous listview messages. --- dlls/user32/spy.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 1ed768f..26bd741 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2329,13 +2329,10 @@ static void SPY_DumpStructure(const SPY_INSTANCE *sp_e, BOOL enter) switch (sp_e->msgnum) { case LVM_INSERTITEMW: - case LVM_INSERTITEMA: case LVM_SETITEMW: - case LVM_SETITEMA: if (!enter) break; /* fall through */ case LVM_GETITEMW: - case LVM_GETITEMA: { LPLVITEMA item = (LPLVITEMA) sp_e->lParam; if (item) {

1 0

Vincent Povirk : shell32: Don' t access szFullPath when SHGFI_PIDL is set in SHGetFileInfo.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 537bfbf4946837ce8739b5722c22f0d45abceacf URL: http://source.winehq.org/git/wine.git/?a=commit;h=537bfbf4946837ce8739b5722… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jul 16 15:36:30 2010 -0500 shell32: Don't access szFullPath when SHGFI_PIDL is set in SHGetFileInfo. --- dlls/shell32/shell32_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 2824268..75b9c7e 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -436,7 +436,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, /* get the displayname */ if (SUCCEEDED(hr) && (flags & SHGFI_DISPLAYNAME)) { - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { lstrcpyW (psfi->szDisplayName, PathFindFileNameW(szFullPath)); } @@ -455,7 +455,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, static const WCHAR szFile[] = { 'F','i','l','e',0 }; static const WCHAR szDashFile[] = { '-','f','i','l','e',0 }; - if (!(flags & SHGFI_USEFILEATTRIBUTES)) + if (!(flags & SHGFI_USEFILEATTRIBUTES) || (flags & SHGFI_PIDL)) { char ftype[80]; @@ -508,7 +508,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, { UINT uDummy,uFlags; - if (flags & SHGFI_USEFILEATTRIBUTES) + if (flags & SHGFI_USEFILEATTRIBUTES && !(flags & SHGFI_PIDL)) { if (dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {

1 0

Eric Pouech : wineoss.drv: Be consistent for aux devices about what we actually support.
by Alexandre Julliard 19 Jul '10

19 Jul '10

Module: wine Branch: master Commit: 06b6e3bdc7eef6c05d46ac31104ecad35ed64be1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b6e3bdc7eef6c05d46ac311… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Fri Jul 16 21:12:34 2010 +0200 wineoss.drv: Be consistent for aux devices about what we actually support. --- dlls/wineoss.drv/mmaux.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wineoss.drv/mmaux.c b/dlls/wineoss.drv/mmaux.c index 3554ffb..e48df5d 100644 --- a/dlls/wineoss.drv/mmaux.c +++ b/dlls/wineoss.drv/mmaux.c @@ -78,10 +78,11 @@ static LRESULT OSS_AuxExit(void) static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) { int mixer, volume; - static const WCHAR ini[] = {'O','S','S',' ','A','u','x',0}; + static const WCHAR ini[] = {'O','S','S',' ','A','u','x',' ','#','0',0}; TRACE("(%04X, %p, %u);\n", wDevID, lpCaps, dwSize); if (lpCaps == NULL) return MMSYSERR_NOTENABLED; + if (wDevID >= NumDev) return MMSYSERR_BADDEVICEID; if ((mixer = open(MIXER_DEV, O_RDWR)) < 0) { WARN("mixer device not available !\n"); return MMSYSERR_NOTENABLED; @@ -93,10 +94,11 @@ static DWORD AUX_GetDevCaps(WORD wDevID, LPAUXCAPSW lpCaps, DWORD dwSize) } close(mixer); lpCaps->wMid = 0xAA; - lpCaps->wPid = 0x55; + lpCaps->wPid = 0x55 + wDevID; lpCaps->vDriverVersion = 0x0100; strcpyW(lpCaps->szPname, ini); - lpCaps->wTechnology = AUXCAPS_CDAUDIO; + lpCaps->szPname[9] = '0' + wDevID; /* 6 at max */ + lpCaps->wTechnology = wDevID == 2 ? AUXCAPS_CDAUDIO : AUXCAPS_AUXIN; lpCaps->dwSupport = AUXCAPS_VOLUME | AUXCAPS_LRVOLUME; return MMSYSERR_NOERROR;

1 0