August 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Upload buffer ranges through buffer ops.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: ac7ca87a68ffb43e358b3950fcd135575a28dfeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac7ca87a68ffb43e358b3950… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:07 2019 +0430 wined3d: Upload buffer ranges through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 59 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 7 +++++ 2 files changed, 40 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2a4725e..a2908bf 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -535,25 +535,6 @@ ULONG CDECL wined3d_buffer_incref(struct wined3d_buffer *buffer) return refcount; } -/* Context activation is done by the caller. */ -static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer_gl *buffer_gl, struct wined3d_context *context, - const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) -{ - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; - const struct wined3d_map_range *range; - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - - while (range_count--) - { - range = &ranges[range_count]; - GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, - range->offset, range->size, (BYTE *)data + range->offset - data_offset)); - } - checkGLcall("glBufferSubData"); -} - static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) { unsigned int i, j, range_idx, start, end, vertex_count; @@ -605,8 +586,8 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), - context, data, 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + data, 0, buffer->modified_areas, buffer->maps); heap_free(data); } @@ -691,8 +672,8 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, case WINED3D_LOCATION_BUFFER: if (!buffer->conversion_map) - wined3d_buffer_gl_upload_ranges(buffer_gl, context, buffer->resource.heap_memory, - 0, buffer->modified_areas, buffer->maps); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, + buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); else buffer_conversion_upload(buffer, context); break; @@ -1250,7 +1231,7 @@ void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_co range.size = buffer->resource.size; } - wined3d_buffer_gl_upload_ranges(wined3d_buffer_gl(buffer), context, data, range.offset, 1, &range); + buffer->buffer_ops->buffer_upload_ranges(buffer, context, data, range.offset, 1, &range); } static void wined3d_buffer_init_data(struct wined3d_buffer *buffer, @@ -1366,7 +1347,7 @@ static GLenum buffer_type_hint_from_bind_flags(const struct wined3d_gl_info *gl_ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, - void *parent, const struct wined3d_parent_ops *parent_ops) + void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_buffer_ops *buffer_ops) { const struct wined3d_format *format = wined3d_get_format(device->adapter, WINED3DFMT_UNKNOWN, desc->bind_flags); const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; @@ -1399,6 +1380,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d WARN("Failed to initialize resource, hr %#x.\n", hr); return hr; } + buffer->buffer_ops = buffer_ops; buffer->structure_byte_stride = desc->structure_byte_stride; buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; @@ -1461,6 +1443,31 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d return WINED3D_OK; } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer upload"); +} + +static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = +{ + wined3d_buffer_gl_upload_ranges, +}; + HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_buffer **buffer) @@ -1480,7 +1487,7 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct object->buffer_type_hint = buffer_type_hint_from_bind_flags(gl_info, desc->bind_flags); - if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops))) + if (FAILED(hr = wined3d_buffer_init(&object->b, device, desc, data, parent, parent_ops, &wined3d_buffer_gl_ops))) { WARN("Failed to initialize buffer, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00ed6dc..8dbf255 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4043,9 +4043,16 @@ struct wined3d_map_range UINT size; }; +struct wined3d_buffer_ops +{ + void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); +}; + struct wined3d_buffer { struct wined3d_resource resource; + const struct wined3d_buffer_ops *buffer_ops; unsigned int structure_byte_stride; DWORD flags;

1 0

Henri Verbeet : wined3d: Download buffer ranges through buffer ops.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: e1448751ead1259e3868658b76283540be2234a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1448751ead1259e3868658b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Aug 8 03:35:08 2019 +0430 wined3d: Download buffer ranges through buffer ops. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 33 ++++++++++++++++++++++++++------- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index a2908bf..65eff21 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -628,9 +628,7 @@ static BOOL wined3d_buffer_prepare_location(struct wined3d_buffer *buffer, BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); - const struct wined3d_gl_info *gl_info = context_gl->gl_info; + struct wined3d_map_range range; TRACE("buffer %p, context %p, location %s.\n", buffer, context, wined3d_debug_location(location)); @@ -664,10 +662,10 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, 0, buffer->resource.size, - buffer->resource.heap_memory)); - checkGLcall("buffer download"); + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); break; case WINED3D_LOCATION_BUFFER: @@ -1463,9 +1461,30 @@ static void wined3d_buffer_gl_upload_ranges(struct wined3d_buffer *buffer, struc checkGLcall("buffer upload"); } +/* Context activation is done by the caller. */ +static void wined3d_buffer_gl_download_ranges(struct wined3d_buffer *buffer, struct wined3d_context *context, + void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges) +{ + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + struct wined3d_buffer_gl *buffer_gl = wined3d_buffer_gl(buffer); + const struct wined3d_gl_info *gl_info = context_gl->gl_info; + const struct wined3d_map_range *range; + + wined3d_buffer_gl_bind(buffer_gl, context_gl); + + while (range_count--) + { + range = &ranges[range_count]; + GL_EXTCALL(glGetBufferSubData(buffer_gl->buffer_type_hint, + range->offset, range->size, (BYTE *)data + range->offset - data_offset)); + } + checkGLcall("buffer download"); +} + static const struct wined3d_buffer_ops wined3d_buffer_gl_ops = { wined3d_buffer_gl_upload_ranges, + wined3d_buffer_gl_download_ranges, }; HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8dbf255..173f169 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4047,6 +4047,8 @@ struct wined3d_buffer_ops { void (*buffer_upload_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, const void *data, unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); + void (*buffer_download_ranges)(struct wined3d_buffer *buffer, struct wined3d_context *context, void *data, + unsigned int data_offset, unsigned int range_count, const struct wined3d_map_range *ranges); }; struct wined3d_buffer

1 0

Zebediah Figura : include: Add NTSTATUS severity macros.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: a28736df1fad6c64995afb9e7432b4d741adeed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a28736df1fad6c64995afb9e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:11 2019 -0500 include: Add NTSTATUS severity macros. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sec.c | 6 ++---- include/ntdef.h | 5 +++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 02fc77d..464104d 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -43,8 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); -#define NT_SUCCESS(status) (status == STATUS_SUCCESS) - #define SELF_RELATIVE_FIELD(sd,field) ((BYTE *)(sd) + ((SECURITY_DESCRIPTOR_RELATIVE *)(sd))->field) /* helper function to retrieve active length of an ACL */ @@ -1521,7 +1519,7 @@ RtlAdjustPrivilege(ULONG Privilege, &TokenHandle); } - if (!NT_SUCCESS(Status)) + if (Status) { WARN("Retrieving token handle failed (Status %x)\n", Status); return Status; @@ -1546,7 +1544,7 @@ RtlAdjustPrivilege(ULONG Privilege, TRACE("Failed to assign all privileges\n"); return STATUS_PRIVILEGE_NOT_HELD; } - if (!NT_SUCCESS(Status)) + if (Status) { WARN("NtAdjustPrivilegesToken() failed (Status %x)\n", Status); return Status; diff --git a/include/ntdef.h b/include/ntdef.h index 83ecffd..014102a 100644 --- a/include/ntdef.h +++ b/include/ntdef.h @@ -43,4 +43,9 @@ typedef enum _WAIT_TYPE { } #endif +#define NT_SUCCESS(status) (((NTSTATUS)(status)) >= 0) +#define NT_INFORMATION(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x40000000) +#define NT_WARNING(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0x80000000) +#define NT_ERROR(status) ((((NTSTATUS)(status)) & 0xc0000000) == 0xc0000000) + #endif /* _NTDEF_ */

1 0

Zebediah Figura : ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set.
by Alexandre Julliard 09 Aug '19

09 Aug '19

Module: wine Branch: master Commit: b9919c2e7f7ac92417cb2d8ed10414b318f03f1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9919c2e7f7ac92417cb2d8e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Aug 7 21:10:12 2019 -0500 ntoskrnl.exe: Set the IRP output buffer unless the status has both high bits set. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 6488e52..ccc5fce 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -439,7 +439,7 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; req->size = irp->IoStatus.Information; - if (irp->IoStatus.u.Status >= 0) + if (!NT_ERROR(irp->IoStatus.u.Status)) { if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index e7a8cc9..86dce75 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -444,7 +444,7 @@ static void test_return_status(void) sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); ok(!ret, "ioctl succeeded\n"); ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); - todo_wine ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); ok(ret_size == 3, "got size %u\n", ret_size); strcpy(buffer, "abcdef");

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add some tests for file objects.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 7845c0117a6a26f78fcc870b8fbae4ff74816ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7845c0117a6a26f78fcc870b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 22:48:41 2019 -0500 ntoskrnl.exe/tests: Add some tests for file objects. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 42 ++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/driver.h | 3 ++ dlls/ntoskrnl.exe/tests/ntoskrnl.c | 71 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 41b1420..f43e48f 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -209,6 +209,7 @@ static void *get_proc_address(const char *name) } static FILE_OBJECT *last_created_file; +static unsigned int create_count, close_count; static void test_irp_struct(IRP *irp, DEVICE_OBJECT *device) { @@ -1631,7 +1632,7 @@ static NTSTATUS test_basic_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * return STATUS_SUCCESS; } -static NTSTATUS get_cancel_count(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +static NTSTATUS get_dword(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info, DWORD value) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; char *buffer = irp->AssociatedIrp.SystemBuffer; @@ -1642,7 +1643,24 @@ static NTSTATUS get_cancel_count(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR * if (length < sizeof(DWORD)) return STATUS_BUFFER_TOO_SMALL; - *(DWORD*)buffer = cancel_cnt; + *(DWORD*)buffer = value; + *info = sizeof(DWORD); + return STATUS_SUCCESS; +} + +static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; + char *buffer = irp->AssociatedIrp.SystemBuffer; + DWORD *context = stack->FileObject->FsContext; + + if (!buffer || !context) + return STATUS_ACCESS_VIOLATION; + + if (length < sizeof(DWORD)) + return STATUS_BUFFER_TOO_SMALL; + + *(DWORD*)buffer = *context; *info = sizeof(DWORD); return STATUS_SUCCESS; } @@ -1667,8 +1685,13 @@ static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG static NTSTATUS WINAPI driver_Create(DEVICE_OBJECT *device, IRP *irp) { IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp ); + DWORD *context = ExAllocatePool(PagedPool, sizeof(*context)); last_created_file = irpsp->FileObject; + ++create_count; + if (context) + *context = create_count; + irpsp->FileObject->FsContext = context; create_caller_thread = KeGetCurrentThread(); irp->IoStatus.Status = STATUS_SUCCESS; @@ -1701,7 +1724,16 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) IoMarkIrpPending(irp); return STATUS_PENDING; case IOCTL_WINETEST_GET_CANCEL_COUNT: - status = get_cancel_count(irp, stack, &irp->IoStatus.Information); + status = get_dword(irp, stack, &irp->IoStatus.Information, cancel_cnt); + break; + case IOCTL_WINETEST_GET_CREATE_COUNT: + status = get_dword(irp, stack, &irp->IoStatus.Information, create_count); + break; + case IOCTL_WINETEST_GET_CLOSE_COUNT: + status = get_dword(irp, stack, &irp->IoStatus.Information, close_count); + break; + case IOCTL_WINETEST_GET_FSCONTEXT: + status = get_fscontext(irp, stack, &irp->IoStatus.Information); break; case IOCTL_WINETEST_DETACH: IoDetachDevice(lower_device); @@ -1733,6 +1765,10 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) static NTSTATUS WINAPI driver_Close(DEVICE_OBJECT *device, IRP *irp) { + IO_STACK_LOCATION *stack = IoGetCurrentIrpStackLocation(irp); + ++close_count; + if (stack->FileObject->FsContext) + ExFreePool(stack->FileObject->FsContext); irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(irp, IO_NO_INCREMENT); return STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index d5ff09a..a468cbd 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -29,6 +29,9 @@ #define IOCTL_WINETEST_TEST_CANCEL CTL_CODE(FILE_DEVICE_UNKNOWN, 0x804, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_CANCEL_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x805, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_DETACH CTL_CODE(FILE_DEVICE_UNKNOWN, 0x806, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_GET_CREATE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x807, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 48ddb29..dfd0cb3 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -318,6 +318,76 @@ static void test_load_driver(SC_HANDLE service) ok(status.dwCurrentState == SERVICE_STOPPED, "got state %#x\n", status.dwCurrentState); } +static void test_file_handles(void) +{ + DWORD count, ret_size; + HANDLE file, dup, file2; + BOOL ret; + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CREATE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 2, "got %u\n", count); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CLOSE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + + file = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CREATE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 3, "got %u\n", count); + + file2 = CreateFileA("\\\\.\\WineTestDriver", 0, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file2 != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CREATE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 4, "got %u\n", count); + + ret = DuplicateHandle(GetCurrentProcess(), file, GetCurrentProcess(), &dup, 0, FALSE, DUPLICATE_SAME_ACCESS); + ok(ret, "failed to duplicate handle: %u\n", GetLastError()); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CREATE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 4, "got %u\n", count); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_FSCONTEXT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + + ret = DeviceIoControl(file, IOCTL_WINETEST_GET_FSCONTEXT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 3, "got %u\n", count); + + ret = DeviceIoControl(file2, IOCTL_WINETEST_GET_FSCONTEXT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 4, "got %u\n", count); + + ret = DeviceIoControl(dup, IOCTL_WINETEST_GET_FSCONTEXT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 3, "got %u\n", count); + + CloseHandle(dup); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CLOSE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 1, "got %u\n", count); + + CloseHandle(file2); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CLOSE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 2, "got %u\n", count); + + CloseHandle(file); + + ret = DeviceIoControl(device, IOCTL_WINETEST_GET_CLOSE_COUNT, NULL, 0, &count, sizeof(count), &ret_size, NULL); + ok(ret, "ioctl failed: %u\n", GetLastError()); + ok(count == 3, "got %u\n", count); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -369,6 +439,7 @@ START_TEST(ntoskrnl) main_test(); test_overlapped(); test_load_driver(service2); + test_file_handles(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */

1 0

Zebediah Figura : ntoskrnl.exe/tests: Add some tests for IRP return values.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: d99ecb078b628e2ee9cd2c54049b3e67f1ae1208 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d99ecb078b628e2ee9cd2c54… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 22:48:42 2019 -0500 ntoskrnl.exe/tests: Add some tests for IRP return values. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 21 +++++++++++ dlls/ntoskrnl.exe/tests/driver.h | 1 + dlls/ntoskrnl.exe/tests/ntoskrnl.c | 71 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index f43e48f..525d818 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1665,6 +1665,24 @@ static NTSTATUS get_fscontext(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *inf return STATUS_SUCCESS; } +static NTSTATUS return_status(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) +{ + char *buffer = irp->AssociatedIrp.SystemBuffer; + NTSTATUS ret; + + if (!buffer) + return STATUS_ACCESS_VIOLATION; + + if (stack->Parameters.DeviceIoControl.InputBufferLength < sizeof(DWORD) + || stack->Parameters.DeviceIoControl.OutputBufferLength < 3) + return STATUS_BUFFER_TOO_SMALL; + + ret = *(DWORD *)irp->AssociatedIrp.SystemBuffer; + memcpy(buffer, "ghi", 3); + *info = 3; + return ret; +} + static NTSTATUS test_load_driver_ioctl(IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { BOOL *load = irp->AssociatedIrp.SystemBuffer; @@ -1735,6 +1753,9 @@ static NTSTATUS WINAPI driver_IoControl(DEVICE_OBJECT *device, IRP *irp) case IOCTL_WINETEST_GET_FSCONTEXT: status = get_fscontext(irp, stack, &irp->IoStatus.Information); break; + case IOCTL_WINETEST_RETURN_STATUS: + status = return_status(irp, stack, &irp->IoStatus.Information); + break; case IOCTL_WINETEST_DETACH: IoDetachDevice(lower_device); status = STATUS_SUCCESS; diff --git a/dlls/ntoskrnl.exe/tests/driver.h b/dlls/ntoskrnl.exe/tests/driver.h index a468cbd..313d554 100644 --- a/dlls/ntoskrnl.exe/tests/driver.h +++ b/dlls/ntoskrnl.exe/tests/driver.h @@ -32,6 +32,7 @@ #define IOCTL_WINETEST_GET_CREATE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x807, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_CLOSE_COUNT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x808, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_WINETEST_GET_FSCONTEXT CTL_CODE(FILE_DEVICE_UNKNOWN, 0x809, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_RETURN_STATUS CTL_CODE(FILE_DEVICE_UNKNOWN, 0x80a, METHOD_BUFFERED, FILE_ANY_ACCESS) static const char teststr[] = "Wine is not an emulator"; diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index dfd0cb3..c701cf2 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -21,6 +21,8 @@ */ #include <stdio.h> +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windows.h" #include "winsvc.h" #include "winioctl.h" @@ -388,6 +390,74 @@ static void test_file_handles(void) ok(count == 3, "got %u\n", count); } +static void test_return_status(void) +{ + NTSTATUS status; + char buffer[7]; + DWORD ret_size; + BOOL ret; + + strcpy(buffer, "abcdef"); + status = STATUS_SUCCESS; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + ok(ret, "ioctl failed\n"); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(ret_size == 3, "got size %u\n", ret_size); + + strcpy(buffer, "abcdef"); + status = STATUS_TIMEOUT; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + todo_wine ok(ret, "ioctl failed\n"); + todo_wine ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(ret_size == 3, "got size %u\n", ret_size); + + strcpy(buffer, "abcdef"); + status = 0x0eadbeef; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + todo_wine ok(ret, "ioctl failed\n"); + todo_wine ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(ret_size == 3, "got size %u\n", ret_size); + + strcpy(buffer, "abcdef"); + status = 0x4eadbeef; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + todo_wine ok(ret, "ioctl failed\n"); + todo_wine ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + ok(ret_size == 3, "got size %u\n", ret_size); + + strcpy(buffer, "abcdef"); + status = 0x8eadbeef; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + ok(!ret, "ioctl succeeded\n"); + ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); + todo_wine ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); + todo_wine ok(ret_size == 3, "got size %u\n", ret_size); + + strcpy(buffer, "abcdef"); + status = 0xceadbeef; + SetLastError(0xdeadbeef); + ret = DeviceIoControl(device, IOCTL_WINETEST_RETURN_STATUS, &status, + sizeof(status), buffer, sizeof(buffer), &ret_size, NULL); + ok(!ret, "ioctl succeeded\n"); + ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); + ok(!strcmp(buffer, "abcdef"), "got buffer %s\n", buffer); + todo_wine ok(ret_size == 3, "got size %u\n", ret_size); +} + static void test_driver3(void) { char filename[MAX_PATH]; @@ -440,6 +510,7 @@ START_TEST(ntoskrnl) test_overlapped(); test_load_driver(service2); test_file_handles(); + test_return_status(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */

1 0

Zebediah Figura : ntoskrnl.exe: Always set the IRP return size.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: dfc7132f50321dd9117930020c5fc670c905ddba URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfc7132f50321dd911793002… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 22:48:43 2019 -0500 ntoskrnl.exe: Always set the IRP return size. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 92f9afa..40c18d8 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -438,9 +438,9 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, { req->handle = wine_server_obj_handle( irp_handle ); req->status = irp->IoStatus.u.Status; + req->size = irp->IoStatus.Information; if (irp->IoStatus.u.Status >= 0) { - req->size = irp->IoStatus.Information; if (out_buff) wine_server_add_data( req, out_buff, irp->IoStatus.Information ); } status = wine_server_call( req ); diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index c701cf2..e7a8cc9 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -445,7 +445,7 @@ static void test_return_status(void) ok(!ret, "ioctl succeeded\n"); ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); todo_wine ok(!strcmp(buffer, "ghidef"), "got buffer %s\n", buffer); - todo_wine ok(ret_size == 3, "got size %u\n", ret_size); + ok(ret_size == 3, "got size %u\n", ret_size); strcpy(buffer, "abcdef"); status = 0xceadbeef; @@ -455,7 +455,7 @@ static void test_return_status(void) ok(!ret, "ioctl succeeded\n"); ok(GetLastError() == ERROR_MR_MID_NOT_FOUND, "got error %u\n", GetLastError()); ok(!strcmp(buffer, "abcdef"), "got buffer %s\n", buffer); - todo_wine ok(ret_size == 3, "got size %u\n", ret_size); + ok(ret_size == 3, "got size %u\n", ret_size); } static void test_driver3(void)

1 0

Kai Krakow : wined3d: Add GPU information for NVIDIA GTX 1660 Ti.
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 682805ec6aef71ea7aac04a665ded43680666438 URL: https://source.winehq.org/git/wine.git/?a=commit;h=682805ec6aef71ea7aac04a6… Author: Kai Krakow <kai(a)kaishome.de> Date: Mon Aug 5 23:57:43 2019 +0200 wined3d: Add GPU information for NVIDIA GTX 1660 Ti. Signed-off-by: Kai Krakow <kai(a)kaishome.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c500c34..86e347d 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -1357,6 +1357,7 @@ cards_nvidia_binary[] = {"RTX 2080", CARD_NVIDIA_GEFORCE_RTX2080}, /* GeForce 2000 - highend */ {"RTX 2070", CARD_NVIDIA_GEFORCE_RTX2070}, /* GeForce 2000 - highend */ {"RTX 2060", CARD_NVIDIA_GEFORCE_RTX2060}, /* GeForce 2000 - highend */ + {"GTX 1660 Ti", CARD_NVIDIA_GEFORCE_GTX1660TI}, /* GeForce 1600 - highend */ {"TITAN V", CARD_NVIDIA_TITANV}, /* GeForce 1000 - highend */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 15063e7..967348d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -338,6 +338,7 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANV, "NVIDIA TITAN V", DRIVER_NVIDIA_GEFORCE8, 12288}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1660TI, "NVIDIA GeForce GTX 1660 Ti", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2060, "NVIDIA GeForce RTX 2060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2070, "NVIDIA GeForce RTX 2070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_RTX2080, "NVIDIA GeForce RTX 2080", DRIVER_NVIDIA_GEFORCE8, 8192}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1048d19..c628b2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2513,6 +2513,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_NVIDIA_TITANV = 0x1d81, + CARD_NVIDIA_GEFORCE_GTX1660TI = 0x2182, CARD_NVIDIA_GEFORCE_RTX2060 = 0x1f08, CARD_NVIDIA_GEFORCE_RTX2070 = 0x1f07, CARD_NVIDIA_GEFORCE_RTX2080 = 0x1e87,

1 0

Zebediah Figura : quartz/filtergraph: Remove type tracing from IGraphBuilder::AddSourceFilter().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: a4006aa7d7f65809f5b4bc506ee092d3235bbf70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a4006aa7d7f65809f5b4bc50… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:30 2019 -0500 quartz/filtergraph: Remove type tracing from IGraphBuilder::AddSourceFilter(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a441294..d151cdf 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1754,9 +1754,6 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR IFilterGraphImpl *This = impl_from_IFilterGraph2(iface); HRESULT hr; IBaseFilter* preader; - IFileSourceFilter* pfile = NULL; - AM_MEDIA_TYPE mt; - WCHAR* filename; TRACE("(%p/%p)->(%s, %s, %p)\n", This, iface, debugstr_w(lpcwstrFileName), debugstr_w(lpcwstrFilterName), ppFilter); @@ -1774,39 +1771,10 @@ static HRESULT WINAPI FilterGraph2_AddSourceFilter(IFilterGraph2 *iface, LPCWSTR return hr; } - hr = IBaseFilter_QueryInterface(preader, &IID_IFileSourceFilter, (LPVOID*)&pfile); - if (FAILED(hr)) { - WARN("Unable to get IFileSourceInterface (%x)\n", hr); - goto error; - } - - /* The file has been already loaded */ - hr = IFileSourceFilter_GetCurFile(pfile, &filename, &mt); - if (FAILED(hr)) { - WARN("GetCurFile (%x)\n", hr); - goto error; - } - - TRACE("File %s\n", debugstr_w(filename)); - TRACE("MajorType %s\n", debugstr_guid(&mt.majortype)); - TRACE("SubType %s\n", debugstr_guid(&mt.subtype)); - - CoTaskMemFree(filename); - FreeMediaType(&mt); - if (ppFilter) *ppFilter = preader; - IFileSourceFilter_Release(pfile); return S_OK; - -error: - if (pfile) - IFileSourceFilter_Release(pfile); - IFilterGraph2_RemoveFilter(iface, preader); - IBaseFilter_Release(preader); - - return hr; } static HRESULT WINAPI FilterGraph2_SetLogFile(IFilterGraph2 *iface, DWORD_PTR hFile)

1 0

Zebediah Figura : quartz: Remove unnecessary tracing from GetClassMediaFile().
by Alexandre Julliard 07 Aug '19

07 Aug '19

Module: wine Branch: master Commit: 7d89e791bd412e70df588c7cae594f30bcc070c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d89e791bd412e70df588c7c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Aug 6 14:58:31 2019 -0500 quartz: Remove unnecessary tracing from GetClassMediaFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 31 +++++++------------------------ dlls/quartz/filtergraph.c | 1 + 2 files changed, 8 insertions(+), 24 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index e66c3fa..25c523b 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -191,8 +191,6 @@ static HRESULT process_pattern_string(LPCWSTR wszPatternString, IAsyncReader * p HRESULT hr = S_OK; ULONG strpos; - TRACE("\t\tPattern string: %s\n", debugstr_w(wszPatternString)); - /* format: "offset, bytestocompare, mask, value" */ ulOffset = wcstol(wszPatternString, NULL, 10); @@ -281,8 +279,6 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * BOOL bFound = FALSE; static const WCHAR wszMediaType[] = {'M','e','d','i','a',' ','T','y','p','e',0}; - TRACE("(%p, %s, %p, %p)\n", pReader, debugstr_w(pszFileName), majorType, minorType); - if(majorType) *majorType = GUID_NULL; if(minorType) @@ -308,7 +304,6 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * break; if (RegOpenKeyExW(hkeyMediaType, wszMajorKeyName, 0, KEY_READ, &hkeyMajor) != ERROR_SUCCESS) break; - TRACE("%s\n", debugstr_w(wszMajorKeyName)); if (!wcscmp(wszExtensions, wszMajorKeyName)) { if (process_extensions(hkeyMajor, pszFileName, majorType, minorType, sourceFilter) == S_OK) @@ -335,8 +330,6 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * if (RegOpenKeyExW(hkeyMajor, wszMinorKeyName, 0, KEY_READ, &hkeyMinor) != ERROR_SUCCESS) break; - TRACE("\t%s\n", debugstr_w(wszMinorKeyName)); - if (RegQueryInfoKeyW(hkeyMinor, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &maxValueLen, NULL, NULL) != ERROR_SUCCESS) break; @@ -387,22 +380,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * } CloseHandle(hkeyMediaType); - if (SUCCEEDED(hr) && !bFound) - { - ERR("Media class not found\n"); - hr = E_FAIL; - } - else if (bFound) - { - TRACE("Found file's class:\n"); - if(majorType) - TRACE("\tmajor = %s\n", qzdebugstr_guid(majorType)); - if(minorType) - TRACE("\tsubtype = %s\n", qzdebugstr_guid(minorType)); - if(sourceFilter) - TRACE("\tsource filter = %s\n", qzdebugstr_guid(sourceFilter)); - } - + if (hr == S_OK && !bFound) hr = E_FAIL; return hr; } @@ -581,7 +559,12 @@ static HRESULT WINAPI FileSource_Load(IFileSourceFilter * iface, LPCOLESTR pszFi if (!pmt) { CopyMediaType(This->pmt, &default_mt); - if (FAILED(GetClassMediaFile(&This->IAsyncReader_iface, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL))) + if (SUCCEEDED(GetClassMediaFile(&This->IAsyncReader_iface, pszFileName, &This->pmt->majortype, &This->pmt->subtype, NULL))) + { + TRACE("Found major type %s, subtype %s.\n", + debugstr_guid(&This->pmt->majortype), debugstr_guid(&This->pmt->subtype)); + } + else { This->pmt->majortype = MEDIATYPE_Stream; This->pmt->subtype = MEDIASUBTYPE_NULL; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d151cdf..c52f0ca 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -1739,6 +1739,7 @@ static HRESULT GetFileSourceFilter(LPCOLESTR pszFileName, IBaseFilter **filter) if (hr == S_OK) { + TRACE("Found source filter %s.\n", debugstr_guid(&clsid)); /* Release the AsyncReader filter and create the matching one */ IBaseFilter_Release(*filter); return CreateFilterInstanceAndLoadFile(&clsid, pszFileName, filter);

1 0