May 2007 - Wine-commits - list.winehq.org

Misha Koshelev : msi/tests: automation: Add test for View::Modify.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 854ca51a5f0c71545c0b71a417dc85dbcd9e86ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=854ca51a5f0c71545c0b71a41… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 11 14:08:38 2007 -0500 msi/tests: automation: Add test for View::Modify. --- dlls/msi/tests/automation.c | 48 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 055f768..b3c661e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -890,6 +890,24 @@ static HRESULT View_Fetch(IDispatch *pView, IDispatch **ppRecord) return hr; } +static HRESULT View_Modify(IDispatch *pView, int iMode, IDispatch *pRecord) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = iMode; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_DISPATCH; + V_DISPATCH(&vararg[0]) = pRecord; + if (pRecord) + IDispatch_AddRef(pRecord); /* VariantClear in invoke will call IDispatch_Release */ + + return invoke(pView, "Modify", DISPATCH_METHOD, &dispparams, &varresult, VT_EMPTY); +} + static HRESULT View_Close(IDispatch *pView) { VARIANT varresult; @@ -1010,6 +1028,7 @@ static void test_Database(IDispatch *pDatabase) static WCHAR szThree[] = { 'T','h','r','e','e',0 }; static WCHAR szTwo[] = { 'T','w','o',0 }; static WCHAR szStringDataField[] = { 'S','t','r','i','n','g','D','a','t','a',',','F','i','e','l','d',0 }; + static WCHAR szModifyModeRecord[] = { 'M','o','d','i','f','y',',','M','o','d','e',',','R','e','c','o','r','d',0 }; IDispatch *pView = NULL; HRESULT hr; @@ -1051,6 +1070,35 @@ static void test_Database(IDispatch *pDatabase) ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult 0x%08x\n", hr); ok_exception(hr, szStringDataField); + /* View::Modify with incorrect parameters */ + todo_wine + { + hr = View_Modify(pView, -5, NULL); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); + + hr = View_Modify(pView, -5, pRecord); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); + + hr = View_Modify(pView, MSIMODIFY_REFRESH, NULL); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); + } + + /* View::Modify with MSIMODIFY_REFRESH should undo our changes */ + todo_wine + { + hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord); + ok(SUCCEEDED(hr), "View_Modify failed, hresult 0x%08x\n", hr); + } + + /* Record::StringDataGet, confirm that the record is back to its unmodified value */ + memset(szString, 0, sizeof(szString)); + hr = Record_StringDataGet(pRecord, 1, szString); + ok(SUCCEEDED(hr), "Record_StringDataGet failed, hresult 0x%08x\n", hr); + todo_wine ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, szThree); + IDispatch_Release(pRecord); }

1 0

Misha Koshelev : msi: automation: Implement View::Modify.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 9d234fcb9f6afcf3ef7ab9df668d55f945a58a0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d234fcb9f6afcf3ef7ab9df6… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 11 14:08:43 2007 -0500 msi: automation: Implement View::Modify. --- dlls/msi/automation.c | 18 ++++++++++++++++++ dlls/msi/msiserver.idl | 20 ++++++++++++++++++++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 29 ++++++++++++----------------- 4 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index e314be0..b9dcb5a 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -735,6 +735,24 @@ static HRESULT WINAPI ViewImpl_Invoke( else return DISP_E_MEMBERNOTFOUND; break; + case DISPID_VIEW_MODIFY: + if (wFlags & DISPATCH_METHOD) + { + hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); + if (FAILED(hr)) return hr; + hr = DispGetParam(pDispParams, 1, VT_DISPATCH, &varg1, puArgErr); + if (FAILED(hr)) return hr; + if (!V_DISPATCH(&varg1)) return DISP_E_EXCEPTION; + if ((ret = MsiViewModify(This->msiHandle, V_I4(&varg0), ((AutomationObject *)V_DISPATCH(&varg1))->msiHandle)) != ERROR_SUCCESS) + { + VariantClear(&varg1); + ERR("MsiViewModify returned %d\n", ret); + return DISP_E_EXCEPTION; + } + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_VIEW_CLOSE: if (wFlags & DISPATCH_METHOD) { diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index f47b691..560b572 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -124,6 +124,22 @@ library WindowsInstaller methods: } + typedef enum { + msiViewModifySeek = -1, + msiViewModifyRefresh = 0, + msiViewModifyInsert = 1, + msiViewModifyUpdate = 2, + msiViewModifyAssign = 3, + msiViewModifyReplace = 4, + msiViewModifyMerge = 5, + msiViewModifyDelete = 6, + msiViewModifyInsertTemporary = 7, + msiViewModifyValidate = 8, + msiViewModifyValidateNew = 9, + msiViewModifyValidateField = 10, + msiViewModifyValidateDelete = 11, + } _MsiViewModify; /* Added underscore to avoid conflict with function name */ + [ uuid(000C109C-0000-0000-C000-000000000046) ] dispinterface View { @@ -133,6 +149,10 @@ library WindowsInstaller void Execute([in, optional, defaultvalue(0)] Record *Params); [id(DISPID_VIEW_FETCH)] Record* Fetch(); + [id(DISPID_VIEW_MODIFY)] + void Modify( + [in] _MsiViewModify Mode, + Record *Record); [id(DISPID_VIEW_CLOSE)] void Close(); } diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 88d6d53..ebcab7d 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -30,6 +30,7 @@ #define DISPID_VIEW_EXECUTE 1 #define DISPID_VIEW_FETCH 2 +#define DISPID_VIEW_MODIFY 3 #define DISPID_VIEW_CLOSE 4 #define DISPID_DATABASE_OPENVIEW 3 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index b3c661e..4aaa671 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1071,27 +1071,22 @@ static void test_Database(IDispatch *pDatabase) ok_exception(hr, szStringDataField); /* View::Modify with incorrect parameters */ - todo_wine - { - hr = View_Modify(pView, -5, NULL); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); - ok_exception(hr, szModifyModeRecord); + hr = View_Modify(pView, -5, NULL); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); - hr = View_Modify(pView, -5, pRecord); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); - ok_exception(hr, szModifyModeRecord); + hr = View_Modify(pView, -5, pRecord); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); - hr = View_Modify(pView, MSIMODIFY_REFRESH, NULL); - ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); - ok_exception(hr, szModifyModeRecord); - } + hr = View_Modify(pView, MSIMODIFY_REFRESH, NULL); + ok(hr == DISP_E_EXCEPTION, "View_Modify failed, hresult 0x%08x\n", hr); + ok_exception(hr, szModifyModeRecord); /* View::Modify with MSIMODIFY_REFRESH should undo our changes */ - todo_wine - { - hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord); - ok(SUCCEEDED(hr), "View_Modify failed, hresult 0x%08x\n", hr); - } + hr = View_Modify(pView, MSIMODIFY_REFRESH, pRecord); + /* Wine's MsiViewModify currently does not support MSIMODIFY_REFRESH */ + todo_wine ok(SUCCEEDED(hr), "View_Modify failed, hresult 0x%08x\n", hr); /* Record::StringDataGet, confirm that the record is back to its unmodified value */ memset(szString, 0, sizeof(szString));

1 0

Paul Vriens : ole32/tests: Check for correct return value.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 0eeb5727b20ccb4b8689b9f0e0e51d82d833dd31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eeb5727b20ccb4b8689b9f0e… Author: Paul Vriens <paul.vriens.wine(a)gmail.com> Date: Fri May 11 20:33:22 2007 +0200 ole32/tests: Check for correct return value. --- dlls/ole32/tests/moniker.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 48a5262..14f5018 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -777,12 +777,14 @@ static void test_MkParseDisplayName(void) ok_ole_success(hr, CreateBindCtx); hr = MkParseDisplayName(pbc, wszNonExistentProgId, &eaten, &pmk); - ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, + "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); /* no special handling of "clsid:" without the string form of the clsid * following */ hr = MkParseDisplayName(pbc, wszDisplayNameClsid, &eaten, &pmk); - ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName should have failed with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, + "MkParseDisplayName should have failed with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); /* shows clsid has higher precedence than a running object */ hr = CreateFileMoniker(wszDisplayName, &pmk); @@ -849,7 +851,8 @@ static void test_MkParseDisplayName(void) } hr = MkParseDisplayName(pbc, wszDisplayNameProgIdFail, &eaten, &pmk); - ok(hr == MK_E_CANTOPENFILE, "MkParseDisplayName with ProgId without marker should fail with MK_E_CANTOPENFILE instead of 0x%08x\n", hr); + ok(hr == MK_E_SYNTAX || hr == MK_E_CANTOPENFILE /* Win9x */, + "MkParseDisplayName with ProgId without marker should fail with MK_E_SYNTAX or MK_E_CANTOPENFILE instead of 0x%08x\n", hr); hr = CoRevokeClassObject(pdwReg1); ok_ole_success(hr, CoRevokeClassObject);

1 0

Emmanuel Maillard : winecoreaudio: Initial mixer support on Mac OS X.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: e64485d5a9dbc8ee589b358a9bf0608a2319162e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64485d5a9dbc8ee589b358a9… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 21:36:22 2007 +0200 winecoreaudio: Initial mixer support on Mac OS X. Find all lines and initialize controls. --- dlls/winecoreaudio.drv/Makefile.in | 3 +- dlls/winecoreaudio.drv/coreaudio.c | 4 +- dlls/winecoreaudio.drv/coreaudio.h | 5 +- dlls/winecoreaudio.drv/mixer.c | 493 +++++++++++++++++++++++++ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 1 + 5 files changed, 502 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e64485d5a9dbc8ee589b3…

1 0

Emmanuel Maillard : winecoreaudio: Implement MIX_Open and MIX_GetNumDevs.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: db6318ea9152463582e46538912756a473bed995 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6318ea9152463582e465389… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 21:48:14 2007 +0200 winecoreaudio: Implement MIX_Open and MIX_GetNumDevs. --- dlls/winecoreaudio.drv/mixer.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 93bf420..78ce6e2 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -452,6 +452,33 @@ void CoreAudio_MixerRelease(void) } /************************************************************************** +* MIX_Open [internal] +*/ +static DWORD MIX_Open(WORD wDevID, LPMIXEROPENDESC lpMod, DWORD_PTR flags) +{ + TRACE("wDevID=%d lpMod=%p dwSize=%08lx\n", wDevID, lpMod, flags); + if (lpMod == NULL) { + WARN("invalid parameter: lpMod == NULL\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID: %04X\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + return MMSYSERR_NOERROR; +} + +/************************************************************************** +* MIX_GetNumDevs [internal] +*/ +static DWORD MIX_GetNumDevs(void) +{ + TRACE("()\n"); + return numMixers; +} + +/************************************************************************** * mxdMessage */ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, @@ -469,8 +496,11 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, /* FIXME: Pretend this is supported */ return 0; case MXDM_OPEN: + return MIX_Open(wDevID, (LPMIXEROPENDESC)dwParam1, dwParam2); case MXDM_CLOSE: + return MMSYSERR_NOERROR; case MXDM_GETNUMDEVS: + return MIX_GetNumDevs(); case MXDM_GETDEVCAPS: case MXDM_GETLINEINFO: case MXDM_GETLINECONTROLS:

1 0

Emmanuel Maillard : winecoreaudio: Implement MIX_GetDevCaps.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 7fb0861bf6a84655f4ba59d01fd231ee3fc56fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fb0861bf6a84655f4ba59d01… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 21:56:42 2007 +0200 winecoreaudio: Implement MIX_GetDevCaps. --- dlls/winecoreaudio.drv/mixer.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 78ce6e2..7cecda2 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -478,6 +478,23 @@ static DWORD MIX_GetNumDevs(void) return numMixers; } +static DWORD MIX_GetDevCaps(WORD wDevID, LPMIXERCAPSW lpCaps, DWORD_PTR dwSize) +{ + TRACE("wDevID=%d lpCaps=%p\n", wDevID, lpCaps); + + if (lpCaps == NULL) { + WARN("Invalid Parameter\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID : %d\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + memcpy(lpCaps, &mixer.caps, min(dwSize, sizeof(*lpCaps))); + return MMSYSERR_NOERROR; +} + /************************************************************************** * mxdMessage */ @@ -502,6 +519,7 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETNUMDEVS: return MIX_GetNumDevs(); case MXDM_GETDEVCAPS: + return MIX_GetDevCaps(wDevID, (LPMIXERCAPSW)dwParam1, dwParam2); case MXDM_GETLINEINFO: case MXDM_GETLINECONTROLS: case MXDM_GETCONTROLDETAILS:

1 0

Emmanuel Maillard : winecoreaudio: Initial implementation of MIX_GetLineInfo.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 7f5a322e259757f406dbcac1461197ada8795875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f5a322e259757f406dbcac14… Author: Emmanuel Maillard <mahanuu(a)free.fr> Date: Sun May 13 22:02:26 2007 +0200 winecoreaudio: Initial implementation of MIX_GetLineInfo. --- dlls/winecoreaudio.drv/mixer.c | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 7cecda2..5a9f724 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -496,6 +496,126 @@ static DWORD MIX_GetDevCaps(WORD wDevID, LPMIXERCAPSW lpCaps, DWORD_PTR dwSize) } /************************************************************************** +* MIX_GetLineInfo [internal] +*/ +static DWORD MIX_GetLineInfo(WORD wDevID, LPMIXERLINEW lpMl, DWORD_PTR fdwInfo) +{ + int i; + DWORD ret = MMSYSERR_ERROR; + MixerLine *line = NULL; + + TRACE("%04X, %p, %08lx\n", wDevID, lpMl, fdwInfo); + + if (lpMl == NULL) { + WARN("invalid parameter: lpMl = NULL\n"); + return MMSYSERR_INVALPARAM; + } + + if (lpMl->cbStruct != sizeof(*lpMl)) { + WARN("invalid parameter: lpMl->cbStruct\n"); + return MMSYSERR_INVALPARAM; + } + + if (wDevID >= numMixers) { + WARN("bad device ID: %04X\n", wDevID); + return MMSYSERR_BADDEVICEID; + } + + /* FIXME: set all the variables correctly... the lines below + * are very wrong... + */ + lpMl->dwUser = 0; + + switch (fdwInfo & MIXER_GETLINEINFOF_QUERYMASK) + { + case MIXER_GETLINEINFOF_DESTINATION: + TRACE("MIXER_GETLINEINFOF_DESTINATION %d\n", lpMl->dwDestination); + if ( (lpMl->dwDestination >= 0) && (lpMl->dwDestination < mixer.caps.cDestinations) ) + { + lpMl->dwLineID = lpMl->dwDestination; + line = &mixer.lines[lpMl->dwDestination]; + } + else ret = MIXERR_INVALLINE; + break; + case MIXER_GETLINEINFOF_COMPONENTTYPE: + TRACE("MIXER_GETLINEINFOF_COMPONENTTYPE %s\n", getComponentType(lpMl->dwComponentType)); + for (i = 0; i < mixer.caps.cDestinations; i++) + { + if (mixer.lines[i].componentType == lpMl->dwComponentType) + { + lpMl->dwDestination = lpMl->dwLineID = i; + line = &mixer.lines[i]; + break; + } + } + if (line == NULL) + { + WARN("can't find component type %s\n", getComponentType(lpMl->dwComponentType)); + ret = MIXERR_INVALVALUE; + } + break; + case MIXER_GETLINEINFOF_SOURCE: + FIXME("MIXER_GETLINEINFOF_SOURCE %d dst=%d\n", lpMl->dwSource, lpMl->dwDestination); + break; + case MIXER_GETLINEINFOF_LINEID: + TRACE("MIXER_GETLINEINFOF_LINEID %d\n", lpMl->dwLineID); + if ( (lpMl->dwLineID >= 0) && (lpMl->dwLineID < mixer.caps.cDestinations) ) + { + lpMl->dwDestination = lpMl->dwLineID; + line = &mixer.lines[lpMl->dwLineID]; + } + else ret = MIXERR_INVALLINE; + break; + case MIXER_GETLINEINFOF_TARGETTYPE: + FIXME("MIXER_GETLINEINFOF_TARGETTYPE (%s)\n", getTargetType(lpMl->Target.dwType)); + switch (lpMl->Target.dwType) { + case MIXERLINE_TARGETTYPE_UNDEFINED: + case MIXERLINE_TARGETTYPE_WAVEOUT: + case MIXERLINE_TARGETTYPE_WAVEIN: + case MIXERLINE_TARGETTYPE_MIDIOUT: + case MIXERLINE_TARGETTYPE_MIDIIN: + case MIXERLINE_TARGETTYPE_AUX: + default: + FIXME("Unhandled target type (%s)\n", + getTargetType(lpMl->Target.dwType)); + return MMSYSERR_INVALPARAM; + } + break; + default: + WARN("Unknown flag (%08lx)\n", fdwInfo & MIXER_GETLINEINFOF_QUERYMASK); + break; + } + + if (line) + { + lpMl->dwComponentType = line->componentType; + lpMl->cChannels = line->numChannels; + lpMl->cControls = ControlsPerLine; + + /* FIXME check there with CoreAudio */ + lpMl->cConnections = 1; + lpMl->fdwLine = MIXERLINE_LINEF_ACTIVE; + + MultiByteToWideChar(CP_ACP, 0, line->name, -1, lpMl->szShortName, sizeof(lpMl->szShortName) / sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, line->name, -1, lpMl->szName, sizeof(lpMl->szName) / sizeof(WCHAR)); + + if ( IsInput(line->direction) ) + lpMl->Target.dwType = MIXERLINE_TARGETTYPE_WAVEIN; + else + lpMl->Target.dwType = MIXERLINE_TARGETTYPE_WAVEOUT; + + lpMl->Target.dwDeviceID = line->deviceID; + lpMl->Target.wMid = mixer.caps.wMid; + lpMl->Target.wPid = mixer.caps.wPid; + lpMl->Target.vDriverVersion = mixer.caps.vDriverVersion; + + MultiByteToWideChar(CP_ACP, 0, WINE_MIXER_NAME, -1, lpMl->Target.szPname, sizeof(lpMl->Target.szPname) / sizeof(WCHAR)); + ret = MMSYSERR_NOERROR; + } + return ret; +} + +/************************************************************************** * mxdMessage */ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, @@ -521,6 +641,7 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MXDM_GETDEVCAPS: return MIX_GetDevCaps(wDevID, (LPMIXERCAPSW)dwParam1, dwParam2); case MXDM_GETLINEINFO: + return MIX_GetLineInfo(wDevID, (LPMIXERLINEW)dwParam1, dwParam2); case MXDM_GETLINECONTROLS: case MXDM_GETCONTROLDETAILS: case MXDM_SETCONTROLDETAILS:

1 0

Misha Koshelev : msi/tests: automation: Correct expected Record:: StringData PROPERTYPUT return variant type.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: d2ad4e09ce218b9dad98844e7a983f78652bb9a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ad4e09ce218b9dad98844e7… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 11 14:08:22 2007 -0500 msi/tests: automation: Correct expected Record::StringData PROPERTYPUT return variant type. --- dlls/msi/tests/automation.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ab2cc12..7f94d1d 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -938,7 +938,7 @@ static HRESULT Record_StringDataPut(IDispatch *pRecord, int iField, LPCWSTR szSt V_VT(&vararg[0]) = VT_BSTR; V_BSTR(&vararg[0]) = SysAllocString(szString); - return invoke(pRecord, "StringData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_BSTR); + return invoke(pRecord, "StringData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } static HRESULT StringList_Item(IDispatch *pStringList, int iIndex, LPWSTR szString) @@ -1002,6 +1002,16 @@ static void test_Database(IDispatch *pDatabase) ok(SUCCEEDED(hr), "Record_StringDataGet failed, hresult 0x%08x\n", hr); ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, szThree); + /* Record::StringDataPut with correct index */ + hr = Record_StringDataPut(pRecord, 1, szTwo); + ok(SUCCEEDED(hr), "Record_StringDataPut failed, hresult 0x%08x\n", hr); + + /* Record::StringDataGet */ + memset(szString, 0, sizeof(szString)); + hr = Record_StringDataGet(pRecord, 1, szString); + ok(SUCCEEDED(hr), "Record_StringDataGet failed, hresult 0x%08x\n", hr); + ok_w2("Record_StringDataGet result was %s but expected %s\n", szString, szTwo); + /* Record::StringDataPut with incorrect index */ hr = Record_StringDataPut(pRecord, -1, szString); ok(hr == DISP_E_EXCEPTION, "Record_StringDataPut failed, hresult 0x%08x\n", hr);

1 0

Misha Koshelev : msi/tests: automation: Add tests for Record::IntegerData.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: 5e16dbb3f373142f44c9e11b0cebc59aa39a89c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e16dbb3f373142f44c9e11b0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 11 14:08:27 2007 -0500 msi/tests: automation: Add tests for Record::IntegerData. --- dlls/msi/tests/automation.c | 78 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 7f94d1d..055f768 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -941,6 +941,40 @@ static HRESULT Record_StringDataPut(IDispatch *pRecord, int iField, LPCWSTR szSt return invoke(pRecord, "StringData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT Record_IntegerDataGet(IDispatch *pRecord, int iField, int *pValue) +{ + VARIANT varresult; + VARIANTARG vararg[1]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + HRESULT hr; + + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = iField; + + hr = invoke(pRecord, "IntegerData", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_I4); + *pValue = V_I4(&varresult); + VariantClear(&varresult); + return hr; +} + +static HRESULT Record_IntegerDataPut(IDispatch *pRecord, int iField, int iValue) +{ + VARIANT varresult; + VARIANTARG vararg[2]; + DISPID dispid = DISPID_PROPERTYPUT; + DISPPARAMS dispparams = {vararg, &dispid, sizeof(vararg)/sizeof(VARIANTARG), 1}; + + VariantInit(&vararg[1]); + V_VT(&vararg[1]) = VT_I4; + V_I4(&vararg[1]) = iField; + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = iValue; + + return invoke(pRecord, "IntegerData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); +} + static HRESULT StringList_Item(IDispatch *pStringList, int iIndex, LPWSTR szString) { VARIANT varresult; @@ -1374,11 +1408,12 @@ static void test_Installer(void) static WCHAR szProductCode[] = { '{','F','1','C','3','A','F','5','0','-','8','B','5','6','-','4','A','6','9','-','A','0','0','C','-','0','0','7','7','3','F','E','4','2','F','3','0','}',0 }; static WCHAR szBackslash[] = { '\\',0 }; static WCHAR szCreateRecordException[] = { 'C','r','e','a','t','e','R','e','c','o','r','d',',','C','o','u','n','t',0 }; + static WCHAR szIntegerDataException[] = { 'I','n','t','e','g','e','r','D','a','t','a',',','F','i','e','l','d',0 }; WCHAR szPath[MAX_PATH]; HRESULT hr; UINT len; IDispatch *pSession = NULL, *pRecord = NULL, *pStringList = NULL; - int iState; + int iValue; if (!pInstaller) return; @@ -1395,12 +1430,37 @@ static void test_Installer(void) ok(pRecord != NULL, "Installer_CreateRecord should not have returned NULL record\n"); if (pRecord) { - int iFieldCount = 0; - /* Record::FieldCountGet */ - hr = Record_FieldCountGet(pRecord, &iFieldCount); + hr = Record_FieldCountGet(pRecord, &iValue); ok(SUCCEEDED(hr), "Record_FiledCountGet failed, hresult 0x%08x\n", hr); - ok(iFieldCount == 1, "Record_FieldCountGet result was %d but expected 1\n", iFieldCount); + ok(iValue == 1, "Record_FieldCountGet result was %d but expected 1\n", iValue); + + todo_wine + { + /* Record::IntegerDataGet */ + hr = Record_IntegerDataGet(pRecord, 1, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); + + /* Record::IntegerDataGet, bad index */ + hr = Record_IntegerDataGet(pRecord, 10, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == MSI_NULL_INTEGER, "Record_IntegerDataGet result was %d but expected %d\n", iValue, MSI_NULL_INTEGER); + + /* Record::IntegerDataPut */ + hr = Record_IntegerDataPut(pRecord, 1, 100); + ok(SUCCEEDED(hr), "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + + /* Record::IntegerDataPut, bad index */ + hr = Record_IntegerDataPut(pRecord, 10, 100); + ok(hr == DISP_E_EXCEPTION, "Record_IntegerDataPut failed, hresult 0x%08x\n", hr); + ok_exception(hr, szIntegerDataException); + + /* Record::IntegerDataGet */ + hr = Record_IntegerDataGet(pRecord, 1, &iValue); + ok(SUCCEEDED(hr), "Record_IntegerDataGet failed, hresult 0x%08x\n", hr); + ok(iValue == 100, "Record_IntegerDataGet result was %d but expected 100\n", iValue); + } IDispatch_Release(pRecord); } @@ -1450,10 +1510,10 @@ static void test_Installer(void) if (SUCCEEDED(hr)) { /* Installer::ProductState */ - hr = Installer_ProductState(szPath, &iState); + hr = Installer_ProductState(szPath, &iValue); ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); if (SUCCEEDED(hr)) - ok(iState == INSTALLSTATE_DEFAULT || iState == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iState, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); + ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); } } @@ -1466,10 +1526,10 @@ static void test_Installer(void) } /* Installer::ProductState for our product code, which should not be installed */ - hr = Installer_ProductState(szProductCode, &iState); + hr = Installer_ProductState(szProductCode, &iValue); ok(SUCCEEDED(hr), "Installer_ProductState failed, hresult 0x%08x\n", hr); if (SUCCEEDED(hr)) - ok(iState == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iState, INSTALLSTATE_UNKNOWN); + ok(iValue == INSTALLSTATE_UNKNOWN, "Installer_ProductState returned %d, expected %d\n", iValue, INSTALLSTATE_UNKNOWN); /* Installer::Version */ todo_wine {

1 0

Misha Koshelev : msi: automation: Implement Record::FieldCount.
by Alexandre Julliard 14 May '07

14 May '07

Module: wine Branch: master Commit: c0c6fe63418b64970ba1393a0129dc699e123a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0c6fe63418b64970ba1393a0… Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 11 14:08:14 2007 -0500 msi: automation: Implement Record::FieldCount. --- dlls/msi/automation.c | 8 ++++++++ dlls/msi/msiserver.idl | 2 ++ dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 9 +++------ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index ec0706a..e314be0 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -566,6 +566,14 @@ static HRESULT WINAPI RecordImpl_Invoke( switch (dispIdMember) { + case DISPID_RECORD_FIELDCOUNT: + if (wFlags & DISPATCH_PROPERTYGET) { + V_VT(pVarResult) = VT_I4; + V_I4(pVarResult) = MsiRecordGetFieldCount(This->msiHandle); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_RECORD_STRINGDATA: if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index e02f194..f47b691 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -88,6 +88,8 @@ library WindowsInstaller void StringData( [in] long Field, [in] BSTR rhs); + [id(DISPID_RECORD_FIELDCOUNT), propget] + long FieldCount(); } [ uuid(000C1095-0000-0000-C000-000000000046) ] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index b65726e..88d6d53 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -22,6 +22,7 @@ #define DISPID_INSTALLER_PRODUCTSTATE 17 #define DISPID_INSTALLER_PRODUCTS 35 +#define DISPID_RECORD_FIELDCOUNT 0 #define DISPID_RECORD_STRINGDATA 1 #define DISPID_STRINGLIST_ITEM 0 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index c197c87..ab2cc12 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1388,12 +1388,9 @@ static void test_Installer(void) int iFieldCount = 0; /* Record::FieldCountGet */ - todo_wine - { - hr = Record_FieldCountGet(pRecord, &iFieldCount); - ok(SUCCEEDED(hr), "Record_FiledCountGet failed, hresult 0x%08x\n", hr); - ok(iFieldCount == 1, "Record_FieldCountGet result was %d but expected 1\n", iFieldCount); - } + hr = Record_FieldCountGet(pRecord, &iFieldCount); + ok(SUCCEEDED(hr), "Record_FiledCountGet failed, hresult 0x%08x\n", hr); + ok(iFieldCount == 1, "Record_FieldCountGet result was %d but expected 1\n", iFieldCount); IDispatch_Release(pRecord); }

1 0