wine-commits December 2021

wine-commits@winehq.org

2 participants
569 discussions

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 : 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

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

Rémi Bernon : winmm: Instanciate DirectInput8 class lazily using delay imported DLL.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: e9282254c6824c4387d3a6368c7fb8ca44aeef53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9282254c6824c4387d3a636… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Dec 17 16:42:05 2021 +0100 winmm: Instanciate DirectInput8 class lazily using delay imported DLL. Instead of statically importing dinput8 and creating the class at load time, which causes some native hooks to fail loading. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52222 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/winmm/Makefile.in | 3 ++- dlls/winmm/joystick.c | 11 ++++++++--- dlls/winmm/winemm.h | 1 - dlls/winmm/winmm.c | 2 -- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/winmm/Makefile.in b/dlls/winmm/Makefile.in index 5439ae21678..c515a3aba2e 100644 --- a/dlls/winmm/Makefile.in +++ b/dlls/winmm/Makefile.in @@ -1,7 +1,8 @@ EXTRADEFS = -D_WINMM_ MODULE = winmm.dll IMPORTLIB = winmm -IMPORTS = uuid user32 advapi32 ole32 msacm32 dinput8 +IMPORTS = uuid user32 advapi32 ole32 msacm32 +DELAYIMPORTS = dinput8 C_SRCS = \ driver.c \ diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c index 5f5683e3e35..5a6e1203513 100644 --- a/dlls/winmm/joystick.c +++ b/dlls/winmm/joystick.c @@ -152,11 +152,12 @@ static BOOL CALLBACK enum_instances( const DIDEVICEINSTANCEW *instance, void *co return DIENUM_CONTINUE; } -void joystick_load( HINSTANCE instance ) +static BOOL WINAPI joystick_load_once( INIT_ONCE *once, void *param, void **context ) { - HRESULT hr = DirectInput8Create( instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, + HRESULT hr = DirectInput8Create( hWinMM32Instance, DIRECTINPUT_VERSION, &IID_IDirectInput8W, (void **)&dinput, NULL ); - if (FAILED(hr)) WARN( "could not create dinput instance, hr %#x\n", hr ); + if (FAILED(hr)) ERR( "Could not create dinput instance, hr %#x\n", hr ); + return TRUE; } void joystick_unload() @@ -177,11 +178,15 @@ void joystick_unload() static void find_joysticks(void) { + static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; + IDirectInputDevice8W *device; HANDLE event; DWORD index; HRESULT hr; + InitOnceExecuteOnce( &init_once, joystick_load_once, NULL, NULL ); + if (!dinput) return; index = 0; diff --git a/dlls/winmm/winemm.h b/dlls/winmm/winemm.h index 3459c2a85ef..52cab64b1c5 100644 --- a/dlls/winmm/winemm.h +++ b/dlls/winmm/winemm.h @@ -153,7 +153,6 @@ MMRESULT WINMM_CheckCallback(DWORD_PTR dwCallback, DWORD fdwOpen, BOOL mixer) DE void WINMM_DeleteWaveform(void) DECLSPEC_HIDDEN; -void joystick_load( HMODULE instance ) DECLSPEC_HIDDEN; void joystick_unload( void ) DECLSPEC_HIDDEN; /* Global variables */ diff --git a/dlls/winmm/winmm.c b/dlls/winmm/winmm.c index aab8bfb51a9..aa2dd50c4c1 100644 --- a/dlls/winmm/winmm.c +++ b/dlls/winmm/winmm.c @@ -144,8 +144,6 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID fImpLoad) if (!WINMM_CreateIData(hInstDLL)) return FALSE; - - joystick_load( hInstDLL ); break; case DLL_PROCESS_DETACH: if(fImpLoad)

1 0

Piotr Caban : msvcrt: Make _setfp* helpers infallible.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: c521ec04c9a501159adf40087523557c616e5ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c521ec04c9a501159adf4008… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 21 12:55:07 2021 +0100 msvcrt: Make _setfp* helpers infallible. The functions may only fail on unsupported compilers/architectures. It's not really possible to handle errors properly. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index a80f60bb6c1..414c948d025 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5167,7 +5167,7 @@ double CDECL modf( double x, double *iptr ) } #if defined(__i386__) || defined(__x86_64__) -static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, +static void _setfp_sse( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if defined(__GNUC__) || defined(__clang__) @@ -5256,17 +5256,15 @@ static BOOL _setfp_sse( unsigned int *cw, unsigned int cw_mask, if (fpword != old_fpword) __asm__ __volatile__( "ldmxcsr %0" : : "m" (fpword) ); - return TRUE; #else FIXME("not implemented\n"); if (cw) *cw = 0; if (sw) *sw = 0; - return FALSE; #endif } #endif -static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, +static void _setfp( unsigned int *cw, unsigned int cw_mask, unsigned int *sw, unsigned int sw_mask ) { #if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) @@ -5376,16 +5374,15 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, fenv.status_word = newsw; __asm__ __volatile__( "fldenv %0" : : "m" (fenv) : "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" ); - return TRUE; + return; } if (oldsw != newsw) __asm__ __volatile__( "fnclex" ); if (oldcw != newcw) __asm__ __volatile__( "fldcw %0" : : "m" (newcw) ); - return TRUE; #elif defined(__x86_64__) - return _setfp_sse(cw, cw_mask, sw, sw_mask); + _setfp_sse(cw, cw_mask, sw, sw_mask); #elif defined(__aarch64__) ULONG_PTR old_fpsr = 0, fpsr = 0, old_fpcr = 0, fpcr = 0; unsigned int flags; @@ -5465,7 +5462,6 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); if (old_fpcr != fpcr) __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); - return TRUE; #elif defined(__arm__) && !defined(__SOFTFP__) DWORD old_fpscr, fpscr; unsigned int flags; @@ -5533,12 +5529,10 @@ static BOOL _setfp( unsigned int *cw, unsigned int cw_mask, if (old_fpscr != fpscr) __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); - return TRUE; #else FIXME("not implemented\n"); if (cw) *cw = 0; if (sw) *sw = 0; - return FALSE; #endif } @@ -5648,8 +5642,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (x86_cw) { *x86_cw = newval; - if (!_setfp(x86_cw, mask, NULL, 0)) - return 0; + _setfp(x86_cw, mask, NULL, 0); } if (!sse2_cw) return 1; @@ -5657,8 +5650,7 @@ int CDECL __control87_2( unsigned int newval, unsigned int mask, if (sse2_supported) { *sse2_cw = newval; - if (!_setfp_sse(sse2_cw, mask, NULL, 0)) - return 0; + _setfp_sse(sse2_cw, mask, NULL, 0); } else *sse2_cw = 0; @@ -6053,17 +6045,12 @@ int CDECL fesetenv(const fenv_t *env) #endif #ifdef __i386__ - if (!_setfp(&x87_cw, mask, &x87_stat, ~0)) - return 1; + _setfp(&x87_cw, mask, &x87_stat, ~0); if (sse2_supported) - { - if (!_setfp_sse(&cw, mask, &stat, ~0)) - return 1; - } + _setfp_sse(&cw, mask, &stat, ~0); return 0; #else - if (!_setfp(&cw, mask, &stat, ~0)) - return 1; + _setfp(&cw, mask, &stat, ~0); return 0; #endif }

1 0

Piotr Caban : msvcrt: Don't set _EM_AMBIGOUS flag in _control87 when sse2 is not supported.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 564ede5d328b14a0aedbe88bc372574c243c19f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=564ede5d328b14a0aedbe88b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Dec 21 12:54:58 2021 +0100 msvcrt: Don't set _EM_AMBIGOUS flag in _control87 when sse2 is not supported. Fixes compilation warning. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 3af44f83a08..a80f60bb6c1 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5677,8 +5677,11 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) __control87_2( newval, mask, &flags, &sse2_cw ); - if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; - flags |= sse2_cw; + if (sse2_supported) + { + if ((flags ^ sse2_cw) & (_MCW_EM | _MCW_RC)) flags |= _EM_AMBIGUOUS; + flags |= sse2_cw; + } #else flags = newval; _setfp(&flags, mask, NULL, 0);

1 0

Giovanni Mascellani : wine.inf: Regenerate time zones.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: 929face08481845304315a5dcdf5d01a03119a7e URL: https://source.winehq.org/git/wine.git/?a=commit;h=929face08481845304315a5d… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Tue Dec 21 12:09:18 2021 +0100 wine.inf: Regenerate time zones. Unicode CLDR release 40 and tzdata 2021e were used. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/tzres/tzres.rc | 3 + loader/wine.inf.in | 167 ++++++++++++++++++++++++++--------------- po/ar.po | 206 +++++++++++++++++++++++++++----------------------- po/ast.po | 206 +++++++++++++++++++++++++++----------------------- po/bg.po | 202 ++++++++++++++++++++++++++----------------------- po/ca.po | 206 +++++++++++++++++++++++++++----------------------- po/cs.po | 206 +++++++++++++++++++++++++++----------------------- po/da.po | 206 +++++++++++++++++++++++++++----------------------- po/de.po | 208 ++++++++++++++++++++++++++++----------------------- po/el.po | 202 ++++++++++++++++++++++++++----------------------- po/en.po | 202 ++++++++++++++++++++++++++----------------------- po/en_US.po | 202 ++++++++++++++++++++++++++----------------------- po/eo.po | 206 +++++++++++++++++++++++++++----------------------- po/es.po | 208 ++++++++++++++++++++++++++++----------------------- po/fa.po | 204 +++++++++++++++++++++++++++----------------------- po/fi.po | 208 ++++++++++++++++++++++++++++----------------------- po/fr.po | 206 +++++++++++++++++++++++++++----------------------- po/he.po | 206 +++++++++++++++++++++++++++----------------------- po/hi.po | 202 ++++++++++++++++++++++++++----------------------- po/hr.po | 206 +++++++++++++++++++++++++++----------------------- po/hu.po | 206 +++++++++++++++++++++++++++----------------------- po/it.po | 206 +++++++++++++++++++++++++++----------------------- po/ja.po | 208 ++++++++++++++++++++++++++++----------------------- po/ko.po | 208 ++++++++++++++++++++++++++++----------------------- po/lt.po | 208 ++++++++++++++++++++++++++++----------------------- po/ml.po | 202 ++++++++++++++++++++++++++----------------------- po/nb_NO.po | 206 +++++++++++++++++++++++++++----------------------- po/nl.po | 208 ++++++++++++++++++++++++++++----------------------- po/or.po | 202 ++++++++++++++++++++++++++----------------------- po/pa.po | 202 ++++++++++++++++++++++++++----------------------- po/pl.po | 208 ++++++++++++++++++++++++++++----------------------- po/pt_BR.po | 208 ++++++++++++++++++++++++++++----------------------- po/pt_PT.po | 206 +++++++++++++++++++++++++++----------------------- po/rm.po | 202 ++++++++++++++++++++++++++----------------------- po/ro.po | 206 +++++++++++++++++++++++++++----------------------- po/ru.po | 202 ++++++++++++++++++++++++++----------------------- po/si.po | 206 +++++++++++++++++++++++++++----------------------- po/sk.po | 206 +++++++++++++++++++++++++++----------------------- po/sl.po | 206 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 204 +++++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 204 +++++++++++++++++++++++++++----------------------- po/sv.po | 206 +++++++++++++++++++++++++++----------------------- po/ta.po | 202 ++++++++++++++++++++++++++----------------------- po/te.po | 202 ++++++++++++++++++++++++++----------------------- po/th.po | 204 +++++++++++++++++++++++++++----------------------- po/tr.po | 206 +++++++++++++++++++++++++++----------------------- po/uk.po | 206 +++++++++++++++++++++++++++----------------------- po/wa.po | 204 +++++++++++++++++++++++++++----------------------- po/wine.pot | 202 ++++++++++++++++++++++++++----------------------- po/zh_CN.po | 206 +++++++++++++++++++++++++++----------------------- po/zh_TW.po | 208 ++++++++++++++++++++++++++++----------------------- 51 files changed, 5505 insertions(+), 4717 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=929face0848184530431…

1 0

Floris Renaud : wineconsole: Remove "option" from the man page.
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: e3d56549c993c0ff5601ba9cf3f84201b0891b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3d56549c993c0ff5601ba9c… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Dec 21 10:33:35 2021 +0100 wineconsole: Remove "option" from the man page. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/wineconsole.man.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/wineconsole/wineconsole.man.in b/programs/wineconsole/wineconsole.man.in index 251579c1422..dac4e62f321 100644 --- a/programs/wineconsole/wineconsole.man.in +++ b/programs/wineconsole/wineconsole.man.in @@ -3,11 +3,11 @@ wineconsole \- The Wine console .SH SYNOPSIS .B wineconsole -.RI [ option "] " command +.RI [ command "] " .SH DESCRIPTION .B wineconsole is the Wine console manager, used to run console commands and applications. It allows running the -console either in the current terminal (\fIcurses\fR) or in a newly made window (\fIuser\fR). +console in a newly made window. .SH BUGS Bugs can be reported on the .UR https://bugs.winehq.org

1 0

Alex Henrie : wpcap: Remove unused variable ptr from build_win32_description (cppcheck).
by Alexandre Julliard 21 Dec '21

21 Dec '21

Module: wine Branch: master Commit: bd7d771433adc65fe554369d79395c8767135493 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd7d771433adc65fe554369d… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 19 21:54:51 2021 -0700 wpcap: Remove unused variable ptr from build_win32_description (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/wpcap/wpcap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 59e8f43f77c..b140deeb3d2 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -240,10 +240,10 @@ static char *build_win32_name( const char *source, const char *adapter_name ) static char *build_win32_description( const struct pcap_interface *unix_dev ) { int len = strlen(unix_dev->name) + 1; - char *ret, *ptr; + char *ret; if (unix_dev->description && unix_dev->description[0]) len += strlen(unix_dev->description) + 1; - if ((ret = ptr = malloc( len ))) + if ((ret = malloc( len ))) { if (unix_dev->description) {

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

← Newer
1
...
6
7
8
9
10
11
12
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2021