July 2024 - Wine-commits - list.winehq.org

Eric Pouech : cmd: Enhance CHOICE arguement parsing.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 47915927bbc62dd1277c61e0413e45e553c46a71 URL: https://gitlab.winehq.org/wine/wine/-/commit/47915927bbc62dd1277c61e0413e45… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jul 13 09:27:44 2024 +0200 cmd: Enhance CHOICE arguement parsing. Now using Windows's syntax (and no longer the DOS one). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 201 +++++++++++++++++++++++++----------------------- programs/cmd/wcmd.h | 2 +- 2 files changed, 106 insertions(+), 97 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 17671c32eba..d2071a17d3c 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -279,147 +279,154 @@ RETURN_CODE WCMD_clear_screen(void) * */ -RETURN_CODE WCMD_choice (const WCHAR * args) +RETURN_CODE WCMD_choice(WCHAR *args) { + RETURN_CODE return_code = NO_ERROR; WCHAR answer[16]; WCHAR buffer[16]; WCHAR *ptr = NULL; WCHAR *opt_c = NULL; - WCHAR *my_command = NULL; + WCHAR *opt_m = NULL; WCHAR opt_default = 0; - DWORD opt_timeout = 0; + DWORD opt_timeout = -1; + WCHAR *end; DWORD count; DWORD oldmode; BOOL have_console; BOOL opt_n = FALSE; - BOOL opt_s = FALSE; - - have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); - my_command = xstrdupW(WCMD_skip_leading_spaces((WCHAR*)args)); - - ptr = my_command; - /* syntax errors are reported with ERRORLEVEL=1, which doesn't allow to - * discriminate from a choosen option! - */ - while (*ptr == '/') { - switch (towupper(ptr[1])) { - case 'C': - ptr += 2; - /* the colon is optional */ - if (*ptr == ':') - ptr++; - - if (!*ptr || iswspace(*ptr)) { - WINE_FIXME("bad parameter %s for /C\n", wine_dbgstr_w(ptr)); - free(my_command); - return errorlevel = ERROR_INVALID_FUNCTION; - } + BOOL opt_cs = FALSE; + int argno; - /* remember the allowed keys (overwrite previous /C option) */ - opt_c = ptr; - while (*ptr && (!iswspace(*ptr))) - ptr++; + for (argno = 0; ; argno++) + { + WCHAR *arg = WCMD_parameter(args, argno, NULL, FALSE, FALSE); + if (!*arg) break; - if (*ptr) { - /* terminate allowed chars */ - *ptr = 0; - ptr = WCMD_skip_leading_spaces(&ptr[1]); + if (!wcsicmp(arg, L"/N")) opt_n = TRUE; + else if (!wcsicmp(arg, L"/CS")) opt_cs = TRUE; + else if (arg[0] == L'/' && wcschr(L"CDTM", towupper(arg[1]))) + { + WCHAR opt = towupper(arg[1]); + if (arg[2] == L'\0') + { + arg = WCMD_parameter(args, ++argno, NULL, FALSE, FALSE); + if (!*arg) + { + return_code = ERROR_INVALID_FUNCTION; + break; } - WINE_TRACE("answer-list: %s\n", wine_dbgstr_w(opt_c)); + } + else if (arg[2] == L':') + arg += 3; + else + { + return_code = ERROR_INVALID_FUNCTION; break; - - case 'N': - opt_n = TRUE; - ptr = WCMD_skip_leading_spaces(&ptr[2]); + } + switch (opt) + { + case L'C': + opt_c = wcsdup(arg); break; - - case 'S': - opt_s = TRUE; - ptr = WCMD_skip_leading_spaces(&ptr[2]); + case L'M': + opt_m = wcsdup(arg); break; - - case 'T': - ptr = &ptr[2]; - /* the colon is optional */ - if (*ptr == ':') - ptr++; - - opt_default = *ptr++; - - if (!opt_default || (*ptr != ',')) { - WINE_FIXME("bad option %s for /T\n", opt_default ? wine_dbgstr_w(ptr) : ""); - free(my_command); - return errorlevel = ERROR_INVALID_FUNCTION; - } - ptr++; - - count = 0; - while (((answer[count] = *ptr)) && iswdigit(*ptr) && (count < 15)) { - count++; - ptr++; - } - - answer[count] = 0; - opt_timeout = wcstol(answer, NULL, 10); - - ptr = WCMD_skip_leading_spaces(ptr); + case L'D': + opt_default = *arg; break; - - default: - WINE_FIXME("bad parameter: %s\n", wine_dbgstr_w(ptr)); - free(my_command); - return errorlevel = ERROR_INVALID_FUNCTION; + case L'T': + opt_timeout = wcstol(arg, &end, 10); + if (end == arg || (*end && !iswspace(*end))) + opt_timeout = 10000; + break; + } } + else + return_code = ERROR_INVALID_FUNCTION; } - if (opt_timeout) - WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); + /* use default keys, when needed: localized versions of "Y"es and "No" */ + if (!opt_c) + { + LoadStringW(hinst, WCMD_YES, buffer, ARRAY_SIZE(buffer)); + LoadStringW(hinst, WCMD_NO, buffer + 1, ARRAY_SIZE(buffer) - 1); + opt_c = buffer; + buffer[2] = L'\0'; + } + /* validate various options */ + if (!opt_cs) wcsupr(opt_c); + /* check that default is in the choices list */ + if (!wcschr(opt_c, opt_cs ? opt_default : towupper(opt_default))) + return_code = ERROR_INVALID_FUNCTION; + /* check that there's no duplicates in the choices list */ + for (ptr = opt_c; *ptr; ptr++) + if (wcschr(ptr + 1, opt_cs ? *ptr : towupper(*ptr))) + return_code = ERROR_INVALID_FUNCTION; + TRACE("CHOICE message(%s) choices(%s) timeout(%ld) default(%c)\n", + debugstr_w(opt_m), debugstr_w(opt_c), opt_timeout, opt_default ? opt_default : '?'); + if (return_code != NO_ERROR || + (opt_timeout == -1) != (opt_default == L'\0') || + (opt_timeout != -1 && opt_timeout > 9999)) + { + WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); + if (return_code == NO_ERROR) return_code = ERROR_INVALID_FUNCTION; + if (opt_c != buffer) free(opt_c); + free(opt_m); + return errorlevel = return_code; + } + if (opt_timeout != -1) + { + WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); + return errorlevel = ERROR_INVALID_FUNCTION; + } + have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); /* use default keys, when needed: localized versions of "Y"es and "No" */ - if (!opt_c) { + if (!opt_c) + { LoadStringW(hinst, WCMD_YES, buffer, ARRAY_SIZE(buffer)); LoadStringW(hinst, WCMD_NO, buffer + 1, ARRAY_SIZE(buffer) - 1); opt_c = buffer; - buffer[2] = 0; + buffer[2] = L'\0'; } /* print the question, when needed */ - if (*ptr) - WCMD_output_asis(ptr); + if (opt_m) + WCMD_output_asis(opt_m); - if (!opt_s) { + if (!opt_cs) wcsupr(opt_c); - WINE_TRACE("case insensitive answer-list: %s\n", wine_dbgstr_w(opt_c)); - } - if (!opt_n) { + if (!opt_n) + { /* print a list of all allowed answers inside brackets */ WCMD_output_asis(L"["); - ptr = opt_c; - answer[1] = 0; - while ((answer[0] = *ptr++)) { - WCMD_output_asis(answer); - if (*ptr) + answer[1] = L'\0'; + for (ptr = opt_c; *ptr; ptr++) + { + if (ptr != opt_c) WCMD_output_asis(L","); + answer[0] = *ptr; + WCMD_output_asis(answer); } WCMD_output_asis(L"]?"); } - while (TRUE) { - + while (TRUE) + { /* FIXME: Add support for option /T */ answer[1] = 0; /* terminate single character string */ if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count) || !count) { - free(my_command); /* FIXME: is this choice 1 or ERROR_INVALID_FUNCTION? */ - return errorlevel = 1; + return_code = 1; + break; } - if (!opt_s) + if (!opt_cs) answer[0] = towupper(answer[0]); ptr = wcschr(opt_c, answer[0]); @@ -429,10 +436,9 @@ RETURN_CODE WCMD_choice (const WCHAR * args) if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); - errorlevel = (ptr - opt_c) + 1; + return_code = (ptr - opt_c) + 1; TRACE("answer: %d\n", errorlevel); - free(my_command); - return errorlevel; + break; } else { @@ -441,6 +447,9 @@ RETURN_CODE WCMD_choice (const WCHAR * args) WCMD_output_asis(L"\a"); } } + if (opt_c != buffer) free(opt_c); + free(opt_m); + return errorlevel = return_code; } /**************************************************************************** diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8e870993b06..c800da59821 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -157,7 +157,7 @@ BOOL WCMD_print_volume_information(const WCHAR *); RETURN_CODE WCMD_assoc(const WCHAR *, BOOL); RETURN_CODE WCMD_batch(const WCHAR *, WCHAR *, const WCHAR *, HANDLE); RETURN_CODE WCMD_call(WCHAR *command); -RETURN_CODE WCMD_choice(const WCHAR *); +RETURN_CODE WCMD_choice(WCHAR *); RETURN_CODE WCMD_clear_screen(void); RETURN_CODE WCMD_color(void); RETURN_CODE WCMD_copy(WCHAR *);

1 0

Eric Pouech : cmd: Implement timeout support in CHOICE command.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 787fb63720a4ecedd3818b281ceb036520897dde URL: https://gitlab.winehq.org/wine/wine/-/commit/787fb63720a4ecedd3818b281ceb03… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jul 13 11:09:36 2024 +0200 cmd: Implement timeout support in CHOICE command. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/builtins.c | 93 ++++++++++++++++++++------------ programs/cmd/tests/test_builtins.cmd.exp | 24 ++++----- 2 files changed, 70 insertions(+), 47 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index d2071a17d3c..2654ad750fa 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -290,7 +290,6 @@ RETURN_CODE WCMD_choice(WCHAR *args) WCHAR opt_default = 0; DWORD opt_timeout = -1; WCHAR *end; - DWORD count; DWORD oldmode; BOOL have_console; BOOL opt_n = FALSE; @@ -370,39 +369,24 @@ RETURN_CODE WCMD_choice(WCHAR *args) (opt_timeout != -1 && opt_timeout > 9999)) { WCMD_output_stderr(WCMD_LoadMessage(WCMD_ARGERR)); - if (return_code == NO_ERROR) return_code = ERROR_INVALID_FUNCTION; + errorlevel = 255; if (opt_c != buffer) free(opt_c); free(opt_m); - return errorlevel = return_code; - } - if (opt_timeout != -1) - { - WINE_FIXME("timeout not supported: %c,%ld\n", opt_default, opt_timeout); - return errorlevel = ERROR_INVALID_FUNCTION; + return ERROR_INVALID_FUNCTION; } + have_console = GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &oldmode); if (have_console) SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), 0); - /* use default keys, when needed: localized versions of "Y"es and "No" */ - if (!opt_c) - { - LoadStringW(hinst, WCMD_YES, buffer, ARRAY_SIZE(buffer)); - LoadStringW(hinst, WCMD_NO, buffer + 1, ARRAY_SIZE(buffer) - 1); - opt_c = buffer; - buffer[2] = L'\0'; - } - /* print the question, when needed */ if (opt_m) WCMD_output_asis(opt_m); - if (!opt_cs) - wcsupr(opt_c); - if (!opt_n) { /* print a list of all allowed answers inside brackets */ + if (opt_m) WCMD_output_asis(L" "); WCMD_output_asis(L"["); answer[1] = L'\0'; for (ptr = opt_c; *ptr; ptr++) @@ -415,41 +399,80 @@ RETURN_CODE WCMD_choice(WCHAR *args) WCMD_output_asis(L"]?"); } - while (TRUE) + while (return_code == NO_ERROR) { - /* FIXME: Add support for option /T */ - answer[1] = 0; /* terminate single character string */ - if (!WCMD_ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count) || !count) + if (opt_timeout == 0) + answer[0] = opt_default; + else + { + LARGE_INTEGER li, zeroli = {0}; + OVERLAPPED overlapped = {0}; + DWORD count; + + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + if (SetFilePointerEx(GetStdHandle(STD_INPUT_HANDLE), zeroli, &li, FILE_CURRENT)) + { + overlapped.Offset = li.LowPart; + overlapped.OffsetHigh = li.HighPart; + } + if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, NULL, &overlapped)) + { + switch (WaitForSingleObject(overlapped.hEvent, opt_timeout == -1 ? INFINITE : opt_timeout * 1000)) + { + case WAIT_OBJECT_0: + break; + case WAIT_TIMEOUT: + answer[0] = opt_default; + break; + default: + return_code = ERROR_INVALID_FUNCTION; + } + } + else if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), answer, 1, &count, NULL)) + { + if (count == 0) + { + if (opt_timeout != -1) + answer[0] = opt_default; + else + return_code = ERROR_INVALID_FUNCTION; + } + } + else + return_code = ERROR_INVALID_FUNCTION; + CloseHandle(overlapped.hEvent); + } + if (return_code != NO_ERROR) { - /* FIXME: is this choice 1 or ERROR_INVALID_FUNCTION? */ - return_code = 1; + errorlevel = 255; break; } - if (!opt_cs) answer[0] = towupper(answer[0]); + answer[1] = L'\0'; /* terminate single character string */ ptr = wcschr(opt_c, answer[0]); - if (ptr) { + if (ptr) + { WCMD_output_asis(answer); WCMD_output_asis(L"\r\n"); - if (have_console) - SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); - return_code = (ptr - opt_c) + 1; - TRACE("answer: %d\n", errorlevel); - break; + return_code = errorlevel = (ptr - opt_c) + 1; + TRACE("answer: %d\n", return_code); } else { /* key not allowed: play the bell */ - WINE_TRACE("key not allowed: %s\n", wine_dbgstr_w(answer)); + TRACE("key not allowed: %s\n", wine_dbgstr_w(answer)); WCMD_output_asis(L"\a"); } } + if (have_console) + SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), oldmode); + if (opt_c != buffer) free(opt_c); free(opt_m); - return errorlevel = return_code; + return return_code; } /**************************************************************************** diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 5d9629e35a9..03bcb674bdb 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -707,19 +707,19 @@ I'm here!@space@ I'm here!@space@ I'm here!@space@ ------------ Testing 'choice' ------------ -(a)todo_wine@Example message [A,B,C]?A(a)or_broken@choice unavailable +Example message [A,B,C]?A(a)or_broken@choice unavailable 1(a)or_broken@9009 -(a)todo_wine@Example message [A,B,C]?B(a)or_broken@choice unavailable -(a)todo_wine@2(a)or_broken@9009 -(a)todo_wine@[D,E,F]?F(a)or_broken@choice unavailable -(a)todo_wine@3(a)or_broken@9009 -(a)todo_wine@[A,B,C,X,Y,Z]?Y(a)or_broken@choice unavailable -(a)todo_wine@5(a)or_broken@9009 -(a)todo_wine@A(a)or_broken@choice unavailable -(a)todo_wine@1(a)or_broken@9009 -(a)todo_wine@[a,b,c,A,B,C]?A(a)or_broken@choice unavailable -(a)todo_wine@4(a)or_broken@9009 -(a)todo_wine@255(a)or_broken@9009 +Example message [A,B,C]?B(a)or_broken@choice unavailable +2(a)or_broken@9009 +[D,E,F]?F(a)or_broken@choice unavailable +3(a)or_broken@9009 +[A,B,C,X,Y,Z]?Y(a)or_broken@choice unavailable +5(a)or_broken@9009 +A(a)or_broken@choice unavailable +1(a)or_broken@9009 +[a,b,c,A,B,C]?A(a)or_broken@choice unavailable +4(a)or_broken@9009 +255(a)or_broken@9009 ------------ Testing variable expansion ------------ ~p0 should be path containing batch file @path@

1 0

Fabian Maurer : ntdll: Prevent double close in error case (coverity).
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: c30a660dbf448c19cb9ef6c733661233308c5215 URL: https://gitlab.winehq.org/wine/wine/-/commit/c30a660dbf448c19cb9ef6c7336612… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Jun 30 16:18:08 2024 +0200 ntdll: Prevent double close in error case (coverity). --- dlls/ntdll/unix/socket.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index a2b7b9fd051..90405e005f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1787,8 +1787,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (getifaddrs( &ifaddrs ) < 0) { - status = sock_errno_to_status( errno ); - break; + return sock_errno_to_status( errno ); } for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next)

1 0

Biswapriyo Nath : include: Fix return type of IXAudio2MasteringVoice::GetChannelMask in xaudio2.idl.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 2251f1cea1a2670d1d615bddd036b0e1b56675a5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2251f1cea1a2670d1d615bddd036b0… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Mon Jul 15 19:53:28 2024 +0000 include: Fix return type of IXAudio2MasteringVoice::GetChannelMask in xaudio2.idl. --- dlls/xaudio2_7/xaudio_dll.c | 4 ++-- include/xaudio2.idl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a51bb499793..43537589823 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -1353,14 +1353,14 @@ static void WINAPI XA2M_DestroyVoice(IXAudio2MasteringVoice *iface) } #if XAUDIO2_VER >= 8 -static void WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, +static HRESULT WINAPI XA2M_GetChannelMask(IXAudio2MasteringVoice *iface, DWORD *pChannelMask) { XA2VoiceImpl *This = impl_from_IXAudio2MasteringVoice(iface); TRACE("%p, %p\n", This, pChannelMask); - FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); + return FAudioMasteringVoice_GetChannelMask(This->faudio_voice, (uint32_t *)pChannelMask); } #endif diff --git a/include/xaudio2.idl b/include/xaudio2.idl index b07c562914b..5f73ced16e5 100644 --- a/include/xaudio2.idl +++ b/include/xaudio2.idl @@ -459,7 +459,7 @@ interface IXAudio2SubmixVoice : IXAudio2Voice interface IXAudio2MasteringVoice : IXAudio2Voice { #if XAUDIO2_VER >= 8 - void GetChannelMask([out] DWORD *pChannelMask); + HRESULT GetChannelMask([out] DWORD *pChannelMask); #endif }

1 0

Esme Povirk : win32u: Implement EVENT_OBJECT_DESTROY.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: a5c22b55445dbea184d9045f997705cf92b2c8ab URL: https://gitlab.winehq.org/wine/wine/-/commit/a5c22b55445dbea184d9045f997705… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jun 14 21:03:16 2024 +0000 win32u: Implement EVENT_OBJECT_DESTROY. --- dlls/user32/tests/msg.c | 26 +++++++++++++------------- dlls/win32u/window.c | 18 +++++++++++++----- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 398bb0a69ed..f7990270418 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -725,7 +725,7 @@ static const struct message WmDestroyOverlappedSeq[] = { { WM_KILLFOCUS, sent|optional|wparam, 0 }, { WM_IME_SETCONTEXT, sent|wparam|optional, 0 }, { WM_IME_NOTIFY, sent|wparam|optional|defwinproc, 1 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -1644,7 +1644,7 @@ static const struct message WmDestroyChildSeq[] = { { WM_IME_SETCONTEXT, sent|wparam|parent|optional, 1 }, { EVENT_OBJECT_FOCUS, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, { WM_SETFOCUS, sent|parent }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_DESTROY, sent|optional }, /* some other (IME?) window */ { WM_NCDESTROY, sent|optional }, /* some other (IME?) window */ @@ -1664,7 +1664,7 @@ static const struct message WmDestroyInvisibleChildSeq[] = { { 0x0090, sent|optional }, { WM_PARENTNOTIFY, sent|parent|wparam, WM_DESTROY }, { WM_SHOWWINDOW, sent|wparam, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -3017,7 +3017,7 @@ static const struct message WmDestroyMDIframeSeq[] = { { WM_ACTIVATE, sent|wparam|optional, 0 }, /* Win9x */ { WM_ACTIVATEAPP, sent|wparam|optional, 0 }, /* Win9x */ { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam|msg_todo, OBJID_CARET, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -3066,7 +3066,7 @@ static const struct message WmDestroyMDIclientSeq[] = { { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_HIDEWINDOW|SWP_NOACTIVATE|SWP_NOSIZE|SWP_NOMOVE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -3268,7 +3268,7 @@ static const struct message WmDestroyMDIchildInvisibleSeq[] = { */ { 0x0090, sent|optional }, { WM_PARENTNOTIFY, sent /*|wparam, WM_DESTROY*/ }, /* in MDI client */ - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -12806,7 +12806,7 @@ static const struct message destroy_window_with_children[] = { { WM_DESTROY, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */ { WM_CAPTURECHANGED, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */ { WM_NCDESTROY, sent|wparam|lparam, 0, WND_POPUP_ID }, /* popup */ - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, /* parent */ + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, /* parent */ { WM_DESTROY, sent|wparam|lparam, 0, WND_PARENT_ID }, /* parent */ { WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 2 }, /* child2 */ { WM_DESTROY, sent|wparam|lparam, 0, WND_CHILD_ID + 1 }, /* child1 */ @@ -14493,7 +14493,7 @@ static const struct message WmQuitDialogSeq[] = { { EVENT_SYSTEM_DIALOGEND, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, { HCBT_DESTROYWND, hook }, { 0x0090, sent|optional }, /* Vista */ - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_DESTROY, sent }, { WM_NCDESTROY, sent }, { 0 } @@ -17245,7 +17245,7 @@ static const struct message wm_popup_menu_1[] = { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|msg_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't create a window */ { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, @@ -17295,12 +17295,12 @@ static const struct message wm_popup_menu_2[] = { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|msg_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|msg_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */ { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, @@ -17350,12 +17350,12 @@ static const struct message wm_popup_menu_3[] = { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|msg_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook }, { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { EVENT_SYSTEM_MENUPOPUPEND, winevent_hook|wparam|lparam|msg_todo, OBJID_CLIENT, 0 }, { HCBT_DESTROYWND, hook|optional }, /* Win9x doesn't send it */ { EVENT_OBJECT_HIDE, winevent_hook|wparam|lparam, 0, 0 }, - { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam|msg_todo, 0, 0 }, + { EVENT_OBJECT_DESTROY, winevent_hook|wparam|lparam, 0, 0 }, { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, { WM_MENUSELECT, sent|wparam|lparam, MAKEWPARAM(0,0xffff), 0 }, { WM_EXITMENULOOP, sent|wparam|lparam, 0, 0 }, diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 532d8e7a789..e5da6be30e0 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -4759,7 +4759,7 @@ HICON WINAPI NtUserInternalGetWindowIcon( HWND hwnd, UINT type ) /*********************************************************************** * send_destroy_message */ -static void send_destroy_message( HWND hwnd ) +static void send_destroy_message( HWND hwnd, BOOL winevent ) { GUITHREADINFO info; @@ -4772,6 +4772,9 @@ static void send_destroy_message( HWND hwnd ) if (hwnd == NtUserGetClipboardOwner()) release_clipboard_owner( hwnd ); + if (winevent) + NtUserNotifyWinEvent( EVENT_OBJECT_DESTROY, hwnd, OBJID_WINDOW, 0 ); + send_message( hwnd, WM_DESTROY, 0, 0); /* @@ -4787,7 +4790,7 @@ static void send_destroy_message( HWND hwnd ) for (i = 0; children[i]; i++) { - if (is_window( children[i] )) send_destroy_message( children[i] ); + if (is_window( children[i] )) send_destroy_message( children[i], FALSE ); } free( children ); } @@ -4897,7 +4900,7 @@ LRESULT destroy_window( HWND hwnd ) /*********************************************************************** * NtUserDestroyWindow (win32u.@) */ -BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) +static BOOL user_destroy_window( HWND hwnd, BOOL winevent ) { BOOL is_child; @@ -4957,7 +4960,7 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) if (get_window_relative( children[i], GW_OWNER ) != hwnd) continue; if (is_current_thread_window( children[i] )) { - NtUserDestroyWindow( children[i] ); + user_destroy_window( children[i], FALSE ); got_one = TRUE; continue; } @@ -4968,13 +4971,18 @@ BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) } } - send_destroy_message( hwnd ); + send_destroy_message( hwnd, winevent ); if (!is_window( hwnd )) return TRUE; destroy_window( hwnd ); return TRUE; } +BOOL WINAPI NtUserDestroyWindow( HWND hwnd ) +{ + return user_destroy_window( hwnd, TRUE ); +} + /***************************************************************************** * destroy_thread_windows *

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for all trailing array fields.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: a95ba55d32f6bf71b29bc7cc908519d265327faa URL: https://gitlab.winehq.org/wine/wine/-/commit/a95ba55d32f6bf71b29bc7cc908519… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:32:58 2024 +0200 include/mscvpdb.h: Use flexible array members for all trailing array fields. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 4 +-- include/wine/mscvpdb.h | 96 +++++++++++++++++++++++++------------------------- 2 files changed, 50 insertions(+), 50 deletions(-)

1 0

Eric Pouech : include/msvcpdb.h: Use flexible array members for codeview_fieldtype union.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 5db354f9529e70c05af5c1e90a0065090e3772fc URL: https://gitlab.winehq.org/wine/wine/-/commit/5db354f9529e70c05af5c1e90a0065… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:06:31 2024 +0200 include/msvcpdb.h: Use flexible array members for codeview_fieldtype union. This will avoid GCC compiler warnings. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 54 +++++++++++++++++++++++++++---------------------- include/wine/mscvpdb.h | 55 +++++++++++++++++++++++--------------------------- tools/winedump/msc.c | 51 +++++++++++++++++++++++++--------------------- 3 files changed, 83 insertions(+), 77 deletions(-)

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for codeview_symbol union.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 7d7ce1dc205ed48e0201d5193e370d01fde49601 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d7ce1dc205ed48e0201d5193e370d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:29:18 2024 +0200 include/mscvpdb.h: Use flexible array members for codeview_symbol union. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 12 ++++++------ include/wine/mscvpdb.h | 36 ++++++++++++++++-------------------- tools/winedump/msc.c | 18 +++++++++++------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 04de7f6491f..815bcedb04a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2585,8 +2585,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v1.cvalue); - name = (const struct p_string*)((const char*)&sym->constant_v1.cvalue + vlen); + vlen = leaf_as_variant(&v, sym->constant_v1.data); + name = (const struct p_string*)&sym->constant_v1.data[vlen]; se = codeview_get_type(sym->constant_v1.type, FALSE); TRACE("S-Constant-V1 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v1.type); @@ -2601,8 +2601,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v2.cvalue); - name = (const struct p_string*)((const char*)&sym->constant_v2.cvalue + vlen); + vlen = leaf_as_variant(&v, sym->constant_v2.data); + name = (const struct p_string*)&sym->constant_v2.data[vlen]; se = codeview_get_type(sym->constant_v2.type, FALSE); TRACE("S-Constant-V2 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v2.type); @@ -2617,8 +2617,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v3.cvalue); - name = (const char*)&sym->constant_v3.cvalue + vlen; + vlen = leaf_as_variant(&v, sym->constant_v3.data); + name = (const char*)&sym->constant_v3.data[vlen]; se = codeview_get_type(sym->constant_v3.type, FALSE); TRACE("S-Constant-V3 %u %s %x\n", V_INT(&v), name, sym->constant_v3.type); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index da66b2c2416..4d0380ee429 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1661,10 +1661,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ16_t type; - unsigned short cvalue; /* numeric leaf */ -#if 0 - struct p_string p_name; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* struct p_string p_name; */ } constant_v1; struct @@ -1672,10 +1671,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t type; - unsigned short cvalue; /* numeric leaf */ -#if 0 - struct p_string p_name; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* struct p_string p_name; */ } constant_v2; struct @@ -1683,10 +1681,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t type; - unsigned short cvalue; -#if 0 - char name[1]; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* char name; */ } constant_v3; struct @@ -1896,7 +1893,7 @@ union codeview_symbol unsigned short int id; unsigned int program; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_v3; struct @@ -1906,7 +1903,7 @@ union codeview_symbol unsigned int program; unsigned int offParent; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_subfield_v3; struct @@ -1916,7 +1913,7 @@ union codeview_symbol unsigned short reg; unsigned short attr; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_register_v3; struct @@ -1925,7 +1922,7 @@ union codeview_symbol unsigned short int id; int offFramePointer; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_frameptrrel_v3; struct @@ -2003,10 +2000,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; unsigned int count; - cv_typ_t funcs[0]; /* array of cuntions, count entries */ -#if 0 - unsigned int invocations[0]; /* array of count entries, paires with funcs */ -#endif + unsigned char data[]; + /* cv_typ_t functions[count]; */ + /* unsigned int invocations[count]; */ } function_list_v3; struct diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5e274b730dd..0a638d4bf9f 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1703,9 +1703,9 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long int vlen; struct full_value fv; - vlen = full_numeric_leaf(&fv, &sym->constant_v2.cvalue); + vlen = full_numeric_leaf(&fv, sym->constant_v2.data); printf("Constant V2 '%s' = %s type:%x\n", - p_string(PSTRING(&sym->constant_v2.cvalue, vlen)), + p_string((const struct p_string *)&sym->constant_v2.data[vlen]), full_value_string(&fv), sym->constant_v2.type); } break; @@ -1715,9 +1715,9 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long int vlen; struct full_value fv; - vlen = full_numeric_leaf(&fv, &sym->constant_v3.cvalue); + vlen = full_numeric_leaf(&fv, sym->constant_v3.data); printf("Constant V3 '%s' = %s type:%x\n", - (const char*)&sym->constant_v3.cvalue + vlen, + (const char*)&sym->constant_v3.data[vlen], full_value_string(&fv), sym->constant_v3.type); } break; @@ -1893,6 +1893,7 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long case S_INLINEES: { unsigned i, ninvoc; + const cv_typ_t *functions; const unsigned* invoc; const char* tag; @@ -1900,12 +1901,15 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long else if (sym->generic.id == S_CALLEES) tag = "Callees"; else tag = "Inlinees"; printf("%s V3 count:%u\n", tag, sym->function_list_v3.count); - invoc = (const unsigned*)&sym->function_list_v3.funcs[sym->function_list_v3.count]; + functions = (const cv_typ_t *)&sym->function_list_v3.data; + invoc = (const unsigned*)&functions[sym->function_list_v3.count]; ninvoc = (const unsigned*)get_last(sym) - invoc; + if (ninvoc < sym->function_list_v3.count) ninvoc = sym->function_list_v3.count; - for (i = 0; i < sym->function_list_v3.count; ++i) + for (i = 0; i < ninvoc; ++i) printf("%*s| func:%x invoc:%u\n", - indent, "", sym->function_list_v3.funcs[i], i < ninvoc ? invoc[i] : 0); + indent, "", functions[i], invoc[i]); + if (i < sym->function_list_v3.count) printf("Number of entries exceed symbol serialized size\n"); } break;

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for codeview_type with variable.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 9e43076913d717d9d049b55310c8254858c45382 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e43076913d717d9d049b55310c825… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:38:32 2024 +0200 include/mscvpdb.h: Use flexible array members for codeview_type with variable. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 60 +++++++++++++++++++++++------------------------ include/wine/mscvpdb.h | 63 ++++++++++++++++++++++---------------------------- tools/winedump/msc.c | 46 +++++++++++++++++------------------- 3 files changed, 78 insertions(+), 91 deletions(-)

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for the rest of structures.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 88a28aa5757ae74d9997b470d70216f10974247f URL: https://gitlab.winehq.org/wine/wine/-/commit/88a28aa5757ae74d9997b470d70216… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 16:57:51 2024 +0200 include/mscvpdb.h: Use flexible array members for the rest of structures. Removing the migration helpers. Adding some documentation bits. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 16 +++++++--------- include/wine/mscvpdb.h | 17 +++++++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 73d5a8e23f4..6250061296e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -269,9 +269,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], ptrsz)->symt; } -/* wrapper for migration to FAM */ -#define leaf_as_variant(v, l) _leaf_as_variant((v), (const unsigned char*)(l)) -static int _leaf_as_variant(VARIANT *v, const unsigned char *leaf) +static int leaf_as_variant(VARIANT *v, const unsigned char *leaf) { unsigned short int type = *(const unsigned short *)leaf; int length = 2; @@ -397,9 +395,7 @@ static int _leaf_as_variant(VARIANT *v, const unsigned char *leaf) return length; } -/* wrapper for migration to FAM */ -#define numeric_leaf(v, l) _numeric_leaf(v, (const unsigned char *)(l)) -static int _numeric_leaf(int *value, const unsigned char *leaf) +static int numeric_leaf(int *value, const unsigned char *leaf) { unsigned short int type = *(const unsigned short int *)leaf; int length = 2; @@ -1581,6 +1577,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B unsigned int k; const unsigned int* filetab; const unsigned int* lt_ptr; + const unsigned int* offsets; const unsigned short* linenos; const struct startend* start; unsigned source; @@ -1609,13 +1606,14 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B for (j = 0; j < nseg; j++) { ltb = (const struct codeview_linetab_block*)(linetab + *lt_ptr++); - linenos = (const unsigned short*)&ltb->offsets[ltb->num_lines]; + offsets = (const unsigned int*)&ltb->data; + linenos = (const unsigned short*)&offsets[ltb->num_lines]; func_addr0 = codeview_get_address(msc_dbg, ltb->seg, start[j].start); if (!func_addr0) continue; for (func = NULL, k = 0; k < ltb->num_lines; k++) { /* now locate function (if any) */ - addr = func_addr0 + ltb->offsets[k] - start[j].start; + addr = func_addr0 + offsets[k] - start[j].start; /* unfortunately, we can have several functions in the same block, if there's no * gap between them... find the new function if needed */ @@ -1626,7 +1624,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { WARN("--not a func at %04x:%08x %Ix tag=%d\n", - ltb->seg, ltb->offsets[k], addr, func ? func->symt.tag : -1); + ltb->seg, offsets[k], addr, func ? func->symt.tag : -1); func = NULL; break; } diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 560d3cc08d6..d389d5d22d0 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -83,10 +83,11 @@ * symbol size (to be greater than 256), which was likely needed for * complex C++ types (nested + templates). * - * It's somehow difficult to represent the layout of those types on - * disk because: - * - some integral values are stored as numeric leaf, which size is - * variable depending on its value + * It's not possible to represent some disk layout with C structures + * as there are several contiguous entries of variable length. + * Of example of them is called 'numeric leaf' and represent several + * leaf values (integers, reals...). + * All of these contiguous values are packed in a flexible array member. * * Symbols internal stream * ----------------------- @@ -101,6 +102,9 @@ * Internal types * ======================================== */ +/* First versions (v1, v2) of CV data is stored as Pascal strings. + * Third version uses C string instead. + */ struct p_string { unsigned char namelen; @@ -2342,8 +2346,9 @@ struct codeview_linetab_block { unsigned short seg; unsigned short num_lines; - unsigned int offsets[1]; /* in fact num_lines */ -/* unsigned short linenos[]; */ + unsigned char data[]; + /* unsigned int offsets[num_lines]; */ + /* unsigned short linenos[]; */ }; struct startend

1 0