March 2021 - Wine-devel - list.winehq.org

[PATCH 1/5] riched20/tests: Use the system locale to determine rtl and multibyte behaviour.
by Huw Davies 08 Mar '21

08 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/tests/editor.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index f6158d9a3d1..4c87869c4a3 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -615,7 +615,7 @@ static void test_EM_POSFROMCHAR(void) "gg\n" "hh\n"; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -771,7 +771,7 @@ static void test_EM_SETCHARFORMAT(void) BOOL rtl; DWORD expect_effects; - rtl = (GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_FONTSIGNATURE, + rtl = (GetLocaleInfoA(LOCALE_SYSTEM_DEFAULT, LOCALE_FONTSIGNATURE, (LPSTR) &sig, sizeof(LOCALESIGNATURE)) && (sig.lsUsb[3] & 0x08000000) != 0); @@ -5609,7 +5609,7 @@ static void test_EM_FORMATRANGE(void) {"WINE\r\n\r\nwine\r\nwine", 5, 6} }; - skip_non_english = (PRIMARYLANGID(GetUserDefaultLangID()) != LANG_ENGLISH); + skip_non_english = (PRIMARYLANGID(GetSystemDefaultLangID()) != LANG_ENGLISH); if (skip_non_english) skip("Skipping some tests on non-English platform\n"); @@ -8964,7 +8964,7 @@ START_TEST( editor ) * RICHED20.DLL, so the linker doesn't actually link to it. */ hmoduleRichEdit = LoadLibraryA("riched20.dll"); ok(hmoduleRichEdit != NULL, "error: %d\n", (int) GetLastError()); - is_lang_japanese = (PRIMARYLANGID(GetUserDefaultLangID()) == LANG_JAPANESE); + is_lang_japanese = (PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_JAPANESE); test_WM_CHAR(); test_EM_FINDTEXT(FALSE); -- 2.23.0

1 0

[PATCH 01/11] ddraw: Store hardware_device flag in struct d3d_device.
by Paul Gofman 08 Mar '21

08 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 200602-200607. Changes: - Restructure the patchset splitting the patches more; - Fix texture get flags in ddraw_surface_update_frontbuffer(); - Do not use ddraw_surface_get_..._texture() helper when sync is not required; - Fixed some test failures and straightened up the the logic in test_rt_caps() a bit. dlls/ddraw/ddraw.c | 6 +++--- dlls/ddraw/ddraw_private.h | 3 ++- dlls/ddraw/device.c | 12 +++++++----- dlls/ddraw/surface.c | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index d616330c307..705d0335d95 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -4330,7 +4330,7 @@ static HRESULT WINAPI d3d7_CreateDevice(IDirect3D7 *iface, REFCLSID riid, TRACE("iface %p, riid %s, surface %p, device %p.\n", iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, target, (IUnknown *)surface, 7, &object, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, target, (IUnknown *)surface, 7, &object, NULL))) { *device = &object->IDirect3DDevice7_iface; } @@ -4359,7 +4359,7 @@ static HRESULT WINAPI d3d3_CreateDevice(IDirect3D3 *iface, REFCLSID riid, return CLASS_E_NOAGGREGATION; wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 3, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice3_iface; } @@ -4385,7 +4385,7 @@ static HRESULT WINAPI d3d2_CreateDevice(IDirect3D2 *iface, REFCLSID riid, iface, debugstr_guid(riid), surface, device); wined3d_mutex_lock(); - if (SUCCEEDED(hr = d3d_device_create(ddraw, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) + if (SUCCEEDED(hr = d3d_device_create(ddraw, riid, surface_impl, (IUnknown *)surface, 2, &device_impl, NULL))) { *device = &device_impl->IDirect3DDevice2_iface; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 6bbd62949ac..e25ab23c2bc 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -317,6 +317,7 @@ struct d3d_device IUnknown IUnknown_inner; LONG ref; UINT version; + BOOL hardware_device; IUnknown *outer_unknown; struct wined3d_device *wined3d_device; @@ -364,7 +365,7 @@ struct d3d_device const struct wined3d_stateblock_state *stateblock_state; }; -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) DECLSPEC_HIDDEN; enum wined3d_depth_buffer_type d3d_device_update_depth_stencil(struct d3d_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 4d24c22650e..5e66007213d 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6925,7 +6925,7 @@ static void ddraw_reset_viewport_state(struct ddraw *ddraw) wined3d_stateblock_set_scissor_rect(ddraw->state, &rect); } -static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, +static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, IUnknown *outer_unknown) { static const struct wined3d_matrix ident = @@ -6948,6 +6948,8 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, device->IUnknown_inner.lpVtbl = &d3d_device_inner_vtbl; device->ref = 1; device->version = version; + device->hardware_device = IsEqualGUID(&IID_IDirect3DTnLHalDevice, guid) + || IsEqualGUID(&IID_IDirect3DHALDevice, guid); if (outer_unknown) device->outer_unknown = outer_unknown; @@ -7006,14 +7008,14 @@ static HRESULT d3d_device_init(struct d3d_device *device, struct ddraw *ddraw, return D3D_OK; } -HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, +HRESULT d3d_device_create(struct ddraw *ddraw, const GUID *guid, struct ddraw_surface *target, IUnknown *rt_iface, UINT version, struct d3d_device **device, IUnknown *outer_unknown) { struct d3d_device *object; HRESULT hr; - TRACE("ddraw %p, target %p, version %u, device %p, outer_unknown %p.\n", - ddraw, target, version, device, outer_unknown); + TRACE("ddraw %p, guid %s, target %p, version %u, device %p, outer_unknown %p.\n", + ddraw, debugstr_guid(guid), target, version, device, outer_unknown); if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_3DDEVICE) || (target->surface_desc.ddsCaps.dwCaps & DDSCAPS_ZBUFFER)) @@ -7054,7 +7056,7 @@ HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUn return DDERR_OUTOFMEMORY; } - if (FAILED(hr = d3d_device_init(object, ddraw, target, rt_iface, version, outer_unknown))) + if (FAILED(hr = d3d_device_init(object, ddraw, guid, target, rt_iface, version, outer_unknown))) { WARN("Failed to initialize device, hr %#x.\n", hr); heap_free(object); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 0ca19d4f8a5..b910fb6817e 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -256,7 +256,7 @@ static HRESULT WINAPI ddraw_surface7_QueryInterface(IDirectDrawSurface7 *iface, { HRESULT hr; - if (FAILED(hr = d3d_device_create(This->ddraw, This, (IUnknown *)&This->IDirectDrawSurface_iface, + if (FAILED(hr = d3d_device_create(This->ddraw, riid, This, (IUnknown *)&This->IDirectDrawSurface_iface, 1, &This->device1, (IUnknown *)&This->IDirectDrawSurface_iface))) { This->device1 = NULL; -- 2.29.2

3 28

[tools] testbot/PatchUtils: Fix the module name for directories containing dots.
by Francois Gouget 08 Mar '21

08 Mar '21

Wine forces dlls that contain dots in their names to be implemented in a folder ending in '.dll'. But the module name and test executables don't have this extra 'extension' and thus deriving them from the patched filename requires special treatment. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This fixes the issue in the TestBot code. However the TestBot uses winetest.exe to run the tests in Wine, specifically to run the lib.and.dot.dll tests it would run 'winetest.exe lib.and.dot'. It turns out that winetest.exe has been checking the presence of the dlls by calling LoadLibrary("serialui") and not LoadLibrary("serialui.dll"). Surprisingly this works. But LoadLibrary("lib.and.dot") does not work, even if lib.and.dot.dll does exist, as confirmed by LoadLibrary("lib.and.dot.dll"). So this causes winetest.exe to skip the lib.and.dot tests because the dll is missing. https://bugs.winehq.org/show_bug.cgi?id=50783 --- testbot/lib/WineTestBot/PatchUtils.pm | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/PatchUtils.pm b/testbot/lib/WineTestBot/PatchUtils.pm index aeb874321..51def0f66 100644 --- a/testbot/lib/WineTestBot/PatchUtils.pm +++ b/testbot/lib/WineTestBot/PatchUtils.pm @@ -44,6 +44,20 @@ use WineTestBot::Utils; # Source repository maintenance # +sub _Dir2ModuleName($$) +{ + my ($Root, $Dir) = @_; + + # Add a .exe extension to program directory names, but not if they already + # contain some other extension. + return "$Dir.exe" if ($Root eq "programs" and $Dir !~ /\./); + + # Dll directory names can normally be used as is, except if a '.dll' + # extension was added because they contains dots. + $Dir =~ s/\.dll$//; + return $Dir; +} + =pod =over 12 @@ -107,7 +121,7 @@ sub _LoadWineFiles() my ($Root, $Module, $File) = ($1, $2, $3); next if ($File eq "testlist.c"); next if ($File !~ /\.(?:c|spec)$/); - $Module .= ".exe" if ($Root eq "programs" and $Module !~ /\./); + $Module = _Dir2ModuleName($Root, $Module); $_TestList->{$Module}->{$File} = 1; } } @@ -177,8 +191,7 @@ sub _CreateTestInfo($$$) { my ($Impacts, $Root, $Dir) = @_; - # Don't add an extension to programs that have one already - my $Module = ($Root eq "programs" and $Dir !~ /\./) ? "$Dir.exe" : $Dir; + my $Module = _Dir2ModuleName($Root, $Dir); $Impacts->{BuildModules}->{$Module} = 1; $Impacts->{IsWinePatch} = 1; -- 2.20.1

1 0

[PATCH 1/4] reg/tests: Group REG_SZ default value tests
by Hugh McMaster 08 Mar '21

08 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/tests/add.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index a34bcf7c9ac..c91d9d9b9b8 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -287,6 +287,18 @@ static void test_add(void) else win_skip("broken reg.exe detected\n"); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v test /d deadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test", REG_SZ, "deadbeef", 9, 0); @@ -298,10 +310,6 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); - run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_SZ /v test2 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test2", REG_SZ, "", 1, 0); @@ -310,14 +318,6 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "test3", REG_SZ, "", 1, 0); - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - - run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /t REG_SZ /f", &r); - ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - verify_reg(hkey, NULL, REG_SZ, "", 1, 0); - /* REG_EXPAND_SZ */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v expand0 /t REG_EXpand_sz /d \"dead%PATH%beef\" /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); -- 2.30.1

1 3

[PATCH] winemac: Add discardEventsPassingTest to WineEventQueue's interface.
by Huw Davies 08 Mar '21

08 Mar '21

This is called from the status item implementation. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/cocoa_event.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/cocoa_event.h b/dlls/winemac.drv/cocoa_event.h index 72ff8f9c6d4..1cc7e8ac4ba 100644 --- a/dlls/winemac.drv/cocoa_event.h +++ b/dlls/winemac.drv/cocoa_event.h @@ -53,6 +53,7 @@ @interface WineEventQueue : NSObject - (void) postEvent:(macdrv_event*)inEvent; - (void) discardEventsMatchingMask:(macdrv_event_mask)mask forWindow:(NSWindow*)window; + - (void) discardEventsPassingTest:(BOOL (^)(macdrv_event* event))block; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout flags:(NSUInteger)flags; - (BOOL) query:(macdrv_query*)query timeout:(NSTimeInterval)timeout; -- 2.23.0

1 0

[PATCH 1/6] dwrite: Remove duplicated trace call.
by Nikolay Sivov 08 Mar '21

08 Mar '21

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/font.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 9232f29317f..8a5033ab64f 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -7226,9 +7226,6 @@ static HRESULT WINAPI dwritefontset_GetPropertyValues(IDWriteFontSet3 *iface, UI { static int once; - if (!once++) - FIXME("%p: stub\n", iface); - if (!once++) FIXME("%p, %u, %d, %p, %p.\n", iface, index, id, exists, values); -- 2.30.1

1 5

[PATCH v2] programs/wmic: Add missing aliases.
by Hans Leidekker 08 Mar '21

08 Mar '21

From: Chao Long <longchao(a)uniontech.com> v2: Improve patch subject. Signed-off-by: Chao Long <longchao(a)uniontech.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- programs/wmic/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/programs/wmic/main.c b/programs/wmic/main.c index 1372c0986e9..f0b6ea0f05d 100644 --- a/programs/wmic/main.c +++ b/programs/wmic/main.c @@ -44,7 +44,10 @@ alias_map[] = { L"LogicalDisk", L"Win32_LogicalDisk" }, { L"nic", L"Win32_NetworkAdapter" }, { L"os", L"Win32_OperatingSystem" }, - { L"process", L"Win32_Process" } + { L"process", L"Win32_Process" }, + { L"baseboard", L"Win32_BaseBoard" }, + { L"diskdrive", L"Win32_DiskDrive" }, + { L"memorychip", L"Win32_PhysicalMemory" } }; static const WCHAR *find_class( const WCHAR *alias ) -- 2.30.1

1 0

[PATCH] winex11.drv: Initialize biCompression when creating icons (valgrind).
by Rémi Bernon 08 Mar '21

08 Mar '21

Conditional jump or move depends on uninitialised value(s) at 0x6C7D2EC7: bitmapinfoheader_from_user_bitmapinfo (dib.c:188) by 0x6C7D4D7E: GetDIBits (dib.c:1232) by 0x68D63707: create_icon_pixmaps.isra.0 (window.c:581) by 0x68D663B4: fetch_icon_data (window.c:665) by 0x68D692C4: X11DRV_WindowPosChanged (window.c:2491) by 0x6EB9BD64: set_window_pos (winpos.c:2233) by 0x6EB9DE63: USER_SetWindowPos (winpos.c:2312) by 0x6EB9C514: SetWindowPos (winpos.c:2402) by 0x6EB9CCCD: show_window (winpos.c:1130) by 0x6EB9D25A: ShowWindow (winpos.c:1232) by 0x6EB97245: WIN_CreateWindowEx (win.c:1713) by 0x6EB8F9BE: CreateWindowExW (win.c:1799) Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index baaa30d74e3..ef7e24c579c 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -578,6 +578,7 @@ static BOOL create_icon_pixmaps( HDC hdc, const ICONINFO *icon, Pixmap *icon_ret info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); info->bmiHeader.biBitCount = 0; + info->bmiHeader.biCompression = BI_RGB; if (!(lines = GetDIBits( hdc, icon->hbmColor, 0, 0, NULL, info, DIB_RGB_COLORS ))) goto failed; if (!(bits.ptr = HeapAlloc( GetProcessHeap(), 0, info->bmiHeader.biSizeImage ))) goto failed; if (!GetDIBits( hdc, icon->hbmColor, 0, lines, bits.ptr, info, DIB_RGB_COLORS )) goto failed; -- 2.30.0

1 0

[PATCH] winex11.drv: Fix invalid range when reading GTK_WORKAREAS_D0 (valgrind).
by Rémi Bernon 08 Mar '21

08 Mar '21

Invalid read of size 8 at 0x559B816: get_work_area (display.c:296) by 0x55DC8C1: query_screens (xinerama.c:103) by 0x55DC8C1: xinerama_init (xinerama.c:275) by 0x55D6F47: process_attach (x11drv_main.c:602) by 0x55D6F47: DllMain (x11drv_main.c:721) by 0x7BC35819: call_dll_entry_point (loader.c:285) by 0x7BC35819: MODULE_InitDLL (loader.c:1317) by 0x7BC362ED: process_attach.part.0 (loader.c:1411) by 0x7BC3B843: process_attach (loader.c:1382) by 0x7BC3B843: LdrLoadDll (loader.c:2765) by 0x7B025C85: load_library (loader.c:172) by 0x7B026B72: LoadLibraryExW (loader.c:522) by 0x7B026BE5: LoadLibraryW (loader.c:492) by 0x40990D: load_graphics_driver (desktop.c:844) by 0x40990D: manage_desktop (desktop.c:1010) by 0x40C6B3: parse_command_line (explorer.c:836) by 0x40C6B3: wWinMain (explorer.c:865) by 0x4103F2: wmain (crt_wwinmain.c:55) Address 0x5272370 is 16 bytes before an unallocated block of size 3,132,512 in arena "client" Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/display.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/display.c b/dlls/winex11.drv/display.c index 0f61f9f7b2e..b647455a01f 100644 --- a/dlls/winex11.drv/display.c +++ b/dlls/winex11.drv/display.c @@ -289,9 +289,9 @@ RECT get_work_area(const RECT *monitor_rect) x11drv_atom(_GTK_WORKAREAS_D0), 0, ~0, False, XA_CARDINAL, &type, &format, &count, &remaining, (unsigned char **)&work_area)) { - if (type == XA_CARDINAL && format == 32 && count >= 4) + if (type == XA_CARDINAL && format == 32) { - for (i = 0; i + 3 < count; i += 4) + for (i = 0; i < count / 4; ++i) { work_rect.left = work_area[i * 4]; work_rect.top = work_area[i * 4 + 1]; -- 2.30.0

1 0

[PATCH] ntdll: Initialize mountmgr_unix_drive before NtDeviceIoControlFile (valgrind).
by Rémi Bernon 08 Mar '21

08 Mar '21

Syscall param writev(vector[...]) points to uninitialised byte(s) at 0x4189DA3: writev (writev.c:26) by 0x46A5A1B: send_request (server.c:213) by 0x46A5A1B: server_call_unlocked (server.c:273) by 0x46CA54F: virtual_locked_server_call (virtual.c:2993) by 0x4681C9A: server_ioctl_file (file.c:4789) by 0x468B326: NtDeviceIoControlFile (file.c:5620) by 0x468B7AF: get_mountmgr_fs_info (file.c:1986) by 0x468B7AF: get_mountmgr_fs_info (file.c:1955) by 0x468FCBB: NtQueryVolumeInformationFile (file.c:6483) by 0x4677E88: __wine_syscall_dispatcher_xsave (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.so) by 0x7BC0DEB3: NtQueryVolumeInformationFile (in /home/rbernon/Code/build-wine/wine64/dlls/ntdll/ntdll.dll) by 0x7B01F127: GetFileInformationByHandle (file.c:2938) by 0x7096A5C3: _fstat64 (file.c:1791) by 0x7096A941: _fstat64i32 (file.c:1877) Address 0x7ffffe30e520 is in a rw- anonymous segment Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It would maybe be better to have a separate struct for the ioct input, but this is how it's done elsewhere instead. dlls/ntdll/unix/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index bcaf03a2d02..65042f189af 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1963,13 +1963,13 @@ static NTSTATUS get_mountmgr_fs_info( HANDLE handle, int fd, struct mountmgr_uni letter = find_dos_device( unix_name ); free( unix_name ); + memset( drive, 0, sizeof(*drive) ); if (letter == -1) { struct stat st; fstat( fd, &st ); drive->unix_dev = st.st_rdev ? st.st_rdev : st.st_dev; - drive->letter = 0; } else drive->letter = 'a' + letter; -- 2.30.0

1 0