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

Francois Gouget : Assorted spelling and case fixes.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 5920de5ffb5ea42a0cddb1d52873bedb30fadd81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5920de5ffb5ea42a0cddb1d52… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:40 2011 +0200 Assorted spelling and case fixes. --- dlls/comctl32/monthcal.c | 4 ++-- dlls/cryptnet/tests/cryptnet.c | 2 +- dlls/d3d9/tests/visual.c | 4 ++-- dlls/d3dx9_36/mesh.c | 2 +- dlls/d3dx9_36/tests/mesh.c | 2 +- dlls/gdiplus/gdiplus.c | 2 +- dlls/iphlpapi/tests/iphlpapi.c | 18 +++++++++--------- dlls/mshtml/navigate.c | 2 +- dlls/mshtml/tests/exectest.html | 2 +- dlls/msxml3/tests/domdoc.c | 4 ++-- dlls/user.exe16/message.c | 2 +- dlls/usp10/tests/usp10.c | 4 ++-- dlls/wined3d/context.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/state.c | 2 +- dlls/wined3d/swapchain.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 2 +- programs/regedit/regproc.c | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5920de5ffb5ea42a0cddb…

1 0

David Hedberg : winspool.drv: Add stubs for IsValidDevmodeW and IsValidDevmodeA.
by Alexandre Julliard May 9, 2011

May 9, 2011

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

Francois Gouget : ddraw/tests: Add a '\n' to an ok() call.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: d719e831ab6b1e32e7cae683aa73a513871528f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d719e831ab6b1e32e7cae683a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon May 9 09:03:27 2011 +0200 ddraw/tests: Add a '\n' to an ok() call. --- dlls/ddraw/tests/d3d.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 9c01ef0..7ad7492 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -3260,7 +3260,7 @@ static void fix_wndproc(HWND window, LONG_PTR proc) HRESULT hr; hr = pDirectDrawCreateEx(NULL, (void **)&ddraw7, &IID_IDirectDraw7, NULL); - ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.", hr); + ok(SUCCEEDED(hr), "Failed to create IDirectDraw7 object, hr %#x.\n", hr); if (FAILED(hr)) return; SetWindowLongPtrA(window, GWLP_WNDPROC, proc);

1 0

Andrew Eikum : mmdevapi/tests: Make capture.c more easily extendible.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 631d834022833dfde3bf904f65ea92b096a6c59a URL: http://source.winehq.org/git/wine.git/?a=commit;h=631d834022833dfde3bf904f6… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:37 2011 -0500 mmdevapi/tests: Make capture.c more easily extendible. --- dlls/mmdevapi/tests/capture.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index ed497df..4ee7412 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -34,6 +34,8 @@ #include "mmdeviceapi.h" #include "audioclient.h" +static IMMDevice *dev = NULL; + static void test_uninitialized(IAudioClient *ac) { HRESULT hr; @@ -137,15 +139,23 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) IUnknown_Release(acc); } -static void test_audioclient(IAudioClient *ac) +static void test_audioclient(void) { + IAudioClient *ac; IUnknown *unk; HRESULT hr; ULONG ref; WAVEFORMATEX *pwfx, *pwfx2; REFERENCE_TIME t1, t2; + HANDLE handle; - HANDLE handle = CreateEventW(NULL, FALSE, FALSE, NULL); + hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, + NULL, (void**)&ac); + ok(hr == S_OK, "Activation failed with %08x\n", hr); + if(hr != S_OK) + return; + + handle = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IAudioClient_QueryInterface(ac, &IID_IUnknown, NULL); ok(hr == E_POINTER, "QueryInterface(NULL) returned %08x\n", hr); @@ -290,6 +300,7 @@ static void test_audioclient(IAudioClient *ac) test_capture(ac, handle, pwfx); + IAudioClient_Release(ac); CloseHandle(handle); CoTaskMemFree(pwfx); } @@ -298,8 +309,6 @@ START_TEST(capture) { HRESULT hr; IMMDeviceEnumerator *mme = NULL; - IMMDevice *dev = NULL; - IAudioClient *ac = NULL; CoInitializeEx(NULL, COINIT_MULTITHREADED); hr = CoCreateInstance(&CLSID_MMDeviceEnumerator, NULL, CLSCTX_INPROC_SERVER, &IID_IMMDeviceEnumerator, (void**)&mme); @@ -320,13 +329,8 @@ START_TEST(capture) goto cleanup; } - hr = IMMDevice_Activate(dev, &IID_IAudioClient, CLSCTX_INPROC_SERVER, NULL, (void**)&ac); - ok(hr == S_OK, "Activation failed with %08x\n", hr); - if (ac) - { - test_audioclient(ac); - IAudioClient_Release(ac); - } + test_audioclient(); + IMMDevice_Release(dev); cleanup:

1 0

Andrew Eikum : wineoss.drv: Implement volume control interfaces.
by Alexandre Julliard May 9, 2011

May 9, 2011

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

1 0

Nikolay Sivov : msxml3: Support byteOrderMark() property.
by Alexandre Julliard May 9, 2011

May 9, 2011

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

Austin English : ntoskrnl.exe: Add a stub for PsLookupProcessByProcessId.
by Alexandre Julliard May 9, 2011

May 9, 2011

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

Nikolay Sivov : msxml3: Support get/set for disableOutputEscaping() property.
by Alexandre Julliard May 9, 2011

May 9, 2011

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

Andrew Eikum : winealsa.drv: Implement volume control interfaces.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: ae9338c136f1df582912e107716511c4bf93a7eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae9338c136f1df582912e1077… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:22 2011 -0500 winealsa.drv: Implement volume control interfaces. --- dlls/winealsa.drv/mmdevdrv.c | 483 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 456 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae9338c136f1df582912e…

1 0

Andrew Eikum : wineoss.drv: Move IAudioClock closer to its related interfaces.
by Alexandre Julliard May 9, 2011

May 9, 2011

Module: wine Branch: master Commit: 836c5fa5bced39376f44feab74ddeaf03924ec1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=836c5fa5bced39376f44feab7… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Fri May 6 10:34:25 2011 -0500 wineoss.drv: Move IAudioClock closer to its related interfaces. --- dlls/wineoss.drv/mmdevdrv.c | 292 +++++++++++++++++++++--------------------- 1 files changed, 146 insertions(+), 146 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index ff21cd6..8b2c005 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1667,6 +1667,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; @@ -2009,149 +2155,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