Ros-diffs August 2023

ros-diffs@reactos.org

30 participants
167 discussions

[reactos] 01/01: [SHLWAPI] Implement IUnknown_QueryServicePropertyBag (#5628)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c254a535c3792a570fbd… commit 1c254a535c3792a570fbd5b049f6f175c4a891d7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Sep 1 07:28:23 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Sep 1 07:28:23 2023 +0900 [SHLWAPI] Implement IUnknown_QueryServicePropertyBag (#5628) CORE-9283 --- dll/win32/shlwapi/propbag.cpp | 33 ++++++++++++++++++++++++++++++++- dll/win32/shlwapi/shlwapi.spec | 2 +- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dll/win32/shlwapi/propbag.cpp b/dll/win32/shlwapi/propbag.cpp index 227a0f3c296..c355647166e 100644 --- a/dll/win32/shlwapi/propbag.cpp +++ b/dll/win32/shlwapi/propbag.cpp @@ -1938,7 +1938,7 @@ EXTERN_C VOID FreeViewStatePropertyBagCache(VOID) * * @see https://www.geoffchappell.com/studies/windows/shell/shlwapi/api/propbag/get… */ -INT WINAPI +EXTERN_C INT WINAPI SHGetPerScreenResName( _Out_writes_(cchBuffer) LPWSTR pszBuffer, _In_ INT cchBuffer, @@ -1953,3 +1953,34 @@ SHGetPerScreenResName( StringCchPrintfW(pszBuffer, cchBuffer, L"%dx%d(%d)", cxWidth, cyHeight, cMonitors); return lstrlenW(pszBuffer); } + +/************************************************************************** + * IUnknown_QueryServicePropertyBag (SHLWAPI.536) + * + * @param punk An IUnknown interface. + * @param flags The SHGVSPB_... flags of SHGetViewStatePropertyBag. + * @param riid IID of requested property bag interface. + * @param ppvObj Address to receive pointer to the new interface. + * @return An HRESULT value. S_OK on success, non-zero on failure. + * @see https://geoffchappell.com/studies/windows/shell/shlwapi/api/util/iunknown/q… + */ +EXTERN_C HRESULT WINAPI +IUnknown_QueryServicePropertyBag( + _In_ IUnknown *punk, + _In_ long flags, + _In_ REFIID riid, + _Outptr_ void **ppvObj) +{ + TRACE("%p 0x%x %p %p\n", punk, flags, &riid, ppvObj); + + CComPtr<IShellBrowserService> pService; + HRESULT hr = IUnknown_QueryService(punk, SID_STopLevelBrowser, IID_IShellBrowserService, + (void **)&pService); + if (FAILED(hr)) + { + ERR("0x%X\n", hr); + return hr; + } + + return pService->GetPropertyBag(flags, riid, ppvObj); +} diff --git a/dll/win32/shlwapi/shlwapi.spec b/dll/win32/shlwapi/shlwapi.spec index 35f1844bf91..c7618d58fa9 100644 --- a/dll/win32/shlwapi/shlwapi.spec +++ b/dll/win32/shlwapi/shlwapi.spec @@ -533,7 +533,7 @@ 533 stdcall -noname SHGetPerScreenResName(ptr long long) 534 stdcall -noname SHPropertyBag_ReadBOOL(ptr wstr ptr) 535 stdcall -noname SHPropertyBag_Delete(ptr wstr) -536 stdcall -stub -noname IUnknown_QueryServicePropertyBag(ptr long ptr ptr) +536 stdcall -noname IUnknown_QueryServicePropertyBag(ptr long ptr ptr) 537 stub -noname SHBoolSystemParametersInfo 538 stdcall -noname IUnknown_QueryServiceForWebBrowserApp(ptr ptr ptr) 539 stub -noname IUnknown_ShowBrowserBar

1 year, 3 months

[reactos] 02/02: [THEMES] Add PNG Start button to Lautus style (#5540)

by Ethan Rodensky

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ed134bf2afefb52ea4786… commit ed134bf2afefb52ea4786d16a74c54630f60911f Author: Ethan Rodensky <splitwirez(a)gmail.com> AuthorDate: Tue Aug 8 17:25:54 2023 -0400 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:42:15 2023 +0300 [THEMES] Add PNG Start button to Lautus style (#5540) Use a PNG image with alpha channel transparency for the Start button when compiling Lautus as Vista+ visual style. This serves both as a test case, and improves appearance when using the taskbar with large icons. --- media/themes/Lautus/lautus.msstyles/CMakeLists.txt | 4 ++++ .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn | Bin 0 -> 15973 bytes .../lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png | Bin 0 -> 2341 bytes media/themes/Lautus/lautus.msstyles/lautus.rc | 14 ++++++++++++++ 4 files changed, 18 insertions(+) diff --git a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt index 0f0971f9c55..e5e0565514c 100644 --- a/media/themes/Lautus/lautus.msstyles/CMakeLists.txt +++ b/media/themes/Lautus/lautus.msstyles/CMakeLists.txt @@ -1,4 +1,8 @@ +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_definitions(-DUSE_PNG_IMAGES) +endif() + list(APPEND TEXTFILES textfiles/ExtraLargeNormal.INI textfiles/LargeFontsNormal.INI diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn new file mode 100644 index 00000000000..2beafa31ff4 Binary files /dev/null and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.pdn differ diff --git a/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png new file mode 100644 index 00000000000..5508ccbc79f Binary files /dev/null and b/media/themes/Lautus/lautus.msstyles/bitmaps/NORMAL_STARTBUTTON.png differ diff --git a/media/themes/Lautus/lautus.msstyles/lautus.rc b/media/themes/Lautus/lautus.msstyles/lautus.rc index dc5cdb7ddb1..ac5886e2929 100644 --- a/media/themes/Lautus/lautus.msstyles/lautus.rc +++ b/media/themes/Lautus/lautus.msstyles/lautus.rc @@ -92,7 +92,21 @@ NORMAL_SPINDOWNGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINDOWNGLYPH.bmp" NORMAL_SPINLEFTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINLEFTGLYPH.bmp" NORMAL_SPINRIGHTGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINRIGHTGLYPH.bmp" NORMAL_SPINUPGLYPH_BMP BITMAP "bitmaps/NORMAL_SPINUPGLYPH.bmp" +#ifdef USE_PNG_IMAGES +/* Resource ID ends in "BMP" both for BMP and PNG versions of this resource. This was + * done to keep the ImageFile paths the same, thus allowing the same INI file to be + * used to compile with or without using PNG resources. This is a workaround, and + * resource IDs ending with "PNG" do work and are preferable. + * + * This workaround is needed because preprocessor definitions only apply to code files. + * As more PNG resources are used, it might be best to some form of compile-time INI + * processing/generation, e.g. to conditionally assemble the final file from separate + * parts or something. This is far from a first priority task, though. + */ +NORMAL_STARTBUTTON_BMP IMAGE "bitmaps/NORMAL_STARTBUTTON.png" +#else NORMAL_STARTBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTBUTTON.bmp" +#endif /* USE_PNG_IMAGES */ NORMAL_STARTGROUPBACKGROUND_BMP BITMAP "bitmaps/NORMAL_STARTGROUPBACKGROUND.bmp" NORMAL_STARTGROUPNEWAPPBUTTON_BMP BITMAP "bitmaps/NORMAL_STARTGROUPNEWAPPBUTTON.bmp" NORMAL_STARTGROUPSEPERATOR_BMP BITMAP "bitmaps/NORMAL_STARTGROUPSEPERATOR.bmp"

1 year, 3 months

[reactos] 01/02: [UXTHEME] Allow PNG images in visual styles (#5540)

by Ethan Rodensky

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e31031f603f54cf1751f0… commit e31031f603f54cf1751f0501d9aaab1e50b02c01 Author: Ethan Rodensky <splitwirez(a)gmail.com> AuthorDate: Sun Aug 6 18:14:51 2023 -0400 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:42:03 2023 +0300 [UXTHEME] Allow PNG images in visual styles (#5540) This is prerequisite to supporting Vista+ iteration of the msstyles format, and also for implementing GetThemeStream() later. Visual styles compiled for Vista+ can now use PNG images in the IMAGE group. This does not affect the ability to use BMP images, they can be mixed now. --- dll/win32/uxtheme/CMakeLists.txt | 13 +++++- dll/win32/uxtheme/msstyles.c | 11 +++++ dll/win32/uxtheme/pngsup.cpp | 94 ++++++++++++++++++++++++++++++++++++++++ dll/win32/uxtheme/uxthemep.h | 14 ++++++ 4 files changed, 131 insertions(+), 1 deletion(-) diff --git a/dll/win32/uxtheme/CMakeLists.txt b/dll/win32/uxtheme/CMakeLists.txt index 37fefc5b7fa..3124014046b 100644 --- a/dll/win32/uxtheme/CMakeLists.txt +++ b/dll/win32/uxtheme/CMakeLists.txt @@ -19,6 +19,13 @@ list(APPEND SOURCE uxthemep.h ${CMAKE_CURRENT_BINARY_DIR}/uxtheme_stubs.c) +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_definitions(-DENABLE_PNG_SUPPORT) + + list(APPEND SOURCE + pngsup.cpp) +endif() + add_library(uxtheme MODULE ${SOURCE} version.rc @@ -27,6 +34,10 @@ add_library(uxtheme MODULE set_module_type(uxtheme win32dll) target_link_libraries(uxtheme wine) add_delay_importlibs(uxtheme msimg32) -add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) +if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600) + add_importlibs(uxtheme user32 advapi32 gdiplus gdi32 shlwapi msvcrt kernel32 ntdll) +else() + add_importlibs(uxtheme user32 advapi32 gdi32 msvcrt kernel32 ntdll) +endif() add_pch(uxtheme uxthemep.h SOURCE) add_cd_file(TARGET uxtheme DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/uxtheme/msstyles.c b/dll/win32/uxtheme/msstyles.c index 866d96effd0..1507d3dd405 100644 --- a/dll/win32/uxtheme/msstyles.c +++ b/dll/win32/uxtheme/msstyles.c @@ -920,8 +920,19 @@ HBITMAP MSSTYLES_LoadBitmap (PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha } /* Not found? Load from resources */ img = HeapAlloc (GetProcessHeap(), 0, sizeof (THEME_IMAGE)); +#ifdef ENABLE_PNG_SUPPORT + if (MSSTYLES_TryLoadPng(tc->hTheme, szFile, TEXT(L"IMAGE"), &img->image)) // ...as PNG... + { + prepare_png_alpha(img->image, hasAlpha); + } + else // ...or, failing that, as BMP + { +#endif /* ENABLE_PNG_SUPPORT */ img->image = LoadImageW(tc->hTheme, szFile, IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION); prepare_alpha (img->image, hasAlpha); +#ifdef ENABLE_PNG_SUPPORT + } +#endif /* ENABLE_PNG_SUPPORT */ img->hasAlpha = *hasAlpha; /* ...and stow away for later reuse. */ lstrcpyW (img->name, szFile); diff --git a/dll/win32/uxtheme/pngsup.cpp b/dll/win32/uxtheme/pngsup.cpp new file mode 100644 index 00000000000..25f53abdae7 --- /dev/null +++ b/dll/win32/uxtheme/pngsup.cpp @@ -0,0 +1,94 @@ +/* + * PROJECT: ReactOS uxtheme.dll + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Support for PNG images in visual styles + * COPYRIGHT: Copyright 2023 Ethan Rodensky <splitwirez(a)gmail.com> + */ + +#include "uxthemep.h" + +#include <ole2.h> +#include <objidl.h> +#include <gdiplus.h> +#include <gdipluscolor.h> +#include <winreg.h> +#include <shlwapi.h> + +BOOL +MSSTYLES_TryLoadPng( + _In_ HINSTANCE hTheme, + _In_ LPCWSTR szFile, + _In_ LPCWSTR type, + _Out_ HBITMAP *phBitmap) +{ + BOOL ret = FALSE; + + HRSRC hRes = FindResourceW(hTheme, szFile, type); + if (!hRes) + return FALSE; + + HGLOBAL hAlloc = LoadResource(hTheme, hRes); + if (!hAlloc) + return FALSE; + + DWORD dwSize = SizeofResource(hTheme, hRes); + LPVOID pData = LockResource(hAlloc); + if ((!pData) || (dwSize <= 0)) + { + FreeResource(hAlloc); + return FALSE; + } + + IStream* stream = SHCreateMemStream((BYTE*)pData, dwSize); + if (stream) + { + Gdiplus::Bitmap* gdipBitmap = Gdiplus::Bitmap::FromStream(stream, FALSE); + stream->Release(); + if (gdipBitmap) + { + ret = gdipBitmap->GetHBITMAP(Gdiplus::Color(0, 0, 0, 0), phBitmap) == Gdiplus::Ok; + delete gdipBitmap; + } + } + + UnlockResource(pData); + FreeResource(hAlloc); + return ret; +} + +BOOL +prepare_png_alpha( + _In_ HBITMAP png, + _Out_ BOOL* hasAlpha) +{ + DIBSECTION dib; + int n; + BYTE* p; + + *hasAlpha = FALSE; + + if (!png || GetObjectW( png, sizeof(dib), &dib ) != sizeof(dib)) + return FALSE; + + if (dib.dsBm.bmBitsPixel != 32) + /* nothing to do */ + return TRUE; + + p = (BYTE*)dib.dsBm.bmBits; + n = dib.dsBmih.biHeight * dib.dsBmih.biWidth; + while (n-- > 0) + { + int a = p[3] + 1; + if (a < 256) + { + p[0] = MulDiv(p[0], 256, a); + p[1] = MulDiv(p[1], 256, a); + p[2] = MulDiv(p[2], 256, a); + + *hasAlpha = TRUE; + } + p += 4; + } + + return TRUE; +} diff --git a/dll/win32/uxtheme/uxthemep.h b/dll/win32/uxtheme/uxthemep.h index b721510ca32..af1ffd31a3d 100644 --- a/dll/win32/uxtheme/uxthemep.h +++ b/dll/win32/uxtheme/uxthemep.h @@ -115,6 +115,20 @@ PUXINI_FILE MSSTYLES_GetThemeIni(PTHEME_FILE tf); PTHEME_PARTSTATE MSSTYLES_FindPartState(PTHEME_CLASS tc, int iPartId, int iStateId, PTHEME_CLASS *tcNext); PTHEME_PROPERTY MSSTYLES_FindProperty(PTHEME_CLASS tc, int iPartId, int iStateId, int iPropertyPrimitive, int iPropertyId); PTHEME_PROPERTY MSSTYLES_FindMetric(PTHEME_FILE tf, int iPropertyPrimitive, int iPropertyId); +#ifdef ENABLE_PNG_SUPPORT +EXTERN_C +BOOL +MSSTYLES_TryLoadPng( + _In_ HINSTANCE hTheme, + _In_ LPCWSTR szFile, + _In_ LPCWSTR type, + _Out_ HBITMAP *phBitmap); +EXTERN_C +BOOL +prepare_png_alpha( + _In_ HBITMAP png, + _Out_ BOOL* hasAlpha); +#endif /* ENABLE_PNG_SUPPORT */ HBITMAP MSSTYLES_LoadBitmap(PTHEME_CLASS tc, LPCWSTR lpFilename, BOOL* hasAlpha); HRESULT MSSTYLES_GetPropertyBool(PTHEME_PROPERTY tp, BOOL *pfVal);

1 year, 3 months

[reactos] 02/02: [MSGINA] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a0250607f234ca0f7f3f0… commit a0250607f234ca0f7f3f06531e81d9d4c5a96bcb Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 31 20:10:23 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:10:23 2023 +0300 [MSGINA] Update Russian (ru-RU) translation --- dll/win32/msgina/lang/ru-RU.rc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dll/win32/msgina/lang/ru-RU.rc b/dll/win32/msgina/lang/ru-RU.rc index 7db4abd7ad6..f4685e012e6 100644 --- a/dll/win32/msgina/lang/ru-RU.rc +++ b/dll/win32/msgina/lang/ru-RU.rc @@ -232,14 +232,14 @@ BEGIN IDS_PASSWORDMUSTCHANGE "Вы должны сменить пароль при следующем входе." IDS_PASSWORDEXPIRED "Срок действия вашего пароля истек, необходимо его изменить." IDS_ACCOUNTEXPIRED "Срок действия вашего аккаунта истек. Пожалуйста, обратитесь к системному администратору." - IDS_ACCOUNTLOCKED "Unable to log you on beacuse your account has been locked out. Please see your system administrator." - IDS_INVALIDLOGONHOURS "Your account has time restrictions that prevent you from logging on at this time. Please try again later." - IDS_INVALIDWORKSTATION "Your account is configured to prevent you from using this computer. Please try another computer." - IDS_ACCOUNTRESTRICTION "Unable to log you on because of an account restriction." - IDS_EMERGENCYLOGOFFTITLE "Log Off ReactOS" - IDS_EMERGENCYLOGOFF "Click OK to immediately log off. Any unsaved data will be lost. Use this only as a last resort." - IDS_EMERGENCYRESTARTTITLE "Emergency restart" - IDS_EMERGENCYRESTART "Click OK to immediately restart. Any unsaved data will be lost. Use this only as a last resort." + IDS_ACCOUNTLOCKED "Вход в систему невозможен, так как ваша учётная запись заблокирована. Обратитесь к администратору сети." + IDS_INVALIDLOGONHOURS "Ограничения вашей учётной записи запрещают вход в систему в данное время. Повторите попытку позже." + IDS_INVALIDWORKSTATION "Ограничения вашей учётной записи запрещают вход в систему с данного компьютера. Используйте другой компьютер." + IDS_ACCOUNTRESTRICTION "Вход в систему невозможен из-за ограничений для учётной записи." + IDS_EMERGENCYLOGOFFTITLE "Выход из ReactOS" + IDS_EMERGENCYLOGOFF "Нажмите OK, чтобы завершить сеанс с потерей всех несохранённых данных. Используйте этот вариант только при крайней необходимости." + IDS_EMERGENCYRESTARTTITLE "Аварийная перезагрузка" + IDS_EMERGENCYRESTART "Нажмите OK, чтобы перезагрузить компьютер с потерей всех несохранённых данных. Используйте этот вариант только при крайней необходимости." END /* Shutdown Dialog Strings */

1 year, 3 months

[reactos] 01/02: [SHELL32] Update Russian (ru-RU) translation

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72b59e2459264f6e3745e… commit 72b59e2459264f6e3745e04e692026bed1bce1c9 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Thu Aug 31 20:10:02 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Thu Aug 31 20:10:02 2023 +0300 [SHELL32] Update Russian (ru-RU) translation --- dll/win32/shell32/lang/ru-RU.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/shell32/lang/ru-RU.rc b/dll/win32/shell32/lang/ru-RU.rc index 0d7ae9e0af9..2e4f44ed294 100644 --- a/dll/win32/shell32/lang/ru-RU.rc +++ b/dll/win32/shell32/lang/ru-RU.rc @@ -815,8 +815,8 @@ BEGIN IDS_MOVEERROR "Не удаётся переместить '%s': %s" IDS_COPYERROR "Не удаётся скопировать '%s': %s" - IDS_CREATEFILE_DENIED "Could not create file %1" - IDS_CREATEFILE_CAPTION "Error creating file" + IDS_CREATEFILE_DENIED "Невозможно создать файл '%1'" + IDS_CREATEFILE_CAPTION "Невозможно создать файл" IDS_CREATEFOLDER_DENIED "Невозможно создать папку '%1'" IDS_CREATEFOLDER_CAPTION "Невозможно создать папку" IDS_DELETEITEM_CAPTION "Подтверждение удаления файла"

1 year, 3 months

[reactos] 01/01: [NTOS:KD] Fix release builds.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b2294b4c84b025b2e6f0a… commit b2294b4c84b025b2e6f0a6dc6cb3210aae1944a6 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Aug 31 17:09:30 2023 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 17:10:34 2023 +0200 [NTOS:KD] Fix release builds. --- ntoskrnl/kd/kdio.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 1a9c4c5fbb4..cfaa0d46875 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -593,8 +593,9 @@ KdIoPrintf( KdIoPrintString(Buffer, Length); } - +#ifdef KDBG extern const CSTRING KdbPromptStr; +#endif VOID NTAPI @@ -645,9 +646,11 @@ KdReceivePacket( _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT Context) { +#ifdef KDBG PDBGKD_DEBUG_IO DebugIo; STRING ResponseString; CHAR MessageBuffer[512]; +#endif if (PacketType != PACKET_TYPE_KD_DEBUG_IO) { @@ -655,6 +658,7 @@ KdReceivePacket( return KdPacketTimedOut; } +#ifdef KDBG DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; /* Validate API call */ @@ -703,6 +707,7 @@ KdReceivePacket( /* Only now we can copy back the data into MessageData->Buffer */ RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); +#endif return KdPacketReceived; }

1 year, 3 months

[reactos] 01/01: [NTOS:KD:KDBG] Integration into KD framework (Part 2/3)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d0ffb7d7dbc37d2263a6… commit 0d0ffb7d7dbc37d2263a6109693d8bbf2036a91a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 21 18:42:29 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 16:09:49 2023 +0200 [NTOS:KD:KDBG] Integration into KD framework (Part 2/3) Add redirections for KdSave/KdRestore and KdD0Transition/KdD3Transition. Both KDBG and KD(TERM) need those since they will become external transport DLLs later. --- ntoskrnl/include/ntoskrnl.h | 4 ++++ ntoskrnl/kd/kdmain.c | 39 +++++++++++++++++++++++++++++++++++++++ ntoskrnl/kdbg/kdbg.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+) diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 4d70fd91627..c228e625587 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -91,6 +91,10 @@ #include <kddll.h> #ifdef KDBG /* Define new names for these exports also present in KDBG */ + #define KdD0Transition KdbgD0Transition + #define KdD3Transition KdbgD3Transition + #define KdSave KdbgSave + #define KdRestore KdbgRestore #define KdSendPacket KdbgSendPacket #define KdReceivePacket KdbgReceivePacket /* And reload the definitions with these new names */ diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index 8120ab52e5d..c5b3e828e2e 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -14,6 +14,11 @@ #define NDEBUG #include <debug.h> +#undef KdD0Transition +#undef KdD3Transition +#undef KdSave +#undef KdRestore + /* PUBLIC FUNCTIONS *********************************************************/ static VOID @@ -446,4 +451,38 @@ KdDebuggerInitialize1( return STATUS_SUCCESS; } +NTSTATUS +NTAPI +KdD0Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdSave( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdRestore( + _In_ BOOLEAN SleepTransition) +{ + /* Nothing to do */ + return STATUS_SUCCESS; +} + /* EOF */ diff --git a/ntoskrnl/kdbg/kdbg.c b/ntoskrnl/kdbg/kdbg.c index ac78f72b7e3..b61d19f8aba 100644 --- a/ntoskrnl/kdbg/kdbg.c +++ b/ntoskrnl/kdbg/kdbg.c @@ -22,6 +22,48 @@ static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; /* FUNCTIONS *****************************************************************/ +NTSTATUS +NTAPI +KdD0Transition(VOID) +#undef KdD0Transition +#define pKdD0Transition KdD0Transition +{ + /* Call KdTerm */ + return pKdD0Transition(); +} + +NTSTATUS +NTAPI +KdD3Transition(VOID) +#undef KdD3Transition +#define pKdD3Transition KdD3Transition +{ + /* Call KdTerm */ + return pKdD3Transition(); +} + +NTSTATUS +NTAPI +KdSave( + _In_ BOOLEAN SleepTransition) +#undef KdSave +#define pKdSave KdSave +{ + /* Call KdTerm */ + return pKdSave(SleepTransition); +} + +NTSTATUS +NTAPI +KdRestore( + _In_ BOOLEAN SleepTransition) +#undef KdRestore +#define pKdRestore KdRestore +{ + /* Call KdTerm */ + return pKdRestore(SleepTransition); +} + VOID NTAPI KdSendPacket(

1 year, 3 months

[reactos] 01/01: [NTOS:KD:KDBG] Integration into KD framework (Part 1/3)

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2046a17ef475ac8d80bfd… commit 2046a17ef475ac8d80bfdcffc09d35712e14ec4a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 21 18:42:29 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Aug 31 16:07:51 2023 +0200 [NTOS:KD:KDBG] Integration into KD framework (Part 1/3) Split KdSendPacket and KdReceivePacket into those that manipulate the KDBG state proper (reside in kdbg/kdbg.c), and those that deal only with debug input/output that will reside in a KDTERM "KD Terminal Driver" DLL. Based on some previous preparatory work by Hervé Poussineau in PR #4600. (Equivalents of commits 5162bf106 and partly e9bcf7275.) --- ntoskrnl/include/internal/kd.h | 7 -- ntoskrnl/include/ntoskrnl.h | 12 +-- ntoskrnl/kd/kdio.c | 151 +++++++----------------------------- ntoskrnl/kdbg/kdb.h | 28 ++++--- ntoskrnl/kdbg/kdb_print.c | 22 ++++-- ntoskrnl/kdbg/kdbg.c | 170 +++++++++++++++++++++++++++++++++++++++++ ntoskrnl/ntos.cmake | 1 + 7 files changed, 242 insertions(+), 149 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index a180acf5478..caeb605cb12 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -30,13 +30,6 @@ KdPortPutByteEx( /* KD GLOBALS ****************************************************************/ -typedef enum _KD_CONTINUE_TYPE -{ - kdContinue = 0, - kdDoNotHandleException, - kdHandleException -} KD_CONTINUE_TYPE; - /* KD Internal Debug Services */ typedef enum _KDP_DEBUG_SERVICE { diff --git a/ntoskrnl/include/ntoskrnl.h b/ntoskrnl/include/ntoskrnl.h index 6f2f5379bec..4d70fd91627 100644 --- a/ntoskrnl/include/ntoskrnl.h +++ b/ntoskrnl/include/ntoskrnl.h @@ -88,13 +88,15 @@ #define NOEXTAPI #include <windbgkd.h> #include <wdbgexts.h> +#include <kddll.h> #ifdef KDBG -#define KdDebuggerInitialize0 KdpDebuggerInitialize0 -#define KdDebuggerInitialize1 KdpDebuggerInitialize1 -#define KdSendPacket KdpSendPacket -#define KdReceivePacket KdpReceivePacket + /* Define new names for these exports also present in KDBG */ + #define KdSendPacket KdbgSendPacket + #define KdReceivePacket KdbgReceivePacket + /* And reload the definitions with these new names */ + #undef _KDDLL_ + #include <kddll.h> #endif -#include <kddll.h> #ifdef __ROS_ROSSYM__ #include <reactos/rossym.h> #endif diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 82a1ade1ed7..1a9c4c5fbb4 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -20,6 +20,9 @@ #define NDEBUG #include <debug.h> +#undef KdSendPacket +#undef KdReceivePacket + /* GLOBALS *******************************************************************/ #define KdpBufferSize (1024 * 512) @@ -54,12 +57,6 @@ PKDP_INIT_ROUTINE InitRoutines[KdMax] = #endif }; -static ULONG KdbgNextApiNumber = DbgKdContinueApi; -static CONTEXT KdbgContext; -static EXCEPTION_RECORD64 KdbgExceptionRecord; -static BOOLEAN KdbgFirstChanceException; -static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; - /* LOCKING FUNCTIONS *********************************************************/ KIRQL @@ -607,93 +604,36 @@ KdSendPacket( _In_opt_ PSTRING MessageData, _Inout_ PKD_CONTEXT Context) { - if (PacketType == PACKET_TYPE_KD_DEBUG_IO) - { - ULONG ApiNumber = ((PDBGKD_DEBUG_IO)MessageHeader->Buffer)->ApiNumber; - - /* Validate API call */ - if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) - return; - if ((ApiNumber != DbgKdPrintStringApi) && - (ApiNumber != DbgKdGetStringApi)) - { - return; - } - if (!MessageData) - return; + PDBGKD_DEBUG_IO DebugIo; - /* NOTE: MessageData->Length should be equal to - * DebugIo.u.PrintString.LengthOfString, or to - * DebugIo.u.GetString.LengthOfPromptString */ + if (PacketType != PACKET_TYPE_KD_DEBUG_IO) + { + KdIoPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return; + } - if (!KdpDebugMode.Value) - return; + DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; - /* Print the string proper */ - KdIoPrintString(MessageData->Buffer, MessageData->Length); + /* Validate API call */ + if (MessageHeader->Length != sizeof(DBGKD_DEBUG_IO)) return; - } - else if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) + if ((DebugIo->ApiNumber != DbgKdPrintStringApi) && + (DebugIo->ApiNumber != DbgKdGetStringApi)) { - PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer; - if (WaitStateChange->NewState == DbgKdLoadSymbolsStateChange) - { -#ifdef KDBG - PLDR_DATA_TABLE_ENTRY LdrEntry; - /* Load symbols. Currently implemented only for KDBG! */ - if (KdbpSymFindModule((PVOID)(ULONG_PTR)WaitStateChange->u.LoadSymbols.BaseOfDll, -1, &LdrEntry)) - { - KdbSymProcessSymbols(LdrEntry, !WaitStateChange->u.LoadSymbols.UnloadSymbols); - } -#endif - return; - } - else if (WaitStateChange->NewState == DbgKdExceptionStateChange) - { - KdbgNextApiNumber = DbgKdGetContextApi; - KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord; - KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance; - return; - } + return; } - else if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) - { - PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; - if (ManipulateState->ApiNumber == DbgKdGetContextApi) - { - KD_CONTINUE_TYPE Result; + if (!MessageData) + return; -#ifdef KDBG - /* Check if this is an assertion failure */ - if (KdbgExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) - { - /* Bump EIP to the instruction following the int 2C */ - KeSetContextPc(&KdbgContext, KeGetContextPc(&KdbgContext) + 2); - } + /* NOTE: MessageData->Length should be equal to + * DebugIo.u.PrintString.LengthOfString, or to + * DebugIo.u.GetString.LengthOfPromptString */ - Result = KdbEnterDebuggerException(&KdbgExceptionRecord, - KdbgContext.SegCs & 1, - &KdbgContext, - KdbgFirstChanceException); -#else - /* We'll manually dump the stack for the user... */ - KeRosDumpStackFrames(NULL, 0); - Result = kdHandleException; -#endif - if (Result != kdHandleException) - KdbgContinueStatus = STATUS_SUCCESS; - else - KdbgContinueStatus = STATUS_UNSUCCESSFUL; - KdbgNextApiNumber = DbgKdSetContextApi; - return; - } - else if (ManipulateState->ApiNumber == DbgKdSetContextApi) - { - KdbgNextApiNumber = DbgKdContinueApi; - return; - } - } - UNIMPLEMENTED; + if (!KdpDebugMode.Value) + return; + + /* Print the string proper */ + KdIoPrintString(MessageData->Buffer, MessageData->Length); } KDSTATUS @@ -705,48 +645,16 @@ KdReceivePacket( _Out_ PULONG DataLength, _Inout_ PKD_CONTEXT Context) { -#ifdef KDBG - STRING ResponseString; PDBGKD_DEBUG_IO DebugIo; + STRING ResponseString; CHAR MessageBuffer[512]; -#endif - - if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) - { - PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; - RtlZeroMemory(MessageHeader->Buffer, MessageHeader->MaximumLength); - if (KdbgNextApiNumber == DbgKdGetContextApi) - { - ManipulateState->ApiNumber = DbgKdGetContextApi; - MessageData->Length = 0; - MessageData->Buffer = (PCHAR)&KdbgContext; - return KdPacketReceived; - } - else if (KdbgNextApiNumber == DbgKdSetContextApi) - { - ManipulateState->ApiNumber = DbgKdSetContextApi; - MessageData->Length = sizeof(KdbgContext); - MessageData->Buffer = (PCHAR)&KdbgContext; - return KdPacketReceived; - } - else if (KdbgNextApiNumber != DbgKdContinueApi) - { - UNIMPLEMENTED; - } - ManipulateState->ApiNumber = DbgKdContinueApi; - ManipulateState->u.Continue.ContinueStatus = KdbgContinueStatus; - - /* Prepare for next time */ - KdbgNextApiNumber = DbgKdContinueApi; - KdbgContinueStatus = STATUS_SUCCESS; - - return KdPacketReceived; - } if (PacketType != PACKET_TYPE_KD_DEBUG_IO) + { + KdIoPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); return KdPacketTimedOut; + } -#ifdef KDBG DebugIo = (PDBGKD_DEBUG_IO)MessageHeader->Buffer; /* Validate API call */ @@ -795,7 +703,6 @@ KdReceivePacket( /* Only now we can copy back the data into MessageData->Buffer */ RtlCopyMemory(MessageData->Buffer, ResponseString.Buffer, *DataLength); -#endif return KdPacketReceived; } diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 2170be54f9f..df2945a7d9c 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -51,6 +51,25 @@ typedef enum _KDB_ENTER_CONDITION KdbEnterFromUmode } KDB_ENTER_CONDITION; +typedef enum _KD_CONTINUE_TYPE +{ + kdContinue = 0, + kdDoNotHandleException, + kdHandleException +} KD_CONTINUE_TYPE; + + +/* GLOBALS *******************************************************************/ + +extern PCHAR KdbInitFileBuffer; + +extern PEPROCESS KdbCurrentProcess; +extern PETHREAD KdbCurrentThread; +extern LONG KdbLastBreakPointNr; +extern ULONG KdbNumSingleSteps; +extern BOOLEAN KdbSingleStepOver; +extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; + /* FUNCTIONS *****************************************************************/ @@ -74,8 +93,6 @@ KdbpStackSwitchAndCall( /* from kdb_cli.c */ -extern PCHAR KdbInitFileBuffer; - NTSTATUS NTAPI KdbInitialize( @@ -175,13 +192,6 @@ KdbSymInit( /* from kdb.c */ -extern PEPROCESS KdbCurrentProcess; -extern PETHREAD KdbCurrentThread; -extern LONG KdbLastBreakPointNr; -extern ULONG KdbNumSingleSteps; -extern BOOLEAN KdbSingleStepOver; -extern PKDB_KTRAP_FRAME KdbCurrentTrapFrame; - LONG KdbpGetNextBreakPointNr( IN ULONG Start OPTIONAL); diff --git a/ntoskrnl/kdbg/kdb_print.c b/ntoskrnl/kdbg/kdb_print.c index 257b37e1225..85b3ac20a6c 100644 --- a/ntoskrnl/kdbg/kdb_print.c +++ b/ntoskrnl/kdbg/kdb_print.c @@ -13,6 +13,14 @@ /* FUNCTIONS *****************************************************************/ +static KD_CONTEXT KdbgKdContext; + +#undef KdSendPacket +#define pKdSendPacket KdSendPacket + +#undef KdReceivePacket +#define pKdReceivePacket KdReceivePacket + static VOID KdbPrintStringWorker( _In_ const CSTRING* Output, @@ -48,7 +56,8 @@ KdbPrintStringWorker( Data->Buffer = (PCHAR)Output->Buffer; /* Send the packet */ - KdSendPacket(PACKET_TYPE_KD_DEBUG_IO, Header, Data, &KdpContext); + /* IO packet: call KdTerm */ + pKdSendPacket(PACKET_TYPE_KD_DEBUG_IO, Header, Data, &KdbgKdContext); } VOID @@ -88,11 +97,12 @@ KdbPromptStringWorker( do { /* Get our reply */ - Status = KdReceivePacket(PACKET_TYPE_KD_DEBUG_IO, - &Header, - &Data, - &Length, - &KdpContext); + /* IO packet: call KdTerm */ + Status = pKdReceivePacket(PACKET_TYPE_KD_DEBUG_IO, + &Header, + &Data, + &Length, + &KdbgKdContext); /* Return TRUE if we need to resend */ if (Status == KdPacketNeedsResend) diff --git a/ntoskrnl/kdbg/kdbg.c b/ntoskrnl/kdbg/kdbg.c new file mode 100644 index 00000000000..ac78f72b7e3 --- /dev/null +++ b/ntoskrnl/kdbg/kdbg.c @@ -0,0 +1,170 @@ +/* + * PROJECT: ReactOS KDBG Kernel Debugger + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel Debugger Initialization + * COPYRIGHT: Copyright 2020-2021 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2021 Jérôme Gardou <jerome.gardou(a)reactos.org> + * Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#include "kdb.h" + +/* GLOBALS *******************************************************************/ + +static ULONG KdbgNextApiNumber = DbgKdContinueApi; +static CONTEXT KdbgContext; +static EXCEPTION_RECORD64 KdbgExceptionRecord; +static BOOLEAN KdbgFirstChanceException; +static NTSTATUS KdbgContinueStatus = STATUS_SUCCESS; + +/* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdSendPacket( + _In_ ULONG PacketType, + _In_ PSTRING MessageHeader, + _In_opt_ PSTRING MessageData, + _Inout_ PKD_CONTEXT Context) +#undef KdSendPacket +#define pKdSendPacket KdSendPacket +{ + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* Call KdTerm */ + pKdSendPacket(PacketType, MessageHeader, MessageData, Context); + return; + } + + /* Debugger-only packets */ + if (PacketType == PACKET_TYPE_KD_STATE_CHANGE64) + { + PDBGKD_ANY_WAIT_STATE_CHANGE WaitStateChange = (PDBGKD_ANY_WAIT_STATE_CHANGE)MessageHeader->Buffer; + if (WaitStateChange->NewState == DbgKdLoadSymbolsStateChange) + { + /* Load or unload symbols */ + PLDR_DATA_TABLE_ENTRY LdrEntry; + if (KdbpSymFindModule((PVOID)(ULONG_PTR)WaitStateChange->u.LoadSymbols.BaseOfDll, -1, &LdrEntry)) + { + KdbSymProcessSymbols(LdrEntry, !WaitStateChange->u.LoadSymbols.UnloadSymbols); + } + return; + } + else if (WaitStateChange->NewState == DbgKdExceptionStateChange) + { + KdbgNextApiNumber = DbgKdGetContextApi; + KdbgExceptionRecord = WaitStateChange->u.Exception.ExceptionRecord; + KdbgFirstChanceException = WaitStateChange->u.Exception.FirstChance; + return; + } + } + else if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) + { + PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; + if (ManipulateState->ApiNumber == DbgKdGetContextApi) + { + KD_CONTINUE_TYPE Result; + + /* Check if this is an assertion failure */ + if (KdbgExceptionRecord.ExceptionCode == STATUS_ASSERTION_FAILURE) + { + /* Bump EIP to the instruction following the int 2C */ + KeSetContextPc(&KdbgContext, KeGetContextPc(&KdbgContext) + 2); + } + + Result = KdbEnterDebuggerException(&KdbgExceptionRecord, + KdbgContext.SegCs & 1, + &KdbgContext, + KdbgFirstChanceException); +#if 0 + /* Manually dump the stack for the user */ + KeRosDumpStackFrames(NULL, 0); + Result = kdHandleException; +#endif + if (Result != kdHandleException) + KdbgContinueStatus = STATUS_SUCCESS; + else + KdbgContinueStatus = STATUS_UNSUCCESSFUL; + KdbgNextApiNumber = DbgKdSetContextApi; + return; + } + else if (ManipulateState->ApiNumber == DbgKdSetContextApi) + { + KdbgNextApiNumber = DbgKdContinueApi; + return; + } + } + + KdbPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return; +} + +KDSTATUS +NTAPI +KdReceivePacket( + _In_ ULONG PacketType, + _Out_ PSTRING MessageHeader, + _Out_ PSTRING MessageData, + _Out_ PULONG DataLength, + _Inout_ PKD_CONTEXT Context) +#undef KdReceivePacket +#define pKdReceivePacket KdReceivePacket +{ + if (PacketType == PACKET_TYPE_KD_POLL_BREAKIN) + { + // FIXME TODO: Implement break-in for the debugger + // and return KdPacketReceived when handled properly. + return KdPacketTimedOut; + } + + if (PacketType == PACKET_TYPE_KD_DEBUG_IO) + { + /* Call KdTerm */ + return pKdReceivePacket(PacketType, + MessageHeader, + MessageData, + DataLength, + Context); + } + + /* Debugger-only packets */ + if (PacketType == PACKET_TYPE_KD_STATE_MANIPULATE) + { + PDBGKD_MANIPULATE_STATE64 ManipulateState = (PDBGKD_MANIPULATE_STATE64)MessageHeader->Buffer; + RtlZeroMemory(MessageHeader->Buffer, MessageHeader->MaximumLength); + if (KdbgNextApiNumber == DbgKdGetContextApi) + { + ManipulateState->ApiNumber = DbgKdGetContextApi; + MessageData->Length = 0; + MessageData->Buffer = (PCHAR)&KdbgContext; + return KdPacketReceived; + } + else if (KdbgNextApiNumber == DbgKdSetContextApi) + { + ManipulateState->ApiNumber = DbgKdSetContextApi; + MessageData->Length = sizeof(KdbgContext); + MessageData->Buffer = (PCHAR)&KdbgContext; + return KdPacketReceived; + } + else if (KdbgNextApiNumber != DbgKdContinueApi) + { + KdbPrintf("%s:%d is UNIMPLEMENTED\n", __FUNCTION__, __LINE__); + } + ManipulateState->ApiNumber = DbgKdContinueApi; + ManipulateState->u.Continue.ContinueStatus = KdbgContinueStatus; + + /* Prepare for next time */ + KdbgNextApiNumber = DbgKdContinueApi; + KdbgContinueStatus = STATUS_SUCCESS; + + return KdPacketReceived; + } + + KdbPrintf("%s: PacketType %d is UNIMPLEMENTED\n", __FUNCTION__, PacketType); + return KdPacketTimedOut; +} + +/* EOF */ diff --git a/ntoskrnl/ntos.cmake b/ntoskrnl/ntos.cmake index dddb6cae4ab..a85cb19e39a 100644 --- a/ntoskrnl/ntos.cmake +++ b/ntoskrnl/ntos.cmake @@ -404,6 +404,7 @@ if(NOT _WINKD_) if(KDBG) list(APPEND SOURCE + ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdbg.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cli.c ${REACTOS_SOURCE_DIR}/ntoskrnl/kdbg/kdb_cmdhist.c

1 year, 3 months

[reactos] 01/01: [REGEDIT] Update Japanese (ja-JP) tranlation Part 2

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=823b51558df325064ea15… commit 823b51558df325064ea15484961c2691c3e28596 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 21:01:56 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 21:01:56 2023 +0900 [REGEDIT] Update Japanese (ja-JP) tranlation Part 2 CORE-18706 --- base/applications/regedit/lang/ja-JP.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index a3212756384..ecb5d413a28 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -295,7 +295,7 @@ BEGIN LTEXT "デバイス特有のデータ:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "使い方", IDC_STATIC, 10, 219, 125, 39 + GROUPBOX "使用用途", IDC_STATIC, 10, 219, 125, 39 LTEXT "未定", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED LTEXT "共有", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED LTEXT "デバイス専用", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED

1 year, 3 months

[reactos] 01/01: [REGEDIT] Update Japanese (ja-JP) translation

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=389377ce2a4e5e4487868… commit 389377ce2a4e5e4487868ea1744ea296d89649e0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 31 20:45:25 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Aug 31 20:45:25 2023 +0900 [REGEDIT] Update Japanese (ja-JP) translation CORE-18706 --- base/applications/regedit/lang/ja-JP.rc | 194 ++++++++++++++++---------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/base/applications/regedit/lang/ja-JP.rc b/base/applications/regedit/lang/ja-JP.rc index 68f820f9ccb..a3212756384 100644 --- a/base/applications/regedit/lang/ja-JP.rc +++ b/base/applications/regedit/lang/ja-JP.rc @@ -15,53 +15,53 @@ END /* Command-line strings */ STRINGTABLE BEGIN - STRING_USAGE "Usage:\n\ - regedit [options] [filename] [reg_key]\n\n\ -Options:\n\ - [no option] Launch the graphical version of this program.\n\ - /L:system.dat The location of the system.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /R:user.dat The location of the user.dat file to be modified.\n\ - Compatible with any other switch. Ignored.\n\ - /C Import the contents of a registry file.\n\ - /D Delete a specified registry key.\n\ - /E Export the contents of a specified registry key to a file.\n\ - If no key is specified, the entire registry is exported.\n\ - /S Silent mode. No messages will be displayed.\n\ - /V Launch the GUI in advanced mode. Ignored.\n\ - /? Display this information and exit.\n\ - [filename] The location of the file containing registry information to\n\ - be imported. When used with [/E], this option specifies the\n\ - file location where registry information will be exported.\n\ - [reg_key] The registry key to be modified.\n\ + STRING_USAGE "使い方:\n\ + regedit [オプション] [ファイル名] [reg_key]\n\n\ +オプション:\n\ + [オプションなし] このプログラムのグラフィカルなバージョンを起動します。\n\ + /L:system.dat 変更する system.dat ファイルの場所です。\n\ + 他のスイッチと互換です。無視されます。\n\ + /R:user.dat 変更する user.dat ファイルの場所です。\n\ + 他のスイッチと互換です。無視されます。\n\ + /C レジストリファイルの内容をインポートします。\n\ + /D 指定したレジストリキーを削除します。\n\ + /E 指定したレジストリキーの内容をファイルにエクスポートします。\n\ + キーが未指定のときはレジストリ全体がエクスポートされます。\n\ + /S サイレントモード。メッセージが表示されません。\n\ + /V 上級者向けモードでGUIを起動します。無視されます。\n\ + /? この情報を表示して終了します。\n\ + [ファイル名] インポートされるレジストリ情報を含むファイルの場所です。\n\ + [/E] と一緒に使うと、このオプションは、エクスポートされる\n\ + ファイルの場所です\n\ + [reg_key] 変更されるレジストリーキーです。\n\ \n\ -Usage examples:\n\ +使用例:\n\ regedit ""import.reg""\n\ regedit /E ""export.reg"" ""HKEY_CURRENT_USER\\Console""\n\ regedit /D ""HKEY_LOCAL_MACHINE\\Error\\Path""\n" - STRING_INVALID_SWITCH "regedit: Invalid or unrecognized switch [%1]\n" - STRING_HELP "Type ""regedit /?"" for help.\n" - STRING_NO_FILENAME "regedit: No filename was specified.\n" - STRING_NO_REG_KEY "regedit: No registry key was specified for removal.\n" - STRING_FILE_NOT_FOUND "regedit: The file '%1' was not found.\n" - STRING_CANNOT_OPEN_FILE "regedit: Unable to open the file '%1'.\n" - STRING_UNHANDLED_ACTION "regedit: Unhandled action.\n" - STRING_OUT_OF_MEMORY "regedit: Out of memory! (%1!S!, line %2!u!)\n" - STRING_INVALID_HEX "regedit: Invalid hexadecimal value.\n" - STRING_CSV_HEX_ERROR "regedit: Unable to convert hexadecimal data. An invalid value was encountered at '%1'.\n" - STRING_ESCAPE_SEQUENCE "regedit: Unrecognized escape sequence [\\%1!c!]\n" - STRING_UNKNOWN_DATA_FORMAT "regedit: Unsupported registry data type [0x%1!x!]\n" - STRING_UNEXPECTED_EOL "regedit: Unexpected end of line in '%1'.\n" - STRING_UNRECOGNIZED_LINE "regedit: The line '%1' was not recognized.\n" - STRING_SETVALUE_FAILED "regedit: Unable to add the registry value '%1' to '%2'.\n" - STRING_OPEN_KEY_FAILED "regedit: Unable to open the registry key '%1'.\n" - STRING_UNSUPPORTED_TYPE "regedit: Unsupported registry data type [0x%1!x!] encountered in '%2'.\n" - STRING_EXPORT_AS_BINARY "regedit: The registry value '%1' will be exported as binary data.\n" - STRING_INVALID_SYSTEM_KEY "regedit: Invalid system key [%1]\n" - STRING_REG_KEY_NOT_FOUND "regedit: Unable to export '%1'. The specified registry key was not found.\n" - STRING_DELETE_FAILED "regedit: Unable to delete the registry key '%1'.\n" - STRING_UNKNOWN_TYPE "Unknown Type" - STRING_INVALID_LINE_SYNTAX, "regedit: The line contains invalid syntax.\n" + STRING_INVALID_SWITCH "regedit: 無効または認識されないスイッチ [%1]\n" + STRING_HELP "ヘルプを表示するには ""regedit /?"" と入力ください。\n" + STRING_NO_FILENAME "regedit: ファイル名が未指定です。\n" + STRING_NO_REG_KEY "regedit: 除去するレジストリーキーが未指定です。\n" + STRING_FILE_NOT_FOUND "regedit: ファイル '%1' は見つかりませんでした。\n" + STRING_CANNOT_OPEN_FILE "regedit: ファイル '%1' が開けません。.\n" + STRING_UNHANDLED_ACTION "regedit: ハンドルされないアクションです。\n" + STRING_OUT_OF_MEMORY "regedit: メモリー不足です! (%1!S!, 行 %2!u!)\n" + STRING_INVALID_HEX "regedit: 不正な16進数の値です。\n" + STRING_CSV_HEX_ERROR "regedit: 16進数のデータを変換できません。不正な値が '%1' で見つかりました。\n" + STRING_ESCAPE_SEQUENCE "regedit: 認識されないエスケープシーケンスです [\\%1!c!]\n" + STRING_UNKNOWN_DATA_FORMAT "regedit: 未サポートのレジストリデータの種類です [0x%1!x!]\n" + STRING_UNEXPECTED_EOL "regedit: 予期しない行の終わりです。'%1'\n" + STRING_UNRECOGNIZED_LINE "regedit: 行 '%1' は認識されません。\n" + STRING_SETVALUE_FAILED "regedit: レジストリ値 '%1' を '%2' に追加できませんでした。\n" + STRING_OPEN_KEY_FAILED "regedit: レジストリキー '%1' を開けませんでした。\n" + STRING_UNSUPPORTED_TYPE "regedit: 未サポートのレジストリデータの種類 [0x%1!x!] が '%2' で見つかりました。\n" + STRING_EXPORT_AS_BINARY "regedit: レジストリ値 '%1' がバイナリデータでエクスポートされます。\n" + STRING_INVALID_SYSTEM_KEY "regedit: 不正なシステムキーです [%1]\n" + STRING_REG_KEY_NOT_FOUND "regedit: '%1' をエクスポートできません。指定されたレジストリキーが見つかりません。\n" + STRING_DELETE_FAILED "regedit: レジストリキー '%1' を削除できません。\n" + STRING_UNKNOWN_TYPE "未知の種類" + STRING_INVALID_LINE_SYNTAX, "regedit: 無効な文法の行があります。\n" END /* Menus */ @@ -277,39 +277,39 @@ END IDD_EDIT_RESOURCE DIALOGEX 6, 18, 281, 283 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Resources" +CAPTION "リソース" FONT 9, "MS UI Gothic" BEGIN LTEXT "DMA:", IDC_STATIC, 10, 5, 20, 8 CONTROL "", IDC_DMA_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 15, 261, 31 - LTEXT "Interrupt:", IDC_STATIC, 10, 48, 35, 8 + LTEXT "割り込み:", IDC_STATIC, 10, 48, 35, 8 CONTROL "", IDC_IRQ_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 58, 261, 31 - LTEXT "Memory:", IDC_STATIC, 10, 91, 32, 8 + LTEXT "メモリ:", IDC_STATIC, 10, 91, 32, 8 CONTROL "", IDC_MEMORY_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 101, 261, 31 - LTEXT "Port:", IDC_STATIC, 10, 134, 38, 8 + LTEXT "ポート:", IDC_STATIC, 10, 134, 38, 8 CONTROL "", IDC_PORT_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 144, 261, 31 - LTEXT "Device specific data:", IDC_STATIC, 10, 177, 80, 8 + LTEXT "デバイス特有のデータ:", IDC_STATIC, 10, 177, 80, 8 CONTROL "", IDC_DEVICE_LIST, "SysListView32", LVS_REPORT | LVS_NOSORTHEADER | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 10, 188, 261, 31 - GROUPBOX "Usage", IDC_STATIC, 10, 219, 125, 39 - LTEXT "Undetermined", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED - LTEXT "Shared", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED - LTEXT "Device exclusive", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED - LTEXT "Driver exclusive", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED - RTEXT "Interface Type:", IDC_STATIC, 144, 220, 58, 8 + GROUPBOX "使い方", IDC_STATIC, 10, 219, 125, 39 + LTEXT "未定", IDC_UNDETERMINED, 18, 230, 46, 8, WS_DISABLED + LTEXT "共有", IDC_SHARED, 18, 240, 48, 8, WS_DISABLED + LTEXT "デバイス専用", IDC_DEVICE_EXCLUSIVE, 72, 230, 58, 8, WS_DISABLED + LTEXT "ドライバ専用", IDC_DRIVER_EXCLUSIVE, 72, 240, 54, 8, WS_DISABLED + RTEXT "ｲﾝﾀｰﾌｪｲｽの種類:", IDC_STATIC, 144, 220, 58, 8 LTEXT "", IDC_INTERFACETYPE, 205, 220, 66, 8 - RTEXT "Bus Nummer:", IDC_STATIC, 151, 230, 51, 8 + RTEXT "バス番号:", IDC_STATIC, 151, 230, 51, 8 LTEXT "", IDC_BUSNUMBER, 205, 230, 66, 8 - RTEXT "Version:", IDC_STATIC, 151, 240, 51, 8 + RTEXT "バージョン:", IDC_STATIC, 151, 240, 51, 8 LTEXT "", IDC_VERSION, 205, 240, 66, 8 - RTEXT "Revision:", IDC_STATIC, 151, 250, 51, 8 + RTEXT "リビジョン:", IDC_STATIC, 151, 250, 51, 8 LTEXT "", IDC_REVISION, 205, 250, 66, 8 DEFPUSHBUTTON "OK", IDOK, 92, 263, 40, 14 - PUSHBUTTON "&Data...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED + PUSHBUTTON "データ(&D)...", IDC_SHOW_RESOURCE_DATA, 148, 263, 40, 14, WS_DISABLED END /* String Tables */ @@ -415,13 +415,13 @@ BEGIN IDS_FLT_REGFILE "登録ファイル" IDS_FLT_REGFILES "登録ファイル (*.reg)" IDS_FLT_REGFILES_FLT "*.reg" - IDS_FLT_HIVFILES "Registry Hive Files (*.*)" + IDS_FLT_HIVFILES "レジストリハイブファイル (*.*)" IDS_FLT_HIVFILES_FLT "*.*" IDS_FLT_REGEDIT4 "Win9x/NT4 登録ファイル (REGEDIT4) (*.reg)" IDS_FLT_REGEDIT4_FLT "*.reg" IDS_FLT_ALLFILES "すべてのファイル (*.*)" IDS_FLT_ALLFILES_FLT "*.*" - IDS_FLT_TXTFILES "Text Files (*.txt)" + IDS_FLT_TXTFILES "テキストファイル (*.txt)" IDS_FLT_TXTFILES_FLT "*.txt" END @@ -466,40 +466,40 @@ END STRINGTABLE BEGIN - IDS_BUSNUMBER "Bus Number" - IDS_INTERFACE "Interface" - IDS_DMA_CHANNEL "Channel" - IDS_DMA_PORT "Port" - IDS_INTERRUPT_VECTOR "Vector" - IDS_INTERRUPT_LEVEL "Level" - IDS_INTERRUPT_AFFINITY "Affinity" - IDS_INTERRUPT_TYPE "Type" - IDS_MEMORY_ADDRESS "Physical Address" - IDS_MEMORY_LENGTH "Length" - IDS_MEMORY_ACCESS "Access" - IDS_PORT_ADDRESS "Physical Address" - IDS_PORT_LENGTH "Length" - IDS_PORT_ACCESS "Access" - IDS_SPECIFIC_RESERVED1 "Reserved 1" - IDS_SPECIFIC_RESERVED2 "Reserved 2" - IDS_SPECIFIC_DATASIZE "Data Size" + IDS_BUSNUMBER "バス番号" + IDS_INTERFACE "インターフェイス" + IDS_DMA_CHANNEL "チャンネル" + IDS_DMA_PORT "ポート" + IDS_INTERRUPT_VECTOR "ベクター" + IDS_INTERRUPT_LEVEL "レベル" + IDS_INTERRUPT_AFFINITY "アフィニティ" + IDS_INTERRUPT_TYPE "種類" + IDS_MEMORY_ADDRESS "物理アドレス" + IDS_MEMORY_LENGTH "長さ" + IDS_MEMORY_ACCESS "アクセス" + IDS_PORT_ADDRESS "物理アドレス" + IDS_PORT_LENGTH "長さ" + IDS_PORT_ACCESS "アクセス" + IDS_SPECIFIC_RESERVED1 "予約済み 1" + IDS_SPECIFIC_RESERVED2 "予約済み 2" + IDS_SPECIFIC_DATASIZE "データサイズ" END STRINGTABLE BEGIN - IDS_PORT_PORT_IO "Port" - IDS_PORT_MEMORY_IO "Memory" + IDS_PORT_PORT_IO "ポート" + IDS_PORT_MEMORY_IO "メモリ" IDS_INTERRUPT_EDGE_SENSITIVE "Edge Sensitive" IDS_INTERRUPT_LEVEL_SENSITIVE "Level Sensitive" - IDS_MEMORY_READ_ONLY "Read Only" - IDS_MEMORY_WRITE_ONLY "Write Only" - IDS_MEMORY_READ_WRITE "Read / Write" + IDS_MEMORY_READ_ONLY "読み込みのみ" + IDS_MEMORY_WRITE_ONLY "書き込みのみ" + IDS_MEMORY_READ_WRITE "読み書き可能" END STRINGTABLE BEGIN - IDS_BUS_UNDEFINED "Undefined" - IDS_BUS_INTERNAL "Internal" + IDS_BUS_UNDEFINED "未定義" + IDS_BUS_INTERNAL "内部" IDS_BUS_ISA "ISA" IDS_BUS_EISA "EISA" IDS_BUS_MICROCHANNEL "MicroChannel" @@ -511,25 +511,25 @@ BEGIN IDS_BUS_CBUS "C-Bus" IDS_BUS_MPIBUS "MPI-Bus" IDS_BUS_MPSABUS "MPSA-Bus" - IDS_BUS_PROCESSORINTERNAL "Processor Internal" - IDS_BUS_INTERNALPOWERBUS "Internal Power Bus" + IDS_BUS_PROCESSORINTERNAL "内部プロセッサ" + IDS_BUS_INTERNALPOWERBUS "内部 Power Bus" IDS_BUS_PNPISABUS "PnP-ISA Bus" IDS_BUS_PNPBUS "PnP Bus" - IDS_BUS_UNKNOWNTYPE "Unknown Interface Type" + IDS_BUS_UNKNOWNTYPE "未知のインターフェイスの種類" END STRINGTABLE BEGIN - IDS_FIELD_KEY_NAME "Key Name:" - IDS_FIELD_CLASS_NAME "Class Name:" - IDS_NO_CLASS_NAME "<NO CLASS>" - IDS_NULL_TIMESTAMP "<NULL>" - IDS_FIELD_NAME " Name:" - IDS_FIELD_TYPE " Type:" - IDS_FIELD_DATA " Data:" - IDS_FIELD_LASTWRITE "Last Write Time:" - IDS_UNKNOWN "<UNKNOWN>" - IDS_VALUE_INDEX "Value %d" + IDS_FIELD_KEY_NAME "キー名:" + IDS_FIELD_CLASS_NAME "クラス名:" + IDS_NO_CLASS_NAME "<クラスなし>" + IDS_NULL_TIMESTAMP "<なし>" + IDS_FIELD_NAME " 名前:" + IDS_FIELD_TYPE " 種類:" + IDS_FIELD_DATA " データ:" + IDS_FIELD_LASTWRITE "最終書き込み時刻:" + IDS_UNKNOWN "<未知>" + IDS_VALUE_INDEX "値 %d" END /*****************************************************************/

1 year, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2023