wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Bernhard Übelacker : cmd: Load start.exe from the system directory.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 810de9d1a733f3aaa7ffaf3f61808fb9582d92e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=810de9d1a733f3aaa7ffaf3f… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Wed Sep 8 14:17:14 2021 +0200 cmd: Load start.exe from the system directory. Fixes cmd test in pure 64-bit wine. Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/cmd/builtins.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index c7df724ae00..a55ce6e0244 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -4351,8 +4351,8 @@ void WCMD_start(WCHAR *args) STARTUPINFOW st; PROCESS_INFORMATION pi; - GetWindowsDirectoryW( file, MAX_PATH ); - lstrcatW(file, L"\\command\\start.exe"); + GetSystemDirectoryW( file, MAX_PATH ); + lstrcatW(file, L"\\start.exe"); cmdline = heap_xalloc( (lstrlenW(file) + lstrlenW(args) + 8) * sizeof(WCHAR) ); lstrcpyW( cmdline, file ); lstrcatW(cmdline, L" ");

1 0

Zebediah Figura : server: Don't wake up always-blocking asyncs.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: a1c42293a2b0b4e039a00bfb8d73fdd0c543b0bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1c42293a2b0b4e039a00bfb… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:42 2021 -0500 server: Don't wake up always-blocking asyncs. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 12 ++++++------ server/async.c | 4 ++-- server/device.c | 2 +- server/file.h | 2 +- server/sock.c | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 682af256b43..f3bdc2cb477 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1169,15 +1169,15 @@ static void test_blocking_irp(void) memset(&io, 0xcc, sizeof(io)); status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); - todo_wine ok(!status, "got %#x\n", status); - todo_wine ok(!io.Status, "got iosb status %#x\n", io.Status); - todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); memset(&io, 0xcc, sizeof(io)); status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); - todo_wine ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); - todo_wine ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); - todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); CloseHandle(file); } diff --git a/server/async.c b/server/async.c index 8dba55afb01..2dbdfc76a59 100644 --- a/server/async.c +++ b/server/async.c @@ -285,13 +285,13 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da return async; } -void set_async_pending( struct async *async, int signal ) +void set_async_pending( struct async *async ) { if (!async->terminated) { async->pending = 1; async->unknown_status = 0; - if (signal && !async->signaled) + if (!async->blocking && !async->signaled) { async->signaled = 1; wake_up( &async->obj, 0 ); diff --git a/server/device.c b/server/device.c index 9515d238fb4..a2383ecdc7c 100644 --- a/server/device.c +++ b/server/device.c @@ -961,7 +961,7 @@ DECL_HANDLER(get_next_device_request) * so we need to do it now */ cancel_irp_call( irp ); else if (irp->async) - set_async_pending( irp->async, irp->file && is_fd_overlapped( irp->file->fd ) ); + set_async_pending( irp->async ); free_irp_params( irp ); release_object( irp ); diff --git a/server/file.h b/server/file.h index 22879b75c05..80f2191c050 100644 --- a/server/file.h +++ b/server/file.h @@ -229,7 +229,7 @@ extern void async_set_timeout( struct async *async, timeout_t timeout, unsigned extern void async_set_result( struct object *obj, unsigned int status, apc_param_t total ); extern void async_set_completion_callback( struct async *async, async_completion_callback func, void *private ); extern void async_set_unknown_status( struct async *async ); -extern void set_async_pending( struct async *async, int signal ); +extern void set_async_pending( struct async *async ); extern int async_waiting( struct async_queue *queue ); extern void async_terminate( struct async *async, unsigned int status ); extern void async_request_complete( struct async *async, unsigned int status, data_size_t result, diff --git a/server/sock.c b/server/sock.c index 3d2e8c005f0..fc234e89865 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2399,7 +2399,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) obj_handle_t event_handle; int mask; - set_async_pending( async, 0 ); + set_async_pending( async ); if (is_machine_64bit( current->process->machine )) { @@ -2530,7 +2530,7 @@ static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) #endif } - set_async_pending( async, 0 ); + set_async_pending( async ); if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0

Zebediah Figura : server: Use a separate field to track whether an async is blocking.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 386c4bcf2f0d86a5a19c4836fc4b160c36ccb499 URL: https://source.winehq.org/git/wine.git/?a=commit;h=386c4bcf2f0d86a5a19c4836… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:41 2021 -0500 server: Use a separate field to track whether an async is blocking. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/async.c b/server/async.c index d1627069086..8dba55afb01 100644 --- a/server/async.c +++ b/server/async.c @@ -55,6 +55,7 @@ struct async unsigned int terminated :1; /* async has been terminated */ unsigned int canceled :1; /* have we already queued cancellation for this async? */ unsigned int unknown_status :1; /* initial status is not known yet */ + unsigned int blocking :1; /* async is blocking */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ unsigned int comp_flags; /* completion flags */ @@ -262,6 +263,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->terminated = 0; async->canceled = 0; async->unknown_status = 0; + async->blocking = !is_fd_overlapped( fd ); async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; async->completion_callback = NULL; @@ -300,6 +302,8 @@ void set_async_pending( struct async *async, int signal ) /* return async object status and wait handle to client */ obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_blocking ) { + async->blocking = force_blocking || async->blocking; + if (async->unknown_status) { /* even the initial status is not known yet */ @@ -338,7 +342,7 @@ obj_handle_t async_handoff( struct async *async, data_size_t *result, int force_ { async->direct_result = 0; async->pending = 1; - if (!force_blocking && async->fd && is_fd_overlapped( async->fd )) + if (!async->blocking) { close_handle( async->thread->process, async->wait_handle); async->wait_handle = 0;

1 0

Zebediah Figura : ntoskrnl/tests: Test a pending NtQueryVolumeInformation call on an overlapped file handle.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 0f7c784fb7b1309382d0b2cf4656f28c297f9383 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f7c784fb7b1309382d0b2cf… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:40 2021 -0500 ntoskrnl/tests: Test a pending NtQueryVolumeInformation call on an overlapped file handle. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/tests/driver.c | 59 +++++++++++++++++++++++++++++++------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 44 ++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 10 deletions(-) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 0d40053b0e6..8cb97507ab5 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -1959,15 +1959,12 @@ static void test_object_name(void) ok(!name->Name.MaximumLength, "got maximum length %u\n", name->Name.MaximumLength); } -static PIO_WORKITEM main_test_work_item; +static PIO_WORKITEM work_item; static void WINAPI main_test_task(DEVICE_OBJECT *device, void *context) { IRP *irp = context; - IoFreeWorkItem(main_test_work_item); - main_test_work_item = NULL; - test_current_thread(TRUE); test_critical_region(FALSE); test_call_driver(device); @@ -2337,13 +2334,8 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_process_memory(test_input); test_permanence(); - if (main_test_work_item) return STATUS_UNEXPECTED_IO_ERROR; - - main_test_work_item = IoAllocateWorkItem(lower_device); - ok(main_test_work_item != NULL, "main_test_work_item = NULL\n"); - IoMarkIrpPending(irp); - IoQueueWorkItem(main_test_work_item, main_test_task, DelayedWorkQueue, irp); + IoQueueWorkItem(work_item, main_test_task, DelayedWorkQueue, irp); return STATUS_PENDING; } @@ -2611,6 +2603,32 @@ static NTSTATUS WINAPI driver_FlushBuffers(DEVICE_OBJECT *device, IRP *irp) return STATUS_PENDING; } +static void WINAPI blocking_irp_task(DEVICE_OBJECT *device, void *context) +{ + LARGE_INTEGER timeout; + IRP *irp = context; + + timeout.QuadPart = -100 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); + + irp->IoStatus.Status = STATUS_SUCCESS; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + +static void WINAPI blocking_irp_failure_task(DEVICE_OBJECT *device, void *context) +{ + LARGE_INTEGER timeout; + IRP *irp = context; + + timeout.QuadPart = -100 * 10000; + KeDelayExecutionThread( KernelMode, FALSE, &timeout ); + + irp->IoStatus.Status = STATUS_DEVICE_NOT_READY; + irp->IoStatus.Information = 0; + IoCompleteRequest(irp, IO_NO_INCREMENT); +} + static BOOL compare_file_name(const struct file_context *context, const WCHAR *expect) { return context->namelen == wcslen(expect) * sizeof(WCHAR) @@ -2717,6 +2735,21 @@ static NTSTATUS WINAPI driver_QueryVolumeInformation(DEVICE_OBJECT *device, IRP ret = STATUS_SUCCESS; break; } + + case FileFsSizeInformation: + { + IoMarkIrpPending(irp); + IoQueueWorkItem(work_item, blocking_irp_task, DelayedWorkQueue, irp); + return STATUS_PENDING; + } + + case FileFsFullSizeInformation: + { + IoMarkIrpPending(irp); + IoQueueWorkItem(work_item, blocking_irp_failure_task, DelayedWorkQueue, irp); + return STATUS_PENDING; + } + default: ret = STATUS_NOT_IMPLEMENTED; break; @@ -2744,6 +2777,9 @@ static VOID WINAPI driver_Unload(DRIVER_OBJECT *driver) DbgPrint("unloading driver\n"); + IoFreeWorkItem(work_item); + work_item = NULL; + RtlInitUnicodeString(&linkW, L"\\DosDevices\\WineTestDriver"); IoDeleteSymbolicLink(&linkW); @@ -2802,5 +2838,8 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry) IoAttachDeviceToDeviceStack(upper_device, lower_device); upper_device->Flags &= ~DO_DEVICE_INITIALIZING; + work_item = IoAllocateWorkItem(lower_device); + ok(work_item != NULL, "work_item = NULL\n"); + return STATUS_SUCCESS; } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 7b61f131e96..682af256b43 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -1139,6 +1139,49 @@ static void test_object_info(void) CloseHandle(file); } +static void test_blocking_irp(void) +{ + char buffer[40]; + IO_STATUS_BLOCK io; + NTSTATUS status; + HANDLE file; + + file = CreateFileA("\\\\.\\WineTestDriver\\", FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); + ok(!status, "got %#x\n", status); + ok(!io.Status, "got iosb status %#x\n", io.Status); + ok(!io.Information, "got information %#Ix\n", io.Information); + + io.Status = 0xdeadf00d; + io.Information = 0xdeadf00d; + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); + ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + todo_wine ok(io.Status == 0xdeadf00d, "got iosb status %#x\n", io.Status); + todo_wine ok(io.Information == 0xdeadf00d, "got information %#Ix\n", io.Information); + + CloseHandle(file); + + file = CreateFileA("\\\\.\\WineTestDriver\\", FILE_ALL_ACCESS, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL); + ok(file != INVALID_HANDLE_VALUE, "failed to open device: %u\n", GetLastError()); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsSizeInformation); + todo_wine ok(!status, "got %#x\n", status); + todo_wine ok(!io.Status, "got iosb status %#x\n", io.Status); + todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + + memset(&io, 0xcc, sizeof(io)); + status = NtQueryVolumeInformationFile(file, &io, buffer, sizeof(buffer), FileFsFullSizeInformation); + todo_wine ok(status == STATUS_DEVICE_NOT_READY, "got %#x\n", status); + todo_wine ok(io.Status == STATUS_DEVICE_NOT_READY, "got iosb status %#x\n", io.Status); + todo_wine ok(!io.Information, "got information %#Ix\n", io.Information); + + CloseHandle(file); +} + static void test_driver3(struct testsign_context *ctx) { WCHAR filename[MAX_PATH]; @@ -3487,6 +3530,7 @@ START_TEST(ntoskrnl) test_file_handles(); test_return_status(); test_object_info(); + test_blocking_irp(); /* We need a separate ioctl to call IoDetachDevice(); calling it in the * driver unload routine causes a live-lock. */

1 0

Zebediah Figura : server: Queue a cancel IRP in the device file cancel_async callback.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 32347fcf08440d9faad8902896df3e107699e35e URL: https://source.winehq.org/git/wine.git/?a=commit;h=32347fcf08440d9faad89028… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:39 2021 -0500 server: Queue a cancel IRP in the device file cancel_async callback. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/httpapi/tests/httpapi.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.c | 22 ---------------------- server/async.c | 9 ++++++++- server/device.c | 23 ++++++++++------------- 4 files changed, 20 insertions(+), 36 deletions(-) diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index 1d1ad56e9f6..b0431b0f3fd 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -349,6 +349,8 @@ static void test_v1_server(void) ret = CancelIo(queue); ok(ret, "Failed to close queue handle, error %u.\n", GetLastError()); + ret = WaitForSingleObject(ovl.hEvent, 100); + ok(!ret, "Got %u.\n", ret); ret_size = 0xdeadbeef; ret = GetOverlappedResult(queue, &ovl, &ret_size, FALSE); ok(!ret, "Expected failure.\n"); diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 5c3a42c3d76..f7a9d8e8efe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -419,17 +419,6 @@ static void *create_file_object( HANDLE handle ) DECLARE_CRITICAL_SECTION(irp_completion_cs); -static void WINAPI cancel_completed_irp( DEVICE_OBJECT *device, IRP *irp ) -{ - TRACE( "(%p %p)\n", device, irp ); - - IoReleaseCancelSpinLock(irp->CancelIrql); - - irp->IoStatus.u.Status = STATUS_CANCELLED; - irp->IoStatus.Information = 0; - IoCompleteRequest(irp, IO_NO_INCREMENT); -} - /* transfer result of IRP back to wineserver */ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, void *context ) { @@ -455,17 +444,6 @@ static NTSTATUS WINAPI dispatch_irp_completion( DEVICE_OBJECT *device, IRP *irp, } SERVER_END_REQ; - if (status == STATUS_MORE_PROCESSING_REQUIRED) - { - /* IRP is complete, but server may have already ordered cancel call. In such case, - * it will return STATUS_MORE_PROCESSING_REQUIRED, leaving the IRP alive until - * cancel frees it. */ - if (irp->Cancel) - status = STATUS_SUCCESS; - else - IoSetCancelRoutine( irp, cancel_completed_irp ); - } - if (irp->UserBuffer != irp->AssociatedIrp.SystemBuffer) { HeapFree( GetProcessHeap(), 0, irp->UserBuffer ); diff --git a/server/async.c b/server/async.c index 278048bc7a3..d1627069086 100644 --- a/server/async.c +++ b/server/async.c @@ -53,6 +53,7 @@ struct async unsigned int direct_result :1;/* a flag if we're passing result directly from request instead of APC */ unsigned int alerted :1; /* fd is signaled, but we are waiting for client-side I/O */ unsigned int terminated :1; /* async has been terminated */ + unsigned int canceled :1; /* have we already queued cancellation for this async? */ unsigned int unknown_status :1; /* initial status is not known yet */ struct completion *completion; /* completion associated with fd */ apc_param_t comp_key; /* completion key associated with fd */ @@ -259,6 +260,7 @@ struct async *create_async( struct fd *fd, struct thread *thread, const async_da async->direct_result = 0; async->alerted = 0; async->terminated = 0; + async->canceled = 0; async->unknown_status = 0; async->completion = fd_get_completion( fd, &async->comp_key ); async->comp_flags = 0; @@ -494,14 +496,19 @@ static int cancel_async( struct process *process, struct object *obj, struct thr struct async *async; int woken = 0; + /* FIXME: it would probably be nice to replace the "canceled" flag with a + * single LIST_FOR_EACH_ENTRY_SAFE, but currently cancelling an async can + * cause other asyncs to be removed via async_reselect() */ + restart: LIST_FOR_EACH_ENTRY( async, &process->asyncs, struct async, process_entry ) { - if (async->terminated) continue; + if (async->terminated || async->canceled) continue; if ((!obj || (get_fd_user( async->fd ) == obj)) && (!thread || async->thread == thread) && (!iosb || async->data.iosb == iosb)) { + async->canceled = 1; fd_cancel_async( async->fd, async ); woken++; goto restart; diff --git a/server/device.c b/server/device.c index 2310de43ac4..9515d238fb4 100644 --- a/server/device.c +++ b/server/device.c @@ -205,7 +205,7 @@ static void device_file_read( struct fd *fd, struct async *async, file_pos_t pos static void device_file_write( struct fd *fd, struct async *async, file_pos_t pos ); static void device_file_flush( struct fd *fd, struct async *async ); static void device_file_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); -static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ); +static void device_file_cancel_async( struct fd *fd, struct async *async ); static void device_file_get_volume_info( struct fd *fd, struct async *async, unsigned int info_class ); static const struct object_ops device_file_ops = @@ -243,9 +243,9 @@ static const struct fd_ops device_file_fd_ops = default_fd_get_file_info, /* get_file_info */ device_file_get_volume_info, /* get_volume_info */ device_file_ioctl, /* ioctl */ - default_fd_cancel_async, /* cancel_async */ + device_file_cancel_async, /* cancel_async */ default_fd_queue_async, /* queue_async */ - device_file_reselect_async /* reselect_async */ + default_fd_reselect_async, /* reselect_async */ }; @@ -687,21 +687,21 @@ static void cancel_irp_call( struct irp_call *irp ) add_irp_to_queue( irp->file->device->manager, cancel_irp, NULL ); release_object( cancel_irp ); } - - set_irp_result( irp, STATUS_CANCELLED, NULL, 0, 0 ); } -static void device_file_reselect_async( struct fd *fd, struct async_queue *queue ) +static void device_file_cancel_async( struct fd *fd, struct async *async ) { struct device_file *file = get_fd_user( fd ); struct irp_call *irp; LIST_FOR_EACH_ENTRY( irp, &file->requests, struct irp_call, dev_entry ) - if (irp->iosb->status != STATUS_PENDING) + { + if (irp->async == async) { cancel_irp_call( irp ); return; } + } } static struct device *create_device( struct object *root, const struct unicode_str *name, @@ -1018,12 +1018,9 @@ DECL_HANDLER(set_irp_result) if ((irp = (struct irp_call *)get_handle_obj( current->process, req->handle, 0, &irp_call_ops ))) { - if (!irp->canceled) - set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); - else if(irp->user_ptr) /* cancel already queued */ - set_error( STATUS_MORE_PROCESSING_REQUIRED ); - else /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ - irp->canceled = 0; + set_irp_result( irp, req->status, get_req_data(), get_req_data_size(), req->size ); + /* we may be still dispatching the IRP. don't bother queuing cancel if it's already complete */ + irp->canceled = 0; close_handle( current->process, req->handle ); /* avoid an extra round-trip for close */ release_object( irp ); }

1 0

Zebediah Figura : server: Cancel asyncs through fd_ops.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 4f1c7ba5f90b1627314b63c573b48baee575f387 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f1c7ba5f90b1627314b63c5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Sep 3 23:11:38 2021 -0500 server: Cancel asyncs through fd_ops. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/async.c | 2 +- server/change.c | 1 + server/console.c | 6 ++++++ server/device.c | 1 + server/fd.c | 10 ++++++++++ server/file.c | 1 + server/file.h | 4 ++++ server/mailslot.c | 3 +++ server/mapping.c | 1 + server/named_pipe.c | 3 +++ server/serial.c | 1 + server/sock.c | 2 ++ 12 files changed, 34 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1c7ba5f90b1627314b…

1 0

Jan Sikorski : wined3d: Remove wined3d_texture_copy_sysmem_location().
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: d23f1007d2e8cba5d92688aa3d6b70ee891ea5b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d23f1007d2e8cba5d92688aa… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Thu Sep 2 15:14:20 2021 +0200 wined3d: Remove wined3d_texture_copy_sysmem_location(). Use wined3d_context_copy_bo_address() instead. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 58 ++++++++++---------------------------------------- 1 file changed, 11 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index f5f7fab49a6..6663e788e9c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -745,52 +745,6 @@ void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) } } -static BOOL wined3d_texture_copy_sysmem_location(struct wined3d_texture *texture, - unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location) -{ - unsigned int size = texture->sub_resources[sub_resource_idx].size; - struct wined3d_device *device = texture->resource.device; - const struct wined3d_gl_info *gl_info; - struct wined3d_bo_gl *src_bo, *dst_bo; - struct wined3d_bo_address dst, src; - - if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) - return FALSE; - - wined3d_texture_get_memory(texture, sub_resource_idx, &dst, location); - wined3d_texture_get_memory(texture, sub_resource_idx, &src, - texture->sub_resources[sub_resource_idx].locations); - - if ((dst_bo = (struct wined3d_bo_gl *)dst.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, dst_bo->id)); - GL_EXTCALL(glBufferSubData(GL_PIXEL_UNPACK_BUFFER, 0, size, src.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), dst_bo); - checkGLcall("PBO upload"); - context_release(context); - return TRUE; - } - - if ((src_bo = (struct wined3d_bo_gl *)src.buffer_object)) - { - context = context_acquire(device, NULL, 0); - gl_info = wined3d_context_gl(context)->gl_info; - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, src_bo->id)); - GL_EXTCALL(glGetBufferSubData(GL_PIXEL_PACK_BUFFER, 0, size, dst.addr)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); - wined3d_context_gl_reference_bo(wined3d_context_gl(context), src_bo); - checkGLcall("PBO download"); - context_release(context); - return TRUE; - } - - memcpy(dst.addr, src.addr, size); - return TRUE; -} - /* Context activation is done by the caller. Context may be NULL in * WINED3D_NO3D mode. */ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, @@ -837,7 +791,17 @@ BOOL wined3d_texture_load_location(struct wined3d_texture *texture, } if ((location & wined3d_texture_sysmem_locations) && (current & wined3d_texture_sysmem_locations)) - ret = wined3d_texture_copy_sysmem_location(texture, sub_resource_idx, context, location); + { + unsigned int size = texture->sub_resources[sub_resource_idx].size; + struct wined3d_bo_address source, destination; + + if (!wined3d_texture_prepare_location(texture, sub_resource_idx, context, location)) + return FALSE; + wined3d_texture_get_memory(texture, sub_resource_idx, &source, current); + wined3d_texture_get_memory(texture, sub_resource_idx, &destination, location); + wined3d_context_copy_bo_address(context, &destination, &source, size); + ret = TRUE; + } else ret = texture->texture_ops->texture_load_location(texture, sub_resource_idx, context, location);

1 0

Nikolay Sivov : wined3d: Handle null semantics in stream output description cache.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: a408fdf5f52a4de94ab06318bfa86a205bd9a2c2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a408fdf5f52a4de94ab06318… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 9 18:58:03 2021 +0300 wined3d: Handle null semantics in stream output description cache. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2147447ee0..07bd7c65ad7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5620,7 +5620,9 @@ static int wined3d_so_desc_compare(const void *key, const struct wine_rb_entry * if ((ret = (a->stream_idx - b->stream_idx))) return ret; - if ((ret = strcmp(a->semantic_name, b->semantic_name))) + if ((ret = (!a->semantic_name - !b->semantic_name))) + return ret; + if (a->semantic_name && (ret = strcmp(a->semantic_name, b->semantic_name))) return ret; if ((ret = (a->semantic_idx - b->semantic_idx))) return ret;

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 07beacb74224f922356efa8154978fadc9764edf URL: https://source.winehq.org/git/wine.git/?a=commit;h=07beacb74224f922356efa81… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Sep 9 20:25:38 2021 +0200 po: Update Dutch translation. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nl.po | 464 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 190 insertions(+), 274 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07beacb74224f922356e…

1 0

Alex Henrie : include: Provide a definition of NOP_FUNCTION that works on GCC.
by Alexandre Julliard 09 Sep '21

09 Sep '21

Module: wine Branch: master Commit: 3ad4def46aaee37c9bf50cd1e8e0138c995c2ac1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ad4def46aaee37c9bf50cd1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 8 23:29:25 2021 -0600 include: Provide a definition of NOP_FUNCTION that works on GCC. NOP_FUNCTION is a drop-in function replacement that ignores its arguments but also suppresses compiler warnings about them being unused. For example, on MSVC, 0(foo, bar, baz()); or __noop(foo, bar, baz()); would suppress warnings about foo and bar being unused and not call baz at all. Neither of those syntaxes is supported on GCC, which provides no similar way to suppress unused variable warnings, but we can at least allow such code to compile by defining NOP_FUNCTION to be an empty variadic macro. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index b83f588a16d..c230fa0cd7f 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -123,10 +123,14 @@ extern "C" { #endif #ifndef NOP_FUNCTION -# if defined(_MSC_VER) && (_MSC_VER >= 1210) -# define NOP_FUNCTION __noop +# if defined(_MSC_VER) +# if (_MSC_VER >= 1210) +# define NOP_FUNCTION __noop +# else +# define NOP_FUNCTION (void)0 +# endif # else -# define NOP_FUNCTION (void)0 +# define NOP_FUNCTION(...) # endif #endif

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 September 2021