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

Andrew Eikum : mmdevapi: Initialize global driver data at DLL load time.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 4a37f2f0936e9471d6a0bf4af10097e721db5373 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a37f2f0936e9471d6a0bf4af… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:29 2011 -0500 mmdevapi: Initialize global driver data at DLL load time. --- dlls/mmdevapi/main.c | 2 +- dlls/winealsa.drv/mmdevdrv.c | 18 ++++++++++++------ dlls/winecoreaudio.drv/mmdevdrv.c | 17 +++++++++++------ dlls/wineoss.drv/mmdevdrv.c | 17 +++++++++++------ 4 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/mmdevapi/main.c b/dlls/mmdevapi/main.c index 48dd93d..f87ad2e 100644 --- a/dlls/mmdevapi/main.c +++ b/dlls/mmdevapi/main.c @@ -72,7 +72,7 @@ static BOOL load_driver(const WCHAR *name) } #define LDFC(n) do { drvs.p##n = (void*)GetProcAddress(drvs.module, #n);\ - if(!drvs.p##n) return FALSE; } while(0); + if(!drvs.p##n) { FreeLibrary(drvs.module); return FALSE; } } while(0); LDFC(GetEndpointIDs); LDFC(GetAudioEndpoint); #undef LDFC diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8957457..1bbb23c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -140,6 +140,18 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -175,12 +187,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(void *key, IMMDevice *dev, TRACE("%p %p %d %p\n", key, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 10201e7..c360642 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -159,6 +159,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, AudioDeviceID ***keys, UINT *num, UINT *def_index) { @@ -344,12 +355,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, TRACE("%p %d %p\n", dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_FAIL; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index d3f5435..278b1b3 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -151,6 +151,17 @@ static inline ACImpl *impl_from_IAudioClock2(IAudioClock2 *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioClock2_iface); } +BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) +{ + if(reason == DLL_PROCESS_ATTACH){ + g_timer_q = CreateTimerQueue(); + if(!g_timer_q) + return FALSE; + } + + return TRUE; +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, void ***keys, UINT *num, UINT *def_index) { @@ -268,12 +279,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(char *devnode, IMMDevice *dev, TRACE("%s %p %d %p\n", devnode, dev, dataflow, out); - if(!g_timer_q){ - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return E_UNEXPECTED; - } - This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) return E_OUTOFMEMORY;

1 0

Andrew Eikum : winealsa.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: eabf5715ce2616685e9ae6d86d96141ff405780a URL: http://source.winehq.org/git/wine.git/?a=commit;h=eabf5715ce2616685e9ae6d86… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:41 2011 -0500 winealsa.drv: Implement IAudioSessionControl::GetState. --- dlls/winealsa.drv/alsa.c | 16 ++- dlls/winealsa.drv/alsa.h | 8 -- dlls/winealsa.drv/dscapture.c | 3 + dlls/winealsa.drv/dsoutput.c | 3 + dlls/winealsa.drv/midi.c | 3 + dlls/winealsa.drv/mixer.c | 3 + dlls/winealsa.drv/mmdevdrv.c | 232 ++++++++++++++++++++++++++++++++++------- dlls/winealsa.drv/wavein.c | 5 + dlls/winealsa.drv/waveinit.c | 3 + dlls/winealsa.drv/waveout.c | 5 + 10 files changed, 231 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=eabf5715ce2616685e9ae…

1 0

Andrew Eikum : wineoss.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 4a95e7b0c93167ce808db629f5d0a786cc7f228e URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a95e7b0c93167ce808db629f… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:21:49 2011 -0500 wineoss.drv: Implement IAudioSessionControl::GetState. --- dlls/wineoss.drv/audio.c | 5 +- dlls/wineoss.drv/mmdevdrv.c | 234 ++++++++++++++++++++++++++++++++++++------- 2 files changed, 202 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a95e7b0c93167ce808db…

1 0

Andrew Eikum : winecoreaudio.drv: Implement IAudioSessionControl::GetState.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 3025f7f505afbc16997307db791fd6ab9d541468 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3025f7f505afbc16997307db7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 10:24:22 2011 -0500 winecoreaudio.drv: Implement IAudioSessionControl::GetState. --- dlls/winecoreaudio.drv/audio.c | 4 +- dlls/winecoreaudio.drv/mmdevdrv.c | 237 +++++++++++++++++++++++++++++++------ 2 files changed, 206 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3025f7f505afbc1699730…

1 0

Andrew Eikum : mmdevapi/tests: Add tests for IAudioSessionControl::GetState .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 4d2622e65b002ebed407186a00353a5649703b5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d2622e65b002ebed407186a0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 2 08:22:31 2011 -0500 mmdevapi/tests: Add tests for IAudioSessionControl::GetState. --- dlls/mmdevapi/tests/mmdevenum.c | 1 + dlls/mmdevapi/tests/render.c | 197 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 197 insertions(+), 1 deletions(-) diff --git a/dlls/mmdevapi/tests/mmdevenum.c b/dlls/mmdevapi/tests/mmdevenum.c index 98c25a1..a0898b3 100644 --- a/dlls/mmdevapi/tests/mmdevenum.c +++ b/dlls/mmdevapi/tests/mmdevenum.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "audiopolicy.h" #include "dshow.h" #include "dsound.h" #include "devpkey.h" diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 7c8174b..659ce62 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -33,9 +33,25 @@ #include "uuids.h" #include "mmdeviceapi.h" #include "audioclient.h" +#include "audiopolicy.h" +#include <stdio.h> + +#define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) + +static IMMDeviceEnumerator *mme = NULL; static IMMDevice *dev = NULL; +static inline const char *dbgstr_guid( const GUID *id ) +{ + static char ret[256]; + sprintf(ret, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", + id->Data1, id->Data2, id->Data3, + id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], + id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); + return ret; +} + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -604,10 +620,188 @@ static void test_clock(void) IAudioClient_Release(ac); } +static void test_session(void) +{ + IAudioClient *ses1_ac1, *ses1_ac2, *cap_ac = NULL; + IAudioSessionControl2 *ses1_ctl, *ses1_ctl2, *cap_ctl; + IMMDevice *cap_dev; + GUID ses1_guid; + AudioSessionState state; + WAVEFORMATEX *pwfx; + ULONG ref; + HRESULT hr; + + hr = CoCreateGuid(&ses1_guid); + ok(hr == S_OK, "CoCreateGuid failed: %08x\n", hr); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac1); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_GetMixFormat(ses1_ac1, &pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(ses1_ac1, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ses1_ac2); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + + hr = IAudioClient_Initialize(ses1_ac2, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IMMDeviceEnumerator_GetDefaultAudioEndpoint(mme, eCapture, + eMultimedia, &cap_dev); + if(hr == S_OK){ + WAVEFORMATEX *cap_pwfx; + + hr = IMMDevice_Activate(cap_dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&cap_ac); + ok(hr == S_OK, "Activate failed: %08x\n", hr); + + hr = IAudioClient_GetMixFormat(cap_ac, &cap_pwfx); + ok(hr == S_OK, "GetMixFormat failed: %08x\n", hr); + + hr = IAudioClient_Initialize(cap_ac, AUDCLNT_SHAREMODE_SHARED, + 0, 5000000, 0, cap_pwfx, &ses1_guid); + ok(hr == S_OK, "Initialize failed: %08x\n", hr); + + hr = IAudioClient_GetService(cap_ac, &IID_IAudioSessionControl, (void**)&cap_ctl); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + IMMDevice_Release(cap_dev); + CoTaskMemFree(cap_pwfx); + }else + skip("No capture device available; skipping capture device in render session tests\n"); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl2, (void**)&ses1_ctl); + ok(hr == E_NOINTERFACE, "GetService gave wrong error: %08x\n", hr); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + hr = IAudioClient_GetService(ses1_ac1, &IID_IAudioSessionControl, (void**)&ses1_ctl2); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + ok(ses1_ctl == ses1_ctl2, "Got different controls: %p %p\n", ses1_ctl, ses1_ctl2); + ref = IAudioSessionControl_Release(ses1_ctl2); + ok(ref != 0, "AudioSessionControl was destroyed\n"); + + hr = IAudioClient_GetService(ses1_ac2, &IID_IAudioSessionControl, (void**)&ses1_ctl2); + ok(hr == S_OK, "GetService failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, NULL); + ok(hr == NULL_PTR_ERR, "GetState gave wrong error: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + } + + hr = IAudioClient_Start(ses1_ac1); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + } + + hr = IAudioClient_Stop(ses1_ac1); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + if(cap_ac){ + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioClient_Start(cap_ac); + ok(hr == S_OK, "Start failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateActive, "Got wrong state: %d\n", state); + + hr = IAudioClient_Stop(cap_ac); + ok(hr == S_OK, "Stop failed: %08x\n", hr); + + hr = IAudioSessionControl_GetState(ses1_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + hr = IAudioSessionControl_GetState(cap_ctl, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + ref = IAudioSessionControl_Release(cap_ctl); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + ref = IAudioClient_Release(cap_ac); + ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + } + + ref = IAudioSessionControl_Release(ses1_ctl); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + ref = IAudioClient_Release(ses1_ac1); + ok(ref == 0, "AudioClient wasn't released: %u\n", ref); + + ref = IAudioClient_Release(ses1_ac2); + ok(ref == 1, "AudioClient had wrong refcount: %u\n", ref); + + /* we've released all of our IAudioClient references, so check GetState */ + hr = IAudioSessionControl_GetState(ses1_ctl2, &state); + ok(hr == S_OK, "GetState failed: %08x\n", hr); + ok(state == AudioSessionStateInactive, "Got wrong state: %d\n", state); + + ref = IAudioSessionControl_Release(ses1_ctl2); + ok(ref == 0, "AudioSessionControl wasn't released: %u\n", ref); + + CoTaskMemFree(pwfx); +} + START_TEST(render) { HRESULT hr; - IMMDeviceEnumerator *mme = NULL; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -633,6 +827,7 @@ START_TEST(render) test_event(); test_padding(); test_clock(); + test_session(); IMMDevice_Release(dev);

1 0

Alexandre Julliard : configure: Improve the detection of OSS v4.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: f60a0f5e565ab9ec5f13b6b489e03b6b22ebf8f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f60a0f5e565ab9ec5f13b6b48… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 20:06:49 2011 +0200 configure: Improve the detection of OSS v4. --- configure | 42 +++++++++++++++++++++++------------------- configure.ac | 35 +++++++++++++++++------------------ dlls/wineoss.drv/Makefile.in | 1 + dlls/wineoss.drv/audio.c | 8 +------- dlls/wineoss.drv/dscapture.c | 8 +------- dlls/wineoss.drv/dsrender.c | 8 +------- dlls/wineoss.drv/midi.c | 8 +------- dlls/wineoss.drv/mixer.c | 8 +------- dlls/wineoss.drv/mmaux.c | 8 +------- dlls/wineoss.drv/mmdevdrv.c | 32 ++++++++++++-------------------- include/config.h.in | 13 ++----------- 11 files changed, 61 insertions(+), 110 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f60a0f5e565ab9ec5f13b…

1 0

Alexandre Julliard : wineoss: Get rid of %ll printf formats.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 92e05ed981c764e17a27f3240a1b7725994ed3ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=92e05ed981c764e17a27f3240… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 2 21:03:15 2011 +0200 wineoss: Get rid of %ll printf formats. --- dlls/wineoss.drv/mmdevdrv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index c66955f..ff21cd6 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -640,8 +640,8 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, int mask; HRESULT hr; - TRACE("(%p)->(%x, %x, %llu, %llu, %p, %s)\n", This, mode, flags, - duration, period, fmt, debugstr_guid(sessionguid)); + TRACE("(%p)->(%x, %x, %s, %s, %p, %s)\n", This, mode, flags, + wine_dbgstr_longlong(duration), wine_dbgstr_longlong(period), fmt, debugstr_guid(sessionguid)); if(!fmt) return E_POINTER;

1 0

Hans Leidekker : msi: Support remote calls to MsiEnumComponentCosts.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: cc517f2b3803e2cd0f197e5075e829e430d8b94b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc517f2b3803e2cd0f197e507… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:40 2011 +0200 msi: Support remote calls to MsiEnumComponentCosts. --- dlls/msi/msi.c | 28 +++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 4 +++- dlls/msi/package.c | 10 ++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index b5e4b13..d48d1d1 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -32,6 +32,7 @@ #include "msidefs.h" #include "msiquery.h" #include "msipriv.h" +#include "msiserver.h" #include "wincrypt.h" #include "winver.h" #include "winuser.h" @@ -1839,7 +1840,32 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i state, drive, buflen, cost, temp); if (!drive || !buflen || !cost || !temp) return ERROR_INVALID_PARAMETER; - if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) return ERROR_INVALID_HANDLE; + if (!(package = msihandle2msiinfo( handle, MSIHANDLETYPE_PACKAGE ))) + { + HRESULT hr; + IWineMsiRemotePackage *remote_package; + BSTR bname; + + if (!(remote_package = (IWineMsiRemotePackage *)msi_get_remote( handle ))) + return ERROR_INVALID_HANDLE; + + bname = SysAllocString( component ); + if (!bname) + { + IWineMsiRemotePackage_Release( remote_package ); + return ERROR_OUTOFMEMORY; + } + hr = IWineMsiRemotePackage_EnumComponentCosts( remote_package, bname, index, state, drive, buflen, cost, temp ); + IWineMsiRemotePackage_Release( remote_package ); + SysFreeString( bname ); + if (FAILED(hr)) + { + if (HRESULT_FACILITY(hr) == FACILITY_WIN32) return HRESULT_CODE(hr); + return ERROR_FUNCTION_FAILED; + } + return ERROR_SUCCESS; + } + if (!msi_get_property_int( package->db, szCostingComplete, 0 )) { msiobj_release( &package->hdr ); diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 58c5b3c..aa81498 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -72,7 +72,9 @@ interface IWineMsiRemotePackage : IUnknown HRESULT SetInstallLevel( [in] int level ); HRESULT FormatRecord( [in] MSIHANDLE record, [out] BSTR *value ); HRESULT EvaluateCondition( [in] BSTR condition ); - HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost); + HRESULT GetFeatureCost( [in] BSTR feature, [in] INT cost_tree, [in] INSTALLSTATE state, [out] INT *cost ); + HRESULT EnumComponentCosts( [in] BSTR component, [in] DWORD index, [in] INSTALLSTATE state, + [out, size_is(*buflen)] BSTR drive, [in, out] DWORD *buflen, [out] INT *cost, [out] INT *temp ); } [ diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bad8ab3..2a82ca5 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2534,6 +2534,15 @@ static HRESULT WINAPI mrp_GetFeatureCost( IWineMsiRemotePackage *iface, BSTR fea return HRESULT_FROM_WIN32(r); } +static HRESULT WINAPI mrp_EnumComponentCosts( IWineMsiRemotePackage *iface, BSTR component, + DWORD index, INSTALLSTATE state, BSTR drive, + DWORD *buflen, INT *cost, INT *temp ) +{ + msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); + UINT r = MsiEnumComponentCostsW(This->package, component, index, state, drive, buflen, cost, temp); + return HRESULT_FROM_WIN32(r); +} + static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = { mrp_QueryInterface, @@ -2560,6 +2569,7 @@ static const IWineMsiRemotePackageVtbl msi_remote_package_vtbl = mrp_FormatRecord, mrp_EvaluateCondition, mrp_GetFeatureCost, + mrp_EnumComponentCosts }; HRESULT create_msi_remote_package( IUnknown *pOuter, LPVOID *ppObj )

1 0

Hans Leidekker : msi: Avoid casts in IWineMsiRemotePackage methods.
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: c96cd6efc8debc3cee4637e4797e01e1a8a543ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=c96cd6efc8debc3cee4637e47… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:02:55 2011 +0200 msi: Avoid casts in IWineMsiRemotePackage methods. --- dlls/msi/install.c | 12 ++++-------- dlls/msi/msiserver.idl | 6 +++--- dlls/msi/package.c | 20 ++++++++------------ 3 files changed, 15 insertions(+), 23 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 30a63e6..5879df4 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -246,8 +246,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, } len = 0; - hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, - NULL, &len ); + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, NULL, &len ); if (FAILED(hr)) goto done; @@ -259,8 +258,7 @@ static UINT MSI_GetTargetPath( MSIHANDLE hInstall, LPCWSTR szFolder, goto done; } - hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, - (BSTR *)value, &len); + hr = IWineMsiRemotePackage_GetTargetPath( remote_package, folder, value, &len ); if (FAILED(hr)) goto done; @@ -371,8 +369,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, } len = 0; - hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, - NULL, &len ); + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, NULL, &len ); if (FAILED(hr)) goto done; @@ -384,8 +381,7 @@ static UINT MSI_GetSourcePath( MSIHANDLE hInstall, LPCWSTR szFolder, goto done; } - hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, - (BSTR *)value, &len); + hr = IWineMsiRemotePackage_GetSourcePath( remote_package, folder, value, &len ); if (FAILED(hr)) goto done; diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index aa81498..669d7f2 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -54,14 +54,14 @@ interface IWineMsiRemotePackage : IUnknown { HRESULT SetMsiHandle( [in] MSIHANDLE handle ); HRESULT GetActiveDatabase( [out] MSIHANDLE *handle ); - HRESULT GetProperty( [in] BSTR property, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetProperty( [in] BSTR property, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT SetProperty( [in] BSTR property, [in] BSTR value ); HRESULT ProcessMessage( [in] INSTALLMESSAGE message, [in] MSIHANDLE record ); HRESULT DoAction( [in] BSTR action ); HRESULT Sequence( [in] BSTR table, [in] int sequence ); - HRESULT GetTargetPath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetTargetPath( [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT SetTargetPath( [in] BSTR folder, [in] BSTR value ); - HRESULT GetSourcePath( [in] BSTR folder, [out] BSTR *value, [out] DWORD *size ); + HRESULT GetSourcePath( [in] BSTR folder, [out, size_is(*size)] BSTR value, [in, out] DWORD *size ); HRESULT GetMode( [in] MSIRUNMODE mode, [out] BOOL *ret ); HRESULT SetMode( [in] MSIRUNMODE mode, [in] BOOL state ); HRESULT GetFeatureState( [in] BSTR feature, [out] INSTALLSTATE *installed, [out] INSTALLSTATE *action ); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 2a82ca5..7355b3d 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -2231,7 +2231,7 @@ static UINT MSI_GetProperty( MSIHANDLE handle, LPCWSTR name, goto done; } - hr = IWineMsiRemotePackage_GetProperty( remote_package, bname, (BSTR *)value, &len ); + hr = IWineMsiRemotePackage_GetProperty( remote_package, bname, value, &len ); if (FAILED(hr)) goto done; @@ -2383,15 +2383,11 @@ static HRESULT WINAPI mrp_GetActiveDatabase( IWineMsiRemotePackage *iface, MSIHA return S_OK; } -static HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetProperty( IWineMsiRemotePackage *iface, BSTR property, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r; - - r = MsiGetPropertyW(This->package, (LPWSTR)property, (LPWSTR)value, size); - if (r != ERROR_SUCCESS) - return HRESULT_FROM_WIN32(r); - + UINT r = MsiGetPropertyW(This->package, property, value, size); + if (r != ERROR_SUCCESS) return HRESULT_FROM_WIN32(r); return S_OK; } @@ -2423,10 +2419,10 @@ static HRESULT WINAPI mrp_Sequence( IWineMsiRemotePackage *iface, BSTR table, in return HRESULT_FROM_WIN32(r); } -static HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetTargetPath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetTargetPathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + UINT r = MsiGetTargetPathW(This->package, folder, value, size); return HRESULT_FROM_WIN32(r); } @@ -2437,10 +2433,10 @@ static HRESULT WINAPI mrp_SetTargetPath( IWineMsiRemotePackage *iface, BSTR fold return HRESULT_FROM_WIN32(r); } -static HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR *value, DWORD *size ) +static HRESULT WINAPI mrp_GetSourcePath( IWineMsiRemotePackage *iface, BSTR folder, BSTR value, DWORD *size ) { msi_remote_package_impl* This = impl_from_IWineMsiRemotePackage( iface ); - UINT r = MsiGetSourcePathW(This->package, (LPWSTR)folder, (LPWSTR)value, size); + UINT r = MsiGetSourcePathW(This->package, folder, value, size); return HRESULT_FROM_WIN32(r); }

1 0

Hans Leidekker : msi: Skip disabled components in the InstallService action .
by Alexandre Julliard 02 May '11

02 May '11

Module: wine Branch: master Commit: 0d0074d56be678ea0480eb4bfbe69685bf0eb453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d0074d56be678ea0480eb4bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 2 16:03:14 2011 +0200 msi: Skip disabled components in the InstallService action. --- dlls/msi/action.c | 33 +++++++++++++++++++-------------- 1 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 7bed12f..da59d3a 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5945,23 +5945,33 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','W','H','E','R','E',' ', + '`','C','o','m','p','o','n','e','n','t','`',' ','=','\'','%','s','\'',0}; MSIPACKAGE *package = param; + MSICOMPONENT *component; MSIRECORD *row; MSIFILE *file; - SC_HANDLE hscm, service = NULL; + SC_HANDLE hscm = NULL, service = NULL; LPCWSTR comp, key; LPWSTR name = NULL, disp = NULL, load_order = NULL, serv_name = NULL; LPWSTR depends = NULL, pass = NULL, args = NULL, image_path = NULL; DWORD serv_type, start_type, err_control; SERVICE_DESCRIPTIONW sd = {NULL}; - static const WCHAR query[] = - {'S','E','L','E','C','T',' ','*',' ','F','R', 'O','M',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - 'W','H','E','R','E',' ', - '`','C','o','m','p','o','n','e','n','t','`',' ', - '=','\'','%','s','\'',0}; - + comp = MSI_RecordGetString( rec, 12 ); + component = get_loaded_component( package, comp ); + if (!component) + { + WARN("service component not found\n"); + goto done; + } + if (!component->Enabled) + { + TRACE("service component disabled\n"); + goto done; + } hscm = OpenSCManagerW(NULL, SERVICES_ACTIVE_DATABASEW, GENERIC_WRITE); if (!hscm) { @@ -5969,10 +5979,6 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) goto done; } - comp = MSI_RecordGetString( rec, 12 ); - if (!get_loaded_component( package, comp )) - goto done; - start_type = MSI_RecordGetInteger(rec, 5); if (start_type == SERVICE_BOOT_START || start_type == SERVICE_SYSTEM_START) goto done; @@ -5992,11 +5998,10 @@ static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) row = MSI_QueryGetRecord(package->db, query, comp); if (!row) { - ERR("Control query failed!\n"); + ERR("Query failed\n"); goto done; } key = MSI_RecordGetString(row, 6); - file = get_loaded_file(package, key); msiobj_release(&row->hdr); if (!file)

1 0