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

Re: [PATCH 4/6] amstream: Implement IAudioStreamSample::GetMediaStream().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

July 29, 2020

Re: [PATCH v2 2/2] amstream: Increase IAudioData refcount in IAudioMediaStream::CreateSample().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

July 29, 2020

Re: [PATCH v2 1/2] amstream: Increase parent IAMMediaStream refcount in IAudioMediaStream::CreateSample().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>

July 29, 2020

Re: [PATCH 1/6] amstream: Return correct media type info when enumerating AMAudioStream media types.

by Zebediah Figura

On 7/29/20 5:30 AM, Gijs Vermeulen wrote: > Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> > --- > dlls/amstream/audiostream.c | 20 +++++++++++++++++++- > dlls/amstream/tests/amstream.c | 10 +++++----- > 2 files changed, 24 insertions(+), 6 deletions(-) > > diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c > index 112891eeb7..c3831544d6 100644 > --- a/dlls/amstream/audiostream.c > +++ b/dlls/amstream/audiostream.c > @@ -821,6 +821,17 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, > { > struct enum_media_types *enum_media_types = impl_from_IEnumMediaTypes(iface); > > + static const WAVEFORMATEX wfx = > + { > + .wFormatTag = WAVE_FORMAT_PCM, > + .nChannels = 1, > + .nSamplesPerSec = 11025, > + .nAvgBytesPerSec = 11025 * 2, > + .nBlockAlign = 2, > + .wBitsPerSample = 16, > + .cbSize = 0, > + }; > + > TRACE("iface %p, count %u, mts %p, ret_count %p.\n", iface, count, mts, ret_count); > > if (!ret_count) > @@ -831,7 +842,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, > mts[0] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); > memset(mts[0], 0, sizeof(AM_MEDIA_TYPE)); > mts[0]->majortype = MEDIATYPE_Audio; > - mts[0]->subtype = MEDIASUBTYPE_PCM; > + mts[0]->subtype = GUID_NULL; > + mts[0]->bFixedSizeSamples = TRUE; > + mts[0]->bTemporalCompression = FALSE; > + mts[0]->lSampleSize = 2; > + mts[0]->formattype = FORMAT_WaveFormatEx; > + mts[0]->cbFormat = sizeof(WAVEFORMATEX); > + mts[0]->pbFormat = (BYTE *)&wfx; This needs to be allocated with CoTaskMemAlloc(). > + > ++enum_media_types->index; > *ret_count = 1; > return count == 1 ? S_OK : S_FALSE; > diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c > index 68d2b9c18f..da9633feec 100644 > --- a/dlls/amstream/tests/amstream.c > +++ b/dlls/amstream/tests/amstream.c > @@ -2426,15 +2426,15 @@ static void test_media_types(void) > ok(count == 1, "Got count %u.\n", count); > ok(IsEqualGUID(&pmt->majortype, &MEDIATYPE_Audio), "Got major type %s\n", > wine_dbgstr_guid(&pmt->majortype)); > - todo_wine ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", > + ok(IsEqualGUID(&pmt->subtype, &GUID_NULL), "Got subtype %s\n", > wine_dbgstr_guid(&pmt->subtype)); > - todo_wine ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); > + ok(pmt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", pmt->bFixedSizeSamples); > ok(!pmt->bTemporalCompression, "Got temporal compression %d.\n", pmt->bTemporalCompression); > - todo_wine ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); > - todo_wine ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", > + ok(pmt->lSampleSize == 2, "Got sample size %u.\n", pmt->lSampleSize); > + ok(IsEqualGUID(&pmt->formattype, &FORMAT_WaveFormatEx), "Got format type %s.\n", > wine_dbgstr_guid(&pmt->formattype)); > ok(!pmt->pUnk, "Got pUnk %p.\n", pmt->pUnk); > - todo_wine ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); > + ok(pmt->cbFormat == sizeof(WAVEFORMATEX), "Got format size %u.\n", pmt->cbFormat); > ok(!memcmp(pmt->pbFormat, &expect_wfx, pmt->cbFormat), "Format blocks didn't match.\n"); > > hr = IPin_QueryAccept(pin, pmt); >

July 29, 2020

Re: [PATCH v3 1/4] xinput: change to IMPORTS from DELAYIMPORTS

by Zebediah Figura

On 7/29/20 2:24 AM, Zhiyi Zhang wrote: > Hi Jordan, > > v3 is better but it still doesn't state the root cause of the problem, e.g., why > using DELAYIMPORT setupapi would break the startup the some applications? > Should we not use DELAYIMPORT ever again? With that solved, it could let future > developers to avoid using DELAYIMPORT for possibly other modules. And ideally, > with added tests to make sure that such problems won't happen again. Since the submitter might not be aware, the problem appears to be a variation on bug 45936. That is, some function from setupapi yields "Call from 7B036515 to unimplemented function setupapi.dll.SetupDiCreateDeviceInfoList, aborting" when that function is of course implemented (and has been for over 15 years). I suggested not delay-loading setupapi as a solution, since it worked, and since all of the modules that delay-load it end up using it rather quickly at this point. (I.e. xinput and hidclass use it in order to do their main job of dealing with PnP devices; ntoskrnl loads it immediately to check if it needs to enumerate any root PnP devices; gdi32 loads it when doing anything with the desktop DC, which I think is basically always). Since it's not known exactly what the program is doing, I don't know that adding tests is particularly feasible. > > Thanks, > Zhiyi > > On 7/28/20 11:32 PM, Jordan Coppard wrote: >> Using DELAYIMPORTS is breaking startup of old MapleStory clients using >> GameGuard. After discussion in #winehackers IRC, it was remarked that >> there is no good reason to keep setupapi under DELAYIMPORTS, thus I have >> moved all occurrences of it to IMPORTS instead which allows said old >> MapleStory clients to open successfully. >> >> Signed-off-by: Jordan Coppard <jordan(a)niau.io> >> --- >> dlls/xinput1_1/Makefile.in | 2 +- >> dlls/xinput1_2/Makefile.in | 2 +- >> dlls/xinput1_3/Makefile.in | 2 +- >> dlls/xinput1_4/Makefile.in | 2 +- >> dlls/xinput9_1_0/Makefile.in | 2 +- >> 5 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in >> index a2b17a248c..c4a0fe4b3a 100644 >> --- a/dlls/xinput1_1/Makefile.in >> +++ b/dlls/xinput1_1/Makefile.in >> @@ -1,6 +1,6 @@ >> MODULE = xinput1_1.dll >> PARENTSRC = ../xinput1_3 >> -DELAYIMPORTS = hid setupapi >> +IMPORTS = hid setupapi >> >> EXTRADLLFLAGS = -mno-cygwin >> >> diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in >> index fd38c6f6cc..9e56513501 100644 >> --- a/dlls/xinput1_2/Makefile.in >> +++ b/dlls/xinput1_2/Makefile.in >> @@ -1,6 +1,6 @@ >> MODULE = xinput1_2.dll >> PARENTSRC = ../xinput1_3 >> -DELAYIMPORTS = hid setupapi >> +IMPORTS = hid setupapi >> >> EXTRADLLFLAGS = -mno-cygwin >> >> diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in >> index 3b4968fb6d..fd4e48b4a8 100644 >> --- a/dlls/xinput1_3/Makefile.in >> +++ b/dlls/xinput1_3/Makefile.in >> @@ -1,6 +1,6 @@ >> MODULE = xinput1_3.dll >> IMPORTLIB = xinput >> -DELAYIMPORTS = hid setupapi >> +IMPORTS = hid setupapi >> >> EXTRADLLFLAGS = -mno-cygwin >> >> diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in >> index cdf4b4fed0..73ef49dbf5 100644 >> --- a/dlls/xinput1_4/Makefile.in >> +++ b/dlls/xinput1_4/Makefile.in >> @@ -1,6 +1,6 @@ >> MODULE = xinput1_4.dll >> PARENTSRC = ../xinput1_3 >> -DELAYIMPORTS = hid setupapi >> +IMPORTS = hid setupapi >> >> EXTRADLLFLAGS = -mno-cygwin >> >> diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in >> index dc8739c464..2efe7b31b6 100644 >> --- a/dlls/xinput9_1_0/Makefile.in >> +++ b/dlls/xinput9_1_0/Makefile.in >> @@ -1,6 +1,6 @@ >> MODULE = xinput9_1_0.dll >> PARENTSRC = ../xinput1_3 >> -DELAYIMPORTS = hid setupapi >> +IMPORTS = hid setupapi >> >> EXTRADLLFLAGS = -mno-cygwin >> > >

July 29, 2020

[PATCH v2 3/3] setupapi: Clear error on SetupDiDestroyDeviceInfoList success.

by Jeff Smith

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49332 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/setupapi/devinst.c | 1 + dlls/setupapi/tests/devinst.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 9dacde29acb..de0413e74f5 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -2854,6 +2854,7 @@ BOOL WINAPI SetupDiDestroyDeviceInfoList(HDEVINFO devinfo) } heap_free(set); + SetLastError(ERROR_SUCCESS); return TRUE; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 58b6303608d..48b84c21e84 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2711,7 +2711,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2746,7 +2746,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2775,7 +2775,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2798,7 +2798,7 @@ static void test_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2869,7 +2869,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2901,7 +2901,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2927,7 +2927,7 @@ static void test_class_coinstaller(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2978,7 +2978,7 @@ static void test_call_class_installer(void) SetLastError(0xdeadbeef); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list.\n"); - todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); + ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll"); -- 2.23.0

July 29, 2020

[PATCH v2 2/3] setupapi/tests: Add error tests for SetupDiDestroyDeviceInfoList.

by Jeff Smith

Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 40 ++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index cb77fdf3c46..58b6303608d 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2708,7 +2708,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2740,7 +2743,10 @@ static void test_class_installer(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* Test returning ERROR_DI_DO_DEFAULT. */ @@ -2766,7 +2772,10 @@ static void test_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is ClassInstall(). */ @@ -2786,7 +2795,10 @@ static void test_class_installer(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2854,7 +2866,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_REMOVE, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); todo_wine ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); todo_wine ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2883,7 +2898,10 @@ static void test_class_coinstaller(void) ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); /* The default entry point is CoDeviceInstall(). */ @@ -2906,7 +2924,10 @@ static void test_class_coinstaller(void) ok(*coinst_last_message == DIF_ALLOW_INSTALL, "Got unexpected message %#x.\n", *coinst_last_message); *coinst_callback_count = 0; - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); ok(*coinst_callback_count == 1, "Got %d callbacks.\n", *coinst_callback_count); ok(*coinst_last_message == DIF_DESTROYPRIVATEDATA, "Got unexpected message %#x.\n", *coinst_last_message); @@ -2954,7 +2975,10 @@ static void test_call_class_installer(void) ok(ret, "Failed to call class installer, error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); - SetupDiDestroyDeviceInfoList(set); + SetLastError(0xdeadbeef); + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list.\n"); + todo_wine ok(!GetLastError(), "Got unexpected error %#x.\n", GetLastError()); load_resource("coinst.dll", "C:\\windows\\system32\\winetest_coinst.dll"); -- 2.23.0

July 29, 2020

[PATCH v2 1/3] setupapi/tests: Change return values from coinst functions.

by Jeff Smith

As co_error and class_error both return 0xdeadbeef, use of 0xdeadbeef as a canary value as well can lead to ambiguous tests results. As 0xdeadbeef is a typical canary value in wine, change the return values for co_error and class_error, avoiding the potential ambiguity. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> --- v2: Replace E_FAIL with 0xdeadc0de for the value returned by class_error and co_error (i.e. the value we want to be distinct from the canary value set in tests/devinst.c). dlls/setupapi/tests/coinst.c | 4 ++-- dlls/setupapi/tests/devinst.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/setupapi/tests/coinst.c b/dlls/setupapi/tests/coinst.c index 5e8d890cfa5..ba526a5d3a1 100644 --- a/dlls/setupapi/tests/coinst.c +++ b/dlls/setupapi/tests/coinst.c @@ -47,7 +47,7 @@ DWORD WINAPI class_default(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA * DWORD WINAPI class_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device) { - return 0xdeadbeef; + return 0xdeadc0de; } DWORD WINAPI co_success(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, @@ -67,5 +67,5 @@ DWORD WINAPI CoDeviceInstall(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA DWORD WINAPI co_error(DI_FUNCTION function, HDEVINFO set, SP_DEVINFO_DATA *device, COINSTALLER_CONTEXT_DATA *context) { - return 0xdeadbeef; + return 0xdeadc0de; } diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index d4c82dea1f6..cb77fdf3c46 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2727,17 +2727,17 @@ static void test_class_installer(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REMOVE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set); @@ -2875,12 +2875,12 @@ static void test_class_coinstaller(void) ret = SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); ret = SetupDiCallClassInstaller(DIF_REGISTERDEVICE, set, &device); ok(!ret, "Expected failure.\n"); - ok(GetLastError() == 0xdeadbeef, "Got unexpected error %#x.\n", GetLastError()); + ok(GetLastError() == 0xdeadc0de, "Got unexpected error %#x.\n", GetLastError()); ok(!device_is_registered(set, &device), "Expected device not to be registered.\n"); SetupDiDestroyDeviceInfoList(set); -- 2.23.0

July 29, 2020

Re: [PATCH] d3dx10/tests: Add more test images for DDS format.

by Matteo Bruni

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

July 29, 2020

Re: [PATCH] msvcp140_1: Add stub msvcp140_1.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>

July 29, 2020