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

David Hedberg : winspool.drv: Add stubs for IsValidDevmodeW and IsValidDevmodeA.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: a82f7cf44650ccaac0e90cc442c818c26d20ddd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82f7cf44650ccaac0e90cc44… Author: David Hedberg <dhedberg(a)codeweavers.com> Date: Mon May 9 08:27:09 2011 +0200 winspool.drv: Add stubs for IsValidDevmodeW and IsValidDevmodeA. --- dlls/winspool.drv/info.c | 32 ++++++++++++++++++++++++++++++++ dlls/winspool.drv/tests/info.c | 23 +++++++++++++++++++++++ dlls/winspool.drv/winspool.drv.spec | 2 ++ 3 files changed, 57 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 6d81f52..5201e30 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1775,6 +1775,38 @@ LONG WINAPI DocumentPropertiesW(HWND hWnd, HANDLE hPrinter, return ret; } +/***************************************************************************** + * IsValidDevmodeA [WINSPOOL.@] + * + * Validate a DEVMODE structure and fix errors if possible. + * + */ +BOOL WINAPI IsValidDevmodeA(PDEVMODEA *pDevMode, SIZE_T size) +{ + FIXME("(%p,%ld): stub\n", pDevMode, size); + + if(!pDevMode) + return FALSE; + + return TRUE; +} + +/***************************************************************************** + * IsValidDevmodeW [WINSPOOL.@] + * + * Validate a DEVMODE structure and fix errors if possible. + * + */ +BOOL WINAPI IsValidDevmodeW(PDEVMODEW *pDevMode, SIZE_T size) +{ + FIXME("(%p,%ld): stub\n", pDevMode, size); + + if(!pDevMode) + return FALSE; + + return TRUE; +} + /****************************************************************** * OpenPrinterA [WINSPOOL.@] * diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index da4fc38..2ef049f 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -75,6 +75,7 @@ static BOOL (WINAPI * pGetPrinterDriverW)(HANDLE, LPWSTR, DWORD, LPBYTE, DWORD, static BOOL (WINAPI * pGetPrinterW)(HANDLE, DWORD, LPBYTE, DWORD, LPDWORD); static BOOL (WINAPI * pSetDefaultPrinterA)(LPCSTR); static DWORD (WINAPI * pXcvDataW)(HANDLE, LPCWSTR, PBYTE, DWORD, PBYTE, DWORD, PDWORD, PDWORD); +static BOOL (WINAPI * pIsValidDevmodeW)(PDEVMODEW, SIZE_T); /* ################################ */ @@ -2852,6 +2853,26 @@ static void test_DeviceCapabilities(void) GlobalFree(prn_dlg.hDevNames); } +static void test_IsValidDevmodeW(void) +{ + BOOL br; + + if (!pIsValidDevmodeW) + { + win_skip("IsValidDevmodeW not implemented.\n"); + return; + } + + br = pIsValidDevmodeW(NULL, 0); + ok(br == FALSE, "Got %d\n", br); + + br = pIsValidDevmodeW(NULL, 1); + ok(br == FALSE, "Got %d\n", br); + + br = pIsValidDevmodeW(NULL, sizeof(DEVMODEW)); + ok(br == FALSE, "Got %d\n", br); +} + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); @@ -2863,6 +2884,7 @@ START_TEST(info) pGetPrinterW = (void *) GetProcAddress(hwinspool, "GetPrinterW"); pSetDefaultPrinterA = (void *) GetProcAddress(hwinspool, "SetDefaultPrinterA"); pXcvDataW = (void *) GetProcAddress(hwinspool, "XcvDataW"); + pIsValidDevmodeW = (void *) GetProcAddress(hwinspool, "IsValidDevmodeW"); on_win9x = check_win9x(); if (on_win9x) @@ -2898,6 +2920,7 @@ START_TEST(info) test_SetDefaultPrinter(); test_XcvDataW_MonitorUI(); test_XcvDataW_PortIsValid(); + test_IsValidDevmodeW(); /* Cleanup our temporary file */ DeleteFileA(tempfileA); diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index 9151b11..bdf346c 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -145,6 +145,8 @@ @ stdcall GetPrinterDriverDirectoryW(wstr wstr long ptr long ptr) @ stdcall GetPrinterDriverW(long wstr long ptr long ptr) @ stdcall GetPrinterW(long long ptr long ptr) +@ stdcall IsValidDevmodeA(ptr long) +@ stdcall IsValidDevmodeW(ptr long) @ stdcall OpenPrinterA(str ptr ptr) @ stdcall OpenPrinterW(wstr ptr ptr) @ stub PlayGdiScriptOnPrinterIC

1 0

Andrew Eikum : winecoreaudio.drv: Move IAudioClock closer to its related interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 5f4081e1f203154a013fa124e729a4c4bec6b423 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f4081e1f203154a013fa124e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:29 2011 -0500 winecoreaudio.drv: Move IAudioClock closer to its related interfaces. --- dlls/winecoreaudio.drv/mmdevdrv.c | 326 ++++++++++++++++++------------------ 1 files changed, 163 insertions(+), 163 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index fa4d107..503b983 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1756,6 +1756,169 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = AudioCaptureClient_GetNextPacketSize }; +static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if(!ppv) + return E_POINTER; + *ppv = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if(IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->IAudioClock2_iface; + if(*ppv){ + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock_Release(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, freq); + + *freq = This->fmt->nSamplesPerSec; + + return S_OK; +} + +static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, + UINT64 *pos, UINT64 *qpctime, BOOL raw) +{ + AudioTimeStamp time; + OSStatus sc; + + sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &time, NULL); + if(sc == kAudioQueueErr_InvalidRunState){ + *pos = 0; + }else if(sc == noErr){ + if(!(time.mFlags & kAudioTimeStampSampleTimeValid)){ + FIXME("Sample time not valid, should calculate from something else\n"); + return E_FAIL; + } + + if(raw) + *pos = time.mSampleTime; + else + *pos = time.mSampleTime - This->last_time; + }else{ + WARN("Unable to get current time: %lx\n", sc); + return E_FAIL; + } + + if(qpctime){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, + UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock(iface); + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); + + if(!pos) + return E_POINTER; + + OSSpinLockLock(&This->lock); + + hr = AudioClock_GetPosition_nolock(This, pos, qpctime, FALSE); + + OSSpinLockUnlock(&This->lock); + + return hr; +} + +static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, + DWORD *chars) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, chars); + + if(!chars) + return E_POINTER; + + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + + return S_OK; +} + +static const IAudioClockVtbl AudioClock_Vtbl = +{ + AudioClock_QueryInterface, + AudioClock_AddRef, + AudioClock_Release, + AudioClock_GetFrequency, + AudioClock_GetPosition, + AudioClock_GetCharacteristics +}; + +static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); +} + +static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, + UINT64 *pos, UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + + FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); + + return E_NOTIMPL; +} + +static const IAudioClock2Vtbl AudioClock2_Vtbl = +{ + AudioClock2_QueryInterface, + AudioClock2_AddRef, + AudioClock2_Release, + AudioClock2_GetDevicePosition +}; + static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret; @@ -2099,166 +2262,3 @@ static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = SimpleAudioVolume_SetMute, SimpleAudioVolume_GetMute }; - -static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IAudioClock2)) - *ppv = &This->IAudioClock2_iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock_Release(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, freq); - - *freq = This->fmt->nSamplesPerSec; - - return S_OK; -} - -static HRESULT AudioClock_GetPosition_nolock(ACImpl *This, - UINT64 *pos, UINT64 *qpctime, BOOL raw) -{ - AudioTimeStamp time; - OSStatus sc; - - sc = AudioQueueGetCurrentTime(This->aqueue, NULL, &time, NULL); - if(sc == kAudioQueueErr_InvalidRunState){ - *pos = 0; - }else if(sc == noErr){ - if(!(time.mFlags & kAudioTimeStampSampleTimeValid)){ - FIXME("Sample time not valid, should calculate from something else\n"); - return E_FAIL; - } - - if(raw) - *pos = time.mSampleTime; - else - *pos = time.mSampleTime - This->last_time; - }else{ - WARN("Unable to get current time: %lx\n", sc); - return E_FAIL; - } - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, - UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock(iface); - HRESULT hr; - - TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); - - if(!pos) - return E_POINTER; - - OSSpinLockLock(&This->lock); - - hr = AudioClock_GetPosition_nolock(This, pos, qpctime, FALSE); - - OSSpinLockUnlock(&This->lock); - - return hr; -} - -static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, - DWORD *chars) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, chars); - - if(!chars) - return E_POINTER; - - *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; - - return S_OK; -} - -static const IAudioClockVtbl AudioClock_Vtbl = -{ - AudioClock_QueryInterface, - AudioClock_AddRef, - AudioClock_Release, - AudioClock_GetFrequency, - AudioClock_GetPosition, - AudioClock_GetCharacteristics -}; - -static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); -} - -static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, - UINT64 *pos, UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - - FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); - - return E_NOTIMPL; -} - -static const IAudioClock2Vtbl AudioClock2_Vtbl = -{ - AudioClock2_QueryInterface, - AudioClock2_AddRef, - AudioClock2_Release, - AudioClock2_GetDevicePosition -};

1 0

Andrew Eikum : winecoreaudio.drv: Store the PropertyScope in ACImpl.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: b9a66b1bc364c316249a4c11e5499c1c5c29e7a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a66b1bc364c316249a4c11e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:31 2011 -0500 winecoreaudio.drv: Store the PropertyScope in ACImpl. --- dlls/winecoreaudio.drv/mmdevdrv.c | 35 +++++++++++++---------------------- 1 files changed, 13 insertions(+), 22 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 503b983..d5c064d 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -112,6 +112,7 @@ struct ACImpl { AudioDeviceID adevid; AudioQueueRef aqueue; + AudioObjectPropertyScope scope; HANDLE timer; UINT32 period_ms, bufsize_frames, inbuf_frames, written_frames; UINT64 last_time; @@ -402,6 +403,15 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(AudioDeviceID *adevid, IMMDevice *dev, This->dataflow = dataflow; + if(dataflow == eRender) + This->scope = kAudioDevicePropertyScopeOutput; + else if(dataflow == eCapture) + This->scope = kAudioDevicePropertyScopeInput; + else{ + HeapFree(GetProcessHeap(), 0, This); + return E_INVALIDARG; + } + This->lock = 0; This->parent = dev; @@ -872,12 +882,7 @@ static HRESULT ca_get_max_stream_latency(ACImpl *This, UInt32 *max) OSStatus sc; int nstreams, i; - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else - return E_UNEXPECTED; + addr.mScope = This->scope; addr.mElement = 0; addr.mSelector = kAudioDevicePropertyStreams; @@ -944,14 +949,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient *iface, return AUDCLNT_E_NOT_INITIALIZED; } - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else{ - OSSpinLockUnlock(&This->lock); - return E_UNEXPECTED; - } + addr.mScope = This->scope; addr.mSelector = kAudioDevicePropertyLatency; addr.mElement = 0; @@ -1077,14 +1075,7 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, fmt->Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; - if(This->dataflow == eRender) - addr.mScope = kAudioDevicePropertyScopeOutput; - else if(This->dataflow == eCapture) - addr.mScope = kAudioDevicePropertyScopeInput; - else{ - OSSpinLockUnlock(&This->lock); - return E_UNEXPECTED; - } + addr.mScope = This->scope; addr.mElement = 0; addr.mSelector = kAudioDevicePropertyStreamConfiguration;

1 0

Andrew Eikum : winecoreaudio.drv: Implement volume control interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: e8f3d4736aa2ac54739eaf463b81a437900613ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8f3d4736aa2ac54739eaf463… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:34 2011 -0500 winecoreaudio.drv: Implement volume control interfaces. --- dlls/winecoreaudio.drv/mmdevdrv.c | 547 +++++++++++++++++++++++++++++++++++-- 1 files changed, 521 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e8f3d4736aa2ac54739ea…

1 0

Nikolay Sivov : msxml3: Support indent() property.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 630e5f81fe6155c4a0dfb62ff1d1afbb694db685 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630e5f81fe6155c4a0dfb62ff… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 20:53:33 2011 +0400 msxml3: Support indent() property. --- dlls/msxml3/mxwriter.c | 25 ++++++++++++++++++------- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index a791acb..3d04ceb 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,7 +44,8 @@ static const char crlfA[] = "\r\n"; typedef enum { - MXWriter_OmitXmlDecl = 0, + MXWriter_Indent = 0, + MXWriter_OmitXmlDecl, MXWriter_Standalone, MXWriter_LastProp } MXWRITER_PROPS; @@ -308,18 +309,27 @@ static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL return E_NOTIMPL; } -static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL indent) +static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, indent); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->props[MXWriter_Indent] = value; + + return S_OK; } -static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *indent) +static HRESULT WINAPI mxwriter_get_indent(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, indent); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->props[MXWriter_Indent]; + + return S_OK; } static HRESULT WINAPI mxwriter_put_standalone(IMXWriter *iface, VARIANT_BOOL value) @@ -698,6 +708,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->props[MXWriter_Indent] = VARIANT_FALSE; This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE; This->props[MXWriter_Standalone] = VARIANT_FALSE; This->encoding = SysAllocString(utf16W); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index cac238c..fd07629 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -936,6 +936,14 @@ static void test_mxwriter_properties(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_get_indent(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_TRUE; + hr = IMXWriter_get_indent(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + hr = IMXWriter_get_omitXMLDeclaration(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Store raw text data passed through characters().
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 8cefe9b0710d241930fbc3ed6c6d8d9bf40ca5ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cefe9b0710d241930fbc3ed6… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 21:51:33 2011 +0400 msxml3: Store raw text data passed through characters(). --- dlls/msxml3/msxml_private.h | 16 ++++++++++--- dlls/msxml3/mxwriter.c | 15 +++++++++++- dlls/msxml3/tests/saxreader.c | 47 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index d1d4617..dcd305a 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -389,17 +389,25 @@ static inline HRESULT return_null_bstr(BSTR *p) return S_FALSE; } -static inline xmlChar *xmlchar_from_wchar( LPCWSTR str ) +static inline xmlChar *xmlchar_from_wcharn(const WCHAR *str, int nchars) { xmlChar *xmlstr; - DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, -1, NULL, 0, NULL, NULL ); + DWORD len = WideCharToMultiByte( CP_UTF8, 0, str, nchars, NULL, 0, NULL, NULL ); - xmlstr = heap_alloc( len ); + xmlstr = heap_alloc( len+1 ); if ( xmlstr ) - WideCharToMultiByte( CP_UTF8, 0, str, -1, (LPSTR) xmlstr, len, NULL, NULL ); + { + WideCharToMultiByte( CP_UTF8, 0, str, nchars, (LPSTR) xmlstr, len+1, NULL, NULL ); + xmlstr[len] = 0; + } return xmlstr; } +static inline xmlChar *xmlchar_from_wchar( const WCHAR *str ) +{ + return xmlchar_from_wcharn(str, -1); +} + #endif extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, BSTR srcText, diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 3d04ceb..fa0756f 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -636,8 +636,19 @@ static HRESULT WINAPI mxwriter_saxcontent_characters( int nchars) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - FIXME("(%p)->(%s)\n", This, debugstr_wn(chars, nchars)); - return E_NOTIMPL; + + TRACE("(%p)->(%s:%d)\n", This, debugstr_wn(chars, nchars), nchars); + + if (!chars) return E_INVALIDARG; + + if (nchars) + { + xmlChar *s = xmlchar_from_wcharn(chars, nchars); + xmlOutputBufferWriteString(This->buffer, (char*)s); + heap_free(s); + } + + return S_OK; } static HRESULT WINAPI mxwriter_saxcontent_ignorableWhitespace( diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index fd07629..3092039 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -1285,6 +1285,52 @@ static void test_mxwriter_startendelement(void) free_bstrs(); } +static void test_mxwriter_characters(void) +{ + static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + ISAXContentHandler *content; + IMXWriter *writer; + VARIANT dest; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, NULL, 0); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, chardataW, 0); + ok(hr == S_OK, "got %08x\n", hr); + + hr = ISAXContentHandler_characters(content, chardataW, sizeof(chardataW)/sizeof(WCHAR) - 1); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(!lstrcmpW(_bstr_("TESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "got %08x\n", hr); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -1317,6 +1363,7 @@ START_TEST(saxreader) test_mxwriter_contenthandler(); test_mxwriter_startenddocument(); test_mxwriter_startendelement(); + test_mxwriter_characters(); test_mxwriter_properties(); test_mxwriter_flush(); }

1 0

Nikolay Sivov : msxml3: Support byteOrderMark() property.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: d4fd12594410991368addd6433a96b50cd345fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4fd12594410991368addd643… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 21:57:45 2011 +0400 msxml3: Support byteOrderMark() property. --- dlls/msxml3/mxwriter.c | 25 ++++++++++++++++++------- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index fa0756f..0bf1146 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -44,7 +44,8 @@ static const char crlfA[] = "\r\n"; typedef enum { - MXWriter_Indent = 0, + MXWriter_BOM = 0, + MXWriter_Indent, MXWriter_OmitXmlDecl, MXWriter_Standalone, MXWriter_LastProp @@ -295,18 +296,27 @@ static HRESULT WINAPI mxwriter_get_encoding(IMXWriter *iface, BSTR *encoding) return return_bstr(This->encoding, encoding); } -static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL writeBOM) +static HRESULT WINAPI mxwriter_put_byteOrderMark(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, writeBOM); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->props[MXWriter_BOM] = value; + + return S_OK; } -static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *writeBOM) +static HRESULT WINAPI mxwriter_get_byteOrderMark(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, writeBOM); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->props[MXWriter_BOM]; + + return S_OK; } static HRESULT WINAPI mxwriter_put_indent(IMXWriter *iface, VARIANT_BOOL value) @@ -719,6 +729,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ISAXContentHandler_iface.lpVtbl = &mxwriter_saxcontent_vtbl; This->ref = 1; + This->props[MXWriter_BOM] = VARIANT_TRUE; This->props[MXWriter_Indent] = VARIANT_FALSE; This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE; This->props[MXWriter_Standalone] = VARIANT_FALSE; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 3092039..8ad464f 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -936,6 +936,14 @@ static void test_mxwriter_properties(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_get_byteOrderMark(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_FALSE; + hr = IMXWriter_get_byteOrderMark(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_TRUE, "got %d\n", b); + hr = IMXWriter_get_indent(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr);

1 0

Nikolay Sivov : msxml3: Support get/set for disableOutputEscaping() property.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: 53efed9112af40656c0f0fbe820fb460310a81c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53efed9112af40656c0f0fbe8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 7 22:15:33 2011 +0400 msxml3: Support get/set for disableOutputEscaping() property. --- dlls/msxml3/mxwriter.c | 19 +++++++++++++++---- dlls/msxml3/tests/saxreader.c | 8 ++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 0bf1146..2a354ac 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -45,6 +45,7 @@ static const char crlfA[] = "\r\n"; typedef enum { MXWriter_BOM = 0, + MXWriter_DisableEscaping, MXWriter_Indent, MXWriter_OmitXmlDecl, MXWriter_Standalone, @@ -409,15 +410,24 @@ static HRESULT WINAPI mxwriter_get_version(IMXWriter *iface, BSTR *version) static HRESULT WINAPI mxwriter_put_disableOutputEscaping(IMXWriter *iface, VARIANT_BOOL value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%d)\n", This, value); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, value); + This->props[MXWriter_DisableEscaping] = value; + + return S_OK; } static HRESULT WINAPI mxwriter_get_disableOutputEscaping(IMXWriter *iface, VARIANT_BOOL *value) { mxwriter *This = impl_from_IMXWriter( iface ); - FIXME("(%p)->(%p)\n", This, value); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, value); + + if (!value) return E_POINTER; + + *value = This->props[MXWriter_DisableEscaping]; + + return S_OK; } static HRESULT WINAPI mxwriter_flush(IMXWriter *iface) @@ -730,6 +740,7 @@ HRESULT MXWriter_create(IUnknown *pUnkOuter, void **ppObj) This->ref = 1; This->props[MXWriter_BOM] = VARIANT_TRUE; + This->props[MXWriter_DisableEscaping] = VARIANT_FALSE; This->props[MXWriter_Indent] = VARIANT_FALSE; This->props[MXWriter_OmitXmlDecl] = VARIANT_FALSE; This->props[MXWriter_Standalone] = VARIANT_FALSE; diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 8ad464f..ec1c1ec 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -936,6 +936,14 @@ static void test_mxwriter_properties(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_get_disableOutputEscaping(writer, NULL); + ok(hr == E_POINTER, "got %08x\n", hr); + + b = VARIANT_TRUE; + hr = IMXWriter_get_disableOutputEscaping(writer, &b); + ok(hr == S_OK, "got %08x\n", hr); + ok(b == VARIANT_FALSE, "got %d\n", b); + hr = IMXWriter_get_byteOrderMark(writer, NULL); ok(hr == E_POINTER, "got %08x\n", hr);

1 0

Austin English : ntoskrnl.exe: Add a stub for PsLookupProcessByProcessId.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: ebb1fec5cacd6c445b2b6e4208842facc59e9696 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebb1fec5cacd6c445b2b6e420… Author: Austin English <austinenglish(a)gmail.com> Date: Sat May 7 13:22:29 2011 -0500 ntoskrnl.exe: Add a stub for PsLookupProcessByProcessId. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6fc0fb2..2543ca6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1605,6 +1605,15 @@ NTSTATUS WINAPI PsSetLoadImageNotifyRoutine(PLOAD_IMAGE_NOTIFY_ROUTINE routine) } /***************************************************** + * PsLookupProcessByProcessId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) +{ + FIXME("(%p %p) stub\n", processid, process); + return STATUS_NOT_IMPLEMENTED; +} + +/***************************************************** * DllMain */ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7e4918f..64aaf39 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -892,7 +892,7 @@ @ stub PsIsThreadImpersonating @ stub PsIsThreadTerminating @ stub PsJobType -@ stub PsLookupProcessByProcessId +@ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid @ stub PsLookupThreadByThreadId @ stub PsProcessType

1 0

Andrew Eikum : winealsa.drv: Move IAudioClock closer to its related interfaces.
by Alexandre Julliard 09 May '11

09 May '11

Module: wine Branch: master Commit: af92572b3820433da28de0e71de77777fc7da8da URL: http://source.winehq.org/git/wine.git/?a=commit;h=af92572b3820433da28de0e71… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:18 2011 -0500 winealsa.drv: Move IAudioClock closer to its related interfaces. --- dlls/winealsa.drv/mmdevdrv.c | 292 +++++++++++++++++++++--------------------- 1 files changed, 146 insertions(+), 146 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 2b16f86..f876177 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1825,6 +1825,152 @@ static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = AudioCaptureClient_GetNextPacketSize }; +static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); + + if(!ppv) + return E_POINTER; + *ppv = NULL; + + if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) + *ppv = iface; + else if(IsEqualIID(riid, &IID_IAudioClock2)) + *ppv = &This->IAudioClock2_iface; + if(*ppv){ + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; + } + + WARN("Unknown interface %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock_Release(IAudioClock *iface) +{ + ACImpl *This = impl_from_IAudioClock(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, freq); + + *freq = This->fmt->nSamplesPerSec; + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, + UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock(iface); + UINT32 pad; + HRESULT hr; + + TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); + + if(!pos) + return E_POINTER; + + EnterCriticalSection(&This->lock); + + hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); + if(FAILED(hr)){ + LeaveCriticalSection(&This->lock); + return hr; + } + + if(This->dataflow == eRender) + *pos = This->written_frames - pad; + else if(This->dataflow == eCapture) + *pos = This->written_frames + pad; + + LeaveCriticalSection(&This->lock); + + if(qpctime){ + LARGE_INTEGER stamp, freq; + QueryPerformanceCounter(&stamp); + QueryPerformanceFrequency(&freq); + *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; + } + + return S_OK; +} + +static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, + DWORD *chars) +{ + ACImpl *This = impl_from_IAudioClock(iface); + + TRACE("(%p)->(%p)\n", This, chars); + + if(!chars) + return E_POINTER; + + *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; + + return S_OK; +} + +static const IAudioClockVtbl AudioClock_Vtbl = +{ + AudioClock_QueryInterface, + AudioClock_AddRef, + AudioClock_Release, + AudioClock_GetFrequency, + AudioClock_GetPosition, + AudioClock_GetCharacteristics +}; + +static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, + REFIID riid, void **ppv) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); +} + +static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_AddRef(&This->IAudioClient_iface); +} + +static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + return IAudioClient_Release(&This->IAudioClient_iface); +} + +static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, + UINT64 *pos, UINT64 *qpctime) +{ + ACImpl *This = impl_from_IAudioClock2(iface); + + FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); + + return E_NOTIMPL; +} + +static const IAudioClock2Vtbl AudioClock2_Vtbl = +{ + AudioClock2_QueryInterface, + AudioClock2_AddRef, + AudioClock2_Release, + AudioClock2_GetDevicePosition +}; + static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret; @@ -2167,149 +2313,3 @@ static const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl = SimpleAudioVolume_SetMute, SimpleAudioVolume_GetMute }; - -static HRESULT WINAPI AudioClock_QueryInterface(IAudioClock *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IAudioClock)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IAudioClock2)) - *ppv = &This->IAudioClock2_iface; - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioClock_AddRef(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock_Release(IAudioClock *iface) -{ - ACImpl *This = impl_from_IAudioClock(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock_GetFrequency(IAudioClock *iface, UINT64 *freq) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, freq); - - *freq = This->fmt->nSamplesPerSec; - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetPosition(IAudioClock *iface, UINT64 *pos, - UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock(iface); - UINT32 pad; - HRESULT hr; - - TRACE("(%p)->(%p, %p)\n", This, pos, qpctime); - - if(!pos) - return E_POINTER; - - EnterCriticalSection(&This->lock); - - hr = IAudioClient_GetCurrentPadding(&This->IAudioClient_iface, &pad); - if(FAILED(hr)){ - LeaveCriticalSection(&This->lock); - return hr; - } - - if(This->dataflow == eRender) - *pos = This->written_frames - pad; - else if(This->dataflow == eCapture) - *pos = This->written_frames + pad; - - LeaveCriticalSection(&This->lock); - - if(qpctime){ - LARGE_INTEGER stamp, freq; - QueryPerformanceCounter(&stamp); - QueryPerformanceFrequency(&freq); - *qpctime = (stamp.QuadPart * (INT64)10000000) / freq.QuadPart; - } - - return S_OK; -} - -static HRESULT WINAPI AudioClock_GetCharacteristics(IAudioClock *iface, - DWORD *chars) -{ - ACImpl *This = impl_from_IAudioClock(iface); - - TRACE("(%p)->(%p)\n", This, chars); - - if(!chars) - return E_POINTER; - - *chars = AUDIOCLOCK_CHARACTERISTIC_FIXED_FREQ; - - return S_OK; -} - -static const IAudioClockVtbl AudioClock_Vtbl = -{ - AudioClock_QueryInterface, - AudioClock_AddRef, - AudioClock_Release, - AudioClock_GetFrequency, - AudioClock_GetPosition, - AudioClock_GetCharacteristics -}; - -static HRESULT WINAPI AudioClock2_QueryInterface(IAudioClock2 *iface, - REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClock_QueryInterface(&This->IAudioClock_iface, riid, ppv); -} - -static ULONG WINAPI AudioClock2_AddRef(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_AddRef(&This->IAudioClient_iface); -} - -static ULONG WINAPI AudioClock2_Release(IAudioClock2 *iface) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - return IAudioClient_Release(&This->IAudioClient_iface); -} - -static HRESULT WINAPI AudioClock2_GetDevicePosition(IAudioClock2 *iface, - UINT64 *pos, UINT64 *qpctime) -{ - ACImpl *This = impl_from_IAudioClock2(iface); - - FIXME("(%p)->(%p, %p)\n", This, pos, qpctime); - - return E_NOTIMPL; -} - -static const IAudioClock2Vtbl AudioClock2_Vtbl = -{ - AudioClock2_QueryInterface, - AudioClock2_AddRef, - AudioClock2_Release, - AudioClock2_GetDevicePosition -};

1 0