July 2020 - Wine-Devel - list.winehq.org

[PATCH] amstream: Accept more media subtypes in AMVideoStream::ReceiveConnection().
by Gijs Vermeulen July 24, 2020

July 24, 2020

Fixes: a7c515fe01c4902a3e7c6b60608a54b77e252b47 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/amstream/ddrawstream.c | 26 +++++----- dlls/amstream/tests/amstream.c | 93 ++++++++++++++++++++++++++++++++++ 2 files changed, 107 insertions(+), 12 deletions(-) diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 9f74eaf91a..4c94bacf52 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -632,16 +632,6 @@ static HRESULT WINAPI ddraw_sink_Connect(IPin *iface, IPin *peer, const AM_MEDIA return E_UNEXPECTED; } -static BOOL check_media_type(const AM_MEDIA_TYPE *mt) -{ - if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) - && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) - && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) - return TRUE; - - return FALSE; -} - static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, const AM_MEDIA_TYPE *mt) { struct ddraw_stream *stream = impl_from_IPin(iface); @@ -657,7 +647,13 @@ static HRESULT WINAPI ddraw_sink_ReceiveConnection(IPin *iface, IPin *peer, cons return VFW_E_ALREADY_CONNECTED; } - if (!check_media_type(mt)) + if (!IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + || (!IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB24) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB32) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB555) + && !IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB565)) + || !IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) { LeaveCriticalSection(&stream->cs); return VFW_E_TYPE_NOT_ACCEPTED; @@ -788,7 +784,13 @@ static HRESULT WINAPI ddraw_sink_QueryId(IPin *iface, WCHAR **id) static HRESULT WINAPI ddraw_sink_QueryAccept(IPin *iface, const AM_MEDIA_TYPE *mt) { TRACE("iface %p, mt %p.\n", iface, mt); - return check_media_type(mt) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED; + + if (IsEqualGUID(&mt->majortype, &MEDIATYPE_Video) + && IsEqualGUID(&mt->subtype, &MEDIASUBTYPE_RGB8) + && IsEqualGUID(&mt->formattype, &FORMAT_VideoInfo)) + return S_OK; + + return VFW_E_TYPE_NOT_ACCEPTED; } static HRESULT WINAPI ddraw_sink_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..8a6dc26f96 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -28,6 +28,7 @@ #include "initguid.h" #include "ksmedia.h" #include "dvdmedia.h" +#include "wmcodecdsp.h" #include "wine/strmbase.h" static const WAVEFORMATEX audio_format = @@ -2330,6 +2331,14 @@ static void test_media_types(void) &MEDIASUBTYPE_ARGB32, &MEDIASUBTYPE_ARGB1555, &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, &GUID_NULL, }; @@ -3243,6 +3252,89 @@ static void test_audiostream_receive_connection(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static void test_ddrawstream_receive_connection(void) +{ + static const VIDEOINFOHEADER req_vih; + IDirectDrawMediaStream *ddraw_stream; + IAMMultiMediaStream *mmstream; + struct testfilter source; + IMediaStream *stream; + AM_MEDIA_TYPE mt; + HRESULT hr; + ULONG ref; + IPin *pin; + int i; + + const AM_MEDIA_TYPE video_mt = + { + .majortype = MEDIATYPE_Video, + .subtype = MEDIASUBTYPE_RGB8, + .formattype = FORMAT_VideoInfo, + .cbFormat = sizeof(VIDEOINFOHEADER), + .pbFormat = (BYTE *)&req_vih, + }; + + static const GUID *subtypes[] = + { + &MEDIASUBTYPE_RGB24, + &MEDIASUBTYPE_RGB32, + &MEDIASUBTYPE_RGB555, + &MEDIASUBTYPE_RGB565, + &MEDIASUBTYPE_RGB1, + &MEDIASUBTYPE_RGB4, + &MEDIASUBTYPE_ARGB32, + &MEDIASUBTYPE_ARGB1555, + &MEDIASUBTYPE_ARGB4444, + &MEDIASUBTYPE_Avi, + &MEDIASUBTYPE_I420, + &MEDIASUBTYPE_AYUV, + &MEDIASUBTYPE_YV12, + &MEDIASUBTYPE_YUY2, + &MEDIASUBTYPE_UYVY, + &MEDIASUBTYPE_YVYU, + &MEDIASUBTYPE_NV12, + &GUID_NULL, + }; + + mmstream = create_ammultimediastream(); + hr = IAMMultiMediaStream_AddMediaStream(mmstream, NULL, &MSPID_PrimaryVideo, 0, &stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IDirectDrawMediaStream, (void **)&ddraw_stream); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaStream_QueryInterface(stream, &IID_IPin, (void **)&pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&source); + + mt = video_mt; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + for (i = 0; i < ARRAY_SIZE(subtypes); ++i) + { + mt = video_mt; + mt.subtype = *subtypes[i]; + hr = IPin_ReceiveConnection(pin, &source.source.pin.IPin_iface, &mt); + ok(hr == (i < 4) ? S_OK : VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + hr = IPin_Disconnect(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + } + } + + ref = IAMMultiMediaStream_Release(mmstream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + IPin_Release(pin); + IDirectDrawMediaStream_Release(ddraw_stream); + ref = IMediaStream_Release(stream); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&source.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + static void test_audiostream_set_state(void) { IAMMultiMediaStream *mmstream = create_ammultimediastream(); @@ -5238,6 +5330,7 @@ START_TEST(amstream) test_ddrawstream_initialize(); test_ddrawstream_getsetdirectdraw(); + test_ddrawstream_receive_connection(); test_ammediastream_join_am_multi_media_stream(); test_ammediastream_join_filter(); -- 2.27.0

2 1

[PATCH 2/2] wineconsole: Use ReadConsoleOutputW in WINECON_FetchCells.
by Jacek Caban July 24, 2020

July 24, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-)

1 0

[PATCH 1/2] wineconsole: Ignore ERROR_IO_INCOMPLETE error in WINECON_GrabChanges.
by Jacek Caban July 24, 2020

July 24, 2020

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/wineconsole/wineconsole.c | 1 + 1 file changed, 1 insertion(+)

1 0

[RFC PATCH v2] gdi32: Enumerate one charset per font for EnumFontFamilies.
by Myah Caron July 24, 2020

July 24, 2020

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=47726 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- v2: - Fix the successful todo_wine errors. - Merge the patches together, as both patches are now RFC. I'm not sure how to approach either the Traditional Arabic issue (as I'm currently unable to replicate it, even after installing multiple Arabic language packs), or the font aliasing issues that this patch now exposes (the RUSSIAN_CHARSET errors).

2 1

[PATCH 3/3] amstream: Implement IMediaStreamFilter::GetStopPosition.
by Myah Caron July 24, 2020

July 24, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 ++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 15 ++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index ef23edfae3..6d1b107df5 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -800,9 +800,29 @@ static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - FIXME("iface %p, stop %p, stub!\n", iface, stop); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, stop %p\n", iface, stop); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetStopPosition(seeking, stop); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 50b2d5a761..d9c982948d 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -917,8 +917,11 @@ static HRESULT WINAPI testsource_seeking_GetDuration(IMediaSeeking *iface, LONGL static HRESULT WINAPI testsource_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) { - ok(0, "Unexpected call.\n"); - return E_NOTIMPL; + struct testfilter *filter = impl_from_IMediaSeeking(iface); + + *stop = 0x8000000000000000ULL; + + return S_OK; } static HRESULT WINAPI testsource_seeking_GetCurrentPosition(IMediaSeeking *iface, LONGLONG *current) @@ -4814,7 +4817,7 @@ static void test_mediastreamfilter_set_positions(void) IAMMediaStream *stream1; IAMMediaStream *stream2; IAMMediaStream *stream3; - LONGLONG stop_position; + LONGLONG stop_position, in_stop_position; LONGLONG duration; IMediaSeeking *seeking; IGraphBuilder *graph; @@ -4912,6 +4915,12 @@ static void test_mediastreamfilter_set_positions(void) ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", wine_dbgstr_longlong(duration)); + in_stop_position = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetStopPosition(seeking, &in_stop_position); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(in_stop_position == 0x8000000000000000ULL, "Got stop position %s.\n", + wine_dbgstr_longlong(in_stop_position)); + source2.set_positions_hr = E_FAIL; source1.current_position = 0xdeadbeefdeadbeefULL; source1.stop_position = 0xdeadbeefdeadbeefULL; -- 2.27.0

2 1

[PATCH 2/3] amstream: Implement IAMMultiMediaStream::GetDuration.
by Myah Caron July 24, 2020

July 24, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/multimedia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 200bd5c4a5..e6b088e432 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -177,9 +177,9 @@ static HRESULT WINAPI multimedia_stream_GetDuration(IAMMultiMediaStream *iface, { struct multimedia_stream *This = impl_from_IAMMultiMediaStream(iface); - FIXME("(%p/%p)->(%p) stub!\n", This, iface, pDuration); + TRACE("(%p/%p)->(%p)\n", This, iface, pDuration); - return E_NOTIMPL; + return IMediaSeeking_GetDuration(This->media_seeking, pDuration); } static HRESULT WINAPI multimedia_stream_Seek(IAMMultiMediaStream *iface, STREAM_TIME seek_time) -- 2.27.0

2 1

[PATCH 1/3] amstream: Implement IMediaStreamFilter::GetDuration.
by Myah Caron July 24, 2020

July 24, 2020

Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- dlls/amstream/filter.c | 24 ++++++++++++++++++++++-- dlls/amstream/tests/amstream.c | 7 +++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 0a06e78180..ef23edfae3 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -773,9 +773,29 @@ static HRESULT WINAPI filter_seeking_SetTimeFormat(IMediaSeeking *iface, const G static HRESULT WINAPI filter_seeking_GetDuration(IMediaSeeking *iface, LONGLONG *duration) { - FIXME("iface %p, duration %p, stub!\n", iface, duration); + struct filter *filter = impl_from_IMediaSeeking(iface); + IMediaSeeking *seeking; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, duration %p\n", iface, duration); + + EnterCriticalSection(&filter->cs); + + seeking = get_seeking(filter->seekable_stream); + + if (!seeking) + { + LeaveCriticalSection(&filter->cs); + return E_NOTIMPL; + } + + hr = IMediaSeeking_GetDuration(seeking, duration); + + IMediaSeeking_Release(seeking); + + LeaveCriticalSection(&filter->cs); + + return hr; } static HRESULT WINAPI filter_seeking_GetStopPosition(IMediaSeeking *iface, LONGLONG *stop) diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index 8adf9db934..50b2d5a761 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -4815,6 +4815,7 @@ static void test_mediastreamfilter_set_positions(void) IAMMediaStream *stream2; IAMMediaStream *stream3; LONGLONG stop_position; + LONGLONG duration; IMediaSeeking *seeking; IGraphBuilder *graph; IPin *pin1; @@ -4905,6 +4906,12 @@ static void test_mediastreamfilter_set_positions(void) ok(source3.stop_position == 0xdeadbeefdeadbeefULL, "Got stop position %s.\n", wine_dbgstr_longlong(source3.stop_position)); + duration = 0xdeadbeefdeadbeefULL; + hr = IMediaSeeking_GetDuration(seeking, &duration); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(duration == 0x8000000000000000ULL, "Got duration %s.\n", + wine_dbgstr_longlong(duration)); + source2.set_positions_hr = E_FAIL; source1.current_position = 0xdeadbeefdeadbeefULL; source1.stop_position = 0xdeadbeefdeadbeefULL; -- 2.27.0

2 1

[PATCH v2 1/5] dsound/tests: Link directly to dsound.
by Zebediah Figura July 24, 2020

July 24, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dsound/tests/Makefile.in | 2 +- dlls/dsound/tests/capture.c | 37 +++------ dlls/dsound/tests/ds3d.c | 35 ++------ dlls/dsound/tests/ds3d8.c | 35 ++------ dlls/dsound/tests/dsound.c | 115 +++++++------------------- dlls/dsound/tests/dsound8.c | 75 ++++++----------- dlls/dsound/tests/duplex.c | 50 +++--------- dlls/dsound/tests/propset.c | 148 ++++++++++++---------------------- 8 files changed, 145 insertions(+), 352 deletions(-) diff --git a/dlls/dsound/tests/Makefile.in b/dlls/dsound/tests/Makefile.in index a3e7c37c93..49bc4d9b55 100644 --- a/dlls/dsound/tests/Makefile.in +++ b/dlls/dsound/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dsound.dll -IMPORTS = ole32 version user32 +IMPORTS = dsound ole32 version user32 C_SRCS = \ capture.c \ diff --git a/dlls/dsound/tests/capture.c b/dlls/dsound/tests/capture.c index dada067956..e326fe8d83 100644 --- a/dlls/dsound/tests/capture.c +++ b/dlls/dsound/tests/capture.c @@ -32,9 +32,6 @@ #define NOTIFICATIONS 5 -static HRESULT (WINAPI *pDirectSoundCaptureCreate)(LPCGUID,LPDIRECTSOUNDCAPTURE*,LPUNKNOWN)=NULL; -static HRESULT (WINAPI *pDirectSoundCaptureEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; - static const char * get_format_str(WORD format) { static char msg[32]; @@ -232,28 +229,28 @@ static void test_capture(void) "should have failed: %08x\n",rc); /* try with no device specified */ - rc=pDirectSoundCaptureCreate(NULL,&dsco,NULL); + rc = DirectSoundCaptureCreate(NULL, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCaptureCreate(NULL) failed: %08x\n",rc); if (rc==S_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); /* try with default capture device specified */ - rc=pDirectSoundCaptureCreate(&DSDEVID_DefaultCapture,&dsco,NULL); + rc = DirectSoundCaptureCreate(&DSDEVID_DefaultCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCaptureCreate(DSDEVID_DefaultCapture) failed: %08x\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); /* try with default voice capture device specified */ - rc=pDirectSoundCaptureCreate(&DSDEVID_DefaultVoiceCapture,&dsco,NULL); + rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoiceCapture, &dsco, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCaptureCreate(DSDEVID_DefaultVoiceCapture) failed: %08x\n", rc); if (rc==DS_OK && dsco) IDirectSoundCapture_test(dsco, TRUE, NULL); /* try with a bad device specified */ - rc=pDirectSoundCaptureCreate(&DSDEVID_DefaultVoicePlayback,&dsco,NULL); + rc = DirectSoundCaptureCreate(&DSDEVID_DefaultVoicePlayback, &dsco, NULL); ok(rc==DSERR_NODRIVER, "DirectSoundCaptureCreate(DSDEVID_DefaultVoicePlatback) " "should have failed: %08x\n",rc); @@ -442,11 +439,11 @@ static BOOL WINAPI dscenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, /* Private dsound.dll: Error: Invalid interface buffer */ trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); - rc=pDirectSoundCaptureCreate(lpGuid,NULL,NULL); + rc = DirectSoundCaptureCreate(lpGuid, NULL, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCaptureCreate() should have " "returned DSERR_INVALIDPARAM, returned: %08x\n",rc); - rc=pDirectSoundCaptureCreate(lpGuid,&dsco,NULL); + rc = DirectSoundCaptureCreate(lpGuid, &dsco, NULL); ok((rc==DS_OK)||(rc==DSERR_NODRIVER)||(rc==E_FAIL)||(rc==DSERR_ALLOCATED), "DirectSoundCaptureCreate() failed: %08x\n",rc); if (rc!=DS_OK) { @@ -669,7 +666,7 @@ EXIT: static void test_enumerate(void) { HRESULT rc; - rc=pDirectSoundCaptureEnumerateA(&dscenum_callback,NULL); + rc = DirectSoundCaptureEnumerateA(dscenum_callback, NULL); ok(rc==DS_OK,"DirectSoundCaptureEnumerateA() failed: %08x\n", rc); } @@ -684,12 +681,12 @@ static void test_COM(void) HRESULT hr; ULONG refcount; - hr = pDirectSoundCaptureCreate(NULL, &dsc, (IUnknown*)0xdeadbeef); + hr = DirectSoundCaptureCreate(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); + hr = DirectSoundCaptureCreate(NULL, &dsc, NULL); if (hr == DSERR_NODRIVER) { skip("No driver\n"); return; @@ -755,27 +752,11 @@ static void test_COM(void) START_TEST(capture) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (!hDsound) { - skip("dsound.dll not found - skipping all tests\n"); - return; - } - - pDirectSoundCaptureCreate = (void*)GetProcAddress(hDsound, "DirectSoundCaptureCreate"); - pDirectSoundCaptureEnumerateA = (void*)GetProcAddress(hDsound, "DirectSoundCaptureEnumerateA"); - if (!pDirectSoundCaptureCreate || !pDirectSoundCaptureEnumerateA) { - skip("DirectSoundCapture{Create,Enumerate} missing - skipping all tests\n"); - return; - } - test_COM(); test_capture(); test_enumerate(); - FreeLibrary(hDsound); CoUninitialize(); } diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 1b44afff8d..a6b31641d4 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -36,11 +36,6 @@ #define PI 3.14159265358979323846 - -static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, - LPUNKNOWN)=NULL; - char* wave_generate_la(WAVEFORMATEX* wfx, double duration, DWORD* size, BOOL ieee) { int i; @@ -712,7 +707,7 @@ static HRESULT test_secondary(LPGUID lpGuid, int play, int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -974,7 +969,7 @@ static HRESULT test_for_driver(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -998,7 +993,7 @@ static HRESULT test_primary(LPGUID lpGuid) int ref, i; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -1081,7 +1076,7 @@ static HRESULT test_primary_3d(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -1152,7 +1147,7 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -1306,32 +1301,16 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, static void ds3d_tests(void) { HRESULT rc; - rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); + rc = DirectSoundEnumerateA(dsenum_callback, NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, - "DirectSoundEnumerateA"); - pDirectSoundCreate = (void*)GetProcAddress(hDsound, - "DirectSoundCreate"); - - ds3d_tests(); - - FreeLibrary(hDsound); - } - else - skip("dsound.dll not found - skipping all tests\n"); + ds3d_tests(); CoUninitialize(); } diff --git a/dlls/dsound/tests/ds3d8.c b/dlls/dsound/tests/ds3d8.c index 00340af94b..465ba040a3 100644 --- a/dlls/dsound/tests/ds3d8.c +++ b/dlls/dsound/tests/ds3d8.c @@ -34,9 +34,6 @@ #include "ksmedia.h" #include "dsound_test.h" -static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate8)(LPCGUID,LPDIRECTSOUND8*,LPUNKNOWN)=NULL; - typedef struct { char* wave; DWORD wave_len; @@ -544,7 +541,7 @@ static HRESULT test_secondary8(LPGUID lpGuid, BOOL play, int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -822,7 +819,7 @@ static HRESULT test_for_driver8(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -846,7 +843,7 @@ static HRESULT test_primary8(LPGUID lpGuid) int ref, i; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -928,7 +925,7 @@ static HRESULT test_primary_3d8(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -999,7 +996,7 @@ static HRESULT test_primary_3d_with_listener8(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n", rc); if (rc!=DS_OK) return rc; @@ -1136,34 +1133,16 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, static void ds3d8_tests(void) { HRESULT rc; - rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); + rc = DirectSoundEnumerateA(dsenum_callback, NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(ds3d8) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, - "DirectSoundEnumerateA"); - pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, - "DirectSoundCreate8"); - if (pDirectSoundCreate8) - ds3d8_tests(); - else - skip("DirectSoundCreate8 missing - skipping all tests\n"); - - FreeLibrary(hDsound); - } - else - skip("dsound.dll not found - skipping all tests\n"); + ds3d8_tests(); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 2bf87eb857..a4f59efaad 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -41,12 +41,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); -static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, - LPUNKNOWN)=NULL; - -static BOOL gotdx8; - static void IDirectSound_test(LPDIRECTSOUND dso, BOOL initialized, LPCGUID lpGuid) { @@ -235,28 +229,28 @@ static void IDirectSound_tests(void) "should have failed: %08x\n",rc); /* try with no device specified */ - rc=pDirectSoundCreate(NULL,&dso,NULL); + rc = DirectSoundCreate(NULL, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate(NULL) failed: %08x\n",rc); if (rc==S_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with default playback device specified */ - rc=pDirectSoundCreate(&DSDEVID_DefaultPlayback,&dso,NULL); + rc = DirectSoundCreate(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate(DSDEVID_DefaultPlayback) failed: %08x\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with default voice playback device specified */ - rc=pDirectSoundCreate(&DSDEVID_DefaultVoicePlayback,&dso,NULL); + rc = DirectSoundCreate(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate(DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); if (rc==DS_OK && dso) IDirectSound_test(dso, TRUE, NULL); /* try with a bad device specified */ - rc=pDirectSoundCreate(&DSDEVID_DefaultVoiceCapture,&dso,NULL); + rc = DirectSoundCreate(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate(DSDEVID_DefaultVoiceCapture) " "should have failed: %08x\n",rc); if (rc==DS_OK && dso) @@ -270,12 +264,12 @@ static HRESULT test_dsound(LPGUID lpGuid) int ref; /* DSOUND: Error: Invalid interface buffer */ - rc=pDirectSoundCreate(lpGuid,0,NULL); + rc = DirectSoundCreate(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate() should have returned " "DSERR_INVALIDPARAM, returned: %08x\n",rc); /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -292,13 +286,13 @@ static HRESULT test_dsound(LPGUID lpGuid) IDirectSound_test(dso, FALSE, lpGuid); /* Create a DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); if (rc==DS_OK) { LPDIRECTSOUND dso1=NULL; /* Create a second DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso1,NULL); + rc = DirectSoundCreate(lpGuid, &dso1, NULL); ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); if (rc==DS_OK) { /* Release the second DirectSound object */ @@ -318,7 +312,7 @@ static HRESULT test_dsound(LPGUID lpGuid) return rc; /* Create a DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK,"DirectSoundCreate() failed: %08x\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; @@ -374,7 +368,7 @@ static HRESULT test_primary(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -545,7 +539,7 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) int f,ref,tag; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -687,7 +681,7 @@ static HRESULT test_secondary(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -751,30 +745,16 @@ static HRESULT test_secondary(LPGUID lpGuid) wfx.nBlockAlign); bufdesc.lpwfxFormat=&wfx; rc=IDirectSound_CreateSoundBuffer(dso,&bufdesc,&secondary,NULL); - if (gotdx8 || wfx.wBitsPerSample <= 16 || wfx.wFormatTag == WAVE_FORMAT_IEEE_FLOAT) - { - if (wfx.wBitsPerSample > 16) - ok(broken((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) - || rc == DS_OK, /* driver dependent? */ - "IDirectSound_CreateSoundBuffer() " - "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " - "and NULL, returned: %08x %p\n", rc, secondary); - else - ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ - "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); - } - else - ok(rc==E_INVALIDARG, "Creating %d bpp buffer on dx < 8 returned: %p %08x\n", - wfx.wBitsPerSample, secondary, rc); - if (!gotdx8) - { - win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); - /* Apparently they succeed with bogus values, - * which means that older dsound doesn't look at them - */ - goto no_wfe; - } + if (wfx.wBitsPerSample > 16) + ok(broken((rc == DSERR_CONTROLUNAVAIL || rc == DSERR_INVALIDCALL || rc == DSERR_INVALIDPARAM /* 2003 */) && !secondary) + || rc == DS_OK, /* driver dependent? */ + "IDirectSound_CreateSoundBuffer() " + "should have returned (DSERR_CONTROLUNAVAIL or DSERR_INVALIDCALL) " + "and NULL, returned: %08x %p\n", rc, secondary); + else + ok((rc==DS_OK && secondary!=NULL) || broken(rc == DSERR_CONTROLUNAVAIL), /* vmware drivers on w2k */ + "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (secondary) IDirectSoundBuffer_Release(secondary); @@ -853,7 +833,6 @@ static HRESULT test_secondary(LPGUID lpGuid) ok(rc==DS_OK && secondary!=NULL, "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); -no_wfe: if (rc==DS_OK && secondary!=NULL) { if (winetest_interactive) { trace(" Testing a secondary buffer at %dx%dx%d (fmt=%d) " @@ -902,7 +881,7 @@ static HRESULT test_block_align(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -973,7 +952,7 @@ static HRESULT test_frequency(LPGUID lpGuid) 48000, 96000 }; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -1104,7 +1083,7 @@ static HRESULT test_duplicate(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -1431,11 +1410,6 @@ static void perform_invalid_fmt_tests(const char *testname, IDirectSound *dso, I } } - if(!gotdx8){ - win_skip("Not doing the WAVE_FORMAT_EXTENSIBLE tests\n"); - return; - } - fmtex.Format.cbSize = sizeof(WAVEFORMATEXTENSIBLE) - sizeof(WAVEFORMATEX); fmtex.Format.wFormatTag = WAVE_FORMAT_EXTENSIBLE; fmtex.Format.nChannels = 2; @@ -1510,7 +1484,7 @@ static HRESULT test_invalid_fmts(LPGUID lpGuid) DSBUFFERDESC bufdesc; /* Create the DirectSound object */ - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) @@ -1556,7 +1530,7 @@ static void test_notifications(LPGUID lpGuid) DWORD expect, status; int cycles; - rc = pDirectSoundCreate(lpGuid, &dso, NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc == DS_OK || rc == DSERR_NODRIVER || rc == DSERR_ALLOCATED, "DirectSoundCreate() failed: %08x\n", rc); if(rc != DS_OK) @@ -1683,7 +1657,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, static void dsound_tests(void) { HRESULT rc; - rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); + rc = DirectSoundEnumerateA(&dsenum_callback, NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); } @@ -1699,7 +1673,7 @@ static void test_hw_buffers(void) UINT i; HRESULT hr; - hr = pDirectSoundCreate(NULL, &ds, NULL); + hr = DirectSoundCreate(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, "DirectSoundCreate failed: %08x\n", hr); if(hr != S_OK) @@ -1801,38 +1775,11 @@ static void test_hw_buffers(void) START_TEST(dsound) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - BOOL ret; - - ret = FreeLibrary(hDsound); - ok( ret, "FreeLibrary(1) returned %d\n", GetLastError()); - } - - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, - "DirectSoundEnumerateA"); - pDirectSoundCreate = (void*)GetProcAddress(hDsound, - "DirectSoundCreate"); - - gotdx8 = !!GetProcAddress(hDsound, "DirectSoundCreate8"); - - IDirectSound_tests(); - dsound_tests(); - test_hw_buffers(); - - FreeLibrary(hDsound); - } - else - win_skip("dsound.dll not found - skipping all tests\n"); + IDirectSound_tests(); + dsound_tests(); + test_hw_buffers(); CoUninitialize(); } diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index 8190a61736..6fe13c66fd 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -48,9 +48,6 @@ #include "dsound_test.h" -static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate8)(LPCGUID,LPDIRECTSOUND8*,LPUNKNOWN)=NULL; - int align(int length, int align) { return (length / align) * align; @@ -250,28 +247,28 @@ static void IDirectSound8_tests(void) "should have failed: %08x\n",rc); /* try with no device specified */ - rc=pDirectSoundCreate8(NULL,&dso,NULL); + rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with default playback device specified */ - rc=pDirectSoundCreate8(&DSDEVID_DefaultPlayback,&dso,NULL); + rc = DirectSoundCreate8(&DSDEVID_DefaultPlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with default voice playback device specified */ - rc=pDirectSoundCreate8(&DSDEVID_DefaultVoicePlayback,&dso,NULL); + rc = DirectSoundCreate8(&DSDEVID_DefaultVoicePlayback, &dso, NULL); ok(rc==S_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK && dso) IDirectSound8_test(dso, TRUE, NULL); /* try with a bad device specified */ - rc=pDirectSoundCreate8(&DSDEVID_DefaultVoiceCapture,&dso,NULL); + rc = DirectSoundCreate8(&DSDEVID_DefaultVoiceCapture, &dso, NULL); ok(rc==DSERR_NODRIVER,"DirectSoundCreate8(DSDEVID_DefaultVoiceCapture) " "should have failed: %08x\n",rc); } @@ -283,12 +280,12 @@ static HRESULT test_dsound8(LPGUID lpGuid) int ref; /* DSOUND: Error: Invalid interface buffer */ - rc=pDirectSoundCreate8(lpGuid,0,NULL); + rc = DirectSoundCreate8(lpGuid, 0, NULL); ok(rc==DSERR_INVALIDPARAM,"DirectSoundCreate8() should have returned " "DSERR_INVALIDPARAM, returned: %08x\n",rc); /* Create the DirectSound8 object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -305,13 +302,13 @@ static HRESULT test_dsound8(LPGUID lpGuid) IDirectSound8_test(dso, FALSE, lpGuid); /* Create a DirectSound8 object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK) { LPDIRECTSOUND8 dso1=NULL; /* Create a second DirectSound8 object */ - rc=pDirectSoundCreate8(lpGuid,&dso1,NULL); + rc = DirectSoundCreate8(lpGuid, &dso1, NULL); ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK) { /* Release the second DirectSound8 object */ @@ -332,7 +329,7 @@ static HRESULT test_dsound8(LPGUID lpGuid) return rc; /* Create a DirectSound8 object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK,"DirectSoundCreate8() failed: %08x\n",rc); if (rc==DS_OK) { LPDIRECTSOUNDBUFFER secondary; @@ -401,7 +398,7 @@ static HRESULT test_primary8(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -551,7 +548,7 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) unsigned int f, tag; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -692,7 +689,7 @@ static HRESULT test_secondary8(LPGUID lpGuid) int ref; /* Create the DirectSound object */ - rc=pDirectSoundCreate8(lpGuid,&dso,NULL); + rc = DirectSoundCreate8(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED, "DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -938,7 +935,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, static void dsound8_tests(void) { HRESULT rc; - rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); + rc = DirectSoundEnumerateA(dsenum_callback, NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); } @@ -954,7 +951,7 @@ static void test_hw_buffers(void) UINT i; HRESULT hr; - hr = pDirectSoundCreate8(NULL, &ds, NULL); + hr = DirectSoundCreate8(NULL, &ds, NULL); ok(hr == S_OK || hr == DSERR_NODRIVER || hr == DSERR_ALLOCATED || hr == E_FAIL, "DirectSoundCreate8 failed: %08x\n", hr); if(hr != S_OK) @@ -1119,7 +1116,7 @@ static void test_first_device(void) IMMDevice_Release(defdev); IMMDeviceEnumerator_Release(devenum); - hr = pDirectSoundEnumerateA(&default_device_cb, NULL); + hr = DirectSoundEnumerateA(default_device_cb, NULL); ok(hr == S_OK, "DirectSoundEnumerateA failed: %08x\n", hr); } @@ -1183,7 +1180,7 @@ static void test_primary_flags(void) DSCAPS dscaps; /* Create a DirectSound8 object */ - rc = pDirectSoundCreate8(NULL, &dso, NULL); + rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc == DS_OK || rc==DSERR_NODRIVER, "Failed: %08x\n",rc); if (rc!=DS_OK) @@ -1234,7 +1231,7 @@ static void test_effects(void) DWORD resultcodes[2]; /* Create a DirectSound8 object */ - rc=pDirectSoundCreate8(NULL,&dso,NULL); + rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER,"DirectSoundCreate8() failed: %08x\n",rc); if (rc!=DS_OK) @@ -1696,7 +1693,7 @@ static void test_effects_parameters(void) DWORD resultcodes[8]; /* Create a DirectSound8 object */ - rc = pDirectSoundCreate8(NULL, &dso, NULL); + rc = DirectSoundCreate8(NULL, &dso, NULL); ok(rc == DS_OK || rc == DSERR_NODRIVER, "DirectSoundCreate8() failed: %08x\n", rc); if (rc != DS_OK) return; @@ -1789,36 +1786,16 @@ cleanup: START_TEST(dsound8) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, - "DirectSoundEnumerateA"); - pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, - "DirectSoundCreate8"); - if (pDirectSoundCreate8) - { - test_COM(); - IDirectSound8_tests(); - dsound8_tests(); - test_hw_buffers(); - test_first_device(); - test_primary_flags(); - test_effects(); - test_effects_parameters(); - } - else - skip("DirectSoundCreate8 missing - skipping all tests\n"); - - FreeLibrary(hDsound); - } - else - skip("dsound.dll not found - skipping all tests\n"); + test_COM(); + IDirectSound8_tests(); + dsound8_tests(); + test_hw_buffers(); + test_first_device(); + test_primary_flags(); + test_effects(); + test_effects_parameters(); CoUninitialize(); } diff --git a/dlls/dsound/tests/duplex.c b/dlls/dsound/tests/duplex.c index b770515785..59507c566c 100644 --- a/dlls/dsound/tests/duplex.c +++ b/dlls/dsound/tests/duplex.c @@ -29,10 +29,6 @@ #include "dsound_test.h" -static HRESULT (WINAPI *pDirectSoundFullDuplexCreate)(LPCGUID, LPCGUID, - LPCDSCBUFFERDESC, LPCDSBUFFERDESC, HWND, DWORD, LPDIRECTSOUNDFULLDUPLEX *, - LPDIRECTSOUNDCAPTUREBUFFER8*, LPDIRECTSOUNDBUFFER8*, LPUNKNOWN)=NULL; - static void IDirectSoundFullDuplex_test(LPDIRECTSOUNDFULLDUPLEX dsfdo, BOOL initialized, LPCGUID lpGuidCapture, LPCGUID lpGuidRender) @@ -181,19 +177,17 @@ static void IDirectSoundFullDuplex_tests(void) DSBufferDesc.lpwfxFormat = &wfex; /* try with no device specified */ - rc=pDirectSoundFullDuplexCreate(NULL,NULL,&DSCBufferDesc,&DSBufferDesc, - get_hwnd(),DSSCL_EXCLUSIVE ,&dsfdo,&pDSCBuffer8, - &pDSBuffer8,NULL); + rc = DirectSoundFullDuplexCreate(NULL, NULL, &DSCBufferDesc, &DSBufferDesc, + get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(NULL,NULL) failed: %08x\n",rc); if (rc==S_OK && dsfdo) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); /* try with default devices specified */ - rc=pDirectSoundFullDuplexCreate(&DSDEVID_DefaultCapture, - &DSDEVID_DefaultPlayback,&DSCBufferDesc, - &DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE,&dsfdo, - &pDSCBuffer8,&pDSBuffer8,NULL); + rc = DirectSoundFullDuplexCreate(&DSDEVID_DefaultCapture, + &DSDEVID_DefaultPlayback, &DSCBufferDesc, &DSBufferDesc, get_hwnd(), + DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8,&pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultCapture," "DSDEVID_DefaultPlayback) failed: %08x\n", rc); @@ -201,10 +195,9 @@ static void IDirectSoundFullDuplex_tests(void) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); /* try with default voice devices specified */ - rc=pDirectSoundFullDuplexCreate(&DSDEVID_DefaultVoiceCapture, - &DSDEVID_DefaultVoicePlayback, - &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, - &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); + rc = DirectSoundFullDuplexCreate(&DSDEVID_DefaultVoiceCapture, + &DSDEVID_DefaultVoicePlayback, &DSCBufferDesc, &DSBufferDesc, + get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoiceCapture," "DSDEVID_DefaultVoicePlayback) failed: %08x\n", rc); @@ -212,10 +205,9 @@ static void IDirectSoundFullDuplex_tests(void) IDirectSoundFullDuplex_test(dsfdo, TRUE, NULL, NULL); /* try with bad devices specified */ - rc=pDirectSoundFullDuplexCreate(&DSDEVID_DefaultVoicePlayback, - &DSDEVID_DefaultVoiceCapture, - &DSCBufferDesc,&DSBufferDesc,get_hwnd(),DSSCL_EXCLUSIVE, - &dsfdo,&pDSCBuffer8,&pDSBuffer8,NULL); + rc = DirectSoundFullDuplexCreate(&DSDEVID_DefaultVoicePlayback, + &DSDEVID_DefaultVoiceCapture, &DSCBufferDesc, &DSBufferDesc, + get_hwnd(), DSSCL_EXCLUSIVE, &dsfdo, &pDSCBuffer8, &pDSBuffer8, NULL); ok(rc==DSERR_NODRIVER||rc==DSERR_INVALIDCALL, "DirectSoundFullDuplexCreate(DSDEVID_DefaultVoicePlayback," "DSDEVID_DefaultVoiceCapture) should have failed: %08x\n", rc); @@ -336,26 +328,10 @@ static void test_COM(void) START_TEST(duplex) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, - "DirectSoundFullDuplexCreate"); - if (pDirectSoundFullDuplexCreate) { - test_COM(); - IDirectSoundFullDuplex_tests(); - } else - skip("DirectSoundFullDuplexCreate missing - skipping all tests\n"); - - FreeLibrary(hDsound); - } - else - skip("dsound.dll not found - skipping all tests\n"); + test_COM(); + IDirectSoundFullDuplex_tests(); CoUninitialize(); } diff --git a/dlls/dsound/tests/propset.c b/dlls/dsound/tests/propset.c index 49e6f518ae..94f0d36345 100644 --- a/dlls/dsound/tests/propset.c +++ b/dlls/dsound/tests/propset.c @@ -49,19 +49,7 @@ DEFINE_GUID(DSPROPSETID_I3DL2_BufferProperties, DEFINE_GUID(DSPROPSETID_ZOOMFX_BufferProperties, 0xCD5368E0,0x3450,0x11D3,0x8B,0x6E,0x00,0x10,0x5A,0x9B,0x7B,0xBC); -static HRESULT (WINAPI *pDirectSoundEnumerateA)(LPDSENUMCALLBACKA,LPVOID)=NULL; static HRESULT (WINAPI *pDllGetClassObject)(REFCLSID,REFIID,LPVOID*)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate)(LPCGUID,LPDIRECTSOUND*, - LPUNKNOWN)=NULL; -static HRESULT (WINAPI *pDirectSoundCreate8)(LPCGUID,LPDIRECTSOUND8*, - LPUNKNOWN)=NULL; -static HRESULT (WINAPI *pDirectSoundCaptureCreate)(LPCGUID, - LPDIRECTSOUNDCAPTURE*,LPUNKNOWN)=NULL; -static HRESULT (WINAPI *pDirectSoundCaptureCreate8)(LPCGUID, - LPDIRECTSOUNDCAPTURE8*,LPUNKNOWN)=NULL; -static HRESULT (WINAPI *pDirectSoundFullDuplexCreate)(LPCGUID,LPCGUID, - LPCDSCBUFFERDESC,LPCDSBUFFERDESC,HWND,DWORD,LPDIRECTSOUNDFULLDUPLEX*, - LPDIRECTSOUNDCAPTUREBUFFER8*,LPDIRECTSOUNDBUFFER8*,LPUNKNOWN)=NULL; static BOOL CALLBACK callback(PDSPROPERTY_DIRECTSOUNDDEVICE_DESCRIPTION_DATA data, LPVOID context) @@ -202,67 +190,57 @@ static void propset_private_tests(void) "returned E_NOINTERFACE, returned: %08x\n",rc); /* and the direct sound 8 version */ - if (pDirectSoundCreate8) { - rc = (pDllGetClassObject)(&CLSID_DirectSound8, &IID_IClassFactory, (void **)(&pcf)); - ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " - "failed: %08x\n",rc); - if (pcf==0) - return; - - /* direct sound 8 doesn't have an IKsPropertySet */ - rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, - (void **)(&pps)); - ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); - } + rc = pDllGetClassObject(&CLSID_DirectSound8, &IID_IClassFactory, (void **)&pcf); + ok(pcf!=0, "DllGetClassObject(CLSID_DirectSound8, IID_IClassFactory) " + "failed: %08x\n",rc); + if (pcf==0) + return; + + /* direct sound 8 doesn't have an IKsPropertySet */ + rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, + (void **)(&pps)); + ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " + "returned E_NOINTERFACE, returned: %08x\n",rc); /* try direct sound capture next */ - if (pDirectSoundCaptureCreate) { - rc = (pDllGetClassObject)(&CLSID_DirectSoundCapture, &IID_IClassFactory, - (void **)(&pcf)); - ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " - "failed: %08x\n",rc); - if (pcf==0) - return; - - /* direct sound capture doesn't have an IKsPropertySet */ - rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, - (void **)(&pps)); - ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE,returned: %08x\n",rc); - } + rc = pDllGetClassObject(&CLSID_DirectSoundCapture, &IID_IClassFactory, (void **)&pcf); + ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture, IID_IClassFactory) " + "failed: %08x\n",rc); + if (pcf==0) + return; + + /* direct sound capture doesn't have an IKsPropertySet */ + rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, + (void **)(&pps)); + ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " + "returned E_NOINTERFACE,returned: %08x\n",rc); /* and the direct sound capture 8 version */ - if (pDirectSoundCaptureCreate8) { - rc = (pDllGetClassObject)(&CLSID_DirectSoundCapture8, &IID_IClassFactory, - (void **)(&pcf)); - ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture8, " - "IID_IClassFactory) failed: %08x\n",rc); - if (pcf==0) - return; - - /* direct sound capture 8 doesn't have an IKsPropertySet */ - rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, - (void **)(&pps)); - ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned E_NOINTERFACE, returned: %08x\n",rc); - } + rc = pDllGetClassObject(&CLSID_DirectSoundCapture8, &IID_IClassFactory, (void **)&pcf); + ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundCapture8, " + "IID_IClassFactory) failed: %08x\n",rc); + if (pcf==0) + return; + + /* direct sound capture 8 doesn't have an IKsPropertySet */ + rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, + (void **)(&pps)); + ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " + "returned E_NOINTERFACE, returned: %08x\n",rc); /* try direct sound full duplex next */ - if (pDirectSoundFullDuplexCreate) { - rc = (pDllGetClassObject)(&CLSID_DirectSoundFullDuplex, &IID_IClassFactory, - (void **)(&pcf)); - ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundFullDuplex, " - "IID_IClassFactory) failed: %08x\n",rc); - if (pcf==0) - return; - - /* direct sound full duplex doesn't have an IKsPropertySet */ - rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, - (void **)(&pps)); - ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " - "returned NOINTERFACE, returned: %08x\n",rc); - } + rc = (pDllGetClassObject)(&CLSID_DirectSoundFullDuplex, &IID_IClassFactory, + (void **)(&pcf)); + ok(pcf!=0, "DllGetClassObject(CLSID_DirectSoundFullDuplex, " + "IID_IClassFactory) failed: %08x\n",rc); + if (pcf==0) + return; + + /* direct sound full duplex doesn't have an IKsPropertySet */ + rc = IClassFactory_CreateInstance(pcf, NULL, &IID_IKsPropertySet, + (void **)(&pps)); + ok(rc==E_NOINTERFACE, "CreateInstance(IID_IKsPropertySet) should have " + "returned NOINTERFACE, returned: %08x\n",rc); /* try direct sound private last */ rc = (pDllGetClassObject)(&CLSID_DirectSoundPrivate, &IID_IClassFactory, @@ -549,7 +527,7 @@ static BOOL WINAPI dsenum_callback(LPGUID lpGuid, LPCSTR lpcstrDescription, trace("*** Testing %s - %s ***\n",lpcstrDescription,lpcstrModule); driver_count++; - rc=pDirectSoundCreate(lpGuid,&dso,NULL); + rc = DirectSoundCreate(lpGuid, &dso, NULL); ok(rc==DS_OK||rc==DSERR_NODRIVER||rc==DSERR_ALLOCATED||rc==E_FAIL, "DirectSoundCreate() failed: %08x\n",rc); if (rc!=DS_OK) { @@ -692,43 +670,19 @@ EXIT: static void propset_buffer_tests(void) { HRESULT rc; - rc=pDirectSoundEnumerateA(&dsenum_callback,NULL); + rc = DirectSoundEnumerateA(dsenum_callback, NULL); ok(rc==DS_OK,"DirectSoundEnumerateA() failed: %08x\n",rc); trace("tested %u DirectSound drivers\n", driver_count); } START_TEST(propset) { - HMODULE hDsound; - CoInitialize(NULL); - hDsound = LoadLibraryA("dsound.dll"); - if (hDsound) - { - - pDirectSoundEnumerateA = (void*)GetProcAddress(hDsound, - "DirectSoundEnumerateA"); - pDllGetClassObject = (void *)GetProcAddress(hDsound, - "DllGetClassObject"); - pDirectSoundCreate = (void*)GetProcAddress(hDsound, - "DirectSoundCreate"); - pDirectSoundCreate8 = (void*)GetProcAddress(hDsound, - "DirectSoundCreate8"); - pDirectSoundCaptureCreate=(void*)GetProcAddress(hDsound, - "DirectSoundCaptureCreate"); - pDirectSoundCaptureCreate8=(void*)GetProcAddress(hDsound, - "DirectSoundCaptureCreate8"); - pDirectSoundFullDuplexCreate=(void*)GetProcAddress(hDsound, - "DirectSoundFullDuplexCreate"); - - propset_private_tests(); - propset_buffer_tests(); - - FreeLibrary(hDsound); - } - else - skip("dsound.dll not found - skipping all tests\n"); + pDllGetClassObject = (void *)GetProcAddress(GetModuleHandleA("dsound"), "DllGetClassObject"); + + propset_private_tests(); + propset_buffer_tests(); CoUninitialize(); } -- 2.27.0

2 9

[PATCH] winex11.drv: Fix the spelling of a comment.
by Francois Gouget July 24, 2020

July 24, 2020

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/winex11.drv/x11drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 1c6b666227f..e4015891369 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -672,7 +672,7 @@ struct x11drv_settings_handler /* get_id() will be called to map a device name, e.g., \\.\DISPLAY1 to a driver specific id. * Following functions use this id to identify the device. * - * Return FALSE if the device can not be found and TRUE on success */ + * Return FALSE if the device cannot be found and TRUE on success */ BOOL (*get_id)(const WCHAR *device_name, ULONG_PTR *id); /* get_modes() will be called to get a list of supported modes of the device of id in modes -- 2.20.1

1 0

[PATCH 6/6] winex11.drv: Remove XRandR 1.2 display settings handler.
by Zhiyi Zhang July 24, 2020

July 24, 2020

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- configure.ac | 4 - dlls/winex11.drv/xrandr.c | 255 ++------------------------------------ 2 files changed, 7 insertions(+), 252 deletions(-) diff --git a/configure.ac b/configure.ac index 928f8ebd1b1..e82ed889545 100644 --- a/configure.ac +++ b/configure.ac @@ -1255,10 +1255,6 @@ then #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRSetScreenConfigAndRate) * func; if (func) return 0;]])], [WINE_CHECK_SONAME(Xrandr,XRRQueryExtension, [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> -#include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetScreenResources) *f; if (f) return 0;]])], - [AC_DEFINE(HAVE_XRRGETSCREENRESOURCES, 1, - [Define if Xrandr has the XRRGetScreenResources function])]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xlib.h> #include <X11/extensions/Xrandr.h>]], [[static typeof(XRRGetProviderResources) *f; if (f) return 0;]])], [AC_DEFINE(HAVE_XRRGETPROVIDERRESOURCES, 1, [Define if Xrandr has the XRRGetProviderResources function])], diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 5ad70ea95ac..d111b960fa6 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -29,7 +29,7 @@ #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xrandr); -#ifdef HAVE_XRRGETSCREENRESOURCES +#ifdef HAVE_XRRGETPROVIDERRESOURCES WINE_DECLARE_DEBUG_CHANNEL(winediag); #endif @@ -62,22 +62,17 @@ MAKE_FUNCPTR(XRRSetScreenConfig) MAKE_FUNCPTR(XRRSetScreenConfigAndRate) MAKE_FUNCPTR(XRRSizes) -#ifdef HAVE_XRRGETSCREENRESOURCES +#ifdef HAVE_XRRGETPROVIDERRESOURCES MAKE_FUNCPTR(XRRFreeCrtcInfo) MAKE_FUNCPTR(XRRFreeOutputInfo) MAKE_FUNCPTR(XRRFreeScreenResources) MAKE_FUNCPTR(XRRGetCrtcInfo) MAKE_FUNCPTR(XRRGetOutputInfo) MAKE_FUNCPTR(XRRGetScreenResources) +MAKE_FUNCPTR(XRRGetScreenResourcesCurrent) MAKE_FUNCPTR(XRRGetScreenSizeRange) MAKE_FUNCPTR(XRRSetCrtcConfig) MAKE_FUNCPTR(XRRSetScreenSize) -static typeof(XRRGetScreenResources) *pXRRGetScreenResourcesCurrent; -static RRMode *xrandr12_modes; -static int primary_crtc; -#endif - -#ifdef HAVE_XRRGETPROVIDERRESOURCES MAKE_FUNCPTR(XRRSelectInput) MAKE_FUNCPTR(XRRGetOutputPrimary) MAKE_FUNCPTR(XRRGetProviderResources) @@ -116,20 +111,17 @@ static int load_xrandr(void) LOAD_FUNCPTR(XRRSizes); r = 1; -#ifdef HAVE_XRRGETSCREENRESOURCES +#ifdef HAVE_XRRGETPROVIDERRESOURCES LOAD_FUNCPTR(XRRFreeCrtcInfo); LOAD_FUNCPTR(XRRFreeOutputInfo); LOAD_FUNCPTR(XRRFreeScreenResources); LOAD_FUNCPTR(XRRGetCrtcInfo); LOAD_FUNCPTR(XRRGetOutputInfo); LOAD_FUNCPTR(XRRGetScreenResources); + LOAD_FUNCPTR(XRRGetScreenResourcesCurrent); LOAD_FUNCPTR(XRRGetScreenSizeRange); LOAD_FUNCPTR(XRRSetCrtcConfig); LOAD_FUNCPTR(XRRSetScreenSize); - r = 2; -#endif - -#ifdef HAVE_XRRGETPROVIDERRESOURCES LOAD_FUNCPTR(XRRSelectInput); LOAD_FUNCPTR(XRRGetOutputPrimary); LOAD_FUNCPTR(XRRGetProviderResources); @@ -305,7 +297,7 @@ static void xrandr10_init_modes(void) TRACE("Enabling XRandR\n"); } -#ifdef HAVE_XRRGETSCREENRESOURCES +#ifdef HAVE_XRRGETPROVIDERRESOURCES static XRRScreenResources *xrandr_get_screen_resources(void) { @@ -398,54 +390,6 @@ static BOOL is_broken_driver(void) return FALSE; } -static int xrandr12_get_current_mode(void) -{ - XRRScreenResources *resources; - XRRCrtcInfo *crtc_info; - int i, ret = -1; - - if (xrandr_current_mode != -1) - return xrandr_current_mode; - - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return 0; - } - - if (resources->ncrtc <= primary_crtc || - !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) - { - pXRRFreeScreenResources( resources ); - ERR("Failed to get CRTC info.\n"); - return 0; - } - - TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, - crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); - - for (i = 0; i < xrandr_mode_count; ++i) - { - if (xrandr12_modes[i] == crtc_info->mode) - { - ret = i; - break; - } - } - - pXRRFreeCrtcInfo( crtc_info ); - pXRRFreeScreenResources( resources ); - - if (ret == -1) - { - ERR("Unknown mode, returning default.\n"); - return 0; - } - - xrandr_current_mode = ret; - return ret; -} - static void get_screen_size( XRRScreenResources *resources, unsigned int *width, unsigned int *height ) { int min_width = 0, min_height = 0, max_width, max_height; @@ -481,99 +425,6 @@ static void set_screen_size( int width, int height ) pXRRSetScreenSize( gdi_display, root_window, width, height, mm_width, mm_height ); } -static LONG xrandr12_set_current_mode( int mode ) -{ - unsigned int screen_width, screen_height; - Status status = RRSetConfigFailed; - XRRScreenResources *resources; - XRRCrtcInfo *crtc_info; - - mode = mode % xrandr_mode_count; - - if (!(resources = pXRRGetScreenResourcesCurrent( gdi_display, root_window ))) - { - ERR("Failed to get screen resources.\n"); - return DISP_CHANGE_FAILED; - } - - if (resources->ncrtc <= primary_crtc || - !(crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[primary_crtc] ))) - { - pXRRFreeScreenResources( resources ); - ERR("Failed to get CRTC info.\n"); - return DISP_CHANGE_FAILED; - } - - TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, - crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); - - /* According to the RandR spec, the entire CRTC must fit inside the screen. - * Since we use the union of all enabled CRTCs to determine the necessary - * screen size, this might involve shrinking the screen, so we must disable - * the CRTC in question first. */ - - XGrabServer( gdi_display ); - - status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], - CurrentTime, crtc_info->x, crtc_info->y, None, - crtc_info->rotation, NULL, 0 ); - if (status != RRSetConfigSuccess) - { - XUngrabServer( gdi_display ); - XFlush( gdi_display ); - ERR("Failed to disable CRTC.\n"); - pXRRFreeCrtcInfo( crtc_info ); - pXRRFreeScreenResources( resources ); - return DISP_CHANGE_FAILED; - } - - get_screen_size( resources, &screen_width, &screen_height ); - screen_width = max( screen_width, crtc_info->x + dd_modes[mode].width ); - screen_height = max( screen_height, crtc_info->y + dd_modes[mode].height ); - set_screen_size( screen_width, screen_height ); - - status = pXRRSetCrtcConfig( gdi_display, resources, resources->crtcs[primary_crtc], - CurrentTime, crtc_info->x, crtc_info->y, xrandr12_modes[mode], - crtc_info->rotation, crtc_info->outputs, crtc_info->noutput ); - - XUngrabServer( gdi_display ); - XFlush( gdi_display ); - - pXRRFreeCrtcInfo( crtc_info ); - pXRRFreeScreenResources( resources ); - - if (status != RRSetConfigSuccess) - { - ERR("Resolution change not successful -- perhaps display has changed?\n"); - return DISP_CHANGE_FAILED; - } - - xrandr_current_mode = mode; - X11DRV_DisplayDevices_Update( TRUE ); - return DISP_CHANGE_SUCCESSFUL; -} - -static XRRCrtcInfo *xrandr12_get_primary_crtc_info( XRRScreenResources *resources, int *crtc_idx ) -{ - XRRCrtcInfo *crtc_info; - int i; - - for (i = 0; i < resources->ncrtc; ++i) - { - crtc_info = pXRRGetCrtcInfo( gdi_display, resources, resources->crtcs[i] ); - if (!crtc_info || crtc_info->mode == None) - { - pXRRFreeCrtcInfo( crtc_info ); - continue; - } - - *crtc_idx = i; - return crtc_info; - } - - return NULL; -} - static unsigned int get_frequency( const XRRModeInfo *mode ) { unsigned int dots = mode->hTotal * mode->vTotal; @@ -589,87 +440,6 @@ static unsigned int get_frequency( const XRRModeInfo *mode ) return (mode->dotClock + dots / 2) / dots; } -static int xrandr12_init_modes(void) -{ - XRRScreenResources *resources; - XRROutputInfo *output_info; - XRRCrtcInfo *crtc_info; - int ret = -1; - int i, j; - - if (!(resources = xrandr_get_screen_resources())) - return ret; - - if (!(crtc_info = xrandr12_get_primary_crtc_info( resources, &primary_crtc ))) - { - pXRRFreeScreenResources( resources ); - ERR("Failed to get primary CRTC info.\n"); - return ret; - } - - TRACE("CRTC %d: mode %#lx, %ux%u+%d+%d.\n", primary_crtc, crtc_info->mode, - crtc_info->width, crtc_info->height, crtc_info->x, crtc_info->y); - - if (!crtc_info->noutput || !(output_info = pXRRGetOutputInfo( gdi_display, resources, crtc_info->outputs[0] ))) - { - pXRRFreeCrtcInfo( crtc_info ); - pXRRFreeScreenResources( resources ); - ERR("Failed to get output info.\n"); - return ret; - } - - TRACE("OUTPUT 0: name %s.\n", debugstr_a(output_info->name)); - - if (!output_info->nmode) - { - WARN("Output has no modes.\n"); - goto done; - } - - if (!(xrandr12_modes = HeapAlloc( GetProcessHeap(), 0, sizeof(*xrandr12_modes) * output_info->nmode ))) - { - ERR("Failed to allocate xrandr mode info array.\n"); - goto done; - } - - dd_modes = X11DRV_Settings_SetHandlers( "XRandR 1.2", - xrandr12_get_current_mode, - xrandr12_set_current_mode, - output_info->nmode, 1 ); - - xrandr_mode_count = 0; - for (i = 0; i < output_info->nmode; ++i) - { - for (j = 0; j < resources->nmode; ++j) - { - XRRModeInfo *mode = &resources->modes[j]; - - if (mode->id == output_info->modes[i]) - { - unsigned int refresh = get_frequency( mode ); - - TRACE("Adding mode %#lx: %ux%u(a)%u.\n", mode->id, mode->width, mode->height, refresh); - X11DRV_Settings_AddOneMode( mode->width, mode->height, 0, refresh ); - xrandr12_modes[xrandr_mode_count++] = mode->id; - break; - } - } - } - - X11DRV_Settings_AddDepthModes(); - ret = 0; - -done: - pXRRFreeOutputInfo( output_info ); - pXRRFreeCrtcInfo( crtc_info ); - pXRRFreeScreenResources( resources ); - return ret; -} - -#endif /* HAVE_XRRGETSCREENRESOURCES */ - -#ifdef HAVE_XRRGETPROVIDERRESOURCES - static RECT get_primary_rect( XRRScreenResources *resources ) { XRROutputInfo *output_info = NULL; @@ -1640,18 +1410,7 @@ void X11DRV_XRandR_Init(void) TRACE("Found XRandR %d.%d.\n", major, minor); -#ifdef HAVE_XRRGETSCREENRESOURCES - if (ret >= 2 && (major > 1 || (major == 1 && minor >= 2))) - { - if (major > 1 || (major == 1 && minor >= 3)) - pXRRGetScreenResourcesCurrent = dlsym( xrandr_handle, "XRRGetScreenResourcesCurrent" ); - if (!pXRRGetScreenResourcesCurrent) - pXRRGetScreenResourcesCurrent = pXRRGetScreenResources; - } - - if (!pXRRGetScreenResourcesCurrent || is_broken_driver() || xrandr12_init_modes() < 0) -#endif - xrandr10_init_modes(); + xrandr10_init_modes(); #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) -- 2.25.1

2 1