Ros-diffs April 2023

ros-diffs@reactos.org

17 participants
89 discussions

[reactos] 01/01: [HHCTRL.OCX] Reduce ROS diff

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=42ef03381fbfcd1b7ef16… commit 42ef03381fbfcd1b7ef166dfe5fd939382406c4a Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Mar 28 18:49:34 2023 +0700 Commit: George Bișoc <george.bisoc(a)reactos.org> CommitDate: Sun Apr 16 18:53:19 2023 +0200 [HHCTRL.OCX] Reduce ROS diff --- dll/win32/hhctrl.ocx/help.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/dll/win32/hhctrl.ocx/help.c b/dll/win32/hhctrl.ocx/help.c index 9696f0b846a..28b03223aad 100644 --- a/dll/win32/hhctrl.ocx/help.c +++ b/dll/win32/hhctrl.ocx/help.c @@ -173,21 +173,9 @@ static inline BOOL navigation_visible(HHInfo *info) /* Loads a string from the resource file */ #ifdef __REACTOS__ LPWSTR HH_LoadString(DWORD dwID) -{ - LPWSTR string = NULL; - LPCWSTR stringresource; - int iSize; - - iSize = LoadStringW(hhctrl_hinstance, dwID, (LPWSTR)&stringresource, 0); - - string = heap_alloc((iSize + 2) * sizeof(WCHAR)); /* some strings (tab text) needs double-null termination */ - memcpy(string, stringresource, iSize * sizeof(WCHAR)); - string[iSize] = UNICODE_NULL; - - return string; -} #else static LPWSTR HH_LoadString(DWORD dwID) +#endif { LPWSTR string = NULL; LPCWSTR stringresource; @@ -201,7 +189,6 @@ static LPWSTR HH_LoadString(DWORD dwID) return string; } -#endif static HRESULT navigate_url(HHInfo *info, LPCWSTR surl) {

1 year, 8 months

[reactos] 03/03: [PSEH] Change return type of filter function prototype to avoid broken return from inside it.

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=93dface84e940b6de679e… commit 93dface84e940b6de679ef35b56b6101fb8083e6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Dec 28 15:15:28 2022 +0100 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:56:08 2023 +0300 [PSEH] Change return type of filter function prototype to avoid broken return from inside it. --- sdk/lib/pseh/include/pseh/pseh3.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sdk/lib/pseh/include/pseh/pseh3.h b/sdk/lib/pseh/include/pseh/pseh3.h index 05bb3de3b87..c7286e9d7bd 100644 --- a/sdk/lib/pseh/include/pseh/pseh3.h +++ b/sdk/lib/pseh/include/pseh/pseh3.h @@ -263,6 +263,11 @@ _SEH3$_AutoCleanup( #else /* __cplusplus || __clang__ */ +typedef struct __SEH3$FILTER_RESULT +{ + int Value; +} _SEH3$FILTER_RESULT; + #define _SEH3$_DECLARE_EXCEPT_INTRINSICS() \ inline __attribute__((always_inline, gnu_inline)) \ unsigned long _exception_code() { return _SEH3$_TrylevelFrame.ExceptionCode; } @@ -276,13 +281,13 @@ _SEH3$_AutoCleanup( the function with an arbitrary base address in eax first and then use the result to calculate the correct address for a second call to the function. */ #define _SEH3$_DECLARE_FILTER_FUNC(_Name) \ - auto int __fastcall _Name(int Action) + auto _SEH3$FILTER_RESULT __fastcall _Name(int Action) #define _SEH3$_NESTED_FUNC_OPEN(_Name) \ - int __fastcall _Name(int Action) \ + _SEH3$FILTER_RESULT __fastcall _Name(int Action) \ { \ /* This is a fancy way to get information about the frame layout */ \ - if (Action == 0) return (int)&_SEH3$_TrylevelFrame; + if (Action == 0) { _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = (int)&_SEH3$_TrylevelFrame; return seh3$result; } #define _SEH3$_DEFINE_FILTER_FUNC(_Name, expression) \ _SEH3$_NESTED_FUNC_OPEN(_Name) \ @@ -296,7 +301,7 @@ _Pragma("GCC diagnostic ignored \"-Wshadow\"") \ _Pragma("GCC diagnostic pop") \ \ /* Now handle the actual filter expression */ \ - return (expression); \ + { _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = (expression); return seh3$result; } \ } #define _SEH3$_FINALLY_FUNC_OPEN(_Name) \ @@ -307,7 +312,7 @@ _Pragma("GCC diagnostic pop") \ \ /* This construct makes sure that the finally function returns */ \ /* a proper value at the end */ \ - for (; ; (void)({return 0; 0;})) + for (; ; (void)({ _SEH3$FILTER_RESULT seh3$result; seh3$result.Value = 0; return seh3$result; 0;})) #define _SEH3$_FILTER(_Filter, _FilterExpression) \ (__builtin_constant_p(_FilterExpression) ? (void*)(unsigned long)(unsigned char)(unsigned long)(_FilterExpression) : _Filter)

1 year, 8 months

[reactos] 02/03: [NTOS/CC] Fix broken usage of _SEH2_FINALLY

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb74d9e24ed16d3d52e1a… commit cb74d9e24ed16d3d52e1a4cff3ff3fde6bcd9bd1 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Tue Dec 27 17:43:10 2022 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:56:08 2023 +0300 [NTOS/CC] Fix broken usage of _SEH2_FINALLY Finally handlers are - unlike except blocks - not part of the function they are in, but separate functions, which are called during unwind. PSEH implements them on GCC using nested functions. While "return" from a finally handler is allowed with native SEH, it's handled by the compiler through an extra unwinding operation using _local_unwind, WHICH IS NOT SUPPORTED BY PSEH! With PSEH, returning from a finally handler does not return from the function, instead it will only return from [...] Also use _SEH_VOLATILE to make sure the variable assignment is not optimized away by the compiler and add zero out the result parameters on error. --- ntoskrnl/cc/pin.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/ntoskrnl/cc/pin.c b/ntoskrnl/cc/pin.c index 3d80befb660..dcd1d5483a5 100644 --- a/ntoskrnl/cc/pin.c +++ b/ntoskrnl/cc/pin.c @@ -221,7 +221,7 @@ CcpPinData( KIRQL OldIrql; ULONG VacbOffset; NTSTATUS Status; - BOOLEAN Result; + _SEH2_VOLATILE BOOLEAN Result; VacbOffset = (ULONG)(FileOffset->QuadPart % VACB_MAPPING_GRANULARITY); @@ -302,15 +302,19 @@ CcpPinData( CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> FALSE\n", SharedCacheMap->FileObject, FileOffset, Length, Flags); CcUnpinData(&NewBcb->PFCB); - return FALSE; + *Bcb = NULL; + *Buffer = NULL; } } _SEH2_END; - *Bcb = &NewBcb->PFCB; - *Buffer = (PVOID)((ULONG_PTR)NewBcb->Vacb->BaseAddress + VacbOffset); + if (Result) + { + *Bcb = &NewBcb->PFCB; + *Buffer = (PVOID)((ULONG_PTR)NewBcb->Vacb->BaseAddress + VacbOffset); + } - return TRUE; + return Result; } /* @@ -332,7 +336,7 @@ CcMapData ( PROS_SHARED_CACHE_MAP SharedCacheMap; ULONG VacbOffset; NTSTATUS Status; - BOOLEAN Result; + _SEH2_VOLATILE BOOLEAN Result; CCTRACE(CC_API_DEBUG, "CcMapData(FileObject 0x%p, FileOffset 0x%I64x, Length %lu, Flags 0x%lx," " pBcb 0x%p, pBuffer 0x%p)\n", FileObject, FileOffset->QuadPart, @@ -406,13 +410,17 @@ CcMapData ( if (!Result) { CcpDereferenceBcb(SharedCacheMap, iBcb); - return FALSE; + *pBcb = NULL; + *pBuffer = NULL; } } _SEH2_END; - *pBcb = &iBcb->PFCB; - *pBuffer = (PVOID)((ULONG_PTR)iBcb->Vacb->BaseAddress + VacbOffset); + if (Result) + { + *pBcb = &iBcb->PFCB; + *pBuffer = (PVOID)((ULONG_PTR)iBcb->Vacb->BaseAddress + VacbOffset); + } CCTRACE(CC_API_DEBUG, "FileObject=%p FileOffset=%p Length=%lu Flags=0x%lx -> TRUE Bcb=%p, Buffer %p\n", FileObject, FileOffset, Length, Flags, *pBcb, *pBuffer);

1 year, 8 months

[reactos] 01/03: [NTOS/CC] Fix calls to CcRosEnsureVacbResident

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2fcd27aaa234dd205b20… commit b2fcd27aaa234dd205b201113486c18f9cdaf9f6 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Jan 22 10:26:13 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:56:08 2023 +0300 [NTOS/CC] Fix calls to CcRosEnsureVacbResident The function returns BOOLEAN, not NTSTATUS! Also wrap it in SEH, because it can throw an exception on failure. --- ntoskrnl/cc/copy.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/ntoskrnl/cc/copy.c b/ntoskrnl/cc/copy.c index 09af125540c..7b43ab51e60 100644 --- a/ntoskrnl/cc/copy.c +++ b/ntoskrnl/cc/copy.c @@ -139,6 +139,7 @@ CcPerformReadAhead( ULONG Length; PPRIVATE_CACHE_MAP PrivateCacheMap; BOOLEAN Locked; + BOOLEAN Success; SharedCacheMap = FileObject->SectionObjectPointer->SharedCacheMap; @@ -206,9 +207,18 @@ CcPerformReadAhead( goto Clear; } - Status = CcRosEnsureVacbResident(Vacb, TRUE, FALSE, - CurrentOffset % VACB_MAPPING_GRANULARITY, PartialLength); - if (!NT_SUCCESS(Status)) + _SEH2_TRY + { + Success = CcRosEnsureVacbResident(Vacb, TRUE, FALSE, + CurrentOffset % VACB_MAPPING_GRANULARITY, PartialLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Success = FALSE; + } + _SEH2_END + + if (!Success) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE); DPRINT1("Failed to read data: %lx!\n", Status); @@ -234,8 +244,17 @@ CcPerformReadAhead( goto Clear; } - Status = CcRosEnsureVacbResident(Vacb, TRUE, FALSE, 0, PartialLength); - if (!NT_SUCCESS(Status)) + _SEH2_TRY + { + Success = CcRosEnsureVacbResident(Vacb, TRUE, FALSE, 0, PartialLength); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Success = FALSE; + } + _SEH2_END + + if (!Success) { CcRosReleaseVacb(SharedCacheMap, Vacb, FALSE, FALSE); DPRINT1("Failed to read data: %lx!\n", Status);

1 year, 8 months

[reactos] 01/01: [USER32_WINETEST] Change module type to win32cui to be able to see test results

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=178285c275c7a4508e52a… commit 178285c275c7a4508e52ac04a746dece87ef006c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Feb 1 18:29:38 2023 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Fri Apr 14 11:47:29 2023 +0300 [USER32_WINETEST] Change module type to win32cui to be able to see test results --- modules/rostests/winetests/user32/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/rostests/winetests/user32/CMakeLists.txt b/modules/rostests/winetests/user32/CMakeLists.txt index 32f89934309..62c49fa79ce 100644 --- a/modules/rostests/winetests/user32/CMakeLists.txt +++ b/modules/rostests/winetests/user32/CMakeLists.txt @@ -47,7 +47,6 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU") endif() add_pch(user32_winetest precomp.h "${PCH_SKIP_SOURCE}") -# some tests need to be run from an app compiled as GUI -set_module_type(user32_winetest win32gui) +set_module_type(user32_winetest win32cui) add_importlibs(user32_winetest user32 gdi32 advapi32 msvcrt kernel32) add_rostests_file(TARGET user32_winetest)

1 year, 8 months

[reactos] 01/01: [CODEOWNERS] Add Giannis and myself as reviewer for shell related stuff

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=89f58017c06d4f9cdae99… commit 89f58017c06d4f9cdae9929ea39f9ca53daf2135 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Mon Apr 3 20:12:39 2023 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Apr 13 19:09:55 2023 +0200 [CODEOWNERS] Add Giannis and myself as reviewer for shell related stuff --- CODEOWNERS | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CODEOWNERS b/CODEOWNERS index 8f67ff1af16..81851d73fd9 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -252,6 +252,16 @@ /modules/rostests/kmtests/ntos_se/ @GeoB99 /ntoskrnl/se/ @GeoB99 +# Shell +# M: +# R: learn-more, learn_more, Mark Jansen +# R: yagoulas, Giannis Adamopoulos +# S: Maintained +/base/shell/explorer/ @learn-more @yagoulas +/base/shell/rshell/ @learn-more @yagoulas +/dll/win32/browseui/ @learn-more @yagoulas +/dll/win32/shell32/ @learn-more @yagoulas + # Shell Extensions # M: # R: learn-more, learn_more, Mark Jansen

1 year, 8 months

[reactos] 01/01: [NTUSER] co_UserDestroyWindow: Validate window before destroying it (#5054)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77d46531648c244b6eec2… commit 77d46531648c244b6eec2cdb75a710d4e8ffd8cb Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Thu Apr 13 03:20:46 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 12 22:20:46 2023 +0200 [NTUSER] co_UserDestroyWindow: Validate window before destroying it (#5054) Prevent the window from being destroyed twice fixes BSOD 0x1E CORE-18821 --- win32ss/user/ntuser/window.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index f8bc4e539c2..7bc57864b78 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2845,6 +2845,15 @@ BOOLEAN co_UserDestroyWindow(PVOID Object) ASSERT_REFS_CO(Window); // FIXME: Temp HACK? + /* NtUserDestroyWindow does check if the window has already been destroyed + but co_UserDestroyWindow can be called from more paths which means + that it can also be called for a window that has already been destroyed. */ + if (!IntIsWindow(UserHMGetHandle(Window))) + { + TRACE("Tried to destroy a window twice\n"); + return TRUE; + } + hWnd = Window->head.h; ti = PsGetCurrentThreadWin32Thread();

1 year, 8 months

[reactos] 01/01: [MMSYS] Improve sound test button (#4879)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15c755e5f9eedd3ea6032… commit 15c755e5f9eedd3ea60320432d24160b00866a48 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Thu Apr 13 03:00:37 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Apr 12 22:00:37 2023 +0200 [MMSYS] Improve sound test button (#4879) - Make sound test button able to stop the sound (like WinXP's mmsys.cpl) - Change stop icon - Add documentation for GetSoundDuration --- dll/cpl/mmsys/resources/stop.ico | Bin 4286 -> 326 bytes dll/cpl/mmsys/sounds.c | 165 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 160 insertions(+), 5 deletions(-) diff --git a/dll/cpl/mmsys/resources/stop.ico b/dll/cpl/mmsys/resources/stop.ico index a0b001ad1f3..eca39a1ea0c 100644 Binary files a/dll/cpl/mmsys/resources/stop.ico and b/dll/cpl/mmsys/resources/stop.ico differ diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index 5285599908c..cec3e34e273 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -16,6 +16,8 @@ #include <debug.h> +#define ID_SOUND_TEST_TIMER 1 + typedef struct _LABEL_MAP { PWCHAR szName; @@ -57,6 +59,8 @@ typedef struct _GLOBAL_DATA PLABEL_MAP pLabelMap; PAPP_MAP pAppMap; UINT NumWavOut; + HICON hPlayIcon; + HICON hStopIcon; } GLOBAL_DATA, *PGLOBAL_DATA; @@ -1140,6 +1144,99 @@ InitImageList(UINT StartResource, } +/** + * @brief + * Get the duration of a waveform audio file. + * + * @param[in] pFileName + * The file name or full path of the file. + * + * @return + * The duration of the sound, in milliseconds. + * Returns 0 in case of failure. + **/ +static +DWORD +GetSoundDuration(LPCWSTR pFileName) +{ + MCI_OPEN_PARMSW openParms; + MCI_GENERIC_PARMS closeParms; + MCI_SET_PARMS setParms; + MCI_STATUS_PARMS statusParms; + MCIERROR mciError; + + ZeroMemory(&openParms, sizeof(openParms)); + openParms.lpstrDeviceType = L"waveaudio"; + openParms.lpstrElementName = pFileName; + + mciError = mciSendCommandW(0, + MCI_OPEN, + MCI_OPEN_TYPE | MCI_OPEN_ELEMENT | MCI_WAIT, + (DWORD_PTR)&openParms); + if (mciError != 0) + return 0; + + ZeroMemory(&setParms, sizeof(setParms)); + setParms.dwTimeFormat = MCI_FORMAT_MILLISECONDS; + + mciError = mciSendCommandW(openParms.wDeviceID, + MCI_SET, + MCI_SET_TIME_FORMAT | MCI_WAIT, + (DWORD_PTR)&setParms); + if (mciError == 0) + { + ZeroMemory(&statusParms, sizeof(statusParms)); + statusParms.dwItem = MCI_STATUS_LENGTH; + + mciError = mciSendCommandW(openParms.wDeviceID, + MCI_STATUS, + MCI_STATUS_ITEM | MCI_WAIT, + (DWORD_PTR)&statusParms); + } + + closeParms.dwCallback = 0; + mciSendCommandW(openParms.wDeviceID, MCI_CLOSE, MCI_WAIT, (DWORD_PTR)&closeParms); + + if (mciError != 0) + return 0; + + return statusParms.dwReturn; +} + +static +BOOL +StartSoundTest(HWND hwndDlg, LPCWSTR pszSound) +{ + DWORD dwDuration; + + dwDuration = GetSoundDuration(pszSound); + if (dwDuration == 0) + return FALSE; + + if (PlaySoundW(pszSound, NULL, SND_FILENAME | SND_ASYNC | SND_NODEFAULT)) + { + SetTimer(hwndDlg, ID_SOUND_TEST_TIMER, dwDuration, NULL); + return TRUE; + } + + return FALSE; +} + +static +BOOL +StopSoundTest(HWND hwndDlg) +{ + /* Check if the sound is playing */ + if (KillTimer(hwndDlg, ID_SOUND_TEST_TIMER)) + { + /* Stop the sound */ + PlaySoundW(NULL, NULL, SND_ASYNC); + return TRUE; + } + + return FALSE; +} + /* Sounds property page dialog callback */ INT_PTR CALLBACK @@ -1167,9 +1264,20 @@ SoundsDlgProc(HWND hwndDlg, pGlobalData->NumWavOut = waveOutGetNumDevs(); - SendMessageW(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), - BM_SETIMAGE, (WPARAM)IMAGE_ICON, - (LPARAM)(HANDLE)LoadIconW(hApplet, MAKEINTRESOURCEW(IDI_PLAY_ICON))); + pGlobalData->hPlayIcon = LoadImageW(hApplet, + MAKEINTRESOURCEW(IDI_PLAY_ICON), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + pGlobalData->hStopIcon = LoadImageW(hApplet, + MAKEINTRESOURCEW(IDI_STOP_ICON), + IMAGE_ICON, + 32, + 32, + LR_DEFAULTCOLOR); + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hPlayIcon); pGlobalData->hSoundsImageList = InitImageList(IDI_SOUND_SECTION, IDI_SOUND_ASSIGNED, @@ -1236,6 +1344,14 @@ SoundsDlgProc(HWND hwndDlg, case IDC_PLAY_SOUND: { LRESULT lIndex; + + if (StopSoundTest(hwndDlg)) + { + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hPlayIcon); + break; + } + lIndex = ComboBox_GetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST)); if (lIndex == CB_ERR) { @@ -1245,7 +1361,11 @@ SoundsDlgProc(HWND hwndDlg, lIndex = ComboBox_GetItemData(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); if (lIndex != CB_ERR) { - PlaySoundW((PWCHAR)lIndex, NULL, SND_FILENAME); + if (StartSoundTest(hwndDlg, (LPWSTR)lIndex)) + { + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hStopIcon); + } } break; } @@ -1346,12 +1466,20 @@ SoundsDlgProc(HWND hwndDlg, } case WM_DESTROY: { + StopSoundTest(hwndDlg); FreeSoundFiles(hwndDlg); FreeSoundProfiles(hwndDlg); FreeAppMap(pGlobalData); FreeLabelMap(pGlobalData); if (pGlobalData->hSoundsImageList) ImageList_Destroy(pGlobalData->hSoundsImageList); + + if (pGlobalData->hStopIcon) + DestroyIcon(pGlobalData->hStopIcon); + + if (pGlobalData->hPlayIcon) + DestroyIcon(pGlobalData->hPlayIcon); + HeapFree(GetProcessHeap(), 0, pGlobalData); break; } @@ -1369,11 +1497,27 @@ SoundsDlgProc(HWND hwndDlg, ApplyChanges(hwndDlg); break; } + case PSN_KILLACTIVE: + { + if (StopSoundTest(hwndDlg)) + { + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hPlayIcon); + } + + break; + } case TVN_SELCHANGED: { LPNMTREEVIEWW nm = (LPNMTREEVIEWW)lParam; LRESULT lCount, lIndex, lResult; + if (StopSoundTest(hwndDlg)) + { + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hPlayIcon); + } + pLabelContext = (PLABEL_CONTEXT)nm->itemNew.lParam; if (pLabelContext == NULL) { @@ -1431,8 +1575,19 @@ SoundsDlgProc(HWND hwndDlg, break; } } + break; + } + case WM_TIMER: + { + if (wParam == ID_SOUND_TEST_TIMER) + { + KillTimer(hwndDlg, ID_SOUND_TEST_TIMER); + SendDlgItemMessageW(hwndDlg, IDC_PLAY_SOUND, BM_SETIMAGE, + IMAGE_ICON, (LPARAM)pGlobalData->hPlayIcon); + } + + break; } - break; } return FALSE;

1 year, 8 months

[reactos] 03/03: [NTOS:KDBG] Only use the direct KdbPrintf instead of KdbpPrint (pager) inside the exception handler (outside the debugger main loop).

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99b0e4b9a9fe6a891c240… commit 99b0e4b9a9fe6a891c240ee732a516e786a7b0fb Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 28 02:48:55 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 12 19:30:57 2023 +0200 [NTOS:KDBG] Only use the direct KdbPrintf instead of KdbpPrint (pager) inside the exception handler (outside the debugger main loop). --- ntoskrnl/kdbg/kdb.c | 89 ++++++++++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 48 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index c1ed2d0a9d7..15175d5ca93 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -12,9 +12,6 @@ #include <ntoskrnl.h> #include "kdb.h" -#define NDEBUG -#include <debug.h> - /* TYPES *********************************************************************/ /* DEFINES *******************************************************************/ @@ -242,7 +239,7 @@ KdbpShouldStepOverInstruction( if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem)))) { - KdbpPrint("Couldn't access memory at 0x%p\n", Eip); + KdbPrintf("Couldn't access memory at 0x%p\n", Eip); return FALSE; } @@ -312,7 +309,7 @@ KdbpStepIntoInstruction( /* Read memory */ if (!NT_SUCCESS(KdbpSafeReadMemory(Mem, (PVOID)Eip, sizeof (Mem)))) { - /*KdbpPrint("Couldn't access memory at 0x%p\n", Eip);*/ + // KdbPrintf("Couldn't access memory at 0x%p\n", Eip); return FALSE; } @@ -336,14 +333,14 @@ KdbpStepIntoInstruction( __sidt(&Idtr.Limit); if (IntVect >= (Idtr.Limit + 1) / 8) { - /*KdbpPrint("IDT does not contain interrupt vector %d.\n", IntVect);*/ + // KdbPrintf("IDT does not contain interrupt vector %d.\n", IntVect); return TRUE; } /* Get the interrupt descriptor */ if (!NT_SUCCESS(KdbpSafeReadMemory(IntDesc, (PVOID)((ULONG_PTR)Idtr.Base + (IntVect * 8)), sizeof(IntDesc)))) { - /*KdbpPrint("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8));*/ + // KdbPrintf("Couldn't access memory at 0x%p\n", (ULONG_PTR)Idtr.Base + (IntVect * 8)); return FALSE; } @@ -499,13 +496,13 @@ KdbpInsertBreakPoint( { if ((Address % Size) != 0) { - KdbpPrint("Address (0x%p) must be aligned to a multiple of the size (%d)\n", Address, Size); + KdbPrintf("Address (0x%p) must be aligned to a multiple of the size (%d)\n", Address, Size); return STATUS_UNSUCCESSFUL; } if (AccessType == KdbAccessExec && Size != 1) { - KdbpPrint("Size must be 1 for execution breakpoints.\n"); + KdbPuts("Size must be 1 for execution breakpoints.\n"); return STATUS_UNSUCCESSFUL; } } @@ -515,16 +512,16 @@ KdbpInsertBreakPoint( return STATUS_UNSUCCESSFUL; } - /* Parse conditon expression string and duplicate it */ + /* Parse condition expression string and duplicate it */ if (ConditionExpression) { Condition = KdbpRpnParseExpression(ConditionExpression, &ErrOffset, ErrMsg); if (!Condition) { if (ErrOffset >= 0) - KdbpPrint("Couldn't parse expression: %s at character %d\n", ErrMsg, ErrOffset); + KdbPrintf("Couldn't parse expression: %s at character %d\n", ErrMsg, ErrOffset); else - KdbpPrint("Couldn't parse expression: %s", ErrMsg); + KdbPrintf("Couldn't parse expression: %s", ErrMsg); return STATUS_UNSUCCESSFUL; } @@ -578,7 +575,7 @@ KdbpInsertBreakPoint( KdbBreakPointCount++; if (Type != KdbBreakPointTemporary) - KdbpPrint("Breakpoint %d inserted.\n", i); + KdbPrintf("Breakpoint %d inserted.\n", i); /* Try to enable the breakpoint */ KdbpEnableBreakPoint(i, NULL); @@ -611,7 +608,7 @@ KdbpDeleteBreakPoint( if (BreakPointNr < 0 || BreakPointNr >= KDB_MAXIMUM_BREAKPOINT_COUNT) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } @@ -622,7 +619,7 @@ KdbpDeleteBreakPoint( if (BreakPoint->Type == KdbBreakPointNone) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } @@ -630,7 +627,7 @@ KdbpDeleteBreakPoint( return FALSE; if (BreakPoint->Type != KdbBreakPointTemporary) - KdbpPrint("Breakpoint %d deleted.\n", BreakPointNr); + KdbPrintf("Breakpoint %d deleted.\n", BreakPointNr); BreakPoint->Type = KdbBreakPointNone; KdbBreakPointCount--; @@ -718,7 +715,7 @@ KdbpEnableBreakPoint( if (BreakPointNr < 0 || BreakPointNr >= KDB_MAXIMUM_BREAKPOINT_COUNT) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } @@ -729,13 +726,13 @@ KdbpEnableBreakPoint( if (BreakPoint->Type == KdbBreakPointNone) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } if (BreakPoint->Enabled) { - KdbpPrint("Breakpoint %d is already enabled.\n", BreakPointNr); + KdbPrintf("Breakpoint %d is already enabled.\n", BreakPointNr); return TRUE; } @@ -744,7 +741,7 @@ KdbpEnableBreakPoint( { if (KdbSwBreakPointCount >= KDB_MAXIMUM_SW_BREAKPOINT_COUNT) { - KdbpPrint("Maximum number of SW breakpoints (%d) used. " + KdbPrintf("Maximum number of SW breakpoints (%d) used. " "Disable another breakpoint in order to enable this one.\n", KDB_MAXIMUM_SW_BREAKPOINT_COUNT); return FALSE; @@ -754,7 +751,7 @@ KdbpEnableBreakPoint( 0xCC, &BreakPoint->Data.SavedInstruction); if (!NT_SUCCESS(Status)) { - KdbpPrint("Couldn't access memory at 0x%p\n", BreakPoint->Address); + KdbPrintf("Couldn't access memory at 0x%p\n", BreakPoint->Address); return FALSE; } @@ -769,10 +766,9 @@ KdbpEnableBreakPoint( if (KdbHwBreakPointCount >= KDB_MAXIMUM_HW_BREAKPOINT_COUNT) { - KdbpPrint("Maximum number of HW breakpoints (%d) already used. " + KdbPrintf("Maximum number of HW breakpoints (%d) already used. " "Disable another breakpoint in order to enable this one.\n", KDB_MAXIMUM_HW_BREAKPOINT_COUNT); - return FALSE; } @@ -853,7 +849,7 @@ KdbpEnableBreakPoint( BreakPoint->Enabled = TRUE; if (BreakPoint->Type != KdbBreakPointTemporary) - KdbpPrint("Breakpoint %d enabled.\n", BreakPointNr); + KdbPrintf("Breakpoint %d enabled.\n", BreakPointNr); return TRUE; } @@ -884,7 +880,7 @@ KdbpDisableBreakPoint( if (BreakPointNr < 0 || BreakPointNr >= KDB_MAXIMUM_BREAKPOINT_COUNT) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } @@ -895,13 +891,13 @@ KdbpDisableBreakPoint( if (BreakPoint->Type == KdbBreakPointNone) { - KdbpPrint("Invalid breakpoint: %d\n", BreakPointNr); + KdbPrintf("Invalid breakpoint: %d\n", BreakPointNr); return FALSE; } if (BreakPoint->Enabled == FALSE) { - KdbpPrint("Breakpoint %d is not enabled.\n", BreakPointNr); + KdbPrintf("Breakpoint %d is not enabled.\n", BreakPointNr); return TRUE; } @@ -914,7 +910,7 @@ KdbpDisableBreakPoint( if (!NT_SUCCESS(Status)) { - KdbpPrint("Couldn't restore original instruction.\n"); + KdbPuts("Couldn't restore original instruction.\n"); return FALSE; } @@ -959,7 +955,7 @@ KdbpDisableBreakPoint( BreakPoint->Enabled = FALSE; if (BreakPoint->Type != KdbBreakPointTemporary) - KdbpPrint("Breakpoint %d disabled.\n", BreakPointNr); + KdbPrintf("Breakpoint %d disabled.\n", BreakPointNr); return TRUE; } @@ -1180,7 +1176,7 @@ KdbpInternalEnter(VOID) Thread->Tcb.StackLimit = (ULONG_PTR)KdbStack; Thread->Tcb.KernelStack = (char*)KdbStack + KDB_STACK_SIZE; - // KdbpPrint("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp); + // KdbPrintf("Switching to KDB stack 0x%08x-0x%08x (Current Stack is 0x%08x)\n", Thread->Tcb.StackLimit, Thread->Tcb.StackBase, Esp); KdbpStackSwitchAndCall(KdbStack + KDB_STACK_SIZE - KDB_STACK_RESERVE, KdbpCallMainLoop); @@ -1318,7 +1314,7 @@ KdbEnterDebuggerException( if (!NT_SUCCESS(KdbpOverwriteInstruction(KdbCurrentProcess, BreakPoint->Address, BreakPoint->Data.SavedInstruction, NULL))) { - KdbpPrint("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); + KdbPuts("Couldn't restore original instruction after INT3! Cannot continue execution.\n"); KeBugCheck(0); // FIXME: Proper bugcode! } @@ -1402,17 +1398,17 @@ KdbEnterDebuggerException( if (BreakPoint->Type == KdbBreakPointSoftware) { - KdbpPrint("\nEntered debugger on breakpoint #%d: EXEC 0x%04x:0x%p\n", + KdbPrintf("\nEntered debugger on breakpoint #%d: EXEC 0x%04x:0x%p\n", KdbLastBreakPointNr, Context->SegCs & 0xffff, KeGetContextPc(Context)); } else if (BreakPoint->Type == KdbBreakPointHardware) { - KdbpPrint("\nEntered debugger on breakpoint #%d: %s 0x%08x\n", + KdbPrintf("\nEntered debugger on breakpoint #%d: %s 0x%08x\n", KdbLastBreakPointNr, - (BreakPoint->Data.Hw.AccessType == KdbAccessRead) ? "READ" : - ((BreakPoint->Data.Hw.AccessType == KdbAccessWrite) ? "WRITE" : - ((BreakPoint->Data.Hw.AccessType == KdbAccessReadWrite) ? "RDWR" : "EXEC")), - BreakPoint->Address); + (BreakPoint->Data.Hw.AccessType == KdbAccessRead) ? "READ" : + ((BreakPoint->Data.Hw.AccessType == KdbAccessWrite) ? "WRITE" : + ((BreakPoint->Data.Hw.AccessType == KdbAccessReadWrite) ? "RDWR" : "EXEC")), + BreakPoint->Address); } } else if (ExceptionCode == STATUS_SINGLE_STEP) @@ -1433,7 +1429,7 @@ KdbEnterDebuggerException( if (!NT_SUCCESS(KdbpOverwriteInstruction(KdbCurrentProcess, BreakPoint->Address, 0xCC, &BreakPoint->Data.SavedInstruction))) { - KdbpPrint("Warning: Couldn't reenable breakpoint %d\n", + KdbPrintf("Warning: Couldn't reenable breakpoint %d\n", BreakPoint - KdbBreakPoints); } @@ -1481,7 +1477,7 @@ KdbEnterDebuggerException( return kdHandleException; } - KdbpPrint("\nEntered debugger on unexpected debug trap!\n"); + KdbPuts("\nEntered debugger on unexpected debug trap!\n"); } } else if (ExceptionCode == STATUS_BREAKPOINT) @@ -1496,31 +1492,28 @@ KdbEnterDebuggerException( return kdHandleException; } - KdbpPrint("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", + KdbPrintf("\nEntered debugger on embedded INT3 at 0x%04x:0x%p.\n", Context->SegCs & 0xffff, KeGetContextPc(Context)); } else { const CHAR *ExceptionString = (ExpNr < RTL_NUMBER_OF(ExceptionNrToString)) ? - (ExceptionNrToString[ExpNr]) : - ("Unknown/User defined exception"); + ExceptionNrToString[ExpNr] : + "Unknown/User defined exception"; if (!EnterConditionMet) { return ContinueType; } - KdbpPrint("\nEntered debugger on %s-chance exception (Exception Code: 0x%x) (%s)\n", + KdbPrintf("\nEntered debugger on %s-chance exception (Exception Code: 0x%x) (%s)\n", FirstChance ? "first" : "last", ExceptionCode, ExceptionString); if (ExceptionCode == STATUS_ACCESS_VIOLATION && ExceptionRecord && ExceptionRecord->NumberParameters != 0) { - ULONG_PTR TrapCr2; - - TrapCr2 = __readcr2(); - - KdbpPrint("Memory at 0x%p could not be accessed\n", TrapCr2); + ULONG_PTR TrapCr2 = __readcr2(); + KdbPrintf("Memory at 0x%p could not be accessed\n", TrapCr2); } }

1 year, 8 months

[reactos] 02/03: [NTOS:KDBG] Use local KdbPrintf function for DPRINT1 instead of DbgPrint...

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9808d32f4a32cc20c2b75… commit 9808d32f4a32cc20c2b75d42edac0b9fca133254 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Apr 12 18:38:47 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Apr 12 19:30:56 2023 +0200 [NTOS:KDBG] Use local KdbPrintf function for DPRINT1 instead of DbgPrint... ... that would otherwise cause a debugger re-entry. Also use KdbPuts/Printf instead of KdpDprintf that won't be available once KDBG is moved out of it. --- ntoskrnl/kdbg/debug.h | 51 +++++++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/i386/i386-dis.c | 7 ++---- ntoskrnl/kdbg/kdb_cli.c | 4 ++-- ntoskrnl/kdbg/kdb_expr.c | 42 ++++++++++++++++++----------------- ntoskrnl/kdbg/kdb_symbols.c | 22 +++++++++---------- 5 files changed, 87 insertions(+), 39 deletions(-) diff --git a/ntoskrnl/kdbg/debug.h b/ntoskrnl/kdbg/debug.h new file mode 100644 index 00000000000..965f9612739 --- /dev/null +++ b/ntoskrnl/kdbg/debug.h @@ -0,0 +1,51 @@ +/* + * PROJECT: ReactOS KDBG Kernel Debugger + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Useful debugging macros + * COPYRIGHT: Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +/* + * NOTE: Define NDEBUG before including this header + * to disable debugging macros. + */ + +#pragma once + +#ifndef __RELFILE__ +#define __RELFILE__ __FILE__ +#endif + +/* Print stuff only on Debug Builds */ +#if DBG + + /* These are always printed */ + #define DPRINT1(fmt, ...) \ + KdbPrintf("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + + /* These are printed only if NDEBUG is NOT defined */ + #ifndef NDEBUG + #define DPRINT(fmt, ...) \ + KdbPrintf("(%s:%d) " fmt, __RELFILE__, __LINE__, ##__VA_ARGS__) + #else +#if defined(_MSC_VER) + #define DPRINT __noop +#else + #define DPRINT(...) do { if(0) { KdbPrintf(__VA_ARGS__); } } while(0) +#endif + #endif + +#else /* not DBG */ + + /* On non-debug builds, we never show these */ +#if defined(_MSC_VER) + #define DPRINT1 __noop + #define DPRINT __noop +#else + #define DPRINT1(...) do { if(0) { KdbPrintf(__VA_ARGS__); } } while(0) + #define DPRINT(...) do { if(0) { KdbPrintf(__VA_ARGS__); } } while(0) +#endif /* _MSC_VER */ + +#endif /* not DBG */ + +/* EOF */ diff --git a/ntoskrnl/kdbg/i386/i386-dis.c b/ntoskrnl/kdbg/i386/i386-dis.c index 86b2e9dac9a..559a3ac1678 100644 --- a/ntoskrnl/kdbg/i386/i386-dis.c +++ b/ntoskrnl/kdbg/i386/i386-dis.c @@ -10,9 +10,6 @@ #include <ntoskrnl.h> #include "../kdb.h" -#define NDEBUG -#include <debug.h> - /* ReactOS compatibility stuff. */ #define PARAMS(X) X #define PTR void* @@ -53,7 +50,7 @@ KdbpPrintDisasm(void* Ignored, const char* fmt, ...) va_start(ap, fmt); ret = vsprintf(buffer, fmt, ap); - KdpDprintf("%s", buffer); + KdbPuts(buffer); va_end(ap); return(ret); } @@ -82,7 +79,7 @@ KdbpPrintAddressInCode(uintptr_t Addr, struct disassemble_info * Ignored) { if (!KdbSymPrintAddress((void*)Addr, NULL)) { - KdpDprintf("<%08x>", Addr); + KdbPrintf("<%08x>", Addr); } } diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index 7ad4cc275ee..cc7aece3d9e 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -33,7 +33,7 @@ #include "../kd/kdterminal.h" #define NDEBUG -#include <debug.h> +#include "debug.h" /* DEFINES *******************************************************************/ @@ -655,7 +655,7 @@ KdbpCmdPrintStruct( DPRINT1("BaseAddress: %p\n", BaseAddress); } } - DPRINT1("BaseAddress %p\n", BaseAddress); + DPRINT1("BaseAddress: %p\n", BaseAddress); KdbpPrintStructInternal(Info, Indent, !!BaseAddress, BaseAddress, &Aggregate); end: RosSymFreeAggregate(&Aggregate); diff --git a/ntoskrnl/kdbg/kdb_expr.c b/ntoskrnl/kdbg/kdb_expr.c index f868d6df376..50625175e94 100644 --- a/ntoskrnl/kdbg/kdb_expr.c +++ b/ntoskrnl/kdbg/kdb_expr.c @@ -37,7 +37,7 @@ #include "kdb.h" #define NDEBUG -#include <debug.h> +#include "debug.h" /* TYPES *********************************************************************/ typedef enum _RPN_OP_TYPE @@ -244,6 +244,7 @@ RpnBinaryOperatorGreaterThanOrEquals( return (a >= b); } +#ifdef DEBUG_RPN /*!\brief Dumps the given RPN stack content * * \param Stack Pointer to a RPN_STACK structure. @@ -255,7 +256,7 @@ RpnpDumpStack( ULONG ul; ASSERT(Stack); - KdpDprintf("\nStack size: %ld\n", Stack->Sp); + KdbPrintf("\nStack size: %ld\n", Stack->Sp); for (ul = 0; ul < Stack->Sp; ul++) { @@ -263,61 +264,62 @@ RpnpDumpStack( switch (Op->Type) { case RpnOpNop: - KdpDprintf("NOP,"); + KdbPuts("NOP,"); break; case RpnOpImmediate: - KdpDprintf("0x%I64x,", Op->Data.Immediate); + KdbPrintf("0x%I64x,", Op->Data.Immediate); break; case RpnOpBinaryOperator: if (Op->Data.BinaryOperator == RpnBinaryOperatorAdd) - KdpDprintf("+,"); + KdbPuts("+,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorSub) - KdpDprintf("-,"); + KdbPuts("-,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorMul) - KdpDprintf("*,"); + KdbPuts("*,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorDiv) - KdpDprintf("/,"); + KdbPuts("/,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorMod) - KdpDprintf("%%,"); + KdbPuts("%%,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorEquals) - KdpDprintf("==,"); + KdbPuts("==,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorNotEquals) - KdpDprintf("!=,"); + KdbPuts("!=,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThan) - KdpDprintf("<,"); + KdbPuts("<,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorLessThanOrEquals) - KdpDprintf("<=,"); + KdbPuts("<=,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThan) - KdpDprintf(">,"); + KdbPuts(">,"); else if (Op->Data.BinaryOperator == RpnBinaryOperatorGreaterThanOrEquals) - KdpDprintf(">=,"); + KdbPuts(">=,"); else - KdpDprintf("UNKNOWN OP,"); + KdbPuts("UNKNOWN OP,"); break; case RpnOpRegister: - KdpDprintf("%s,", RegisterToTrapFrame[Op->Data.Register].Name); + KdbPrintf("%s,", RegisterToTrapFrame[Op->Data.Register].Name); break; case RpnOpDereference: - KdpDprintf("[%s],", + KdbPrintf("[%s],", (Op->Data.DerefMemorySize == 1) ? ("byte") : ((Op->Data.DerefMemorySize == 2) ? ("word") : ((Op->Data.DerefMemorySize == 4) ? ("dword") : ("qword")))); break; default: - KdpDprintf("\nUnsupported Type: %d\n", Op->Type); + KdbPrintf("\nUnsupported Type: %d\n", Op->Type); ul = Stack->Sp; break; } } - KdpDprintf("\n"); + KdbPuts("\n"); } +#endif // DEBUG_RPN /*!\brief Clears the given RPN stack. * diff --git a/ntoskrnl/kdbg/kdb_symbols.c b/ntoskrnl/kdbg/kdb_symbols.c index b8491fefa4b..8cd897f339d 100644 --- a/ntoskrnl/kdbg/kdb_symbols.c +++ b/ntoskrnl/kdbg/kdb_symbols.c @@ -14,7 +14,7 @@ #include "kdb.h" #define NDEBUG -#include <debug.h> +#include "debug.h" /* GLOBALS ******************************************************************/ @@ -170,17 +170,15 @@ KdbSymPrintAddress( CHAR FileName[256]; CHAR FunctionName[256]; - if (RosSymGetAddressInformation(LdrEntry->PatchInformation, RelativeAddress, &LineNumber, FileName, FunctionName)) + if (RosSymGetAddressInformation(LdrEntry->PatchInformation, + RelativeAddress, + &LineNumber, + FileName, + FunctionName)) { - STRING str; - /* Use KdpPrintString because KdpDprintf is limited wrt string size */ - KdpDprintf("<%s:%x (", ModuleNameAnsi, RelativeAddress); - str.Buffer = FileName; - str.Length = (USHORT)strnlen(FileName, sizeof(FileName)); - str.MaximumLength = sizeof(FileName); - KdpPrintString(&str); - KdpDprintf(":%d (%s))>", LineNumber, FunctionName); - + KdbPrintf("<%s:%x (%s:%d (%s))>", + ModuleNameAnsi, RelativeAddress, + FileName, LineNumber, FunctionName); Printed = TRUE; } } @@ -188,7 +186,7 @@ KdbSymPrintAddress( if (!Printed) { /* Just print module & address */ - KdpDprintf("<%s:%x>", ModuleNameAnsi, RelativeAddress); + KdbPrintf("<%s:%x>", ModuleNameAnsi, RelativeAddress); } return TRUE;

1 year, 8 months

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2023