Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 02/02: [NTOS:KD] Remove unneeded 'extern' declaration. Addendum to commit 4ce819ca.
by Hermès Bélusca-Maïto 12 Mar '23

12 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ab92e4031717d8fab8450… commit ab92e4031717d8fab8450a8d2ef592fc4b7e1068 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Mar 11 17:08:39 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 12 02:17:15 2023 +0100 [NTOS:KD] Remove unneeded 'extern' declaration. Addendum to commit 4ce819ca. --- ntoskrnl/kd/kdio.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 4575b9a2e8b..396c0432317 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -26,7 +26,6 @@ static KSPIN_LOCK KdpDebugLogSpinLock; static KEVENT KdpLoggerThreadEvent; static HANDLE KdpLogFileHandle; ANSI_STRING KdpLogFileName = RTL_CONSTANT_STRING("\\SystemRoot\\debug.log"); -extern ULONG ExpInitializationPhase; static KSPIN_LOCK KdpSerialSpinLock; ULONG SerialPortNumber = DEFAULT_DEBUG_PORT;

1 0

[reactos] 01/02: [NTOS:KDBG] Remove dead code. Addendum to baa47fa5e and fe777bb52.
by Hermès Bélusca-Maïto 12 Mar '23

12 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=372eb0c0b8e09af0fa646… commit 372eb0c0b8e09af0fa646c7e9245f49b65f05c2d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Nov 28 00:43:22 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Mar 12 02:16:58 2023 +0100 [NTOS:KDBG] Remove dead code. Addendum to baa47fa5e and fe777bb52. --- ntoskrnl/kdbg/kdb.c | 32 -------------------------------- ntoskrnl/kdbg/kdb.h | 4 ---- 2 files changed, 36 deletions(-) diff --git a/ntoskrnl/kdbg/kdb.c b/ntoskrnl/kdbg/kdb.c index abe8f96b2cd..1b03f692ec5 100644 --- a/ntoskrnl/kdbg/kdb.c +++ b/ntoskrnl/kdbg/kdb.c @@ -1623,38 +1623,6 @@ continue_execution: return ContinueType; } -KD_CONTINUE_TYPE -KdbEnterDebuggerFirstChanceException( - IN OUT PKTRAP_FRAME TrapFrame) -{ - EXCEPTION_RECORD64 ExceptionRecord; - KD_CONTINUE_TYPE Return; - CONTEXT Context; - - /* Copy TrapFrame to Context */ - RtlZeroMemory(&Context, sizeof(CONTEXT)); - Context.ContextFlags = CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS; -#ifdef CONTEXT_EXTENDED_REGISTERS - Context.ContextFlags |= CONTEXT_EXTENDED_REGISTERS; -#endif - KeTrapFrameToContext(TrapFrame, NULL, &Context); - - /* Create ExceptionRecord (assume breakpoint) */ - RtlZeroMemory(&ExceptionRecord, sizeof(EXCEPTION_RECORD64)); - ExceptionRecord.ExceptionCode = STATUS_BREAKPOINT; - - /* Call real function */ - Return = KdbEnterDebuggerException(&ExceptionRecord, - KernelMode, - &Context, - TRUE); - - /* Copy back Context to TrapFrame */ - KeContextToTrapFrame(&Context, NULL, TrapFrame, Context.ContextFlags, KernelMode); - - return Return; -} - VOID NTAPI KdbpGetCommandLineSettings( diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 4424dd4837c..b606d4a5156 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -257,10 +257,6 @@ KdbEnterDebuggerException(IN PEXCEPTION_RECORD64 ExceptionRecord, IN OUT PCONTEXT Context, IN BOOLEAN FirstChance); -KD_CONTINUE_TYPE -KdbEnterDebuggerFirstChanceException( - IN OUT PKTRAP_FRAME TrapFrame); - /* other functions */ NTSTATUS

1 0

[reactos] 01/01: [NOTEPAD] Refactor around _tWinMain (#5135)
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d0ab35e9da0cfa78ffb10… commit d0ab35e9da0cfa78ffb10fd08056bf4a0b454777 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 12 08:26:33 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sun Mar 12 08:26:33 2023 +0900 [NOTEPAD] Refactor around _tWinMain (#5135) - Add hInstance parameter to NOTEPAD_InitData. - Move some code in _tWinMain into NOTEPAD_InitData. - Move some code in _tWinMain into WM_CREATE handling. - Move some code in WM_CLOSE handling into WM_DESTROY handling. - Fix the exit code of _tWinMain. CORE-18837 --- base/applications/notepad/main.c | 86 ++++++++++++++++++++-------------------- 1 file changed, 44 insertions(+), 42 deletions(-) diff --git a/base/applications/notepad/main.c b/base/applications/notepad/main.c index d2d7331db3f..6c3ec3d6d19 100644 --- a/base/applications/notepad/main.c +++ b/base/applications/notepad/main.c @@ -253,12 +253,17 @@ static VOID NOTEPAD_FindTerm(VOID) /*********************************************************************** * Data Initialization */ -static VOID NOTEPAD_InitData(VOID) +static VOID NOTEPAD_InitData(HINSTANCE hInstance) { - LPTSTR p = Globals.szFilter; + LPTSTR p; static const TCHAR txt_files[] = _T("*.txt"); static const TCHAR all_files[] = _T("*.*"); + ZeroMemory(&Globals, sizeof(Globals)); + Globals.hInstance = hInstance; + Globals.encFile = ENCODING_DEFAULT; + + p = Globals.szFilter; p += LoadString(Globals.hInstance, STRING_TEXT_FILES_TXT, p, MAX_STRING_LEN) + 1; _tcscpy(p, txt_files); p += ARRAY_SIZE(txt_files); @@ -340,8 +345,17 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) { case WM_CREATE: + Globals.hMainWnd = hWnd; Globals.hMenu = GetMenu(hWnd); + DragAcceptFiles(hWnd, TRUE); /* Accept Drag & Drop */ + + /* Create controls */ + DoCreateEditWindow(); + DoShowHideStatusBar(); + + DIALOG_FileNew(); /* Initialize file info */ + // For now, the "Help" dialog is disabled due to the lack of HTML Help support EnableMenuItem(Globals.hMenu, CMD_HELP_CONTENTS, MF_BYCOMMAND | MF_GRAYED); break; @@ -354,20 +368,9 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) NOTEPAD_MenuCommand(LOWORD(wParam)); break; - case WM_DESTROYCLIPBOARD: - /*MessageBox(Globals.hMainWnd, "Empty clipboard", "Debug", MB_ICONEXCLAMATION);*/ - break; - case WM_CLOSE: - if (DoCloseFile()) { - if (Globals.hFont) - DeleteObject(Globals.hFont); - if (Globals.hDevMode) - GlobalFree(Globals.hDevMode); - if (Globals.hDevNames) - GlobalFree(Globals.hDevNames); + if (DoCloseFile()) DestroyWindow(hWnd); - } break; case WM_QUERYENDSESSION: @@ -377,6 +380,12 @@ NOTEPAD_WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_DESTROY: + if (Globals.hFont) + DeleteObject(Globals.hFont); + if (Globals.hDevMode) + GlobalFree(Globals.hDevMode); + if (Globals.hDevNames) + GlobalFree(Globals.hDevNames); SetWindowLongPtr(Globals.hEdit, GWLP_WNDPROC, (LONG_PTR)Globals.EditProc); NOTEPAD_SaveSettingsToRegistry(); PostQuitMessage(0); @@ -574,9 +583,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh aFINDMSGSTRING = (ATOM)RegisterWindowMessage(FINDMSGSTRING); - ZeroMemory(&Globals, sizeof(Globals)); - Globals.hInstance = hInstance; - Globals.encFile = ENCODING_DEFAULT; + NOTEPAD_InitData(hInstance); NOTEPAD_LoadSettingsFromRegistry(); ZeroMemory(&wndclass, sizeof(wndclass)); @@ -591,11 +598,14 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh wndclass.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_NPICON), IMAGE_ICON, - 16, - 16, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), 0); - - if (!RegisterClassEx(&wndclass)) return FALSE; + if (!RegisterClassEx(&wndclass)) + { + ShowLastError(); + return 1; + } /* Setup windows */ @@ -608,37 +618,29 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE prev, LPTSTR cmdline, int sh if (!IntersectRect(&rcIntersect, &Globals.main_rect, &info.rcWork)) x = y = CW_USEDEFAULT; - Globals.hMainWnd = CreateWindow(className, - winName, - WS_OVERLAPPEDWINDOW, - x, - y, - Globals.main_rect.right - Globals.main_rect.left, - Globals.main_rect.bottom - Globals.main_rect.top, - NULL, - NULL, - Globals.hInstance, - NULL); + /* Globals.hMainWnd will be set in WM_CREATE handling */ + CreateWindow(className, + winName, + WS_OVERLAPPEDWINDOW, + x, + y, + Globals.main_rect.right - Globals.main_rect.left, + Globals.main_rect.bottom - Globals.main_rect.top, + NULL, + NULL, + Globals.hInstance, + NULL); if (!Globals.hMainWnd) { ShowLastError(); - ExitProcess(1); + return 1; } - DoCreateEditWindow(); - DoShowHideStatusBar(); - - NOTEPAD_InitData(); - DIALOG_FileNew(); - ShowWindow(Globals.hMainWnd, show); UpdateWindow(Globals.hMainWnd); - DragAcceptFiles(Globals.hMainWnd, TRUE); if (!HandleCommandLine(cmdline)) - { return 0; - } hAccel = LoadAccelerators(hInstance, MAKEINTRESOURCE(ID_ACCEL));

1 0

[reactos] 01/01: [NOTEPAD] Move the printing code to the newly added printing.c
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3b0791547f8857110352e… commit 3b0791547f8857110352e1837e8cfbc2c7a93a46 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sun Mar 12 07:51:53 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sun Mar 12 07:51:53 2023 +0900 [NOTEPAD] Move the printing code to the newly added printing.c CORE-18837 --- base/applications/notepad/CMakeLists.txt | 1 + base/applications/notepad/dialog.c | 677 ------------------------------ base/applications/notepad/printing.c | 688 +++++++++++++++++++++++++++++++ 3 files changed, 689 insertions(+), 677 deletions(-) diff --git a/base/applications/notepad/CMakeLists.txt b/base/applications/notepad/CMakeLists.txt index aa1aae6034a..f9a534a70e5 100644 --- a/base/applications/notepad/CMakeLists.txt +++ b/base/applications/notepad/CMakeLists.txt @@ -2,6 +2,7 @@ list(APPEND SOURCE dialog.c main.c + printing.c settings.c text.c notepad.h) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index 3bd835a5011..5c78dadc39a 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -55,8 +55,6 @@ static UINT EncToStrId[] = { STRING_UTF8_BOM }; -static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam); - VOID ShowLastError(VOID) { DWORD error = GetLastError(); @@ -209,17 +207,6 @@ static int AlertFileNotSaved(LPCTSTR szFileName) MB_ICONQUESTION | MB_YESNOCANCEL); } -static void AlertPrintError(void) -{ - TCHAR szUntitled[MAX_STRING_LEN]; - - LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); - - DIALOG_StringMsgBox(Globals.hMainWnd, STRING_PRINTERROR, - Globals.szFileName[0] ? Globals.szFileName : szUntitled, - MB_ICONEXCLAMATION | MB_OK); -} - /** * Returns: * TRUE - if file exists @@ -240,76 +227,6 @@ BOOL HasFileExtension(LPCTSTR szFilename) return _tcsrchr(szFilename, _T('.')) != NULL; } -int GetSelectionTextLength(HWND hWnd) -{ - DWORD dwStart = 0, dwEnd = 0; - SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); - return dwEnd - dwStart; -} - -int GetSelectionText(HWND hWnd, LPTSTR lpString, int nMaxCount) -{ - DWORD dwStart = 0, dwEnd = 0; - INT cchText = GetWindowTextLength(hWnd); - LPTSTR pszText; - HLOCAL hLocal; - HRESULT hr; - - SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); - if (!lpString || dwStart == dwEnd || cchText == 0) - return 0; - - hLocal = (HLOCAL)SendMessage(hWnd, EM_GETHANDLE, 0, 0); - pszText = (LPTSTR)LocalLock(hLocal); - if (!pszText) - return 0; - - hr = StringCchCopyN(lpString, nMaxCount, pszText + dwStart, dwEnd - dwStart); - LocalUnlock(hLocal); - - switch (hr) - { - case S_OK: - return dwEnd - dwStart; - - case STRSAFE_E_INSUFFICIENT_BUFFER: - return nMaxCount - 1; - - default: - return 0; - } -} - -static RECT -GetPrintingRect(IN HDC hdc, IN LPCRECT pMargins) -{ - INT iLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); - INT iLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); - INT iHorzRes = GetDeviceCaps(hdc, HORZRES); /* in pixels */ - INT iVertRes = GetDeviceCaps(hdc, VERTRES); /* in pixels */ - RECT rcPrintRect, rcPhysical; - -#define CONVERT_X(x) MulDiv((x), iLogPixelsX, 2540) /* 100th millimeters to pixels */ -#define CONVERT_Y(y) MulDiv((y), iLogPixelsY, 2540) /* 100th millimeters to pixels */ - SetRect(&rcPrintRect, - CONVERT_X(pMargins->left), CONVERT_Y(pMargins->top), - iHorzRes - CONVERT_X(pMargins->right), - iVertRes - CONVERT_Y(pMargins->bottom)); - - rcPhysical.left = GetDeviceCaps(hdc, PHYSICALOFFSETX); - rcPhysical.right = rcPhysical.left + GetDeviceCaps(hdc, PHYSICALWIDTH); - rcPhysical.top = GetDeviceCaps(hdc, PHYSICALOFFSETY); - rcPhysical.bottom = rcPhysical.top + GetDeviceCaps(hdc, PHYSICALHEIGHT); - - /* Adjust the margin */ - rcPrintRect.left = max(rcPrintRect.left, rcPhysical.left); - rcPrintRect.top = max(rcPrintRect.top, rcPhysical.top); - rcPrintRect.right = min(rcPrintRect.right, rcPhysical.right); - rcPrintRect.bottom = min(rcPrintRect.bottom, rcPhysical.bottom); - - return rcPrintRect; -} - static BOOL DoSaveFile(VOID) { BOOL bRet = FALSE; @@ -619,527 +536,6 @@ BOOL DIALOG_FileSaveAs(VOID) } } -/* Convert the points into pixels */ -#define X_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSX), 72) -#define Y_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSY), 72) - -/* - * See also: - * https://support.microsoft.com/en-us/windows/changing-header-and-footer-comm… - */ -static VOID -DrawHeaderOrFooter(HDC hDC, LPRECT pRect, LPCTSTR pszFormat, INT nPageNo, const SYSTEMTIME *pstNow) -{ - TCHAR szText[256], szField[128]; - const TCHAR *pchFormat; - UINT uAlign = DT_CENTER, uFlags = DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX; - HGDIOBJ hOldPen, hOldBrush; - - /* Draw a rectangle */ - hOldPen = SelectObject(hDC, GetStockObject(BLACK_PEN)); - hOldBrush = SelectObject(hDC, GetStockObject(NULL_BRUSH)); - Rectangle(hDC, pRect->left, pRect->top, pRect->right, pRect->bottom); - SelectObject(hDC, hOldBrush); - SelectObject(hDC, hOldPen); - - InflateRect(pRect, -X_POINTS_TO_PIXELS(hDC, 3), 0); /* Shrink 3pt */ - - szText[0] = 0; - - for (pchFormat = pszFormat; *pchFormat; ++pchFormat) - { - if (*pchFormat != _T('&')) - { - StringCchCatN(szText, ARRAY_SIZE(szText), pchFormat, 1); - continue; - } - - ++pchFormat; - if (*pchFormat == 0) - break; - - switch (_totupper(*pchFormat)) /* Make it uppercase */ - { - case _T('&'): /* Found double ampersand */ - StringCchCat(szText, ARRAY_SIZE(szText), TEXT("&")); - break; - - case _T('L'): /* Left */ - DrawText(hDC, szText, -1, pRect, uAlign | uFlags); - szText[0] = 0; - uAlign = DT_LEFT; - break; - - case _T('C'): /* Center */ - DrawText(hDC, szText, -1, pRect, uAlign | uFlags); - szText[0] = 0; - uAlign = DT_CENTER; - break; - - case _T('R'): /* Right */ - DrawText(hDC, szText, -1, pRect, uAlign | uFlags); - szText[0] = 0; - uAlign = DT_RIGHT; - break; - - case _T('D'): /* Date */ - GetDateFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, - szField, (INT)ARRAY_SIZE(szField)); - StringCchCat(szText, ARRAY_SIZE(szText), szField); - break; - - case _T('T'): /* Time */ - GetTimeFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, - szField, (INT)ARRAY_SIZE(szField)); - StringCchCat(szText, ARRAY_SIZE(szText), szField); - break; - - case _T('F'): /* Filename */ - StringCchCat(szText, ARRAY_SIZE(szText), Globals.szFileTitle); - break; - - case _T('P'): /* Page number */ - StringCchPrintf(szField, ARRAY_SIZE(szField), TEXT("%u"), nPageNo); - StringCchCat(szText, ARRAY_SIZE(szText), szField); - break; - - default: /* Otherwise */ - szField[0] = _T('&'); - szField[1] = *pchFormat; - szField[2] = 0; - StringCchCat(szText, ARRAY_SIZE(szText), szField); - break; - } - } - - DrawText(hDC, szText, -1, pRect, uAlign | uFlags); -} - -typedef struct -{ - PRINTDLG printer; - HWND hwndDlg; - INT status; - INT currentPage; - RECT printRect; - SYSTEMTIME stNow; - HFONT hHeaderFont; - HFONT hBodyFont; - LPTSTR pszText; - DWORD ich; - DWORD cchText; - INT cyHeader; - INT cySpacing; - INT cyFooter; -} PRINT_DATA, *PPRINT_DATA; - -static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) -{ - LPPRINTDLG pPrinter = &pData->printer; - RECT printRect = pData->printRect; - INT xLeft = printRect.left, yTop = printRect.top + pData->cyHeader + pData->cySpacing; - INT xStart, tabWidth; - DWORD ichStart; - SIZE charMetrics; - TEXTMETRIC tmText; - - /* Calculate a tab width */ -#define TAB_STOP 8 - GetTextMetrics(pPrinter->hDC, &tmText); - tabWidth = TAB_STOP * tmText.tmAveCharWidth; - -#define DO_FLUSH() do { \ - if (ichStart < pData->ich && !bSkipPage) { \ - TextOut(pPrinter->hDC, xStart, yTop, &pData->pszText[ichStart], pData->ich - ichStart); \ - } \ - ichStart = pData->ich; \ - xStart = xLeft; \ - if (pData->status == STRING_PRINTCANCELING) return FALSE; \ -} while (0) - - /* The drawing-body loop */ - for (ichStart = pData->ich, xStart = xLeft; pData->ich < pData->cchText; ) - { - TCHAR ch = pData->pszText[pData->ich]; - - if (ch == _T('\r')) - { - DO_FLUSH(); - - pData->ich++; /* Next char */ - ichStart = pData->ich; - continue; - } - - if (ch == _T('\n')) - { - DO_FLUSH(); - - /* Next line */ - yTop += tmText.tmHeight; - xLeft = xStart = printRect.left; - } - else - { - if (ch == _T('\t')) - { - INT nStepWidth = tabWidth - ((xLeft - printRect.left) % tabWidth); - - DO_FLUSH(); - - /* Go to the next tab stop */ - xLeft += nStepWidth; - xStart = xLeft; - } - else /* Normal char */ - { - GetTextExtentPoint32(pPrinter->hDC, &ch, 1, &charMetrics); - xLeft += charMetrics.cx; - } - - /* Insert a line break if the next position reached the right edge */ - if (xLeft + charMetrics.cx >= printRect.right) - { - if (ch != _T('\t')) - DO_FLUSH(); - - /* Next line */ - yTop += tmText.tmHeight; - xLeft = xStart = printRect.left; - } - } - - pData->ich++; /* Next char */ - if (ch == _T('\t') || ch == _T('\n')) - ichStart = pData->ich; - - if (yTop + tmText.tmHeight >= printRect.bottom - pData->cyFooter) - break; /* The next line reached the body bottom */ - } - - DO_FLUSH(); - return TRUE; -} - -static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) -{ - LPPRINTDLG pPrinter = &pData->printer; - BOOL bSkipPage, ret; - HFONT hOldFont; - - /* Should we skip this page? */ - bSkipPage = !(pPrinter->Flags & PD_SELECTION) && - (pPrinter->Flags & PD_PAGENUMS) && - !(pPrinter->nFromPage <= PageCount && PageCount <= pPrinter->nToPage); - - /* The prologue of a page */ - if (!bSkipPage) - { - if (StartPage(pPrinter->hDC) <= 0) - { - pData->status = STRING_PRINTFAILED; - return FALSE; - } - - if (pData->cyHeader > 0) - { - /* Draw the page header */ - RECT rc = pData->printRect; - rc.bottom = rc.top + pData->cyHeader; - - hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); - DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szHeader, PageCount, &pData->stNow); - SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ - } - } - - hOldFont = SelectObject(pPrinter->hDC, pData->hBodyFont); - ret = DoPrintBody(pData, PageCount, bSkipPage); - SelectObject(pPrinter->hDC, hOldFont); - if (!ret) - return FALSE; /* Canceled */ - - /* The epilogue of a page */ - if (!bSkipPage) - { - if (pData->cyFooter > 0) - { - /* Draw the page footer */ - RECT rc = pData->printRect; - rc.top = rc.bottom - pData->cyFooter; - - hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); - DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szFooter, PageCount, &pData->stNow); - SelectObject(pPrinter->hDC, hOldFont); - } - - if (EndPage(pPrinter->hDC) <= 0) - { - pData->status = STRING_PRINTFAILED; - return FALSE; - } - } - - return TRUE; -} - -#define BODY_FONT_SIZE 10 /* 10pt */ -#define HEADER_FONT_SIZE 9 /* 9pt */ -#define SPACING_HEIGHT 4 /* 4pt */ -#define PRINTING_MESSAGE (WM_USER + 100) - -static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) -{ - LOGFONT lfBody, lfHeader; - - /* Create the main text font for printing */ - lfBody = Globals.lfFont; - lfBody.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, BODY_FONT_SIZE); - pPrintData->hBodyFont = CreateFontIndirect(&lfBody); - if (pPrintData->hBodyFont == NULL) - return FALSE; - - /* Create the header/footer font */ - lfHeader = Globals.lfFont; - lfHeader.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, HEADER_FONT_SIZE); - lfHeader.lfWeight = FW_BOLD; - pPrintData->hHeaderFont = CreateFontIndirect(&lfHeader); - if (pPrintData->hHeaderFont == NULL) - return FALSE; - - return TRUE; -} - -static BOOL DoPrintDocument(PPRINT_DATA printData) -{ - DOCINFO docInfo; - LPPRINTDLG pPrinter = &printData->printer; - DWORD CopyCount, PageCount; - TEXTMETRIC tmHeader; - BOOL ret = FALSE; - HFONT hOldFont; - - GetLocalTime(&printData->stNow); - - printData->printRect = GetPrintingRect(pPrinter->hDC, &Globals.lMargins); - - if (!DoCreatePrintFonts(pPrinter, printData)) - { - printData->status = STRING_PRINTFAILED; - goto Quit; - } - - if (pPrinter->Flags & PD_SELECTION) - printData->cchText = GetSelectionTextLength(Globals.hEdit); - else - printData->cchText = GetWindowTextLength(Globals.hEdit); - - /* Allocate a buffer for the text */ - printData->pszText = HeapAlloc(GetProcessHeap(), 0, (printData->cchText + 1) * sizeof(TCHAR)); - if (!printData->pszText) - { - printData->status = STRING_PRINTFAILED; - goto Quit; - } - - if (pPrinter->Flags & PD_SELECTION) - GetSelectionText(Globals.hEdit, printData->pszText, printData->cchText + 1); - else - GetWindowText(Globals.hEdit, printData->pszText, printData->cchText + 1); - - /* Start a document */ - ZeroMemory(&docInfo, sizeof(docInfo)); - docInfo.cbSize = sizeof(DOCINFO); - docInfo.lpszDocName = Globals.szFileTitle; - if (StartDoc(pPrinter->hDC, &docInfo) <= 0) - { - printData->status = STRING_PRINTFAILED; - goto Quit; - } - - /* Calculate the header and footer heights */ - hOldFont = SelectObject(pPrinter->hDC, printData->hHeaderFont); - GetTextMetrics(pPrinter->hDC, &tmHeader); - printData->cyHeader = printData->cyFooter = 2 * tmHeader.tmHeight; - printData->cySpacing = Y_POINTS_TO_PIXELS(pPrinter->hDC, SPACING_HEIGHT); - SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ - if (!Globals.szHeader[0]) - printData->cyHeader = printData->cySpacing = 0; - if (!Globals.szFooter[0]) - printData->cyFooter = 0; - - /* The printing-copies loop */ - for (CopyCount = 1; CopyCount <= pPrinter->nCopies; ++CopyCount) - { - /* The printing-pages loop */ - for (PageCount = 1, printData->ich = 0; printData->ich < printData->cchText; ++PageCount) - { - printData->currentPage = PageCount; - PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); - - if (!DoPrintPage(printData, PageCount)) - { - AbortDoc(pPrinter->hDC); /* Cancel printing */ - goto Quit; - } - } - } - - if (EndDoc(pPrinter->hDC) <= 0) - { - printData->status = STRING_PRINTFAILED; - goto Quit; - } - - ret = TRUE; - printData->status = STRING_PRINTCOMPLETE; - -Quit: - DeleteObject(printData->hHeaderFont); - DeleteObject(printData->hBodyFont); - if (printData->pszText) - HeapFree(GetProcessHeap(), 0, printData->pszText); - if (printData->status == STRING_PRINTCANCELING) - printData->status = STRING_PRINTCANCELED; - PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); - return ret; -} - -static DWORD WINAPI PrintThreadFunc(LPVOID arg) -{ - PPRINT_DATA pData = arg; - pData->currentPage = 1; - pData->status = STRING_NOWPRINTING; - PostMessage(pData->hwndDlg, PRINTING_MESSAGE, 0, 0); - return DoPrintDocument(pData); -} - -static INT_PTR CALLBACK -DIALOG_Printing_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) -{ - TCHAR szText[MAX_STRING_LEN]; - static TCHAR s_szPage[64]; - static PPRINT_DATA s_pData = NULL; - static HANDLE s_hThread = NULL; - - switch (uMsg) - { - case WM_INITDIALOG: - s_pData = (PPRINT_DATA)lParam; - s_pData->hwndDlg = hwnd; - SetDlgItemText(hwnd, IDC_PRINTING_FILENAME, Globals.szFileTitle); - GetDlgItemText(hwnd, IDC_PRINTING_PAGE, s_szPage, ARRAY_SIZE(s_szPage)); - SetDlgItemText(hwnd, IDC_PRINTING_PAGE, NULL); - - s_hThread = CreateThread(NULL, 0, PrintThreadFunc, s_pData, 0, NULL); - if (!s_hThread) - { - s_pData->status = STRING_PRINTFAILED; - EndDialog(hwnd, IDABORT); - } - return TRUE; - - case PRINTING_MESSAGE: - switch (s_pData->status) - { - case STRING_NOWPRINTING: - case STRING_PRINTCANCELING: - StringCchPrintf(szText, ARRAY_SIZE(szText), s_szPage, s_pData->currentPage); - SetDlgItemText(hwnd, IDC_PRINTING_PAGE, szText); - - LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); - SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); - break; - - case STRING_PRINTCOMPLETE: - case STRING_PRINTCANCELED: - case STRING_PRINTFAILED: - LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); - SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); - - if (s_pData->status == STRING_PRINTCOMPLETE) - EndDialog(hwnd, IDOK); - else if (s_pData->status == STRING_PRINTFAILED) - EndDialog(hwnd, IDABORT); - else - EndDialog(hwnd, IDCANCEL); - break; - } - break; - - case WM_COMMAND: - if (LOWORD(wParam) == IDCANCEL && s_pData->status == STRING_NOWPRINTING) - { - EnableWindow(GetDlgItem(hwnd, IDCANCEL), FALSE); - s_pData->status = STRING_PRINTCANCELING; - PostMessage(hwnd, PRINTING_MESSAGE, 0, 0); - } - break; - - case WM_DESTROY: - if (s_hThread) - CloseHandle(s_hThread); - DeleteDC(s_pData->printer.hDC); - s_pData = LocalFree(s_pData); - break; - } - - return 0; -} - -VOID DIALOG_FilePrint(VOID) -{ - BOOL ret; - LPPRINTDLG printer; - PPRINT_DATA printData = LocalAlloc(LPTR, sizeof(PRINT_DATA)); - if (!printData) - { - ShowLastError(); - return; - } - - printer = &printData->printer; - printer->lStructSize = sizeof(PRINTDLG); - printer->hwndOwner = Globals.hMainWnd; - printer->Flags = PD_RETURNDC | PD_SELECTION; - - /* Disable the selection radio button if there is no text selected */ - if (!GetSelectionTextLength(Globals.hEdit)) - printer->Flags |= PD_NOSELECTION; - - printer->nFromPage = 1; - printer->nToPage = MAXWORD; - printer->nMinPage = 1; - printer->nMaxPage = MAXWORD; - - printer->hDevMode = Globals.hDevMode; - printer->hDevNames = Globals.hDevNames; - - ret = PrintDlg(printer); - /* NOTE: Even if PrintDlg returns FALSE, hDevMode and hDevNames may have changed. */ - Globals.hDevMode = printer->hDevMode; - Globals.hDevNames = printer->hDevNames; - - if (!ret) - { - LocalFree(printData); - return; /* The user canceled printing */ - } - assert(printer->hDC != NULL); - - /* Ensure that each logical unit maps to one pixel */ - SetMapMode(printer->hDC, MM_TEXT); - - if (DialogBoxParam(Globals.hInstance, - MAKEINTRESOURCE(DIALOG_PRINTING), - Globals.hMainWnd, - DIALOG_Printing_DialogProc, - (LPARAM)printer) == IDABORT) - { - AlertPrintError(); - } -} - VOID DIALOG_FileExit(VOID) { PostMessage(Globals.hMainWnd, WM_CLOSE, 0, 0); @@ -1525,76 +921,3 @@ VOID DIALOG_HelpAboutNotepad(VOID) ShellAbout(Globals.hMainWnd, szNotepad, szNotepadAuthors, notepadIcon); DestroyIcon(notepadIcon); } - -/*********************************************************************** - * DIALOG_FilePageSetup - */ -VOID DIALOG_FilePageSetup(void) -{ - PAGESETUPDLG page; - - ZeroMemory(&page, sizeof(page)); - page.lStructSize = sizeof(page); - page.hwndOwner = Globals.hMainWnd; - page.Flags = PSD_ENABLEPAGESETUPTEMPLATE | PSD_ENABLEPAGESETUPHOOK | PSD_MARGINS; - page.hInstance = Globals.hInstance; - page.rtMargin = Globals.lMargins; - page.hDevMode = Globals.hDevMode; - page.hDevNames = Globals.hDevNames; - page.lpPageSetupTemplateName = MAKEINTRESOURCE(DIALOG_PAGESETUP); - page.lpfnPageSetupHook = DIALOG_PAGESETUP_Hook; - - PageSetupDlg(&page); - - /* NOTE: Even if PageSetupDlg returns FALSE, the following members may have changed */ - Globals.hDevMode = page.hDevMode; - Globals.hDevNames = page.hDevNames; - Globals.lMargins = page.rtMargin; -} - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * DIALOG_PAGESETUP_Hook - */ -static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_COMMAND: - if (HIWORD(wParam) == BN_CLICKED) - { - switch (LOWORD(wParam)) - { - case IDOK: - /* save user input and close dialog */ - GetDlgItemText(hDlg, 0x141, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); - GetDlgItemText(hDlg, 0x143, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); - return FALSE; - - case IDCANCEL: - /* discard user input and close dialog */ - return FALSE; - - case IDHELP: - { - /* FIXME: Bring this to work */ - static const TCHAR sorry[] = _T("Sorry, no help available"); - static const TCHAR help[] = _T("Help"); - MessageBox(Globals.hMainWnd, sorry, help, MB_ICONEXCLAMATION); - return TRUE; - } - - default: - break; - } - } - break; - - case WM_INITDIALOG: - /* fetch last user input prior to display dialog */ - SetDlgItemText(hDlg, 0x141, Globals.szHeader); - SetDlgItemText(hDlg, 0x143, Globals.szFooter); - break; - } - - return FALSE; -} diff --git a/base/applications/notepad/printing.c b/base/applications/notepad/printing.c new file mode 100644 index 00000000000..7040ec3498f --- /dev/null +++ b/base/applications/notepad/printing.c @@ -0,0 +1,688 @@ +/* + * PROJECT: ReactOS Notepad + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Providing a Windows-compatible simple text editor for ReactOS + * COPYRIGHT: Copyright 2020-2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "notepad.h" + +#include <strsafe.h> +#include <assert.h> + +static VOID AlertPrintError(VOID) +{ + TCHAR szUntitled[MAX_STRING_LEN]; + + LoadString(Globals.hInstance, STRING_UNTITLED, szUntitled, ARRAY_SIZE(szUntitled)); + + DIALOG_StringMsgBox(Globals.hMainWnd, STRING_PRINTERROR, + Globals.szFileName[0] ? Globals.szFileName : szUntitled, + MB_ICONEXCLAMATION | MB_OK); +} + +static RECT +GetPrintingRect(IN HDC hdc, IN LPCRECT pMargins) +{ + INT iLogPixelsX = GetDeviceCaps(hdc, LOGPIXELSX); + INT iLogPixelsY = GetDeviceCaps(hdc, LOGPIXELSY); + INT iHorzRes = GetDeviceCaps(hdc, HORZRES); /* in pixels */ + INT iVertRes = GetDeviceCaps(hdc, VERTRES); /* in pixels */ + RECT rcPrintRect, rcPhysical; + +#define CONVERT_X(x) MulDiv((x), iLogPixelsX, 2540) /* 100th millimeters to pixels */ +#define CONVERT_Y(y) MulDiv((y), iLogPixelsY, 2540) /* 100th millimeters to pixels */ + SetRect(&rcPrintRect, + CONVERT_X(pMargins->left), CONVERT_Y(pMargins->top), + iHorzRes - CONVERT_X(pMargins->right), + iVertRes - CONVERT_Y(pMargins->bottom)); + + rcPhysical.left = GetDeviceCaps(hdc, PHYSICALOFFSETX); + rcPhysical.right = rcPhysical.left + GetDeviceCaps(hdc, PHYSICALWIDTH); + rcPhysical.top = GetDeviceCaps(hdc, PHYSICALOFFSETY); + rcPhysical.bottom = rcPhysical.top + GetDeviceCaps(hdc, PHYSICALHEIGHT); + + /* Adjust the margin */ + rcPrintRect.left = max(rcPrintRect.left, rcPhysical.left); + rcPrintRect.top = max(rcPrintRect.top, rcPhysical.top); + rcPrintRect.right = min(rcPrintRect.right, rcPhysical.right); + rcPrintRect.bottom = min(rcPrintRect.bottom, rcPhysical.bottom); + + return rcPrintRect; +} + +static INT GetSelectionTextLength(HWND hWnd) +{ + DWORD dwStart = 0, dwEnd = 0; + SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + return dwEnd - dwStart; +} + +static INT GetSelectionText(HWND hWnd, LPTSTR lpString, INT nMaxCount) +{ + DWORD dwStart = 0, dwEnd = 0; + INT cchText = GetWindowTextLength(hWnd); + LPTSTR pszText; + HLOCAL hLocal; + HRESULT hr; + + SendMessage(hWnd, EM_GETSEL, (WPARAM)&dwStart, (LPARAM)&dwEnd); + if (!lpString || dwStart == dwEnd || cchText == 0) + return 0; + + hLocal = (HLOCAL)SendMessage(hWnd, EM_GETHANDLE, 0, 0); + pszText = (LPTSTR)LocalLock(hLocal); + if (!pszText) + return 0; + + hr = StringCchCopyN(lpString, nMaxCount, pszText + dwStart, dwEnd - dwStart); + LocalUnlock(hLocal); + + switch (hr) + { + case S_OK: + return dwEnd - dwStart; + + case STRSAFE_E_INSUFFICIENT_BUFFER: + return nMaxCount - 1; + + default: + return 0; + } +} + +typedef struct +{ + PRINTDLG printer; + HWND hwndDlg; + INT status; + INT currentPage; + RECT printRect; + SYSTEMTIME stNow; + HFONT hHeaderFont; + HFONT hBodyFont; + LPTSTR pszText; + DWORD ich; + DWORD cchText; + INT cyHeader; + INT cySpacing; + INT cyFooter; +} PRINT_DATA, *PPRINT_DATA; + +/* Convert the points into pixels */ +#define X_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSX), 72) +#define Y_POINTS_TO_PIXELS(hDC, points) MulDiv((points), GetDeviceCaps((hDC), LOGPIXELSY), 72) + +/* + * See also: + * https://support.microsoft.com/en-us/windows/changing-header-and-footer-comm… + */ +static VOID +DrawHeaderOrFooter(HDC hDC, LPRECT pRect, LPCTSTR pszFormat, INT nPageNo, const SYSTEMTIME *pstNow) +{ + TCHAR szText[256], szField[128]; + const TCHAR *pchFormat; + UINT uAlign = DT_CENTER, uFlags = DT_SINGLELINE | DT_VCENTER | DT_NOPREFIX; + HGDIOBJ hOldPen, hOldBrush; + + /* Draw a rectangle */ + hOldPen = SelectObject(hDC, GetStockObject(BLACK_PEN)); + hOldBrush = SelectObject(hDC, GetStockObject(NULL_BRUSH)); + Rectangle(hDC, pRect->left, pRect->top, pRect->right, pRect->bottom); + SelectObject(hDC, hOldBrush); + SelectObject(hDC, hOldPen); + + InflateRect(pRect, -X_POINTS_TO_PIXELS(hDC, 3), 0); /* Shrink 3pt */ + + szText[0] = 0; + + for (pchFormat = pszFormat; *pchFormat; ++pchFormat) + { + if (*pchFormat != _T('&')) + { + StringCchCatN(szText, ARRAY_SIZE(szText), pchFormat, 1); + continue; + } + + ++pchFormat; + if (*pchFormat == 0) + break; + + switch (_totupper(*pchFormat)) /* Make it uppercase */ + { + case _T('&'): /* Found double ampersand */ + StringCchCat(szText, ARRAY_SIZE(szText), TEXT("&")); + break; + + case _T('L'): /* Left */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_LEFT; + break; + + case _T('C'): /* Center */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_CENTER; + break; + + case _T('R'): /* Right */ + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); + szText[0] = 0; + uAlign = DT_RIGHT; + break; + + case _T('D'): /* Date */ + GetDateFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, + szField, (INT)ARRAY_SIZE(szField)); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + + case _T('T'): /* Time */ + GetTimeFormat(LOCALE_USER_DEFAULT, 0, pstNow, NULL, + szField, (INT)ARRAY_SIZE(szField)); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + + case _T('F'): /* Filename */ + StringCchCat(szText, ARRAY_SIZE(szText), Globals.szFileTitle); + break; + + case _T('P'): /* Page number */ + StringCchPrintf(szField, ARRAY_SIZE(szField), TEXT("%u"), nPageNo); + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + + default: /* Otherwise */ + szField[0] = _T('&'); + szField[1] = *pchFormat; + szField[2] = 0; + StringCchCat(szText, ARRAY_SIZE(szText), szField); + break; + } + } + + DrawText(hDC, szText, -1, pRect, uAlign | uFlags); +} + +static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) +{ + LPPRINTDLG pPrinter = &pData->printer; + RECT printRect = pData->printRect; + INT xLeft = printRect.left, yTop = printRect.top + pData->cyHeader + pData->cySpacing; + INT xStart, tabWidth; + DWORD ichStart; + SIZE charMetrics; + TEXTMETRIC tmText; + + /* Calculate a tab width */ +#define TAB_STOP 8 + GetTextMetrics(pPrinter->hDC, &tmText); + tabWidth = TAB_STOP * tmText.tmAveCharWidth; + +#define DO_FLUSH() do { \ + if (ichStart < pData->ich && !bSkipPage) { \ + TextOut(pPrinter->hDC, xStart, yTop, &pData->pszText[ichStart], pData->ich - ichStart); \ + } \ + ichStart = pData->ich; \ + xStart = xLeft; \ + if (pData->status == STRING_PRINTCANCELING) return FALSE; \ +} while (0) + + /* The drawing-body loop */ + for (ichStart = pData->ich, xStart = xLeft; pData->ich < pData->cchText; ) + { + TCHAR ch = pData->pszText[pData->ich]; + + if (ch == _T('\r')) + { + DO_FLUSH(); + + pData->ich++; /* Next char */ + ichStart = pData->ich; + continue; + } + + if (ch == _T('\n')) + { + DO_FLUSH(); + + /* Next line */ + yTop += tmText.tmHeight; + xLeft = xStart = printRect.left; + } + else + { + if (ch == _T('\t')) + { + INT nStepWidth = tabWidth - ((xLeft - printRect.left) % tabWidth); + + DO_FLUSH(); + + /* Go to the next tab stop */ + xLeft += nStepWidth; + xStart = xLeft; + } + else /* Normal char */ + { + GetTextExtentPoint32(pPrinter->hDC, &ch, 1, &charMetrics); + xLeft += charMetrics.cx; + } + + /* Insert a line break if the next position reached the right edge */ + if (xLeft + charMetrics.cx >= printRect.right) + { + if (ch != _T('\t')) + DO_FLUSH(); + + /* Next line */ + yTop += tmText.tmHeight; + xLeft = xStart = printRect.left; + } + } + + pData->ich++; /* Next char */ + if (ch == _T('\t') || ch == _T('\n')) + ichStart = pData->ich; + + if (yTop + tmText.tmHeight >= printRect.bottom - pData->cyFooter) + break; /* The next line reached the body bottom */ + } + + DO_FLUSH(); + return TRUE; +} + +static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) +{ + LPPRINTDLG pPrinter = &pData->printer; + BOOL bSkipPage, ret; + HFONT hOldFont; + + /* Should we skip this page? */ + bSkipPage = !(pPrinter->Flags & PD_SELECTION) && + (pPrinter->Flags & PD_PAGENUMS) && + !(pPrinter->nFromPage <= PageCount && PageCount <= pPrinter->nToPage); + + /* The prologue of a page */ + if (!bSkipPage) + { + if (StartPage(pPrinter->hDC) <= 0) + { + pData->status = STRING_PRINTFAILED; + return FALSE; + } + + if (pData->cyHeader > 0) + { + /* Draw the page header */ + RECT rc = pData->printRect; + rc.bottom = rc.top + pData->cyHeader; + + hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); + DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szHeader, PageCount, &pData->stNow); + SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ + } + } + + hOldFont = SelectObject(pPrinter->hDC, pData->hBodyFont); + ret = DoPrintBody(pData, PageCount, bSkipPage); + SelectObject(pPrinter->hDC, hOldFont); + if (!ret) + return FALSE; /* Canceled */ + + /* The epilogue of a page */ + if (!bSkipPage) + { + if (pData->cyFooter > 0) + { + /* Draw the page footer */ + RECT rc = pData->printRect; + rc.top = rc.bottom - pData->cyFooter; + + hOldFont = SelectObject(pPrinter->hDC, pData->hHeaderFont); + DrawHeaderOrFooter(pPrinter->hDC, &rc, Globals.szFooter, PageCount, &pData->stNow); + SelectObject(pPrinter->hDC, hOldFont); + } + + if (EndPage(pPrinter->hDC) <= 0) + { + pData->status = STRING_PRINTFAILED; + return FALSE; + } + } + + return TRUE; +} + +#define BODY_FONT_SIZE 10 /* 10pt */ +#define HEADER_FONT_SIZE 9 /* 9pt */ +#define SPACING_HEIGHT 4 /* 4pt */ +#define PRINTING_MESSAGE (WM_USER + 100) + +static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) +{ + LOGFONT lfBody, lfHeader; + + /* Create the main text font for printing */ + lfBody = Globals.lfFont; + lfBody.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, BODY_FONT_SIZE); + pPrintData->hBodyFont = CreateFontIndirect(&lfBody); + if (pPrintData->hBodyFont == NULL) + return FALSE; + + /* Create the header/footer font */ + lfHeader = Globals.lfFont; + lfHeader.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, HEADER_FONT_SIZE); + lfHeader.lfWeight = FW_BOLD; + pPrintData->hHeaderFont = CreateFontIndirect(&lfHeader); + if (pPrintData->hHeaderFont == NULL) + return FALSE; + + return TRUE; +} + +static BOOL DoPrintDocument(PPRINT_DATA printData) +{ + DOCINFO docInfo; + LPPRINTDLG pPrinter = &printData->printer; + DWORD CopyCount, PageCount; + TEXTMETRIC tmHeader; + BOOL ret = FALSE; + HFONT hOldFont; + + GetLocalTime(&printData->stNow); + + printData->printRect = GetPrintingRect(pPrinter->hDC, &Globals.lMargins); + + if (!DoCreatePrintFonts(pPrinter, printData)) + { + printData->status = STRING_PRINTFAILED; + goto Quit; + } + + if (pPrinter->Flags & PD_SELECTION) + printData->cchText = GetSelectionTextLength(Globals.hEdit); + else + printData->cchText = GetWindowTextLength(Globals.hEdit); + + /* Allocate a buffer for the text */ + printData->pszText = HeapAlloc(GetProcessHeap(), 0, (printData->cchText + 1) * sizeof(TCHAR)); + if (!printData->pszText) + { + printData->status = STRING_PRINTFAILED; + goto Quit; + } + + if (pPrinter->Flags & PD_SELECTION) + GetSelectionText(Globals.hEdit, printData->pszText, printData->cchText + 1); + else + GetWindowText(Globals.hEdit, printData->pszText, printData->cchText + 1); + + /* Start a document */ + ZeroMemory(&docInfo, sizeof(docInfo)); + docInfo.cbSize = sizeof(DOCINFO); + docInfo.lpszDocName = Globals.szFileTitle; + if (StartDoc(pPrinter->hDC, &docInfo) <= 0) + { + printData->status = STRING_PRINTFAILED; + goto Quit; + } + + /* Calculate the header and footer heights */ + hOldFont = SelectObject(pPrinter->hDC, printData->hHeaderFont); + GetTextMetrics(pPrinter->hDC, &tmHeader); + printData->cyHeader = printData->cyFooter = 2 * tmHeader.tmHeight; + printData->cySpacing = Y_POINTS_TO_PIXELS(pPrinter->hDC, SPACING_HEIGHT); + SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ + if (!Globals.szHeader[0]) + printData->cyHeader = printData->cySpacing = 0; + if (!Globals.szFooter[0]) + printData->cyFooter = 0; + + /* The printing-copies loop */ + for (CopyCount = 1; CopyCount <= pPrinter->nCopies; ++CopyCount) + { + /* The printing-pages loop */ + for (PageCount = 1, printData->ich = 0; printData->ich < printData->cchText; ++PageCount) + { + printData->currentPage = PageCount; + PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); + + if (!DoPrintPage(printData, PageCount)) + { + AbortDoc(pPrinter->hDC); /* Cancel printing */ + goto Quit; + } + } + } + + if (EndDoc(pPrinter->hDC) <= 0) + { + printData->status = STRING_PRINTFAILED; + goto Quit; + } + + ret = TRUE; + printData->status = STRING_PRINTCOMPLETE; + +Quit: + DeleteObject(printData->hHeaderFont); + DeleteObject(printData->hBodyFont); + if (printData->pszText) + HeapFree(GetProcessHeap(), 0, printData->pszText); + if (printData->status == STRING_PRINTCANCELING) + printData->status = STRING_PRINTCANCELED; + PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); + return ret; +} + +static DWORD WINAPI PrintThreadFunc(LPVOID arg) +{ + PPRINT_DATA pData = arg; + pData->currentPage = 1; + pData->status = STRING_NOWPRINTING; + PostMessage(pData->hwndDlg, PRINTING_MESSAGE, 0, 0); + return DoPrintDocument(pData); +} + +static INT_PTR CALLBACK +DIALOG_Printing_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + TCHAR szText[MAX_STRING_LEN]; + static TCHAR s_szPage[64]; + static PPRINT_DATA s_pData = NULL; + static HANDLE s_hThread = NULL; + + switch (uMsg) + { + case WM_INITDIALOG: + s_pData = (PPRINT_DATA)lParam; + s_pData->hwndDlg = hwnd; + SetDlgItemText(hwnd, IDC_PRINTING_FILENAME, Globals.szFileTitle); + GetDlgItemText(hwnd, IDC_PRINTING_PAGE, s_szPage, ARRAY_SIZE(s_szPage)); + SetDlgItemText(hwnd, IDC_PRINTING_PAGE, NULL); + + s_hThread = CreateThread(NULL, 0, PrintThreadFunc, s_pData, 0, NULL); + if (!s_hThread) + { + s_pData->status = STRING_PRINTFAILED; + EndDialog(hwnd, IDABORT); + } + return TRUE; + + case PRINTING_MESSAGE: + switch (s_pData->status) + { + case STRING_NOWPRINTING: + case STRING_PRINTCANCELING: + StringCchPrintf(szText, ARRAY_SIZE(szText), s_szPage, s_pData->currentPage); + SetDlgItemText(hwnd, IDC_PRINTING_PAGE, szText); + + LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); + SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); + break; + + case STRING_PRINTCOMPLETE: + case STRING_PRINTCANCELED: + case STRING_PRINTFAILED: + LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); + SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); + + if (s_pData->status == STRING_PRINTCOMPLETE) + EndDialog(hwnd, IDOK); + else if (s_pData->status == STRING_PRINTFAILED) + EndDialog(hwnd, IDABORT); + else + EndDialog(hwnd, IDCANCEL); + break; + } + break; + + case WM_COMMAND: + if (LOWORD(wParam) == IDCANCEL && s_pData->status == STRING_NOWPRINTING) + { + EnableWindow(GetDlgItem(hwnd, IDCANCEL), FALSE); + s_pData->status = STRING_PRINTCANCELING; + PostMessage(hwnd, PRINTING_MESSAGE, 0, 0); + } + break; + + case WM_DESTROY: + if (s_hThread) + CloseHandle(s_hThread); + DeleteDC(s_pData->printer.hDC); + s_pData = LocalFree(s_pData); + break; + } + + return 0; +} + +VOID DIALOG_FilePrint(VOID) +{ + BOOL ret; + LPPRINTDLG printer; + PPRINT_DATA printData = LocalAlloc(LPTR, sizeof(PRINT_DATA)); + if (!printData) + { + ShowLastError(); + return; + } + + printer = &printData->printer; + printer->lStructSize = sizeof(PRINTDLG); + printer->hwndOwner = Globals.hMainWnd; + printer->Flags = PD_RETURNDC | PD_SELECTION; + + /* Disable the selection radio button if there is no text selected */ + if (!GetSelectionTextLength(Globals.hEdit)) + printer->Flags |= PD_NOSELECTION; + + printer->nFromPage = 1; + printer->nToPage = MAXWORD; + printer->nMinPage = 1; + printer->nMaxPage = MAXWORD; + + printer->hDevMode = Globals.hDevMode; + printer->hDevNames = Globals.hDevNames; + + ret = PrintDlg(printer); + /* NOTE: Even if PrintDlg returns FALSE, hDevMode and hDevNames may have changed. */ + Globals.hDevMode = printer->hDevMode; + Globals.hDevNames = printer->hDevNames; + + if (!ret) + { + LocalFree(printData); + return; /* The user canceled printing */ + } + assert(printer->hDC != NULL); + + /* Ensure that each logical unit maps to one pixel */ + SetMapMode(printer->hDC, MM_TEXT); + + if (DialogBoxParam(Globals.hInstance, + MAKEINTRESOURCE(DIALOG_PRINTING), + Globals.hMainWnd, + DIALOG_Printing_DialogProc, + (LPARAM)printer) == IDABORT) + { + AlertPrintError(); + } +} + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * DIALOG_PAGESETUP_Hook + */ +static UINT_PTR CALLBACK DIALOG_PAGESETUP_Hook(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_INITDIALOG: + /* fetch last user input prior to display dialog */ + SetDlgItemText(hDlg, 0x141, Globals.szHeader); + SetDlgItemText(hDlg, 0x143, Globals.szFooter); + break; + + case WM_COMMAND: + { + if (HIWORD(wParam) == BN_CLICKED) + { + switch (LOWORD(wParam)) + { + case IDOK: + /* save user input and close dialog */ + GetDlgItemText(hDlg, 0x141, Globals.szHeader, ARRAY_SIZE(Globals.szHeader)); + GetDlgItemText(hDlg, 0x143, Globals.szFooter, ARRAY_SIZE(Globals.szFooter)); + return FALSE; + + case IDCANCEL: + /* discard user input and close dialog */ + return FALSE; + + case IDHELP: + { + /* FIXME: Bring this to work */ + static const TCHAR sorry[] = _T("Sorry, no help available"); + static const TCHAR help[] = _T("Help"); + MessageBox(Globals.hMainWnd, sorry, help, MB_ICONEXCLAMATION); + return TRUE; + } + + default: + break; + } + } + break; + } + } + + return FALSE; +} + +/*********************************************************************** + * DIALOG_FilePageSetup + */ +VOID DIALOG_FilePageSetup(VOID) +{ + PAGESETUPDLG page; + + ZeroMemory(&page, sizeof(page)); + page.lStructSize = sizeof(page); + page.hwndOwner = Globals.hMainWnd; + page.Flags = PSD_ENABLEPAGESETUPTEMPLATE | PSD_ENABLEPAGESETUPHOOK | PSD_MARGINS; + page.hInstance = Globals.hInstance; + page.rtMargin = Globals.lMargins; + page.hDevMode = Globals.hDevMode; + page.hDevNames = Globals.hDevNames; + page.lpPageSetupTemplateName = MAKEINTRESOURCE(DIALOG_PAGESETUP); + page.lpfnPageSetupHook = DIALOG_PAGESETUP_Hook; + + PageSetupDlg(&page); + + /* NOTE: Even if PageSetupDlg returns FALSE, the following members may have changed */ + Globals.hDevMode = page.hDevMode; + Globals.hDevNames = page.hDevNames; + Globals.lMargins = page.rtMargin; +}

1 0

[reactos] 01/01: [NOTEPAD] Add 'Now-printing' dialog (#5127)
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=072503c1fc133f48c4d71… commit 072503c1fc133f48c4d710362b42b4cc4fb7f192 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 22:23:14 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 11 22:23:14 2023 +0900 [NOTEPAD] Add 'Now-printing' dialog (#5127) Allow the user to cancel the print job. - Add DIALOG_PRINTING dialog. - Make the print job another thread. - Let the thread communicate with the dialog box by PRINTING_MESSAGE. - Add some resource strings. CORE-18837 --- base/applications/notepad/dialog.c | 247 +++++++++++++++++++++++--------- base/applications/notepad/lang/bg-BG.rc | 16 +++ base/applications/notepad/lang/cs-CZ.rc | 16 +++ base/applications/notepad/lang/da-DK.rc | 16 +++ base/applications/notepad/lang/de-DE.rc | 16 +++ base/applications/notepad/lang/el-GR.rc | 16 +++ base/applications/notepad/lang/en-US.rc | 16 +++ base/applications/notepad/lang/es-ES.rc | 16 +++ base/applications/notepad/lang/et-EE.rc | 16 +++ base/applications/notepad/lang/eu-ES.rc | 16 +++ base/applications/notepad/lang/fi-FI.rc | 16 +++ base/applications/notepad/lang/fr-FR.rc | 16 +++ base/applications/notepad/lang/he-IL.rc | 16 +++ base/applications/notepad/lang/hi-IN.rc | 16 +++ base/applications/notepad/lang/hr-HR.rc | 16 +++ base/applications/notepad/lang/hu-HU.rc | 16 +++ base/applications/notepad/lang/hy-AM.rc | 16 +++ base/applications/notepad/lang/id-ID.rc | 16 +++ base/applications/notepad/lang/it-IT.rc | 16 +++ base/applications/notepad/lang/ja-JP.rc | 16 +++ base/applications/notepad/lang/lt-LT.rc | 16 +++ base/applications/notepad/lang/ms-MY.rc | 16 +++ base/applications/notepad/lang/nl-NL.rc | 16 +++ base/applications/notepad/lang/no-NO.rc | 16 +++ base/applications/notepad/lang/pl-PL.rc | 16 +++ base/applications/notepad/lang/pt-BR.rc | 16 +++ base/applications/notepad/lang/pt-PT.rc | 16 +++ base/applications/notepad/lang/ro-RO.rc | 16 +++ base/applications/notepad/lang/ru-RU.rc | 16 +++ base/applications/notepad/lang/sk-SK.rc | 16 +++ base/applications/notepad/lang/sl-SI.rc | 16 +++ base/applications/notepad/lang/sq-AL.rc | 16 +++ base/applications/notepad/lang/sv-SE.rc | 16 +++ base/applications/notepad/lang/th-TH.rc | 16 +++ base/applications/notepad/lang/tr-TR.rc | 16 +++ base/applications/notepad/lang/uk-UA.rc | 16 +++ base/applications/notepad/lang/uz-UZ.rc | 16 +++ base/applications/notepad/lang/zh-CN.rc | 16 +++ base/applications/notepad/lang/zh-HK.rc | 16 +++ base/applications/notepad/lang/zh-TW.rc | 16 +++ base/applications/notepad/notepad_res.h | 9 ++ 41 files changed, 812 insertions(+), 68 deletions(-) diff --git a/base/applications/notepad/dialog.c b/base/applications/notepad/dialog.c index e31d8d6f038..3bd835a5011 100644 --- a/base/applications/notepad/dialog.c +++ b/base/applications/notepad/dialog.c @@ -717,7 +717,10 @@ DrawHeaderOrFooter(HDC hDC, LPRECT pRect, LPCTSTR pszFormat, INT nPageNo, const typedef struct { - LPPRINTDLG pPrinter; + PRINTDLG printer; + HWND hwndDlg; + INT status; + INT currentPage; RECT printRect; SYSTEMTIME stNow; HFONT hHeaderFont; @@ -732,7 +735,7 @@ typedef struct static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) { - LPPRINTDLG pPrinter = pData->pPrinter; + LPPRINTDLG pPrinter = &pData->printer; RECT printRect = pData->printRect; INT xLeft = printRect.left, yTop = printRect.top + pData->cyHeader + pData->cySpacing; INT xStart, tabWidth; @@ -751,6 +754,7 @@ static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) } \ ichStart = pData->ich; \ xStart = xLeft; \ + if (pData->status == STRING_PRINTCANCELING) return FALSE; \ } while (0) /* The drawing-body loop */ @@ -819,8 +823,8 @@ static BOOL DoPrintBody(PPRINT_DATA pData, DWORD PageCount, BOOL bSkipPage) static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) { - LPPRINTDLG pPrinter = pData->pPrinter; - BOOL bSkipPage; + LPPRINTDLG pPrinter = &pData->printer; + BOOL bSkipPage, ret; HFONT hOldFont; /* Should we skip this page? */ @@ -833,7 +837,7 @@ static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) { if (StartPage(pPrinter->hDC) <= 0) { - AlertPrintError(); + pData->status = STRING_PRINTFAILED; return FALSE; } @@ -850,8 +854,10 @@ static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) } hOldFont = SelectObject(pPrinter->hDC, pData->hBodyFont); - DoPrintBody(pData, PageCount, bSkipPage); + ret = DoPrintBody(pData, PageCount, bSkipPage); SelectObject(pPrinter->hDC, hOldFont); + if (!ret) + return FALSE; /* Canceled */ /* The epilogue of a page */ if (!bSkipPage) @@ -869,7 +875,7 @@ static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) if (EndPage(pPrinter->hDC) <= 0) { - AlertPrintError(); + pData->status = STRING_PRINTFAILED; return FALSE; } } @@ -877,9 +883,10 @@ static BOOL DoPrintPage(PPRINT_DATA pData, DWORD PageCount) return TRUE; } -#define HEADER_FONT_SIZE 11 /* 11pt */ -#define BODY_FONT_SIZE 9 /* 9pt */ +#define BODY_FONT_SIZE 10 /* 10pt */ +#define HEADER_FONT_SIZE 9 /* 9pt */ #define SPACING_HEIGHT 4 /* 4pt */ +#define PRINTING_MESSAGE (WM_USER + 100) static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) { @@ -887,17 +894,15 @@ static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) /* Create the main text font for printing */ lfBody = Globals.lfFont; - lfBody.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, HEADER_FONT_SIZE); + lfBody.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, BODY_FONT_SIZE); pPrintData->hBodyFont = CreateFontIndirect(&lfBody); if (pPrintData->hBodyFont == NULL) return FALSE; /* Create the header/footer font */ - ZeroMemory(&lfHeader, sizeof(lfHeader)); - lfHeader.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, BODY_FONT_SIZE); + lfHeader = Globals.lfFont; + lfHeader.lfHeight = -Y_POINTS_TO_PIXELS(pPrinter->hDC, HEADER_FONT_SIZE); lfHeader.lfWeight = FW_BOLD; - lfHeader.lfCharSet = DEFAULT_CHARSET; - StringCchCopy(lfHeader.lfFaceName, ARRAY_SIZE(lfHeader.lfFaceName), lfBody.lfFaceName); pPrintData->hHeaderFont = CreateFontIndirect(&lfHeader); if (pPrintData->hHeaderFont == NULL) return FALSE; @@ -905,42 +910,42 @@ static BOOL DoCreatePrintFonts(LPPRINTDLG pPrinter, PPRINT_DATA pPrintData) return TRUE; } -static BOOL DoPrintDocument(LPPRINTDLG pPrinter) +static BOOL DoPrintDocument(PPRINT_DATA printData) { DOCINFO docInfo; - PRINT_DATA printData = { pPrinter }; + LPPRINTDLG pPrinter = &printData->printer; DWORD CopyCount, PageCount; TEXTMETRIC tmHeader; BOOL ret = FALSE; HFONT hOldFont; - GetLocalTime(&printData.stNow); + GetLocalTime(&printData->stNow); - printData.printRect = GetPrintingRect(pPrinter->hDC, &Globals.lMargins); + printData->printRect = GetPrintingRect(pPrinter->hDC, &Globals.lMargins); - if (!DoCreatePrintFonts(pPrinter, &printData)) + if (!DoCreatePrintFonts(pPrinter, printData)) { - ShowLastError(); + printData->status = STRING_PRINTFAILED; goto Quit; } if (pPrinter->Flags & PD_SELECTION) - printData.cchText = GetSelectionTextLength(Globals.hEdit); + printData->cchText = GetSelectionTextLength(Globals.hEdit); else - printData.cchText = GetWindowTextLength(Globals.hEdit); + printData->cchText = GetWindowTextLength(Globals.hEdit); /* Allocate a buffer for the text */ - printData.pszText = HeapAlloc(GetProcessHeap(), 0, (printData.cchText + 1) * sizeof(TCHAR)); - if (!printData.pszText) + printData->pszText = HeapAlloc(GetProcessHeap(), 0, (printData->cchText + 1) * sizeof(TCHAR)); + if (!printData->pszText) { - ShowLastError(); + printData->status = STRING_PRINTFAILED; goto Quit; } if (pPrinter->Flags & PD_SELECTION) - GetSelectionText(Globals.hEdit, printData.pszText, printData.cchText + 1); + GetSelectionText(Globals.hEdit, printData->pszText, printData->cchText + 1); else - GetWindowText(Globals.hEdit, printData.pszText, printData.cchText + 1); + GetWindowText(Globals.hEdit, printData->pszText, printData->cchText + 1); /* Start a document */ ZeroMemory(&docInfo, sizeof(docInfo)); @@ -948,28 +953,31 @@ static BOOL DoPrintDocument(LPPRINTDLG pPrinter) docInfo.lpszDocName = Globals.szFileTitle; if (StartDoc(pPrinter->hDC, &docInfo) <= 0) { - AlertPrintError(); + printData->status = STRING_PRINTFAILED; goto Quit; } /* Calculate the header and footer heights */ - hOldFont = SelectObject(pPrinter->hDC, printData.hHeaderFont); + hOldFont = SelectObject(pPrinter->hDC, printData->hHeaderFont); GetTextMetrics(pPrinter->hDC, &tmHeader); - printData.cyHeader = printData.cyFooter = 2 * tmHeader.tmHeight; - printData.cySpacing = Y_POINTS_TO_PIXELS(pPrinter->hDC, SPACING_HEIGHT); + printData->cyHeader = printData->cyFooter = 2 * tmHeader.tmHeight; + printData->cySpacing = Y_POINTS_TO_PIXELS(pPrinter->hDC, SPACING_HEIGHT); SelectObject(pPrinter->hDC, hOldFont); /* De-select the font */ if (!Globals.szHeader[0]) - printData.cyHeader = printData.cySpacing = 0; + printData->cyHeader = printData->cySpacing = 0; if (!Globals.szFooter[0]) - printData.cyFooter = 0; + printData->cyFooter = 0; /* The printing-copies loop */ for (CopyCount = 1; CopyCount <= pPrinter->nCopies; ++CopyCount) { /* The printing-pages loop */ - for (PageCount = 1, printData.ich = 0; printData.ich < printData.cchText; ++PageCount) + for (PageCount = 1, printData->ich = 0; printData->ich < printData->cchText; ++PageCount) { - if (!DoPrintPage(&printData, PageCount)) + printData->currentPage = PageCount; + PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); + + if (!DoPrintPage(printData, PageCount)) { AbortDoc(pPrinter->hDC); /* Cancel printing */ goto Quit; @@ -978,56 +986,158 @@ static BOOL DoPrintDocument(LPPRINTDLG pPrinter) } if (EndDoc(pPrinter->hDC) <= 0) - AlertPrintError(); - else - ret = TRUE; + { + printData->status = STRING_PRINTFAILED; + goto Quit; + } -Quit: /* Clean up */ - DeleteObject(printData.hHeaderFont); - DeleteObject(printData.hBodyFont); - if (printData.pszText) - HeapFree(GetProcessHeap(), 0, printData.pszText); + ret = TRUE; + printData->status = STRING_PRINTCOMPLETE; + +Quit: + DeleteObject(printData->hHeaderFont); + DeleteObject(printData->hBodyFont); + if (printData->pszText) + HeapFree(GetProcessHeap(), 0, printData->pszText); + if (printData->status == STRING_PRINTCANCELING) + printData->status = STRING_PRINTCANCELED; + PostMessage(printData->hwndDlg, PRINTING_MESSAGE, 0, 0); return ret; } -VOID DIALOG_FilePrint(VOID) +static DWORD WINAPI PrintThreadFunc(LPVOID arg) { - PRINTDLG printer; + PPRINT_DATA pData = arg; + pData->currentPage = 1; + pData->status = STRING_NOWPRINTING; + PostMessage(pData->hwndDlg, PRINTING_MESSAGE, 0, 0); + return DoPrintDocument(pData); +} - /* Get Current Settings */ - ZeroMemory(&printer, sizeof(printer)); - printer.lStructSize = sizeof(printer); - printer.hwndOwner = Globals.hMainWnd; - printer.hInstance = Globals.hInstance; +static INT_PTR CALLBACK +DIALOG_Printing_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + TCHAR szText[MAX_STRING_LEN]; + static TCHAR s_szPage[64]; + static PPRINT_DATA s_pData = NULL; + static HANDLE s_hThread = NULL; - /* Set some default flags */ - printer.Flags = PD_RETURNDC | PD_SELECTION; + switch (uMsg) + { + case WM_INITDIALOG: + s_pData = (PPRINT_DATA)lParam; + s_pData->hwndDlg = hwnd; + SetDlgItemText(hwnd, IDC_PRINTING_FILENAME, Globals.szFileTitle); + GetDlgItemText(hwnd, IDC_PRINTING_PAGE, s_szPage, ARRAY_SIZE(s_szPage)); + SetDlgItemText(hwnd, IDC_PRINTING_PAGE, NULL); + + s_hThread = CreateThread(NULL, 0, PrintThreadFunc, s_pData, 0, NULL); + if (!s_hThread) + { + s_pData->status = STRING_PRINTFAILED; + EndDialog(hwnd, IDABORT); + } + return TRUE; + + case PRINTING_MESSAGE: + switch (s_pData->status) + { + case STRING_NOWPRINTING: + case STRING_PRINTCANCELING: + StringCchPrintf(szText, ARRAY_SIZE(szText), s_szPage, s_pData->currentPage); + SetDlgItemText(hwnd, IDC_PRINTING_PAGE, szText); + + LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); + SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); + break; + + case STRING_PRINTCOMPLETE: + case STRING_PRINTCANCELED: + case STRING_PRINTFAILED: + LoadString(Globals.hInstance, s_pData->status, szText, ARRAY_SIZE(szText)); + SetDlgItemText(hwnd, IDC_PRINTING_STATUS, szText); + + if (s_pData->status == STRING_PRINTCOMPLETE) + EndDialog(hwnd, IDOK); + else if (s_pData->status == STRING_PRINTFAILED) + EndDialog(hwnd, IDABORT); + else + EndDialog(hwnd, IDCANCEL); + break; + } + break; + + case WM_COMMAND: + if (LOWORD(wParam) == IDCANCEL && s_pData->status == STRING_NOWPRINTING) + { + EnableWindow(GetDlgItem(hwnd, IDCANCEL), FALSE); + s_pData->status = STRING_PRINTCANCELING; + PostMessage(hwnd, PRINTING_MESSAGE, 0, 0); + } + break; + + case WM_DESTROY: + if (s_hThread) + CloseHandle(s_hThread); + DeleteDC(s_pData->printer.hDC); + s_pData = LocalFree(s_pData); + break; + } + + return 0; +} + +VOID DIALOG_FilePrint(VOID) +{ + BOOL ret; + LPPRINTDLG printer; + PPRINT_DATA printData = LocalAlloc(LPTR, sizeof(PRINT_DATA)); + if (!printData) + { + ShowLastError(); + return; + } + + printer = &printData->printer; + printer->lStructSize = sizeof(PRINTDLG); + printer->hwndOwner = Globals.hMainWnd; + printer->Flags = PD_RETURNDC | PD_SELECTION; /* Disable the selection radio button if there is no text selected */ if (!GetSelectionTextLength(Globals.hEdit)) - printer.Flags |= PD_NOSELECTION; + printer->Flags |= PD_NOSELECTION; - printer.nFromPage = 1; - printer.nToPage = MAXWORD; - printer.nMinPage = 1; - printer.nMaxPage = MAXWORD; + printer->nFromPage = 1; + printer->nToPage = MAXWORD; + printer->nMinPage = 1; + printer->nMaxPage = MAXWORD; - printer.hDevMode = Globals.hDevMode; - printer.hDevNames = Globals.hDevNames; + printer->hDevMode = Globals.hDevMode; + printer->hDevNames = Globals.hDevNames; - if (!PrintDlg(&printer)) - return; /* The user canceled printing */ + ret = PrintDlg(printer); + /* NOTE: Even if PrintDlg returns FALSE, hDevMode and hDevNames may have changed. */ + Globals.hDevMode = printer->hDevMode; + Globals.hDevNames = printer->hDevNames; - assert(printer.hDC != NULL); - Globals.hDevMode = printer.hDevMode; - Globals.hDevNames = printer.hDevNames; + if (!ret) + { + LocalFree(printData); + return; /* The user canceled printing */ + } + assert(printer->hDC != NULL); /* Ensure that each logical unit maps to one pixel */ - SetMapMode(printer.hDC, MM_TEXT); - - DoPrintDocument(&printer); + SetMapMode(printer->hDC, MM_TEXT); - DeleteDC(printer.hDC); + if (DialogBoxParam(Globals.hInstance, + MAKEINTRESOURCE(DIALOG_PRINTING), + Globals.hMainWnd, + DIALOG_Printing_DialogProc, + (LPARAM)printer) == IDABORT) + { + AlertPrintError(); + } } VOID DIALOG_FileExit(VOID) @@ -1436,6 +1546,7 @@ VOID DIALOG_FilePageSetup(void) PageSetupDlg(&page); + /* NOTE: Even if PageSetupDlg returns FALSE, the following members may have changed */ Globals.hDevMode = page.hDevMode; Globals.hDevNames = page.hDevNames; Globals.lMargins = page.rtMargin; diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index ffc30a206db..9d45a9f5d1d 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Отказ", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Страница %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Възпроизводствено право 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 71c65359bdb..874854b9cf4 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Storno", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Strana %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ paměti." STRING_PRINTERROR "Soubor '%s' nebylo možné vytisknout.\n\nZkontrolujte, zda je tiskárna zapnutá a správně nastavená." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Textový dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index e44e6089e75..dc637207806 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Side %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ hukommelse, og prøv så igen." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 86219a879f4..8220a475df4 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Abbrechen", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Seite %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Abbrechen", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -167,6 +178,11 @@ um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ STRING_PRINTERROR "Die Datei '%s' kann nicht gedruckt werden.\n\nStellen Sie sicher, dass der Drucker angeschlossen und richtig konfiguriert ist." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Textdokument" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 3cef55cd8db..4d8cb846c65 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Ακύρωση", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Σελίδα %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Ακύρωση", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index 1aaf9c43a33..a3444ea81b6 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Page %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 46abc699626..541fdfbad63 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -132,6 +132,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Página %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -168,6 +179,11 @@ aumentar la cantidad\nde memoria libre." STRING_PRINTERROR "No se puede imprimir el archivo '%s'.\n\nAsegúrese de que la impresora esté encendida y configurada correctamente." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 55583c79f11..8b1171328fa 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -138,6 +138,17 @@ BEGIN PUSHBUTTON "Loobu", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Lk %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Loobu", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -173,6 +184,11 @@ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu STRING_PRINTERROR "Ei suuda printida faili '%s'.\n\nVeendu et printer on sisse lülitatud ja korralikult sättestatud." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Tekstidokument" STRING_NOTEPAD_AUTHORS "Autoriõigus 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/eu-ES.rc b/base/applications/notepad/lang/eu-ES.rc index 074f3e280a0..c9719f4fbc6 100644 --- a/base/applications/notepad/lang/eu-ES.rc +++ b/base/applications/notepad/lang/eu-ES.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Utzi", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Orriak %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Utzi", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ memoria librearen\nkopurua handitzeko." STRING_PRINTERROR "'%s' fitxategia inprimatu ez ahal du.\n\nZihurtatu behar duzu inmprimagailua pistuta eta ongi konfiguratuta dago." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 112b1a909aa..6cc2f9a1a0c 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Sivu %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ muistia." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/fr-FR.rc b/base/applications/notepad/lang/fr-FR.rc index 407deb3feab..6216cd8804b 100644 --- a/base/applications/notepad/lang/fr-FR.rc +++ b/base/applications/notepad/lang/fr-FR.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Annuler", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Page %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Annuler", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ de la mémoire." STRING_PRINTERROR "Impossible d'imprimer le fichier '%s'.\n\nVérifiez que l'imprimante est allumée et correctement configurée." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Document Texte" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index 0ccac31217c..afcdd1a9e81 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -133,6 +133,17 @@ BEGIN PUSHBUTTON "ביטול", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "עמוד %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "ביטול", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -168,6 +179,11 @@ task.\nClose one or more applications to increase the amount of\nfree memory." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hi-IN.rc b/base/applications/notepad/lang/hi-IN.rc index f66e29898fd..5c568dc677e 100644 --- a/base/applications/notepad/lang/hi-IN.rc +++ b/base/applications/notepad/lang/hi-IN.rc @@ -137,6 +137,17 @@ BEGIN PUSHBUTTON "रद्द करें", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Page %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "रद्द करें", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -172,6 +183,11 @@ BEGIN STRING_PRINTERROR "फ़ाइल '%s' मुद्रित नहीं कर सकता।\n\n सुनिश्चित करें कि प्रिंटर चालू है और ठीक से कॉन्फ़िगर किया गया है।" STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "टेक्स्ट डॉक्यूमॅन्ट" STRING_NOTEPAD_AUTHORS "कॉपीराइट 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index 8d69778a17d..dea66511d0a 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -137,6 +137,17 @@ BEGIN PUSHBUTTON "Odustani", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Stranica %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Odustani", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -172,6 +183,11 @@ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." STRING_PRINTERROR "Ne mogu ispisati datoteku '%s'.\n\nProvjerite je li pisač uključen i je li pravilno konfiguiran." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Tekstni dokument" STRING_NOTEPAD_AUTHORS "Copyright 1997, 98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 4fb13be84ee..18e368941c7 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Mégse", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Oldalszám: %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Mégse", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ Szeretné menteni a változásokat?" STRING_PRINTERROR "Nem sikerült kinyomtatni a következő fájlt: '%s'.\n\nEllenőrizze hogy a nyomtató be van-e kapcsolva és megfelelően van-e konfigurálva." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Szöveges dokumentum" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index b570d30e510..c1b866313b4 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Չնդունել", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Էջ %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Չնդունել", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ Would you like to save the changes ?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 1bf3230f469..8405f0f0abf 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Halaman %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Batal", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ bebas." STRING_PRINTERROR "Tidak bisa mencetak '%s'.\n\nPastikan pencetak telah menyala dan bisa digunakan dengan benar." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Teks Dokumen" STRING_NOTEPAD_AUTHORS "Hak Cipta 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index 4cba0c5eb0a..a22a1586762 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Annulla", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Pagina %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Annulla", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ di memoria libera." STRING_PRINTERROR "Impossibile stampare il file '%s'.\n\nControllare che la stampante sia accesa e impostata correttamente." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Documento di testo" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index bc50047fac0..e9df825c3ac 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "キャンセル", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "印刷中" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 9, "MS UI Gothic" +BEGIN + CTEXT "印刷ジョブを開始中...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(ファイル名)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "ページ %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "キャンセル", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ BEGIN STRING_PRINTERROR "ファイル '%s'を印刷できません。\n\nプリンタがオンになっていて、正しく設定されているか確認して下さい。" STRING_DEFAULTFONT "ＭＳゴシック" /* MS Gothic */ STRING_LINE_NUMBER_OUT_OF_RANGE "指定された行番号は範囲外です。" + STRING_NOWPRINTING "印刷中..." + STRING_PRINTCANCELING "印刷ジョブをキャンセル中..." + STRING_PRINTCOMPLETE "印刷が完了しました。" + STRING_PRINTCANCELED "印刷がキャンセルされました。" + STRING_PRINTFAILED "印刷が失敗しました。" STRING_TEXT_DOCUMENT "テキスト文書" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 1cd4f99306c..3e474ed0041 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Atsisakyti", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Puslapis %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Atsisakyti", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ Ar norite išsaugoti pakeitimus?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "(C) 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index 2c08f7fc548..b20afcc378f 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -132,6 +132,17 @@ BEGIN PUSHBUTTON "Batal", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Page %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Batal", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -167,6 +178,11 @@ tugas ini.\nTutup satu atau lebih aplikasi untuk menambah jumlah\ningatan kosong STRING_PRINTERROR "Tidak boleh mencetak fail '%s'.\n\nPastikan pencetak dihidupkan dan dikonfigurasikan dengan betul." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index dce7657c783..f3ec9a79fb1 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Pagina %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ Wilt u de wijzigingen opslaan?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 4cb8c26aed4..8df8d4c00b2 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Side %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -166,6 +177,11 @@ minne." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Enerett 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index ba60d5ec329..97874362419 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Anuluj", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Strona %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Anuluj", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -160,6 +171,11 @@ BEGIN STRING_PRINTERROR "Nie można wydrukować pliku '%s'.\n\nUpewnij się, że drukarka jest włączona i poprawnie skonfigurowana." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Dokument tekstowy" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 912a37a4f68..c3e8d86ed08 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Página %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 3b5e2de940b..13f0c79f1f5 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancelar", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Página %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancelar", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ tarefa.\nFeche uma ou mais aplicações para aumentar a quantidade de memória l STRING_PRINTERROR "Impossível imprimir o ficheiro '%s'.\n\nCertifique-se de que a impressora está ligada e correctamente configurada." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Documento de texto" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index d1354a2db43..5b95ee1fac3 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -135,6 +135,17 @@ BEGIN PUSHBUTTON "A&nulează", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Pagină %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "A&nulează", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -170,6 +181,11 @@ Păstrați modificările aduse?" STRING_PRINTERROR "Fișierul „%s” nu a putut fi imprimat.\n\nAsigurați-vă că imprimanta este pornită și configurată corespunzător." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Document text" STRING_NOTEPAD_AUTHORS "Drept de autor 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 71b0c70e06a..a3ffa8bdc6a 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Отмена", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Страница %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Отмена", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ BEGIN STRING_PRINTERROR "Невозможно распечатать файл '%s'.\n\nПроверьте, включен ли принтер, и настроен ли он правильно." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Текстовый документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index 87334cd527a..cead9a46f5e 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -138,6 +138,17 @@ BEGIN PUSHBUTTON "Zrušiť", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Strana %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Zrušiť", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -173,6 +184,11 @@ alebo viac aplikácií, aby sa uvoľnila pamäť a skúste to znova." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 55af9a7dd65..0031fd14997 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Stran %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in posk STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index cdf0a08b135..60d5a04da2e 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -134,6 +134,17 @@ BEGIN PUSHBUTTON "Anulo", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Faqe %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Anulo", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -169,6 +180,11 @@ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index a256eff432b..70b3e3a2baa 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Avbryt", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Sida %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Avbryt", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ den här åtgärden.\nAvsluta ett eller flera program för att frigöra mer minn STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index 471d0d73a8f..11fe1192792 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Cancel", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "หน้า %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -160,6 +171,11 @@ BEGIN STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 26a7ef1f87e..1f37825511e 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -133,6 +133,17 @@ BEGIN PUSHBUTTON "İptal", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Sayfa %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "İptal", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -163,6 +174,11 @@ BEGIN STRING_PRINTERROR """%s"" dosyası yazdırılamıyor.\n\nYazıcının açık olduğundan ve doğru yapılandırıldığından emin olunuz." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Metin Belgesi" STRING_NOTEPAD_AUTHORS "Telif Hakları: 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index 23f6b27ba74..a914503457a 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Скасувати", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Сторінка %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Скасувати", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ BEGIN STRING_PRINTERROR "Неможливо розпечатати файл '%s'.\n\nПереконайтесь, що принтер ввімкнено, та налаштовано." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Текстовий документ" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/uz-UZ.rc b/base/applications/notepad/lang/uz-UZ.rc index 586905aeeab..4ea02231662 100644 --- a/base/applications/notepad/lang/uz-UZ.rc +++ b/base/applications/notepad/lang/uz-UZ.rc @@ -130,6 +130,17 @@ BEGIN PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "Sahifa %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "Cancel", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -165,6 +176,11 @@ O‘zgarishlarni saqlashni istaysizmi?" STRING_PRINTERROR "Cannot print the file '%s'.\n\nMake sure that the printer is turned on and is configured properly." STRING_DEFAULTFONT "Lucida Console" STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "Text Document" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-CN.rc b/base/applications/notepad/lang/zh-CN.rc index bacc7722019..12879a31dd8 100644 --- a/base/applications/notepad/lang/zh-CN.rc +++ b/base/applications/notepad/lang/zh-CN.rc @@ -138,6 +138,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 9, "宋体" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "页面 %u", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "取消", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -173,6 +184,11 @@ BEGIN STRING_PRINTERROR "无法打印文件“%s”。\n\n请确保打印机已打开，并且已正确配置。" STRING_DEFAULTFONT "宋体" /* SimSun */ STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "文本文档" STRING_NOTEPAD_AUTHORS "版权所有 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-HK.rc b/base/applications/notepad/lang/zh-HK.rc index 24fa27a6e36..7a2c9f23331 100644 --- a/base/applications/notepad/lang/zh-HK.rc +++ b/base/applications/notepad/lang/zh-HK.rc @@ -138,6 +138,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 9, "新細明體" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "第 %u 頁", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "取消", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -174,6 +185,11 @@ BEGIN 請檢查印表機是否已經開機及正確設定。" STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/lang/zh-TW.rc b/base/applications/notepad/lang/zh-TW.rc index 871a000a7bc..4d64ad1ea94 100644 --- a/base/applications/notepad/lang/zh-TW.rc +++ b/base/applications/notepad/lang/zh-TW.rc @@ -138,6 +138,17 @@ BEGIN PUSHBUTTON "取消", IDCANCEL, 120, 30, 40, 15 END +DIALOG_PRINTING DIALOG 0, 0, 160, 100 +CAPTION "Now printing" +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 9, "新細明體" +BEGIN + CTEXT "Print job is starting...", IDC_PRINTING_STATUS, 5, 10, 150, 15 + CTEXT "(Filename)", IDC_PRINTING_FILENAME, 5, 35, 150, 15 + CTEXT "第 %u 頁", IDC_PRINTING_PAGE, 5, 55, 150, 15 + PUSHBUTTON "取消", IDCANCEL, 50, 75, 60, 20 +END + STRINGTABLE BEGIN STRING_PAGESETUP_HEADERVALUE "&f" @@ -173,6 +184,11 @@ BEGIN STRING_PRINTERROR "檔案「%s」列印失敗。\n\n請檢查印表機是否已經開機和正確設定。" STRING_DEFAULTFONT "新細明體" /* PMingLiU */ STRING_LINE_NUMBER_OUT_OF_RANGE "The specified line number is out of range." + STRING_NOWPRINTING "Now printing page..." + STRING_PRINTCANCELING "The print job is being canceled..." + STRING_PRINTCOMPLETE "Printing is successfully done." + STRING_PRINTCANCELED "Printing has been canceled." + STRING_PRINTFAILED "Printing is failed." STRING_TEXT_DOCUMENT "純文字檔案" STRING_NOTEPAD_AUTHORS "Copyright 1997,98 Marcel Baur, 2000 Mike McCormack, 2002 Sylvain Petreolle, 2002 Andriy Palamarchuk\r\n" diff --git a/base/applications/notepad/notepad_res.h b/base/applications/notepad/notepad_res.h index 870db3f7687..153590f67b8 100644 --- a/base/applications/notepad/notepad_res.h +++ b/base/applications/notepad/notepad_res.h @@ -31,6 +31,10 @@ #define ID_LINENUMBER 0x208 #define IDI_NPICON 0x209 #define IDC_LICENSE 0x20A +#define DIALOG_PRINTING 0x20B +#define IDC_PRINTING_STATUS 0x20C +#define IDC_PRINTING_FILENAME 0x20D +#define IDC_PRINTING_PAGE 0x20E /* Commands */ #define CMD_NEW 0x100 @@ -99,6 +103,11 @@ #define STRING_PRINTERROR 0x189 #define STRING_DEFAULTFONT 0x18A #define STRING_LINE_NUMBER_OUT_OF_RANGE 0x18B +#define STRING_NOWPRINTING 0x18C +#define STRING_PRINTCANCELING 0x18D +#define STRING_PRINTCOMPLETE 0x18E +#define STRING_PRINTCANCELED 0x18F +#define STRING_PRINTFAILED 0x190 #define STRING_TEXT_DOCUMENT 0x200

1 0

[reactos] 01/01: [MSPAINT] Delete unused HWND hToolBtn[16] global variable
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b49b47fc84ddb4352811b… commit b49b47fc84ddb4352811ba0424ee036297611cff Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 14:19:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Mar 11 14:19:12 2023 +0900 [MSPAINT] Delete unused HWND hToolBtn[16] global variable CORE-18867 --- base/applications/mspaint/globalvar.h | 2 -- base/applications/mspaint/main.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 071baecb4dc..87f903438ba 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -47,8 +47,6 @@ extern HCURSOR hCurZoom; extern HCURSOR hCurPen; extern HCURSOR hCurAirbrush; -extern HWND hToolBtn[16]; - extern HINSTANCE hProgInstance; extern TCHAR filepathname[1000]; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 4b8ed0c5fbe..23c8f7a02b8 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -45,8 +45,6 @@ HCURSOR hCurZoom; HCURSOR hCurPen; HCURSOR hCurAirbrush; -HWND hToolBtn[16]; - HINSTANCE hProgInstance; TCHAR filepathname[1000];

1 0

[reactos] 01/01: [MSPAINT] Remember status bar visibility (#5145)
by Katayama Hirofumi MZ 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff9295a2267c94076fbc… commit 9ff9295a2267c94076fbc095093b39b08bfed41d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 11:41:52 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 11 11:41:52 2023 +0900 [MSPAINT] Remember status bar visibility (#5145) - Add ShowStatusBar registry setting. - Save ShowStatusBar status and restore the status on startup. CORE-18867 --- base/applications/mspaint/main.cpp | 4 +++- base/applications/mspaint/registry.cpp | 3 +++ base/applications/mspaint/registry.h | 1 + base/applications/mspaint/winproc.cpp | 3 ++- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index f040ad7d300..4b8ed0c5fbe 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -239,9 +239,11 @@ _tWinMain (HINSTANCE hThisInstance, HINSTANCE hPrevInstance, LPTSTR lpszArgument /* creating the status bar */ hStatusBar = - CreateWindowEx(0, STATUSCLASSNAME, NULL, SBARS_SIZEGRIP | WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, hwnd, + CreateWindowEx(0, STATUSCLASSNAME, NULL, SBARS_SIZEGRIP | WS_CHILD, 0, 0, 0, 0, hwnd, NULL, hThisInstance, NULL); SendMessage(hStatusBar, SB_SETMINHEIGHT, 21, 0); + if (registrySettings.ShowStatusBar) + ShowWindow(hStatusBar, SW_SHOWNOACTIVATE); RECT scrlClientWindowPos = {0, 0, 0 + 500, 0 + 500}; scrlClientWindow.Create(scrollboxWindow.m_hWnd, scrlClientWindowPos, NULL, WS_CHILD | WS_VISIBLE); diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index fd83a4b3243..1702c8d2c01 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -74,6 +74,7 @@ void RegistrySettings::LoadPresets() FontsPositionX = 0; FontsPositionY = 0; ShowTextTool = TRUE; + ShowStatusBar = TRUE; LOGFONT lf; GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); @@ -100,6 +101,7 @@ void RegistrySettings::Load() ReadDWORD(view, _T("ThumbXPos"), ThumbXPos, TRUE); ReadDWORD(view, _T("ThumbYPos"), ThumbYPos, TRUE); ReadDWORD(view, _T("UnitSetting"), UnitSetting, FALSE); + ReadDWORD(view, _T("ShowStatusBar"), ShowStatusBar, FALSE); ULONG pnBytes = sizeof(WINDOWPLACEMENT); view.QueryBinaryValue(_T("WindowPlacement"), &WindowPlacement, &pnBytes); @@ -152,6 +154,7 @@ void RegistrySettings::Store() view.SetDWORDValue(_T("ThumbXPos"), ThumbXPos); view.SetDWORDValue(_T("ThumbYPos"), ThumbYPos); view.SetDWORDValue(_T("UnitSetting"), UnitSetting); + view.SetDWORDValue(_T("ShowStatusBar"), ShowStatusBar); view.SetBinaryValue(_T("WindowPlacement"), &WindowPlacement, sizeof(WINDOWPLACEMENT)); } diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index 33c1be4054b..be90c104d9c 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -41,6 +41,7 @@ public: DWORD FontsPositionX; DWORD FontsPositionY; DWORD ShowTextTool; + DWORD ShowStatusBar; enum WallpaperStyle { TILED, diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 779db8ff51d..3a064799c40 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -729,7 +729,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH alignChildrenToMainWindow(); break; case IDM_VIEWSTATUSBAR: - ::ShowWindow(hStatusBar, ::IsWindowVisible(hStatusBar) ? SW_HIDE : SW_SHOW); + registrySettings.ShowStatusBar = !::IsWindowVisible(hStatusBar); + ::ShowWindow(hStatusBar, (registrySettings.ShowStatusBar ? SW_SHOWNOACTIVATE : SW_HIDE)); alignChildrenToMainWindow(); break; case IDM_FORMATICONBAR:

1 0

[reactos] 01/01: [NTOS:KD][KDBG] Rework the BootPhase >= 2 initialization of the KD/KDBG kernel debugger. (#4892) CORE-17470
by Hermès Bélusca-Maïto 11 Mar '23

11 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4ce819ca5a7de11a1b77e… commit 4ce819ca5a7de11a1b77e05124d2d2f0d35871c4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Jan 9 19:35:18 2023 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Mar 11 01:22:19 2023 +0100 [NTOS:KD][KDBG] Rework the BootPhase >= 2 initialization of the KD/KDBG kernel debugger. (#4892) CORE-17470 + KdpDebugLogInit: Add resources cleanup in failure code paths. Fix, in an NT-compatible manner, how (and when) the KD/KDBG BootPhase >=2 initialization steps are performed. These are necessary for any functionality KDBG needs, that would depend on the NT I/O Manager and the storage and filesystem stacks to be running. This includes, creating the debug log file, and for KDBG, loading its KDBinit initialization file. As a result, file debug logging is fixed. The old ReactOS-specific (NT-incompatible) callback we did in the middle of IoInitSystem() is removed, in favor of a runtime mechanism that should work on Windows as well. The idea for this new mechanism is loosely inspired by the TDL4 rootkit, see http://blog.w4kfu.com/public/tdl4_article/draft_tdl4article.html but contrary to it, a specific hook is used instead, as well as the technique of driver reinitialization: https://web.archive.org/web/20211021050515/https://driverentry.com.br/en/bl… Its rationale is as follows: We want to be able to perform I/O-related initialization (starting a logger thread for file log debugging, loading KDBinit file for KDBG, etc.). A good place for this would be as early as possible, once the I/O Manager has started the storage and the boot filesystem drivers. Here is an overview of the initialization steps of the NT Kernel and Executive: ---- KiSystemStartup(KeLoaderBlock) if (Cpu == 0) KdInitSystem(0, KeLoaderBlock); KiSwitchToBootStack() -> KiSystemStartupBootStack() -> KiInitializeKernel() -> ExpInitializeExecutive(Cpu, KeLoaderBlock) (NOTE: Any unexpected debugger break will call KdInitSystem(0, NULL); ) KdInitSystem(0, LoaderBlock) -> KdDebuggerInitialize0(LoaderBlock); ExpInitializeExecutive(Cpu == 0): ExpInitializationPhase = 0; HalInitSystem(0, KeLoaderBlock); <-- Sets HalInitPnpDriver callback. ... PsInitSystem(LoaderBlock) PsCreateSystemThread(Phase1Initialization) Phase1Initialization(Discard): ExpInitializationPhase = 1; HalInitSystem(1, KeLoaderBlock); ... Early initialization of Ob, Ex, Ke. KdInitSystem(1, KeLoaderBlock); ... KdDebuggerInitialize1(LoaderBlock); ... IoInitSystem(LoaderBlock); ... ---- As we can see, KdDebuggerInitialize1() is the last KD initialization routine the kernel calls, and is called *before* the I/O Manager starts. Thus, direct Nt/ZwCreateFile ... calls done there would fail. Also, we want to do the I/O initialization as soon as possible. There does not seem to be any exported way to be notified about the I/O manager initialization steps... that is, unless we somehow become a driver and insert ourselves in the flow! Since we are not a regular driver, we need to invoke IoCreateDriver() to create one. However, remember that we are currently running *before* IoInitSystem(), the I/O subsystem is not initialized yet. Due to this, calling IoCreateDriver(), much like any other IO functions, would lead to a crash, because it calls ObCreateObject(..., IoDriverObjectType, ...), and IoDriverObjectType is non-initialized yet (it's NULL). The chosen solution is to hook a "known" exported callback: namely, the HalInitPnpDriver() callback (it initializes the "HAL Root Bus Driver"). It is set very early on by the HAL via the HalInitSystem(0, ...) call, and is called early on by IoInitSystem() before any driver is loaded, but after the I/O Manager has been minimally set up so that new drivers can be created. When the hook: KdpInitDriver() is called, we create our driver with IoCreateDriver(), specifying its entrypoint KdpDriverEntry(), then restore and call the original HalInitPnpDriver() callback. Another possible unexplored alternative, could be to insert ourselves in the KeLoaderBlock->LoadOrderListHead boot modules list, or in the KeLoaderBlock->BootDriverListHead boot-driver list. (Note that while we may be able to do this, because boot-drivers are resident in memory, much like we are, we cannot insert ourselves in the system-driver list however, since those drivers are expected to come from PE image files.) Once the KdpDriverEntry() driver entrypoint is called, we register KdpDriverReinit() for re-initialization with the I/O Manager, in order to provide more initialization points. KdpDriverReinit() calls the KD providers at BootPhase >= 2, and schedules further reinitializations (at most 3 more) if any of the providers request so. --- ntoskrnl/include/internal/kd.h | 9 +- ntoskrnl/io/iomgr/iomgr.c | 8 -- ntoskrnl/kd/kdio.c | 121 +++++++++-------- ntoskrnl/kd/kdmain.c | 291 ++++++++++++++++++++++++++++++++++++++--- ntoskrnl/kdbg/kdb.h | 4 +- ntoskrnl/kdbg/kdb_cli.c | 51 ++++++-- 6 files changed, 384 insertions(+), 100 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 325e0b0ea3c..424ae89fe1f 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -39,7 +39,7 @@ typedef enum _KD_CONTINUE_TYPE } KD_CONTINUE_TYPE; typedef -VOID +NTSTATUS (NTAPI *PKDP_INIT_ROUTINE)( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); @@ -70,19 +70,19 @@ KdpScreenAcquire(VOID); VOID KdpScreenRelease(VOID); -VOID +NTSTATUS NTAPI KdpScreenInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); -VOID +NTSTATUS NTAPI KdpSerialInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, _In_ ULONG BootPhase); -VOID +NTSTATUS NTAPI KdpDebugLogInit( _In_ struct _KD_DISPATCH_TABLE *DispatchTable, @@ -168,6 +168,7 @@ typedef struct _KD_DISPATCH_TABLE LIST_ENTRY KdProvidersList; PKDP_INIT_ROUTINE KdpInitRoutine; PKDP_PRINT_ROUTINE KdpPrintRoutine; + NTSTATUS InitStatus; } KD_DISPATCH_TABLE, *PKD_DISPATCH_TABLE; /* The current Debugging Mode */ diff --git a/ntoskrnl/io/iomgr/iomgr.c b/ntoskrnl/io/iomgr/iomgr.c index 380a8518661..b982414e270 100644 --- a/ntoskrnl/io/iomgr/iomgr.c +++ b/ntoskrnl/io/iomgr/iomgr.c @@ -588,14 +588,6 @@ IoInitSystem(IN PLOADER_PARAMETER_BLOCK LoaderBlock) * We can finally load other drivers from the boot volume. */ PnPBootDriversInitialized = TRUE; -#if !defined(_WINKD_) && defined(KDBG) - /* Read KDB Data */ - KdbpCliInit(); - - /* I/O is now setup for disk access, so phase 3 */ - KdInitSystem(3, LoaderBlock); -#endif - /* Load system start drivers */ IopInitializeSystemDrivers(); PnpSystemInit = TRUE; diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 129db8b9b5e..4575b9a2e8b 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -19,7 +19,6 @@ #define KdpBufferSize (1024 * 512) static BOOLEAN KdpLoggingEnabled = FALSE; -static BOOLEAN KdpLoggingStarting = FALSE; static PCHAR KdpDebugBuffer = NULL; static volatile ULONG KdpCurrentPosition = 0; static volatile ULONG KdpFreeBytes = 0; @@ -39,14 +38,14 @@ static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; KDP_DEBUG_MODE KdpDebugMode; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; -KD_DISPATCH_TABLE DispatchTable[KdMax]; +KD_DISPATCH_TABLE DispatchTable[KdMax] = {0}; PKDP_INIT_ROUTINE InitRoutines[KdMax] = { KdpScreenInit, KdpSerialInit, KdpDebugLogInit, -#ifdef KDBG +#ifdef KDBG // See kdb_cli.c KdpKdbgInit #endif }; @@ -158,7 +157,6 @@ KdpPrintToLogFile(PCHAR String, { KIRQL OldIrql; ULONG beg, end, num; - BOOLEAN DoReinit = FALSE; if (KdpDebugBuffer == NULL) return; @@ -185,45 +183,31 @@ KdpPrintToLogFile(PCHAR String, } /* Release the spinlock */ - if (OldIrql == PASSIVE_LEVEL && !KdpLoggingStarting && !KdpLoggingEnabled && ExpInitializationPhase >= 2) - { - DoReinit = TRUE; - } KdbpReleaseLock(&KdpDebugLogSpinLock, OldIrql); - if (DoReinit) - { - KdpLoggingStarting = TRUE; - KdpDebugLogInit(NULL, 3); - } - /* Signal the logger thread */ if (OldIrql <= DISPATCH_LEVEL && KdpLoggingEnabled) KeSetEvent(&KdpLoggerThreadEvent, IO_NO_INCREMENT, FALSE); } -VOID +NTSTATUS NTAPI KdpDebugLogInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - NTSTATUS Status; - UNICODE_STRING FileName; - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK Iosb; - HANDLE ThreadHandle; - KPRIORITY Priority; + NTSTATUS Status = STATUS_SUCCESS; - if (!KdpDebugMode.File) return; + if (!KdpDebugMode.File) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpDebugLogInit; DispatchTable->KdpPrintRoutine = KdpPrintToLogFile; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpDebugLogInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) @@ -235,20 +219,35 @@ KdpDebugLogInit( if (!KdpDebugBuffer) { KdpDebugMode.File = FALSE; - return; + RemoveEntryList(&DispatchTable->KdProvidersList); + return STATUS_NO_MEMORY; } KdpFreeBytes = KdpBufferSize; /* Initialize spinlock */ KeInitializeSpinLock(&KdpDebugLogSpinLock); + /* Register for later BootPhase 2 reinitialization */ + DispatchTable->KdpInitRoutine = KdpDebugLogInit; + HalDisplayString("\r\n File log debugging enabled\r\n\r\n"); } - else if (BootPhase == 3) + else if (BootPhase >= 2) { + UNICODE_STRING FileName; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK Iosb; + HANDLE ThreadHandle; + KPRIORITY Priority; + + /* If we have already successfully opened the log file, bail out */ + if (KdpLogFileHandle != NULL) + return STATUS_SUCCESS; + /* Setup the log name */ Status = RtlAnsiStringToUnicodeString(&FileName, &KdpLogFileName, TRUE); - if (!NT_SUCCESS(Status)) return; + if (!NT_SUCCESS(Status)) + goto Failure; InitializeObjectAttributes(&ObjectAttributes, &FileName, @@ -274,8 +273,16 @@ KdpDebugLogInit( if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open log file: 0x%08x\n", Status); - return; + DPRINT1("Failed to open log file: 0x%08lx\n", Status); + + /* Schedule an I/O reinitialization if needed */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND || + Status == STATUS_OBJECT_PATH_NOT_FOUND) + { + DispatchTable->KdpInitRoutine = KdpDebugLogInit; + return Status; + } + goto Failure; } /** HACK for FILE_APPEND_DATA ** @@ -323,18 +330,29 @@ KdpDebugLogInit( NULL); if (!NT_SUCCESS(Status)) { + DPRINT1("Failed to create log file thread: 0x%08lx\n", Status); ZwClose(KdpLogFileHandle); - return; + goto Failure; } - Priority = 7; + Priority = HIGH_PRIORITY; ZwSetInformationThread(ThreadHandle, ThreadPriority, &Priority, sizeof(Priority)); ZwClose(ThreadHandle); + return Status; + +Failure: + KdpFreeBytes = 0; + ExFreePoolWithTag(KdpDebugBuffer, TAG_KDBG); + KdpDebugBuffer = NULL; + KdpDebugMode.File = FALSE; + RemoveEntryList(&DispatchTable->KdProvidersList); } + + return Status; } /* SERIAL FUNCTIONS **********************************************************/ @@ -365,38 +383,41 @@ KdpSerialPrint(PCHAR String, KdbpReleaseLock(&KdpSerialSpinLock, OldIrql); } -VOID +NTSTATUS NTAPI KdpSerialInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - if (!KdpDebugMode.Serial) return; + if (!KdpDebugMode.Serial) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpSerialInit; DispatchTable->KdpPrintRoutine = KdpSerialPrint; /* Initialize the Port */ if (!KdPortInitializeEx(&SerialPortInfo, SerialPortNumber)) { KdpDebugMode.Serial = FALSE; - return; + return STATUS_DEVICE_DOES_NOT_EXIST; } KdComPortInUse = SerialPortInfo.Address; /* Initialize spinlock */ KeInitializeSpinLock(&KdpSerialSpinLock); - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpSerialInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) { HalDisplayString("\r\n Serial debugging enabled\r\n\r\n"); } + + return STATUS_SUCCESS; } /* SCREEN FUNCTIONS **********************************************************/ @@ -483,21 +504,22 @@ KdpScreenPrint(PCHAR String, } } -VOID +NTSTATUS NTAPI KdpScreenInit( _In_ PKD_DISPATCH_TABLE DispatchTable, _In_ ULONG BootPhase) { - if (!KdpDebugMode.Screen) return; + if (!KdpDebugMode.Screen) + return STATUS_PORT_DISCONNECTED; if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdpScreenInit; DispatchTable->KdpPrintRoutine = KdpScreenPrint; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdpScreenInit; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) @@ -507,16 +529,13 @@ KdpScreenInit( HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } + + return STATUS_SUCCESS; } /* GENERAL FUNCTIONS *********************************************************/ -BOOLEAN -NTAPI -KdpPrintString( - _In_ PSTRING Output); - extern STRING KdbPromptString; VOID @@ -551,20 +570,16 @@ KdSendPacket( if (!KdpDebugMode.Value) return; - /* Call the registered handlers */ - CurrentEntry = KdProviders.Flink; - while (CurrentEntry != &KdProviders) + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; + CurrentEntry = CurrentEntry->Flink) { - /* Get the current table */ CurrentTable = CONTAINING_RECORD(CurrentEntry, KD_DISPATCH_TABLE, KdProvidersList); - /* Call it */ CurrentTable->KdpPrintRoutine(MessageData->Buffer, MessageData->Length); - - /* Next Table */ - CurrentEntry = CurrentEntry->Flink; } return; } diff --git a/ntoskrnl/kd/kdmain.c b/ntoskrnl/kd/kdmain.c index be749a705a9..abd358da0fc 100644 --- a/ntoskrnl/kd/kdmain.c +++ b/ntoskrnl/kd/kdmain.c @@ -1,10 +1,10 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS Kernel - * FILE: ntoskrnl/kd/kdmain.c - * PURPOSE: Kernel Debugger Initialization - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Kernel Debugger Initialization + * COPYRIGHT: Copyright 2005 Alex Ionescu <alex.ionescu(a)reactos.org> + * Copyright 2020 Hervé Poussineau <hpoussin(a)reactos.org> + * Copyright 2023 Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> */ #include <ntoskrnl.h> @@ -13,8 +13,6 @@ /* VARIABLES ***************************************************************/ -VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads); - extern ANSI_STRING KdpLogFileName; /* PUBLIC FUNCTIONS *********************************************************/ @@ -86,8 +84,9 @@ NTAPI KdDebuggerInitialize0( _In_opt_ PLOADER_PARAMETER_BLOCK LoaderBlock) { - ULONG i; PCHAR CommandLine, Port = NULL; + ULONG i; + BOOLEAN Success = FALSE; if (LoaderBlock) { @@ -127,15 +126,174 @@ KdDebuggerInitialize0( if (KdpDebugMode.Value == 0) KdpDebugMode.Serial = TRUE; - /* Call Providers at Phase 0 */ - for (i = 0; i < KdMax; i++) + /* Call the providers at Phase 0 */ + for (i = 0; i < RTL_NUMBER_OF(DispatchTable); i++) + { + DispatchTable[i].InitStatus = InitRoutines[i](&DispatchTable[i], 0); + Success = (Success || NT_SUCCESS(DispatchTable[i].InitStatus)); + } + + /* Return success if at least one of the providers succeeded */ + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); +} + + +/** + * @brief Reinitialization routine. + * DRIVER_REINITIALIZE + * + * Calls each registered provider for reinitialization at Phase >= 2. + * I/O is now set up for disk access, at different phases. + **/ +static VOID +NTAPI +KdpDriverReinit( + _In_ PDRIVER_OBJECT DriverObject, + _In_opt_ PVOID Context, + _In_ ULONG Count) +{ + PLIST_ENTRY CurrentEntry; + PKD_DISPATCH_TABLE CurrentTable; + PKDP_INIT_ROUTINE KdpInitRoutine; + ULONG BootPhase = (Count + 1); // Do BootPhase >= 2 + BOOLEAN ScheduleReinit = FALSE; + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + DPRINT("*** KD %sREINITIALIZATION - Phase %d ***\n", + Context ? "" : "BOOT ", BootPhase); + + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; NOTHING) + { + /* Get the provider */ + CurrentTable = CONTAINING_RECORD(CurrentEntry, + KD_DISPATCH_TABLE, + KdProvidersList); + /* Go to the next entry (the Init routine may unlink us) */ + CurrentEntry = CurrentEntry->Flink; + + /* Call it if it requires a reinitialization */ + if (CurrentTable->KdpInitRoutine) + { + /* Get the initialization routine and reset it */ + KdpInitRoutine = CurrentTable->KdpInitRoutine; + CurrentTable->KdpInitRoutine = NULL; + CurrentTable->InitStatus = KdpInitRoutine(CurrentTable, BootPhase); + DPRINT("KdpInitRoutine(%p) returned 0x%08lx\n", + CurrentTable, CurrentTable->InitStatus); + + /* Check whether it needs to be reinitialized again */ + ScheduleReinit = (ScheduleReinit || CurrentTable->KdpInitRoutine); + } + } + + DPRINT("ScheduleReinit: %s\n", ScheduleReinit ? "TRUE" : "FALSE"); + if (ScheduleReinit) + { + /* + * Determine when to reinitialize. + * If Context == NULL, we are doing a boot-driver reinitialization. + * It is initially done once (Count == 1), and is rescheduled once + * after all other boot drivers get loaded (Count == 2). + * If further reinitialization is needed, switch to system-driver + * reinitialization and do it again, not more than twice. + */ + if (Count <= 1) + { + IoRegisterBootDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)FALSE); + } + else if (Count <= 3) + { + IoRegisterDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)TRUE); + } + else + { + /* Too late, no more reinitializations! */ + DPRINT("Cannot reinitialize anymore!\n"); + ScheduleReinit = FALSE; + } + } + + if (!ScheduleReinit) { - InitRoutines[i](&DispatchTable[i], 0); + /* All the necessary reinitializations are done, + * the driver object is not needed anymore. */ + ObMakeTemporaryObject(DriverObject); + IoDeleteDriver(DriverObject); } +} +/** + * @brief Entry point for the auxiliary driver. + * DRIVER_INITIALIZE + **/ +static NTSTATUS +NTAPI +KdpDriverEntry( + _In_ PDRIVER_OBJECT DriverObject, + _In_ PUNICODE_STRING RegistryPath) +{ + UNREFERENCED_PARAMETER(RegistryPath); + + /* Register for reinitialization after the other drivers are loaded */ + IoRegisterBootDriverReinitialization(DriverObject, + KdpDriverReinit, + (PVOID)FALSE); + + /* Set the driver as initialized */ + DriverObject->Flags |= DRVO_INITIALIZED; return STATUS_SUCCESS; } +/** + * @brief Hooked HalInitPnpDriver() callback. + * It is initially set by the HAL when HalInitSystem(0, ...) + * is called earlier on. + **/ +static pHalInitPnpDriver orgHalInitPnpDriver = NULL; + +/** + * @brief + * HalInitPnpDriver() callback hook installed by KdDebuggerInitialize1(). + * + * It is called during initialization of the I/O manager and is where + * the auxiliary driver is created. This driver is needed for receiving + * reinitialization callbacks in KdpDriverReinit() later. + * This hook must *always* call the original HalInitPnpDriver() function + * and return its returned value, or return STATUS_SUCCESS. + **/ +static NTSTATUS +NTAPI +KdpInitDriver(VOID) +{ + static BOOLEAN InitCalled = FALSE; + NTSTATUS Status; + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"\\Driver\\KdDriver"); + + ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + + /* Ensure we are not called more than once */ + if (_InterlockedCompareExchange8((char*)&InitCalled, TRUE, FALSE) != FALSE) + return STATUS_SUCCESS; + + /* Create the driver */ + Status = IoCreateDriver(&DriverName, KdpDriverEntry); + if (!NT_SUCCESS(Status)) + DPRINT1("IoCreateDriver failed: 0x%08lx\n", Status); + /* Ignore any failure from IoCreateDriver(). If it fails, no I/O-related + * initialization will happen (no file log debugging, etc.). */ + + /* Finally, restore and call the original HalInitPnpDriver() */ + InterlockedExchangePointer((PVOID*)&HalInitPnpDriver, orgHalInitPnpDriver); + return (HalInitPnpDriver ? HalInitPnpDriver() : STATUS_SUCCESS); +} + NTSTATUS NTAPI KdDebuggerInitialize1( @@ -143,26 +301,119 @@ KdDebuggerInitialize1( { PLIST_ENTRY CurrentEntry; PKD_DISPATCH_TABLE CurrentTable; + PKDP_INIT_ROUTINE KdpInitRoutine; + BOOLEAN Success = FALSE; + BOOLEAN ReinitForPhase2 = FALSE; - /* Call the registered handlers */ - CurrentEntry = KdProviders.Flink; - while (CurrentEntry != &KdProviders) + /* Call the registered providers */ + for (CurrentEntry = KdProviders.Flink; + CurrentEntry != &KdProviders; NOTHING) { - /* Get the current table */ + /* Get the provider */ CurrentTable = CONTAINING_RECORD(CurrentEntry, KD_DISPATCH_TABLE, KdProvidersList); + /* Go to the next entry (the Init routine may unlink us) */ + CurrentEntry = CurrentEntry->Flink; + + /* Get the initialization routine and reset it */ + ASSERT(CurrentTable->KdpInitRoutine); + KdpInitRoutine = CurrentTable->KdpInitRoutine; + CurrentTable->KdpInitRoutine = NULL; /* Call it */ - CurrentTable->KdpInitRoutine(CurrentTable, 1); + CurrentTable->InitStatus = KdpInitRoutine(CurrentTable, 1); - /* Next Table */ - CurrentEntry = CurrentEntry->Flink; + /* Check whether it needs to be reinitialized for Phase 2 */ + Success = (Success || NT_SUCCESS(CurrentTable->InitStatus)); + ReinitForPhase2 = (ReinitForPhase2 || CurrentTable->KdpInitRoutine); } NtGlobalFlag |= FLG_STOP_ON_EXCEPTION; + /* If we don't need to reinitialize providers for Phase 2, we are done */ + if (!ReinitForPhase2) + { + /* Return success if at least one of them succeeded */ + return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); + } + + /** + * We want to be able to perform I/O-related initialization (starting a + * logger thread for file log debugging, loading KDBinit file for KDBG, + * etc.). A good place for this would be as early as possible, once the + * I/O Manager has started the storage and the boot filesystem drivers. + * + * Here is an overview of the initialization steps of the NT Kernel and + * Executive: + * ---- + * KiSystemStartup(KeLoaderBlock) + * if (Cpu == 0) KdInitSystem(0, KeLoaderBlock); + * KiSwitchToBootStack() -> KiSystemStartupBootStack() + * -> KiInitializeKernel() -> ExpInitializeExecutive(Cpu, KeLoaderBlock) + * + * (NOTE: Any unexpected debugger break will call KdInitSystem(0, NULL); ) + * KdInitSystem(0, LoaderBlock) -> KdDebuggerInitialize0(LoaderBlock); + * + * ExpInitializeExecutive(Cpu == 0): ExpInitializationPhase = 0; + * HalInitSystem(0, KeLoaderBlock); <-- Sets HalInitPnpDriver callback. + * ... + * PsInitSystem(LoaderBlock) + * PsCreateSystemThread(Phase1Initialization) + * + * Phase1Initialization(Discard): ExpInitializationPhase = 1; + * HalInitSystem(1, KeLoaderBlock); + * ... + * Early initialization of Ob, Ex, Ke. + * KdInitSystem(1, KeLoaderBlock); + * ... + * KdDebuggerInitialize1(LoaderBlock); + * ... + * IoInitSystem(LoaderBlock); + * ... + * ---- + * As we can see, KdDebuggerInitialize1() is the last KD initialization + * routine the kernel calls, and is called *before* the I/O Manager starts. + * Thus, direct Nt/ZwCreateFile ... calls done there would fail. Also, + * we want to do the I/O initialization as soon as possible. There does + * not seem to be any exported way to be notified about the I/O manager + * initialization steps... that is, unless we somehow become a driver and + * insert ourselves in the flow! + * + * Since we are not a regular driver, we need to invoke IoCreateDriver() + * to create one. However, remember that we are currently running *before* + * IoInitSystem(), the I/O subsystem is not initialized yet. Due to this, + * calling IoCreateDriver(), much like any other IO functions, would lead + * to a crash, because it calls + * ObCreateObject(..., IoDriverObjectType, ...), and IoDriverObjectType + * is non-initialized yet (it's NULL). + * + * The chosen solution is to hook a "known" exported callback: namely, the + * HalInitPnpDriver() callback (it initializes the "HAL Root Bus Driver"). + * It is set very early on by the HAL via the HalInitSystem(0, ...) call, + * and is called early on by IoInitSystem() before any driver is loaded, + * but after the I/O Manager has been minimally set up so that new drivers + * can be created. + * When the hook: KdpInitDriver() is called, we create our driver with + * IoCreateDriver(), specifying its entrypoint KdpDriverEntry(), then + * restore and call the original HalInitPnpDriver() callback. + * + * Another possible unexplored alternative, could be to insert ourselves + * in the KeLoaderBlock->LoadOrderListHead boot modules list, or in the + * KeLoaderBlock->BootDriverListHead boot-driver list. (Note that while + * we may be able to do this, because boot-drivers are resident in memory, + * much like we are, we cannot insert ourselves in the system-driver list + * however, since those drivers are expected to come from PE image files.) + * + * Once the KdpDriverEntry() driver entrypoint is called, we register + * KdpDriverReinit() for re-initialization with the I/O Manager, in order + * to provide more initialization points. KdpDriverReinit() calls the KD + * providers at BootPhase >= 2, and schedules further reinitializations + * (at most 3 more) if any of the providers request so. + **/ + orgHalInitPnpDriver = + InterlockedExchangePointer((PVOID*)&HalInitPnpDriver, KdpInitDriver); return STATUS_SUCCESS; } - /* EOF */ +/* EOF */ diff --git a/ntoskrnl/kdbg/kdb.h b/ntoskrnl/kdbg/kdb.h index 11bc4cb452f..4424dd4837c 100644 --- a/ntoskrnl/kdbg/kdb.h +++ b/ntoskrnl/kdbg/kdb.h @@ -82,7 +82,7 @@ KdbpStackSwitchAndCall( extern PCHAR KdbInitFileBuffer; -VOID +NTSTATUS NTAPI KdbInitialize( _In_ PKD_DISPATCH_TABLE DispatchTable, @@ -94,7 +94,7 @@ KdbRegisterCliCallback( PVOID Callback, BOOLEAN Deregister); -VOID +NTSTATUS KdbpCliInit(VOID); VOID diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index fdd5d694924..aaebf573cf8 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -3795,11 +3795,13 @@ KdbpCliInterpretInitFile(VOID) DPRINT("KDB: KDBinit executed\n"); } -/*!\brief Called when KDB is initialized +/** + * @brief Called when KDB is initialized. * - * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory and executes it. - */ -VOID + * Reads the KDBinit file from the SystemRoot\System32\drivers\etc directory + * and executes it. + **/ +NTSTATUS KdbpCliInit(VOID) { NTSTATUS Status; @@ -3812,6 +3814,10 @@ KdbpCliInit(VOID) PCHAR FileBuffer; ULONG OldEflags; + /* Don't load the KDBinit file if its buffer is already lying around */ + if (KdbInitFileBuffer) + return STATUS_SUCCESS; + /* Initialize the object attributes */ RtlInitUnicodeString(&FileName, L"\\SystemRoot\\System32\\drivers\\etc\\KDBinit"); InitializeObjectAttributes(&ObjectAttributes, @@ -3828,7 +3834,7 @@ KdbpCliInit(VOID) if (!NT_SUCCESS(Status)) { DPRINT("Could not open \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); - return; + return Status; } /* Get the size of the file */ @@ -3839,7 +3845,7 @@ KdbpCliInit(VOID) { ZwClose(hFile); DPRINT("Could not query size of \\SystemRoot\\System32\\drivers\\etc\\KDBinit (Status 0x%x)", Status); - return; + return Status; } FileSize = FileStdInfo.EndOfFile.u.LowPart; @@ -3849,7 +3855,7 @@ KdbpCliInit(VOID) { ZwClose(hFile); DPRINT("Could not allocate %d bytes for KDBinit file\n", FileSize); - return; + return Status; } /* Load file into memory */ @@ -3860,7 +3866,7 @@ KdbpCliInit(VOID) { ExFreePool(FileBuffer); DPRINT("Could not read KDBinit file into memory (Status 0x%lx)\n", Status); - return; + return Status; } FileSize = min(FileSize, (INT)Iosb.Information); @@ -3872,13 +3878,15 @@ KdbpCliInit(VOID) /* Interpret the init file... */ KdbInitFileBuffer = FileBuffer; - //KdbEnter(); // FIXME + //KdbEnter(); // FIXME, see commit baa47fa5e KdbInitFileBuffer = NULL; /* Leave critical section */ __writeeflags(OldEflags); ExFreePool(FileBuffer); + + return STATUS_SUCCESS; } @@ -3947,10 +3955,10 @@ KdbDebugPrint( * @param[in] BootPhase * Phase of initialization. * - * @return None. + * @return A status value. * @note Also known as "KdpKdbgInit". **/ -VOID +NTSTATUS NTAPI KdbInitialize( _In_ PKD_DISPATCH_TABLE DispatchTable, @@ -3959,14 +3967,17 @@ KdbInitialize( if (BootPhase == 0) { /* Write out the functions that we support for now */ - DispatchTable->KdpInitRoutine = KdbInitialize; DispatchTable->KdpPrintRoutine = KdbDebugPrint; - /* Register as a Provider */ + /* Register for BootPhase 1 initialization and as a Provider */ + DispatchTable->KdpInitRoutine = KdbInitialize; InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } else if (BootPhase == 1) { + /* Register for later BootPhase 2 reinitialization */ + DispatchTable->KdpInitRoutine = KdbInitialize; + /* Initialize Dmesg support */ /* Allocate a buffer for Dmesg log buffer. +1 for terminating null, @@ -3987,6 +3998,20 @@ KdbInitialize( /* Initialize symbols support */ KdbSymInit(BootPhase); } + else if (BootPhase >= 2) + { + /* I/O is now set up for disk access: Read KDB Data */ + NTSTATUS Status = KdbpCliInit(); + + /* Schedule an I/O reinitialization if needed */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND || + Status == STATUS_OBJECT_PATH_NOT_FOUND) + { + DispatchTable->KdpInitRoutine = KdbInitialize; + } + } + + return STATUS_SUCCESS; } /* EOF */

1 0

[reactos] 01/01: [NTOS:KD] Move handling of Dmesg buffer from screen provider to KDBG provider. (#5143) CORE-10749
by Hervé Poussineau 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf734e5373ef476083109… commit bf734e5373ef4760831098b23279e568935c83e1 Author: Hervé Poussineau <hpoussin(a)reactos.org> AuthorDate: Sun Jul 10 15:01:01 2022 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Mar 10 23:59:08 2023 +0100 [NTOS:KD] Move handling of Dmesg buffer from screen provider to KDBG provider. (#5143) CORE-10749 The dmesg command is now available even if screen output is disabled. Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> --- ntoskrnl/include/internal/kd.h | 11 ++++++ ntoskrnl/kd/kdio.c | 68 --------------------------------- ntoskrnl/kdbg/kdb_cli.c | 85 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 85 insertions(+), 79 deletions(-) diff --git a/ntoskrnl/include/internal/kd.h b/ntoskrnl/include/internal/kd.h index 75ffd8be63f..325e0b0ea3c 100644 --- a/ntoskrnl/include/internal/kd.h +++ b/ntoskrnl/include/internal/kd.h @@ -53,6 +53,17 @@ VOID /* INIT ROUTINES *************************************************************/ +KIRQL +NTAPI +KdbpAcquireLock( + _In_ PKSPIN_LOCK SpinLock); + +VOID +NTAPI +KdbpReleaseLock( + _In_ PKSPIN_LOCK SpinLock, + _In_ KIRQL OldIrql); + VOID KdpScreenAcquire(VOID); diff --git a/ntoskrnl/kd/kdio.c b/ntoskrnl/kd/kdio.c index 9c8a486fad8..129db8b9b5e 100644 --- a/ntoskrnl/kd/kdio.c +++ b/ntoskrnl/kd/kdio.c @@ -37,14 +37,6 @@ CPPORT SerialPortInfo = {0, DEFAULT_DEBUG_BAUD_RATE, 0}; static CHAR KdpScreenLineBuffer[KdpScreenLineLengthDefault + 1] = ""; static ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; -const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; -PCHAR KdpDmesgBuffer = NULL; -volatile ULONG KdpDmesgCurrentPosition = 0; -volatile ULONG KdpDmesgFreeBytes = 0; -volatile ULONG KdbDmesgTotalWritten = 0; -volatile BOOLEAN KdbpIsInDmesgMode = FALSE; -static KSPIN_LOCK KdpDmesgLogSpinLock; - KDP_DEBUG_MODE KdpDebugMode; LIST_ENTRY KdProviders = {&KdProviders, &KdProviders}; KD_DISPATCH_TABLE DispatchTable[KdMax]; @@ -440,20 +432,12 @@ KdpScreenRelease(VOID) } } -/* - * Screen debug logger function KdpScreenPrint() writes text strings into - * KdpDmesgBuffer, using it as a circular buffer. KdpDmesgBuffer contents could - * be later (re)viewed using dmesg command of kdbg. KdpScreenPrint() protects - * KdpDmesgBuffer from simultaneous writes by use of KdpDmesgLogSpinLock. - */ static VOID NTAPI KdpScreenPrint(PCHAR String, ULONG Length) { PCHAR pch = String; - KIRQL OldIrql; - ULONG beg, end, num; while (pch < String + Length && *pch) { @@ -497,45 +481,6 @@ KdpScreenPrint(PCHAR String, HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); KdpScreenLineBufferPos = KdpScreenLineLength; } - - /* Dmesg: store the string in the buffer to show it later */ - if (KdbpIsInDmesgMode) - return; - - if (KdpDmesgBuffer == NULL) - return; - - /* Acquire the printing spinlock without waiting at raised IRQL */ - OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); - - beg = KdpDmesgCurrentPosition; - /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ - num = min(Length, KdpDmesgFreeBytes); - if (num != 0) - { - end = (beg + num) % KdpDmesgBufferSize; - if (end > beg) - { - RtlCopyMemory(KdpDmesgBuffer + beg, String, Length); - } - else - { - RtlCopyMemory(KdpDmesgBuffer + beg, String, KdpDmesgBufferSize - beg); - RtlCopyMemory(KdpDmesgBuffer, String + (KdpDmesgBufferSize - beg), end); - } - KdpDmesgCurrentPosition = end; - - /* Counting the total bytes written */ - KdbDmesgTotalWritten += num; - } - - /* Release the spinlock */ - KdbpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); - - /* Optional step(?): find out a way to notify about buffer exhaustion, - * and possibly fall into kbd to use dmesg command: user will read - * debug strings before they will be wiped over by next writes. - */ } VOID @@ -557,22 +502,9 @@ KdpScreenInit( } else if (BootPhase == 1) { - /* Allocate a buffer for dmesg log buffer. +1 for terminating null, - * see kdbp_cli.c:KdbpCmdDmesg()/2 - */ - KdpDmesgBuffer = ExAllocatePoolZero(NonPagedPool, - KdpDmesgBufferSize + 1, - TAG_KDBG); - /* Ignore failure if KdpDmesgBuffer is NULL */ - KdpDmesgFreeBytes = KdpDmesgBufferSize; - KdbDmesgTotalWritten = 0; - /* Take control of the display */ KdpScreenAcquire(); - /* Initialize spinlock */ - KeInitializeSpinLock(&KdpDmesgLogSpinLock); - HalDisplayString("\r\n Screen debugging enabled\r\n\r\n"); } } diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index c12f19554ef..fdd5d694924 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -155,14 +155,14 @@ static LONG KdbNumberOfColsTerminal = -1; PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ BOOLEAN KdbpBugCheckRequested = FALSE; -/* Vars for dmesg */ -/* defined in ../kd/kdio.c, declare here: */ -extern volatile BOOLEAN KdbpIsInDmesgMode; -extern const ULONG KdpDmesgBufferSize; -extern PCHAR KdpDmesgBuffer; -extern volatile ULONG KdpDmesgCurrentPosition; -extern volatile ULONG KdpDmesgFreeBytes; -extern volatile ULONG KdbDmesgTotalWritten; +/* Variables for Dmesg */ +static const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; +static PCHAR KdpDmesgBuffer = NULL; +static volatile ULONG KdpDmesgCurrentPosition = 0; +static volatile ULONG KdpDmesgFreeBytes = 0; +static volatile ULONG KdbDmesgTotalWritten = 0; +static volatile BOOLEAN KdbpIsInDmesgMode = FALSE; +static KSPIN_LOCK KdpDmesgLogSpinLock; STRING KdbPromptString = RTL_CONSTANT_STRING("kdb:> "); @@ -3882,13 +3882,60 @@ KdbpCliInit(VOID) } +/** + * @brief Debug logger function. + * + * This function writes text strings into KdpDmesgBuffer, using it as + * a circular buffer. KdpDmesgBuffer contents can be later (re)viewed + * using the dmesg command. KdbDebugPrint() protects KdpDmesgBuffer + * from simultaneous writes by use of KdpDmesgLogSpinLock. + **/ static VOID NTAPI KdbDebugPrint( - PCH Message, - ULONG Length) + _In_ PCHAR String, + _In_ ULONG Length) { - /* Nothing here */ + KIRQL OldIrql; + ULONG beg, end, num; + + /* Avoid recursive calling if we already are in Dmesg mode */ + if (KdbpIsInDmesgMode) + return; + + if (KdpDmesgBuffer == NULL) + return; + + /* Acquire the printing spinlock without waiting at raised IRQL */ + OldIrql = KdbpAcquireLock(&KdpDmesgLogSpinLock); + + beg = KdpDmesgCurrentPosition; + /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); */ + num = min(Length, KdpDmesgFreeBytes); + if (num != 0) + { + end = (beg + num) % KdpDmesgBufferSize; + if (end > beg) + { + RtlCopyMemory(KdpDmesgBuffer + beg, String, Length); + } + else + { + RtlCopyMemory(KdpDmesgBuffer + beg, String, KdpDmesgBufferSize - beg); + RtlCopyMemory(KdpDmesgBuffer, String + (KdpDmesgBufferSize - beg), end); + } + KdpDmesgCurrentPosition = end; + + /* Counting the total bytes written */ + KdbDmesgTotalWritten += num; + } + + /* Release the spinlock */ + KdbpReleaseLock(&KdpDmesgLogSpinLock, OldIrql); + + /* Optional step(?): find out a way to notify about buffer exhaustion, + * and possibly fall into kbd to use dmesg command: user will read + * debug strings before they will be wiped over by next writes. */ } /** @@ -3918,6 +3965,22 @@ KdbInitialize( /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); } + else if (BootPhase == 1) + { + /* Initialize Dmesg support */ + + /* Allocate a buffer for Dmesg log buffer. +1 for terminating null, + * see kdbp_cli.c:KdbpCmdDmesg()/2 */ + KdpDmesgBuffer = ExAllocatePoolZero(NonPagedPool, + KdpDmesgBufferSize + 1, + TAG_KDBG); + /* Ignore failure if KdpDmesgBuffer is NULL */ + KdpDmesgFreeBytes = KdpDmesgBufferSize; + KdbDmesgTotalWritten = 0; + + /* Initialize spinlock */ + KeInitializeSpinLock(&KdpDmesgLogSpinLock); + } if (BootPhase <= 1) {

1 0

[reactos] 01/01: [MSPAINT] There were two "main" windows (#5147)
by Katayama Hirofumi MZ 10 Mar '23

10 Mar '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86e2f9e635b82c49002b1… commit 86e2f9e635b82c49002b1e522e83facbeeaec373 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Mar 11 07:42:04 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Mar 11 07:42:04 2023 +0900 [MSPAINT] There were two "main" windows (#5147) Our mspaint had two windows of window class "MainWindow". class CToolBox should inherit CWindowImpl<CToolBox> instead of CWindowImpl<CMainWindow>. CORE-18867 --- base/applications/mspaint/toolbox.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 772ff2df1e2..f7cdfc91288 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -9,7 +9,7 @@ #pragma once -class CToolBox : public CWindowImpl<CMainWindow> +class CToolBox : public CWindowImpl<CToolBox> { public: DECLARE_WND_CLASS_EX(_T("ToolBox"), CS_DBLCLKS, COLOR_BTNFACE)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs