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

Zebediah Figura : quartz/tests: Add some tests for media types for the DirectSound renderer.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 1af01ac91717223adf09c4b61d7d0217ec0ccec5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af01ac91717223adf09c4b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:15 2020 -0500 quartz/tests: Add some tests for media types for the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 2 +- dlls/quartz/tests/dsoundrender.c | 118 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index 7652baf274..b4a372d4d3 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = quartz.dll -IMPORTS = strmbase advapi32 d3d9 msdmo msvfw32 ole32 oleaut32 user32 uuid +IMPORTS = strmbase advapi32 d3d9 dsound msdmo msvfw32 ole32 oleaut32 user32 uuid C_SRCS = \ acmwrapper.c \ diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index ecff4b7c88..3add14d043 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -24,6 +24,7 @@ #include "initguid.h" #include "dsound.h" #include "amaudio.h" +#include "mmreg.h" #include "wine/test.h" static const WCHAR sink_id[] = L"Audio Input pin (rendered)"; @@ -685,6 +686,122 @@ static void test_unconnected_filter_state(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +static HRESULT does_dsound_support_format(WAVEFORMATEX *format) +{ + const DSBUFFERDESC desc = + { + .dwSize = sizeof(DSBUFFERDESC), + .dwBufferBytes = format->nAvgBytesPerSec, + .lpwfxFormat = format, + }; + IDirectSoundBuffer *buffer; + IDirectSound *dsound; + HRESULT hr; + + hr = DirectSoundCreate(NULL, &dsound, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IDirectSound_CreateSoundBuffer(dsound, &desc, &buffer, NULL); + if (hr == S_OK) + IDirectSoundBuffer_Release(buffer); + IDirectSound_Release(dsound); + + return hr == S_OK ? S_OK : S_FALSE; +} + +static void test_media_types(void) +{ + IBaseFilter *filter = create_dsound_render(); + AM_MEDIA_TYPE *mt, req_mt = {{0}}; + IEnumMediaTypes *enummt; + WAVEFORMATEX wfx = {0}; + HRESULT hr, expect_hr; + unsigned int i, j; + WORD channels; + ULONG ref; + IPin *pin; + + static const DWORD sample_rates[] = {8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000, 96000}; + + static const struct + { + WORD tag; + WORD depth; + } formats[] = + { + {WAVE_FORMAT_PCM, 8}, + {WAVE_FORMAT_PCM, 16}, + {WAVE_FORMAT_PCM, 24}, + {WAVE_FORMAT_PCM, 32}, + {WAVE_FORMAT_IEEE_FLOAT, 32}, + {WAVE_FORMAT_IEEE_FLOAT, 64}, + }; + + IBaseFilter_FindPin(filter, sink_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + { + ok(IsEqualGUID(&mt->majortype, &MEDIATYPE_Audio), "Got major type %s.\n", wine_dbgstr_guid(&mt->majortype)); + ok(IsEqualGUID(&mt->subtype, &GUID_NULL), "Got subtype %s.\n", wine_dbgstr_guid(&mt->subtype)); + ok(mt->bFixedSizeSamples == TRUE, "Got fixed size %d.\n", mt->bFixedSizeSamples); + ok(!mt->bTemporalCompression, "Got temporal compression %d.\n", mt->bTemporalCompression); + ok(mt->lSampleSize == 1, "Got sample size %u.\n", mt->lSampleSize); + ok(IsEqualGUID(&mt->formattype, &GUID_NULL), "Got format type %s.\n", wine_dbgstr_guid(&mt->formattype)); + ok(!mt->pUnk, "Got pUnk %p.\n", mt->pUnk); + ok(!mt->cbFormat, "Got format size %u.\n", mt->cbFormat); + ok(!mt->pbFormat, "Got unexpected format block.\n"); + + hr = IPin_QueryAccept(pin, mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + CoTaskMemFree(mt); + } + + hr = IEnumMediaTypes_Next(enummt, 1, &mt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + req_mt.majortype = MEDIATYPE_Audio; + req_mt.formattype = FORMAT_WaveFormatEx; + req_mt.cbFormat = sizeof(WAVEFORMATEX); + req_mt.pbFormat = (BYTE *)&wfx; + + IEnumMediaTypes_Release(enummt); + + for (channels = 1; channels <= 2; ++channels) + { + wfx.nChannels = channels; + + for (i = 0; i < ARRAY_SIZE(formats); ++i) + { + wfx.wFormatTag = formats[i].tag; + wfx.wBitsPerSample = formats[i].depth; + wfx.nBlockAlign = wfx.nChannels * wfx.wBitsPerSample / 8; + for (j = 0; j < ARRAY_SIZE(sample_rates); ++j) + { + wfx.nSamplesPerSec = sample_rates[j]; + wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign; + + expect_hr = does_dsound_support_format(&wfx); + + hr = IPin_QueryAccept(pin, &req_mt); + todo_wine_if (expect_hr == S_OK) + ok(hr == expect_hr, "Expected hr %#x, got %#x, for %d channels, %d-bit %s, %d Hz.\n", + expect_hr, hr, channels, formats[i].depth, + formats[i].tag == WAVE_FORMAT_PCM ? "integer" : "float", sample_rates[j]); + } + } + } + + IPin_Release(pin); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); +} + START_TEST(dsoundrender) { IBaseFilter *filter; @@ -712,6 +829,7 @@ START_TEST(dsoundrender) test_basic_audio(); test_enum_media_types(); test_unconnected_filter_state(); + test_media_types(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/dsoundrender: Don't check the subtype in DSoundRender_CheckMediaType().
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 3d54a77af8c7fbc1aefb3182fc6e3d902314a38a URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d54a77af8c7fbc1aefb3182… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:16 2020 -0500 quartz/dsoundrender: Don't check the subtype in DSoundRender_CheckMediaType(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 3 --- dlls/quartz/tests/dsoundrender.c | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 8e6379da8c..225c1e07b9 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -384,9 +384,6 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(struct strmbase_renderer *ifac if (!IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio)) return S_FALSE; - if (!IsEqualIID(&pmt->subtype, &MEDIASUBTYPE_PCM)) - return S_FALSE; - return S_OK; } diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 3add14d043..0b45d712dc 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -789,10 +789,9 @@ static void test_media_types(void) expect_hr = does_dsound_support_format(&wfx); hr = IPin_QueryAccept(pin, &req_mt); - todo_wine_if (expect_hr == S_OK) - ok(hr == expect_hr, "Expected hr %#x, got %#x, for %d channels, %d-bit %s, %d Hz.\n", - expect_hr, hr, channels, formats[i].depth, - formats[i].tag == WAVE_FORMAT_PCM ? "integer" : "float", sample_rates[j]); + ok(hr == expect_hr, "Expected hr %#x, got %#x, for %d channels, %d-bit %s, %d Hz.\n", + expect_hr, hr, channels, formats[i].depth, + formats[i].tag == WAVE_FORMAT_PCM ? "integer" : "float", sample_rates[j]); } } }

1 0

Zebediah Figura : quartz/tests: Add some tests for pin connection on the DirectSound renderer.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 52862838db98b462ae6db8fec220b7903f8bf7b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52862838db98b462ae6db8fe… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:17 2020 -0500 quartz/tests: Add some tests for pin connection on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 138 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 0b45d712dc..22d5bf6282 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -25,6 +25,7 @@ #include "dsound.h" #include "amaudio.h" #include "mmreg.h" +#include "wine/strmbase.h" #include "wine/test.h" static const WCHAR sink_id[] = L"Audio Input pin (rendered)"; @@ -38,6 +39,12 @@ static IBaseFilter *create_dsound_render(void) return filter; } +static inline BOOL compare_media_types(const AM_MEDIA_TYPE *a, const AM_MEDIA_TYPE *b) +{ + return !memcmp(a, b, offsetof(AM_MEDIA_TYPE, pbFormat)) + && !memcmp(a->pbFormat, b->pbFormat, a->cbFormat); +} + static ULONG get_refcount(void *iface) { IUnknown *unknown = iface; @@ -573,6 +580,136 @@ static void test_enum_media_types(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + if (!index) + return &filter->source.pin; + return NULL; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + +static void test_connect_pin(void) +{ + WAVEFORMATEX wfx = + { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 2, + .nSamplesPerSec = 44100, + .nAvgBytesPerSec = 44100 * 4, + .nBlockAlign = 4, + .wBitsPerSample = 16, + }; + AM_MEDIA_TYPE req_mt = + { + .majortype = MEDIATYPE_Audio, + .subtype = MEDIASUBTYPE_PCM, + .formattype = FORMAT_WaveFormatEx, + .cbFormat = sizeof(wfx), + .pbFormat = (BYTE *)&wfx, + }; + IBaseFilter *filter = create_dsound_render(); + struct testfilter source; + IFilterGraph2 *graph; + AM_MEDIA_TYPE mt; + IPin *pin, *peer; + HRESULT hr; + ULONG ref; + + testfilter_init(&source); + + CoCreateInstance(&CLSID_FilterGraph, NULL, CLSCTX_INPROC_SERVER, &IID_IFilterGraph2, (void **)&graph); + IFilterGraph2_AddFilter(graph, &source.filter.IBaseFilter_iface, L"source"); + IFilterGraph2_AddFilter(graph, filter, L"sink"); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + hr = IFilterGraph2_ConnectDirect(graph, &source.source.pin.IPin_iface, pin, &req_mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(peer == &source.source.pin.IPin_iface, "Got peer %p.\n", peer); + IPin_Release(peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_Disconnect(graph, pin); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + ok(source.source.pin.peer == pin, "Got peer %p.\n", source.source.pin.peer); + IFilterGraph2_Disconnect(graph, &source.source.pin.IPin_iface); + + peer = (IPin *)0xdeadbeef; + hr = IPin_ConnectedTo(pin, &peer); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ok(!peer, "Got peer %p.\n", peer); + + hr = IPin_ConnectionMediaType(pin, &mt); + ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + + IPin_Release(pin); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(filter); + 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_pin(IPin *pin) { IMemInputPin *mpin = NULL; @@ -829,6 +966,7 @@ START_TEST(dsoundrender) test_enum_media_types(); test_unconnected_filter_state(); test_media_types(); + test_connect_pin(); test_basefilter(); CoUninitialize();

1 0

Zebediah Figura : quartz/tests: Add some tests for allocator negotiation on the DirectSound renderer.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: aca967b8a5a6ce7a839990fcd85c7517f3a1e46c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aca967b8a5a6ce7a839990fc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jul 15 22:57:18 2020 -0500 quartz/tests: Add some tests for allocator negotiation on the DirectSound renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 22d5bf6282..d5c18d389a 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -631,6 +631,49 @@ static void testfilter_init(struct testfilter *filter) strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); } +static void test_allocator(IMemInputPin *input) +{ + IMemAllocator *req_allocator, *ret_allocator; + ALLOCATOR_PROPERTIES props; + HRESULT hr; + + hr = IMemInputPin_GetAllocatorRequirements(input, &props); + ok(hr == E_NOTIMPL, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + if (hr == S_OK) + { + hr = IMemAllocator_GetProperties(ret_allocator, &props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!props.cBuffers, "Got %d buffers.\n", props.cBuffers); + ok(!props.cbBuffer, "Got size %d.\n", props.cbBuffer); + ok(!props.cbAlign, "Got alignment %d.\n", props.cbAlign); + ok(!props.cbPrefix, "Got prefix %d.\n", props.cbPrefix); + + hr = IMemInputPin_NotifyAllocator(input, ret_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IMemAllocator_Release(ret_allocator); + } + + hr = IMemInputPin_NotifyAllocator(input, NULL, TRUE); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&req_allocator); + + hr = IMemInputPin_NotifyAllocator(input, req_allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_GetAllocator(input, &ret_allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ret_allocator == req_allocator, "Allocators didn't match.\n"); + + IMemAllocator_Release(req_allocator); + IMemAllocator_Release(ret_allocator); +} + static void test_connect_pin(void) { WAVEFORMATEX wfx = @@ -653,6 +696,7 @@ static void test_connect_pin(void) IBaseFilter *filter = create_dsound_render(); struct testfilter source; IFilterGraph2 *graph; + IMemInputPin *input; AM_MEDIA_TYPE mt; IPin *pin, *peer; HRESULT hr; @@ -686,6 +730,10 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); + IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); + + test_allocator(input); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -701,6 +749,7 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Puetz Kevin A : include: GWL_ID is not a HANDLE or pointer, and should be available on _WIN64.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 493e9a6164f48e133f07c079398a9a7e7c43e7d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=493e9a6164f48e133f07c079… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Wed Jul 15 13:02:40 2020 +0000 include: GWL_ID is not a HANDLE or pointer, and should be available on _WIN64. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 311b1481be..53661f6c78 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -1217,9 +1217,9 @@ typedef struct tagSTYLESTRUCT { /* Offsets for GetWindowLong() and GetWindowWord() */ #define GWL_EXSTYLE (-20) #define GWL_STYLE (-16) +#define GWL_ID (-12) #if !defined _WIN64 && !defined __WINESRC__ # define GWL_USERDATA (-21) -# define GWL_ID (-12) # define GWL_HWNDPARENT (-8) # define GWL_HINSTANCE (-6) # define GWL_WNDPROC (-4)

1 0

Puetz Kevin A : include: Use __typeof__ so <guiddef.h> is compatible with -std=c++11.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: ea90e1ce0d09620826611bde51b4c84212b93d88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea90e1ce0d09620826611bde… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Wed Jul 15 13:06:28 2020 +0000 include: Use __typeof__ so <guiddef.h> is compatible with -std=c++11. The typeof(...) extension is available in -std=gnu++11, but c++11 considers it replaced by decltype(...) and off-by-default __uuidof does need GNU __typeof__(), not decltype(), for c++03 support and because both __uuidof(typename) and __uuidof(expression) should work, but decltype(typename) is not accepted. Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/guiddef.h b/include/guiddef.h index 546c450043..664f74fac3 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -74,7 +74,7 @@ extern "C++" { __WINE_UUID_ATTR const GUID __wine_uuidof<type>::uuid = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}; \ } -#define __uuidof(type) __wine_uuidof_type<typeof(type)>::inst::uuid +#define __uuidof(type) __wine_uuidof_type<__typeof__(type)>::inst::uuid #else /* __WINE_UUID_ATTR */

1 0

Puetz Kevin A : include: Use unsigned int in InlineIsEqualGUID.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: aa4f8daf999c31025c076c031dfffb7c3de5b473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa4f8daf999c31025c076c03… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 16 21:15:38 2020 +0200 include: Use unsigned int in InlineIsEqualGUID. This fixes stand-alone inclusion of <guiddef.h> (without first including <basetsd.h>). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/guiddef.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/include/guiddef.h b/include/guiddef.h index 664f74fac3..a25b3a7107 100644 --- a/include/guiddef.h +++ b/include/guiddef.h @@ -156,18 +156,18 @@ typedef GUID FMTID,*LPFMTID; #define IsEqualGUID(rguid1, rguid2) (!memcmp(&(rguid1), &(rguid2), sizeof(GUID))) inline int InlineIsEqualGUID(REFGUID rguid1, REFGUID rguid2) { - return (((ULONG *)&rguid1)[0] == ((ULONG *)&rguid2)[0] && - ((ULONG *)&rguid1)[1] == ((ULONG *)&rguid2)[1] && - ((ULONG *)&rguid1)[2] == ((ULONG *)&rguid2)[2] && - ((ULONG *)&rguid1)[3] == ((ULONG *)&rguid2)[3]); + return (((unsigned int *)&rguid1)[0] == ((unsigned int *)&rguid2)[0] && + ((unsigned int *)&rguid1)[1] == ((unsigned int *)&rguid2)[1] && + ((unsigned int *)&rguid1)[2] == ((unsigned int *)&rguid2)[2] && + ((unsigned int *)&rguid1)[3] == ((unsigned int *)&rguid2)[3]); } #else #define IsEqualGUID(rguid1, rguid2) (!memcmp(rguid1, rguid2, sizeof(GUID))) #define InlineIsEqualGUID(rguid1, rguid2) \ - (((ULONG *)rguid1)[0] == ((ULONG *)rguid2)[0] && \ - ((ULONG *)rguid1)[1] == ((ULONG *)rguid2)[1] && \ - ((ULONG *)rguid1)[2] == ((ULONG *)rguid2)[2] && \ - ((ULONG *)rguid1)[3] == ((ULONG *)rguid2)[3]) + (((unsigned int *)rguid1)[0] == ((unsigned int *)rguid2)[0] && \ + ((unsigned int *)rguid1)[1] == ((unsigned int *)rguid2)[1] && \ + ((unsigned int *)rguid1)[2] == ((unsigned int *)rguid2)[2] && \ + ((unsigned int *)rguid1)[3] == ((unsigned int *)rguid2)[3]) #endif #ifdef __cplusplus

1 0

Puetz Kevin A : oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 380fbe006ad153078a8cf0cfe4ecf6d2f11c2291 URL: https://source.winehq.org/git/wine.git/?a=commit;h=380fbe006ad153078a8cf0cf… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Thu Jul 16 21:06:17 2020 +0200 oleaut32: Cut off only non-empty \[0-9]+$ resource-id in RegisterTypeLib. Check if szFullPath ended with '\\' (was explicitly a directory). Signed-off-by: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 01bb16efbc..06667850a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -730,7 +730,7 @@ HRESULT WINAPI RegisterTypeLib(ITypeLib *ptlib, const WCHAR *szFullPath, const W if ((disposition == REG_CREATED_NEW_KEY) && (szHelpDir == NULL)) { szHelpDir = freeHelpDir = SysAllocString(szFullPath); file_name = wcsrchr(szHelpDir, '\\'); - if (file_name && file_name[0]) { + if (file_name && file_name[1]) { /* possible remove a numeric \index (resource-id) */ WCHAR *end_ptr = file_name + 1; while ('0' <= *end_ptr && *end_ptr <= '9') end_ptr++;

1 0

Alexandre Julliard : ntdll: Use syscall thunks for keyed event functions.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: eb45a75a2e76e9716d08ae35cc2512b02e3bf85d URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb45a75a2e76e9716d08ae35… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 16 10:31:21 2020 +0200 ntdll: Use syscall thunks for keyed event functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 16 ++++++++-------- dlls/ntdll/sync.c | 35 ----------------------------------- dlls/ntdll/unix/loader.c | 4 ---- dlls/ntdll/unixlib.h | 10 +--------- 4 files changed, 9 insertions(+), 56 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eb45a75a2e76e9716d08…

1 0

Henri Verbeet : vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: vkd3d Branch: master Commit: 36d21277650f821b7532dd5e89c86500ae39bedc URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=36d21277650f821b7532dd5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 16 14:56:44 2020 +0430 vkd3d-shader: Rename the vkd3d_root_descriptor_table structure to vkd3d_shader_root_descriptor_table. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/vkd3d_shader.h | 4 ++-- libs/vkd3d-shader/dxbc.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1ce701c..6fa2505 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -437,7 +437,7 @@ struct vkd3d_shader_descriptor_range unsigned int descriptor_table_offset; }; -struct vkd3d_root_descriptor_table +struct vkd3d_shader_root_descriptor_table { unsigned int descriptor_range_count; const struct vkd3d_shader_descriptor_range *descriptor_ranges; @@ -472,7 +472,7 @@ struct vkd3d_root_parameter enum vkd3d_shader_root_parameter_type parameter_type; union { - struct vkd3d_root_descriptor_table descriptor_table; + struct vkd3d_shader_root_descriptor_table descriptor_table; struct vkd3d_root_constants constants; struct vkd3d_root_descriptor descriptor; } u; diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 6297a04..0848c04 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2300,7 +2300,7 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context } static int shader_parse_descriptor_table(struct root_signature_parser_context *context, - unsigned int offset, struct vkd3d_root_descriptor_table *table) + unsigned int offset, struct vkd3d_shader_root_descriptor_table *table) { struct vkd3d_shader_descriptor_range *ranges; unsigned int count; @@ -2807,7 +2807,7 @@ static int shader_write_root_signature_header(struct root_signature_writer_conte } static int shader_write_descriptor_ranges(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { const struct vkd3d_shader_descriptor_range *ranges = table->descriptor_ranges; unsigned int i; @@ -2855,7 +2855,7 @@ static int shader_write_descriptor_ranges1(struct root_signature_writer_context } static int shader_write_descriptor_table(struct root_signature_writer_context *context, - const struct vkd3d_root_descriptor_table *table) + const struct vkd3d_shader_root_descriptor_table *table) { if (!write_dword(context, table->descriptor_range_count)) return VKD3D_ERROR_OUT_OF_MEMORY; @@ -3036,7 +3036,7 @@ static int shader_write_root_signature(struct root_signature_writer_context *con return shader_write_static_samplers(context, desc); } -static int validate_descriptor_table_v_1_0(const struct vkd3d_root_descriptor_table *descriptor_table) +static int validate_descriptor_table_v_1_0(const struct vkd3d_shader_root_descriptor_table *descriptor_table) { bool have_srv_uav_cbv = false; bool have_sampler = false;

1 0