January 2024 - Wine-Commits

Biswapriyo Nath : include: Add missing macros in devenum.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: e031a0d0daf1af0b328f23cddbcb5d6b101c32bc URL: https://gitlab.winehq.org/wine/wine/-/commit/e031a0d0daf1af0b328f23cddbcb5d… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Dec 18 09:54:44 2023 +0000 include: Add missing macros in devenum.idl. --- include/devenum.idl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/devenum.idl b/include/devenum.idl index f7eaf9a4a59..2afe365bd5e 100644 --- a/include/devenum.idl +++ b/include/devenum.idl @@ -27,6 +27,12 @@ cpp_quote("#define CDEF_BYPASS_CLASS_MANAGER 0x0002") cpp_quote("#define CDEF_CLASS_LEGACY 0x0004") cpp_quote("#define CDEF_MERIT_ABOVE_DO_NOT_USE 0x0008") +cpp_quote("#define CDEF_DEVMON_CMGR_DEVICE 0x0010") +cpp_quote("#define CDEF_DEVMON_DMO 0x0020") +cpp_quote("#define CDEF_DEVMON_PNP_DEVICE 0x0040") +cpp_quote("#define CDEF_DEVMON_FILTER 0x0080") +cpp_quote("#define CDEF_DEVMON_SELECTIVE_MASK 0x00f0") + [ object, uuid(29840822-5B84-11D0-BD3B-00A0C911CE86),

1 0

Fabian Maurer : wow64win: Add missing break inside packed_result_32to64 (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 31f340edfd5d13bd535c2058b3c19cb449d44bbf URL: https://gitlab.winehq.org/wine/wine/-/commit/31f340edfd5d13bd535c2058b3c19c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:12:01 2024 +0100 wow64win: Add missing break inside packed_result_32to64 (Coverity). --- dlls/wow64win/user.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 44b422ef62c..4b285036184 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -851,6 +851,7 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par cs64->dwExStyle = cs32->dwExStyle; return sizeof(*cs64); } + break; case WM_NCCALCSIZE: if (wparam)

1 0

Biswapriyo Nath : include: Add D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS in d3d12video.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 51e1f5e43d879735a22b1375bf3a9edb75777847 URL: https://gitlab.winehq.org/wine/wine/-/commit/51e1f5e43d879735a22b1375bf3a9e… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:15:52 2024 +0000 include: Add D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS in d3d12video.idl. --- include/d3d12video.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index ffda6916b74..e838a4cd5a2 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1594,6 +1594,17 @@ typedef struct D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA UINT64 bHeaderSize; } D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA; +typedef enum D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS +{ + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_NO_ERROR = 0x0, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_CODEC_PICTURE_CONTROL_NOT_SUPPORTED = 0x1, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_SUBREGION_LAYOUT_CONFIGURATION_NOT_SUPPORTED = 0x2, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_REFERENCE_PICTURES = 0x4, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_RECONFIGURATION_REQUEST_NOT_SUPPORTED = 0x8, + D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAG_INVALID_METADATA_BUFFER_SOURCE = 0x10, +} D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS; +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(D3D12_VIDEO_ENCODER_ENCODE_ERROR_FLAGS);") + typedef struct D3D12_VIDEO_ENCODER_OUTPUT_METADATA_STATISTICS { UINT64 AverageQP;

1 0

Biswapriyo Nath : include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS in d3d12video.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: e63a998420a10fb34b6a7abdd46e5bcd35d12e10 URL: https://gitlab.winehq.org/wine/wine/-/commit/e63a998420a10fb34b6a7abdd46e5b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:12:05 2024 +0000 include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS in d3d12video.idl. --- include/d3d12video.idl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 74c1b269b92..ffda6916b74 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1237,6 +1237,14 @@ typedef enum D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE_QUARTER_PIXEL = 3, } D3D12_VIDEO_ENCODER_MOTION_ESTIMATION_PRECISION_MODE; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS +{ + UINT MaxSubregionsNumber; + UINT MaxIntraRefreshFrameDuration; + UINT SubregionBlockPixelsSize; + UINT QPMapRegionPixelsSize; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOLUTION_SUPPORT_LIMITS; + typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE_H264 { UINT GOPLength;

1 0

Fabian Maurer : winedbg: Add missing break inside fetch_value (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 1fc50847e0812f367b0287effe99df4c1d3f54ce URL: https://gitlab.winehq.org/wine/wine/-/commit/1fc50847e0812f367b0287effe99df… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:11:19 2024 +0100 winedbg: Add missing break inside fetch_value (Coverity). --- programs/winedbg/be_x86_64.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/winedbg/be_x86_64.c b/programs/winedbg/be_x86_64.c index aca04d769fe..066dad3c168 100644 --- a/programs/winedbg/be_x86_64.c +++ b/programs/winedbg/be_x86_64.c @@ -352,6 +352,7 @@ static BOOL fetch_value(const char* addr, unsigned sz, LONG* value) case 2: if (!dbg_read_memory(addr, &value16, sizeof(value16))) return FALSE; *value = value16; + break; case 4: if (!dbg_read_memory(addr, value, sizeof(*value))) return FALSE; break;

1 0

Biswapriyo Nath : include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS in d3d12video.idl.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 0c2cdfffd9ce060136f5e1ff964d4b5848e22e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/0c2cdfffd9ce060136f5e1ff964d4b… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Thu Jan 4 04:08:15 2024 +0000 include: Add D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS in d3d12video.idl. --- include/d3d12video.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/d3d12video.idl b/include/d3d12video.idl index 330be3c4d13..74c1b269b92 100644 --- a/include/d3d12video.idl +++ b/include/d3d12video.idl @@ -1263,6 +1263,19 @@ typedef struct D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE }; } D3D12_VIDEO_ENCODER_SEQUENCE_GOP_STRUCTURE; +typedef struct D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS +{ + UINT NodeIndex; + D3D12_VIDEO_ENCODER_CODEC Codec; + D3D12_VIDEO_ENCODER_PROFILE_DESC Profile; + DXGI_FORMAT InputFormat; + D3D12_VIDEO_ENCODER_PICTURE_RESOLUTION_DESC PictureTargetResolution; + BOOL IsSupported; + UINT CompressedBitstreamBufferAccessAlignment; + UINT EncoderMetadataBufferAccessAlignment; + UINT MaxEncoderOutputMetadataBufferSize; +} D3D12_FEATURE_DATA_VIDEO_ENCODER_RESOURCE_REQUIREMENTS; + typedef enum D3D12_VIDEO_ENCODER_FLAGS { D3D12_VIDEO_ENCODER_FLAG_NONE = 0x0,

1 0

Fabian Maurer : wmiutils: Always zero path->namespaces in parse_text (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: ed18b66ceb43d472339ff584cd26154497e04d1c URL: https://gitlab.winehq.org/wine/wine/-/commit/ed18b66ceb43d472339ff584cd2615… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:39:25 2024 +0100 wmiutils: Always zero path->namespaces in parse_text (Coverity). When the malloc for len_namespaces should fail namespaces would be uninitialized and passed to free. --- dlls/wmiutils/path.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wmiutils/path.c b/dlls/wmiutils/path.c index 0f0263c9536..48b79ccdb23 100644 --- a/dlls/wmiutils/path.c +++ b/dlls/wmiutils/path.c @@ -437,7 +437,7 @@ static HRESULT parse_text( struct path *path, ULONG mode, const WCHAR *text ) } if (path->num_namespaces) { - if (!(path->namespaces = malloc( path->num_namespaces * sizeof(WCHAR *) ))) goto done; + if (!(path->namespaces = calloc( path->num_namespaces, sizeof(WCHAR *) ))) goto done; if (!(path->len_namespaces = malloc( path->num_namespaces * sizeof(int) ))) goto done; i = 0;

1 0

Nikolay Sivov : ntdll/tests: Add some tests for creating custom heaps.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: a8f5b292c32ff3cedb6325fc72a098b5a8cbd33a URL: https://gitlab.winehq.org/wine/wine/-/commit/a8f5b292c32ff3cedb6325fc72a098… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 9 19:39:38 2024 +0100 ntdll/tests: Add some tests for creating custom heaps. --- dlls/ntdll/tests/rtl.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 442ad729540..03c31d7bf6b 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -3565,6 +3565,77 @@ static void test_RtlDestroyHeap(void) RtlRemoveVectoredExceptionHandler( handler ); } +struct commit_routine_context +{ + void *base; + SIZE_T size; +}; + +static struct commit_routine_context commit_context; + +static NTSTATUS NTAPI test_commit_routine(void *base, void **address, SIZE_T *size) +{ + commit_context.base = base; + commit_context.size = *size; + + return VirtualAlloc(*address, *size, MEM_COMMIT, PAGE_READWRITE) ? 0 : STATUS_ASSERTION_FAILURE; +} + +static void test_RtlCreateHeap(void) +{ + void *ptr, *base, *reserve; + RTL_HEAP_PARAMETERS params; + HANDLE heap; + BOOL ret; + + heap = RtlCreateHeap(0, NULL, 0, 0, NULL, NULL); + ok(!!heap, "Failed to create a heap.\n"); + RtlDestroyHeap(heap); + + memset(&params, 0, sizeof(params)); + heap = RtlCreateHeap(0, NULL, 0, 0, NULL, &params); + ok(!!heap, "Failed to create a heap.\n"); + RtlDestroyHeap(heap); + + params.Length = 1; + heap = RtlCreateHeap(0, NULL, 0, 0, NULL, &params); + ok(!!heap, "Failed to create a heap.\n"); + RtlDestroyHeap(heap); + + params.Length = sizeof(params); + params.CommitRoutine = test_commit_routine; + params.InitialCommit = 0x1000; + params.InitialReserve = 0x10000; + + heap = RtlCreateHeap(0, NULL, 0, 0, NULL, &params); + todo_wine + ok(!heap, "Unexpected heap.\n"); + if (heap) + RtlDestroyHeap(heap); + + reserve = VirtualAlloc(NULL, 0x10000, MEM_RESERVE, PAGE_READWRITE); + base = VirtualAlloc(reserve, 0x1000, MEM_COMMIT, PAGE_READWRITE); + ok(!!base, "Unexpected pointer.\n"); + + heap = RtlCreateHeap(0, base, 0, 0, NULL, &params); + ok(!!heap, "Unexpected heap.\n"); + + /* Using block size above initially committed size to trigger + new allocation via user callback. */ + ptr = RtlAllocateHeap(heap, 0, 0x4000); + ok(!!ptr, "Failed to allocate a block.\n"); + todo_wine + ok(commit_context.base == base, "Unexpected base %p.\n", commit_context.base); + todo_wine + ok(!!commit_context.size, "Unexpected allocation size.\n"); + RtlFreeHeap(heap, 0, ptr); + RtlDestroyHeap(heap); + + ret = VirtualFree(reserve, 0, MEM_RELEASE); + todo_wine + ok(ret, "Unexpected return value.\n"); +} + static void test_RtlFirstFreeAce(void) { PACL acl; @@ -3711,6 +3782,7 @@ START_TEST(rtl) test_LdrRegisterDllNotification(); test_DbgPrint(); test_RtlDestroyHeap(); + test_RtlCreateHeap(); test_RtlFirstFreeAce(); test_RtlInitializeSid(); test_RtlValidSecurityDescriptor();

1 0

Fabian Maurer : localspl: In fpScheduleJob leave critical section in error case (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 83bcb752a2d1a1a99e8e1036c8322c3130e3c772 URL: https://gitlab.winehq.org/wine/wine/-/commit/83bcb752a2d1a1a99e8e1036c8322c… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:19:34 2024 +0100 localspl: In fpScheduleJob leave critical section in error case (Coverity). --- dlls/localspl/provider.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 26e9c66bea0..b1f1e245693 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -3783,7 +3783,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) { printer_t *printer = (printer_t *)hprinter; WCHAR output[1024], name[1024], *datatype; - BOOL datatype_valid = FALSE, ret = TRUE; + BOOL datatype_valid = FALSE, ret = FALSE; PRINTPROCESSOROPENDATA pp_data; const WCHAR *port_name, *port; job_info_t *job; @@ -3852,8 +3852,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) if (!datatype_valid) { pp = print_proc_load(printer->print_proc); - if (!pp) - return FALSE; + if (!pp) goto cleanup; datatype_valid = print_proc_check_datatype(pp, datatype); } @@ -3863,7 +3862,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) WARN("%s datatype not supported by %s\n", debugstr_w(datatype), debugstr_w(printer->info->print_proc)); print_proc_unload(pp); - return FALSE; + goto cleanup; } swprintf(name, ARRAY_SIZE(name), L"%s, Port", port_name); @@ -3879,7 +3878,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) { WARN("OpenPrintProcessor failed %ld\n", GetLastError()); print_proc_unload(pp); - return FALSE; + goto cleanup; } swprintf(name, ARRAY_SIZE(name), L"%s, Job %d", printer->name, job->id); @@ -3892,6 +3891,7 @@ static BOOL WINAPI fpScheduleJob(HANDLE hprinter, DWORD job_id) if (!(printer->info->attributes & PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS)) DeleteFileW(job->filename); free_job(job); +cleanup: LeaveCriticalSection(&printer->info->jobs_cs); return ret; }

1 0

Eric Pouech : winedbg: Make some internal data 'static const'.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: edb38d15c5dbc7a2f1f0a9b6ce985928f13fa666 URL: https://gitlab.winehq.org/wine/wine/-/commit/edb38d15c5dbc7a2f1f0a9b6ce9859… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Dec 20 09:40:03 2023 +0100 winedbg: Make some internal data 'static const'. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 0d400711d34..83ad5ef3535 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -1639,7 +1639,7 @@ static void packet_query_monitor_mem(struct gdb_context* gdbctx, int len, const packet_reply(gdbctx, "OK"); } -struct query_detail +static const struct query_detail { int with_arg; const char* name; @@ -1659,7 +1659,7 @@ static enum packet_return packet_query_remote_command(struct gdb_context* gdbctx const char* hxcmd, size_t len) { char buffer[128]; - struct query_detail* qd; + const struct query_detail* qd; assert((len & 1) == 0 && len < 2 * sizeof(buffer)); len /= 2; @@ -1986,7 +1986,7 @@ static enum packet_return packet_query_exec_file(struct gdb_context* gdbctx) return packet_send_buffer; } -struct qxfer +static const struct qxfer { const char* name; enum packet_return (*handler)(struct gdb_context* gdbctx); @@ -2260,7 +2260,7 @@ struct packet_entry enum packet_return (*handler)(struct gdb_context* gdbctx); }; -static struct packet_entry packet_entries[] = +static const struct packet_entry packet_entries[] = { {'?', packet_last_signal}, {'c', packet_continue},

1 0