wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Jacek Caban : jscript: Run sanity check with invoke_version 0.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: afcb9a013067d5bcaf04bdba6e186e0f5977b156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcb9a013067d5bcaf04bdba6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:43:38 2012 +0100 jscript: Run sanity check with invoke_version 0. --- dlls/jscript/tests/run.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 66f70b9..e5bd072 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -108,7 +108,7 @@ static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; static IDispatch *script_disp; -static int invoke_version = 2; +static int invoke_version; static IActiveScriptError *script_error; /* Returns true if the user interface is in English. Note that this does not @@ -1680,6 +1680,7 @@ START_TEST(run) if(!check_jscript()) { win_skip("Broken engine, probably too old\n"); }else if(argc > 2) { + invoke_version = 2; run_from_file(argv[2]); }else { trace("invoke version 0\n");

1 0

Jacek Caban : jscript: Don't use break in finally block on pre-IE8 jscript.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: e7bb8813a9ed674e2b40163966abd96f9c525c69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7bb8813a9ed674e2b4016396… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 12 13:43:25 2012 +0100 jscript: Don't use break in finally block on pre-IE8 jscript. --- dlls/jscript/tests/lang.js | 51 +++++++++++++++++++++++-------------------- 1 files changed, 27 insertions(+), 24 deletions(-) diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 58d4599..a035ebe 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -842,34 +842,37 @@ ok(!("nonexistent" in obj1), "nonexistent added to obj1 by for..in loop"); var i, j; -tmp = ""; -i = 0; -while(true) { - tmp += "1"; - for(i = 1; i < 3; i++) { - switch(i) { - case 1: - tmp += "2"; - continue; - case 2: - tmp += "3"; - try { - throw null; - }finally { - tmp += "4"; - break; +/* Previous versions have broken finally block implementation */ +if(ScriptEngineMinorVersion() >= 8) { + tmp = ""; + i = 0; + while(true) { + tmp += "1"; + for(i = 1; i < 3; i++) { + switch(i) { + case 1: + tmp += "2"; + continue; + case 2: + tmp += "3"; + try { + throw null; + }finally { + tmp += "4"; + break; + } + default: + ok(false, "unexpected state"); } - default: - ok(false, "unexpected state"); + tmp += "5"; + } + with({prop: "6"}) { + tmp += prop; + break; } - tmp += "5"; - } - with({prop: "6"}) { - tmp += prop; - break; } + ok(tmp === "123456", "tmp = " + tmp); } -ok(tmp === "123456", "tmp = " + tmp); tmp = ""; i = 0;

1 0

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

12 Jan '12

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

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

12 Jan '12

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

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

12 Jan '12

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

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

12 Jan '12

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

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

12 Jan '12

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

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

12 Jan '12

1 0

Michael Stefaniuc : dsound/tests: Add some COM tests for capture.
by Alexandre Julliard 12 Jan '12

12 Jan '12

Module: wine Branch: master Commit: 66361f1bd532b685cad5ddd82ddea469f0633eac URL: http://source.winehq.org/git/wine.git/?a=commit;h=66361f1bd532b685cad5ddd82… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jan 12 00:40:31 2012 +0100 dsound/tests: Add some COM tests for capture. --- dlls/dsound/tests/capture.c | 63 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 63 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index 02ef46a..cb53a02 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -666,6 +666,68 @@ static void test_enumerate(void) ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08x\n", rc); } +static void test_COM(void) +{ + IDirectSoundCapture *dsc = (IDirectSoundCapture*)0xdeadbeef; + IDirectSoundCaptureBuffer *buffer = (IDirectSoundCaptureBuffer*)0xdeadbeef; + IDirectSoundNotify *notify; + DSCBUFFERDESC bufdesc; + WAVEFORMATEX wfx; + HRESULT hr; + ULONG refcount; + + hr = pDirectSoundCaptureCreate(NULL, &dsc, (IUnknown*)0xdeadbeef); + ok(hr == DSERR_NOAGGREGATION, + "DirectSoundCaptureCreate failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + ok(dsc == (IDirectSoundCapture*)0xdeadbeef, "dsc = %p\n", dsc); + + hr = pDirectSoundCaptureCreate(NULL, &dsc, NULL); + if (hr == DSERR_NODRIVER) { + skip("No driver\n"); + return; + } + ok(hr == DS_OK, "DirectSoundCaptureCreate failed: %08x, expected DS_OK\n", hr); + + init_format(&wfx, WAVE_FORMAT_PCM, 44100, 16, 1); + ZeroMemory(&bufdesc, sizeof(bufdesc)); + bufdesc.dwSize = sizeof(bufdesc); + bufdesc.dwBufferBytes = wfx.nAvgBytesPerSec; + bufdesc.lpwfxFormat = &wfx; + + hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, (IUnknown*)0xdeadbeef); + ok(hr == DSERR_NOAGGREGATION, + "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DSERR_NOAGGREGATION\n", hr); + ok(buffer == (IDirectSoundCaptureBuffer*)0xdeadbeef, "buffer = %p\n", buffer); + + hr = IDirectSoundCapture_CreateCaptureBuffer(dsc, &bufdesc, &buffer, NULL); + ok(hr == DS_OK, "IDirectSoundCapture_CreateCaptureBuffer failed: %08x, expected DS_OK\n", hr); + + /* IDirectSoundCaptureBuffer and IDirectSoundNotify have separate refcounts */ + IDirectSoundCaptureBuffer_AddRef(buffer); + refcount = IDirectSoundCaptureBuffer_AddRef(buffer); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + hr = IDirectSoundCaptureBuffer_QueryInterface(buffer, &IID_IDirectSoundNotify, (void**)&notify); + ok(hr == DS_OK, "IDirectSoundCapture_QueryInterface failed: %08x, expected DS_OK\n", hr); + refcount = IDirectSoundNotify_AddRef(notify); + ok(refcount == 2, "IDirectSoundNotify refcount is %u, expected 2\n", refcount); + IDirectSoundCaptureBuffer_AddRef(buffer); + refcount = IDirectSoundCaptureBuffer_Release(buffer); + ok(refcount == 3, "IDirectSoundCaptureBuffer refcount is %u, expected 3\n", refcount); + + /* Release IDirectSoundCaptureBuffer while keeping IDirectSoundNotify alive */ + while (IDirectSoundCaptureBuffer_Release(buffer) > 0); + refcount = IDirectSoundNotify_AddRef(notify); + ok(refcount == 3, "IDirectSoundNotify refcount is %u, expected 3\n", refcount); + refcount = IDirectSoundCaptureBuffer_AddRef(buffer); + ok(refcount == 1, "IDirectSoundCaptureBuffer refcount is %u, expected 1\n", refcount); + + while (IDirectSoundNotify_Release(notify) > 0); + refcount = IDirectSoundCaptureBuffer_Release(buffer); + ok(refcount == 0, "IDirectSoundCaptureBuffer refcount is %u, expected 0\n", refcount); + refcount = IDirectSoundCapture_Release(dsc); + ok(refcount == 0, "IDirectSoundCapture refcount is %u, expected 0\n", refcount); +} + START_TEST(capture) { HMODULE hDsound; @@ -685,6 +747,7 @@ START_TEST(capture) return; } + test_COM(); test_capture(); test_enumerate();

1 0

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

12 Jan '12

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

← Newer
1
...
60
61
62
63
64
65
66
...
98
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012