April 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : mfreadwrite: Handle MENewStream event.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 8be164c92127bb32af921f9e6696ba444a2ac25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be164c92127bb32af921f9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:09 2019 +0300 mfreadwrite: Handle MENewStream event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/main.c | 142 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index edc7ebd..ce8a4d4 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid mfplat +IMPORTS = mfuuid uuid mfplat ole32 C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e41bdf6..e6ddce0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) struct media_stream { + IMFMediaStream *stream; IMFMediaType *current; DWORD id; }; @@ -82,6 +83,7 @@ typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; IMFAsyncCallback source_events_callback; + IMFAsyncCallback stream_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -110,6 +112,11 @@ static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsync return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); } +static struct source_reader *impl_from_stream_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, stream_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); @@ -151,6 +158,77 @@ static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyn return E_NOTIMPL; } +static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IMFMediaEvent *event) +{ + IMFStreamDescriptor *sd; + IMFMediaStream *stream; + PROPVARIANT value; + unsigned int i; + DWORD id = 0; + HRESULT hr; + + PropVariantInit(&value); + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + { + WARN("Failed to get event value, hr %#x.\n", hr); + return hr; + } + + if (value.vt != VT_UNKNOWN || !value.u.punkVal) + { + WARN("Unexpected value type %d.\n", value.vt); + PropVariantClear(&value); + return E_UNEXPECTED; + } + + hr = IUnknown_QueryInterface(value.u.punkVal, &IID_IMFMediaStream, (void **)&stream); + PropVariantClear(&value); + if (FAILED(hr)) + { + WARN("Unexpected object type.\n"); + return hr; + } + + TRACE("Got new stream %p.\n", stream); + + if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) + { + hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &id); + IMFStreamDescriptor_Release(sd); + } + + if (FAILED(hr)) + { + WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + IMFMediaStream_Release(stream); + return hr; + } + + for (i = 0; i < reader->stream_count; ++i) + { + if (id == reader->streams[i].id) + { + if (!InterlockedCompareExchangePointer((void **)&reader->streams[i].stream, stream, NULL)) + { + IMFMediaStream_AddRef(reader->streams[i].stream); + if (FAILED(hr = IMFMediaStream_BeginGetEvent(stream, &reader->stream_events_callback, + (IUnknown *)stream))) + { + WARN("Failed to subscribe to stream events, hr %#x.\n", hr); + } + } + break; + } + } + + if (i == reader->stream_count) + WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + + IMFMediaStream_Release(stream); + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); @@ -170,10 +248,21 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba TRACE("Got event %u.\n", event_type); + switch (event_type) + { + case MENewStream: + hr = source_reader_new_stream_handler(reader, event); + break; + default: + ; + } + + if (FAILED(hr)) + WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + IMFMediaEvent_Release(event); - IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, - (IUnknown *)source); + IMFMediaSource_BeginGetEvent(source, iface, (IUnknown *)source); return S_OK; } @@ -187,6 +276,52 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = source_reader_source_events_callback_Invoke, }; +static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + MediaEventType event_type; + IMFMediaStream *stream; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + stream = (IMFMediaStream *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaStream_EndGetEvent(stream, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_stream_events_callback_AddRef, + source_reader_stream_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_stream_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -239,6 +374,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { + if (reader->streams[i].stream) + IMFMediaStream_Release(reader->streams[i].stream); if (reader->streams[i].current) IMFMediaType_Release(reader->streams[i].current); } @@ -614,6 +751,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; object->source_events_callback.lpVtbl = &source_events_callback_vtbl; + object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source);

1 0

Zebediah Figura : qcap/tests: Add some tests for AVI compressor media types.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: dc16a6cd0e837866d22569f941dd90e4904ecbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc16a6cd0e837866d22569f9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:37 2019 -0500 qcap/tests: Add some tests for AVI compressor media types. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 9ef66b9..4cdfe81 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -325,6 +325,11 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, lstrcpyW(info->szDescription, nameW); return sizeof(ICINFO); } + case ICM_COMPRESS_QUERY: + { + BITMAPINFO *in = (BITMAPINFO *)lparam1; + return in->bmiHeader.biBitCount == 16 ? ICERR_OK : ICERR_BADFORMAT; + } } return 0; @@ -413,6 +418,78 @@ static void test_property_bag(IMoniker *mon) IPropertyBag_Release(devenum_bag); } +static void test_media_types(IBaseFilter *filter) +{ + VIDEOINFOHEADER vih = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biBitCount = 16, + .bmiHeader.biCompression = BI_RGB, + }; + AM_MEDIA_TYPE mt = {}, *pmt; + IEnumMediaTypes *enummt; + HRESULT hr; + IPin *pin; + + 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, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + + mt.majortype = MEDIATYPE_Video; + mt.formattype = FORMAT_VideoInfo; + mt.cbFormat = sizeof(VIDEOINFOHEADER); + mt.pbFormat = (BYTE *)&vih; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + vih.bmiHeader.biBitCount = 32; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + vih.bmiHeader.biBitCount = 16; + + mt.bFixedSizeSamples = TRUE; + mt.bTemporalCompression = TRUE; + mt.lSampleSize = 123; + mt.subtype = MEDIASUBTYPE_RGB565; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + mt.subtype = MEDIASUBTYPE_WAVE; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + mt.formattype = GUID_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.formattype = FORMAT_None; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.formattype = FORMAT_VideoInfo; + + mt.majortype = MEDIATYPE_NULL; + hr = IPin_QueryAccept(pin, &mt); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + mt.majortype = MEDIATYPE_Video; + + IPin_Release(pin); + + IBaseFilter_FindPin(filter, source_id, &pin); + + hr = IPin_EnumMediaTypes(pin, &enummt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IEnumMediaTypes_Next(enummt, 1, &pmt, NULL); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + IEnumMediaTypes_Release(enummt); + IPin_Release(pin); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -452,6 +529,7 @@ START_TEST(avico) test_enum_pins(filter); test_find_pin(filter); test_pin_info(filter); + test_media_types(filter); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireSharedWaitForExclusive( ).
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: b13a00f82b54cfd238b519a658685023ad748a67 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b13a00f82b54cfd238b519a6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:14 2019 -0500 ntoskrnl.exe: Implement ExAcquireSharedWaitForExclusive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 62 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 64 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 347febb..ee26d8b 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -123,7 +123,7 @@ @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stdcall ExAcquireResourceSharedLite(ptr long) @ stdcall ExAcquireSharedStarveExclusive(ptr long) -@ stub ExAcquireSharedWaitForExclusive +@ stdcall ExAcquireSharedWaitForExclusive(ptr long) @ stub ExAllocateFromPagedLookasideList @ stdcall ExAllocatePool(long long) @ stdcall ExAllocatePoolWithQuota(long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2b362ef..e89fddc 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -944,3 +944,65 @@ BOOLEAN WINAPI ExAcquireSharedStarveExclusive( ERESOURCE *resource, BOOLEAN wait return TRUE; } + +/*********************************************************************** + * ExAcquireSharedWaitForExclusive (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wait ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + /* We own the resource exclusively, so increase recursion. */ + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + } + /* We may only grab the resource if there are no exclusive waiters, even if + * we already own it shared. */ + else if (!resource->NumberOfExclusiveWaiters) + { + entry->OwnerCount++; + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + + if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->SharedWaiters) + { + resource->SharedWaiters = heap_alloc( sizeof(*resource->SharedWaiters) ); + KeInitializeSemaphore( resource->SharedWaiters, 0, INT_MAX ); + } + resource->NumberOfSharedWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->SharedWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry->OwnerCount++; + resource->ActiveEntries++; + resource->NumberOfSharedWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 8023fda..4609790 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1515,6 +1515,7 @@ void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); BOOLEAN WINAPI ExAcquireResourceSharedLite(ERESOURCE*,BOOLEAN); BOOLEAN WINAPI ExAcquireSharedStarveExclusive(ERESOURCE*,BOOLEAN); +BOOLEAN WINAPI ExAcquireSharedWaitForExclusive(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: e0da0b777a293059c32a7c846dff16ef0738b2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0da0b777a293059c32a7c84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 5 19:41:13 2019 -0500 devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46316 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 18 +++++++++++++++++- dlls/devenum/tests/devenum.c | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8a3160c..65c1ccd 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -862,7 +862,23 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) register_avicap_devices(); - return create_EnumMoniker(class, out); + if (SUCCEEDED(hr = create_EnumMoniker(class, out))) + { + IMoniker *mon; + hr = IEnumMoniker_Next(*out, 1, &mon, NULL); + if (hr == S_OK) + { + IMoniker_Release(mon); + IEnumMoniker_Reset(*out); + } + else + { + IEnumMoniker_Release(*out); + *out = NULL; + } + } + + return hr; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 9fcfdcf..945bc67 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -69,6 +69,7 @@ static void test_devenum(IBindCtx *bind_ctx) WCHAR *displayname; VARIANT var; HRESULT hr; + int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); @@ -105,6 +106,8 @@ static void test_devenum(IBindCtx *bind_ctx) if (hr == S_OK) { + count = 0; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); @@ -136,8 +139,11 @@ static void test_devenum(IBindCtx *bind_ctx) CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); + count++; } IEnumMoniker_Release(enum_moniker); + + ok(count > 0, "CreateClassEnumerator() returned S_OK but no devices were enumerated.\n"); } }

1 0

Zebediah Figura : qcap/tests: Add some tests for AVI compressor pin interfaces.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 71239f31ad2a640b79aa594fc42a4cdbb6b9fd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=71239f31ad2a640b79aa594f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:33 2019 -0500 qcap/tests: Add some tests for AVI compressor pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5c60846..2d2d4c7 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -54,6 +54,8 @@ static ULONG get_refcount(void *iface) static void test_interfaces(IBaseFilter *filter) { + IPin *pin; + check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); @@ -71,6 +73,29 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_FindPin(filter, source_id, &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); } static void test_enum_pins(IBaseFilter *filter)

1 0

Aric Stewart : winebus.sys: Allow mapping of SDL controllers.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1528d1685a43f820a04da3041499c354b26038ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1528d1685a43f820a04da304… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Mar 20 08:28:43 2019 -0500 winebus.sys: Allow mapping of SDL controllers. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_sdl.c | 68 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 66 insertions(+), 4 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index eda3c26..78e3da1 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl setupapi +IMPORTS = ntoskrnl setupapi advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wl,--subsystem,native diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 5589113..b774df7 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -38,6 +38,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winreg.h" #include "winternl.h" #include "ddk/wdm.h" #include "ddk/hidtypes.h" @@ -106,6 +107,7 @@ MAKE_FUNCPTR(SDL_HapticRunEffect); MAKE_FUNCPTR(SDL_HapticStopAll); MAKE_FUNCPTR(SDL_JoystickIsHaptic); MAKE_FUNCPTR(SDL_memset); +MAKE_FUNCPTR(SDL_GameControllerAddMapping); #endif static Uint16 (*pSDL_JoystickGetProduct)(SDL_Joystick * joystick); static Uint16 (*pSDL_JoystickGetProductVersion)(SDL_Joystick * joystick); @@ -890,9 +892,14 @@ static void process_device_event(SDL_Event *event) set_mapped_report_from_event(event); } +typedef struct _thread_args { + HANDLE event; + UNICODE_STRING *registry_path; +} thread_arguments; + static DWORD CALLBACK deviceloop_thread(void *args) { - HANDLE init_done = args; + thread_arguments *thread_args = args; SDL_Event event; if (pSDL_Init(SDL_INIT_GAMECONTROLLER|SDL_INIT_HAPTIC) < 0) @@ -904,7 +911,58 @@ static DWORD CALLBACK deviceloop_thread(void *args) pSDL_JoystickEventState(SDL_ENABLE); pSDL_GameControllerEventState(SDL_ENABLE); - SetEvent(init_done); + /* Process mappings */ + if (pSDL_GameControllerAddMapping != NULL) + { + HANDLE key; + OBJECT_ATTRIBUTES attr; + WCHAR buffer[MAX_PATH]; + UNICODE_STRING regpath = {0, sizeof(buffer), buffer}; + static const WCHAR szPath[] = {'\\','m','a','p',0}; + + RtlCopyUnicodeString(&regpath, thread_args->registry_path); + RtlAppendUnicodeToString(&regpath, szPath); + InitializeObjectAttributes(&attr, &regpath, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL); + if (NtOpenKey(&key, KEY_ALL_ACCESS, &attr) == STATUS_SUCCESS) + { + DWORD index = 0; + CHAR *buffer = NULL; + DWORD buffer_len = 0; + LSTATUS rc; + + do { + CHAR name[255]; + DWORD name_len; + DWORD type; + DWORD data_len = buffer_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + if (rc == ERROR_MORE_DATA || buffer == NULL) + { + if (buffer) + buffer = HeapReAlloc(GetProcessHeap(), 0, buffer, data_len); + else + buffer = HeapAlloc(GetProcessHeap(), 0, data_len); + buffer_len = data_len; + + name_len = sizeof(name); + rc = RegEnumValueA(key, index, name, &name_len, NULL, &type, (LPBYTE)buffer, &data_len); + } + + if (rc == STATUS_SUCCESS) + { + TRACE("Setting mapping %s...\n",debugstr_an(buffer,29)); + pSDL_GameControllerAddMapping(buffer); + index ++; + } + } while (rc == STATUS_SUCCESS); + HeapFree(GetProcessHeap(), 0, buffer); + NtClose(key); + } + } + + SetEvent(thread_args->event); while (1) while (pSDL_WaitEvent(&event) != 0) @@ -926,6 +984,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ HANDLE events[2]; DWORD result; + thread_arguments args; TRACE("(%p, %s)\n", driver, debugstr_w(registry_path->Buffer)); if (sdl_handle == NULL) @@ -969,6 +1028,7 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ LOAD_FUNCPTR(SDL_HapticStopAll); LOAD_FUNCPTR(SDL_JoystickIsHaptic); LOAD_FUNCPTR(SDL_memset); + LOAD_FUNCPTR(SDL_GameControllerAddMapping); #undef LOAD_FUNCPTR pSDL_JoystickGetProduct = wine_dlsym(sdl_handle, "SDL_JoystickGetProduct", NULL, 0); pSDL_JoystickGetProductVersion = wine_dlsym(sdl_handle, "SDL_JoystickGetProductVersion", NULL, 0); @@ -983,7 +1043,9 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; - if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, events[0], 0, NULL))) + args.event = events[0]; + args.registry_path = registry_path; + if (!(events[1] = CreateThread(NULL, 0, deviceloop_thread, &args, 0, NULL))) { CloseHandle(events[0]); goto error;

1 0

Mark Jansen : wintrust: Verify image hash in WinVerifyTrust.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 93ed3356d892a6b7ade1694cb5e3a880f481eec7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93ed3356d892a6b7ade1694c… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Thu Mar 28 14:49:20 2019 +0100 wintrust: Verify image hash in WinVerifyTrust. Includes various improvements by Sebastian Lackner. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/softpub.c | 173 ++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 8 +- 2 files changed, 177 insertions(+), 4 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d65d2b6..1273a58 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -1,5 +1,6 @@ /* * Copyright 2007 Juan Lang + * Copyright 2016 Mark Jansen * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -21,6 +22,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "wintrust.h" #include "mssip.h" #include "softpub.h" @@ -208,6 +210,174 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file, return err; } +static BOOL hash_file_data( HANDLE file, DWORD start, DWORD end, HCRYPTHASH hash ) +{ + DWORD bytes_read, size = end - start; + DWORD buffer_size = min( size, 1024*1024 ); + BYTE *buffer = HeapAlloc( GetProcessHeap(), 0, buffer_size ); + + if (!buffer) return FALSE; + SetFilePointer( file, start, NULL, FILE_BEGIN ); + while (size) + { + if (!ReadFile( file, buffer, min( buffer_size, size ), &bytes_read, NULL )) break; + if (!bytes_read) break; + if (!CryptHashData( hash, buffer, bytes_read, 0 )) break; + size -= bytes_read; + } + HeapFree( GetProcessHeap(), 0, buffer ); + return !size; +} + +/* See https://www.cs.auckland.ac.nz/~pgut001/pubs/authenticode.txt + * for details about the hashing. + */ +static BOOL SOFTPUB_HashPEFile(HANDLE file, HCRYPTHASH hash) +{ + DWORD checksum, security_dir; + IMAGE_DOS_HEADER dos_header; + union + { + IMAGE_NT_HEADERS32 nt32; + IMAGE_NT_HEADERS64 nt64; + } nt_header; + IMAGE_DATA_DIRECTORY secdir; + LARGE_INTEGER file_size; + DWORD bytes_read; + BOOL ret; + + if (!GetFileSizeEx(file, &file_size)) + return FALSE; + + SetFilePointer(file, 0, NULL, FILE_BEGIN); + ret = ReadFile(file, &dos_header, sizeof(dos_header), &bytes_read, NULL); + if (!ret || bytes_read != sizeof(dos_header)) + return FALSE; + + if (dos_header.e_magic != IMAGE_DOS_SIGNATURE) + return FALSE; + if (dos_header.e_lfanew >= 256 * 1024 * 1024) /* see RtlImageNtHeaderEx */ + return FALSE; + if (dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader.MajorLinkerVersion) > file_size.QuadPart) + return FALSE; + + SetFilePointer(file, dos_header.e_lfanew, NULL, FILE_BEGIN); + ret = ReadFile(file, &nt_header, sizeof(nt_header), &bytes_read, NULL); + if (!ret || bytes_read < FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.Magic) + + sizeof(nt_header.nt32.OptionalHeader.Magic)) + return FALSE; + + if (nt_header.nt32.Signature != IMAGE_NT_SIGNATURE) + return FALSE; + + if (nt_header.nt32.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC) + { + if (bytes_read < sizeof(nt_header.nt32)) + return FALSE; + + checksum = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.CheckSum); + security_dir = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]); + secdir = nt_header.nt32.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]; + } + else if (nt_header.nt32.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC) + { + if (bytes_read < sizeof(nt_header.nt64)) + return FALSE; + + checksum = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader.CheckSum); + security_dir = dos_header.e_lfanew + FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]); + secdir = nt_header.nt64.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_SECURITY]; + } + else + return FALSE; + + if (secdir.VirtualAddress < security_dir + sizeof(IMAGE_DATA_DIRECTORY)) + return FALSE; + if (secdir.VirtualAddress > file_size.QuadPart) + return FALSE; + if (secdir.VirtualAddress + secdir.Size != file_size.QuadPart) + return FALSE; + + if (!hash_file_data( file, 0, checksum, hash )) return FALSE; + if (!hash_file_data( file, checksum + sizeof(DWORD), security_dir, hash )) return FALSE; + if (!hash_file_data( file, security_dir + sizeof(IMAGE_DATA_DIRECTORY), secdir.VirtualAddress, hash )) + return FALSE; + + return TRUE; +} + +static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) +{ + SPC_INDIRECT_DATA_CONTENT *indirect = (SPC_INDIRECT_DATA_CONTENT *)data->u.pPDSip->psIndirectData; + DWORD err, hash_size, length; + BYTE *hash_data; + BOOL release_prov = FALSE; + HCRYPTPROV prov = data->hProv; + HCRYPTHASH hash = 0; + ALG_ID algID; + + if (((ULONG_PTR)indirect->Data.pszObjId >> 16) == 0 || + strcmp(indirect->Data.pszObjId, SPC_PE_IMAGE_DATA_OBJID)) + { + FIXME("Cannot verify hash for pszObjId=%s\n", debugstr_a(indirect->Data.pszObjId)); + return ERROR_SUCCESS; + } + + if (!(algID = CertOIDToAlgId(indirect->DigestAlgorithm.pszObjId))) + return TRUST_E_SYSTEM_ERROR; /* FIXME */ + + if (!prov) + { + if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + return GetLastError(); + release_prov = TRUE; + } + + if (!CryptCreateHash(prov, algID, 0, 0, &hash)) + { + err = GetLastError(); + goto done; + } + + if (!SOFTPUB_HashPEFile(file, hash)) + { + err = TRUST_E_NOSIGNATURE; + goto done; + } + + length = sizeof(hash_size); + if (!CryptGetHashParam(hash, HP_HASHSIZE, (BYTE *)&hash_size, &length, 0)) + { + err = GetLastError(); + goto done; + } + + if (!(hash_data = data->psPfns->pfnAlloc(hash_size))) + { + err = ERROR_OUTOFMEMORY; + goto done; + } + + if (!CryptGetHashParam(hash, HP_HASHVAL, hash_data, &hash_size, 0)) + { + err = GetLastError(); + data->psPfns->pfnFree(hash_data); + goto done; + } + + err = (hash_size == indirect->Digest.cbData && + !memcmp(hash_data, indirect->Digest.pbData, hash_size)) ? S_OK : TRUST_E_BAD_DIGEST; + data->psPfns->pfnFree(hash_data); + +done: + if (hash) + CryptDestroyHash(hash); + if (release_prov) + CryptReleaseContext(prov, 0); + return err; +} + + static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data) { DWORD err = ERROR_SUCCESS; @@ -371,6 +541,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data) if (err) goto error; err = SOFTPUB_DecodeInnerContent(data); + if (err) + goto error; + err = SOFTPUB_VerifyImageHash(data, data->pWintrustData->u.pFile->hFile); error: if (err && data->fOpenedFile && data->pWintrustData->u.pFile) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 5d6d62c..914f04d 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1152,7 +1152,7 @@ static void test_wintrust_digest(void) { {{ SelfSignedFile32, sizeof(SelfSignedFile32) }, { Dummy, sizeof(Dummy) }}, - { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_NOSIGNATURE, FALSE }, { TRUST_E_NOSIGNATURE, FALSE } }, { {{ Dummy, sizeof(Dummy) }, @@ -1163,7 +1163,7 @@ static void test_wintrust_digest(void) {{ SelfSignedFile32, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile32 + 19 + sizeof(Dummy), sizeof(SelfSignedFile32) - 19 - sizeof(Dummy) }}, - { TRUST_E_BAD_DIGEST, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_BAD_DIGEST, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } }, { {{ SelfSignedFile32, sizeof(IMAGE_DOS_HEADER) }}, @@ -1182,7 +1182,7 @@ static void test_wintrust_digest(void) { {{ SelfSignedFile64, sizeof(SelfSignedFile64) }, { Dummy, sizeof(Dummy) }}, - { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_NOSIGNATURE, FALSE }, { TRUST_E_NOSIGNATURE, FALSE } }, { {{ Dummy, sizeof(Dummy) }, @@ -1193,7 +1193,7 @@ static void test_wintrust_digest(void) {{ SelfSignedFile64, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile64 + 19 + sizeof(Dummy), sizeof(SelfSignedFile64) - 19 - sizeof(Dummy) }}, - { TRUST_E_BAD_DIGEST, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + { TRUST_E_BAD_DIGEST, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } }, { {{ SelfSignedFile64, sizeof(IMAGE_DOS_HEADER) }},

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExInitializeResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1304b4c71b8a49d4cd76d7d4a11c64870cc17b0a URL: https://source.winehq.org/git/wine.git/?a=commit;h=1304b4c71b8a49d4cd76d7d4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:10 2019 -0500 ntoskrnl.exe: Implement ExInitializeResourceLite(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45819 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 --------- dlls/ntoskrnl.exe/sync.c | 10 ++++++++ include/ddk/wdm.h | 54 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 63 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index d570a61..41dd178 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2370,17 +2370,6 @@ void WINAPI ExFreePoolWithTag( void *ptr, ULONG tag ) HeapFree( GetProcessHeap(), 0, ptr ); } - -/*********************************************************************** - * ExInitializeResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExInitializeResourceLite(PERESOURCE Resource) -{ - FIXME( "stub: %p\n", Resource ); - return STATUS_NOT_IMPLEMENTED; -} - - /*********************************************************************** * ExInitializeNPagedLookasideList (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 12dacae..168c6d1 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -717,3 +717,13 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) if (count < 1) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } + +/*********************************************************************** + * ExInitializeResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + memset(resource, 0, sizeof(*resource)); + return STATUS_SUCCESS; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index e5804c0..a653621 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -153,12 +153,63 @@ typedef struct _KWAIT_BLOCK { USHORT WaitType; } KWAIT_BLOCK, *PKWAIT_BLOCK, *RESTRICTED_POINTER PRKWAIT_BLOCK; +typedef struct _OWNER_ENTRY +{ + ERESOURCE_THREAD OwnerThread; + union + { + struct + { + ULONG IoPriorityBoosted : 1; + ULONG OwnerReferenced : 1; + ULONG IoQoSPriorityBoosted : 1; + ULONG OwnerCount : 29; + }; + ULONG TableSize; + }; +} OWNER_ENTRY, *POWNER_ENTRY; + +#define ResourceNeverExclusive 0x0010 +#define ResourceReleaseByOtherThread 0x0020 +#define ResourceOwnedExclusive 0x0080 + +typedef struct _ERESOURCE +{ + LIST_ENTRY SystemResourcesList; + OWNER_ENTRY *OwnerTable; + SHORT ActiveCount; + union + { + USHORT Flag; + struct + { + UCHAR ReservedLowFlags; + UCHAR WaiterPriority; + }; + }; + KSEMAPHORE *SharedWaiters; + KEVENT *ExclusiveWaiters; + OWNER_ENTRY OwnerEntry; + ULONG ActiveEntries; + ULONG ContentionCount; + ULONG NumberOfSharedWaiters; + ULONG NumberOfExclusiveWaiters; +#ifdef _WIN64 + void *Reserved2; +#endif + union + { + void *Address; + ULONG_PTR CreatorBackTraceIndex; + }; + KSPIN_LOCK SpinLock; +} ERESOURCE, *PERESOURCE; + typedef struct _IO_TIMER *PIO_TIMER; typedef struct _IO_TIMER_ROUTINE *PIO_TIMER_ROUTINE; typedef struct _ETHREAD *PETHREAD; typedef struct _KTHREAD *PKTHREAD, *PRKTHREAD; typedef struct _EPROCESS *PEPROCESS; -typedef struct _ERESOURCE *PERESOURCE; typedef struct _IO_WORKITEM *PIO_WORKITEM; typedef struct _PAGED_LOOKASIDE_LIST *PPAGED_LOOKASIDE_LIST; typedef struct _OBJECT_TYPE *POBJECT_TYPE; @@ -1469,6 +1520,7 @@ void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT); +NTSTATUS WINAPI ExInitializeResourceLite(ERESOURCE*); PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireResourceExclusiveLite() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 257c56f5f34f80176337382b99b18f86d78dca09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=257c56f5f34f80176337382b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:11 2019 -0500 ntoskrnl.exe: Implement ExAcquireResourceExclusiveLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 ------ dlls/ntoskrnl.exe/sync.c | 71 ++++++++++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 41dd178..454d6f5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3356,15 +3356,6 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ } /*********************************************************************** - * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) - */ -BOOLEAN WINAPI ExAcquireResourceExclusiveLite( PERESOURCE resource, BOOLEAN wait ) -{ - FIXME( ":%p %u stub\n", resource, wait ); - return TRUE; -} - -/*********************************************************************** * ExDeleteResourceLite (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 168c6d1..0c8d02f 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -30,6 +30,7 @@ #include "ddk/wdm.h" #include "wine/debug.h" +#include "wine/heap.h" #include "ntoskrnl_private.h" @@ -718,6 +719,19 @@ void WINAPI ExReleaseFastMutexUnsafe( FAST_MUTEX *mutex ) KeSetEvent( &mutex->Event, IO_NO_INCREMENT, FALSE ); } +/* Use of the fields of an ERESOURCE structure seems to vary wildly between + * Windows versions. The below implementation uses them as follows: + * + * OwnerTable - contains a list of shared owners, including threads which do + * not currently own the resource + * OwnerTable[i].OwnerThread - shared owner TID + * OwnerTable[i].OwnerCount - recursion count of this shared owner (may be 0) + * OwnerEntry.OwnerThread - the owner TID if exclusively owned + * OwnerEntry.TableSize - the number of entries in OwnerTable, including threads + * which do not currently own the resource + * ActiveEntries - total number of acquisitions (incl. recursive ones) + */ + /*********************************************************************** * ExInitializeResourceLite (NTOSKRNL.EXE.@) */ @@ -727,3 +741,60 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) memset(resource, 0, sizeof(*resource)); return STATUS_SUCCESS; } + +/*********************************************************************** + * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireResourceExclusiveLite( ERESOURCE *resource, BOOLEAN wait ) +{ + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + /* In order to avoid a race between waiting for the ExclusiveWaiters event + * and grabbing the lock, do not grab the resource if it is unclaimed but + * has waiters; instead queue ourselves. */ + else if (!resource->ActiveEntries && !resource->NumberOfExclusiveWaiters && !resource->NumberOfSharedWaiters) + { + resource->Flag |= ResourceOwnedExclusive; + resource->OwnerEntry.OwnerThread = (ERESOURCE_THREAD)KeGetCurrentThread(); + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + else if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->ExclusiveWaiters) + { + resource->ExclusiveWaiters = heap_alloc( sizeof(*resource->ExclusiveWaiters) ); + KeInitializeEvent( resource->ExclusiveWaiters, SynchronizationEvent, FALSE ); + } + resource->NumberOfExclusiveWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->ExclusiveWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + resource->Flag |= ResourceOwnedExclusive; + resource->OwnerEntry.OwnerThread = (ERESOURCE_THREAD)KeGetCurrentThread(); + resource->ActiveEntries++; + resource->NumberOfExclusiveWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a653621..6991605 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1512,6 +1512,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); +BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireResourceSharedLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: dcfc7ab1659f864caaed815eded81419c8c43905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dcfc7ab1659f864caaed815e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:12 2019 -0500 ntoskrnl.exe: Implement ExAcquireResourceSharedLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 82 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 508f9e6..177800a 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -121,7 +121,7 @@ @ stdcall DbgQueryDebugFilterState(long long) @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) -@ stub ExAcquireResourceSharedLite +@ stdcall ExAcquireResourceSharedLite(ptr long) @ stub ExAcquireSharedStarveExclusive @ stub ExAcquireSharedWaitForExclusive @ stub ExAllocateFromPagedLookasideList diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 0c8d02f..82667e8 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include <limits.h> #include <stdarg.h> #include "ntstatus.h" @@ -742,6 +743,25 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) return STATUS_SUCCESS; } +/* Find an existing entry in the shared owner list, or create a new one. */ +static OWNER_ENTRY *resource_get_shared_entry( ERESOURCE *resource, ERESOURCE_THREAD thread ) +{ + ULONG i, count; + + for (i = 0; i < resource->OwnerEntry.TableSize; ++i) + { + if (resource->OwnerTable[i].OwnerThread == thread) + return &resource->OwnerTable[i]; + } + + count = ++resource->OwnerEntry.TableSize; + resource->OwnerTable = heap_realloc(resource->OwnerTable, count * sizeof(*resource->OwnerTable)); + resource->OwnerTable[count - 1].OwnerThread = thread; + resource->OwnerTable[count - 1].OwnerCount = 0; + + return &resource->OwnerTable[count - 1]; +} + /*********************************************************************** * ExAcquireResourceExclusiveLite (NTOSKRNL.EXE.@) */ @@ -798,3 +818,65 @@ BOOLEAN WINAPI ExAcquireResourceExclusiveLite( ERESOURCE *resource, BOOLEAN wait return TRUE; } + +/*********************************************************************** + * ExAcquireResourceSharedLite (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireResourceSharedLite( ERESOURCE *resource, BOOLEAN wait ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + /* We own the resource exclusively, so increase recursion. */ + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + } + else if (entry->OwnerCount || !resource->NumberOfExclusiveWaiters) + { + /* Either we already own the resource shared, or there are no exclusive + * owners or waiters, so we can grab it shared. */ + entry->OwnerCount++; + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + + if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->SharedWaiters) + { + resource->SharedWaiters = heap_alloc( sizeof(*resource->SharedWaiters) ); + KeInitializeSemaphore( resource->SharedWaiters, 0, INT_MAX ); + } + resource->NumberOfSharedWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->SharedWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry->OwnerCount++; + resource->ActiveEntries++; + resource->NumberOfSharedWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 6991605..a153942 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1513,6 +1513,7 @@ static inline void IoSetCompletionRoutine(IRP *irp, PIO_COMPLETION_ROUTINE routi NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); +BOOLEAN WINAPI ExAcquireResourceSharedLite(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExAcquireSharedStarveExclusive() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: f0499323d804afb3833ca3dd651cc42c38420aae URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0499323d804afb3833ca3dd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:13 2019 -0500 ntoskrnl.exe: Implement ExAcquireSharedStarveExclusive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 64 +++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 177800a..347febb 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -122,7 +122,7 @@ @ stub DbgSetDebugFilterState @ stdcall ExAcquireResourceExclusiveLite(ptr long) @ stdcall ExAcquireResourceSharedLite(ptr long) -@ stub ExAcquireSharedStarveExclusive +@ stdcall ExAcquireSharedStarveExclusive(ptr long) @ stub ExAcquireSharedWaitForExclusive @ stub ExAllocateFromPagedLookasideList @ stdcall ExAllocatePool(long long) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 82667e8..2b362ef 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -880,3 +880,67 @@ BOOLEAN WINAPI ExAcquireResourceSharedLite( ERESOURCE *resource, BOOLEAN wait ) return TRUE; } + +/*********************************************************************** + * ExAcquireSharedStarveExclusive (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI ExAcquireSharedStarveExclusive( ERESOURCE *resource, BOOLEAN wait ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, wait %u.\n", resource, wait); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry = resource_get_shared_entry( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == (ERESOURCE_THREAD)KeGetCurrentThread()) + { + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + } + /* We are starving exclusive waiters, but we cannot steal the resource out + * from under an exclusive waiter who is about to acquire it. (Because of + * locking, and because exclusive waiters are always waked first, this is + * guaranteed to be the case if the resource is unowned and there are + * exclusive waiters.) */ + else if (!(!resource->ActiveEntries && resource->NumberOfExclusiveWaiters)) + { + entry->OwnerCount++; + resource->ActiveEntries++; + KeReleaseSpinLock( &resource->SpinLock, irql ); + return TRUE; + } + + if (!wait) + { + KeReleaseSpinLock( &resource->SpinLock, irql ); + return FALSE; + } + + if (!resource->SharedWaiters) + { + resource->SharedWaiters = heap_alloc( sizeof(*resource->SharedWaiters) ); + KeInitializeSemaphore( resource->SharedWaiters, 0, INT_MAX ); + } + resource->NumberOfSharedWaiters++; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + KeWaitForSingleObject( resource->SharedWaiters, Executive, KernelMode, FALSE, NULL ); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + entry->OwnerCount++; + resource->ActiveEntries++; + resource->NumberOfSharedWaiters--; + + KeReleaseSpinLock( &resource->SpinLock, irql ); + + return TRUE; +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index a153942..8023fda 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1514,6 +1514,7 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG, ULONG); void WINAPI ExAcquireFastMutexUnsafe(PFAST_MUTEX); BOOLEAN WINAPI ExAcquireResourceExclusiveLite(ERESOURCE*,BOOLEAN); BOOLEAN WINAPI ExAcquireResourceSharedLite(ERESOURCE*,BOOLEAN); +BOOLEAN WINAPI ExAcquireSharedStarveExclusive(ERESOURCE*,BOOLEAN); PVOID WINAPI ExAllocatePool(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG);

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceForThreadLite() .
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 9dfa9f6b26d4d50d3b6f74bc2760ebbe0f8d0350 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9dfa9f6b26d4d50d3b6f74bc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:15 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceForThreadLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 ------ dlls/ntoskrnl.exe/sync.c | 60 ++++++++++++++++++++++++++++++++++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 61 insertions(+), 8 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 454d6f5..2d8bdb5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3365,14 +3365,6 @@ NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) } /*********************************************************************** - * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) - */ -void WINAPI ExReleaseResourceForThreadLite( PERESOURCE resource, ERESOURCE_THREAD tid ) -{ - FIXME( "stub: %p %lu\n", resource, tid ); -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index e89fddc..88c9ea7 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1006,3 +1006,63 @@ BOOLEAN WINAPI ExAcquireSharedWaitForExclusive( ERESOURCE *resource, BOOLEAN wai return TRUE; } + +/*********************************************************************** + * ExReleaseResourceForThreadLite (NTOSKRNL.EXE.@) + */ +void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREAD thread ) +{ + OWNER_ENTRY *entry; + KIRQL irql; + + TRACE("resource %p, thread %#lx.\n", resource, thread); + + KeAcquireSpinLock( &resource->SpinLock, &irql ); + + if (resource->Flag & ResourceOwnedExclusive) + { + if (resource->OwnerEntry.OwnerThread == thread) + { + if (!--resource->ActiveEntries) + { + resource->OwnerEntry.OwnerThread = 0; + resource->Flag &= ~ResourceOwnedExclusive; + } + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is exclusively owned by %#lx.\n", + resource, thread, resource->OwnerEntry.OwnerThread); + return; + } + } + else + { + entry = resource_get_shared_entry( resource, thread ); + if (entry->OwnerCount) + { + entry->OwnerCount--; + resource->ActiveEntries--; + } + else + { + ERR("Trying to release %p for thread %#lx, but resource is not owned by that thread.\n", resource, thread); + return; + } + } + + if (!resource->ActiveEntries) + { + if (resource->NumberOfExclusiveWaiters) + { + KeSetEvent( resource->ExclusiveWaiters, IO_NO_INCREMENT, FALSE ); + } + else if (resource->NumberOfSharedWaiters) + { + KeReleaseSemaphore( resource->SharedWaiters, IO_NO_INCREMENT, + resource->NumberOfSharedWaiters, FALSE ); + } + } + + KeReleaseSpinLock( &resource->SpinLock, irql ); +} diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 4609790..1a3f6bb 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1529,6 +1529,7 @@ PSLIST_ENTRY WINAPI ExInterlockedPopEntrySList(PSLIST_HEADER,PKSPIN_LOCK); PSLIST_ENTRY WINAPI ExInterlockedPushEntrySList(PSLIST_HEADER,PSLIST_ENTRY,PKSPIN_LOCK); LIST_ENTRY * WINAPI ExInterlockedRemoveHeadList(LIST_ENTRY*,KSPIN_LOCK*); void WINAPI ExReleaseFastMutexUnsafe(PFAST_MUTEX); +void WINAPI ExReleaseResourceForThreadLite(ERESOURCE*,ERESOURCE_THREAD); ULONG WINAPI ExSetTimerResolution(ULONG,BOOLEAN); void WINAPI IoAcquireCancelSpinLock(KIRQL*);

1 0

Akihiro Sagawa : gdi32/tests: Add tests for GetCharWidthInfo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: eca601d7bb5d0f5d8c667a6eb1ceb89745b4d804 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eca601d7bb5d0f5d8c667a6e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:33:00 2019 +0100 gdi32/tests: Add tests for GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 67e8941..245fb4d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -48,6 +48,7 @@ static BOOL (WINAPI *pGetCharABCWidthsW)(HDC hdc, UINT first, UINT last, LPABC static BOOL (WINAPI *pGetCharABCWidthsFloatW)(HDC hdc, UINT first, UINT last, LPABCFLOAT abc); static BOOL (WINAPI *pGetCharWidth32A)(HDC hdc, UINT first, UINT last, LPINT buffer); static BOOL (WINAPI *pGetCharWidth32W)(HDC hdc, UINT first, UINT last, LPINT buffer); +static BOOL (WINAPI *pGetCharWidthInfo)(HDC hdc, void *); static DWORD (WINAPI *pGetFontUnicodeRanges)(HDC hdc, LPGLYPHSET lpgs); static DWORD (WINAPI *pGetGlyphIndicesA)(HDC hdc, LPCSTR lpstr, INT count, LPWORD pgi, DWORD flags); static DWORD (WINAPI *pGetGlyphIndicesW)(HDC hdc, LPCWSTR lpstr, INT count, LPWORD pgi, DWORD flags); @@ -94,6 +95,7 @@ static void init(void) pGetCharABCWidthsFloatW = (void *)GetProcAddress(hgdi32, "GetCharABCWidthsFloatW"); pGetCharWidth32A = (void *)GetProcAddress(hgdi32, "GetCharWidth32A"); pGetCharWidth32W = (void *)GetProcAddress(hgdi32, "GetCharWidth32W"); + pGetCharWidthInfo = (void *)GetProcAddress(hgdi32, "GetCharWidthInfo"); pGetFontUnicodeRanges = (void *)GetProcAddress(hgdi32, "GetFontUnicodeRanges"); pGetGlyphIndicesA = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesA"); pGetGlyphIndicesW = (void *)GetProcAddress(hgdi32, "GetGlyphIndicesW"); @@ -7004,6 +7006,189 @@ static void test_long_names(void) ReleaseDC(NULL, dc); } +typedef struct +{ + USHORT majorVersion; + USHORT minorVersion; + SHORT ascender; + SHORT descender; + SHORT lineGap; + USHORT advanceWidthMax; + SHORT minLeftSideBearing; + SHORT minRightSideBearing; + SHORT xMaxExtent; + SHORT caretSlopeRise; + SHORT caretSlopeRun; + SHORT caretOffset; + SHORT reserved[4]; + SHORT metricDataFormat; + SHORT numberOfHMetrics; +} TT_Hori_Header; + +static void test_GetCharWidthInfo(void) +{ + HDC hdc; + HFONT hfont, hfont_prev; + LOGFONTA lf; + BOOL r; + DWORD ret, i; + OUTLINETEXTMETRICA otm; + TT_Hori_Header hhea; + struct char_width_info + { + INT lsb, rsb, unk; + } info, info2; + SHORT minLeftSideBearing, minRightSideBearing; + POINT pt[2]; + const char* face_list[] = { "Symbol", "Ume Gothic", "MS Gothic" }; + + if (!pGetCharWidthInfo) + { + win_skip("GetCharWidthInfo is unavailable\n"); + return; + } + + hdc = GetDC(NULL); + + /* test default (System) font */ + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + if (r) /* win10 1803 succeeds */ + { + ok(info.lsb == 0, "expected 0, got %d\n", info.lsb); + ok(info.rsb == 0, "expected 0, got %d\n", info.rsb); + ok(info.unk == 0, "expected 0, got %d\n", info.unk); + } + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetOutlineTextMetricsA(hdc, sizeof(otm), &otm); + ok(ret != 0, "GetOutlineTextMetricsA failed\n"); + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* test Tahoma at the em square size */ + lf.lfHeight = -(int)otm.otmEMSquare; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + ret = GetFontData(hdc, MS_MAKE_TAG('h','h','e','a'), 0, &hhea, sizeof(hhea)); + ok(ret == sizeof(hhea), "got %u\n", ret); + minLeftSideBearing = GET_BE_WORD(hhea.minLeftSideBearing); + minRightSideBearing = GET_BE_WORD(hhea.minRightSideBearing); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "GetCharWidthInfo failed\n"); + ok(info.lsb == minLeftSideBearing, "expected %d, got %d\n", minLeftSideBearing, info.lsb); + ok(info.rsb == minRightSideBearing, "expected %d, got %d\n", minRightSideBearing, info.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + + /* these values are scaled, try with smaller size */ + lf.lfHeight /= 3; + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "pGetCharWidthInfo failed\n"); + ok(info2.lsb == info.lsb/3, "expected %d, got %d\n", info.lsb/3, info2.lsb); + ok(info2.rsb == info.rsb/3, "expected %d, got %d\n", info.rsb/3, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with another mapping mode */ + hdc = GetDC(NULL); + SetMapMode(hdc, MM_ISOTROPIC); + SetWindowExtEx(hdc, 2, 2, NULL); + SetViewportExtEx(hdc, 1, 1, NULL); + + memset(pt, 0, sizeof(pt)); + pt[0].y = otm.otmEMSquare; + DPtoLP(hdc, pt, 1); + + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfCharSet = ANSI_CHARSET; + lf.lfHeight = -abs(pt[0].y); + strcpy(lf.lfFaceName, "Tahoma"); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "SelectObject failed\n"); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "GetCharWidthInfo failed\n"); + pt[0].x = info.lsb; pt[0].y = 0; + pt[1].x = info.rsb; pt[1].y = 0; + DPtoLP(hdc, pt, 2); + ok(pt[0].x == info2.lsb, "expected %d, got %d\n", pt[0].x, info2.lsb); + ok(pt[1].x == info2.rsb, "expected %d, got %d\n", pt[1].x, info2.rsb); + + DeleteObject(SelectObject(hdc, hfont_prev)); + ReleaseDC(NULL, hdc); + + /* test with synthetic fonts */ + hdc = GetDC(NULL); + for (i = 0; i < ARRAY_SIZE(face_list); i++) + { + const char* face = face_list[i]; + if (!is_truetype_font_installed(face)) + { + skip("%s is not installed\n", face); + continue; + } + memset(&lf, 0, sizeof(lf)); + lf.lfWeight = FW_NORMAL; + lf.lfItalic = FALSE; + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfHeight = -256; + strcpy(lf.lfFaceName, face); + hfont = CreateFontIndirectA(&lf); + hfont_prev = SelectObject(hdc, hfont); + + memset(&info, 0xaa, sizeof(info)); + r = pGetCharWidthInfo(hdc, &info); + ok(r, "%s: GetCharWidthInfo failed\n", face); + + /* test with synthetic bold */ + lf.lfWeight = FW_BOLD; + lf.lfItalic = FALSE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + ok(info.lsb == info2.lsb, "%s: expected %d, got %d\n", face, info.lsb, info2.lsb); + ok(info.rsb == info2.rsb, "%s: expected %d, got %d\n", face, info.rsb, info2.rsb); + + /* test with synthetic italic */ + lf.lfWeight = FW_NORMAL; + lf.lfItalic = TRUE; + hfont = CreateFontIndirectA(&lf); + DeleteObject(SelectObject(hdc, hfont)); + + memset(&info2, 0xaa, sizeof(info2)); + r = pGetCharWidthInfo(hdc, &info2); + ok(r, "%s: GetCharWidthInfo failed\n", face); + todo_wine ok(info.lsb > info2.lsb, "%s: expected less than %d, got %d\n", face, info.lsb, info2.lsb); + todo_wine ok(info.rsb > info2.rsb, "%s: expected less than %d, got %d\n", face, info.rsb, info2.rsb); + DeleteObject(SelectObject(hdc, hfont_prev)); + } + + ReleaseDC(NULL, hdc); +} + START_TEST(font) { static const char *test_names[] = @@ -7072,6 +7257,7 @@ START_TEST(font) test_GetTextMetrics2("Arial", -55); test_GetTextMetrics2("Arial", -110); test_GetCharacterPlacement(); + test_GetCharWidthInfo(); test_CreateFontIndirect(); test_CreateFontIndirectEx(); test_oemcharset();

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExDeleteResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5698bb29a3e038a7480de3c040abcb0d87cfcfe0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5698bb29a3e038a7480de3c0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:17 2019 -0500 ntoskrnl.exe: Implement ExDeleteResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 --------- dlls/ntoskrnl.exe/sync.c | 12 ++++++++++++ include/ddk/wdm.h | 1 + 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 06ec176..acb204d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3356,15 +3356,6 @@ NTSTATUS WINAPI IoCsqInitialize(PIO_CSQ csq, PIO_CSQ_INSERT_IRP insert_irp, PIO_ } /*********************************************************************** - * ExDeleteResourceLite (NTOSKRNL.EXE.@) - */ -NTSTATUS WINAPI ExDeleteResourceLite(PERESOURCE resource) -{ - FIXME("(%p): stub\n", resource); - return STATUS_NOT_IMPLEMENTED; -} - -/*********************************************************************** * KeEnterCriticalRegion (NTOSKRNL.EXE.@) */ void WINAPI KeEnterCriticalRegion(void) diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 2ea2e61..c8cae7d 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -743,6 +743,18 @@ NTSTATUS WINAPI ExInitializeResourceLite( ERESOURCE *resource ) return STATUS_SUCCESS; } +/*********************************************************************** + * ExDeleteResourceLite (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI ExDeleteResourceLite( ERESOURCE *resource ) +{ + TRACE("resource %p.\n", resource); + heap_free(resource->OwnerTable); + heap_free(resource->ExclusiveWaiters); + heap_free(resource->SharedWaiters); + return STATUS_SUCCESS; +} + /* Find an existing entry in the shared owner list, or create a new one. */ static OWNER_ENTRY *resource_get_shared_entry( ERESOURCE *resource, ERESOURCE_THREAD thread ) { diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 1a3f6bb..41c462f 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1521,6 +1521,7 @@ PVOID WINAPI ExAllocatePoolWithQuota(POOL_TYPE,SIZE_T); PVOID WINAPI ExAllocatePoolWithTag(POOL_TYPE,SIZE_T,ULONG); PVOID WINAPI ExAllocatePoolWithQuotaTag(POOL_TYPE,SIZE_T,ULONG); void WINAPI ExDeleteNPagedLookasideList(PNPAGED_LOOKASIDE_LIST); +NTSTATUS WINAPI ExDeleteResourceLite(ERESOURCE*); void WINAPI ExFreePool(PVOID); void WINAPI ExFreePoolWithTag(PVOID,ULONG); void WINAPI ExInitializeNPagedLookasideList(PNPAGED_LOOKASIDE_LIST,PALLOCATE_FUNCTION,PFREE_FUNCTION,ULONG,SIZE_T,ULONG,USHORT);

1 0

Nikolay Sivov : mfreadwrite: Keep media stream id for event matching.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 2d834c472d1659120a57af77d16e7f0375bd53a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d834c472d1659120a57af77… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:08 2019 +0300 mfreadwrite: Keep media stream id for event matching. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 78d96e4..e41bdf6 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -75,6 +75,7 @@ HRESULT WINAPI DllUnregisterServer(void) struct media_stream { IMFMediaType *current; + DWORD id; }; typedef struct source_reader @@ -644,6 +645,9 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(object->descriptor, i, &selected, &sd))) break; + if (FAILED(hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &object->streams[i].id))) + WARN("Failed to get stream identifier, hr %#x.\n", hr); + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); IMFStreamDescriptor_Release(sd); if (FAILED(hr))

1 0

Akihiro Sagawa : gdi32: Implement GetCharWidthInfo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1128587fd262f9ad476b49e7837ac74dd656e6ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=1128587fd262f9ad476b49e7… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Tue Apr 9 10:32:59 2019 +0100 gdi32: Implement GetCharWidthInfo(). Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dc.c | 2 ++ dlls/gdi32/driver.c | 6 ++++++ dlls/gdi32/enhmfdrv/dc.c | 1 + dlls/gdi32/enhmfdrv/init.c | 1 + dlls/gdi32/font.c | 24 ++++++++++++++++++++++++ dlls/gdi32/freetype.c | 35 +++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi32.spec | 2 +- dlls/gdi32/gdi_private.h | 8 ++++++++ dlls/gdi32/mfdrv/init.c | 1 + dlls/gdi32/path.c | 1 + dlls/wineandroid.drv/init.c | 1 + dlls/winemac.drv/gdi.c | 1 + dlls/wineps.drv/init.c | 1 + dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/xrender.c | 1 + include/wine/gdi_driver.h | 3 ++- 16 files changed, 87 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1128587fd262f9ad476b…

1 0

Zebediah Figura : ntoskrnl.exe: Implement ExReleaseResourceLite().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: aeed70689cee9b0da5912d79ea0a84d66879e256 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aeed70689cee9b0da5912d79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 22:30:16 2019 -0500 ntoskrnl.exe: Implement ExReleaseResourceLite(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 8 -------- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/sync.c | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2d8bdb5..06ec176 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -4225,14 +4225,6 @@ NTSTATUS WINAPI DbgQueryDebugFilterState(ULONG component, ULONG level) } /********************************************************************* - * ExReleaseResourceLite (NTOSKRNL.@) - */ -void WINAPI ExReleaseResourceLite(PERESOURCE resource) -{ - FIXME("stub: %p\n", resource); -} - -/********************************************************************* * PsGetProcessWow64Process (NTOSKRNL.@) */ PVOID WINAPI PsGetProcessWow64Process(PEPROCESS process) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index ee26d8b..2d1c826 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -9,7 +9,7 @@ @ stdcall -fastcall -arch=i386 ExInterlockedPushEntrySList (ptr ptr ptr) NTOSKRNL_ExInterlockedPushEntrySList @ stub ExReInitializeRundownProtection @ stdcall -fastcall ExReleaseFastMutexUnsafe(ptr) -@ stdcall ExReleaseResourceLite(ptr) +@ stdcall -fastcall ExReleaseResourceLite(ptr) @ stub ExReleaseRundownProtection @ stub ExReleaseRundownProtectionEx @ stub ExRundownCompleted diff --git a/dlls/ntoskrnl.exe/sync.c b/dlls/ntoskrnl.exe/sync.c index 88c9ea7..2ea2e61 100644 --- a/dlls/ntoskrnl.exe/sync.c +++ b/dlls/ntoskrnl.exe/sync.c @@ -1066,3 +1066,12 @@ void WINAPI ExReleaseResourceForThreadLite( ERESOURCE *resource, ERESOURCE_THREA KeReleaseSpinLock( &resource->SpinLock, irql ); } + +/*********************************************************************** + * ExReleaseResourceLite (NTOSKRNL.EXE.@) + */ +DEFINE_FASTCALL1_WRAPPER( ExReleaseResourceLite ) +void WINAPI ExReleaseResourceLite( ERESOURCE *resource ) +{ + ExReleaseResourceForThreadLite( resource, (ERESOURCE_THREAD)KeGetCurrentThread() ); +}

1 0

Zebediah Figura : qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5f32efcf19a1b3650ee8b3bff0b4b772771ea0cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f32efcf19a1b3650ee8b3bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:34 2019 -0500 qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 2d2d4c7..0ee2e1b 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -330,6 +330,89 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, return 0; } +static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI property_bag_AddRef(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 2; +} + +static ULONG WINAPI property_bag_Release(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static BSTR ppb_handler; +static unsigned int ppb_got_read; + +static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) +{ + ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + ok(!log, "Got unexpected error log %p.\n", log); + V_BSTR(var) = SysAllocString(ppb_handler); + ppb_got_read++; + return S_OK; +} + +static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, VARIANT *var) +{ + ok(0, "Unexpected call (name %s).\n", wine_dbgstr_w(name)); + return E_FAIL; +} + +static const IPropertyBagVtbl property_bag_vtbl = +{ + property_bag_QueryInterface, + property_bag_AddRef, + property_bag_Release, + property_bag_Read, + property_bag_Write, +}; + +static void test_property_bag(IMoniker *mon) +{ + IPropertyBag property_bag = {&property_bag_vtbl}; + IPropertyBag *devenum_bag; + IPersistPropertyBag *ppb; + VARIANT var; + HRESULT hr; + ULONG ref; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&devenum_bag); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(devenum_bag, fcchandlerW, &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ppb_handler = V_BSTR(&var); + + hr = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPersistPropertyBag_InitNew(ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ppb_got_read = 0; + hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); + + ref = IPersistPropertyBag_Release(ppb); + ok(!ref, "Got unexpected refcount %d.\n", ref); + + VariantClear(&var); + IPropertyBag_Release(devenum_bag); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -373,8 +456,11 @@ START_TEST(avico) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); } - CoTaskMemFree(name); + if (!memcmp(name, test_display_name, 11 * sizeof(WCHAR))) + test_property_bag(mon); + + CoTaskMemFree(name); IMoniker_Release(mon); }

1 0

Zebediah Figura : qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 9e6e2ee8d9305cd86dfb402cf5b06da2043f6f02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e6e2ee8d9305cd86dfb402c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:35 2019 -0500 qcap/avico: Initialize variant type to VT_BSTR in AVICompressorPropertyBag_Load(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 2 +- dlls/qcap/tests/avico.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index d5020a0..3351b36 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -323,7 +323,7 @@ static HRESULT WINAPI AVICompressorPropertyBag_Load(IPersistPropertyBag *iface, TRACE("(%p)->(%p %p)\n", This, pPropBag, pErrorLog); - V_VT(&v) = VT_EMPTY; + V_VT(&v) = VT_BSTR; hres = IPropertyBag_Read(pPropBag, fcc_handlerW, &v, NULL); if(FAILED(hres)) { WARN("Could not read FccHandler: %08x\n", hres); diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 0ee2e1b..9ef66b9 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -355,7 +355,7 @@ static unsigned int ppb_got_read; static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) { ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); - todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); ok(!log, "Got unexpected error log %p.\n", log); V_BSTR(var) = SysAllocString(ppb_handler); ppb_got_read++; @@ -403,7 +403,7 @@ static void test_property_bag(IMoniker *mon) ppb_got_read = 0; hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); ref = IPersistPropertyBag_Release(ppb);

1 0

Zebediah Figura : qcap/tests: Get rid of test_AviCo().
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 28bdddcc2b1e5ec7218eb6a71c7d575b708c6bd9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bdddcc2b1e5ec7218eb6a7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:36 2019 -0500 qcap/tests: Get rid of test_AviCo(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/qcap.c | 137 ------------------------------------------------- 1 file changed, 137 deletions(-) diff --git a/dlls/qcap/tests/qcap.c b/dlls/qcap/tests/qcap.c index 20ab2e9..a250139 100644 --- a/dlls/qcap/tests/qcap.c +++ b/dlls/qcap/tests/qcap.c @@ -59,7 +59,6 @@ DEFINE_EXPECT(ReceiveConnection); DEFINE_EXPECT(GetAllocatorRequirements); DEFINE_EXPECT(NotifyAllocator); DEFINE_EXPECT(Reconnect); -DEFINE_EXPECT(Read_FccHandler); DEFINE_EXPECT(MediaSeeking_GetPositions); DEFINE_EXPECT(MemAllocator_GetProperties); DEFINE_EXPECT(MemInputPin_QueryInterface_IStream); @@ -74,28 +73,6 @@ DEFINE_EXPECT(MediaSample_GetActualDataLength); DEFINE_EXPECT(MediaSample_GetSize); DEFINE_EXPECT(MediaSample_GetMediaTime); -static int strcmp_wa(LPCWSTR strw, const char *stra) -{ - CHAR buf[512]; - WideCharToMultiByte(CP_ACP, 0, strw, -1, buf, sizeof(buf), NULL, NULL); - return lstrcmpA(stra, buf); -} - -static BSTR a2bstr(const char *str) -{ - BSTR ret; - int len; - - if(!str) - return NULL; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = SysAllocStringLen(NULL, len-1); - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - - return ret; -} - typedef enum { SOURCE_FILTER, SINK_FILTER, @@ -1737,119 +1714,6 @@ static void test_AviMux(char *arg) ok(ref == 0, "IStream was not destroyed (%d)\n", ref); } -static HRESULT WINAPI PropertyBag_QueryInterface(IPropertyBag *iface, REFIID riid, void **ppv) -{ - if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IPropertyBag, riid)) { - *ppv = iface; - return S_OK; - } - - ok(0, "unexpected call %s\n", wine_dbgstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; -} - -static ULONG WINAPI PropertyBag_AddRef(IPropertyBag *iface) -{ - return 2; -} - -static ULONG WINAPI PropertyBag_Release(IPropertyBag *iface) -{ - return 1; -} - -static HRESULT WINAPI PropertyBag_Read(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar, IErrorLog *pErrorLog) -{ - ok(!pErrorLog, "pErrorLog = %p\n", pErrorLog); - - if(!strcmp_wa(pszPropName, "FccHandler")) { - CHECK_EXPECT(Read_FccHandler); - V_VT(pVar) = VT_BSTR; - V_BSTR(pVar) = a2bstr("mrle"); - return S_OK; - } - - ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); - return E_NOTIMPL; -} - -static HRESULT WINAPI PropertyBag_Write(IPropertyBag *iface, LPCOLESTR pszPropName, VARIANT *pVar) -{ - ok(0, "unexpected call: %s\n", wine_dbgstr_w(pszPropName)); - return E_NOTIMPL; -} - -static const IPropertyBagVtbl PropertyBagVtbl = { - PropertyBag_QueryInterface, - PropertyBag_AddRef, - PropertyBag_Release, - PropertyBag_Read, - PropertyBag_Write -}; - -static IPropertyBag PropertyBag = { &PropertyBagVtbl }; - -static void test_AviCo(void) -{ - IPersistPropertyBag *persist_bag; - IPin *pin, *in_pin, *out_pin; - IEnumPins *enum_pins; - IBaseFilter *avico; - PIN_INFO pin_info; - HRESULT hres; - - static const WCHAR inputW[] = {'I','n','p','u','t',0}; - static const WCHAR outputW[] = {'O','u','t','p','u','t',0}; - - hres = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void**)&avico); - if(hres == REGDB_E_CLASSNOTREG || hres == CLASS_E_CLASSNOTAVAILABLE) { - win_skip("CLSID_AVICo not registered/available\n"); - return; - } - ok(hres == S_OK, "Could not create CLSID_AVICo class: %08x\n", hres); - - hres = IBaseFilter_QueryInterface(avico, &IID_IPin, (void**)&pin); - ok(hres == E_NOINTERFACE, "QueryInterface(IID_IPin) returned: %08x\n", hres); - - hres = IBaseFilter_QueryInterface(avico, &IID_IPersistPropertyBag, (void**)&persist_bag); - ok(hres == S_OK, "QueryInterface(IID_IPersistPropertyBag) returned: %08x\n", hres); - - SET_EXPECT(Read_FccHandler); - hres = IPersistPropertyBag_Load(persist_bag, &PropertyBag, NULL); - ok(hres == S_OK, "Load failed: %08x\n", hres); - CHECK_CALLED(Read_FccHandler); - - IPersistPropertyBag_Release(persist_bag); - - hres = IBaseFilter_EnumPins(avico, &enum_pins); - ok(hres == S_OK, "EnumPins failed: %08x\n", hres); - - hres = IEnumPins_Next(enum_pins, 1, &in_pin, NULL); - ok(hres == S_OK, "Next failed: %08x\n", hres); - - hres = IPin_QueryPinInfo(in_pin, &pin_info); - ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); - ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); - ok(pin_info.dir == PINDIR_INPUT, "pin_info.dir = %d\n", pin_info.dir); - todo_wine ok(!lstrcmpW(pin_info.achName, inputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); - - hres = IEnumPins_Next(enum_pins, 1, &out_pin, NULL); - ok(hres == S_OK, "Next failed: %08x\n", hres); - - hres = IPin_QueryPinInfo(out_pin, &pin_info); - ok(hres == S_OK, "QueryPinInfo failed: %08x\n", hres); - ok(pin_info.pFilter == avico, "pin_info.pFilter != avico\n"); - ok(pin_info.dir == PINDIR_OUTPUT, "pin_info.dir = %d\n", pin_info.dir); - todo_wine ok(!lstrcmpW(pin_info.achName, outputW), "pin_info.achName = %s\n", wine_dbgstr_w(pin_info.achName)); - - IEnumPins_Release(enum_pins); - - IPin_Release(in_pin); - IPin_Release(out_pin); - IBaseFilter_Release(avico); -} - /* Outer IUnknown for COM aggregation tests */ struct unk_impl { IUnknown IUnknown_iface; @@ -2005,7 +1869,6 @@ START_TEST(qcap) test_AviMux_QueryInterface(); test_AviMux(arg_c>2 ? arg_v[2] : NULL); - test_AviCo(); test_COM_vfwcapture(); CoUninitialize();

1 0

Piotr Caban : gdi32: Don't use strcasecmp.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 541c8d271e8f493a648b637d0d4aae16c27d05fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=541c8d271e8f493a648b637d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:23 2019 +0200 gdi32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3e4a876..352a866 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2875,7 +2875,7 @@ static void load_fontconfig_fonts(void) len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; - if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) + if(_strnicmp(ext, "pfa", -1) && _strnicmp(ext, "pfb", -1)) AddFontToList(file, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); }

1 0

Alexandre Julliard : makefiles: Store resource files in a separate array.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 5edcae420aaf3972f669a16d17f62ca9e82f97e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5edcae420aaf3972f669a16d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:52:43 2019 +0200 makefiles: Store resource files in a separate array. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 307b7a3..20fec7f 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -205,6 +205,7 @@ struct makefile struct strarray uninstall_files; struct strarray object_files; struct strarray crossobj_files; + struct strarray res_files; struct strarray c2man_files; struct strarray dlldata_files; struct strarray implib_objs; @@ -2567,8 +2568,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c unsigned int i; if (source->file->flags & FLAG_GENERATED) strarray_add( &make->clean_files, source->name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -o $@", tools_path( make, "wrc" ) ); if (make->is_win16) output_filename( "-m16" ); @@ -2622,8 +2622,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c { unsigned int i; - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); strarray_add( &make->clean_files, strmake( "%s.pot", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), source->filename ); output( "\t%s -U -O res -o $@ %s", tools_path( make, "wmc" ), source->filename ); @@ -2652,8 +2651,7 @@ static void output_source_mc( struct makefile *make, struct incl_file *source, c */ static void output_source_res( struct makefile *make, struct incl_file *source, const char *obj ) { - strarray_add( &make->object_files, source->name ); - if (crosstarget) strarray_add( &make->crossobj_files, source->name ); + strarray_add( &make->res_files, source->name ); } @@ -2883,8 +2881,7 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, obj_name = strmake( "%s%s", obj_dir_path( make, obj ), crosstarget ? ".cross.o" : ".o" ); strarray_add( &make->clean_files, dll_name ); - strarray_add( &make->object_files, strmake( "%s.res", obj )); - if (crosstarget) strarray_add( &make->crossobj_files, strmake( "%s.res", obj )); + strarray_add( &make->res_files, strmake( "%s.res", obj )); output( "%s.res: %s\n", obj_dir_path( make, obj ), obj_dir_path( make, dll_name )); output( "\techo \"%s.dll TESTDLL \\\"%s\\\"\" | %s -o $@\n", obj, obj_dir_path( make, dll_name ), tools_path( make, "wrc" )); @@ -3101,6 +3098,7 @@ static void output_module( struct makefile *make ) } if (spec_file) output_filename( spec_file ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3113,6 +3111,7 @@ static void output_module( struct makefile *make ) } else output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3260,6 +3259,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); @@ -3269,11 +3269,13 @@ static void output_test_module( struct makefile *make ) output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s %s%s:", obj_dir_path( make, testmodule ), ext, obj_dir_path( make, stripped ), ext ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); + output_filenames_obj_dir( make, make->res_files ); output_filenames( dep_libs ); output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); @@ -3621,7 +3623,7 @@ static void output_sources( struct makefile *make ) if (top_makefile->submakes[i]->testdll && !top_makefile->submakes[i]->disabled) strarray_add( &tests, top_makefile->submakes[i]->testdll ); for (i = 0; i < tests.count; i++) - strarray_add( &make->object_files, replace_extension( tests.str[i], ".dll", "_test.res" )); + strarray_add( &make->res_files, replace_extension( tests.str[i], ".dll", "_test.res" )); } if (make->dlldata_files.count) @@ -3674,7 +3676,8 @@ static void output_sources( struct makefile *make ) } strarray_addall( &make->clean_files, make->object_files ); - strarray_addall_uniq( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->crossobj_files ); + strarray_addall( &make->clean_files, make->res_files ); strarray_addall( &make->clean_files, make->all_targets ); strarray_addall( &make->clean_files, make->extra_targets );

1 0

Alexandre Julliard : makefiles: Add a helper to generate a winegcc command line.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: cc7c6a734b76a33d2696c49236fd4626ff6d9077 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc7c6a734b76a33d2696c492… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 09:34:05 2019 +0200 makefiles: Add a helper to generate a winegcc command line. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 59 ++++++++++++++++++++++++++++++--------------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 1a21b3d..3f09f3b 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2224,6 +2224,28 @@ static struct strarray get_shared_lib_names( const char *libname ) /******************************************************************* + * output_winegcc_command + */ +static void output_winegcc_command( struct makefile *make, int cross ) +{ + output( "\t%s -o $@", tools_path( make, "winegcc" )); + output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); + if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); + if (cross) + { + output_filename( "-b" ); + output_filename( crosstarget ); + output_filename( "--lib-suffix=.cross.a" ); + } + else + { + output_filenames( target_flags ); + output_filenames( unwind_flags ); + } +} + + +/******************************************************************* * output_symlink_rule * * Output a rule to create a symlink. @@ -2870,11 +2892,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -2903,10 +2922,8 @@ static void output_source_spec( struct makefile *make, struct incl_file *source, output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); + output_filename( "-s" ); output_filenames( dll_flags ); output_filename( "-shared" ); output_filename( source->filename ); @@ -3107,11 +3124,7 @@ static void output_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); if (spec_file) { output( " -shared %s", spec_file ); @@ -3262,22 +3275,15 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->all_targets, strmake( "%s%s", testmodule, dll_ext )); strarray_add( &make->clean_files, strmake( "%s%s", stripped, dll_ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), dll_ext ); - output( "\t%s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" ); output( "\n" ); output( "%s%s:\n", obj_dir_path( make, stripped ), dll_ext ); - output( "\t%s -s -o $@", tools_path( make, "winegcc" )); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filenames( target_flags ); - output_filenames( unwind_flags ); + output_winegcc_command( make, 0 ); + output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); output_filenames( make->appmode ); output_filenames_obj_dir( make, make->object_files ); @@ -3314,10 +3320,7 @@ static void output_test_module( struct makefile *make ) output_filename( tools_path( make, "winebuild" )); output_filename( tools_path( make, "winegcc" )); output( "\n" ); - output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); - output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); - if (tools_dir) output_filename( strmake( "--sysroot=%s", top_obj_dir_path( make, "" ))); - output_filename( "--lib-suffix=.cross.a" ); + output_winegcc_command( make, 1 ); output_filenames_obj_dir( make, make->crossobj_files ); output_filenames( all_libs ); output_filename( "$(LDFLAGS)" );

1 0

Alexandre Julliard : makefiles: Unify APPMODE and EXTRADLLFLAGS variables.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 1d6a4102444f0f2dfd9f131ad4dc9811343cbd0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d6a4102444f0f2dfd9f131a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 9 10:13:37 2019 +0200 makefiles: Unify APPMODE and EXTRADLLFLAGS variables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/rundll.exe16/Makefile.in | 2 +- programs/svchost/Makefile.in | 2 +- programs/winhelp.exe16/Makefile.in | 2 +- programs/winoldap.mod16/Makefile.in | 2 +- tools/make_makefiles | 1 + tools/makedep.c | 29 +++++++++++++++-------------- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/programs/rundll.exe16/Makefile.in b/programs/rundll.exe16/Makefile.in index fe08104..4ea0fe9 100644 --- a/programs/rundll.exe16/Makefile.in +++ b/programs/rundll.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = rundll.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = rundll.c diff --git a/programs/svchost/Makefile.in b/programs/svchost/Makefile.in index b24af3b..0cbf5be 100644 --- a/programs/svchost/Makefile.in +++ b/programs/svchost/Makefile.in @@ -1,5 +1,5 @@ MODULE = svchost.exe -APPMODE = -municode +APPMODE = -mconsole -municode IMPORTS = advapi32 C_SRCS = \ diff --git a/programs/winhelp.exe16/Makefile.in b/programs/winhelp.exe16/Makefile.in index ad1695b..a9deacb 100644 --- a/programs/winhelp.exe16/Makefile.in +++ b/programs/winhelp.exe16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winhelp.exe16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winhelp.c diff --git a/programs/winoldap.mod16/Makefile.in b/programs/winoldap.mod16/Makefile.in index cedf378..01fbf78 100644 --- a/programs/winoldap.mod16/Makefile.in +++ b/programs/winoldap.mod16/Makefile.in @@ -1,4 +1,4 @@ MODULE = winoldap.mod16 -APPMODE = -m16 +APPMODE = -mconsole -m16 C_SRCS = winoldap.c diff --git a/tools/make_makefiles b/tools/make_makefiles index 455ff9e..3936310 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -445,6 +445,7 @@ sub update_makefiles(@) if ($file =~ /^programs\//) { die "APPMODE should be defined in $file" unless defined $make{"APPMODE"} ; + die "APPMODE should contain -mconsole or -mwindows in $file" unless $make{"APPMODE"} =~ /-m(console|windows)/; die "Invalid MODULE in $file" unless $name =~ /\./ || $make{"MODULE"} eq "$name.exe"; } else diff --git a/tools/makedep.c b/tools/makedep.c index 20fec7f..227d589 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -170,7 +170,6 @@ struct makefile struct strarray define_args; struct strarray programs; struct strarray scripts; - struct strarray appmode; struct strarray imports; struct strarray subdirs; struct strarray delayimports; @@ -195,6 +194,7 @@ struct makefile int disabled; int use_msvcrt; int is_win16; + int is_exe; struct makefile **submakes; /* values generated at output time */ @@ -2143,11 +2143,11 @@ static struct strarray get_default_imports( const struct makefile *make ) struct strarray ret = empty_strarray; if (strarray_exists( &make->extradllflags, "-nodefaultlibs" )) return ret; - if (strarray_exists( &make->appmode, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + if (strarray_exists( &make->extradllflags, "-mno-cygwin" )) strarray_add( &ret, "msvcrt" ); + strarray_add( &ret, "winecrt0" ); if (make->is_win16) strarray_add( &ret, "kernel" ); strarray_add( &ret, "kernel32" ); strarray_add( &ret, "ntdll" ); - strarray_add( &ret, "winecrt0" ); return ret; } @@ -3070,8 +3070,7 @@ static void output_module( struct makefile *make ) char *spec_file = NULL; unsigned int i; - if (!make->appmode.count) - spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); + if (!make->is_exe) spec_file = src_dir_path( make, replace_extension( make->module, ".dll", ".spec" )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->delayimports, 0 )); strarray_addall( &all_libs, add_import_libs( make, &dep_libs, make->imports, 0 )); add_import_libs( make, &dep_libs, get_default_imports( make ), 0 ); /* dependencies only */ @@ -3106,10 +3105,10 @@ static void output_module( struct makefile *make ) output_winegcc_command( make, 0 ); if (spec_file) { - output( " -shared %s", spec_file ); - output_filenames( make->extradllflags ); + output_filename( "-shared" ); + output_filename( spec_file ); } - else output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3257,7 +3256,7 @@ static void output_test_module( struct makefile *make ) strarray_add( &make->clean_files, strmake( "%s%s", stripped, ext )); output( "%s%s:\n", obj_dir_path( make, testmodule ), ext ); output_winegcc_command( make, !!crosstarget ); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3267,7 +3266,7 @@ static void output_test_module( struct makefile *make ) output_winegcc_command( make, !!crosstarget ); output_filename( "-s" ); output_filename( strmake( "-Wb,-F,%s", testmodule )); - output_filenames( make->appmode ); + output_filenames( make->extradllflags ); output_filenames_obj_dir( make, crosstarget ? make->crossobj_files : make->object_files ); output_filenames_obj_dir( make, make->res_files ); output_filenames( all_libs ); @@ -3469,7 +3468,7 @@ static void output_subdirs( struct makefile *make ) if (!submake->staticlib) { strarray_add( &builddeps_deps, subdir ); - if (!submake->appmode.count) + if (!submake->is_exe) { output( "manpages htmlpages sgmlpages xmlpages::\n" ); output( "\t(a)cd %s && $(MAKE) $@\n", subdir ); @@ -3977,7 +3976,6 @@ static void load_sources( struct makefile *make ) make->programs = get_expanded_make_var_array( make, "PROGRAMS" ); make->scripts = get_expanded_make_var_array( make, "SCRIPTS" ); - make->appmode = get_expanded_make_var_array( make, "APPMODE" ); make->imports = get_expanded_make_var_array( make, "IMPORTS" ); make->delayimports = get_expanded_make_var_array( make, "DELAYIMPORTS" ); make->extradllflags = get_expanded_make_var_array( make, "EXTRADLLFLAGS" ); @@ -3987,9 +3985,12 @@ static void load_sources( struct makefile *make ) if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; + strarray_addall( &make->extradllflags, get_expanded_make_var_array( make, "APPMODE" )); make->disabled = make->base_dir && strarray_exists( &disabled_dirs, make->base_dir ); - make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ) || strarray_exists( &make->appmode, "-m16" ); - make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); + make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); + make->use_msvcrt = strarray_exists( &make->extradllflags, "-mno-cygwin" ); + make->is_exe = strarray_exists( &make->extradllflags, "-mconsole" ) || + strarray_exists( &make->extradllflags, "-mwindows" ); for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ) ||

1 0

Michael Stefaniuc : wineps.drv: Avoid using the comma operator.
by Alexandre Julliard April 9, 2019

April 9, 2019

Module: wine Branch: master Commit: 23be5e516bbba671915a0c30d8c7353b418e8718 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23be5e516bbba671915a0c30… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Apr 5 21:03:56 2019 +0200 wineps.drv: Avoid using the comma operator. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineps.drv/bitmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/bitmap.c b/dlls/wineps.drv/bitmap.c index c4d0a96..c1de724 100644 --- a/dlls/wineps.drv/bitmap.c +++ b/dlls/wineps.drv/bitmap.c @@ -271,7 +271,7 @@ DWORD PSDRV_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, } dst_x = dst->visrect.left; - dst_y = dst->visrect.top, + dst_y = dst->visrect.top; dst_width = dst->visrect.right - dst->visrect.left; dst_height = dst->visrect.bottom - dst->visrect.top; if (src->width * dst->width < 0)

1 0