January 2022 - Wine-Devel - list.winehq.org

[PATCH v2 1/5] winhttp: Move receive callback call to task_socket_receive().

by Hans Leidekker

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/winhttp/request.c | 48 +++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f37c33b202c..bddbf4a03b2 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3578,7 +3578,7 @@ static WINHTTP_WEB_SOCKET_BUFFER_TYPE map_opcode( enum socket_opcode opcode, BOO } static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD *ret_len, - WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type, BOOL async ) + WINHTTP_WEB_SOCKET_BUFFER_TYPE *ret_type ) { DWORD count, ret = ERROR_SUCCESS; @@ -3601,29 +3601,8 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD WARN("Short read.\n"); socket->read_size -= count; - if (!async) - { - *ret_len = count; - *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); - } - } - if (async) - { - if (!ret) - { - WINHTTP_WEB_SOCKET_STATUS status; - status.dwBytesTransferred = count; - status.eBufferType = map_opcode( socket->opcode, socket->read_size != 0 ); - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); - } - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_READ_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } + *ret_len = count; + *ret_type = map_opcode( socket->opcode, socket->read_size != 0 ); } return ret; } @@ -3631,9 +3610,26 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD static void CALLBACK task_socket_receive( TP_CALLBACK_INSTANCE *instance, void *ctx, TP_WORK *work ) { struct socket_receive *r = ctx; + DWORD ret, count, type; TRACE("running %p\n", work); - socket_receive( r->socket, r->buf, r->len, NULL, NULL, TRUE ); + ret = socket_receive( r->socket, r->buf, r->len, &count, &type ); + + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = count; + status.eBufferType = type; + send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = API_READ_DATA; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &r->socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } release_object( &r->socket->hdr ); free( r ); @@ -3677,7 +3673,7 @@ DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, D free( r ); } } - else ret = socket_receive( socket, buf, len, ret_len, ret_type, FALSE ); + else ret = socket_receive( socket, buf, len, ret_len, ret_type ); release_object( &socket->hdr ); return ret; -- 2.30.2

Jan. 26, 2022

Re: [PATCH v2 4/6] winhttp: Return error from WinHttpWebSocketQueryCloseStatus() if close frame was not received.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106074 Your paranoid android. === w8adm (32 bit report) === winhttp: notification.c:256: Test failed: failed to send request 12007 notification.c:258: Test failed: unexpected function 3, expected 4. probably some notifications were missing notification.c:260: Test failed: failed to receive response 12019 notification.c:264: Test failed: failed unexpectedly 12019 notification.c:265: Test failed: request failed unexpectedly 0 notification.c:268: Test failed: unexpected function 3, expected 13. probably some notifications were missing notification.c:116: Test failed: 268: expected status 0x00000002 got 0x00000800 notification.c:117: Test failed: 268: expected function 3 got 13 notification: Timeout

Jan. 26, 2022

Re: [PATCH v2 3/6] winhttp: Send callback for pending receives right away when closing websocket.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106073 Your paranoid android. === w8adm (32 bit report) === winhttp: notification.c:256: Test failed: failed to send request 12007 notification.c:258: Test failed: unexpected function 3, expected 4. probably some notifications were missing notification.c:260: Test failed: failed to receive response 12019 notification.c:264: Test failed: failed unexpectedly 12019 notification.c:265: Test failed: request failed unexpectedly 0 notification.c:268: Test failed: unexpected function 3, expected 13. probably some notifications were missing notification.c:116: Test failed: 268: expected status 0x00000002 got 0x00000800 notification.c:117: Test failed: 268: expected function 3 got 13 notification: Timeout

Jan. 26, 2022

[PATCH v2 2/2] ntdll/tests: Add disk space allocation tests for NtCreateFile.

by Patrick Hibbs

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52171 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- dlls/ntdll/tests/file.c | 81 ++++++++++++++++++++++++++++------------- 1 file changed, 56 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index 19ae5f2ac21..69b75a52fb7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -4170,28 +4170,42 @@ static void test_NtCreateFile(void) { static const struct test_data { - DWORD disposition, attrib_in, status, result, attrib_out, needs_cleanup; + DWORD disposition, attrib_in, status, result, attrib_out, alloc_in, alloc_out, enable_write, needs_cleanup; } td[] = { - /* 0*/{ FILE_CREATE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /* 1*/{ FILE_CREATE, 0, STATUS_OBJECT_NAME_COLLISION, 0, 0, TRUE }, - /* 2*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, - /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, - /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, TRUE }, - /* 7*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /* 8*/{ FILE_OPEN_IF, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /* 9*/{ FILE_OVERWRITE, 0, STATUS_ACCESS_DENIED, 0, 0, TRUE }, - /*10*/{ FILE_OVERWRITE, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, FALSE }, - /*11*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /*12*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /*13*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, TRUE }, - /*14*/{ FILE_OVERWRITE_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /*15*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, FALSE }, - /*16*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, FALSE }, - /*17*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, TRUE }, - /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, TRUE } + /* 0*/{ FILE_CREATE, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, FALSE }, + /* 1*/{ FILE_CREATE, 0, STATUS_OBJECT_NAME_COLLISION, 0, 0, 0, 0, FALSE, TRUE }, + /* 2*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, FALSE }, + /* 3*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, TRUE }, + /* 4*/{ FILE_OPEN, FILE_ATTRIBUTE_READONLY, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, 0, 0, FALSE, FALSE }, + /* 5*/{ FILE_OPEN_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, FALSE }, + /* 6*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, TRUE }, + /* 7*/{ FILE_OPEN_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, FALSE }, + /* 8*/{ FILE_OPEN_IF, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, FALSE }, + /* 9*/{ FILE_OVERWRITE, 0, STATUS_ACCESS_DENIED, 0, 0, 0, 0, FALSE, TRUE }, + /*10*/{ FILE_OVERWRITE, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, 0, 0, FALSE, FALSE }, + /*11*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, FALSE }, + /*12*/{ FILE_OVERWRITE, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, FALSE }, + /*13*/{ FILE_OVERWRITE_IF, 0, STATUS_ACCESS_DENIED, 0, 0, 0, 0, FALSE, TRUE }, + /*14*/{ FILE_OVERWRITE_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, FALSE }, + /*15*/{ FILE_OVERWRITE_IF, FILE_ATTRIBUTE_READONLY, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, FALSE }, + /*16*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, FALSE }, + /*17*/{ FILE_SUPERSEDE, FILE_ATTRIBUTE_READONLY, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE|FILE_ATTRIBUTE_READONLY, 0, 0, FALSE, TRUE }, + /*18*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 0, 0, FALSE, TRUE }, + /*19*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, FALSE, TRUE }, + /*20*/{ FILE_CREATE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, TRUE, FALSE }, + /*21*/{ FILE_OVERWRITE, 0, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, FALSE, FALSE }, + /*22*/{ FILE_OPEN, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, 2000, 0, TRUE, TRUE }, + /*23*/{ FILE_OVERWRITE, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, 2000, 0, FALSE, TRUE }, + /*24*/{ FILE_OVERWRITE, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, 2000, 0, TRUE, TRUE }, + /*25*/{ FILE_OVERWRITE_IF, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, TRUE, FALSE }, + /*26*/{ FILE_OVERWRITE_IF, 0, 0, FILE_OVERWRITTEN, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, TRUE, TRUE }, + /*27*/{ FILE_SUPERSEDE, 0, 0, FILE_CREATED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, FALSE, FALSE }, + /*28*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, TRUE, FALSE }, + /*29*/{ FILE_SUPERSEDE, 0, 0, FILE_SUPERSEDED, FILE_ATTRIBUTE_ARCHIVE, 2000, 2000, FALSE, FALSE }, + /*30*/{ FILE_OPEN, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, 0, 2000, FALSE, FALSE }, + /*31*/{ FILE_OPEN, 0, 0, FILE_OPENED, FILE_ATTRIBUTE_ARCHIVE, 2000, 0, FALSE, TRUE },/* Win7 dealloc without write permission! */ + /*32*/{ FILE_OPEN, 0, STATUS_OBJECT_NAME_NOT_FOUND, 0, 0, 2000, 0, FALSE, FALSE } }; static const WCHAR fooW[] = {'f','o','o',0}; NTSTATUS status; @@ -4201,6 +4215,8 @@ static void test_NtCreateFile(void) IO_STATUS_BLOCK io; UNICODE_STRING nameW; DWORD ret, i; + LARGE_INTEGER li; + FILE_NETWORK_OPEN_INFORMATION info; GetTempPathW(MAX_PATH, path); GetTempFileNameW(path, fooW, 0, path); @@ -4214,17 +4230,22 @@ static void test_NtCreateFile(void) attr.SecurityDescriptor = NULL; attr.SecurityQualityOfService = NULL; + info.AllocationSize.QuadPart = 0; + for (i = 0; i < ARRAY_SIZE(td); i++) { - status = pNtCreateFile(&handle, GENERIC_READ, &attr, &io, NULL, + li.QuadPart = td[i].alloc_in; + + status = pNtCreateFile(&handle, ((td[i].enable_write) ? (GENERIC_READ | GENERIC_WRITE) : (GENERIC_READ)), + &attr, &io, ((li.QuadPart > 0) ? (&li) : (NULL)), td[i].attrib_in, FILE_SHARE_READ|FILE_SHARE_WRITE, td[i].disposition, 0, NULL, 0); - ok(status == td[i].status, "%d: expected %#x got %#x\n", i, td[i].status, status); + ok(status == td[i].status, "%d: status expected %#x got %#x\n", i, td[i].status, status); if (!status) { - ok(io.Information == td[i].result,"%d: expected %#x got %#lx\n", i, td[i].result, io.Information); + ok(io.Information == td[i].result,"%d: result expected %#x got %#lx\n", i, td[i].result, io.Information); ret = GetFileAttributesW(path); ret &= ~FILE_ATTRIBUTE_NOT_CONTENT_INDEXED; @@ -4232,11 +4253,21 @@ static void test_NtCreateFile(void) if (ret != td[i].attrib_out) { todo_wine - ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + ok(ret == td[i].attrib_out, "%d: attribute expected %#x got %#x\n", i, td[i].attrib_out, ret); SetFileAttributesW(path, td[i].attrib_out); } else - ok(ret == td[i].attrib_out, "%d: expected %#x got %#x\n", i, td[i].attrib_out, ret); + ok(ret == td[i].attrib_out, "%d: attribute expected %#x got %#x\n", i, td[i].attrib_out, ret); + + if (td[i].alloc_in) + { + status = pNtQueryFullAttributesFile( &attr, &info ); + ok(status == STATUS_SUCCESS, + "%d: query failed %x\n", i, status); + ok(info.AllocationSize.QuadPart >= td[i].alloc_out, + "%d: alloc_size failed expected %#x got %#I64x\n", i, td[i].alloc_out, + info.AllocationSize.QuadPart); + } CloseHandle(handle); } -- 2.30.2

Jan. 26, 2022

[PATCH v2 1/2] ntdll: Implement alloc_size support in NtCreateFile.

by Patrick Hibbs

Use posix_fallocate to reserve space for files. Function will print a warning at runtime if posix_fallocate isn't supported. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52171 Signed-off-by: Patrick Hibbs <hibbsncc1701(a)gmail.com> --- v2: - Rebase to current master after codefreeze. - Remove unneeded comment block. - Fix memory leak pointed out by Alex Henrie. --- dlls/ntdll/unix/file.c | 61 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a29b5cbb980..259c4c3b795 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -3740,9 +3740,13 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU { OBJECT_ATTRIBUTES new_attr; UNICODE_STRING nt_name; - char *unix_name; + char *unix_name = NULL; BOOL created = FALSE; NTSTATUS status; + ULONG new_attributes, new_disposition; + struct stat st; + LARGE_INTEGER remaining_bytes; + int perr, unix_handle; TRACE( "handle=%p access=%08x name=%s objattr=%08x root=%p sec=%p io=%p alloc_size=%p " "attr=%08x sharing=%08x disp=%d options=%08x ea=%p.0x%08x\n", @@ -3753,8 +3757,6 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU *handle = 0; if (!attr || !attr->ObjectName) return STATUS_INVALID_PARAMETER; - if (alloc_size) FIXME( "alloc_size not supported\n" ); - new_attr = *attr; if (options & FILE_OPEN_BY_FILE_ID) { @@ -3781,11 +3783,59 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU status = STATUS_SUCCESS; } +#ifdef HAVE_POSIX_FALLOCATE + if (alloc_size && alloc_size->QuadPart > 0 && + disposition != FILE_OPEN && + (created || (disposition != FILE_OVERWRITE || + status != STATUS_OBJECT_NAME_NOT_FOUND))) + { + remaining_bytes.QuadPart = 0; + new_disposition = FILE_OPEN; + + if (created) + remaining_bytes.QuadPart = alloc_size->QuadPart; + else + { + if (get_file_info( unix_name, &st, &new_attributes ) == -1) + status = errno_to_status( errno ); + else + { + if ((S_ISREG(st.st_mode)) && ((st.st_blocks * 512) < alloc_size->QuadPart)) + remaining_bytes.QuadPart = (alloc_size->QuadPart - (st.st_blocks * 512)); + } + } + + if (remaining_bytes.QuadPart > 0) + { + if (created || disposition == FILE_SUPERSEDE || disposition == FILE_OVERWRITE) + unix_handle = open( unix_name, O_RDWR | O_CREAT | O_TRUNC | O_DIRECT | O_SYNC, S_IRWXU ); + else + unix_handle = open( unix_name, O_RDWR | O_DIRECT | O_SYNC, S_IRWXU ); + + if (unix_handle == -1) + status = errno_to_status( errno ); + else + { + perr = posix_fallocate( unix_handle, 0, remaining_bytes.QuadPart ); + if (perr) + status = errno_to_status( perr ); + + close( unix_handle ); + } + } + } + else + { + new_disposition = disposition; + } +#else + WARN_ONCE("Preallocating files is not supported!\n"); +#endif + if (status == STATUS_SUCCESS) { status = open_unix_file( handle, unix_name, access, &new_attr, attributes, - sharing, disposition, options, ea_buffer, ea_length ); - free( unix_name ); + sharing, new_disposition, options, ea_buffer, ea_length ); } else WARN( "%s not found (%x)\n", debugstr_us(attr->ObjectName), status ); @@ -3816,6 +3866,7 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU if (!once++) ERR_(winediag)( "Too many open files, ulimit -n probably needs to be increased\n" ); } + if (unix_name) free( unix_name ); free( nt_name.Buffer ); return io->u.Status = status; } -- 2.30.2

Jan. 26, 2022

Re: [PATCH 3/3] wined3d: Don't initialize system memory for buffers.

by Henri Verbeet

On Tue, 25 Jan 2022 at 03:35, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > This fixes test_map_synchronisation() on 64-bit machines, broken after > 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab. > How is it broken, and why does that happen? > @@ -1233,7 +1233,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d > } > buffer->buffer_ops = buffer_ops; > buffer->structure_byte_stride = desc->structure_byte_stride; > - buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; > + buffer->locations = WINED3D_LOCATION_DISCARDED; > I think avoiding WINED3D_LOCATION_SYSMEM would be great, but I'm not as convinced about using WINED3D_LOCATION_DISCARDED for that purpose. I'm not sure we've ever confirmed that buffer resources should be zeroed after creation, but we have for texture resources; it would not surprise me if this change would break some applications. My preferred way of handling this would be to introduce WINED3D_LOCATION_CLEARED, which would effectively defer clearing the resource until loading it into another location. When replacing the entire (sub-)resource with e.g. a DISCARD map or sub-resource update, we can then just skip that clear. This approach would also allow us to avoid zeroing texture resources on creation, an in case of the Vulkan renderer, we could even extend that a bit further and merge render-target clears with starting render passes by using VK_ATTACHMENT_LOAD_OP_CLEAR and appropriate clear values.

Jan. 26, 2022

Re: [PATCH 1/3] wined3d: Handle discarded buffers in buffer_resource_sub_resource_map().

by Henri Verbeet

On Tue, 25 Jan 2022 at 03:21, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > @@ -927,10 +928,13 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc > > count = ++resource->map_count; > > - if (buffer->buffer_object) > + context = context_acquire(device, NULL, 0); > + > + wined3d_buffer_get_memory(buffer, context, &addr); > + > + if (addr.buffer_object) > { I think that potentially changes the location we map in some cases. (In particular, when buffer->buffer_object is non-NULL, but WINED3D_LOCATION_BUFFER is not current.) I don't know for sure whether that would cause issues for applications, but this code is sensitive enough that I'd prefer avoiding wined3d_buffer_get_memory() here unless we have a good reason not to. What is the issue exactly? Is it that buffer->buffer_object may not have been created yet for discarded resources?

Jan. 26, 2022

[PATCH 2/2] winecoreaudio: Remove unnecessary buffer sizes.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winecoreaudio.drv/coreaudio.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index a2bbc3e45c9..f242ebe54a8 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -92,7 +92,6 @@ struct coreaudio_stream INT32 getbuf_last; WAVEFORMATEX *fmt; BYTE *local_buffer, *cap_buffer, *wrap_buffer, *resamp_buffer, *tmp_buffer; - SIZE_T local_buffer_size, tmp_buffer_size; }; static HRESULT osstatus_to_hresult(OSStatus sc) @@ -617,6 +616,7 @@ static NTSTATUS create_stream(void *args) struct coreaudio_stream *stream = calloc(1, sizeof(*stream)); AURenderCallbackStruct input; OSStatus sc; + SIZE_T size; if(!stream){ params->result = E_OUTOFMEMORY; @@ -679,8 +679,8 @@ static NTSTATUS create_stream(void *args) goto end; } - stream->local_buffer_size = stream->bufsize_frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &stream->local_buffer_size, + size = stream->bufsize_frames * stream->fmt->nBlockAlign; + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, 0, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto end; @@ -1337,6 +1337,7 @@ static NTSTATUS get_render_buffer(void *args) { struct get_render_buffer_params *params = args; struct coreaudio_stream *stream = params->stream; + SIZE_T size; UINT32 pad; OSSpinLockLock(&stream->lock); @@ -1359,14 +1360,14 @@ static NTSTATUS get_render_buffer(void *args) if(stream->wri_offs_frames + params->frames > stream->bufsize_frames){ if(stream->tmp_buffer_frames < params->frames){ if(stream->tmp_buffer){ - SIZE_T size = 0; + size = 0; NtFreeVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, &size, MEM_RELEASE); stream->tmp_buffer = NULL; } - stream->tmp_buffer_size = params->frames * stream->fmt->nBlockAlign; + size = params->frames * stream->fmt->nBlockAlign; if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE)){ + &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; params->result = E_OUTOFMEMORY; goto end; @@ -1439,6 +1440,7 @@ static NTSTATUS get_capture_buffer(void *args) struct coreaudio_stream *stream = params->stream; UINT32 chunk_bytes, chunk_frames; LARGE_INTEGER stamp, freq; + SIZE_T size; OSSpinLockLock(&stream->lock); @@ -1461,9 +1463,9 @@ static NTSTATUS get_capture_buffer(void *args) if(chunk_frames < stream->period_frames){ chunk_bytes = chunk_frames * stream->fmt->nBlockAlign; if(!stream->tmp_buffer){ - stream->tmp_buffer_size = stream->period_frames * stream->fmt->nBlockAlign; + size = stream->period_frames * stream->fmt->nBlockAlign; NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, 0, - &stream->tmp_buffer_size, MEM_COMMIT, PAGE_READWRITE); + &size, MEM_COMMIT, PAGE_READWRITE); } *params->data = stream->tmp_buffer; memcpy(*params->data, stream->local_buffer + stream->lcl_offs_frames * stream->fmt->nBlockAlign, -- 2.23.0

Jan. 26, 2022

[PATCH 1/2] winepulse: Remove unnecessary alloc_size.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winepulse.drv/pulse.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index f32f2a3d26c..3e65936a18f 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -59,7 +59,7 @@ struct pulse_stream INT32 locked; BOOL started; - SIZE_T bufsize_frames, alloc_size, real_bufsize_bytes, period_bytes; + SIZE_T bufsize_frames, real_bufsize_bytes, period_bytes; SIZE_T peek_ofs, read_offs_bytes, lcl_offs_bytes, pa_offs_bytes; SIZE_T tmp_buffer_bytes, held_bytes, peek_len, peek_buffer_len, pa_held_bytes; BYTE *local_buffer, *tmp_buffer, *peek_buffer; @@ -868,14 +868,16 @@ static NTSTATUS pulse_create_stream(void *args) if (SUCCEEDED(hr)) { UINT32 unalign; const pa_buffer_attr *attr = pa_stream_get_buffer_attr(stream->stream); + SIZE_T size; + stream->attr = *attr; /* Update frames according to new size */ dump_attr(attr); if (stream->dataflow == eRender) { - stream->alloc_size = stream->real_bufsize_bytes = + size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -887,9 +889,9 @@ static NTSTATUS pulse_create_stream(void *args) capture_packets = stream->real_bufsize_bytes / stream->period_bytes; - stream->alloc_size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); + size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - 0, &stream->alloc_size, MEM_COMMIT, PAGE_READWRITE)) + 0, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes); -- 2.23.0

Jan. 26, 2022

Re: [PATCH v3 2/5] mf/tests: Add some WMA decoder GetOutputStreamInfo tests.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=106067 Your paranoid android. === w8adm (32 bit report) === mf: mf.c:4292: Test failed: Unexpected hr 0x800401f0.

Jan. 26, 2022