wine-commits January 2023

wine-commits@winehq.org

1 participants
467 discussions

Eric Pouech : conhost.exe: Handle ctrl-\ in Wine.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: e8c79209190c124567027f527497625ac9145618 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8c79209190c124567027f52749762… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 21 10:48:29 2022 +0100 conhost.exe: Handle ctrl-\ in Wine. Let conhost handle ctrl-\ instead of Unix tty, and pretend it's a ctrl-pause/break key stroke. This allows CUI application in processed input mode not to close upon ctrl-\. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54141 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 6 ++++++ server/console.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 0bc6abe657c..1bed7b8a03c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1778,6 +1778,12 @@ static DWORD WINAPI tty_input( void *param ) case 0x1b: i += process_input_escape( console, buf + i + 1, count - i - 1 ); break; + case 0x1c: /* map ctrl-\ unix-ism into ctrl-break/pause windows-ism for unix consoles */ + if (console->is_unix) + key_press( console, 0, VK_CANCEL, LEFT_CTRL_PRESSED ); + else + char_key_press( console, ch, 0 ); + break; case 0x7f: key_press( console, '\b', VK_BACK, 0 ); break; diff --git a/server/console.c b/server/console.c index 34f8d09408f..b64283baf4a 100644 --- a/server/console.c +++ b/server/console.c @@ -1183,7 +1183,7 @@ static void console_server_ioctl( struct fd *fd, ioctl_code_t code, struct async return; } term = server->termios; - term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN); + term.c_lflag &= ~(ECHO | ECHONL | ICANON | IEXTEN | ISIG); term.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON); term.c_cflag &= ~(CSIZE | PARENB); term.c_cflag |= CS8;

1 0

Eric Pouech : conhost.exe: Handle ctrl-pause/break key strokes.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: fda954dfd4f1a0d07ca151324b9eaedc1f09964d URL: https://gitlab.winehq.org/wine/wine/-/commit/fda954dfd4f1a0d07ca151324b9eae… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Dec 21 10:48:28 2022 +0100 conhost.exe: Handle ctrl-pause/break key strokes. Note: this patch should be extended by adding insertion of the CTRL_BREAK_EVENT into processes' crtl handler (as it's done for CTRL_C_EVENT). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/conhost.c | 31 +++++++++++++++++++++++++++---- server/console.c | 8 +++++--- 2 files changed, 32 insertions(+), 7 deletions(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 800e8bab822..0bc6abe657c 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1463,6 +1463,29 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ return process_console_input( console ); } +static BOOL map_to_ctrlevent( struct console *console, const INPUT_RECORD *record, + unsigned int* event) +{ + if (record->EventType == KEY_EVENT) + { + if (record->Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && + !(record->Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + { + *event = CTRL_C_EVENT; + return TRUE; + } + /* we want to get ctrl-pause/break, but it's already translated by user32 into VK_CANCEL */ + if (record->Event.KeyEvent.uChar.UnicodeChar == 0 && + record->Event.KeyEvent.wVirtualKeyCode == VK_CANCEL && + record->Event.KeyEvent.dwControlKeyState == LEFT_CTRL_PRESSED) + { + *event = CTRL_BREAK_EVENT; + return TRUE; + } + } + return FALSE; +} + /* add input events to a console input queue */ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *records, unsigned int count, BOOL flush ) @@ -1485,9 +1508,9 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor unsigned int i = 0; while (i < count) { - if (records[i].EventType == KEY_EVENT && - records[i].Event.KeyEvent.uChar.UnicodeChar == 'C' - 64 && - !(records[i].Event.KeyEvent.dwControlKeyState & ENHANCED_KEY)) + unsigned int event; + + if (map_to_ctrlevent(console, &records[i], &event)) { if (i != count - 1) memcpy( &console->records[console->record_count + i], @@ -1499,7 +1522,7 @@ NTSTATUS write_console_input( struct console *console, const INPUT_RECORD *recor struct condrv_ctrl_event ctrl_event; IO_STATUS_BLOCK io; - ctrl_event.event = CTRL_C_EVENT; + ctrl_event.event = event; ctrl_event.group_id = 0; NtDeviceIoControlFile( console->server, NULL, NULL, NULL, &io, IOCTL_CONDRV_CTRL_EVENT, &ctrl_event, sizeof(ctrl_event), NULL, 0 ); diff --git a/server/console.c b/server/console.c index 5f3f50d006f..34f8d09408f 100644 --- a/server/console.c +++ b/server/console.c @@ -694,14 +694,16 @@ static void propagate_console_signal( struct console *console, set_error( STATUS_INVALID_PARAMETER ); return; } - /* FIXME: should support the other events (like CTRL_BREAK) */ - if (sig != CTRL_C_EVENT) + switch (sig) { + case CTRL_C_EVENT: csi.signal = SIGINT; break; + case CTRL_BREAK_EVENT: csi.signal = SIGQUIT; break; + default: + /* FIXME: should support the other events */ set_error( STATUS_NOT_IMPLEMENTED ); return; } csi.console = console; - csi.signal = SIGINT; csi.group = group_id; enum_processes(propagate_console_signal_cb, &csi);

1 0

Fabian Maurer : d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: ae84e423c5d0e7d9d8c083b1f64029ef41e6e1fe URL: https://gitlab.winehq.org/wine/wine/-/commit/ae84e423c5d0e7d9d8c083b1f64029… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:56:34 2022 +0100 d3dx10core: Don't redefine ID3D10Device1 (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d3dx10core.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3dx10core.h b/include/d3dx10core.h index cca9052cc13..c8c5e97505f 100644 --- a/include/d3dx10core.h +++ b/include/d3dx10core.h @@ -287,8 +287,8 @@ HRESULT WINAPI D3DX10CreateDevice(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE drive HRESULT WINAPI D3DX10CreateDeviceAndSwapChain(IDXGIAdapter *adapter, D3D10_DRIVER_TYPE driver_type, HMODULE swrast, unsigned int flags, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain, ID3D10Device **device); -typedef interface ID3D10Device1 ID3D10Device1; -HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, ID3D10Device1 **device1); +interface ID3D10Device1; +HRESULT WINAPI D3DX10GetFeatureLevel1(ID3D10Device *device, interface ID3D10Device1 **device1); HRESULT WINAPI D3DX10CreateFontIndirectA(ID3D10Device *device, const D3DX10_FONT_DESCA *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontIndirectW(ID3D10Device *device, const D3DX10_FONT_DESCW *desc, ID3DX10Font **font); HRESULT WINAPI D3DX10CreateFontA(ID3D10Device *device, INT height, UINT width, UINT weight,

1 0

Fabian Maurer : d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 0de8f53b3bb6a5256808638cb98f468a7990b3f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/0de8f53b3bb6a5256808638cb98f46… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon Dec 12 18:32:14 2022 +0100 d2d1_1: Don't redefine D2D1_PROPERTY_BINDING (gcc 4.3). Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- include/d2d1_1.idl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index b60064be3b6..9da56050ecb 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -157,7 +157,7 @@ typedef enum D2D1_LAYER_OPTIONS1 D2D1_LAYER_OPTIONS1_FORCE_DWORD = 0xffffffff, } D2D1_LAYER_OPTIONS1; -typedef struct D2D1_PROPERTY_BINDING D2D1_PROPERTY_BINDING; +struct D2D1_PROPERTY_BINDING; typedef D2D_MATRIX_4X4_F D2D1_MATRIX_4X4_F; typedef enum D2D1_PROPERTY_TYPE @@ -936,14 +936,14 @@ interface ID2D1Factory1 : ID2D1Factory HRESULT RegisterEffectFromStream( [in] REFCLSID effect_id, [in] IStream *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory ); HRESULT RegisterEffectFromString( [in] REFCLSID effect_id, [in] const WCHAR *property_xml, - [in, size_is(binding_count)] const D2D1_PROPERTY_BINDING *bindings, + [in, size_is(binding_count)] const struct D2D1_PROPERTY_BINDING *bindings, [in] UINT32 binding_count, [in] PD2D1_EFFECT_FACTORY effect_factory );

1 0

Alexandre Julliard : shell32: Allocate a full SHITEMID to avoid a compiler warning.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: c844ebdb0ae8994ee4f3d1d3c1697ece06f52a4e URL: https://gitlab.winehq.org/wine/wine/-/commit/c844ebdb0ae8994ee4f3d1d3c1697e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:22:52 2023 +0100 shell32: Allocate a full SHITEMID to avoid a compiler warning. --- dlls/shell32/shfldr_fs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 662d8b52d5b..d47911dbef7 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -347,7 +347,7 @@ IShellFolder_fnParseDisplayName (IShellFolder2 * iface, /* Special case for the root folder. */ if (!wcsicmp( szPath, L"\\\\?\\unix\\" )) { - *ppidl = SHAlloc(sizeof(USHORT)); + *ppidl = SHAlloc(sizeof(*ppidl)); if (!*ppidl) return E_FAIL; (*ppidl)->mkid.cb = 0; /* Terminate the ITEMIDLIST */ return S_OK;

1 0

Alexandre Julliard : krnl386: Remove a trace that causes compiler warnings.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: cf3d58e4dc0a59b8b3ac75ceae64fe594c681a50 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3d58e4dc0a59b8b3ac75ceae64fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:18:34 2023 +0100 krnl386: Remove a trace that causes compiler warnings. --- dlls/krnl386.exe16/thunk.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 6b289eac65e..27fc14b5810 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -989,15 +989,7 @@ DWORD WINAPIV SSCall( FARPROC fun, /* [in] function to call */ ... /* [in/out] arguments */ ) { - DWORD i,ret; - DWORD *args = ((DWORD *)&fun) + 1; - - TRACE("(%ld,0x%08lx,%p,[",nr,flags,fun); - for (i = 0; i < nr/4; i++) TRACE("0x%08lx,",args[i]); - TRACE("])\n"); - ret = call_entry_point( fun, nr / sizeof(DWORD), args ); - TRACE(" returning %ld ...\n",ret); - return ret; + return call_entry_point( fun, nr / sizeof(DWORD), (DWORD *)&fun + 1 ); } /**********************************************************************

1 0

Alexandre Julliard : krnl386: Make MapLS argument non-const to avoid some compiler warnings.
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 6e43f873c3f554f8166abdce8bbd265b66aad548 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e43f873c3f554f8166abdce8bbd26… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 24 22:17:14 2023 +0100 krnl386: Make MapLS argument non-const to avoid some compiler warnings. --- dlls/commdlg.dll16/filedlg.c | 4 ++-- dlls/krnl386.exe16/selector.c | 2 +- dlls/shell.dll16/shell.c | 2 +- dlls/user.exe16/dialog.c | 2 +- dlls/user.exe16/hook.c | 4 ++-- dlls/user.exe16/message.c | 12 ++++++------ dlls/user.exe16/window.c | 2 +- include/wine/winbase16.h | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/commdlg.dll16/filedlg.c b/dlls/commdlg.dll16/filedlg.c index 2631febb6ae..b292561b077 100644 --- a/dlls/commdlg.dll16/filedlg.c +++ b/dlls/commdlg.dll16/filedlg.c @@ -249,8 +249,8 @@ static UINT_PTR CALLBACK call_hook_proc( WNDPROC16 hook, HWND hwnd, UINT msg, WP CREATESTRUCT16 cs; CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); lp = MapLS( &cs ); ret = call_hook16( hook, hwnd, msg, wp, lp ); UnMapLS( lp ); diff --git a/dlls/krnl386.exe16/selector.c b/dlls/krnl386.exe16/selector.c index 7d2984cf777..f0c29c8b10d 100644 --- a/dlls/krnl386.exe16/selector.c +++ b/dlls/krnl386.exe16/selector.c @@ -515,7 +515,7 @@ static struct mapls_entry *first_entry; * * Maps linear pointer to segmented. */ -SEGPTR WINAPI MapLS( LPCVOID ptr ) +SEGPTR WINAPI MapLS( void *ptr ) { struct mapls_entry *entry, *free = NULL; const void *base; diff --git a/dlls/shell.dll16/shell.c b/dlls/shell.dll16/shell.c index bc3cfdfc97d..342adeb9a4a 100644 --- a/dlls/shell.dll16/shell.c +++ b/dlls/shell.dll16/shell.c @@ -670,7 +670,7 @@ HINSTANCE16 WINAPI ShellExecute16( HWND16 hWnd, LPCSTR lpOperation, * Only exported from shell32 on Windows, probably imported * from shell through the 16/32 thunks. */ -void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPCSTR cmdline, INT cmdshow ) +void WINAPI RunDLL_CallEntry16( DWORD proc, HWND hwnd, HINSTANCE inst, LPSTR cmdline, INT cmdshow ) { WORD args[5]; SEGPTR cmdline_seg; diff --git a/dlls/user.exe16/dialog.c b/dlls/user.exe16/dialog.c index b61ae5cd519..2b6731e4aaf 100644 --- a/dlls/user.exe16/dialog.c +++ b/dlls/user.exe16/dialog.c @@ -186,7 +186,7 @@ static BOOL DIALOG_CreateControls16( HWND hwnd, LPCSTR template, SEGPTR segptr; template = DIALOG_GetControl16( template, &info ); - segptr = MapLS( info.data ); + segptr = MapLS( (void *)info.data ); caption = (char *)info.windowName; if (caption && IS_INTRESOURCE(caption)) diff --git a/dlls/user.exe16/hook.c b/dlls/user.exe16/hook.c index d140e16e426..6d40982297c 100644 --- a/dlls/user.exe16/hook.c +++ b/dlls/user.exe16/hook.c @@ -290,8 +290,8 @@ static LRESULT CALLBACK call_WH_CBT( INT code, WPARAM wp, LPARAM lp ) cs16.y = cbtcw32->lpcs->y; cs16.x = cbtcw32->lpcs->x; cs16.style = cbtcw32->lpcs->style; - cs16.lpszName = MapLS( cbtcw32->lpcs->lpszName ); - cs16.lpszClass = MapLS( cbtcw32->lpcs->lpszClass ); + cs16.lpszName = MapLS( (void *)cbtcw32->lpcs->lpszName ); + cs16.lpszClass = MapLS( (void *)cbtcw32->lpcs->lpszClass ); cs16.dwExStyle = cbtcw32->lpcs->dwExStyle; cbtcw16.lpcs = (CREATESTRUCT16 *)MapLS( &cs16 ); diff --git a/dlls/user.exe16/message.c b/dlls/user.exe16/message.c index 59c58ed9bd9..203d543ce90 100644 --- a/dlls/user.exe16/message.c +++ b/dlls/user.exe16/message.c @@ -945,15 +945,15 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT BOOL mdi_child = (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_MDICHILD); CREATESTRUCT32Ato16( cs32, &cs ); - cs.lpszName = MapLS( cs32->lpszName ); - cs.lpszClass = MapLS( cs32->lpszClass ); + cs.lpszName = MapLS( (void *)cs32->lpszName ); + cs.lpszClass = MapLS( (void *)cs32->lpszClass ); if (mdi_child) { MDICREATESTRUCTA *mdi_cs = cs32->lpCreateParams; MDICREATESTRUCT32Ato16( mdi_cs, &mdi_cs16 ); - mdi_cs16.szTitle = MapLS( mdi_cs->szTitle ); - mdi_cs16.szClass = MapLS( mdi_cs->szClass ); + mdi_cs16.szTitle = MapLS( (void *)mdi_cs->szTitle ); + mdi_cs16.szClass = MapLS( (void *)mdi_cs->szClass ); cs.lpCreateParams = MapLS( &mdi_cs16 ); } lParam = MapLS( &cs ); @@ -975,8 +975,8 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT MDICREATESTRUCT16 cs; MDICREATESTRUCT32Ato16( cs32, &cs ); - cs.szTitle = MapLS( cs32->szTitle ); - cs.szClass = MapLS( cs32->szClass ); + cs.szTitle = MapLS( (void *)cs32->szTitle ); + cs.szClass = MapLS( (void *)cs32->szClass ); lParam = MapLS( &cs ); ret = callback( HWND_16(hwnd), msg, wParam, lParam, result, arg ); UnMapLS( lParam ); diff --git a/dlls/user.exe16/window.c b/dlls/user.exe16/window.c index 69d178e31b0..eac3468a6e0 100644 --- a/dlls/user.exe16/window.c +++ b/dlls/user.exe16/window.c @@ -1671,7 +1671,7 @@ BOOL16 WINAPI GetClassInfoEx16( HINSTANCE16 hInst16, SEGPTR name, WNDCLASSEX16 * wc->hCursor = get_icon_16( wc32.hCursor ); wc->hbrBackground = HBRUSH_16(wc32.hbrBackground); wc->lpszClassName = 0; - wc->lpszMenuName = MapLS(wc32.lpszMenuName); /* FIXME: leak */ + wc->lpszMenuName = MapLS((void *)wc32.lpszMenuName); /* FIXME: leak */ } return ret; } diff --git a/include/wine/winbase16.h b/include/wine/winbase16.h index 1d052130e33..28cde59f9b3 100644 --- a/include/wine/winbase16.h +++ b/include/wine/winbase16.h @@ -402,8 +402,8 @@ WORD WINAPI LocalHeapSize16(void); BOOL16 WINAPI LocalInit16(HANDLE16,WORD,WORD); FARPROC16 WINAPI LocalNotify16(FARPROC16); HTASK16 WINAPI LockCurrentTask16(BOOL16); -DWORD WINAPI MapLS(LPCVOID); -LPVOID WINAPI MapSL(DWORD); +SEGPTR WINAPI MapLS(void*); +LPVOID WINAPI MapSL(SEGPTR); VOID WINAPI OldYield16(void); VOID WINAPI WIN32_OldYield16(void); VOID WINAPI PostEvent16(HTASK16);

1 0

Alex Henrie : inetcomm: Fix memory leak on realloc failure in copy_headers_to_buf (cppcheck).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 1afa20ae679d7ee4587f19b1cc22b1a9525decd9 URL: https://gitlab.winehq.org/wine/wine/-/commit/1afa20ae679d7ee4587f19b1cc22b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:24:30 2022 -0700 inetcomm: Fix memory leak on realloc failure in copy_headers_to_buf (cppcheck). --- dlls/inetcomm/mimeole.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 232e09aa075..dd2c00b01fa 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -485,7 +485,7 @@ static inline propschema *impl_from_IMimePropertySchema(IMimePropertySchema *ifa */ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) { - char *buf = NULL; + char *buf = NULL, *new_buf; DWORD size = PARSER_BUF_SIZE, offset = 0, last_end = 0; HRESULT hr; BOOL done = FALSE; @@ -497,18 +497,14 @@ static HRESULT copy_headers_to_buf(IStream *stm, char **ptr) char *end; DWORD read; - if(!buf) - buf = malloc(size + 1); - else - { - size *= 2; - buf = realloc(buf, size + 1); - } - if(!buf) + if(buf) size *= 2; + new_buf = realloc(buf, size + 1); + if(!new_buf) { hr = E_OUTOFMEMORY; goto fail; } + buf = new_buf; hr = IStream_Read(stm, buf + offset, size - offset, &read); if(FAILED(hr)) goto fail;

1 0

Alex Henrie : hhctrl: Handle memory allocation failure in SearchCHM_File (cppcheck).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 02d4647c9bae526e8008ddbd2f9fe99572053350 URL: https://gitlab.winehq.org/wine/wine/-/commit/02d4647c9bae526e8008ddbd2f9fe9… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:20:32 2022 -0700 hhctrl: Handle memory allocation failure in SearchCHM_File (cppcheck). --- dlls/hhctrl.ocx/search.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/hhctrl.ocx/search.c b/dlls/hhctrl.ocx/search.c index c6fe30afc14..64b71e87ac7 100644 --- a/dlls/hhctrl.ocx/search.c +++ b/dlls/hhctrl.ocx/search.c @@ -72,7 +72,7 @@ static void fill_search_tree(HWND hwndList, SearchItem *item) */ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char *needle) { - char *buffer = malloc(BLOCK_SIZE); + char *buffer = NULL, *new_buffer; strbuf_t content, node, node_name; IStream *temp_stream = NULL; DWORD i, buffer_size = 0; @@ -84,7 +84,7 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * hres = IStorage_OpenStream(pStorage, file, NULL, STGM_READ, 0, &temp_stream); if(FAILED(hres)) { FIXME("Could not open '%s' stream: %08lx\n", debugstr_w(file), hres); - goto cleanup; + return NULL; } strbuf_init(&node); @@ -110,7 +110,9 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * title[wlen] = 0; } - buffer = realloc(buffer, buffer_size + textlen + 1); + new_buffer = realloc(buffer, buffer_size + textlen + 1); + if(!new_buffer) goto cleanup; + buffer = new_buffer; memcpy(&buffer[buffer_size], text, textlen); buffer[buffer_size + textlen] = '\0'; buffer_size += textlen; @@ -130,14 +132,14 @@ static WCHAR *SearchCHM_File(IStorage *pStorage, const WCHAR *file, const char * if(strstr(buffer, needle)) found = TRUE; +cleanup: strbuf_free(&node); strbuf_free(&content); strbuf_free(&node_name); -cleanup: free(buffer); - if(temp_stream) - IStream_Release(temp_stream); + IStream_Release(temp_stream); + if(!found) { free(title);

1 0

Alex Henrie : hhctrl: Handle memory allocation failure in ReadChmSystem (cppcheck).
by Alexandre Julliard 25 Jan '23

25 Jan '23

Module: wine Branch: master Commit: 88a5c64b9369baa592163e3cdafe1570a17fcabc URL: https://gitlab.winehq.org/wine/wine/-/commit/88a5c64b9369baa592163e3cdafe15… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Dec 11 22:15:04 2022 -0700 hhctrl: Handle memory allocation failure in ReadChmSystem (cppcheck). --- dlls/hhctrl.ocx/chm.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index fb982303a3c..4be86bd165a 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -82,7 +82,7 @@ static BOOL ReadChmSystem(CHMInfo *chm) { IStream *stream; DWORD ver=0xdeadbeef, read, buf_size; - char *buf; + char *buf, *new_buf; HRESULT hres; struct { @@ -101,16 +101,27 @@ static BOOL ReadChmSystem(CHMInfo *chm) IStream_Read(stream, &ver, sizeof(ver), &read); TRACE("version is %lx\n", ver); - buf = malloc(8 * sizeof(DWORD)); - buf_size = 8*sizeof(DWORD); + buf_size = 8 * sizeof(DWORD); + buf = malloc(buf_size); + if(!buf) { + IStream_Release(stream); + return FALSE; + } while(1) { hres = IStream_Read(stream, &entry, sizeof(entry), &read); if(hres != S_OK) break; - if(entry.len > buf_size) - buf = realloc(buf, buf_size=entry.len); + if(entry.len > buf_size) { + new_buf = realloc(buf, entry.len); + if(!new_buf) { + hres = E_OUTOFMEMORY; + break; + } + buf = new_buf; + buf_size = entry.len; + } hres = IStream_Read(stream, buf, entry.len, &read); if(hres != S_OK)

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
47
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 January 2023