April 2020 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Create Vulkan images for texture resources.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 07981fa64f26d3117b20c5318bda684d7d4cb69a URL: https://source.winehq.org/git/wine.git/?a=commit;h=07981fa64f26d3117b20c531… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 20 23:48:23 2020 +0430 wined3d: Create Vulkan images for texture resources. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 36 +++++++++- dlls/wined3d/texture.c | 160 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 15 ++++ 3 files changed, 205 insertions(+), 6 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=07981fa64f26d3117b20…

1 0

Liam Middlebrook : winevulkan: Don't mark alias functions as required.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 8379a7f87c1ba8b4bcd95455974005229cea6c37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8379a7f87c1ba8b4bcd95455… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon Apr 20 08:35:00 2020 -0700 winevulkan: Don't mark alias functions as required. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index ccbb74e626..482d9805cb 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2659,9 +2659,6 @@ class VkRegistry(object): elif type_info["category"] == "bitmask": mark_bitmask_dependencies(type_info["data"], self.types) - if func.is_alias(): - func.alias.required = True - def _parse_commands(self, root): """ Parse command section containing the Vulkan function calls. """ funcs = {}

1 0

Sven Baars : ntdll: Fix a memory leak in fork_and_exec.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 1cfaf1425a965d54331a2cc4906cad9fb56b8a56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfaf1425a965d54331a2cc4… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:48 2020 +0200 ntdll: Fix a memory leak in fork_and_exec. Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6d506c8530..28aa671f47 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -1554,6 +1554,7 @@ static NTSTATUS fork_and_exec( UNICODE_STRING *path, const RTL_USER_PROCESS_PARA if (stdout_fd != -1) close( stdout_fd ); RtlFreeHeap( GetProcessHeap(), 0, argv ); RtlFreeHeap( GetProcessHeap(), 0, envp ); + RtlFreeHeap( GetProcessHeap(), 0, unixdir ); RtlFreeAnsiString( &unix_name ); return status; }

1 0

Nikolay Sivov : ole32: Simplify static IMalloc instance initialization.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 0a35f0053ab8ddd771126d617dbe15c916d21c18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a35f0053ab8ddd771126d61… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 10:59:22 2020 +0300 ole32: Simplify static IMalloc instance initialization. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ifs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 62007800e3..a144833c7a 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -47,17 +47,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); /* set the vtable later */ static const IMallocVtbl VT_IMalloc32; -typedef struct { +struct allocator +{ IMalloc IMalloc_iface; IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ BOOL SpyReleasePending; /* CoRevokeMallocSpy called with spyed allocations left*/ LPVOID * SpyedBlocks; /* root of the table */ DWORD SpyedBlockTableLength;/* size of the table*/ -} _Malloc32; +}; -/* this is the static object instance */ -static _Malloc32 Malloc32 = {{&VT_IMalloc32}, NULL, 0, 0, NULL, 0}; +static struct allocator Malloc32 = { .IMalloc_iface.lpVtbl = &VT_IMalloc32 }; /* with a spy active all calls from pre to post methods are threadsafe */ static CRITICAL_SECTION IMalloc32_SpyCS;

1 0

Roman Pišl : comctl32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: be1446f56cd82d1c9d3b6ffc31ce71fe54c8c87e URL: https://source.winehq.org/git/wine.git/?a=commit;h=be1446f56cd82d1c9d3b6ffc… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Mon Apr 20 12:20:14 2020 +0200 comctl32/edit: Avoid division by zero in EDIT_EM_LineScroll_internal. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/edit.c | 8 ++++++-- dlls/comctl32/tests/edit.c | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index b0c32445b0..4861fd7a9c 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -1579,8 +1579,12 @@ static BOOL EDIT_EM_LineScroll_internal(EDITSTATE *es, INT dx, INT dy) { INT nyoff; INT x_offset_in_pixels; - INT lines_per_page = (es->format_rect.bottom - es->format_rect.top) / - es->line_height; + INT lines_per_page; + + if (!es->line_height || !es->char_width) + return TRUE; + + lines_per_page = (es->format_rect.bottom - es->format_rect.top) / es->line_height; if (es->style & ES_MULTILINE) { diff --git a/dlls/comctl32/tests/edit.c b/dlls/comctl32/tests/edit.c index 763ade4831..e3b2f40804 100644 --- a/dlls/comctl32/tests/edit.c +++ b/dlls/comctl32/tests/edit.c @@ -1790,6 +1790,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, ok(r == 1, "Returned %ld, expected 1.\n", r); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); return result; @@ -1800,6 +1802,8 @@ static LRESULT CALLBACK test_class_proc(HWND hwnd, UINT message, WPARAM wParam, ok(r == 1, "Returned %ld, expected 1.\n", r); r = SendMessageA(hwnd, WM_SIZE, 0, 0x00100010); todo_wine ok(r == 1, "Returned %ld, expected 1.\n", r); + r = SendMessageA(hwnd, EM_LINESCROLL, 1, 1); + ok(r == 1, "Returned %ld, expected 1.\n", r); break; }

1 0

Owen Rudge : winecfg: Return 0 on success when setting Windows version.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 7b485dbf68e2ace921a59dcb50ef82d741fb8949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b485dbf68e2ace921a59dcb… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Apr 20 12:53:54 2020 +0100 winecfg: Return 0 on success when setting Windows version. The /V switch to winecfg was incorrectly passing the BOOL result through as the application exit code. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c index 735ac02299..74f73a9f23 100644 --- a/programs/winecfg/main.c +++ b/programs/winecfg/main.c @@ -189,7 +189,7 @@ ProcessCmdLine(LPSTR lpCmdLine) } if ((lpCmdLine[1] == 'V' || lpCmdLine[1] == 'v') && (lstrlenA(lpCmdLine) > 4)) { - return set_winver_from_string(&lpCmdLine[3]); + return set_winver_from_string(&lpCmdLine[3]) ? 0 : 1; } if (lpCmdLine[1] == '?')

1 0

Hans Leidekker : wbemprox: Use wide character string literals.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 78e9b02cebf4b107aba69aa9a845ab661a7daf10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78e9b02cebf4b107aba69aa9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 20 10:38:10 2020 +0200 wbemprox: Use wide character string literals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 1661 ++++++++++++-------------------------- dlls/wbemprox/class.c | 40 +- dlls/wbemprox/process.c | 8 +- dlls/wbemprox/qualifier.c | 31 +- dlls/wbemprox/query.c | 78 +- dlls/wbemprox/reg.c | 42 +- dlls/wbemprox/security.c | 15 +- dlls/wbemprox/service.c | 24 +- dlls/wbemprox/services.c | 24 +- dlls/wbemprox/table.c | 21 +- dlls/wbemprox/wbemlocator.c | 11 +- dlls/wbemprox/wbemprox_private.h | 30 - 12 files changed, 614 insertions(+), 1371 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=78e9b02cebf4b107aba6…

1 0

Sven Baars : kernelbase: Fix a string leak in CreateProcessInternal (Valgrind).
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: a202ecd457d7b13a0534398ca0227e78ad77f7b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a202ecd457d7b13a0534398c… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Sat Apr 18 22:06:46 2020 +0200 kernelbase: Fix a string leak in CreateProcessInternal (Valgrind). Signed-off-by: Sven Baars <sbaars(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/process.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index b125f100f6..3369180206 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -182,10 +182,12 @@ static RTL_USER_PROCESS_PARAMETERS *create_process_params( const WCHAR *filename &cmdlineW, envW, &titleW, &desktopW, NULL, &runtimeW, PROCESS_PARAMS_FLAG_NORMALIZED )) { + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (envW != env) RtlFreeHeap( GetProcessHeap(), 0, envW ); return NULL; } + RtlFreeUnicodeString( &newdirW ); RtlReleasePath( load_path ); if (flags & CREATE_NEW_PROCESS_GROUP) params->ConsoleFlags = 1;

1 0

Ziqing Hui : comctl32/tests: Fix ImageList_DrawIndirect() test failures on winxp.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 47a5cd10907bd30e50e9ae3b8d8460c0c749058a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a5cd10907bd30e50e9ae3b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Apr 20 12:51:01 2020 +0800 comctl32/tests: Fix ImageList_DrawIndirect() test failures on winxp. GetDeviceCaps(BITSPIXEL) is always 32 in our test cases. So we can ignore it. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 7b22c1ece4..a580906054 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1507,7 +1507,6 @@ static void test_ImageList_DrawIndirect(void) int iImage = -1, iAlphaImage = -1, iTransparentImage = -1; UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; - int bpp, broken_value; IImageList *imgl; DWORD flags; HRESULT hr; @@ -1519,7 +1518,6 @@ static void test_ImageList_DrawIndirect(void) ok(hdcDst != 0, "CreateCompatibleDC(0) failed to return a valid DC\n"); if (!hdcDst) return; - bpp = GetDeviceCaps(hdcDst, BITSPIXEL); hbmMask = CreateBitmap(2, 1, 1, 1, &maskBits); ok(hbmMask != 0, "CreateBitmap failed\n"); @@ -1587,12 +1585,10 @@ static void test_ImageList_DrawIndirect(void) check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_NORMAL, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_TRANSPARENT, 0xFFD3E5F7, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; - else broken_value = 0xFF9DA8B1; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); - if (bpp == 16 || bpp == 24) broken_value = 0xFFD4D9DD; - else broken_value = 0xFF8C99A3; - todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, broken_value, __LINE__); + /* broken on winxp */ + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND25, ILS_NORMAL, 0, 0xFFE8F1FA, 0xFFD4D9DD, __LINE__); + todo_wine check_ImageList_DrawIndirect_broken(hdcDst, himl, bits, iAlphaImage, ILD_BLEND50, ILS_NORMAL, 0, 0xFFE8F1FA, 0xFFB4BDC4, __LINE__); + check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_MASK, 0xFFD3E5F7, __LINE__); check_ImageList_DrawIndirect_fStyle(hdcDst, himl, bits, iAlphaImage, ILD_IMAGE, 0xFFD3E5F7, __LINE__);

1 0

Hans Leidekker : wbemprox: Implement Win32_VideoController.AdapterCompatibility.
by Alexandre Julliard 20 Apr '20

20 Apr '20

Module: wine Branch: master Commit: 550d96b0bf0928ac4dc573f49d2ec2e0c0444fc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=550d96b0bf0928ac4dc573f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Apr 20 10:38:11 2020 +0200 wbemprox: Implement Win32_VideoController.AdapterCompatibility. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48973 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 3 +++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 4 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 5035ca7b98..24badb7bf9 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -399,6 +399,7 @@ static const struct column col_systemsecurity[] = }; static const struct column col_videocontroller[] = { + { L"AdapterCompatibility", CIM_STRING }, { L"AdapterDACType", CIM_STRING }, { L"AdapterRAM", CIM_UINT32 }, { L"Availability", CIM_UINT16 }, @@ -783,6 +784,7 @@ struct record_systemenclosure }; struct record_videocontroller { + const WCHAR *adapter_compatibility; const WCHAR *adapter_dactype; UINT32 adapter_ram; UINT16 availability; @@ -3842,6 +3844,7 @@ static enum fill_status fill_videocontroller( struct table *table, const struct done: rec = (struct record_videocontroller *)table->data; + rec->adapter_compatibility = L"(Standard display types)"; rec->adapter_dactype = L"Integrated RAMDAC"; rec->adapter_ram = vidmem; rec->availability = 3; /* Running or Full Power */ diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 77aa5ee882..a9b4910ebf 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1282,6 +1282,7 @@ static void test_Win32_VideoController( IWbemServices *services ) hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (hr != S_OK) break; + check_property( obj, L"AdapterCompatibility", VT_BSTR, CIM_STRING ); check_property( obj, L"Availability", VT_I4, CIM_UINT16 ); check_property( obj, L"ConfigManagerErrorCode", VT_I4, CIM_UINT32 ); check_property( obj, L"DriverDate", VT_BSTR, CIM_DATETIME );

1 0