December 2021 - Wine-commits

Paul Gofman : ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 6b78bcff921826c9b490a88b6759f8c65f17fa3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b78bcff921826c9b490a88b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Dec 21 16:09:25 2021 +0300 ntdll: Restore FP status words from MSVCRT_JUMP_BUFFER on x64. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/signal_x86_64.c | 7 ++++++- dlls/ntdll/tests/exception.c | 16 ++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index e0372b111fd..7e77329363c 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -64,7 +64,9 @@ struct MSVCRT_JUMP_BUFFER ULONG64 R14; ULONG64 R15; ULONG64 Rip; - ULONG64 Spare; + ULONG MxCsr; + USHORT FpCsr; + USHORT Spare; M128A Xmm6; M128A Xmm7; M128A Xmm8; @@ -1218,6 +1220,9 @@ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) context->u.s.Xmm13 = jmp->Xmm13; context->u.s.Xmm14 = jmp->Xmm14; context->u.s.Xmm15 = jmp->Xmm15; + context->MxCsr = jmp->MxCsr; + context->u.FltSave.MxCsr = jmp->MxCsr; + context->u.FltSave.ControlWord = jmp->FpCsr; } else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) { diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index 2bceca204be..4307016f149 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -2460,6 +2460,10 @@ static void test_restore_context(void) rec.NumberParameters = 1; rec.ExceptionInformation[0] = (DWORD64)&buf; + ok(buf.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", buf.MxCsr); + ok(buf.FpCsr == 0x27f, "Got unexpected FpCsr %#x.\n", buf.FpCsr); + buf.FpCsr = 0x7f; + buf.MxCsr = 0x3f80; /* uses buf.Rip instead of ctx.Rip */ pRtlRestoreContext(&ctx, &rec); ok(0, "shouldn't be reached\n"); @@ -2487,6 +2491,18 @@ static void test_restore_context(void) "longjmp failed for Xmm%d, expected %lx, got %lx\n", i + 6, fltsave[i].Part[1], ctx.FltSave.XmmRegisters[i + 6].High); } + ok(ctx.FltSave.ControlWord == 0x7f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); + ok(ctx.FltSave.MxCsr == 0x3f80, "Got unexpected MxCsr %#x.\n", ctx.FltSave.MxCsr); + buf.FpCsr = 0x27f; + buf.MxCsr = 0x1f80; + pRtlRestoreContext(&ctx, &rec); + ok(0, "shouldn't be reached\n"); + } + else if (pass == 5) + { + ok(ctx.FltSave.ControlWord == 0x27f, "Got unexpected float control word %#x.\n", ctx.FltSave.ControlWord); + ok(ctx.FltSave.MxCsr == 0x1f80, "Got unexpected MxCsr %#x.\n", ctx.MxCsr); } else ok(0, "unexpected pass %d\n", pass);

1 0

Andrey Gusev : schtasks: Fix a typo in FIXME() message.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 7314b9768780ca97b67fb97338a7dcf2639290f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7314b9768780ca97b67fb973… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 21 16:40:48 2021 +0200 schtasks: Fix a typo in FIXME() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/schtasks/schtasks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/schtasks/schtasks.c b/programs/schtasks/schtasks.c index 79f2555522f..340aeaa56fb 100644 --- a/programs/schtasks/schtasks.c +++ b/programs/schtasks/schtasks.c @@ -104,7 +104,7 @@ static BSTR read_file_to_bstr(const WCHAR *file_name) r = ReadFile(file, data, file_size.QuadPart, &read_size, NULL); CloseHandle(file); if (!r) { - FIXME("Read filed\n"); + FIXME("Read failed\n"); HeapFree(GetProcessHeap(), 0, data); return NULL; }

1 0

Andrey Gusev : oledb32: Add parentheses to the switch statement.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 9cf587c5b2c832927a439d7ab0b21c102d5b44b5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9cf587c5b2c832927a439d7a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 21 16:41:10 2021 +0200 oledb32: Add parentheses to the switch statement. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oledb32/dslocator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oledb32/dslocator.c b/dlls/oledb32/dslocator.c index 95fd7687560..d35e1eb116f 100644 --- a/dlls/oledb32/dslocator.c +++ b/dlls/oledb32/dslocator.c @@ -492,7 +492,7 @@ static INT_PTR CALLBACK data_link_connection_dlg_proc(HWND hwnd, UINT msg, WPARA } case WM_COMMAND: { - switch LOWORD(wp) + switch (LOWORD(wp)) { case IDC_RDO_SRC_NAME: case IDC_BTN_CONNECTION:

1 0

Andrey Gusev : ntdll: Fix a variable name in TRACE() message.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 93b7c335d6985609380be6b2a526e573725a0bd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b7c335d6985609380be6b2… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Dec 21 17:28:48 2021 +0200 ntdll: Fix a variable name in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index d11f3f0f79d..c8f3d83947f 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3127,7 +3127,7 @@ NTSTATUS WINAPI LdrGetDllHandleEx( ULONG flags, LPCWSTR load_path, ULONG *dll_ch WCHAR *dllname; HANDLE mapping; - TRACE( "flag %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", + TRACE( "flags %#x, load_path %p, dll_characteristics %p, name %p, base %p.\n", flags, load_path, dll_characteristics, name, base ); if (flags & ~valid_flags) return STATUS_INVALID_PARAMETER;

1 0

Rémi Bernon : xaudio2/tests: Check that GetDeviceDetails returns a PCM format.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 0053a686f0c518083666623520e373c206c9ef1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0053a686f0c5180836666235… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:16:35 2021 +0100 xaudio2/tests: Check that GetDeviceDetails returns a PCM format. Far Cry 4 expects IXAudio27_GetDeviceDetails to return a PCM format GUID and refuses to create a source voice if the format is IEEE_FLOAT. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/tests/xaudio2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/xaudio2_7/tests/xaudio2.c b/dlls/xaudio2_7/tests/xaudio2.c index 502b513fb6b..ea7e2ec121a 100644 --- a/dlls/xaudio2_7/tests/xaudio2.c +++ b/dlls/xaudio2_7/tests/xaudio2.c @@ -27,6 +27,8 @@ #include "xapo.h" #include "xapofx.h" #include "mmsystem.h" +#include "ks.h" +#include "ksmedia.h" static BOOL xaudio27; @@ -937,6 +939,10 @@ static UINT32 test_DeviceDetails(IXAudio27 *xa) ok(dd.Role == GlobalDefaultDevice, "Got wrong role for index 0: 0x%x\n", dd.Role); else ok(dd.Role == NotDefaultDevice, "Got wrong role for index %u: 0x%x\n", i, dd.Role); + + todo_wine + ok(IsEqualGUID(&dd.OutputFormat.SubFormat, &KSDATAFORMAT_SUBTYPE_PCM), + "got format %s\n", debugstr_guid(&dd.OutputFormat.SubFormat)); } return count;

1 0

Rémi Bernon : mmdevapi/tests: Check that GetMixFormat returns an IEEE_FLOAT format.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 32ee835d3cb3374fa3f9e0bde430d6580153d7a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32ee835d3cb3374fa3f9e0bd… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Dec 20 17:16:36 2021 +0100 mmdevapi/tests: Check that GetMixFormat returns an IEEE_FLOAT format. And that a corresponding PCM format is supported. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/render.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 495c1c6f496..6b77edc569e 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -232,6 +232,14 @@ static void test_audioclient(void) IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM)?"PCM": (IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT)?"FLOAT":"Other")); + ok(IsEqualGUID(&pwfxe->SubFormat, &KSDATAFORMAT_SUBTYPE_IEEE_FLOAT), + "got format %s\n", debugstr_guid(&pwfxe->SubFormat)); + + pwfxe->SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2); + ok(hr == S_OK, "Valid IsFormatSupported(Shared) call returns %08x\n", hr); + ok(pwfx2 == NULL, "pwfx2 is non-null\n"); + CoTaskMemFree(pwfx2); } hr = IAudioClient_IsFormatSupported(ac, AUDCLNT_SHAREMODE_SHARED, pwfx, &pwfx2);

1 0

Bernhard Übelacker : msxml3: Fix crashes due to access to invalid context pointer.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 2ef4cde8ef65800db480588edc0ea3da8f527b61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ef4cde8ef65800db480588e… Author: Bernhard Übelacker <bernhardu(a)mailbox.org> Date: Mon Dec 20 09:33:55 2021 +0100 msxml3: Fix crashes due to access to invalid context pointer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52073 Signed-off-by: Bernhard Übelacker <bernhardu(a)mailbox.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/node.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 721ad54e379..272e438e773 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -1329,7 +1329,7 @@ static HRESULT import_loader_onDataAvailable(void *ctxt, char *ptr, DWORD len) inputbuffer = xmlParserInputBufferCreateIO(import_loader_io_read, import_loader_io_close, buffer, XML_CHAR_ENCODING_NONE); - *input = xmlNewIOInputStream(ctxt, inputbuffer, XML_CHAR_ENCODING_NONE); + *input = xmlNewIOInputStream(NULL, inputbuffer, XML_CHAR_ENCODING_NONE); if (!*input) xmlFreeParserInputBuffer(inputbuffer);

1 0

Alex Henrie : nsiproxy: Fix use after free in icmp_send_echo (scan-build).
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 06923f61e25bf5fb1037303e94014e515f3fc4cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=06923f61e25bf5fb1037303e… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 20 22:01:21 2021 -0700 nsiproxy: Fix use after free in icmp_send_echo (scan-build). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsiproxy.sys/icmp_echo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/nsiproxy.sys/icmp_echo.c b/dlls/nsiproxy.sys/icmp_echo.c index cfebb287547..f36ff156bef 100644 --- a/dlls/nsiproxy.sys/icmp_echo.c +++ b/dlls/nsiproxy.sys/icmp_echo.c @@ -656,8 +656,8 @@ NTSTATUS icmp_send_echo( void *args ) if (ret < 0) { TRACE( "sendto() rets %d errno %d\n", ret, errno ); - icmp_data_free( data ); params->reply_len = data->ops->set_reply_ip_status( errno_to_ip_status( errno ), params->bits, params->reply ); + icmp_data_free( data ); return STATUS_SUCCESS; }

1 0

Alex Henrie : wldap32: Fix memory leak on error path in create_page_control (cppcheck).
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 3f2458996c55b1e0ea8278015aa80450d459eada URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f2458996c55b1e0ea827801… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 20 22:06:08 2021 -0700 wldap32: Fix memory leak on error path in create_page_control (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/page.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wldap32/page.c b/dlls/wldap32/page.c index 8b0ded40e35..9f4acbdaa16 100644 --- a/dlls/wldap32/page.c +++ b/dlls/wldap32/page.c @@ -96,6 +96,7 @@ static ULONG create_page_control( ULONG pagesize, struct berval *cookie, UCHAR c } if (!(ctrl->ldctl_oid = strAtoW( LDAP_PAGED_RESULT_OID_STRING ))) { + free( val ); free( ctrl ); return LDAP_NO_MEMORY; }

1 0

Alex Henrie : mshtml: Avoid null pointer dereference in OmHistory_get_length (cppcheck).
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 06e0220ed6f4b842cf5903fc17d12bdad8e8f379 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06e0220ed6f4b842cf5903fc… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:54:37 2021 -0700 mshtml: Avoid null pointer dereference in OmHistory_get_length (cppcheck). Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index 70e8e568661..7788b453b8d 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -674,7 +674,7 @@ static HRESULT WINAPI OmHistory_get_length(IOmHistory *iface, short *p) if(This->window && This->window->base.outer_window) browser = This->window->base.outer_window->browser; - *p = browser->doc->travel_log + *p = browser && browser->doc->travel_log ? ITravelLog_CountEntries(browser->doc->travel_log, browser->doc->browser_service) : 0; return S_OK;

1 0