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

Jacek Caban : mshtml: Use helper for IHTMLStyle::put_zIndex implementation.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 6b0875a67e5369df29350fabc28631a7494f43e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b0875a67e5369df29350fabc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 10:31:29 2012 +0200 mshtml: Use helper for IHTMLStyle::put_zIndex implementation. --- dlls/mshtml/htmlstyle.c | 17 +---------------- 1 files changed, 1 insertions(+), 16 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7cbf895..4f94c5c 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -2190,22 +2190,7 @@ static HRESULT WINAPI HTMLStyle_put_zIndex(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_Z_INDEX, V_BSTR(&v), 0); - case VT_I4: { - WCHAR value[14]; - static const WCHAR format[] = {'%','d',0}; - - wsprintfW(value, format, V_I4(&v)); - return set_style_attr(This, STYLEID_Z_INDEX, value, 0); - } - default: - FIXME("unimplemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_Z_INDEX, &v, 0); } static HRESULT WINAPI HTMLStyle_get_zIndex(IHTMLStyle *iface, VARIANT *p)

1 0

Jacek Caban : devenum: Removed useless structs.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 9940756d218f76653ebf65195f2c262626319db3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9940756d218f76653ebf65195… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 10:43:12 2012 +0200 devenum: Removed useless structs. --- dlls/devenum/createdevenum.c | 2 +- dlls/devenum/devenum_private.h | 14 ++------------ dlls/devenum/parsedisplayname.c | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 266e1d8..fad1325 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -519,7 +519,7 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = /********************************************************************** * static CreateDevEnum instance */ -CreateDevEnumImpl DEVENUM_CreateDevEnum = { { &ICreateDevEnum_Vtbl } }; +ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; /********************************************************************** * DEVENUM_CreateAMCategoryKey (INTERNAL) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 45736a5..17e89a5 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -62,16 +62,6 @@ typedef struct typedef struct { - ICreateDevEnum ICreateDevEnum_iface; -} CreateDevEnumImpl; - -typedef struct -{ - IParseDisplayName IParseDisplayName_iface; -} ParseDisplayNameImpl; - -typedef struct -{ IMoniker IMoniker_iface; LONG ref; HKEY hkey; @@ -81,8 +71,8 @@ MediaCatMoniker * DEVENUM_IMediaCatMoniker_Construct(void) DECLSPEC_HIDDEN; HRESULT DEVENUM_IEnumMoniker_Construct(HKEY hkey, IEnumMoniker ** ppEnumMoniker) DECLSPEC_HIDDEN; extern ClassFactoryImpl DEVENUM_ClassFactory DECLSPEC_HIDDEN; -extern CreateDevEnumImpl DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; -extern ParseDisplayNameImpl DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; +extern ICreateDevEnum DEVENUM_CreateDevEnum DECLSPEC_HIDDEN; +extern IParseDisplayName DEVENUM_ParseDisplayName DECLSPEC_HIDDEN; /********************************************************************** * Private helper function to get AM filter category key location diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index 40850b2..77ea1ec 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -153,4 +153,4 @@ static const IParseDisplayNameVtbl IParseDisplayName_Vtbl = }; /* The one instance of this class */ -ParseDisplayNameImpl DEVENUM_ParseDisplayName = { { &IParseDisplayName_Vtbl } }; +IParseDisplayName DEVENUM_ParseDisplayName = { &IParseDisplayName_Vtbl };

1 0

Aric Stewart : strmbase: Fix issues with new quality control implementation in TransformFilter.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 109ec4bbabc2c4fe04a38e450ec60e4c2184a23d URL: http://source.winehq.org/git/wine.git/?a=commit;h=109ec4bbabc2c4fe04a38e450… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:27:47 2012 -0500 strmbase: Fix issues with new quality control implementation in TransformFilter. --- dlls/strmbase/transform.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 2a51576..f970527 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -235,6 +235,7 @@ static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* p ERR("Cannot create output pin (%x)\n", hr); else { QualityControlImpl_Create( pTransformFilter->ppPins[0], &pTransformFilter->filter.IBaseFilter_iface, &pTransformFilter->qcimpl); + pTransformFilter->qcimpl->IQualityControl_iface.lpVtbl = &TransformFilter_QualityControl_Vtbl; } } if (FAILED(hr)) @@ -404,7 +405,7 @@ HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStar HRESULT WINAPI TransformFilterImpl_Notify(TransformFilter *iface, IBaseFilter *sender, Quality qm) { - return QualityControlImpl_Notify((IQualityControl*)&iface->qcimpl, sender, qm); + return QualityControlImpl_Notify((IQualityControl*)iface->qcimpl, sender, qm); } /** IBaseFilter implementation **/

1 0

Aric Stewart : strmbase: Add IMediaPosition implementation to PosPassThru.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 51e3834bfb8c9d4718f0bacd3992a4f42f595427 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3834bfb8c9d4718f0bacd3… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:29:51 2012 -0500 strmbase: Add IMediaPosition implementation to PosPassThru. --- dlls/quartz/tests/dsoundrender.c | 2 +- dlls/quartz/tests/videorenderer.c | 4 +- dlls/strmbase/pospass.c | 334 ++++++++++++++++++++++++++++++++++--- dlls/strmbase/renderer.c | 2 +- dlls/winegstreamer/gsttffilter.c | 2 +- dlls/wineqtdecoder/qtvdecoder.c | 2 +- 6 files changed, 320 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51e3834bfb8c9d4718f0b…

1 0

Aric Stewart : quartz: COM cleanup for DSoundRenderImpl.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 5bc4c1591aaa0b79e51c8bb3576804012f4d32ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc4c1591aaa0b79e51c8bb35… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Apr 3 14:28:37 2012 -0500 quartz: COM cleanup for DSoundRenderImpl. --- dlls/quartz/dsoundrender.c | 118 +++++++++++++++++++++++++------------------- 1 files changed, 67 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5bc4c1591aaa0b79e51c8…

1 0

Andrew Eikum : mmdevapi: Use device GUIDs as unique identifiers.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: e87cb774d131963d2642d075977571585ec5da8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e87cb774d131963d2642d0759… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 13:48:12 2012 -0500 mmdevapi: Use device GUIDs as unique identifiers. --- dlls/mmdevapi/devenum.c | 104 +++++++++++-------------- dlls/mmdevapi/mmdevapi.h | 5 +- dlls/winealsa.drv/mmdevdrv.c | 31 +++----- dlls/winealsa.drv/winealsa.drv.spec | 2 +- dlls/winecoreaudio.drv/mmdevdrv.c | 29 ++------ dlls/winecoreaudio.drv/winecoreaudio.drv.spec | 2 +- dlls/wineoss.drv/mmdevdrv.c | 25 +----- dlls/wineoss.drv/wineoss.drv.spec | 2 +- 8 files changed, 71 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e87cb774d131963d2642d…

1 0

Jacek Caban : mshtml: Use helpers for IHTMLStyle:: put_verticalAlign property implementation.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 3d2d9596fdac0a93f8b6242b6e8be83b73f063b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2d9596fdac0a93f8b6242b6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Apr 4 10:30:47 2012 +0200 mshtml: Use helpers for IHTMLStyle::put_verticalAlign property implementation. --- dlls/mshtml/htmlstyle.c | 20 ++------------------ dlls/mshtml/tests/style.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 627d42c..68a2c6b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -1350,32 +1350,16 @@ static HRESULT WINAPI HTMLStyle_put_verticalAlign(IHTMLStyle *iface, VARIANT v) TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); - switch(V_VT(&v)) { - case VT_BSTR: - return set_style_attr(This, STYLEID_VERTICAL_ALIGN, V_BSTR(&v), 0); - default: - FIXME("not implemented vt %d\n", V_VT(&v)); - return E_NOTIMPL; - } - - return S_OK; + return set_nsstyle_attr_var(This->nsstyle, STYLEID_VERTICAL_ALIGN, &v, ATTR_FIX_PX); } static HRESULT WINAPI HTMLStyle_get_verticalAlign(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = impl_from_IHTMLStyle(iface); - BSTR ret; - HRESULT hres; TRACE("(%p)->(%p)\n", This, p); - hres = get_style_attr(This, STYLEID_VERTICAL_ALIGN, &ret); - if(FAILED(hres)) - return hres; - - V_VT(p) = VT_BSTR; - V_BSTR(p) = ret; - return S_OK; + return get_nsstyle_attr_var(This->nsstyle, STYLEID_VERTICAL_ALIGN, p, 0); } static HRESULT WINAPI HTMLStyle_put_textTransform(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index bb80df1..9c7da84 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -1022,6 +1022,19 @@ static void test_body_style(IHTMLStyle *style) ok(!strcmp_wa(V_BSTR(&v), "middle"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); + V_VT(&v) = VT_I4; + V_I4(&v) = 100; + hres = IHTMLStyle_put_verticalAlign(style, v); + ok(hres == S_OK, "put_vertivalAlign failed: %08x\n", hres); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLStyle_get_verticalAlign(style, &v); + ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + str = (void*)0xdeadbeef; hres = IHTMLStyle_get_textAlign(style, &str); ok(hres == S_OK, "get_textAlign failed: %08x\n", hres); @@ -2099,7 +2112,7 @@ static void test_current_style(IHTMLCurrentStyle *current_style) hres = IHTMLCurrentStyle_get_verticalAlign(current_style, &v); ok(hres == S_OK, "get_verticalAlign failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); - ok(!strcmp_wa(V_BSTR(&v), "middle"), "get_verticalAlign returned %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!strcmp_wa(V_BSTR(&v), "100px"), "get_verticalAlign returned %s\n", wine_dbgstr_w(V_BSTR(&v))); VariantClear(&v); hres = IHTMLCurrentStyle_get_marginRight(current_style, &v);

1 0

Andrew Eikum : winecoreaudio.drv: Use device GUIDs as keys.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 98815f399c1e37e1e33e5712e4e74d4c56f9ad78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98815f399c1e37e1e33e5712e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Apr 3 13:48:08 2012 -0500 winecoreaudio.drv: Use device GUIDs as keys. --- dlls/winecoreaudio.drv/mmdevdrv.c | 183 +++++++++++++++++++++++++++++++++--- 1 files changed, 167 insertions(+), 16 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 42d8d18..a50af4f 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -177,6 +177,14 @@ typedef struct _SessionMgr { IMMDevice *device; } SessionMgr; +static const WCHAR drv_keyW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v',0}; +static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', + 'W','i','n','e','\\','D','r','i','v','e','r','s','\\', + 'w','i','n','e','c','o','r','e','a','u','d','i','o','.','d','r','v','\\','d','e','v','i','c','e','s',0}; +static const WCHAR guidW[] = {'g','u','i','d',0}; + static HANDLE g_timer_q; static CRITICAL_SECTION g_sessions_lock; @@ -273,8 +281,83 @@ int WINAPI AUDDRV_GetPriority(void) return Priority_Neutral; } +static void set_device_guid(EDataFlow flow, HKEY drv_key, const WCHAR *key_name, + GUID *guid) +{ + HKEY key; + BOOL opened = FALSE; + LONG lr; + + if(!drv_key){ + lr = RegCreateKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, NULL, 0, KEY_WRITE, + NULL, &drv_key, NULL); + if(lr != ERROR_SUCCESS){ + ERR("RegCreateKeyEx(drv_key) failed: %u\n", lr); + return; + } + opened = TRUE; + } + + lr = RegCreateKeyExW(drv_key, key_name, 0, NULL, 0, KEY_WRITE, + NULL, &key, NULL); + if(lr != ERROR_SUCCESS){ + ERR("RegCreateKeyEx(%s) failed: %u\n", wine_dbgstr_w(key_name), lr); + goto exit; + } + + lr = RegSetValueExW(key, guidW, 0, REG_BINARY, (BYTE*)guid, + sizeof(GUID)); + if(lr != ERROR_SUCCESS) + ERR("RegSetValueEx(%s\\guid) failed: %u\n", wine_dbgstr_w(key_name), lr); + + RegCloseKey(key); +exit: + if(opened) + RegCloseKey(drv_key); +} + +static void get_device_guid(EDataFlow flow, AudioDeviceID device, GUID *guid) +{ + HKEY key = NULL, dev_key; + DWORD type, size = sizeof(*guid); + WCHAR key_name[256]; + + static const WCHAR key_fmt[] = {'%','u',0}; + + if(flow == eCapture) + key_name[0] = '1'; + else + key_name[0] = '0'; + key_name[1] = ','; + + sprintfW(key_name + 2, key_fmt, device); + + if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_WRITE|KEY_READ, &key) == ERROR_SUCCESS){ + if(RegOpenKeyExW(key, key_name, 0, KEY_READ, &dev_key) == ERROR_SUCCESS){ + if(RegQueryValueExW(dev_key, guidW, 0, &type, + (BYTE*)guid, &size) == ERROR_SUCCESS){ + if(type == REG_BINARY){ + RegCloseKey(dev_key); + RegCloseKey(key); + return; + } + ERR("Invalid type for device %s GUID: %u; ignoring and overwriting\n", + wine_dbgstr_w(key_name), type); + } + RegCloseKey(dev_key); + } + } + + CoCreateGuid(guid); + + set_device_guid(flow, key, key_name, guid); + + if(key) + RegCloseKey(key); +} + HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, - AudioDeviceID ***keys, UINT *num, UINT *def_index) + GUID ***guids, UINT *num, UINT *def_index) { UInt32 devsize, size; AudioDeviceID *devices; @@ -330,7 +413,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, return E_OUTOFMEMORY; } - *keys = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(AudioDeviceID *)); + *guids = HeapAlloc(GetProcessHeap(), 0, ndevices * sizeof(GUID *)); if(!*ids){ HeapFree(GetProcessHeap(), 0, *ids); HeapFree(GetProcessHeap(), 0, devices); @@ -363,9 +446,9 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, HeapFree(GetProcessHeap(), 0, devices); for(j = 0; j < *num; ++j){ HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, (*keys)[j]); + HeapFree(GetProcessHeap(), 0, (*guids)[j]); } - HeapFree(GetProcessHeap(), 0, *keys); + HeapFree(GetProcessHeap(), 0, *guids); HeapFree(GetProcessHeap(), 0, *ids); return E_OUTOFMEMORY; } @@ -408,35 +491,35 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, HeapFree(GetProcessHeap(), 0, devices); for(j = 0; j < *num; ++j){ HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, (*keys)[j]); + HeapFree(GetProcessHeap(), 0, (*guids)[j]); } HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *keys); + HeapFree(GetProcessHeap(), 0, *guids); return E_OUTOFMEMORY; } CFStringGetCharacters(name, CFRangeMake(0, len - 1), (UniChar*)(*ids)[*num]); ((*ids)[*num])[len - 1] = 0; CFRelease(name); - (*keys)[*num] = HeapAlloc(GetProcessHeap(), 0, sizeof(AudioDeviceID)); - if(!(*keys)[*num]){ + (*guids)[*num] = HeapAlloc(GetProcessHeap(), 0, sizeof(GUID)); + if(!(*guids)[*num]){ HeapFree(GetProcessHeap(), 0, devices); HeapFree(GetProcessHeap(), 0, (*ids)[*num]); for(j = 0; j < *num; ++j){ HeapFree(GetProcessHeap(), 0, (*ids)[j]); - HeapFree(GetProcessHeap(), 0, (*keys)[j]); + HeapFree(GetProcessHeap(), 0, (*guids)[j]); } HeapFree(GetProcessHeap(), 0, *ids); - HeapFree(GetProcessHeap(), 0, *keys); + HeapFree(GetProcessHeap(), 0, *guids); return E_OUTOFMEMORY; } - *(*keys)[*num] = devices[i]; + get_device_guid(flow, devices[i], (*guids)[*num]); if(*def_index == (UINT)-1 && devices[i] == default_id) *def_index = *num; TRACE("device %u: id %s key %u%s\n", *num, debugstr_w((*ids)[*num]), - (unsigned int)*(*keys)[*num], (*def_index == *num) ? " (default)" : ""); + (unsigned int)devices[i], (*def_index == *num) ? " (default)" : ""); (*num)++; } @@ -449,12 +532,80 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids, return S_OK; } -HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, - EDataFlow dataflow, IAudioClient **out) +static BOOL get_deviceid_by_guid(GUID *guid, AudioDeviceID *id, EDataFlow *flow) +{ + HKEY devices_key; + UINT i = 0; + WCHAR key_name[256]; + DWORD key_name_size; + + if(RegOpenKeyExW(HKEY_CURRENT_USER, drv_key_devicesW, 0, KEY_READ, &devices_key) != ERROR_SUCCESS){ + ERR("No devices in registry?\n"); + return FALSE; + } + + while(1){ + HKEY key; + DWORD size, type; + GUID reg_guid; + + key_name_size = sizeof(key_name); + if(RegEnumKeyExW(devices_key, i, key_name, &key_name_size, NULL, + NULL, NULL, NULL) != ERROR_SUCCESS) + break; + + if(RegOpenKeyExW(devices_key, key_name, 0, KEY_READ, &key) != ERROR_SUCCESS){ + WARN("Couldn't open key: %s\n", wine_dbgstr_w(key_name)); + continue; + } + + size = sizeof(reg_guid); + if(RegQueryValueExW(key, guidW, 0, &type, + (BYTE*)&reg_guid, &size) == ERROR_SUCCESS){ + if(IsEqualGUID(&reg_guid, guid)){ + RegCloseKey(key); + RegCloseKey(devices_key); + + TRACE("Found matching device key: %s\n", wine_dbgstr_w(key_name)); + + if(key_name[0] == '0') + *flow = eRender; + else if(key_name[0] == '1') + *flow = eCapture; + else{ + ERR("Unknown device type: %c\n", key_name[0]); + return FALSE; + } + + *id = strtoulW(key_name + 2, NULL, 10); + + return TRUE; + } + } + + RegCloseKey(key); + + ++i; + } + + RegCloseKey(devices_key); + + WARN("No matching device in registry for GUID %s\n", debugstr_guid(guid)); + + return FALSE; +} + +HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, + EDataFlow unused_dataflow, IAudioClient **out) { ACImpl *This; + AudioDeviceID adevid; + EDataFlow dataflow; + + TRACE("%s %p %p\n", debugstr_guid(guid), dev, out); - TRACE("%u %p %d %p\n", (unsigned int)*adevid, dev, dataflow, out); + if(!get_deviceid_by_guid(guid, &adevid, &dataflow)) + return AUDCLNT_E_DEVICE_INVALIDATED; This = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACImpl)); if(!This) @@ -487,7 +638,7 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, list_init(&This->queued_buffers); list_init(&This->queued_bufinfos); - This->adevid = *adevid; + This->adevid = adevid; *out = &This->IAudioClient_iface; IAudioClient_AddRef(&This->IAudioClient_iface);

1 0

Christian Costa : amstream: Add CLSID_AMAudioData implementation.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: 0f8553b5d4411b324f8116547d1202620f618531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8553b5d4411b324f8116547… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 3 17:51:07 2012 +0200 amstream: Add CLSID_AMAudioData implementation. --- dlls/amstream/Makefile.in | 1 + dlls/amstream/amstream_classes.idl | 7 ++ dlls/amstream/amstream_private.h | 2 + dlls/amstream/audiodata.c | 157 ++++++++++++++++++++++++++++++++++++ dlls/amstream/main.c | 1 + dlls/amstream/tests/amstream.c | 2 +- 6 files changed, 169 insertions(+), 1 deletions(-) diff --git a/dlls/amstream/Makefile.in b/dlls/amstream/Makefile.in index 3353a38..35cfae1 100644 --- a/dlls/amstream/Makefile.in +++ b/dlls/amstream/Makefile.in @@ -3,6 +3,7 @@ IMPORTS = strmiids strmbase uuid ole32 advapi32 C_SRCS = \ amstream.c \ + audiodata.c \ main.c \ mediastream.c \ mediastreamfilter.c diff --git a/dlls/amstream/amstream_classes.idl b/dlls/amstream/amstream_classes.idl index 701275d..064ce00 100644 --- a/dlls/amstream/amstream_classes.idl +++ b/dlls/amstream/amstream_classes.idl @@ -38,3 +38,10 @@ coclass AMDirectDrawStream { interface IAMMultiMediaStream; } uuid(49c47ce5-9ba4-11d0-8212-00c04fc32c45) ] coclass AMMultiMediaStream { interface IAMMultiMediaStream; } + +[ + helpstring("AuStream Class"), + threading(both), + uuid(f2468580-af8a-11d0-8212-00c04fc32c45) +] +coclass AMAudioData { interface IAudioData; } diff --git a/dlls/amstream/amstream_private.h b/dlls/amstream/amstream_private.h index 69fd23f..e40c409 100644 --- a/dlls/amstream/amstream_private.h +++ b/dlls/amstream/amstream_private.h @@ -30,8 +30,10 @@ #include "winuser.h" #include "dshow.h" #include "mmstream.h" +#include "austream.h" HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT mediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, STREAM_TYPE StreamType, IMediaStream **ppMediaStream) DECLSPEC_HIDDEN; diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c new file mode 100644 index 0000000..7d3c38a --- /dev/null +++ b/dlls/amstream/audiodata.c @@ -0,0 +1,157 @@ +/* + * Implementation of IAudioData Interface + * + * Copyright 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "wine/debug.h" + +#define COBJMACROS + +#include "winbase.h" +#include "amstream_private.h" + +#include "amstream.h" + +WINE_DEFAULT_DEBUG_CHANNEL(amstream); + +typedef struct { + IAudioData IAudioData_iface; + LONG ref; +} AMAudioDataImpl; + +static inline AMAudioDataImpl *impl_from_IAudioData(IAudioData *iface) +{ + return CONTAINING_RECORD(iface, AMAudioDataImpl, IAudioData_iface); +} + +/*** IUnknown methods ***/ +static HRESULT WINAPI IAudioDataImpl_QueryInterface(IAudioData *iface, REFIID riid, void **ret_iface) +{ + TRACE("(%p)->(%s,%p)\n", iface, debugstr_guid(riid), ret_iface); + + if (IsEqualGUID(riid, &IID_IUnknown) || + IsEqualGUID(riid, &IID_IMemoryData) || + IsEqualGUID(riid, &IID_IAudioData)) + { + IUnknown_AddRef(iface); + *ret_iface = iface; + return S_OK; + } + + ERR("(%p)->(%s,%p),not found\n", iface, debugstr_guid(riid), ret_iface); + return E_NOINTERFACE; +} + +static ULONG WINAPI IAudioDataImpl_AddRef(IAudioData* iface) +{ + AMAudioDataImpl *This = impl_from_IAudioData(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + + return ref; +} + +static ULONG WINAPI IAudioDataImpl_Release(IAudioData* iface) +{ + AMAudioDataImpl *This = impl_from_IAudioData(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p)->(): new ref = %u\n", iface, This->ref); + + if (!ref) + HeapFree(GetProcessHeap(), 0, This); + + return ref; +} + +/*** IMemoryData methods ***/ +static HRESULT WINAPI IAudioDataImpl_SetBuffer(IAudioData* iface, DWORD size, BYTE *data, DWORD flags) +{ + FIXME("(%p)->(%u,%p,%x): stub\n", iface, size, data, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_GetInfo(IAudioData* iface, DWORD *length, BYTE **data, DWORD *actual_data) +{ + FIXME("(%p)->(%p,%p,%p): stub\n", iface, length, data, actual_data); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_SetActual(IAudioData* iface, DWORD data_valid) +{ + FIXME("(%p)->(%u): stub\n", iface, data_valid); + + return E_NOTIMPL; +} + +/*** IAudioData methods ***/ +static HRESULT WINAPI IAudioDataImpl_GetFormat(IAudioData* iface, WAVEFORMATEX *wave_format_current) +{ + FIXME("(%p)->(%p): stub\n", iface, wave_format_current); + + return E_NOTIMPL; +} + +static HRESULT WINAPI IAudioDataImpl_SetFormat(IAudioData* iface, const WAVEFORMATEX *wave_format) +{ + FIXME("(%p)->(%p): stub\n", iface, wave_format); + + return E_NOTIMPL; +} + +static const struct IAudioDataVtbl AudioData_Vtbl = +{ + /*** IUnknown methods ***/ + IAudioDataImpl_QueryInterface, + IAudioDataImpl_AddRef, + IAudioDataImpl_Release, + /*** IMemoryData methods ***/ + IAudioDataImpl_SetBuffer, + IAudioDataImpl_GetInfo, + IAudioDataImpl_SetActual, + /*** IAudioData methods ***/ + IAudioDataImpl_GetFormat, + IAudioDataImpl_SetFormat +}; + +HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ + AMAudioDataImpl *object; + + TRACE("(%p,%p)\n", pUnkOuter, ppObj); + + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(AMAudioDataImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IAudioData_iface.lpVtbl = &AudioData_Vtbl; + object->ref = 1; + + *ppObj = &object->IAudioData_iface; + + return S_OK; +} diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index 9f23974..79142e5 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -75,6 +75,7 @@ static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, AM_create }, { &CLSID_AMDirectDrawStream, AM_create }, + { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, MediaStreamFilter_create } }; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 39add30..87bbcc7 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -334,7 +334,7 @@ static void test_media_streams(void) { IAudioData* audio_data = NULL; hr = CoCreateInstance(&CLSID_AMAudioData, NULL, CLSCTX_INPROC_SERVER, &IID_IAudioData, (void **)&audio_data); - todo_wine ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); + ok(hr == S_OK, "CoCreateInstance returned: %x\n", hr); hr = IAudioMediaStream_CreateSample(audio_media_stream, NULL, 0, &audio_sample); todo_wine ok(hr == E_POINTER, "IAudioMediaStream_CreateSample returned: %x\n", hr);

1 0

Christian Costa : amstream: Implement IAMMultiMediaStreamImpl_Seek.
by Alexandre Julliard 04 Apr '12

04 Apr '12

Module: wine Branch: master Commit: efff5abfb1701ba63d6e21f7ed510e4e1557591d URL: http://source.winehq.org/git/wine.git/?a=commit;h=efff5abfb1701ba63d6e21f7e… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Apr 3 07:53:43 2012 +0200 amstream: Implement IAMMultiMediaStreamImpl_Seek. --- dlls/amstream/amstream.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 89ea46b..1366cdb 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -211,13 +211,13 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_GetDuration(IAMMultiMediaStream* i return E_NOTIMPL; } -static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME SeekTime) +static HRESULT WINAPI IAMMultiMediaStreamImpl_Seek(IAMMultiMediaStream* iface, STREAM_TIME seek_time) { IAMMultiMediaStreamImpl *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->() stub!\n", This, iface); + TRACE("(%p/%p)->(%s)\n", This, iface, wine_dbgstr_longlong(seek_time)); - return E_NOTIMPL; + return IMediaSeeking_SetPositions(This->media_seeking, &seek_time, AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning); } static HRESULT WINAPI IAMMultiMediaStreamImpl_GetEndOfStream(IAMMultiMediaStream* iface, HANDLE* phEOS)

1 0