February 2010 - Wine-commits

Alexander Nicolaysen Sørnes : dsound/ tests: DirectSound3DListener_QueryInterface should accept IKsPropertySet.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 1db6e112546ae61e5dbe636f04cbe3ab4a480955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1db6e112546ae61e5dbe636f0… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Feb 10 14:59:28 2010 +0100 dsound/tests: DirectSound3DListener_QueryInterface should accept IKsPropertySet. --- dlls/dsound/tests/ds3d.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 71ff2ab..8ae0efa 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1195,6 +1195,16 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) winetest_interactive && !(dscaps.dwFlags & DSCAPS_EMULDRIVER),1.0,0, listener,0,0,FALSE,0); + + todo_wine { + temp_buffer = NULL; + rc=IDirectSound3DListener_QueryInterface(listener, + &IID_IKsPropertySet,(LPVOID *)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSound3DListener_QueryInterface didn't handle IKsPropertySet: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); + } } /* Testing the reference counting */

1 0

Christian Costa : d3dx9: Add definition for ID3DXConstantTable.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 6b890be5512e748412a0e21ed3f0329f1aef3057 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b890be5512e748412a0e21ed… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Feb 11 07:38:02 2010 +0100 d3dx9: Add definition for ID3DXConstantTable. --- include/d3dx9shader.h | 132 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 132 insertions(+), 0 deletions(-) diff --git a/include/d3dx9shader.h b/include/d3dx9shader.h index a15cab6..78abec8 100644 --- a/include/d3dx9shader.h +++ b/include/d3dx9shader.h @@ -44,6 +44,15 @@ typedef LPCSTR D3DXHANDLE; +typedef enum _D3DXREGISTER_SET +{ + D3DXRS_BOOL, + D3DXRS_INT4, + D3DXRS_FLOAT4, + D3DXRS_SAMPLER, + D3DXRS_FORCE_DWORD = 0x7fffffff +} D3DXREGISTER_SET, *LPD3DXREGISTER_SET; + typedef enum D3DXPARAMETER_CLASS { D3DXPC_SCALAR, @@ -80,6 +89,129 @@ typedef enum D3DXPARAMETER_TYPE D3DXPT_FORCE_DWORD = 0x7fffffff, } D3DXPARAMETER_TYPE, *LPD3DXPARAMETER_TYPE; +typedef struct _D3DXCONSTANTTABLE_DESC +{ + LPCSTR Creator; + DWORD Version; + UINT Constants; +} D3DXCONSTANTTABLE_DESC, *LPD3DXCONSTANTTABLE_DESC; + +typedef struct _D3DXCONSTANT_DESC +{ + LPCSTR Name; + D3DXREGISTER_SET RegisterSet; + UINT RegisterIndex; + UINT RegisterCount; + D3DXPARAMETER_CLASS Class; + D3DXPARAMETER_TYPE Type; + UINT Rows; + UINT Columns; + UINT Elements; + UINT StructMembers; + UINT Bytes; + LPCVOID DefaultValue; +} D3DXCONSTANT_DESC, *LPD3DXCONSTANT_DESC; + +#undef INTERFACE +#define INTERFACE ID3DXConstantTable + +DECLARE_INTERFACE_(ID3DXConstantTable, ID3DXBuffer) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, LPVOID *ppv) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DXBuffer methods ***/ + STDMETHOD_(LPVOID, GetBufferPointer)(THIS) PURE; + STDMETHOD_(DWORD, GetBufferSize)(THIS) PURE; + /*** ID3DXConstantTable methods ***/ + STDMETHOD(GetDesc)(THIS_ D3DXCONSTANTTABLE_DESC *pDesc) PURE; + STDMETHOD(GetConstantDesc)(THIS_ D3DXHANDLE hConstant, D3DXCONSTANT_DESC *pConstantDesc, UINT *pCount) PURE; + STDMETHOD_(D3DXHANDLE, GetConstant)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; + STDMETHOD_(D3DXHANDLE, GetConstantByName)(THIS_ D3DXHANDLE hConstant, LPCSTR pName) PURE; + STDMETHOD_(D3DXHANDLE, GetConstantElement)(THIS_ D3DXHANDLE hConstant, UINT Index) PURE; + STDMETHOD(SetDefaults)(THIS_ LPDIRECT3DDEVICE9 pDevice) PURE; + STDMETHOD(SetValue)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, LPCVOID pData, UINT Bytes) PURE; + STDMETHOD(SetBool)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, BOOL b) PURE; + STDMETHOD(SetBoolArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST BOOL* pb, UINT Count) PURE; + STDMETHOD(SetInt)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, INT n) PURE; + STDMETHOD(SetIntArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST INT* pn, UINT Count) PURE; + STDMETHOD(SetFloat)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, FLOAT f) PURE; + STDMETHOD(SetFloatArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST FLOAT* pf, UINT Count) PURE; + STDMETHOD(SetVector)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector) PURE; + STDMETHOD(SetVectorArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXVECTOR4* pVector, UINT Count) PURE; + STDMETHOD(SetMatrix)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE; + STDMETHOD(SetMatrixArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixPointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixTranspose)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix) PURE; + STDMETHOD(SetMatrixTransposeArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX* pMatrix, UINT Count) PURE; + STDMETHOD(SetMatrixTransposePointerArray)(THIS_ LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, CONST D3DXMATRIX** ppMatrix, UINT Count) PURE; +}; + +#if !defined(__cplusplus) || defined(CINTERFACE) +/*** IUnknown methods ***/ +#define ID3DXConstantTable_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) +#define ID3DXConstantTable_AddRef(p) (p)->lpVtbl->AddRef(p,a) +#define ID3DXConstantTable_Release(p) (p)->lpVtbl->Release(p,a) +/*** ID3DXBuffer methods ***/ +#define ID3DXConstantTable_GetBufferPointer(p) (p)->lpVtbl->GetBufferPointer(p) +#define ID3DXConstantTable_GetBufferSize(p) (p)->lpVtbl->GetBufferSize(p) +/*** ID3DXConstantTable methods ***/ +#define ID3DXConstantTable_GetDesc(p,a) (p)->lpVtbl->GetDesc(p,a) +#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->lpVtbl->GetConstantDesc(p,a,b,c) +#define ID3DXConstantTable_GetConstant(p,a,b) (p)->lpVtbl->GetConstant(p,a,b) +#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->lpVtbl->GetConstantByName(p,a,b) +#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->lpVtbl->GetConstantElement(p,a,b) +#define ID3DXConstantTable_SetDefaults(p,a) (p)->lpVtbl->SetDefaults(p,a) +#define ID3DXConstantTable_SetValue(p,a,b,c,d) (p)->lpVtbl->SetValue(p,a,b,c,d) +#define ID3DXConstantTable_SetBool(p,a,b,c) (p)->lpVtbl->SetBool(p,a,b,c) +#define ID3DXConstantTable_SetBoolArray(p,a,b,c,d) (p)->lpVtbl->SetBoolArray(p,a,b,c,d) +#define ID3DXConstantTable_SetInt(p,a,b,c) (p)->lpVtbl->SetInt(p,a,b,c) +#define ID3DXConstantTable_SetIntArray(p,a,b,c,d) (p)->lpVtbl->SetIntArray(p,a,b,c,d) +#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->lpVtbl->SetFloat(p,a,b,c) +#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->lpVtbl->SetFloatArray(p,a,b,c,d) +#define ID3DXConstantTable_SetVector(p,a,b,c) (p)->lpVtbl->SetVector(p,a,b,c) +#define ID3DXConstantTable_SetVectorArray(p,a,b,c,d) (p)->lpVtbl->SetVectorArray(p,a,b,c,d) +#define ID3DXConstantTable_SetMatrix(p,a,b,c) (p)->lpVtbl->SetMatrix(p,a,b,c) +#define ID3DXConstantTable_SetMatrixArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixArray(p,a,b,c,d) +#define ID3DXConstantTable_SetMatrixPointerArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixPointerArray(p,a,b,c,d) +#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->lpVtbl->SetMatrixTranspose(p,a,b,c) +#define ID3DXConstantTable_SetMatrixTransposeArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixTransposeArray(p,a,b,c,d) +#define ID3DXConstantTable_SetMatrixTransposePointerArray(p,a,b,c,d) (p)->lpVtbl->SetMatrixTransposePointerArray(p,a,b,c,d) +#else +/*** IUnknown methods ***/ +#define ID3DXConstantTable_QueryInterface(p,a,b) (p)->QueryInterface(a,b) +#define ID3DXConstantTable_AddRef(p) (p)->AddRef(a) +#define ID3DXConstantTable_Release(p) (p)->Release(a) +/*** ID3DXBuffer methods ***/ +#define ID3DXConstantTable_GetBufferPointer(p) (p)->GetBufferPointer() +#define ID3DXConstantTable_GetBufferSize(p) (p)->GetBufferSize() +/*** ID3DXConstantTable methods ***/ +#define ID3DXConstantTable_GetDesc(p,a) (p)->GetDesc(a) +#define ID3DXConstantTable_GetConstantDesc(p,a,b,c) (p)->GetConstantDesc(a,b,c) +#define ID3DXConstantTable_GetConstant(p,a,b) (p)->GetConstant(a,b) +#define ID3DXConstantTable_GetConstantByName(p,a,b) (p)->GetConstantByName(a,b) +#define ID3DXConstantTable_GetConstantElement(p,a,b) (p)->GetConstantElement(a,b) +#define ID3DXConstantTable_SetDefaults(p,a) (p)->SetDefaults(a) +#define ID3DXConstantTable_SetValue(p,a,b,c,d) (p)->SetValue(a,b,c,d) +#define ID3DXConstantTable_SetBool(p,a,b,c) (p)->SetBool(a,b,c) +#define ID3DXConstantTable_SetBoolArray(p,a,b,c,d) (p)->SetBoolArray(a,b,c,d) +#define ID3DXConstantTable_SetInt(p,a,b,c) (p)->SetInt(a,b,c) +#define ID3DXConstantTable_SetIntArray(p,a,b,c,d) (p)->SetIntArray(a,b,c,d) +#define ID3DXConstantTable_SetFloat(p,a,b,c) (p)->SetFloat(a,b,c) +#define ID3DXConstantTable_SetFloatArray(p,a,b,c,d) (p)->SetFloatArray(a,b,c,d) +#define ID3DXConstantTable_SetVector(p,a,b,c) (p)->SetVector(a,b,c) +#define ID3DXConstantTable_SetVectorArray(p,a,b,c,d) (p)->SetVectorArray(a,b,c,d) +#define ID3DXConstantTable_SetMatrix(p,a,b,c) (p)->SetMatrix(a,b,c) +#define ID3DXConstantTable_SetMatrixArray(p,a,b,c,d) (p)->SetMatrixArray(a,b,c,d) +#define ID3DXConstantTable_SetMatrixPointerArray(p,a,b,c,d) (p)->SetMatrixPointerArray(a,b,c,d) +#define ID3DXConstantTable_SetMatrixTranspose(p,a,b,c) (p)->>SetMatrixTranspose(a,b,c) +#define ID3DXConstantTable_SetMatrixTransposeArray(p,a,b,c,d) (p)->SetMatrixTransposeArray(a,b,c,d) +#define ID3DXConstantTable_SetMatrixTransposePointerArray(p,a,b,c,d) (p)->SetMatrixTransposePointerArray(a,b,c,d) +#endif + +typedef struct ID3DXConstantTable *LPD3DXCONSTANTTABLE; + typedef struct _D3DXMACRO { LPCSTR Name; LPCSTR Definition;

1 0

Christian Costa : d3dx9_36: Add stub for D3DXCompileShader.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 8f63f180c9b1de022909f31c3da7787e7ecc9b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f63f180c9b1de022909f31c3… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Thu Feb 11 07:38:08 2010 +0100 d3dx9_36: Add stub for D3DXCompileShader. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/shader.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index 08bb7f5..37334e7 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -11,7 +11,7 @@ @ stub D3DXCleanMesh @ stdcall D3DXColorAdjustContrast(ptr ptr long) @ stdcall D3DXColorAdjustSaturation(ptr ptr long) -@ stub D3DXCompileShader +@ stdcall D3DXCompileShader(ptr long ptr ptr ptr ptr long ptr ptr ptr) @ stub D3DXCompileShaderFromFileA @ stub D3DXCompileShaderFromFileW @ stub D3DXCompileShaderFromResourceA diff --git a/dlls/d3dx9_36/shader.c b/dlls/d3dx9_36/shader.c index c05f7b7..bd41013 100644 --- a/dlls/d3dx9_36/shader.c +++ b/dlls/d3dx9_36/shader.c @@ -220,3 +220,20 @@ HRESULT WINAPI D3DXAssembleShaderFromResourceW(HMODULE module, return D3DXAssembleShader(buffer, len, defines, include, flags, shader, error_messages); } + +HRESULT WINAPI D3DXCompileShader(LPCSTR pSrcData, + UINT srcDataLen, + CONST D3DXMACRO* pDefines, + LPD3DXINCLUDE pInclude, + LPCSTR pFunctionName, + LPCSTR pProfile, + DWORD Flags, + LPD3DXBUFFER* ppShader, + LPD3DXBUFFER* ppErrorMsgs, + LPD3DXCONSTANTTABLE * ppConstantTable) +{ + FIXME("(%p, %d, %p, %p, %p, %p, %d, %p, %p, %p): stub\n", + pSrcData, srcDataLen, pDefines, pInclude, pFunctionName, + pProfile, Flags, ppShader, ppErrorMsgs, ppConstantTable); + return D3DERR_INVALIDCALL; +}

1 0

Jörg Höhle : midimap: Obey the size parameter in GetDevCaps.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 788d8720e7972a1986589d6fbf2841da6f1e13fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=788d8720e7972a1986589d6fb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 10 08:55:00 2010 +0100 midimap: Obey the size parameter in GetDevCaps. --- dlls/midimap/midimap.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 129427f..24fc645 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -448,18 +448,16 @@ static DWORD modSetVolume(MIDIMAPDATA* mom, DWORD dwVolume) static DWORD modGetDevCaps(UINT wDevID, MIDIMAPDATA* mom, LPMIDIOUTCAPSW lpMidiCaps, DWORD_PTR size) { - static const WCHAR name[] = {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}; - lpMidiCaps->wMid = 0x00FF; - lpMidiCaps->wPid = 0x0001; - lpMidiCaps->vDriverVersion = 0x0100; - lstrcpyW(lpMidiCaps->szPname, name); - lpMidiCaps->wTechnology = MOD_MAPPER; - lpMidiCaps->wVoices = 0; - lpMidiCaps->wNotes = 0; - lpMidiCaps->wChannelMask = 0xFFFF; - /* Native returns volume caps of underlying device | MIDICAPS_STREAM */ - lpMidiCaps->dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; - + static const MIDIOUTCAPSW mappercaps = { + 0x00FF, 0x0001, 0x0100, /* Manufacturer and Product ID */ + {'W','i','n','e',' ','m','i','d','i',' ','m','a','p','p','e','r',0}, + MOD_MAPPER, 0, 0, 0xFFFF, + /* Native returns volume caps of underlying device + MIDICAPS_STREAM */ + MIDICAPS_VOLUME|MIDICAPS_LRVOLUME + }; + if (lpMidiCaps == NULL) return MMSYSERR_INVALPARAM; + + memcpy(lpMidiCaps, &mappercaps, min(size, sizeof(*lpMidiCaps))); return MMSYSERR_NOERROR; }

1 0

Jörg Höhle : midimap: Implement callback/ notification.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: a8b80787047a87b62355b8524d68979ae19a2adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8b80787047a87b62355b8524… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 10 19:42:15 2010 +0100 midimap: Implement callback/notification. --- dlls/midimap/midimap.c | 24 +++++++++++++++++++----- dlls/winmm/tests/midi.c | 6 ------ 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 24fc645..77b8596 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -92,6 +92,8 @@ typedef struct tagMIDIMAPDATA { struct tagMIDIMAPDATA* self; MIDIOUTPORT* ChannelMap[16]; + MIDIOPENDESC midiDesc; + WORD wCbFlags; } MIDIMAPDATA; static MIDIOUTPORT* midiOutPorts; @@ -258,6 +260,13 @@ static BOOL MIDIMAP_LoadSettings(MIDIMAPDATA* mom) return ret; } +static void MIDIMAP_NotifyClient(MIDIMAPDATA* mom, WORD wMsg, + DWORD_PTR dwParam1, DWORD_PTR dwParam2) +{ + DriverCallback(mom->midiDesc.dwCallback, mom->wCbFlags, (HDRVR)mom->midiDesc.hMidi, + wMsg, mom->midiDesc.dwInstance, dwParam1, dwParam2); +} + static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) { MIDIMAPDATA* mom = HeapAlloc(GetProcessHeap(), 0, sizeof(MIDIMAPDATA)); @@ -265,11 +274,9 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) TRACE("(%p %p %08x)\n", lpdwUser, lpDesc, dwFlags); if (!mom) return MMSYSERR_NOMEM; - - if (HIWORD(dwFlags & CALLBACK_TYPEMASK)) { - FIXME("NIY callback flags %08x\n", dwFlags); + if (!lpDesc) { HeapFree(GetProcessHeap(), 0, mom); - return MMSYSERR_INVALFLAG; + return MMSYSERR_INVALPARAM; } if (MIDIMAP_LoadSettings(mom)) @@ -277,6 +284,10 @@ static DWORD modOpen(DWORD_PTR *lpdwUser, LPMIDIOPENDESC lpDesc, DWORD dwFlags) *lpdwUser = (DWORD_PTR)mom; mom->self = mom; + mom->wCbFlags = HIWORD(dwFlags & CALLBACK_TYPEMASK); + mom->midiDesc = *lpDesc; + MIDIMAP_NotifyClient(mom, MOM_OPEN, 0L, 0L); + return MMSYSERR_NOERROR; } HeapFree(GetProcessHeap(), 0, mom); @@ -305,8 +316,10 @@ static DWORD modClose(MIDIMAPDATA* mom) ret = t; } } - if (ret == MMSYSERR_NOERROR) + if (ret == MMSYSERR_NOERROR) { + MIDIMAP_NotifyClient(mom, MOM_CLOSE, 0L, 0L); HeapFree(GetProcessHeap(), 0, mom); + } return ret; } @@ -342,6 +355,7 @@ static DWORD modLongData(MIDIMAPDATA* mom, LPMIDIHDR lpMidiHdr, DWORD_PTR dwPara } lpMidiHdr->dwFlags &= ~MHDR_INQUEUE; lpMidiHdr->dwFlags |= MHDR_DONE; + MIDIMAP_NotifyClient(mom, MOM_DONE, (DWORD_PTR)lpMidiHdr, 0L); return ret; } diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index 82d61d1..a94ea28 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -203,9 +203,6 @@ static void test_midiOut_device(UINT udev, HWND hwnd) rc = midiOutOpen(&hm, udev, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiOutOpen(&hm, udev, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (MIDIMAPPER==udev) todo_wine - ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); - else ok(!rc, "midiOutOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return; @@ -316,9 +313,6 @@ static void test_midiStream(UINT udev, HWND hwnd) rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)hwnd, (DWORD_PTR)MYCBINST, CALLBACK_WINDOW); else rc = midiStreamOpen(&hm, &udev, 1, (DWORD_PTR)callback_func, (DWORD_PTR)MYCBINST, CALLBACK_FUNCTION); - if (MIDIMAPPER==udev) todo_wine - ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); - else ok(!rc, "midiStreamOpen(dev=%d) rc=%s\n", udev, mmsys_error(rc)); if (rc) return;

1 0

Jörg Höhle : winmm: Fix incorrect memory useage ( Valgrind w/ MIDI tests).
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 7bd6be0706ad7f2066d82840369486aebc7ecc77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd6be0706ad7f2066d828403… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 10 20:54:10 2010 +0100 winmm: Fix incorrect memory useage (Valgrind w/ MIDI tests). --- dlls/winmm/tests/midi.c | 4 ++-- dlls/winmm/winmm.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winmm/tests/midi.c b/dlls/winmm/tests/midi.c index a94ea28..4a39cfc 100644 --- a/dlls/winmm/tests/midi.c +++ b/dlls/winmm/tests/midi.c @@ -341,8 +341,8 @@ static void test_midiStream(UINT udev, HWND hwnd) * but it will be set on all systems after the job is finished. */ Sleep(90); - /* Wine starts playing immediately */ - /*todo_wine test_notification(hwnd, "midiStream still paused", 0, WHATEVER);*/ + /* Wine <1.1.39 started playing immediately */ + test_notification(hwnd, "midiStream still paused", 0, WHATEVER); /* MSDN asks to use midiStreamRestart prior to midiStreamOut() * because the starting state is 'pause', but some apps seem to diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index a2074f6..233de32 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1614,7 +1614,7 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) SetEvent(lpMidiStrm->hEvent); TRACE("Ready to go 1\n"); /* thread is started in paused mode */ - SuspendThread(lpMidiStrm->hThread); + SuspendThread(GetCurrentThread()); TRACE("Ready to go 2\n"); lpMidiStrm->dwStartTicks = 0; @@ -1738,8 +1738,8 @@ MMRESULT WINAPI midiStreamClose(HMIDISTRM hMidiStrm) midiStreamStop(hMidiStrm); MMSYSTEM_MidiStream_PostMessage(lpMidiStrm, WM_QUIT, 0, 0); - HeapFree(GetProcessHeap(), 0, lpMidiStrm); CloseHandle(lpMidiStrm->hEvent); + HeapFree(GetProcessHeap(), 0, lpMidiStrm); return midiOutClose((HMIDIOUT)hMidiStrm); }

1 0

Jörg Höhle : winmm: Improve initial MIDI player thread synchronisation.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 67124e1c0b33c9f832c0debebbc7abaee0ea5a2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67124e1c0b33c9f832c0debeb… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Feb 11 04:15:43 2010 +0100 winmm: Improve initial MIDI player thread synchronisation. --- dlls/winmm/winmm.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index 233de32..d201d12 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -1606,22 +1606,16 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) goto the_end; /* force thread's queue creation */ - /* Used to be InitThreadInput16(0, 5); */ - /* but following works also with hack in midiStreamOpen */ - PeekMessageA(&msg, 0, 0, 0, 0); - - /* FIXME: this next line must be called before midiStreamOut or midiStreamRestart are called */ - SetEvent(lpMidiStrm->hEvent); - TRACE("Ready to go 1\n"); - /* thread is started in paused mode */ - SuspendThread(GetCurrentThread()); - TRACE("Ready to go 2\n"); + PeekMessageA(&msg, 0, 0, 0, PM_NOREMOVE); lpMidiStrm->dwStartTicks = 0; lpMidiStrm->dwPulses = 0; lpMidiStrm->lpMidiHdr = 0; + /* midiStreamOpen is waiting for ack */ + SetEvent(lpMidiStrm->hEvent); + for (;;) { lpMidiHdr = lpMidiStrm->lpMidiHdr; if (!lpMidiHdr) { @@ -1706,8 +1700,7 @@ static DWORD CALLBACK MMSYSTEM_MidiStream_Player(LPVOID pmt) } the_end: TRACE("End of thread\n"); - ExitThread(0); - return 0; /* for removing the warning, never executed */ + return 0; } /************************************************************************** @@ -1718,7 +1711,7 @@ static BOOL MMSYSTEM_MidiStream_PostMessage(WINE_MIDIStream* lpMidiStrm, WORD ms if (PostThreadMessageA(lpMidiStrm->dwThreadID, msg, pmt1, pmt2)) { MsgWaitForMultipleObjects( 1, &lpMidiStrm->hEvent, FALSE, INFINITE, 0 ); } else { - WARN("bad PostThreadMessageA\n"); + ERR("bad PostThreadMessageA\n"); return FALSE; } return TRUE; @@ -1805,6 +1798,8 @@ MMRESULT WINAPI midiStreamOpen(HMIDISTRM* lphMidiStrm, LPUINT lpuDeviceID, /* wait for thread to have started, and for its queue to be created */ WaitForSingleObject(lpMidiStrm->hEvent, INFINITE); + /* start in paused mode */ + SuspendThread(lpMidiStrm->hThread); TRACE("=> (%u/%d) hMidi=%p ret=%d lpMidiStrm=%p\n", *lpuDeviceID, lpwm->mld.uDeviceID, *lphMidiStrm, ret, lpMidiStrm); @@ -1839,7 +1834,7 @@ MMRESULT WINAPI midiStreamOut(HMIDISTRM hMidiStrm, LPMIDIHDR lpMidiHdr, if (!PostThreadMessageA(lpMidiStrm->dwThreadID, WINE_MSM_HEADER, cbMidiHdr, (LPARAM)lpMidiHdr)) { - WARN("bad PostThreadMessageA\n"); + ERR("bad PostThreadMessageA\n"); ret = MMSYSERR_ERROR; } } @@ -1860,7 +1855,7 @@ MMRESULT WINAPI midiStreamPause(HMIDISTRM hMidiStrm) ret = MMSYSERR_INVALHANDLE; } else { if (SuspendThread(lpMidiStrm->hThread) == 0xFFFFFFFF) { - WARN("bad Suspend (%d)\n", GetLastError()); + ERR("bad Suspend (%d)\n", GetLastError()); ret = MMSYSERR_ERROR; } } @@ -1963,13 +1958,13 @@ MMRESULT WINAPI midiStreamRestart(HMIDISTRM hMidiStrm) DWORD ret; /* since we increase the thread suspend count on each midiStreamPause - * there may be a need for several midiStreamResume + * there may be a need for several ResumeThread */ do { ret = ResumeThread(lpMidiStrm->hThread); - } while (ret != 0xFFFFFFFF && ret != 0); + } while (ret != 0xFFFFFFFF && ret > 1); if (ret == 0xFFFFFFFF) { - WARN("bad Resume (%d)\n", GetLastError()); + ERR("bad Resume (%d)\n", GetLastError()); ret = MMSYSERR_ERROR; } else { lpMidiStrm->dwStartTicks = GetTickCount() - lpMidiStrm->dwPositionMS;

1 0

Hans Leidekker : msi: The File_Setup field in the ODBCDriver and ODBCTranslator tables is optional .
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 4742dfba9898844d7e4cfa143477d921f27a9432 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4742dfba9898844d7e4cfa143… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:12:55 2010 +0100 msi: The File_Setup field in the ODBCDriver and ODBCTranslator tables is optional. --- dlls/msi/action.c | 32 +++++++++++++++++++++----------- 1 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 76910f3..f9d4965 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4893,15 +4893,17 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) driver_file = msi_find_file(package, MSI_RecordGetString(rec, 4)); setup_file = msi_find_file(package, MSI_RecordGetString(rec, 5)); - if (!driver_file || !setup_file) + if (!driver_file) { ERR("ODBC Driver entry not found!\n"); return ERROR_FUNCTION_FAILED; } - len = lstrlenW(desc) + lstrlenW(driver_fmt) + lstrlenW(driver_file->FileName) + - lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName) + - lstrlenW(usage_fmt) + 1; + len = lstrlenW(desc) + lstrlenW(driver_fmt) + lstrlenW(driver_file->FileName); + if (setup_file) + len += lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName); + len += lstrlenW(usage_fmt) + 1; + driver = msi_alloc(len * sizeof(WCHAR)); if (!driver) return ERROR_OUTOFMEMORY; @@ -4913,8 +4915,11 @@ static UINT ITERATE_InstallODBCDriver( MSIRECORD *rec, LPVOID param ) sprintfW(ptr, driver_fmt, driver_file->FileName); ptr += lstrlenW(ptr) + 1; - sprintfW(ptr, setup_fmt, setup_file->FileName); - ptr += lstrlenW(ptr) + 1; + if (setup_file) + { + sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += lstrlenW(ptr) + 1; + } lstrcpyW(ptr, usage_fmt); ptr += lstrlenW(ptr) + 1; @@ -4957,14 +4962,16 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) translator_file = msi_find_file(package, MSI_RecordGetString(rec, 4)); setup_file = msi_find_file(package, MSI_RecordGetString(rec, 5)); - if (!translator_file || !setup_file) + if (!translator_file) { ERR("ODBC Translator entry not found!\n"); return ERROR_FUNCTION_FAILED; } - len = lstrlenW(desc) + lstrlenW(translator_fmt) + lstrlenW(translator_file->FileName) + - lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName) + 1; + len = lstrlenW(desc) + lstrlenW(translator_fmt) + lstrlenW(translator_file->FileName) + 1; + if (setup_file) + len += lstrlenW(setup_fmt) + lstrlenW(setup_file->FileName); + translator = msi_alloc(len * sizeof(WCHAR)); if (!translator) return ERROR_OUTOFMEMORY; @@ -4976,8 +4983,11 @@ static UINT ITERATE_InstallODBCTranslator( MSIRECORD *rec, LPVOID param ) sprintfW(ptr, translator_fmt, translator_file->FileName); ptr += lstrlenW(ptr) + 1; - sprintfW(ptr, setup_fmt, setup_file->FileName); - ptr += lstrlenW(ptr) + 1; + if (setup_file) + { + sprintfW(ptr, setup_fmt, setup_file->FileName); + ptr += lstrlenW(ptr) + 1; + } *ptr = '\0'; translator_path = strdupW(translator_file->TargetPath);

1 0

Hans Leidekker : msi: Make sure attrs variable is properly double nul-terminated in ITERATE_InstallODBCDataSource .
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 2568e5ec65fa921bff6fb20068f080c2dc91a1f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2568e5ec65fa921bff6fb2006… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:13:19 2010 +0100 msi: Make sure attrs variable is properly double nul-terminated in ITERATE_InstallODBCDataSource. --- dlls/msi/action.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index f9d4965..b949fc7 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5031,8 +5031,8 @@ static UINT ITERATE_InstallODBCDataSource( MSIRECORD *rec, LPVOID param ) if (!attrs) return ERROR_OUTOFMEMORY; - sprintfW(attrs, attrs_fmt, desc); - attrs[len - 1] = '\0'; + len = sprintfW(attrs, attrs_fmt, desc); + attrs[len + 1] = 0; if (!SQLConfigDataSourceW(NULL, request, driver, attrs)) {

1 0

Hans Leidekker : msi: Implement the RemoveODBC standard action.
by Alexandre Julliard 11 Feb '10

11 Feb '10

Module: wine Branch: master Commit: 28bf8e1f0db2268ee3f8aa98497e06ea7e949f90 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28bf8e1f0db2268ee3f8aa984… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 11 13:13:41 2010 +0100 msi: Implement the RemoveODBC standard action. --- dlls/msi/action.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 114 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index b949fc7..31870bd 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5086,6 +5086,120 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) return rc; } +static UINT ITERATE_RemoveODBCDriver( MSIRECORD *rec, LPVOID param ) +{ + DWORD usage; + LPCWSTR desc; + + desc = MSI_RecordGetString( rec, 3 ); + if (!SQLRemoveDriverW( desc, FALSE, &usage )) + { + WARN("Failed to remove ODBC driver\n"); + } + else if (!usage) + { + FIXME("Usage count reached 0\n"); + } + + return ERROR_SUCCESS; +} + +static UINT ITERATE_RemoveODBCTranslator( MSIRECORD *rec, LPVOID param ) +{ + DWORD usage; + LPCWSTR desc; + + desc = MSI_RecordGetString( rec, 3 ); + if (!SQLRemoveTranslatorW( desc, &usage )) + { + WARN("Failed to remove ODBC translator\n"); + } + else if (!usage) + { + FIXME("Usage count reached 0\n"); + } + + return ERROR_SUCCESS; +} + +static UINT ITERATE_RemoveODBCDataSource( MSIRECORD *rec, LPVOID param ) +{ + LPWSTR attrs; + LPCWSTR desc, driver; + WORD request = ODBC_REMOVE_SYS_DSN; + INT registration; + DWORD len; + + static const WCHAR attrs_fmt[] = { + 'D','S','N','=','%','s',0 }; + + desc = MSI_RecordGetString( rec, 3 ); + driver = MSI_RecordGetString( rec, 4 ); + registration = MSI_RecordGetInteger( rec, 5 ); + + if (registration == msidbODBCDataSourceRegistrationPerMachine) request = ODBC_REMOVE_SYS_DSN; + else if (registration == msidbODBCDataSourceRegistrationPerUser) request = ODBC_REMOVE_DSN; + + len = strlenW( attrs_fmt ) + strlenW( desc ) + 1 + 1; + attrs = msi_alloc( len * sizeof(WCHAR) ); + if (!attrs) + return ERROR_OUTOFMEMORY; + + FIXME("Use ODBCSourceAttribute table\n"); + + len = sprintfW( attrs, attrs_fmt, desc ); + attrs[len + 1] = 0; + + if (!SQLConfigDataSourceW( NULL, request, driver, attrs )) + { + WARN("Failed to remove ODBC data source\n"); + } + msi_free( attrs ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + + static const WCHAR driver_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','r','i','v','e','r',0 }; + + static const WCHAR translator_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','T','r','a','n','s','l','a','t','o','r',0 }; + + static const WCHAR source_query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + 'O','D','B','C','D','a','t','a','S','o','u','r','c','e',0 }; + + rc = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCDriver, package ); + msiobj_release( &view->hdr ); + + rc = MSI_DatabaseOpenViewW( package->db, translator_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCTranslator, package ); + msiobj_release( &view->hdr ); + + rc = MSI_DatabaseOpenViewW( package->db, source_query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_RemoveODBCDataSource, package ); + msiobj_release( &view->hdr ); + + return rc; +} + #define ENV_ACT_SETALWAYS 0x1 #define ENV_ACT_SETABSENT 0x2 #define ENV_ACT_REMOVE 0x4 @@ -6290,12 +6404,6 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "RemoveExistingProducts", table ); } -static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'O','D','B','C','D','r','i','v','e','r',0 }; - return msi_unimplemented_action_stub( package, "RemoveODBC", table ); -} - static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) { static const WCHAR table[] = { 'R','e','m','o','v','e','R','e','g','i','s','t','r','y',0 };

1 0