wine-commits April 2019

wine-commits@winehq.org

1 participants
803 discussions

Zebediah Figura : winebus.sys: Retrieve hidraw device strings from the parent USB device.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: cc3820ca99e65150958af5410ac2de77f9a4a505 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc3820ca99e65150958af541… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:32 2019 -0500 winebus.sys: Retrieve hidraw device strings from the parent USB device. This partially reverts 164517fe575564daa44f74cc3bc4a6bbdd7d3f3d. The manufacturer, product, and serial string attributes are not exposed by the HID device on Linux, but by its parent USB device. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46711 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus_udev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index 1f671cf..99753d6 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -674,23 +674,23 @@ static NTSTATUS hidraw_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, static NTSTATUS hidraw_get_string(DEVICE_OBJECT *device, DWORD index, WCHAR *buffer, DWORD length) { - struct udev_device *hiddev; + struct udev_device *usbdev; struct platform_private *private = impl_from_DEVICE_OBJECT(device); WCHAR *str = NULL; - hiddev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "hid", NULL); - if (hiddev) + usbdev = udev_device_get_parent_with_subsystem_devtype(private->udev_device, "usb", "usb_device"); + if (usbdev) { switch (index) { case HID_STRING_ID_IPRODUCT: - str = get_sysattr_string(hiddev, "product"); + str = get_sysattr_string(usbdev, "product"); break; case HID_STRING_ID_IMANUFACTURER: - str = get_sysattr_string(hiddev, "manufacturer"); + str = get_sysattr_string(usbdev, "manufacturer"); break; case HID_STRING_ID_ISERIALNUMBER: - str = get_sysattr_string(hiddev, "serial"); + str = get_sysattr_string(usbdev, "serial"); break; default: ERR("Unhandled string index %08x\n", index);

1 0

Zebediah Figura : hid: Fix length argument to GetOverlappedResult().
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: a0a3b6b90e2d938200bbe86fd131e1ed320d2744 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0a3b6b90e2d938200bbe86f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Mar 29 16:18:31 2019 -0500 hid: Fix length argument to GetOverlappedResult(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidd.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/hid/hidd.c b/dlls/hid/hidd.c index 4b703ca..ca14c4f 100644 --- a/dlls/hid/hidd.c +++ b/dlls/hid/hidd.c @@ -38,15 +38,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(hid); -static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len, DWORD *ret_len) +static BOOL sync_ioctl(HANDLE file, DWORD code, void *in_buf, DWORD in_len, void *out_buf, DWORD out_len) { OVERLAPPED ovl = {0}; + DWORD ret_len; BOOL ret; ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); - ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, ret_len, &ovl); + ret = DeviceIoControl(file, code, in_buf, in_len, out_buf, out_len, &ret_len, &ovl); if (!ret && GetLastError() == ERROR_IO_PENDING) - ret = GetOverlappedResult(file, &ovl, ret_len, TRUE); + ret = GetOverlappedResult(file, &ovl, &ret_len, TRUE); CloseHandle(ovl.hEvent); return ret; } @@ -65,7 +66,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) TRACE("(%p %p)\n", HidDeviceObject, Attr); - ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION), NULL); + ret = sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(HID_COLLECTION_INFORMATION)); if (ret) { @@ -79,7 +80,7 @@ BOOLEAN WINAPI HidD_GetAttributes(HANDLE HidDeviceObject, PHIDD_ATTRIBUTES Attr) BOOLEAN WINAPI HidD_GetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_FEATURE, NULL, 0, ReportBuffer, ReportBufferLength); } void WINAPI HidD_GetHidGuid(LPGUID guid) @@ -91,43 +92,43 @@ void WINAPI HidD_GetHidGuid(LPGUID guid) BOOLEAN WINAPI HidD_GetInputReport(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_INPUT_REPORT, NULL, 0, ReportBuffer, ReportBufferLength); } BOOLEAN WINAPI HidD_GetManufacturerString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_MANUFACTURER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetNumInputBuffers(HANDLE HidDeviceObject, ULONG *NumberBuffers) { TRACE("(%p %p)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers), NULL); + return sync_ioctl(HidDeviceObject, IOCTL_GET_NUM_DEVICE_INPUT_BUFFERS, NULL, 0, NumberBuffers, sizeof(*NumberBuffers)); } BOOLEAN WINAPI HidD_SetFeature(HANDLE HidDeviceObject, PVOID ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_FEATURE, ReportBuffer, ReportBufferLength, NULL, 0); } BOOLEAN WINAPI HidD_SetNumInputBuffers(HANDLE HidDeviceObject, ULONG NumberBuffers) { TRACE("(%p %i)\n", HidDeviceObject, NumberBuffers); - return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_SET_NUM_DEVICE_INPUT_BUFFERS, &NumberBuffers, sizeof(NumberBuffers), NULL, 0); } BOOLEAN WINAPI HidD_GetProductString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_PRODUCT_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetSerialNumberString(HANDLE HidDeviceObject, PVOID Buffer, ULONG BufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, Buffer, BufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_GET_SERIALNUMBER_STRING, NULL, 0, Buffer, BufferLength); } BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DATA *PreparsedData) @@ -137,14 +138,12 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT TRACE("(%p %p)\n", HidDeviceObject, PreparsedData); - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, - &info, sizeof(HID_COLLECTION_INFORMATION), NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_INFORMATION, NULL, 0, &info, sizeof(info))) return FALSE; if (!(data = HeapAlloc(GetProcessHeap(), 0, info.DescriptorSize))) return FALSE; - if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, - data, info.DescriptorSize, NULL)) + if (!sync_ioctl(HidDeviceObject, IOCTL_HID_GET_COLLECTION_DESCRIPTOR, NULL, 0, data, info.DescriptorSize)) { HeapFree( GetProcessHeap(), 0, data ); return FALSE; @@ -156,5 +155,5 @@ BOOLEAN WINAPI HidD_GetPreparsedData(HANDLE HidDeviceObject, PHIDP_PREPARSED_DAT BOOLEAN WINAPI HidD_SetOutputReport(HANDLE HidDeviceObject, void *ReportBuffer, ULONG ReportBufferLength) { TRACE("(%p %p %u)\n", HidDeviceObject, ReportBuffer, ReportBufferLength); - return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0, NULL); + return sync_ioctl(HidDeviceObject, IOCTL_HID_SET_OUTPUT_REPORT, ReportBuffer, ReportBufferLength, NULL, 0); }

1 0

Nikolay Sivov : mfplat: Use attributes helpers for stream descriptor.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: e4e9d3a2f3579fb5b3139b72ed96aefda7730613 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4e9d3a2f3579fb5b3139b72… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:07 2019 +0300 mfplat: Use attributes helpers for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 157 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 124 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e4e9d3a2f3579fb5b313…

1 0

Nikolay Sivov : mfplat: Add per-method helpers for attributes, use them for media type.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 7a13f42786c584c76e71226ad1f29236098cbeca URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a13f42786c584c76e71226a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:06 2019 +0300 mfplat: Add per-method helpers for attributes, use them for media type. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 438 ++++++++++++++++++++++++++++++------------- dlls/mfplat/mediatype.c | 67 +++---- dlls/mfplat/mfplat_private.h | 39 ++++ 3 files changed, 381 insertions(+), 163 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a13f42786c584c76e71…

1 0

Nikolay Sivov : mfreadwrite: Add a trace for async reader mode.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: e92bf051f5f4e6807118715ae1a6395f46f0bca0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e92bf051f5f4e6807118715a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:05 2019 +0300 mfreadwrite: Add a trace for async reader mode. 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 2e1d24c..78d96e4 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -680,8 +680,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri } if (attributes) + { IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_ASYNC_CALLBACK, &IID_IMFSourceReaderCallback, (void **)&object->async_callback); + if (object->async_callback) + TRACE("Using async callback %p.\n", object->async_callback); + } hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out);

1 0

Nikolay Sivov : mfreadwrite: Partially implement setting output media types for reader.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 0694d0f3219b933e85fd6344201ad4c170c30afe URL: https://source.winehq.org/git/wine.git/?a=commit;h=0694d0f3219b933e85fd6344… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:04 2019 +0300 mfreadwrite: Partially implement setting output media types for reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 128 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 121 insertions(+), 7 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 9bed201..2e1d24c 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -72,6 +72,11 @@ HRESULT WINAPI DllUnregisterServer(void) return __wine_unregister_resources( mfinstance ); } +struct media_stream +{ + IMFMediaType *current; +}; + typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; @@ -83,6 +88,9 @@ typedef struct source_reader DWORD first_video_stream_index; IMFSourceReaderCallback *async_callback; BOOL shutdown_on_release; + struct media_stream *streams; + DWORD stream_count; + CRITICAL_SECTION cs; } srcreader; struct sink_writer @@ -214,6 +222,7 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) { struct source_reader *reader = impl_from_IMFSourceReader(iface); ULONG refcount = InterlockedDecrement(&reader->refcount); + unsigned int i; TRACE("%p, refcount %d.\n", iface, refcount); @@ -226,6 +235,14 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) if (reader->descriptor) IMFPresentationDescriptor_Release(reader->descriptor); IMFMediaSource_Release(reader->source); + + for (i = 0; i < reader->stream_count; ++i) + { + if (reader->streams[i].current) + IMFMediaType_Release(reader->streams[i].current); + } + heap_free(reader->streams); + DeleteCriticalSection(&reader->cs); heap_free(reader); } @@ -344,17 +361,70 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR static HRESULT WINAPI src_reader_GetCurrentMediaType(IMFSourceReader *iface, DWORD index, IMFMediaType **type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p\n", This, index, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %p.\n", iface, index, type); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (index >= reader->stream_count) + return MF_E_INVALIDSTREAMNUMBER; + + if (FAILED(hr = MFCreateMediaType(type))) + return hr; + + EnterCriticalSection(&reader->cs); + + hr = IMFMediaType_CopyAllItems(reader->streams[index].current, (IMFAttributes *)*type); + + LeaveCriticalSection(&reader->cs); + + return hr; } static HRESULT WINAPI src_reader_SetCurrentMediaType(IMFSourceReader *iface, DWORD index, DWORD *reserved, IMFMediaType *type) { - srcreader *This = impl_from_IMFSourceReader(iface); - FIXME("%p, 0x%08x, %p, %p\n", This, index, reserved, type); - return E_NOTIMPL; + struct source_reader *reader = impl_from_IMFSourceReader(iface); + HRESULT hr; + + TRACE("%p, %#x, %p, %p.\n", iface, index, reserved, type); + + switch (index) + { + case MF_SOURCE_READER_FIRST_VIDEO_STREAM: + index = reader->first_video_stream_index; + break; + case MF_SOURCE_READER_FIRST_AUDIO_STREAM: + index = reader->first_audio_stream_index; + break; + default: + ; + } + + if (index >= reader->stream_count) + return MF_E_INVALIDSTREAMNUMBER; + + /* FIXME: validate passed type and current presentation state. */ + + EnterCriticalSection(&reader->cs); + + hr = IMFMediaType_CopyAllItems(type, (IMFAttributes *)reader->streams[index].current); + + LeaveCriticalSection(&reader->cs); + + return hr; } static HRESULT WINAPI src_reader_SetCurrentPosition(IMFSourceReader *iface, REFGUID format, REFPROPVARIANT position) @@ -533,7 +603,8 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttributes *attributes, BOOL shutdown_on_release, REFIID riid, void **out) { - srcreader *object; + struct source_reader *object; + unsigned int i; HRESULT hr; object = heap_alloc_zero(sizeof(*object)); @@ -545,10 +616,53 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); + InitializeCriticalSection(&object->cs); if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorCount(object->descriptor, &object->stream_count))) + goto failed; + + if (!(object->streams = heap_alloc_zero(object->stream_count * sizeof(*object->streams)))) + { + hr = E_OUTOFMEMORY; + goto failed; + } + + /* Set initial current media types. */ + for (i = 0; i < object->stream_count; ++i) + { + IMFMediaTypeHandler *handler; + IMFStreamDescriptor *sd; + IMFMediaType *src_type; + BOOL selected; + + if (FAILED(hr = MFCreateMediaType(&object->streams[i].current))) + break; + + if (FAILED(hr = IMFPresentationDescriptor_GetStreamDescriptorByIndex(object->descriptor, i, &selected, &sd))) + break; + + hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler); + IMFStreamDescriptor_Release(sd); + if (FAILED(hr)) + break; + + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, 0, &src_type); + IMFMediaTypeHandler_Release(handler); + if (FAILED(hr)) + break; + + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)object->streams[i].current); + IMFMediaType_Release(src_type); + if (FAILED(hr)) + break; + } + + if (FAILED(hr)) + goto failed; + /* At least one major type has to be set. */ object->first_audio_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Audio); object->first_video_stream_index = reader_get_first_stream_index(object->descriptor, &MFMediaType_Video);

1 0

Nikolay Sivov : mfplat: Add symbolic names for event id tracing.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 86656f86042e02fe29d0e830e3139cc907724df4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86656f86042e02fe29d0e830… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:03 2019 +0300 mfplat: Add symbolic names for event id tracing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 128 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 03de81c..e52aeeb 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -817,6 +817,129 @@ static const char *debugstr_mf_guid(const GUID *guid) return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbgstr_guid(guid); } +struct event_id +{ + DWORD id; + const char *name; +}; + +static int debug_event_id(const void *a, const void *b) +{ + const DWORD *id = a; + const struct event_id *event_id = b; + return *id - event_id->id; +} + +static const char *debugstr_eventid(DWORD event) +{ + static const struct event_id + { + DWORD id; + const char *name; + } + event_ids[] = + { +#define X(e) { e, #e } + X(MEUnknown), + X(MEError), + X(MEExtendedType), + X(MENonFatalError), + X(MESessionUnknown), + X(MESessionTopologySet), + X(MESessionTopologiesCleared), + X(MESessionStarted), + X(MESessionPaused), + X(MESessionStopped), + X(MESessionClosed), + X(MESessionEnded), + X(MESessionRateChanged), + X(MESessionScrubSampleComplete), + X(MESessionCapabilitiesChanged), + X(MESessionTopologyStatus), + X(MESessionNotifyPresentationTime), + X(MENewPresentation), + X(MELicenseAcquisitionStart), + X(MELicenseAcquisitionCompleted), + X(MEIndividualizationStart), + X(MEIndividualizationCompleted), + X(MEEnablerProgress), + X(MEEnablerCompleted), + X(MEPolicyError), + X(MEPolicyReport), + X(MEBufferingStarted), + X(MEBufferingStopped), + X(MEConnectStart), + X(MEConnectEnd), + X(MEReconnectStart), + X(MEReconnectEnd), + X(MERendererEvent), + X(MESessionStreamSinkFormatChanged), + X(MESourceUnknown), + X(MESourceStarted), + X(MEStreamStarted), + X(MESourceSeeked), + X(MEStreamSeeked), + X(MENewStream), + X(MEUpdatedStream), + X(MESourceStopped), + X(MEStreamStopped), + X(MESourcePaused), + X(MEStreamPaused), + X(MEEndOfPresentation), + X(MEEndOfStream), + X(MEMediaSample), + X(MEStreamTick), + X(MEStreamThinMode), + X(MEStreamFormatChanged), + X(MESourceRateChanged), + X(MEEndOfPresentationSegment), + X(MESourceCharacteristicsChanged), + X(MESourceRateChangeRequested), + X(MESourceMetadataChanged), + X(MESequencerSourceTopologyUpdated), + X(MESinkUnknown), + X(MEStreamSinkStarted), + X(MEStreamSinkStopped), + X(MEStreamSinkPaused), + X(MEStreamSinkRateChanged), + X(MEStreamSinkRequestSample), + X(MEStreamSinkMarker), + X(MEStreamSinkPrerolled), + X(MEStreamSinkScrubSampleComplete), + X(MEStreamSinkFormatChanged), + X(MEStreamSinkDeviceChanged), + X(MEQualityNotify), + X(MESinkInvalidated), + X(MEAudioSessionNameChanged), + X(MEAudioSessionVolumeChanged), + X(MEAudioSessionDeviceRemoved), + X(MEAudioSessionServerShutdown), + X(MEAudioSessionGroupingParamChanged), + X(MEAudioSessionIconChanged), + X(MEAudioSessionFormatChanged), + X(MEAudioSessionDisconnected), + X(MEAudioSessionExclusiveModeOverride), + X(METrustUnknown), + X(MEPolicyChanged), + X(MEContentProtectionMessage), + X(MEPolicySet), + X(MEWMDRMLicenseBackupCompleted), + X(MEWMDRMLicenseBackupProgress), + X(MEWMDRMLicenseRestoreCompleted), + X(MEWMDRMLicenseRestoreProgress), + X(MEWMDRMLicenseAcquisitionCompleted), + X(MEWMDRMIndividualizationCompleted), + X(MEWMDRMIndividualizationProgress), + X(MEWMDRMProximityCompleted), + X(MEWMDRMLicenseStoreCleaned), + X(MEWMDRMRevocationDownloadCompleted), +#undef X + }; + + struct event_id *ret = bsearch(&event, event_ids, ARRAY_SIZE(event_ids), sizeof(*event_ids), debug_event_id); + return ret ? wine_dbg_sprintf("%s", ret->name) : wine_dbg_sprintf("%u", event); +} + static inline struct attributes *impl_from_IMFAttributes(IMFAttributes *iface) { return CONTAINING_RECORD(iface, struct attributes, IMFAttributes_iface); @@ -5378,7 +5501,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR mfmediaevent *object; HRESULT hr; - TRACE("%#x, %s, %08x, %p, %p\n", type, debugstr_guid(extended_type), status, value, event); + TRACE("%s, %s, %08x, %p, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, value, event); object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); if(!object) @@ -5401,6 +5524,8 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR *event = &object->IMFMediaEvent_iface; + TRACE("Created event %p.\n", *event); + return S_OK; } @@ -5650,7 +5775,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamVar(IMFMediaEventQueue *iface, M IMFMediaEvent *event; HRESULT hr; - TRACE("%p, %d, %s, %#x, %p\n", iface, event_type, debugstr_guid(extended_type), status, value); + TRACE("%p, %s, %s, %#x, %p\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, value); if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, value, &event))) return hr; @@ -5668,7 +5793,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, M PROPVARIANT value; HRESULT hr; - TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(extended_type), status, unk); + TRACE("%p, %s, %s, %#x, %p.\n", iface, debugstr_eventid(event_type), debugstr_guid(extended_type), status, unk); value.vt = VT_UNKNOWN; value.u.punkVal = unk;

1 0

Nikolay Sivov : mferror: Add more media source and stream error codes.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: f56bcd0e7958efe6242cc76542cb59bc71881cb5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f56bcd0e7958efe6242cc765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:02 2019 +0300 mferror: Add more media source and stream error codes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mferror/mferror.mc | 84 +++++++++++++++++++++++++++++++++++++++++++ include/mferror.h | 12 +++++++ po/ar.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/bg.po | 81 ++++++++++++++++++++++++++++++++++-------- po/ca.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/cs.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/da.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/de.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/el.po | 81 ++++++++++++++++++++++++++++++++++-------- po/en.po | 76 +++++++++++++++++++++++++++++++-------- po/en_US.po | 76 +++++++++++++++++++++++++++++++-------- po/eo.po | 86 ++++++++++++++++++++++++++++++++++++-------- po/es.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/fa.po | 80 +++++++++++++++++++++++++++++++++-------- po/fi.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/fr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/he.po | 82 ++++++++++++++++++++++++++++++++++-------- po/hi.po | 79 +++++++++++++++++++++++++++++++++-------- po/hr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/hu.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/it.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ja.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ko.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/lt.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ml.po | 81 ++++++++++++++++++++++++++++++++++-------- po/nb_NO.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/nl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/or.po | 79 +++++++++++++++++++++++++++++++++-------- po/pa.po | 79 +++++++++++++++++++++++++++++++++-------- po/pl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/pt_BR.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/pt_PT.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/rm.po | 77 ++++++++++++++++++++++++++++++++-------- po/ro.po | 91 +++++++++++++++++++++++++++++++++++++++-------- po/ru.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/si.po | 88 +++++++++++++++++++++++++++++++++++++-------- po/sk.po | 87 +++++++++++++++++++++++++++++++++++++-------- po/sl.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)cyrillic.po | 84 +++++++++++++++++++++++++++++++++++-------- po/sr_RS(a)latin.po | 84 +++++++++++++++++++++++++++++++++++-------- po/sv.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/ta.po | 76 +++++++++++++++++++++++++++++++-------- po/te.po | 79 +++++++++++++++++++++++++++++++++-------- po/th.po | 81 ++++++++++++++++++++++++++++++++++-------- po/tr.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/uk.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/wa.po | 80 +++++++++++++++++++++++++++++++++-------- po/wine.pot | 76 +++++++++++++++++++++++++++++++-------- po/zh_CN.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- po/zh_TW.po | 94 +++++++++++++++++++++++++++++++++++++++++-------- 50 files changed, 3651 insertions(+), 672 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f56bcd0e7958efe6242c…

1 0

Nikolay Sivov : mfplat: Partially implement MFCreateWaveFormatExFromMFMediaType() for PCM format.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: 261995d1662aeb4202a74b15fe87d6ed65313990 URL: https://source.winehq.org/git/wine.git/?a=commit;h=261995d1662aeb4202a74b15… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 1 13:24:01 2019 +0300 mfplat: Partially implement MFCreateWaveFormatExFromMFMediaType() for PCM format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/mediatype.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/mfplat/mfplat.spec | 2 +- dlls/mfplat/tests/mfplat.c | 67 ++++++++++++++++++++++++++++++++++++++++ include/mfapi.h | 7 +++++ 4 files changed, 152 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index dddea4b..6a8bd97 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -20,6 +20,10 @@ #include "mfplat_private.h" +#include "initguid.h" +#include "ks.h" +#include "ksmedia.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -1679,3 +1683,76 @@ HRESULT WINAPI MFUnwrapMediaType(IMFMediaType *wrapper, IMFMediaType **ret) return S_OK; } + +/*********************************************************************** + * MFCreateWaveFormatExFromMFMediaType (mfplat.@) + */ +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *mediatype, WAVEFORMATEX **ret_format, + UINT32 *size, UINT32 flags) +{ + WAVEFORMATEXTENSIBLE *format_ext = NULL; + WAVEFORMATEX *format; + GUID major, subtype; + UINT32 value; + HRESULT hr; + + TRACE("%p, %p, %p, %#x.\n", mediatype, ret_format, size, flags); + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_MAJOR_TYPE, &major))) + return hr; + + if (FAILED(hr = IMFMediaType_GetGUID(mediatype, &MF_MT_SUBTYPE, &subtype))) + return hr; + + if (!IsEqualGUID(&major, &MFMediaType_Audio)) + return E_INVALIDARG; + + if (!IsEqualGUID(&subtype, &MFAudioFormat_PCM)) + { + FIXME("Unsupported audio format %s.\n", debugstr_guid(&subtype)); + return E_NOTIMPL; + } + + /* FIXME: probably WAVE_FORMAT_MPEG/WAVE_FORMAT_MPEGLAYER3 should be handled separately. */ + if (flags == MFWaveFormatExConvertFlag_ForceExtensible) + { + format_ext = CoTaskMemAlloc(sizeof(*format_ext)); + *size = sizeof(*format_ext); + format = (WAVEFORMATEX *)format_ext; + } + else + { + format = CoTaskMemAlloc(sizeof(*format)); + *size = sizeof(*format); + } + + if (!format) + return E_OUTOFMEMORY; + + memset(format, 0, *size); + + format->wFormatTag = format_ext ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_NUM_CHANNELS, &value))) + format->nChannels = value; + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_SAMPLES_PER_SECOND, &format->nSamplesPerSec); + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &format->nAvgBytesPerSec); + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &value))) + format->nBlockAlign = value; + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_BITS_PER_SAMPLE, &value))) + format->wBitsPerSample = value; + if (format_ext) + { + format->cbSize = sizeof(*format_ext) - sizeof(*format); + + if (SUCCEEDED(IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_VALID_BITS_PER_SAMPLE, &value))) + format_ext->Samples.wSamplesPerBlock = value; + + IMFMediaType_GetUINT32(mediatype, &MF_MT_AUDIO_CHANNEL_MASK, &format_ext->dwChannelMask); + memcpy(&format_ext->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM, sizeof(format_ext->SubFormat)); + } + + *ret_format = format; + + return S_OK; +} diff --git a/dlls/mfplat/mfplat.spec b/dlls/mfplat/mfplat.spec index 1d4035c..7823ac0 100644 --- a/dlls/mfplat/mfplat.spec +++ b/dlls/mfplat/mfplat.spec @@ -74,7 +74,7 @@ @ stub MFCreateVideoMediaTypeFromSubtype @ stub MFCreateVideoMediaTypeFromVideoInfoHeader2 @ stub MFCreateVideoMediaTypeFromVideoInfoHeader -@ stub MFCreateWaveFormatExFromMFMediaType +@ stdcall MFCreateWaveFormatExFromMFMediaType(ptr ptr ptr long) @ stub MFDeserializeAttributesFromStream @ stub MFDeserializeEvent @ stub MFDeserializeMediaTypeFromStream diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index f62136f..f081d97 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -2744,6 +2744,72 @@ static void test_wrapped_media_type(void) IMFMediaType_Release(mediatype2); } +static void test_MFCreateWaveFormatExFromMFMediaType(void) +{ + WAVEFORMATEXTENSIBLE *format_ext; + IMFMediaType *mediatype; + WAVEFORMATEX *format; + UINT32 size; + HRESULT hr; + + hr = MFCreateMediaType(&mediatype); + ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == MF_E_ATTRIBUTENOTFOUND, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFMediaType_Video); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + /* Audio/PCM */ + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_Normal); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + ok(format->wFormatTag == WAVE_FORMAT_PCM, "Unexpected tag.\n"); + ok(format->nChannels == 0, "Unexpected number of channels, %u.\n", format->nChannels); + ok(format->nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format->nSamplesPerSec); + ok(format->nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", format->nAvgBytesPerSec); + ok(format->nBlockAlign == 0, "Unexpected alignment, %u.\n", format->nBlockAlign); + ok(format->wBitsPerSample == 0, "Unexpected sample size, %u.\n", format->wBitsPerSample); + ok(format->cbSize == 0, "Unexpected size field, %u.\n", format->cbSize); + CoTaskMemFree(format); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, (WAVEFORMATEX **)&format_ext, &size, + MFWaveFormatExConvertFlag_ForceExtensible); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(format_ext != NULL, "Expected format structure.\n"); + ok(size == sizeof(*format_ext), "Unexpected size %u.\n", size); + ok(format_ext->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE, "Unexpected tag.\n"); + ok(format_ext->Format.nChannels == 0, "Unexpected number of channels, %u.\n", format_ext->Format.nChannels); + ok(format_ext->Format.nSamplesPerSec == 0, "Unexpected sample rate, %u.\n", format_ext->Format.nSamplesPerSec); + ok(format_ext->Format.nAvgBytesPerSec == 0, "Unexpected average data rate rate, %u.\n", + format_ext->Format.nAvgBytesPerSec); + ok(format_ext->Format.nBlockAlign == 0, "Unexpected alignment, %u.\n", format_ext->Format.nBlockAlign); + ok(format_ext->Format.wBitsPerSample == 0, "Unexpected sample size, %u.\n", format_ext->Format.wBitsPerSample); + ok(format_ext->Format.cbSize == sizeof(*format_ext) - sizeof(format_ext->Format), "Unexpected size field, %u.\n", + format_ext->Format.cbSize); + CoTaskMemFree(format_ext); + + hr = MFCreateWaveFormatExFromMFMediaType(mediatype, &format, &size, MFWaveFormatExConvertFlag_ForceExtensible + 1); + ok(hr == S_OK, "Failed to create format, hr %#x.\n", hr); + ok(size == sizeof(*format), "Unexpected size %u.\n", size); + CoTaskMemFree(format); + + IMFMediaType_Release(mediatype); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -2777,6 +2843,7 @@ START_TEST(mfplat) test_MFCompareFullToPartialMediaType(); test_attributes_serialization(); test_wrapped_media_type(); + test_MFCreateWaveFormatExFromMFMediaType(); CoUninitialize(); } diff --git a/include/mfapi.h b/include/mfapi.h index 775a89f..cee9d40 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -344,6 +344,12 @@ typedef void (CALLBACK *MFPERIODICCALLBACK)(IUnknown *context); #define MF_4096_BYTE_ALIGNMENT 0x00000fff #define MF_8192_BYTE_ALIGNMENT 0x00001fff +typedef enum _MFWaveFormatExConvertFlags +{ + MFWaveFormatExConvertFlag_Normal = 0, + MFWaveFormatExConvertFlag_ForceExtensible = 1, +} MFWaveFormatExConvertFlags; + HRESULT WINAPI MFAddPeriodicCallback(MFPERIODICCALLBACK callback, IUnknown *context, DWORD *key); HRESULT WINAPI MFAllocateWorkQueue(DWORD *queue); HRESULT WINAPI MFAllocateWorkQueueEx(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); @@ -363,6 +369,7 @@ HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HR HRESULT WINAPI MFCreateMediaType(IMFMediaType **type); HRESULT WINAPI MFCreateSample(IMFSample **sample); HRESULT WINAPI MFCreateMemoryBuffer(DWORD max_length, IMFMediaBuffer **buffer); +HRESULT WINAPI MFCreateWaveFormatExFromMFMediaType(IMFMediaType *type, WAVEFORMATEX **format, UINT32 *size, UINT32 flags); void * WINAPI MFHeapAlloc(SIZE_T size, ULONG flags, char *file, int line, EAllocationType type); void WINAPI MFHeapFree(void *ptr); HRESULT WINAPI MFGetAttributesAsBlob(IMFAttributes *attributes, UINT8 *buffer, UINT size);

1 0

Alexandre Julliard : crtdll: Sort source file list.
by Alexandre Julliard 01 Apr '19

01 Apr '19

Module: wine Branch: master Commit: e70d4c387b7851a54bf22ba1f4303652936ce084 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e70d4c387b7851a54bf22ba1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 1 21:53:53 2019 +0200 crtdll: Sort source file list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/Makefile.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/crtdll/Makefile.in b/dlls/crtdll/Makefile.in index 71c62b1..ac07045 100644 --- a/dlls/crtdll/Makefile.in +++ b/dlls/crtdll/Makefile.in @@ -4,31 +4,31 @@ PARENTSRC = ../msvcrt DELAYIMPORTS = advapi32 user32 C_SRCS = \ - cpp.c \ console.c \ + cpp.c \ ctype.c \ data.c \ dir.c \ environ.c \ - locale.c \ errno.c \ - exit.c \ except.c \ except_arm.c \ except_arm64.c \ except_i386.c \ except_x86_64.c \ - lock.c \ + exit.c \ file.c \ heap.c \ + locale.c \ + lock.c \ + main.c \ math.c \ mbcs.c \ misc.c \ process.c \ - main.c \ - string.c \ scanf.c \ + string.c \ + thread.c \ time.c \ undname.c \ - thread.c \ wcs.c

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2019