January 2012 - Wine-Commits

Piotr Caban : urlmon/tests: Added Uri IPersistStream_Save tests.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 3f837b0c9a60d8b9b3867492328773034beb3e96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f837b0c9a60d8b9b38674923… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 12 15:35:23 2012 +0100 urlmon/tests: Added Uri IPersistStream_Save tests. --- dlls/urlmon/tests/uri.c | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 199 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f837b0c9a60d8b9b3867…

1 0

Piotr Caban : urlmon: Added Uri IPersistStream stub implementation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: e6d6c6feb9e40e9bc7ff3ac105badc22966ea6fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6d6c6feb9e40e9bc7ff3ac10… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 12 15:34:37 2012 +0100 urlmon: Added Uri IPersistStream stub implementation. --- dlls/urlmon/uri.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 75 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index d334b9e..741732b 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -50,6 +50,7 @@ static const IID IID_IUriObj = {0x4b364760,0x9f51,0x11df,{0x98,0x1c,0x08,0x00,0x typedef struct { IUri IUri_iface; IUriBuilderFactory IUriBuilderFactory_iface; + IPersistStream IPersistStream_iface; LONG ref; @@ -4213,8 +4214,11 @@ static HRESULT WINAPI Uri_QueryInterface(IUri *iface, REFIID riid, void **ppv) TRACE("(%p)->(IID_IUri %p)\n", This, ppv); *ppv = &This->IUri_iface; }else if(IsEqualGUID(&IID_IUriBuilderFactory, riid)) { - TRACE("(%p)->(IID_IUriBuilderFactory %p)\n", This, riid); + TRACE("(%p)->(IID_IUriBuilderFactory %p)\n", This, ppv); *ppv = &This->IUriBuilderFactory_iface; + }else if(IsEqualGUID(&IID_IPersistStream, riid)) { + TRACE("(%p)->(IID_IPersistStream %p)\n", This, ppv); + *ppv = &This->IPersistStream_iface; }else if(IsEqualGUID(&IID_IUriObj, riid)) { TRACE("(%p)->(IID_IUriObj %p)\n", This, ppv); *ppv = This; @@ -5095,11 +5099,81 @@ static const IUriBuilderFactoryVtbl UriBuilderFactoryVtbl = { UriBuilderFactory_CreateInitializedIUriBuilder }; +static inline Uri* impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, Uri, IPersistStream_iface); +} + +static HRESULT WINAPI PersistStream_QueryInterface(IPersistStream *iface, REFIID riid, void **ppvObject) +{ + Uri *This = impl_from_IPersistStream(iface); + return IUri_QueryInterface(&This->IUri_iface, riid, ppvObject); +} + +static ULONG WINAPI PersistStream_AddRef(IPersistStream *iface) +{ + Uri *This = impl_from_IPersistStream(iface); + return IUri_AddRef(&This->IUri_iface); +} + +static ULONG WINAPI PersistStream_Release(IPersistStream *iface) +{ + Uri *This = impl_from_IPersistStream(iface); + return IUri_Release(&This->IUri_iface); +} + +static HRESULT WINAPI PersistStream_GetClassID(IPersistStream *iface, CLSID *pClassID) +{ + Uri *This = impl_from_IPersistStream(iface); + FIXME("(%p)->(%p)\n", This, pClassID); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStream_IsDirty(IPersistStream *iface) +{ + Uri *This = impl_from_IPersistStream(iface); + FIXME("(%p)\n", This); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStream_Load(IPersistStream *iface, IStream *pStm) +{ + Uri *This = impl_from_IPersistStream(iface); + FIXME("(%p)->(%p)\n", This, pStm); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStream_Save(IPersistStream *iface, IStream *pStm, BOOL fClearDirty) +{ + Uri *This = impl_from_IPersistStream(iface); + FIXME("(%p)->(%p %x)\n", This, pStm, fClearDirty); + return E_NOTIMPL; +} + +static HRESULT WINAPI PersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *pcbSize) +{ + Uri *This = impl_from_IPersistStream(iface); + FIXME("(%p)->(%p)\n", This, pcbSize); + return E_NOTIMPL; +} + +static const IPersistStreamVtbl PersistStreamVtbl = { + PersistStream_QueryInterface, + PersistStream_AddRef, + PersistStream_Release, + PersistStream_GetClassID, + PersistStream_IsDirty, + PersistStream_Load, + PersistStream_Save, + PersistStream_GetSizeMax +}; + static Uri* create_uri_obj(void) { Uri *ret = heap_alloc_zero(sizeof(Uri)); if(ret) { ret->IUri_iface.lpVtbl = &UriVtbl; ret->IUriBuilderFactory_iface.lpVtbl = &UriBuilderFactoryVtbl; + ret->IPersistStream_iface.lpVtbl = &PersistStreamVtbl; ret->ref = 1; }

1 0

Jörg Höhle : winealsa: Reset accounts for dropped frames in capture mode.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: be90732e5e9658882a4b0d19d5eaac7f473dd03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=be90732e5e9658882a4b0d19d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Jan 11 23:13:23 2012 +0100 winealsa: Reset accounts for dropped frames in capture mode. --- dlls/winealsa.drv/mmdevdrv.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 55035bd..e791feb 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1776,9 +1776,13 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) if(snd_pcm_prepare(This->pcm_handle) < 0) WARN("snd_pcm_prepare failed\n"); - This->last_pos_frames = 0; + if(This->dataflow == eRender){ + This->written_frames = 0; + This->last_pos_frames = 0; + }else{ + This->written_frames += This->held_frames; + } This->held_frames = 0; - This->written_frames = 0; This->lcl_offs_frames = 0; LeaveCriticalSection(&This->lock);

1 0

Alexandre Julliard : gdi32: Store foreground/ background color even when passed CLR_INVALID.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: f8fa169da0c8fd7aa75c3d87a6d7c5ba1625bf20 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8fa169da0c8fd7aa75c3d87a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jan 12 15:51:54 2012 +0100 gdi32: Store foreground/background color even when passed CLR_INVALID. --- dlls/gdi32/dc.c | 16 ++++------------ dlls/gdi32/tests/dc.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 12 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index b1065de..e4f31814 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -853,12 +853,8 @@ COLORREF WINAPI SetBkColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetBkColor ); - color = physdev->funcs->pSetBkColor( physdev, color ); - if (color != CLR_INVALID) - { - ret = dc->backgroundColor; - dc->backgroundColor = color; - } + ret = dc->backgroundColor; + dc->backgroundColor = physdev->funcs->pSetBkColor( physdev, color ); release_dc_ptr( dc ); } return ret; @@ -894,12 +890,8 @@ COLORREF WINAPI SetTextColor( HDC hdc, COLORREF color ) if (dc) { PHYSDEV physdev = GET_DC_PHYSDEV( dc, pSetTextColor ); - color = physdev->funcs->pSetTextColor( physdev, color ); - if (color != CLR_INVALID) - { - ret = dc->textColor; - dc->textColor = color; - } + ret = dc->textColor; + dc->textColor = physdev->funcs->pSetTextColor( physdev, color ); release_dc_ptr( dc ); } return ret; diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 25d6982..d8276f4 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -54,6 +54,41 @@ static void dump_region(HRGN hrgn) HeapFree( GetProcessHeap(), 0, data ); } +static void test_dc_values(void) +{ + HDC hdc = CreateDCA("DISPLAY", NULL, NULL, NULL); + COLORREF color; + + ok( hdc != NULL, "CreateDC failed\n" ); + color = SetBkColor( hdc, 0x12345678 ); + ok( color == 0xffffff, "initial color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0x12345678, "wrong color %08x\n", color ); + color = SetBkColor( hdc, 0xffffffff ); + ok( color == 0x12345678, "wrong color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = SetBkColor( hdc, 0 ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = GetBkColor( hdc ); + ok( color == 0, "wrong color %08x\n", color ); + + color = SetTextColor( hdc, 0xffeeddcc ); + ok( color == 0, "initial color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0xffeeddcc, "wrong color %08x\n", color ); + color = SetTextColor( hdc, 0xffffffff ); + ok( color == 0xffeeddcc, "wrong color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = SetTextColor( hdc, 0 ); + ok( color == 0xffffffff, "wrong color %08x\n", color ); + color = GetTextColor( hdc ); + ok( color == 0, "wrong color %08x\n", color ); + + DeleteDC( hdc ); +} + static void test_savedc_2(void) { HWND hwnd; @@ -999,6 +1034,7 @@ static void test_printer_dc(void) START_TEST(dc) { pSetLayout = (void *)GetProcAddress( GetModuleHandle("gdi32.dll"), "SetLayout"); + test_dc_values(); test_savedc(); test_savedc_2(); test_GdiConvertToDevmodeW();

1 0

Francois Gouget : comdlg32: Specify a context for the luminance and saturation abbreviations.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

1 0

Andrew Eikum : winealsa.drv: Remove "strange number of channels" FIXME.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: d82cca65edbe76a8d720f6e4d1de047139118140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82cca65edbe76a8d720f6e4d… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Jan 12 08:06:38 2012 -0600 winealsa.drv: Remove "strange number of channels" FIXME. --- dlls/winealsa.drv/mmdevdrv.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 29933e8..55035bd 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1407,11 +1407,9 @@ static HRESULT WINAPI AudioClient_GetMixFormat(IAudioClient *iface, goto exit; } - if(max_channels > 2){ - FIXME("Don't know what to do with %u channels, pretending there's " - "only 2 channels\n", max_channels); + if(max_channels > 2) fmt->Format.nChannels = 2; - }else + else fmt->Format.nChannels = max_channels; fmt->dwChannelMask = get_channel_mask(fmt->Format.nChannels);

1 0

Jörg Höhle : winealsa: Stop may not use snd_pcm_drop or lose written frames.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 77e01019c5ceb7fd2389764328a10903a99fb1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77e01019c5ceb7fd238976432… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Nov 15 10:18:39 2011 +0100 winealsa: Stop may not use snd_pcm_drop or lose written frames. --- dlls/winealsa.drv/mmdevdrv.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index e791feb..8e79c6e 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -1718,14 +1718,9 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient *iface) return S_FALSE; } - if(snd_pcm_drop(This->pcm_handle) < 0) - WARN("snd_pcm_drop failed\n"); - - if(snd_pcm_reset(This->pcm_handle) < 0) - WARN("snd_pcm_reset failed\n"); - - if(snd_pcm_prepare(This->pcm_handle) < 0) - WARN("snd_pcm_prepare failed\n"); + /* Stop without losing written frames or position. + * snd_pcm_pause would be appropriate but is unsupported by dmix. + * snd_pcm_drain yields EAGAIN in NONBLOCK mode, except with Pulse. */ event = CreateEventW(NULL, TRUE, FALSE, NULL); wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event);

1 0

Alexandre Julliard : gdi32: Simplify the CreateCompatibleBitmap implementation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 9ecc1e070212f5218bfe743c665010f35c31c217 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ecc1e070212f5218bfe743c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 10 21:28:19 2012 +0100 gdi32: Simplify the CreateCompatibleBitmap implementation. --- dlls/gdi32/bitmap.c | 90 +++++++++++++-------------------------------------- 1 files changed, 23 insertions(+), 67 deletions(-) diff --git a/dlls/gdi32/bitmap.c b/dlls/gdi32/bitmap.c index a539b9d..cee9204 100644 --- a/dlls/gdi32/bitmap.c +++ b/dlls/gdi32/bitmap.c @@ -135,78 +135,34 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes, */ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) { - HBITMAP hbmpRet = 0; + char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + BITMAPINFO *bi = (BITMAPINFO *)buffer; + DIBSECTION dib; - TRACE("(%p,%d,%d) =\n", hdc, width, height); + TRACE("(%p,%d,%d)\n", hdc, width, height); if (GetObjectType( hdc ) != OBJ_MEMDC) - { - hbmpRet = CreateBitmap(width, height, - GetDeviceCaps(hdc, PLANES), - GetDeviceCaps(hdc, BITSPIXEL), - NULL); - } - else /* Memory DC */ - { - DIBSECTION dib; - HBITMAP bitmap = GetCurrentObject( hdc, OBJ_BITMAP ); - INT size = GetObjectW( bitmap, sizeof(dib), &dib ); - - if (!size) return 0; - - if (size == sizeof(BITMAP)) - { - /* A device-dependent bitmap is selected in the DC */ - hbmpRet = CreateBitmap(width, height, - dib.dsBm.bmPlanes, - dib.dsBm.bmBitsPixel, - NULL); - } - else - { - /* A DIB section is selected in the DC */ - BITMAPINFO *bi; - void *bits; - - /* Allocate memory for a BITMAPINFOHEADER structure and a - color table. The maximum number of colors in a color table - is 256 which corresponds to a bitmap with depth 8. - Bitmaps with higher depths don't have color tables. */ - bi = HeapAlloc(GetProcessHeap(), 0, sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + return CreateBitmap( width, height, + GetDeviceCaps(hdc, PLANES), GetDeviceCaps(hdc, BITSPIXEL), NULL ); - if (bi) - { - bi->bmiHeader.biSize = sizeof(bi->bmiHeader); - bi->bmiHeader.biWidth = width; - bi->bmiHeader.biHeight = height; - bi->bmiHeader.biPlanes = dib.dsBmih.biPlanes; - bi->bmiHeader.biBitCount = dib.dsBmih.biBitCount; - bi->bmiHeader.biCompression = dib.dsBmih.biCompression; - bi->bmiHeader.biSizeImage = 0; - bi->bmiHeader.biXPelsPerMeter = dib.dsBmih.biXPelsPerMeter; - bi->bmiHeader.biYPelsPerMeter = dib.dsBmih.biYPelsPerMeter; - bi->bmiHeader.biClrUsed = dib.dsBmih.biClrUsed; - bi->bmiHeader.biClrImportant = dib.dsBmih.biClrImportant; - - if (bi->bmiHeader.biCompression == BI_BITFIELDS) - { - /* Copy the color masks */ - CopyMemory(bi->bmiColors, dib.dsBitfields, 3 * sizeof(DWORD)); - } - else if (bi->bmiHeader.biBitCount <= 8) - { - /* Copy the color table */ - GetDIBColorTable(hdc, 0, 256, bi->bmiColors); - } - - hbmpRet = CreateDIBSection(hdc, bi, DIB_RGB_COLORS, &bits, NULL, 0); - HeapFree(GetProcessHeap(), 0, bi); - } - } + switch (GetObjectW( GetCurrentObject( hdc, OBJ_BITMAP ), sizeof(dib), &dib )) + { + case sizeof(BITMAP): /* A device-dependent bitmap is selected in the DC */ + return CreateBitmap( width, height, dib.dsBm.bmPlanes, dib.dsBm.bmBitsPixel, NULL ); + + case sizeof(DIBSECTION): /* A DIB section is selected in the DC */ + bi->bmiHeader = dib.dsBmih; + bi->bmiHeader.biWidth = width; + bi->bmiHeader.biHeight = height; + if (dib.dsBmih.biCompression == BI_BITFIELDS) /* copy the color masks */ + memcpy(bi->bmiColors, dib.dsBitfields, sizeof(dib.dsBitfields)); + else if (dib.dsBmih.biBitCount <= 8) /* copy the color table */ + GetDIBColorTable(hdc, 0, 256, bi->bmiColors); + return CreateDIBSection( hdc, bi, DIB_RGB_COLORS, NULL, NULL, 0 ); + + default: + return 0; } - - TRACE("\t\t%p\n", hbmpRet); - return hbmpRet; }

1 0

Michael Stefaniuc : dsound/tests: Sanitize START_TEST() in capture.c.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: 93bfa2b5be8aea6da5ba82526c7e6f2762250001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93bfa2b5be8aea6da5ba82526… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 12 00:36:08 2012 +0100 dsound/tests: Sanitize START_TEST() in capture.c. --- dlls/dsound/tests/capture.c | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 760f0cc..02ef46a 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -177,7 +177,7 @@ EXIT: "should have 0\n", ref); } -static void IDirectSoundCapture_tests(void) +static void test_capture(void) { HRESULT rc; LPDIRECTSOUNDCAPTURE dsco=NULL; @@ -659,7 +659,7 @@ EXIT: return TRUE; } -static void capture_tests(void) +static void test_enumerate(void) { HRESULT rc; rc=pDirectSoundCaptureEnumerateA(&dscenum_callback,NULL); @@ -673,25 +673,21 @@ START_TEST(capture) CoInitialize(NULL); hDsound = LoadLibrary("dsound.dll"); - if (hDsound) - { - - pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, - "DirectSoundCaptureCreate"); - pDirectSoundCaptureEnumerateA=(void*)GetProcAddress(hDsound, - "DirectSoundCaptureEnumerateA"); - if (pDirectSoundCaptureCreate && pDirectSoundCaptureEnumerateA) - { - IDirectSoundCapture_tests(); - capture_tests(); - } - else - skip("capture test skipped\n"); + if (!hDsound) { + skip("dsound.dll not found!\n"); + return; + } - FreeLibrary(hDsound); + pDirectSoundCaptureCreate = (void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); + pDirectSoundCaptureEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundCaptureEnumerateA"); + if (!pDirectSoundCaptureCreate || !pDirectSoundCaptureEnumerateA) { + skip("capture test skipped\n"); + return; } - else - skip("dsound.dll not found!\n"); + test_capture(); + test_enumerate(); + + FreeLibrary(hDsound); CoUninitialize(); }

1 0

Michael Stefaniuc : dsound: Make capture behave like native in regards to COM aggregation.
by Alexandre Julliard Jan. 12, 2012

Jan. 12, 2012

Module: wine Branch: master Commit: a3120ce80ecca76c2138bb86a5ed9238659917af URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3120ce80ecca76c2138bb86a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 12 00:28:21 2012 +0100 dsound: Make capture behave like native in regards to COM aggregation. --- dlls/dsound/capture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 29d34dc..90cddb7 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -1065,6 +1065,11 @@ static HRESULT WINAPI IDirectSoundCaptureImpl_CreateCaptureBuffer(IDirectSoundCa TRACE( "(%p,%p,%p,%p)\n",iface,lpcDSCBufferDesc,lplpDSCaptureBuffer,pUnk); + if (pUnk) { + WARN("invalid parameter: pUnk != NULL\n"); + return DSERR_NOAGGREGATION; + } + if (lpcDSCBufferDesc == NULL) { WARN("invalid parameter: lpcDSCBufferDesc == NULL)\n"); return DSERR_INVALIDPARAM; @@ -1270,7 +1275,6 @@ HRESULT WINAPI DirectSoundCaptureCreate(LPCGUID lpcGUID, IDirectSoundCapture **p if (pUnkOuter) { WARN("invalid parameter: pUnkOuter != NULL\n"); - *ppDSC = NULL; return DSERR_NOAGGREGATION; }

1 0