wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Zebediah Figura : kernel32: Reimplement is_same_file() using FileIdInformation.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 4b2f8c80fb50ed13c300a9268d8b1908d6171622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b2f8c80fb50ed13c300a926… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:06 2020 -0500 kernel32: Reimplement is_same_file() using FileIdInformation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/path.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 31652d3164..334fc25e87 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -257,21 +257,12 @@ DWORD WINAPI GetShortPathNameA( LPCSTR longpath, LPSTR shortpath, DWORD shortlen static BOOL is_same_file(HANDLE h1, HANDLE h2) { - int fd1; - BOOL ret = FALSE; - if (wine_server_handle_to_fd(h1, 0, &fd1, NULL) == STATUS_SUCCESS) - { - int fd2; - if (wine_server_handle_to_fd(h2, 0, &fd2, NULL) == STATUS_SUCCESS) - { - struct stat stat1, stat2; - if (fstat(fd1, &stat1) == 0 && fstat(fd2, &stat2) == 0) - ret = (stat1.st_dev == stat2.st_dev && stat1.st_ino == stat2.st_ino); - wine_server_release_fd(h2, fd2); - } - wine_server_release_fd(h1, fd1); - } - return ret; + FILE_ID_INFORMATION id1, id2; + IO_STATUS_BLOCK io; + + return !NtQueryInformationFile( h1, &io, &id1, sizeof(id1), FileIdInformation ) + && !NtQueryInformationFile( h2, &io, &id2, sizeof(id2), FileIdInformation ) + && !memcmp( &id1, &id2, sizeof(FILE_ID_INFORMATION) ); } /**************************************************************************

1 0

Zebediah Figura : mountmgr: Assign a unique nonzero serial to all volumes.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 54417bf8bf918c15bba1afd27fa527eb6e1c7019 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54417bf8bf918c15bba1afd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:05 2020 -0500 mountmgr: Assign a unique nonzero serial to all volumes. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mountmgr.sys/device.c | 3 +++ dlls/ntdll/tests/file.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 8fb984579e..f68ab4de9b 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -1123,6 +1123,9 @@ static NTSTATUS set_volume_info( struct volume *volume, struct dos_drive *drive, } } + if (!volume->serial) + memcpy(&volume->serial, &volume->guid.Data4[4], sizeof(DWORD)); + if (!volume->mount) volume->mount = add_volume_mount_point( disk_device->dev_obj, &disk_device->name, &volume->guid ); if (drive && !drive->mount) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 33b8ead552..68c6a79e79 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -3908,7 +3908,7 @@ static void test_query_volume_information_file(void) io.Information); todo_wine ok(ffvi->VolumeCreationTime.QuadPart != 0, "Missing VolumeCreationTime\n"); - todo_wine ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); + ok(ffvi->VolumeSerialNumber != 0, "Missing VolumeSerialNumber\n"); ok(ffvi->SupportsObjects == 1,"expected 1, got %d\n", ffvi->SupportsObjects); ok(ffvi->VolumeLabelLength == lstrlenW(ffvi->VolumeLabel) * sizeof(WCHAR), "got %d\n", ffvi->VolumeLabelLength);

1 0

Zebediah Figura : kernelbase: Return the volume serial number in GetFileInformationByHandle().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: dab50548e0a2a22d498af0fa2b287c5e25b91bf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dab50548e0a2a22d498af0fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:03 2020 -0500 kernelbase: Return the volume serial number in GetFileInformationByHandle(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c index 18b8682036..9ca184a5d0 100644 --- a/dlls/kernelbase/file.c +++ b/dlls/kernelbase/file.c @@ -2201,6 +2201,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH FlushFileBuffers( HANDLE file ) */ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandle( HANDLE file, BY_HANDLE_FILE_INFORMATION *info ) { + FILE_FS_VOLUME_INFORMATION volume_info; FILE_ALL_INFORMATION all_info; IO_STATUS_BLOCK io; NTSTATUS status; @@ -2216,12 +2217,17 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetFileInformationByHandle( HANDLE file, BY_HANDLE info->ftLastAccessTime.dwLowDateTime = all_info.BasicInformation.LastAccessTime.u.LowPart; info->ftLastWriteTime.dwHighDateTime = all_info.BasicInformation.LastWriteTime.u.HighPart; info->ftLastWriteTime.dwLowDateTime = all_info.BasicInformation.LastWriteTime.u.LowPart; - info->dwVolumeSerialNumber = 0; /* FIXME */ + info->dwVolumeSerialNumber = 0; info->nFileSizeHigh = all_info.StandardInformation.EndOfFile.u.HighPart; info->nFileSizeLow = all_info.StandardInformation.EndOfFile.u.LowPart; info->nNumberOfLinks = all_info.StandardInformation.NumberOfLinks; info->nFileIndexHigh = all_info.InternalInformation.IndexNumber.u.HighPart; info->nFileIndexLow = all_info.InternalInformation.IndexNumber.u.LowPart; + + status = NtQueryVolumeInformationFile( file, &io, &volume_info, sizeof(volume_info), FileFsVolumeInformation ); + if (status == STATUS_SUCCESS || status == STATUS_BUFFER_OVERFLOW) + info->dwVolumeSerialNumber = volume_info.VolumeSerialNumber; + return TRUE; }

1 0

Zebediah Figura : ntdll: Fill the volume serial number in NtQueryInformationFile(FileIdInformation).
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: a14cdc8ba0cfcfc25aebfff4c734a6ae6288133b URL: https://source.winehq.org/git/wine.git/?a=commit;h=a14cdc8ba0cfcfc25aebfff4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:04 2020 -0500 ntdll: Fill the volume serial number in NtQueryInformationFile(FileIdInformation). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 246 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 126 insertions(+), 120 deletions(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index dac8538add..a9770290e0 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -2237,6 +2237,124 @@ static NTSTATUS server_get_file_info( HANDLE handle, IO_STATUS_BLOCK *io, void * } +/* Find a DOS device which can act as the root of "path". + * Similar to find_drive_root(), but returns -1 instead of crossing volumes. */ +static int find_dos_device( const char *path ) +{ + int len = strlen(path); + int drive; + char *buffer; + struct stat st; + struct drive_info info[MAX_DOS_DRIVES]; + dev_t dev_id; + + if (!DIR_get_drives_info( info )) return -1; + + if (stat( path, &st ) < 0) return -1; + dev_id = st.st_dev; + + /* strip off trailing slashes */ + while (len > 1 && path[len - 1] == '/') len--; + + /* make a copy of the path */ + if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) return -1; + memcpy( buffer, path, len ); + buffer[len] = 0; + + for (;;) + { + if (!stat( buffer, &st ) && S_ISDIR( st.st_mode )) + { + if (st.st_dev != dev_id) break; + + for (drive = 0; drive < MAX_DOS_DRIVES; drive++) + { + if ((info[drive].dev == st.st_dev) && (info[drive].ino == st.st_ino)) + { + if (len == 1) len = 0; /* preserve root slash in returned path */ + TRACE( "%s -> drive %c:, root=%s, name=%s\n", + debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return drive; + } + } + } + if (len <= 1) break; /* reached root */ + while (path[len - 1] != '/') len--; + while (path[len - 1] == '/') len--; + buffer[len] = 0; + } + RtlFreeHeap( GetProcessHeap(), 0, buffer ); + return -1; +} + +static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) +{ + struct mountmgr_unix_drive *drive; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; + ANSI_STRING unix_name; + IO_STATUS_BLOCK io; + HANDLE mountmgr; + NTSTATUS status; + int letter; + + if (server_get_unix_name( handle, &unix_name )) + return NULL; + + letter = find_dos_device( unix_name.Buffer ); + RtlFreeAnsiString( &unix_name ); + + if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, 1024 ))) + return NULL; + + if (letter == -1) + { + struct stat st; + + if (fstat( fd, &st ) == -1) + { + RtlFreeHeap( GetProcessHeap(), 0, drive ); + return NULL; + } + + drive->unix_dev = st.st_dev; + drive->letter = 0; + } + else + drive->letter = 'a' + letter; + + RtlInitUnicodeString( &string, MOUNTMGR_DEVICE_NAME ); + InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); + if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, + FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) + return NULL; + + status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, + drive, sizeof(*drive), drive, 1024 ); + if (status == STATUS_BUFFER_OVERFLOW) + { + if (!(drive = RtlReAllocateHeap( GetProcessHeap(), 0, drive, drive->size ))) + { + RtlFreeHeap( GetProcessHeap(), 0, drive ); + NtClose( mountmgr ); + return NULL; + } + status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, + drive, sizeof(*drive), drive, drive->size ); + } + NtClose( mountmgr ); + + if (status) + { + WARN("failed to retrieve filesystem type from mountmgr, status %#x\n", status); + RtlFreeHeap( GetProcessHeap(), 0, drive ); + return NULL; + } + + return drive; +} + /****************************************************************************** * NtQueryInformationFile [NTDLL.@] * ZwQueryInformationFile [NTDLL.@] @@ -2507,8 +2625,15 @@ NTSTATUS WINAPI NtQueryInformationFile( HANDLE hFile, PIO_STATUS_BLOCK io, if (fd_get_file_info( fd, options, &st, &attr ) == -1) io->u.Status = FILE_GetNtStatus(); else { + struct mountmgr_unix_drive *drive; FILE_ID_INFORMATION *info = ptr; - info->VolumeSerialNumber = 0; /* FIXME */ + + info->VolumeSerialNumber = 0; + if ((drive = get_mountmgr_fs_info( hFile, fd ))) + { + info->VolumeSerialNumber = drive->serial; + RtlFreeHeap( GetProcessHeap(), 0, drive ); + } memset( &info->FileId, 0, sizeof(info->FileId) ); *(ULONGLONG *)&info->FileId = st.st_ino; } @@ -3120,125 +3245,6 @@ static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info ) return STATUS_SUCCESS; } -/* Find a DOS device which can act as the root of "path". - * Similar to find_drive_root(), but returns -1 instead of crossing volumes. */ -static int find_dos_device( const char *path ) -{ - int len = strlen(path); - int drive; - char *buffer; - struct stat st; - struct drive_info info[MAX_DOS_DRIVES]; - dev_t dev_id; - - if (!DIR_get_drives_info( info )) return -1; - - if (stat( path, &st ) < 0) return -1; - dev_id = st.st_dev; - - /* strip off trailing slashes */ - while (len > 1 && path[len - 1] == '/') len--; - - /* make a copy of the path */ - if (!(buffer = RtlAllocateHeap( GetProcessHeap(), 0, len + 1 ))) return -1; - memcpy( buffer, path, len ); - buffer[len] = 0; - - for (;;) - { - if (!stat( buffer, &st ) && S_ISDIR( st.st_mode )) - { - if (st.st_dev != dev_id) break; - - for (drive = 0; drive < MAX_DOS_DRIVES; drive++) - { - if ((info[drive].dev == st.st_dev) && (info[drive].ino == st.st_ino)) - { - if (len == 1) len = 0; /* preserve root slash in returned path */ - TRACE( "%s -> drive %c:, root=%s, name=%s\n", - debugstr_a(path), 'A' + drive, debugstr_a(buffer), debugstr_a(path + len)); - RtlFreeHeap( GetProcessHeap(), 0, buffer ); - return drive; - } - } - } - if (len <= 1) break; /* reached root */ - while (path[len - 1] != '/') len--; - while (path[len - 1] == '/') len--; - buffer[len] = 0; - } - RtlFreeHeap( GetProcessHeap(), 0, buffer ); - return -1; -} - -static struct mountmgr_unix_drive *get_mountmgr_fs_info( HANDLE handle, int fd ) -{ - struct mountmgr_unix_drive *drive; - OBJECT_ATTRIBUTES attr; - UNICODE_STRING string; - ANSI_STRING unix_name; - IO_STATUS_BLOCK io; - HANDLE mountmgr; - NTSTATUS status; - int letter; - - if (server_get_unix_name( handle, &unix_name )) - return NULL; - - letter = find_dos_device( unix_name.Buffer ); - RtlFreeAnsiString( &unix_name ); - - if (!(drive = RtlAllocateHeap( GetProcessHeap(), 0, 1024 ))) - return NULL; - - if (letter == -1) - { - struct stat st; - - if (fstat( fd, &st ) == -1) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return NULL; - } - - drive->unix_dev = st.st_dev; - drive->letter = 0; - } - else - drive->letter = 'a' + letter; - - RtlInitUnicodeString( &string, MOUNTMGR_DEVICE_NAME ); - InitializeObjectAttributes( &attr, &string, 0, NULL, NULL ); - if (NtOpenFile( &mountmgr, GENERIC_READ | SYNCHRONIZE, &attr, &io, - FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_SYNCHRONOUS_IO_NONALERT )) - return NULL; - - status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, - drive, sizeof(*drive), drive, 1024 ); - if (status == STATUS_BUFFER_OVERFLOW) - { - if (!(drive = RtlReAllocateHeap( GetProcessHeap(), 0, drive, drive->size ))) - { - RtlFreeHeap( GetProcessHeap(), 0, drive ); - NtClose( mountmgr ); - return NULL; - } - status = NtDeviceIoControlFile( mountmgr, NULL, NULL, NULL, &io, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, - drive, sizeof(*drive), drive, drive->size ); - } - NtClose( mountmgr ); - - if (status) - { - WARN("failed to retrieve filesystem type from mountmgr, status %#x\n", status); - RtlFreeHeap( GetProcessHeap(), 0, drive ); - return NULL; - } - - return drive; -} - - /****************************************************************************** * NtQueryVolumeInformationFile [NTDLL.@] * ZwQueryVolumeInformationFile [NTDLL.@]

1 0

Zebediah Figura : ntdll: Silence a warning for FileFsVolumeInformation.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 3c28511d42c6f962207ec916306bda1d1e9aa54e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c28511d42c6f962207ec916… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 16:06:02 2020 -0500 ntdll: Silence a warning for FileFsVolumeInformation. We may call CopyFile() and thus GetFileInformationByHandle(), which retrieves the volume serial number, many times when setting up a prefix, before mountmgr has been initialized. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c index 1adc1e094e..dac8538add 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c @@ -3458,7 +3458,6 @@ NTSTATUS WINAPI NtQueryVolumeInformationFile( HANDLE handle, PIO_STATUS_BLOCK io if (!(drive = get_mountmgr_fs_info( handle, fd ))) { - ERR_(winediag)("Failed to query volume information from mountmgr.\n"); io->u.Status = STATUS_NOT_IMPLEMENTED; break; }

1 0

Zebediah Figura : qcap: Search downstream pins regardless of whether the category and major type match.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: d9003a04646087f1ca92391ef705f0598974dc9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9003a04646087f1ca92391e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:56 2020 -0500 qcap: Search downstream pins regardless of whether the category and major type match. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48766 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 30 ++++++++++++++++++++---------- dlls/qcap/tests/capturegraph.c | 6 +++--- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index a5b00df90b..822f68754e 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -505,28 +505,38 @@ static HRESULT find_unconnected_source_from_filter(CaptureGraphImpl *capture_gra static HRESULT find_unconnected_source_from_pin(CaptureGraphImpl *capture_graph, const GUID *category, const GUID *majortype, IPin *pin, IPin **ret) { + PIN_DIRECTION dir; PIN_INFO info; HRESULT hr; IPin *peer; + IPin_QueryDirection(pin, &dir); + if (dir != PINDIR_OUTPUT) + return VFW_E_INVALID_DIRECTION; + if (category && (IsEqualGUID(category, &PIN_CATEGORY_CAPTURE) || IsEqualGUID(category, &PIN_CATEGORY_PREVIEW))) { if (FAILED(hr = match_smart_tee_pin(capture_graph, category, majortype, (IUnknown *)pin, &pin))) return hr; - } - else if (pin_matches(pin, PINDIR_OUTPUT, category, majortype, FALSE)) - { - IPin_AddRef(pin); - hr = S_OK; + + if (FAILED(IPin_ConnectedTo(pin, &peer))) + { + *ret = pin; + return S_OK; + } } else - return E_FAIL; - - if (FAILED(IPin_ConnectedTo(pin, &peer))) { - *ret = pin; - return hr; + if (FAILED(IPin_ConnectedTo(pin, &peer))) + { + if (!pin_matches(pin, PINDIR_OUTPUT, category, majortype, FALSE)) + return E_FAIL; + + IPin_AddRef(*ret = pin); + return S_OK; + } + IPin_AddRef(pin); } IPin_QueryPinInfo(peer, &info); diff --git a/dlls/qcap/tests/capturegraph.c b/dlls/qcap/tests/capturegraph.c index 629bc92d89..49b4f8c6b9 100644 --- a/dlls/qcap/tests/capturegraph.c +++ b/dlls/qcap/tests/capturegraph.c @@ -874,15 +874,15 @@ static void test_render_stream(void) hr = ICaptureGraphBuilder2_RenderStream(capture_graph, NULL, &sink1_type, (IUnknown *)&source.filter.IBaseFilter_iface, NULL, &sink.filter.IBaseFilter_iface); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(source.source1.pin.pin.peer == &transform.sink1.pin.pin.IPin_iface, "Got wrong connection.\n"); ok(transform.source1.pin.pin.peer == &sink.sink1.pin.pin.IPin_iface, "Got wrong connection.\n"); - todo_wine ok(transform.source2.pin.pin.peer == &sink.sink2.pin.pin.IPin_iface, "Got wrong connection.\n"); + ok(transform.source2.pin.pin.peer == &sink.sink2.pin.pin.IPin_iface, "Got wrong connection.\n"); ok(!source.source2.pin.pin.peer, "Pin should not be connected.\n"); disconnect_pins(graph, &source.source1); disconnect_pins(graph, &transform.source1); - todo_wine disconnect_pins(graph, &transform.source2); + disconnect_pins(graph, &transform.source2); /* Test categories. */

1 0

Zebediah Figura : qcap: Iterate over all source pins in find_unconnected_source_from_filter().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 1371838debaade98ddaeaf5da506583d338e4498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1371838debaade98ddaeaf5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:55 2020 -0500 qcap: Iterate over all source pins in find_unconnected_source_from_filter(). find_unconnected_source_from_pin() already checks the category and majortype anyway. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index 6c20e727a2..a5b00df90b 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -540,9 +540,9 @@ static HRESULT find_unconnected_source_from_pin(CaptureGraphImpl *capture_graph, static HRESULT find_unconnected_source_from_filter(CaptureGraphImpl *capture_graph, const GUID *category, const GUID *majortype, IBaseFilter *filter, IPin **ret) { + IEnumPins *enumpins; IPin *pin, *peer; HRESULT hr; - int index; if (category && (IsEqualGUID(category, &PIN_CATEGORY_CAPTURE) || IsEqualGUID(category, &PIN_CATEGORY_PREVIEW))) @@ -561,14 +561,20 @@ static HRESULT find_unconnected_source_from_filter(CaptureGraphImpl *capture_gra return E_INVALIDARG; } - for (index = 0; SUCCEEDED(ICaptureGraphBuilder2_FindPin(&capture_graph->ICaptureGraphBuilder2_iface, - (IUnknown *)filter, PINDIR_OUTPUT, category, majortype, FALSE, index, &pin)); ++index) + if (FAILED(hr = IBaseFilter_EnumPins(filter, &enumpins))) + return hr; + + while (IEnumPins_Next(enumpins, 1, &pin, NULL) == S_OK) { - hr = find_unconnected_source_from_pin(capture_graph, category, majortype, pin, ret); - IPin_Release(pin); - if (SUCCEEDED(hr)) + if (SUCCEEDED(hr = find_unconnected_source_from_pin(capture_graph, category, majortype, pin, ret))) + { + IEnumPins_Release(enumpins); + IPin_Release(pin); return hr; + } + IPin_Release(pin); } + IEnumPins_Release(enumpins); return E_INVALIDARG; }

1 0

Zebediah Figura : qcap: Use pin_matches() directly in find_unconnected_source_from_pin().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 952f194539263c059fcde6941b31f24da7086930 URL: https://source.winehq.org/git/wine.git/?a=commit;h=952f194539263c059fcde694… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:54 2020 -0500 qcap: Use pin_matches() directly in find_unconnected_source_from_pin(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index b49e45b9d6..6c20e727a2 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -511,12 +511,17 @@ static HRESULT find_unconnected_source_from_pin(CaptureGraphImpl *capture_graph, if (category && (IsEqualGUID(category, &PIN_CATEGORY_CAPTURE) || IsEqualGUID(category, &PIN_CATEGORY_PREVIEW))) - hr = match_smart_tee_pin(capture_graph, category, majortype, (IUnknown *)pin, &pin); + { + if (FAILED(hr = match_smart_tee_pin(capture_graph, category, majortype, (IUnknown *)pin, &pin))) + return hr; + } + else if (pin_matches(pin, PINDIR_OUTPUT, category, majortype, FALSE)) + { + IPin_AddRef(pin); + hr = S_OK; + } else - hr = ICaptureGraphBuilder2_FindPin(&capture_graph->ICaptureGraphBuilder2_iface, - (IUnknown *)pin, PINDIR_OUTPUT, category, majortype, FALSE, -1, &pin); - if (FAILED(hr)) - return hr; + return E_FAIL; if (FAILED(IPin_ConnectedTo(pin, &peer))) {

1 0

Zebediah Figura : qcap: Use separate functions when searching from a pin and filter.
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 74014b55397d7f8d94e769b7cfc05e25b85a233d URL: https://source.winehq.org/git/wine.git/?a=commit;h=74014b55397d7f8d94e769b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:53 2020 -0500 qcap: Use separate functions when searching from a pin and filter. Previously, if we tried to search from a matching but connected source, we would loop forever. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/capturegraph.c | 140 +++++++++++++++++++++++------------------ dlls/qcap/tests/capturegraph.c | 39 +++++------- 2 files changed, 95 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=74014b55397d7f8d94e7…

1 0

Zebediah Figura : qcap/tests: Add more tests for ICaptureGraphBuilder2::RenderStream().
by Alexandre Julliard 09 Apr '20

09 Apr '20

Module: wine Branch: master Commit: 18462a2f160d80ec701385492c7057ba5ffa05e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18462a2f160d80ec70138549… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Apr 8 15:58:52 2020 -0500 qcap/tests: Add more tests for ICaptureGraphBuilder2::RenderStream(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/capturegraph.c | 449 ++++++++++++++++++++++++++++++++++++++- dlls/qcap/tests/smartteefilter.c | 231 -------------------- 2 files changed, 443 insertions(+), 237 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=18462a2f160d80ec7013…

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 2020