Ros-diffs

ros-diffs@reactos.org

12 participants
81034 discussions

[reactos] 01/01: [MSPAINT] Adapt to Unicode and <strsafe.h> (#5882)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=640d67d12ae2d5b2b89ff… commit 640d67d12ae2d5b2b89ff7782b2494681ebd50c9 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 19:25:45 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 19:25:45 2023 +0900 [MSPAINT] Adapt to Unicode and <strsafe.h> (#5882) - TCHAR --> WCHAR - LPTSTR --> LPWSTR - LPCTSTR --> LPCWSTR - CString --> CStringW - TEXT("...") --> L"..." - _T("...") --> L"..." - ::SendMessage( --> ::SendMessageW( - ::GetWindowText( --> ::GetWindowTextW( - ::SetWindowText( --> ::SetWindowTextW( - Replace _tcscat with StringCchCatW. - Replace _tcslen with wcslen. etc. CORE-19094 --- base/applications/mspaint/atlimagedx.h | 16 +-- base/applications/mspaint/canvas.cpp | 36 +++--- base/applications/mspaint/canvas.h | 2 +- base/applications/mspaint/dialogs.cpp | 127 ++++++++++---------- base/applications/mspaint/dib.cpp | 48 ++++---- base/applications/mspaint/drawing.cpp | 29 +++-- base/applications/mspaint/drawing.h | 2 +- base/applications/mspaint/fullscreen.cpp | 4 +- base/applications/mspaint/fullscreen.h | 2 +- base/applications/mspaint/globalvar.h | 2 +- base/applications/mspaint/history.cpp | 6 +- base/applications/mspaint/history.h | 2 +- base/applications/mspaint/main.cpp | 48 ++++---- base/applications/mspaint/miniature.cpp | 4 +- base/applications/mspaint/miniature.h | 2 +- base/applications/mspaint/mouse.cpp | 2 +- base/applications/mspaint/palette.h | 2 +- base/applications/mspaint/registry.cpp | 166 +++++++++++++-------------- base/applications/mspaint/registry.h | 8 +- base/applications/mspaint/selectionmodel.cpp | 4 +- base/applications/mspaint/sizebox.cpp | 2 +- base/applications/mspaint/textedit.cpp | 20 ++-- base/applications/mspaint/textedit.h | 2 +- base/applications/mspaint/toolbox.cpp | 16 +-- base/applications/mspaint/toolbox.h | 2 +- base/applications/mspaint/toolsettings.cpp | 16 +-- base/applications/mspaint/toolsettings.h | 2 +- base/applications/mspaint/winproc.cpp | 71 ++++++------ base/applications/mspaint/winproc.h | 6 +- 29 files changed, 321 insertions(+), 328 deletions(-) diff --git a/base/applications/mspaint/atlimagedx.h b/base/applications/mspaint/atlimagedx.h index 6469e9d471b..366774719af 100644 --- a/base/applications/mspaint/atlimagedx.h +++ b/base/applications/mspaint/atlimagedx.h @@ -69,7 +69,7 @@ public: return TRUE; } - HRESULT LoadDx(LPCTSTR pszFileName, float *pxDpi, float *pyDpi) throw() + HRESULT LoadDx(LPCWSTR pszFileName, float *pxDpi, float *pyDpi) throw() { using namespace Gdiplus; @@ -111,7 +111,7 @@ public: return (status == Ok ? S_OK : E_FAIL); } - HRESULT SaveDx(LPCTSTR pszFileName, REFGUID guidFileType = GUID_NULL, + HRESULT SaveDx(LPCWSTR pszFileName, REFGUID guidFileType = GUID_NULL, float xDpi = 0, float yDpi = 0) throw() { using namespace Gdiplus; @@ -141,7 +141,7 @@ public: CLSID clsid; if (::IsEqualGUID(guidFileType, GUID_NULL)) { - CString strExt(PathFindExtension(pszFileName)); + CStringW strExt(PathFindExtensionW(pszFileName)); clsid = FindCodecForExtension(strExt, pEncoders, cEncoders); } else @@ -300,23 +300,23 @@ protected: // CImage::FindCodecForExtension is private. We have to duplicate it at here... static CLSID - FindCodecForExtension(LPCTSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) + FindCodecForExtension(LPCWSTR dotext, const Gdiplus::ImageCodecInfo *pCodecs, UINT nCodecs) { for (UINT i = 0; i < nCodecs; ++i) { - CString strSpecs(pCodecs[i].FilenameExtension); + CStringW strSpecs(pCodecs[i].FilenameExtension); int ichOld = 0, ichSep; for (;;) { - ichSep = strSpecs.Find(TEXT(';'), ichOld); + ichSep = strSpecs.Find(L';', ichOld); - CString strSpec; + CStringW strSpec; if (ichSep < 0) strSpec = strSpecs.Mid(ichOld); else strSpec = strSpecs.Mid(ichOld, ichSep - ichOld); - int ichDot = strSpec.ReverseFind(TEXT('.')); + int ichDot = strSpec.ReverseFind(L'.'); if (ichDot >= 0) strSpec = strSpec.Mid(ichDot); diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index b1b76ce9901..87553d04400 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -321,7 +321,7 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { m_ptOrig = pt; SetCapture(); - ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_HANDDRAG))); return 0; } @@ -450,10 +450,10 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL RECT rcImage; GetImageRect(rcImage); - CString strCoord; + CStringW strCoord; if (::PtInRect(&rcImage, pt)) - strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); + strCoord.Format(L"%ld, %ld", pt.x, pt.y); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); } } @@ -511,9 +511,9 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL cyImage = min(MAXWORD, cyImage); // Display new size - CString strSize; - strSize.Format(_T("%d x %d"), cxImage, cyImage); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); + CStringW strSize; + strSize.Format(L"%d x %d", cxImage, cyImage); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); // Dragging now... Fix the position... CRect rcResizing = { 0, 0, cxImage, cyImage }; @@ -559,7 +559,7 @@ LRESULT CCanvasWindow::OnButtonUp(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& m_drawing = FALSE; toolsModel.OnButtonUp(bLeftButton, pt.x, pt.y); Invalidate(FALSE); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)_T("")); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)L""); return 0; } else if (m_hitSelection != HIT_NONE && bLeftButton) @@ -625,7 +625,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (m_nMouseDownMsg == WM_MBUTTONDOWN) { - ::SetCursor(::LoadCursor(g_hinstExe, MAKEINTRESOURCE(IDC_HANDDRAG))); + ::SetCursor(::LoadCursorW(g_hinstExe, MAKEINTRESOURCEW(IDC_HANDDRAG))); return 0; } @@ -646,7 +646,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (hitSelection != HIT_NONE) { if (!setCursorOnSizeBox(hitSelection)) - ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); + ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_SIZEALL)); return 0; } @@ -659,22 +659,22 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL switch (toolsModel.GetActiveTool()) { case TOOL_FILL: - ::SetCursor(::LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDC_FILL))); + ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_FILL))); break; case TOOL_COLOR: - ::SetCursor(::LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDC_COLOR))); + ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_COLOR))); break; case TOOL_ZOOM: - ::SetCursor(::LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDC_ZOOM))); + ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_ZOOM))); break; case TOOL_PEN: - ::SetCursor(::LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDC_PEN))); + ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_PEN))); break; case TOOL_AIRBRUSH: - ::SetCursor(::LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDC_AIRBRUSH))); + ::SetCursor(::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDC_AIRBRUSH))); break; default: - ::SetCursor(::LoadCursor(NULL, IDC_CROSS)); + ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_CROSS)); } return 0; } @@ -711,12 +711,12 @@ LRESULT CCanvasWindow::OnCancelMode(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CCanvasWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return ::SendMessage(GetParent(), nMsg, wParam, lParam); + return ::SendMessageW(GetParent(), nMsg, wParam, lParam); } LRESULT CCanvasWindow::OnCaptureChanged(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)_T("")); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)L""); return 0; } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 76e7225ccfd..e275e97a4d3 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -10,7 +10,7 @@ class CCanvasWindow : public CWindowImpl<CCanvasWindow> { public: - DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + DECLARE_WND_CLASS_EX(L"ReactOSPaintCanvas", CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, COLOR_APPWORKSPACE) BEGIN_MSG_MAP(CCanvasWindow) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index c56eaaf5f49..36841639d5e 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -113,22 +113,21 @@ LRESULT CAttributesDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, if (g_isAFile) { - TCHAR date[100]; - TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &g_fileTime, NULL, date, _countof(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &g_fileTime, NULL, temp, _countof(temp)); - _tcscat(date, _T(" ")); - _tcscat(date, temp); - CString strSize; + WCHAR date[100], temp[100]; + GetDateFormatW(LOCALE_USER_DEFAULT, 0, &g_fileTime, NULL, date, _countof(date)); + GetTimeFormatW(LOCALE_USER_DEFAULT, 0, &g_fileTime, NULL, temp, _countof(temp)); + StringCchCatW(date, _countof(date), L" "); + StringCchCatW(date, _countof(date), temp); + CStringW strSize; strSize.Format(IDS_FILESIZE, g_fileSize); SetDlgItemText(IDD_ATTRIBUTESTEXT6, date); SetDlgItemText(IDD_ATTRIBUTESTEXT7, strSize); } - CString strUnit; + CStringW strUnit; GetDlgItemText(IDD_ATTRIBUTESTEXT8, strUnit); - CString strRes; + CStringW strRes; if (strUnit == L"dpi") strRes.Format(IDS_PRINTRES, ROUND(g_xDpi), ROUND(g_yDpi)); else @@ -173,10 +172,10 @@ LRESULT CAttributesDialog::OnRadioButton1(WORD wNotifyCode, WORD wID, HWND hWndC if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1) != BST_CHECKED) return 0; - CString strNum; - strNum.Format(_T("%.3lf"), newWidth / g_xDpi); + CStringW strNum; + strNum.Format(L"%.3lf", newWidth / g_xDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), newHeight / g_yDpi); + strNum.Format(L"%.3lf", newHeight / g_yDpi); SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); return 0; } @@ -186,10 +185,10 @@ LRESULT CAttributesDialog::OnRadioButton2(WORD wNotifyCode, WORD wID, HWND hWndC if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2) != BST_CHECKED) return 0; - CString strNum; - strNum.Format(_T("%.3lf"), newWidth / PpcmFromDpi(g_xDpi)); + CStringW strNum; + strNum.Format(L"%.3lf", newWidth / PpcmFromDpi(g_xDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT1, strNum); - strNum.Format(_T("%.3lf"), newHeight / PpcmFromDpi(g_yDpi)); + strNum.Format(L"%.3lf", newHeight / PpcmFromDpi(g_yDpi)); SetDlgItemText(IDD_ATTRIBUTESEDIT2, strNum); return 0; } @@ -208,21 +207,21 @@ LRESULT CAttributesDialog::OnEdit1(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO { if (Edit_GetModify(hWndCtl)) { - TCHAR tempS[100]; + WCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); - newWidth = max(1, (int) (_tcstod(tempS, NULL) * g_xDpi)); + newWidth = max(1, (int)(wcstod(tempS, NULL) * g_xDpi)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); - newWidth = max(1, (int) (_tcstod(tempS, NULL) * PpcmFromDpi(g_xDpi))); + newWidth = max(1, (int)(wcstod(tempS, NULL) * PpcmFromDpi(g_xDpi))); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { GetDlgItemText(IDD_ATTRIBUTESEDIT1, tempS, _countof(tempS)); - newWidth = max(1, _tstoi(tempS)); + newWidth = max(1, _wtoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); } @@ -233,21 +232,21 @@ LRESULT CAttributesDialog::OnEdit2(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOO { if (Edit_GetModify(hWndCtl)) { - TCHAR tempS[100]; + WCHAR tempS[100]; if (IsDlgButtonChecked(IDD_ATTRIBUTESRB1)) { GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); - newHeight = max(1, (int) (_tcstod(tempS, NULL) * g_yDpi)); + newHeight = max(1, (int)(wcstod(tempS, NULL) * g_yDpi)); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB2)) { GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); - newHeight = max(1, (int) (_tcstod(tempS, NULL) * PpcmFromDpi(g_yDpi))); + newHeight = max(1, (int)(wcstod(tempS, NULL) * PpcmFromDpi(g_yDpi))); } else if (IsDlgButtonChecked(IDD_ATTRIBUTESRB3)) { GetDlgItemText(IDD_ATTRIBUTESEDIT2, tempS, _countof(tempS)); - newHeight = max(1, _tstoi(tempS)); + newHeight = max(1, _wtoi(tempS)); } Edit_SetModify(hWndCtl, FALSE); } @@ -273,9 +272,7 @@ LRESULT CStretchSkewDialog::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO LRESULT CStretchSkewDialog::OnOk(WORD wNotifyCode, WORD wID, HWND hWndCtl, BOOL& bHandled) { - CString strrcIntNumbers; - CString strrcPercentage; - CString strrcAngle; + CStringW strrcIntNumbers, strrcPercentage, strrcAngle; BOOL tr1, tr2, tr3, tr4; strrcIntNumbers.LoadString(g_hinstExe, IDS_INTNUMBERS); @@ -305,11 +302,11 @@ LRESULT CStretchSkewDialog::OnCancel(WORD wNotifyCode, WORD wID, HWND hWndCtl, B } static INT CALLBACK -EnumFontFamProc(ENUMLOGFONT *lpelf, NEWTEXTMETRIC *lpntm, INT FontType, LPARAM lParam) +EnumFontFamProc(ENUMLOGFONTW *lpelf, NEWTEXTMETRICW *lpntm, INT FontType, LPARAM lParam) { - CSimpleArray<CString>& arrFontNames = *reinterpret_cast<CSimpleArray<CString>*>(lParam); - LPTSTR name = lpelf->elfLogFont.lfFaceName; - if (name[0] == TEXT('@')) // Vertical fonts + CSimpleArray<CStringW>& arrFontNames = *reinterpret_cast<CSimpleArray<CStringW>*>(lParam); + LPWSTR name = lpelf->elfLogFont.lfFaceName; + if (name[0] == L'@') // Vertical fonts return TRUE; for (INT i = 0; i < arrFontNames.GetSize(); ++i) @@ -331,24 +328,24 @@ CFontsDialog::CFontsDialog() void CFontsDialog::InitFontNames() { // List the fonts - CSimpleArray<CString> arrFontNames; + CSimpleArray<CStringW> arrFontNames; HDC hDC = CreateCompatibleDC(NULL); if (hDC) { - EnumFontFamilies(hDC, NULL, (FONTENUMPROC)EnumFontFamProc, - reinterpret_cast<LPARAM>(&arrFontNames)); - DeleteDC(hDC); + EnumFontFamiliesW(hDC, NULL, (FONTENUMPROCW)EnumFontFamProc, + reinterpret_cast<LPARAM>(&arrFontNames)); + ::DeleteDC(hDC); } // Actually add them to the combobox HWND hwndNames = GetDlgItem(IDD_FONTSNAMES); - SendMessage(hwndNames, CB_RESETCONTENT, 0, 0); + ::SendMessageW(hwndNames, CB_RESETCONTENT, 0, 0); for (INT i = 0; i < arrFontNames.GetSize(); ++i) { ComboBox_AddString(hwndNames, arrFontNames[i]); } - ::SetWindowText(hwndNames, registrySettings.strFontName); + ::SetWindowTextW(hwndNames, registrySettings.strFontName); } void CFontsDialog::InitFontSizes() @@ -373,26 +370,26 @@ void CFontsDialog::InitFontSizes() if (ComboBox_GetCurSel(hwndSizes) == CB_ERR) { StringCchPrintfW(szText, _countof(szText), L"%d", (INT)registrySettings.PointSize); - ::SetWindowText(hwndSizes, szText); + ::SetWindowTextW(hwndSizes, szText); } } void CFontsDialog::InitToolbar() { HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); - SendMessage(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - SendMessage(hwndToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(16, 16)); - SendMessage(hwndToolbar, TB_SETBUTTONWIDTH, 0, MAKELPARAM(20, 20)); + ::SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + ::SendMessageW(hwndToolbar, TB_SETBITMAPSIZE, 0, MAKELPARAM(16, 16)); + ::SendMessageW(hwndToolbar, TB_SETBUTTONWIDTH, 0, MAKELPARAM(20, 20)); TBADDBITMAP AddBitmap; AddBitmap.hInst = g_hinstExe; AddBitmap.nID = IDB_FONTSTOOLBAR; - SendMessage(hwndToolbar, TB_ADDBITMAP, 4, (LPARAM)&AddBitmap); + ::SendMessageW(hwndToolbar, TB_ADDBITMAP, 4, (LPARAM)&AddBitmap); - HIMAGELIST himl = ImageList_LoadImage(g_hinstExe, MAKEINTRESOURCE(IDB_FONTSTOOLBAR), + HIMAGELIST himl = ImageList_LoadImage(g_hinstExe, MAKEINTRESOURCEW(IDB_FONTSTOOLBAR), 16, 8, RGB(255, 0, 255), IMAGE_BITMAP, LR_CREATEDIBSECTION); - SendMessage(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl); + ::SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)himl); TBBUTTON buttons[] = { @@ -401,11 +398,11 @@ void CFontsDialog::InitToolbar() { 2, IDM_UNDERLINE, TBSTATE_ENABLED, TBSTYLE_CHECK }, { 3, IDM_VERTICAL, 0, TBSTYLE_CHECK }, // TODO: }; - SendMessage(hwndToolbar, TB_ADDBUTTONS, _countof(buttons), (LPARAM)&buttons); + ::SendMessageW(hwndToolbar, TB_ADDBUTTONS, _countof(buttons), (LPARAM)&buttons); - SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_BOLD, registrySettings.Bold); - SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_ITALIC, registrySettings.Italic); - SendMessage(hwndToolbar, TB_CHECKBUTTON, IDM_UNDERLINE, registrySettings.Underline); + ::SendMessageW(hwndToolbar, TB_CHECKBUTTON, IDM_BOLD, registrySettings.Bold); + ::SendMessageW(hwndToolbar, TB_CHECKBUTTON, IDM_ITALIC, registrySettings.Italic); + ::SendMessageW(hwndToolbar, TB_CHECKBUTTON, IDM_UNDERLINE, registrySettings.Underline); } LRESULT CFontsDialog::OnInitDialog(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -441,7 +438,7 @@ void CFontsDialog::OnFontName(UINT codeNotify) HWND hwndNames = GetDlgItem(IDD_FONTSNAMES); INT iItem = CB_ERR; UINT cch; - TCHAR szText[LF_FACESIZE]; + WCHAR szText[LF_FACESIZE]; switch (codeNotify) { @@ -449,9 +446,7 @@ void CFontsDialog::OnFontName(UINT codeNotify) iItem = ComboBox_GetCurSel(hwndNames); cch = ComboBox_GetLBTextLen(hwndNames, iItem); if (iItem != CB_ERR && 0 < cch && cch < _countof(szText)) - { ComboBox_GetLBText(hwndNames, iItem, szText); - } break; case CBN_EDITCHANGE: @@ -482,13 +477,13 @@ void CFontsDialog::OnFontSize(UINT codeNotify) if (iItem != CB_ERR && 0 < cch && cch < _countof(szText)) { ComboBox_GetLBText(hwndSizes, iItem, szText); - PointSize = _ttoi(szText); + PointSize = _wtoi(szText); } break; case CBN_EDITCHANGE: - ::GetWindowText(hwndSizes, szText, _countof(szText)); - PointSize = _ttoi(szText); + ::GetWindowTextW(hwndSizes, szText, _countof(szText)); + PointSize = _wtoi(szText); break; } @@ -504,7 +499,7 @@ LRESULT CFontsDialog::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b UINT id = LOWORD(wParam); UINT codeNotify = HIWORD(wParam); HWND hwndToolbar = GetDlgItem(IDD_FONTSTOOLBAR); - BOOL bChecked = (BOOL)::SendMessage(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); + BOOL bChecked = (BOOL)::SendMessageW(hwndToolbar, TB_ISBUTTONCHECKED, id, 0); switch (id) { @@ -548,14 +543,14 @@ LRESULT CFontsDialog::OnNotify(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH NMHDR *pnmhdr = reinterpret_cast<NMHDR *>(lParam); if (pnmhdr->code == TTN_NEEDTEXT) { - LPTOOLTIPTEXT pToolTip = reinterpret_cast<LPTOOLTIPTEXT>(lParam); + LPTOOLTIPTEXTW pToolTip = reinterpret_cast<LPTOOLTIPTEXTW>(lParam); pToolTip->hinst = g_hinstExe; switch (pnmhdr->idFrom) { - case IDM_BOLD: pToolTip->lpszText = MAKEINTRESOURCE(IDS_BOLD); break; - case IDM_ITALIC: pToolTip->lpszText = MAKEINTRESOURCE(IDS_ITALIC); break; - case IDM_UNDERLINE: pToolTip->lpszText = MAKEINTRESOURCE(IDS_UNDERLINE); break; - case IDM_VERTICAL: pToolTip->lpszText = MAKEINTRESOURCE(IDS_VERTICAL); break; + case IDM_BOLD: pToolTip->lpszText = MAKEINTRESOURCEW(IDS_BOLD); break; + case IDM_ITALIC: pToolTip->lpszText = MAKEINTRESOURCEW(IDS_ITALIC); break; + case IDM_UNDERLINE: pToolTip->lpszText = MAKEINTRESOURCEW(IDS_UNDERLINE); break; + case IDM_VERTICAL: pToolTip->lpszText = MAKEINTRESOURCEW(IDS_VERTICAL); break; default: break; @@ -604,29 +599,29 @@ LRESULT CFontsDialog::OnDrawItem(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& if (pDrawItem->itemID == (UINT)-1) return TRUE; - SetBkMode(pDrawItem->hDC, TRANSPARENT); + ::SetBkMode(pDrawItem->hDC, TRANSPARENT); HWND hwndItem = pDrawItem->hwndItem; RECT rcItem = pDrawItem->rcItem; if (pDrawItem->itemState & ODS_SELECTED) { - FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_HIGHLIGHT)); - SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); + ::FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_HIGHLIGHT)); + ::SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_HIGHLIGHTTEXT)); } else { - FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_WINDOW)); - SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_WINDOWTEXT)); + ::FillRect(pDrawItem->hDC, &rcItem, GetSysColorBrush(COLOR_WINDOW)); + ::SetTextColor(pDrawItem->hDC, GetSysColor(COLOR_WINDOWTEXT)); } - TCHAR szText[LF_FACESIZE]; + WCHAR szText[LF_FACESIZE]; if ((UINT)ComboBox_GetLBTextLen(hwndItem, pDrawItem->itemID) < _countof(szText)) { szText[0] = 0; ComboBox_GetLBText(hwndItem, pDrawItem->itemID, szText); rcItem.left += 24; - DrawText(pDrawItem->hDC, szText, -1, &rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE); + ::DrawTextW(pDrawItem->hDC, szText, -1, &rcItem, DT_LEFT | DT_VCENTER | DT_SINGLELINE); } if (pDrawItem->itemState & ODS_FOCUS) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 2c13cc2f785..d6ea224de79 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -87,7 +87,7 @@ CreateColorDIB(int width, int height, COLORREF rgb) HBITMAP CopyMonoImage(HBITMAP hbm, INT cx, INT cy) { BITMAP bm; - if (!GetObject(hbm, sizeof(bm), &bm)) + if (!::GetObjectW(hbm, sizeof(bm), &bm)) return NULL; if (cx == 0 || cy == 0) @@ -96,19 +96,19 @@ HBITMAP CopyMonoImage(HBITMAP hbm, INT cx, INT cy) cy = bm.bmHeight; } - HBITMAP hbmNew = CreateBitmap(cx, cy, 1, 1, NULL); + HBITMAP hbmNew = ::CreateBitmap(cx, cy, 1, 1, NULL); if (!hbmNew) return NULL; - HDC hdc1 = CreateCompatibleDC(NULL); - HDC hdc2 = CreateCompatibleDC(NULL); - HGDIOBJ hbm1Old = SelectObject(hdc1, hbm); - HGDIOBJ hbm2Old = SelectObject(hdc2, hbmNew); - StretchBlt(hdc2, 0, 0, cx, cy, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); - SelectObject(hdc1, hbm1Old); - SelectObject(hdc2, hbm2Old); - DeleteDC(hdc1); - DeleteDC(hdc2); + HDC hdc1 = ::CreateCompatibleDC(NULL); + HDC hdc2 = ::CreateCompatibleDC(NULL); + HGDIOBJ hbm1Old = ::SelectObject(hdc1, hbm); + HGDIOBJ hbm2Old = ::SelectObject(hdc2, hbmNew); + ::StretchBlt(hdc2, 0, 0, cx, cy, hdc1, 0, 0, bm.bmWidth, bm.bmHeight, SRCCOPY); + ::SelectObject(hdc1, hbm1Old); + ::SelectObject(hdc2, hbm2Old); + ::DeleteDC(hdc1); + ::DeleteDC(hdc2); return hbmNew; } @@ -120,7 +120,7 @@ HBITMAP CachedBufferDIB(HBITMAP hbm, int minimalWidth, int minimalHeight) minimalHeight = 1; BITMAP bm; - if (!GetObject(hbm, sizeof(bm), &bm)) + if (!GetObjectW(hbm, sizeof(bm), &bm)) hbm = NULL; if (hbm && minimalWidth <= bm.bmWidth && minimalHeight <= bm.bmHeight) @@ -136,7 +136,7 @@ int GetDIBWidth(HBITMAP hBitmap) { BITMAP bm; - GetObject(hBitmap, sizeof(BITMAP), &bm); + ::GetObjectW(hBitmap, sizeof(BITMAP), &bm); return bm.bmWidth; } @@ -144,7 +144,7 @@ int GetDIBHeight(HBITMAP hBitmap) { BITMAP bm; - GetObject(hBitmap, sizeof(BITMAP), &bm); + ::GetObjectW(hBitmap, sizeof(BITMAP), &bm); return bm.bmHeight; } @@ -211,8 +211,8 @@ void SetFileInfo(LPCWSTR name, LPWIN32_FIND_DATAW pFound, BOOL isAFile) } // set title - CString strTitle; - strTitle.Format(IDS_WINDOWTITLE, PathFindFileName(g_szFileName)); + CStringW strTitle; + strTitle.Format(IDS_WINDOWTITLE, PathFindFileNameW(g_szFileName)); mainWindow.SetWindowText(strTitle); // update file info and recent @@ -258,7 +258,7 @@ HBITMAP DoLoadImageFile(HWND hwnd, LPCWSTR name, BOOL fIsMainFile) CWaitCursor waitCursor; // find the file - WIN32_FIND_DATA find; + WIN32_FIND_DATAW find; HANDLE hFind = ::FindFirstFileW(name, &find); if (hFind == INVALID_HANDLE_VALUE) // does not exist { @@ -358,7 +358,7 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) const double eTan = tan(abs(nDegree) * M_PI / 180); BITMAP bm; - GetObjectW(hbm, sizeof(bm), &bm); + ::GetObjectW(hbm, sizeof(bm), &bm); INT cx = bm.bmWidth, cy = bm.bmHeight, dx = 0, dy = 0; if (bVertical) dy = INT(cx * eTan); @@ -384,9 +384,9 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { INT delta = INT(x * eTan); if (nDegree > 0) - BitBlt(hDC2, x, (dy - delta), 1, cy, hDC1, x, 0, SRCCOPY); + ::BitBlt(hDC2, x, (dy - delta), 1, cy, hDC1, x, 0, SRCCOPY); else - BitBlt(hDC2, x, delta, 1, cy, hDC1, x, 0, SRCCOPY); + ::BitBlt(hDC2, x, delta, 1, cy, hDC1, x, 0, SRCCOPY); } } else @@ -395,9 +395,9 @@ HBITMAP SkewDIB(HDC hDC1, HBITMAP hbm, INT nDegree, BOOL bVertical, BOOL bMono) { INT delta = INT(y * eTan); if (nDegree > 0) - BitBlt(hDC2, (dx - delta), y, cx, 1, hDC1, 0, y, SRCCOPY); + ::BitBlt(hDC2, (dx - delta), y, cx, 1, hDC1, 0, y, SRCCOPY); else - BitBlt(hDC2, delta, y, cx, 1, hDC1, 0, y, SRCCOPY); + ::BitBlt(hDC2, delta, y, cx, 1, hDC1, 0, y, SRCCOPY); } } @@ -416,7 +416,7 @@ HGLOBAL BitmapToClipboardDIB(HBITMAP hBitmap) CWaitCursor waitCursor; BITMAP bm; - if (!GetObject(hBitmap, sizeof(BITMAP), &bm)) + if (!GetObjectW(hBitmap, sizeof(BITMAP), &bm)) return NULL; BITMAPINFODX bmi; @@ -600,7 +600,7 @@ HBITMAP ConvertToBlackAndWhite(HBITMAP hbm) CWaitCursor waitCursor; BITMAP bm; - if (!::GetObject(hbm, sizeof(bm), &bm)) + if (!::GetObjectW(hbm, sizeof(bm), &bm)) return NULL; BITMAPINFOEX bmi; diff --git a/base/applications/mspaint/drawing.cpp b/base/applications/mspaint/drawing.cpp index 3b7579196ce..77d78d465b4 100644 --- a/base/applications/mspaint/drawing.cpp +++ b/base/applications/mspaint/drawing.cpp @@ -253,38 +253,37 @@ RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2) } void -Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style) +Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCWSTR lpchText, HFONT font, LONG style) { - INT iSaveDC = SaveDC(hdc); // We will modify the clipping region. Save now. + INT iSaveDC = ::SaveDC(hdc); // We will modify the clipping region. Save now. RECT rc; - SetRect(&rc, x1, y1, x2, y2); + ::SetRect(&rc, x1, y1, x2, y2); if (style == 0) // Transparent { - SetBkMode(hdc, TRANSPARENT); - GetBkColor(hdc); + ::SetBkMode(hdc, TRANSPARENT); } else // Opaque { - SetBkMode(hdc, OPAQUE); - SetBkColor(hdc, bg); + ::SetBkMode(hdc, OPAQUE); + ::SetBkColor(hdc, bg); - HBRUSH hbr = CreateSolidBrush(bg); - FillRect(hdc, &rc, hbr); // Fill the background - DeleteObject(hbr); + HBRUSH hbr = ::CreateSolidBrush(bg); + ::FillRect(hdc, &rc, hbr); // Fill the background + ::DeleteObject(hbr); } IntersectClipRect(hdc, rc.left, rc.top, rc.right, rc.bottom); - HGDIOBJ hFontOld = SelectObject(hdc, font); - SetTextColor(hdc, fg); + HGDIOBJ hFontOld = ::SelectObject(hdc, font); + ::SetTextColor(hdc, fg); const UINT uFormat = DT_LEFT | DT_TOP | DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_EXPANDTABS | DT_WORDBREAK; - DrawText(hdc, lpchText, -1, &rc, uFormat); - SelectObject(hdc, hFontOld); + ::DrawTextW(hdc, lpchText, -1, &rc, uFormat); + ::SelectObject(hdc, hFontOld); - RestoreDC(hdc, iSaveDC); // Restore + ::RestoreDC(hdc, iSaveDC); // Restore } BOOL diff --git a/base/applications/mspaint/drawing.h b/base/applications/mspaint/drawing.h index 44936f08503..676bb578bb7 100644 --- a/base/applications/mspaint/drawing.h +++ b/base/applications/mspaint/drawing.h @@ -31,7 +31,7 @@ void Brush(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF color, LONG sty void RectSel(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2); -void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCTSTR lpchText, HFONT font, LONG style); +void Text(HDC hdc, LONG x1, LONG y1, LONG x2, LONG y2, COLORREF fg, COLORREF bg, LPCWSTR lpchText, HFONT font, LONG style); BOOL ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight, diff --git a/base/applications/mspaint/fullscreen.cpp b/base/applications/mspaint/fullscreen.cpp index 53e7f8ceb30..8443cedeb6c 100644 --- a/base/applications/mspaint/fullscreen.cpp +++ b/base/applications/mspaint/fullscreen.cpp @@ -22,8 +22,8 @@ HWND CFullscreenWindow::DoCreate() LRESULT CFullscreenWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - SendMessage(WM_SETICON, ICON_BIG, (LPARAM) LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); - SendMessage(WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_BIG, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_SMALL, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); return 0; } diff --git a/base/applications/mspaint/fullscreen.h b/base/applications/mspaint/fullscreen.h index 02efcca0c91..e335bb2e0c5 100644 --- a/base/applications/mspaint/fullscreen.h +++ b/base/applications/mspaint/fullscreen.h @@ -10,7 +10,7 @@ class CFullscreenWindow : public CWindowImpl<CFullscreenWindow> { public: - DECLARE_WND_CLASS_EX(_T("FullscreenWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + DECLARE_WND_CLASS_EX(L"FullscreenWindow", CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, COLOR_BACKGROUND) BEGIN_MSG_MAP(CFullscreenWindow) diff --git a/base/applications/mspaint/globalvar.h b/base/applications/mspaint/globalvar.h index 7c27a1cc3d2..cb6eed1ebd4 100644 --- a/base/applications/mspaint/globalvar.h +++ b/base/applications/mspaint/globalvar.h @@ -15,7 +15,7 @@ extern POINT g_ptStart, g_ptEnd; extern HINSTANCE g_hinstExe; -extern TCHAR g_szFileName[MAX_LONG_PATH]; +extern WCHAR g_szFileName[MAX_LONG_PATH]; extern BOOL g_isAFile; extern BOOL g_imageSaved; extern BOOL g_showGrid; diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 22aaf6835f4..9c0d18f5878 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -179,7 +179,7 @@ void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) NotifyImageChanged(); } -void ImageModel::SaveImage(LPCTSTR lpFileName) +void ImageModel::SaveImage(LPCWSTR lpFileName) { SaveDIBToFile(m_hBms[m_currInd], lpFileName, TRUE); } @@ -266,8 +266,8 @@ void ImageModel::RotateNTimes90Degrees(int iN) case 2: { PushImageForUndo(); - StretchBlt(m_hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), - m_hDrawingDC, 0, 0, GetWidth(), GetHeight(), SRCCOPY); + ::StretchBlt(m_hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), + m_hDrawingDC, 0, 0, GetWidth(), GetHeight(), SRCCOPY); break; } } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 716db560a8e..14b5e38a582 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -25,7 +25,7 @@ public: void Redo(void); void ClearHistory(void); void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); - void SaveImage(LPCTSTR lpFileName); + void SaveImage(LPCWSTR lpFileName); BOOL IsImageSaved() const; void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); int GetWidth() const; diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 0f133cbe485..b98f8ee841b 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -13,7 +13,7 @@ POINT g_ptStart, g_ptEnd; BOOL g_askBeforeEnlarging = FALSE; // TODO: initialize from registry HINSTANCE g_hinstExe = NULL; -TCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; +WCHAR g_szFileName[MAX_LONG_PATH] = { 0 }; WCHAR g_szMailTempFile[MAX_LONG_PATH] = { 0 }; BOOL g_isAFile = FALSE; BOOL g_imageSaved = FALSE; @@ -37,18 +37,18 @@ void ShowOutOfMemory(void) // get file name extension from filter string static BOOL -FileExtFromFilter(LPTSTR pExt, OPENFILENAME *pOFN) +FileExtFromFilter(LPWSTR pExt, OPENFILENAME *pOFN) { - LPTSTR pchExt = pExt; + LPWSTR pchExt = pExt; *pchExt = 0; DWORD nIndex = 1; - for (LPCTSTR pch = pOFN->lpstrFilter; *pch; ++nIndex) + for (LPCWSTR pch = pOFN->lpstrFilter; *pch; ++nIndex) { pch += lstrlen(pch) + 1; if (pOFN->nFilterIndex == nIndex) { - for (++pch; *pch && *pch != _T(';'); ++pch) + for (++pch; *pch && *pch != L';'; ++pch) { *pchExt++ = *pch; } @@ -66,12 +66,12 @@ static UINT_PTR APIENTRY OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hParent; - OFNOTIFY *pon; + OFNOTIFYW *pon; WCHAR Path[MAX_PATH]; switch (uMsg) { case WM_NOTIFY: - pon = (OFNOTIFY *)lParam; + pon = (OFNOTIFYW *)lParam; if (pon->hdr.code == CDN_TYPECHANGE) { hParent = GetParent(hwnd); @@ -195,21 +195,21 @@ BOOL OpenMailer(HWND hWnd, LPCWSTR pszPathName) return FALSE; // Failure } -BOOL CMainWindow::GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) +BOOL CMainWindow::GetOpenFileName(IN OUT LPWSTR pszFile, INT cchMaxFile) { - static OPENFILENAME ofn = { 0 }; - static CString strFilter; + static OPENFILENAMEW ofn = { 0 }; + static CStringW strFilter; if (ofn.lStructSize == 0) { // The "All Files" item text - CString strAllPictureFiles; + CStringW strAllPictureFiles; strAllPictureFiles.LoadString(g_hinstExe, IDS_ALLPICTUREFILES); // Get the import filter CSimpleArray<GUID> aguidFileTypesI; CImage::GetImporterFilterString(strFilter, aguidFileTypesI, strAllPictureFiles, - CImage::excludeDefaultLoad, _T('\0')); + CImage::excludeDefaultLoad, UNICODE_NULL); // Initializing the OPENFILENAME structure for GetOpenFileName ZeroMemory(&ofn, sizeof(ofn)); @@ -223,20 +223,20 @@ BOOL CMainWindow::GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) ofn.lpstrFile = pszFile; ofn.nMaxFile = cchMaxFile; - return ::GetOpenFileName(&ofn); + return ::GetOpenFileNameW(&ofn); } -BOOL CMainWindow::GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) +BOOL CMainWindow::GetSaveFileName(IN OUT LPWSTR pszFile, INT cchMaxFile) { - static OPENFILENAME sfn = { 0 }; - static CString strFilter; + static OPENFILENAMEW sfn = { 0 }; + static CStringW strFilter; if (sfn.lStructSize == 0) { // Get the export filter CSimpleArray<GUID> aguidFileTypesE; CImage::GetExporterFilterString(strFilter, aguidFileTypesE, NULL, - CImage::excludeDefaultSave, _T('\0')); + CImage::excludeDefaultSave, UNICODE_NULL); // Initializing the OPENFILENAME structure for GetSaveFileName ZeroMemory(&sfn, sizeof(sfn)); @@ -266,7 +266,7 @@ BOOL CMainWindow::GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) sfn.lpstrFile = pszFile; sfn.nMaxFile = cchMaxFile; - return ::GetSaveFileName(&sfn); + return ::GetSaveFileNameW(&sfn); } BOOL CMainWindow::ChooseColor(IN OUT COLORREF *prgbColor) @@ -298,9 +298,9 @@ BOOL CMainWindow::ChooseColor(IN OUT COLORREF *prgbColor) HWND CMainWindow::DoCreate() { - ::LoadString(g_hinstExe, IDS_DEFAULTFILENAME, g_szFileName, _countof(g_szFileName)); + ::LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, g_szFileName, _countof(g_szFileName)); - CString strTitle; + CStringW strTitle; strTitle.Format(IDS_WINDOWTITLE, PathFindFileName(g_szFileName)); RECT& rc = registrySettings.WindowPlacement.rcNormalPosition; @@ -309,7 +309,7 @@ HWND CMainWindow::DoCreate() // entry point INT WINAPI -_tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nCmdShow) +wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, INT nCmdShow) { g_hinstExe = hInstance; @@ -325,7 +325,7 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC // Create the main window if (!mainWindow.DoCreate()) { - MessageBox(NULL, TEXT("Failed to create main window."), NULL, MB_ICONERROR); + MessageBox(NULL, L"Failed to create main window.", NULL, MB_ICONERROR); return 1; } @@ -337,7 +337,7 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC mainWindow.ShowWindow(registrySettings.WindowPlacement.showCmd); // Load the access keys - HACCEL hAccel = ::LoadAccelerators(hInstance, MAKEINTRESOURCE(800)); + HACCEL hAccel = ::LoadAcceleratorsW(hInstance, MAKEINTRESOURCEW(800)); // The message loop MSG msg; @@ -346,7 +346,7 @@ _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, INT nC if (fontsDialog.IsWindow() && fontsDialog.IsDialogMessage(&msg)) continue; - if (::TranslateAccelerator(mainWindow, hAccel, &msg)) + if (::TranslateAcceleratorW(mainWindow, hAccel, &msg)) continue; ::TranslateMessage(&msg); diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index dc9eacbca2f..907dcf5d759 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -36,8 +36,8 @@ HWND CMiniatureWindow::DoCreate(HWND hwndParent) (LONG)(registrySettings.ThumbYPos + registrySettings.ThumbHeight) }; - TCHAR strTitle[100]; - ::LoadString(g_hinstExe, IDS_MINIATURETITLE, strTitle, _countof(strTitle)); + WCHAR strTitle[100]; + ::LoadStringW(g_hinstExe, IDS_MINIATURETITLE, strTitle, _countof(strTitle)); DWORD style = WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME; return Create(hwndParent, rc, strTitle, style, WS_EX_PALETTEWINDOW); diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index 7c7d30d2c7f..6e9fdacc370 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -11,7 +11,7 @@ class CMiniatureWindow : public CWindowImpl<CMiniatureWindow> { public: - DECLARE_WND_CLASS_EX(_T("MiniatureWindow"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + DECLARE_WND_CLASS_EX(L"MiniatureWindow", CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, COLOR_BTNFACE) BEGIN_MSG_MAP(CMiniatureWindow) diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 01379f97dc7..d4b22296a16 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -703,7 +703,7 @@ struct TextTool : ToolBase void draw(HDC hdc) { - CString szText; + CStringW szText; textEditWindow.GetWindowText(szText); RECT rc; diff --git a/base/applications/mspaint/palette.h b/base/applications/mspaint/palette.h index d9268dcf2c6..856f2e2233b 100644 --- a/base/applications/mspaint/palette.h +++ b/base/applications/mspaint/palette.h @@ -14,7 +14,7 @@ class CPaletteWindow : public CWindowImpl<CPaletteWindow> { public: - DECLARE_WND_CLASS_EX(_T("Palette"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(L"Palette", CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CPaletteWindow) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index 07778117ae8..68c54f5201c 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -15,18 +15,18 @@ RegistrySettings registrySettings; /* FUNCTIONS ********************************************************/ -static void ReadDWORD(CRegKey &key, LPCTSTR lpName, DWORD &dwValue) +static void ReadDWORD(CRegKey &key, LPCWSTR lpName, DWORD &dwValue) { DWORD dwTemp; if (key.QueryDWORDValue(lpName, dwTemp) == ERROR_SUCCESS) dwValue = dwTemp; } -static void ReadString(CRegKey &key, LPCTSTR lpName, CString &strValue, LPCTSTR lpDefault = TEXT("")) +static void ReadString(CRegKey &key, LPCWSTR lpName, CStringW &strValue, LPCWSTR lpDefault = L"") { - CString strTemp; + CStringW strTemp; ULONG nChars = MAX_PATH; - LPTSTR psz = strTemp.GetBuffer(nChars); + LPWSTR psz = strTemp.GetBuffer(nChars); LONG error = key.QueryStringValue(lpName, psz, &nChars); strTemp.ReleaseBuffer(); @@ -36,15 +36,15 @@ static void ReadString(CRegKey &key, LPCTSTR lpName, CString &strValue, LPCTSTR strValue = lpDefault; } -void RegistrySettings::SetWallpaper(LPCTSTR szFileName, RegistrySettings::WallpaperStyle style) +void RegistrySettings::SetWallpaper(LPCWSTR szFileName, RegistrySettings::WallpaperStyle style) { CRegKey desktop; - if (desktop.Open(HKEY_CURRENT_USER, _T("Control Panel\\Desktop")) == ERROR_SUCCESS) + if (desktop.Open(HKEY_CURRENT_USER, L"Control Panel\\Desktop") == ERROR_SUCCESS) { - desktop.SetStringValue(_T("Wallpaper"), szFileName); + desktop.SetStringValue(L"Wallpaper", szFileName); - desktop.SetStringValue(_T("WallpaperStyle"), (style == RegistrySettings::STRETCHED) ? _T("2") : _T("0")); - desktop.SetStringValue(_T("TileWallpaper"), (style == RegistrySettings::TILED) ? _T("1") : _T("0")); + desktop.SetStringValue(L"WallpaperStyle", (style == RegistrySettings::STRETCHED) ? L"2" : L"0"); + desktop.SetStringValue(L"TileWallpaper", (style == RegistrySettings::TILED) ? L"1" : L"0"); } SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (PVOID) szFileName, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); @@ -77,8 +77,8 @@ void RegistrySettings::LoadPresets(INT nCmdShow) Bar1ID = BAR1ID_TOP; Bar2ID = BAR2ID_LEFT; - LOGFONT lf; - GetObject(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); + LOGFONTW lf; + ::GetObjectW(GetStockObject(DEFAULT_GUI_FONT), sizeof(lf), &lf); strFontName = lf.lfFaceName; ZeroMemory(&WindowPlacement, sizeof(WindowPlacement)); @@ -94,33 +94,33 @@ void RegistrySettings::Load(INT nCmdShow) LoadPresets(nCmdShow); CRegKey paint; - if (paint.Open(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint"), KEY_READ) != ERROR_SUCCESS) + if (paint.Open(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint", KEY_READ) != ERROR_SUCCESS) return; CRegKey view; - if (view.Open(paint, _T("View"), KEY_READ) == ERROR_SUCCESS) + if (view.Open(paint, L"View", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(view, _T("BMPHeight"), BMPHeight); - ReadDWORD(view, _T("BMPWidth"), BMPWidth); - ReadDWORD(view, _T("GridExtent"), GridExtent); - ReadDWORD(view, _T("NoStretching"), NoStretching); - ReadDWORD(view, _T("ShowThumbnail"), ShowThumbnail); - ReadDWORD(view, _T("SnapToGrid"), SnapToGrid); - ReadDWORD(view, _T("ThumbHeight"), ThumbHeight); - ReadDWORD(view, _T("ThumbWidth"), ThumbWidth); - ReadDWORD(view, _T("ThumbXPos"), ThumbXPos); - ReadDWORD(view, _T("ThumbYPos"), ThumbYPos); - ReadDWORD(view, _T("UnitSetting"), UnitSetting); - ReadDWORD(view, _T("ShowStatusBar"), ShowStatusBar); + ReadDWORD(view, L"BMPHeight", BMPHeight); + ReadDWORD(view, L"BMPWidth", BMPWidth); + ReadDWORD(view, L"GridExtent", GridExtent); + ReadDWORD(view, L"NoStretching", NoStretching); + ReadDWORD(view, L"ShowThumbnail", ShowThumbnail); + ReadDWORD(view, L"SnapToGrid", SnapToGrid); + ReadDWORD(view, L"ThumbHeight", ThumbHeight); + ReadDWORD(view, L"ThumbWidth", ThumbWidth); + ReadDWORD(view, L"ThumbXPos", ThumbXPos); + ReadDWORD(view, L"ThumbYPos", ThumbYPos); + ReadDWORD(view, L"UnitSetting", UnitSetting); + ReadDWORD(view, L"ShowStatusBar", ShowStatusBar); ULONG pnBytes = sizeof(WINDOWPLACEMENT); - view.QueryBinaryValue(_T("WindowPlacement"), &WindowPlacement, &pnBytes); + view.QueryBinaryValue(L"WindowPlacement", &WindowPlacement, &pnBytes); } CRegKey files; - if (files.Open(paint, _T("Recent File List"), KEY_READ) == ERROR_SUCCESS) + if (files.Open(paint, L"Recent File List", KEY_READ) == ERROR_SUCCESS) { - TCHAR szName[64]; + WCHAR szName[64]; for (INT i = 0; i < MAX_RECENT_FILES; ++i) { StringCchPrintfW(szName, _countof(szName), L"File%u", i + 1); @@ -129,41 +129,41 @@ void RegistrySettings::Load(INT nCmdShow) } CRegKey text; - if (text.Open(paint, _T("Text"), KEY_READ) == ERROR_SUCCESS) + if (text.Open(paint, L"Text", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(text, _T("Bold"), Bold); - ReadDWORD(text, _T("Italic"), Italic); - ReadDWORD(text, _T("Underline"), Underline); - ReadDWORD(text, _T("CharSet"), CharSet); - ReadDWORD(text, _T("PointSize"), PointSize); - ReadDWORD(text, _T("PositionX"), FontsPositionX); - ReadDWORD(text, _T("PositionY"), FontsPositionY); - ReadDWORD(text, _T("ShowTextTool"), ShowTextTool); - ReadString(text, _T("TypeFaceName"), strFontName, strFontName); + ReadDWORD(text, L"Bold", Bold); + ReadDWORD(text, L"Italic", Italic); + ReadDWORD(text, L"Underline", Underline); + ReadDWORD(text, L"CharSet", CharSet); + ReadDWORD(text, L"PointSize", PointSize); + ReadDWORD(text, L"PositionX", FontsPositionX); + ReadDWORD(text, L"PositionY", FontsPositionY); + ReadDWORD(text, L"ShowTextTool", ShowTextTool); + ReadString(text, L"TypeFaceName", strFontName, strFontName); } CRegKey bar1; - if (bar1.Open(paint, _T("General-Bar1"), KEY_READ) == ERROR_SUCCESS) + if (bar1.Open(paint, L"General-Bar1", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(bar1, _T("BarID"), Bar1ID); + ReadDWORD(bar1, L"BarID", Bar1ID); } CRegKey bar2; - if (bar2.Open(paint, _T("General-Bar2"), KEY_READ) == ERROR_SUCCESS) + if (bar2.Open(paint, L"General-Bar2", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(bar2, _T("BarID"), Bar2ID); + ReadDWORD(bar2, L"BarID", Bar2ID); } CRegKey bar3; - if (bar3.Open(paint, _T("General-Bar3"), KEY_READ) == ERROR_SUCCESS) + if (bar3.Open(paint, L"General-Bar3", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(bar3, _T("Visible"), ShowToolBox); + ReadDWORD(bar3, L"Visible", ShowToolBox); } CRegKey bar4; - if (bar4.Open(paint, _T("General-Bar4"), KEY_READ) == ERROR_SUCCESS) + if (bar4.Open(paint, L"General-Bar4", KEY_READ) == ERROR_SUCCESS) { - ReadDWORD(bar4, _T("Visible"), ShowPalette); + ReadDWORD(bar4, L"Visible", ShowPalette); } // Fix the bitmap size if too large @@ -179,30 +179,30 @@ void RegistrySettings::Store() BMPHeight = imageModel.GetHeight(); CRegKey paint; - if (paint.Create(HKEY_CURRENT_USER, _T("Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint")) != ERROR_SUCCESS) + if (paint.Create(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Applets\\Paint") != ERROR_SUCCESS) return; CRegKey view; - if (view.Create(paint, _T("View")) == ERROR_SUCCESS) + if (view.Create(paint, L"View") == ERROR_SUCCESS) { - view.SetDWORDValue(_T("BMPHeight"), BMPHeight); - view.SetDWORDValue(_T("BMPWidth"), BMPWidth); - view.SetDWORDValue(_T("GridExtent"), GridExtent); - view.SetDWORDValue(_T("NoStretching"), NoStretching); - view.SetDWORDValue(_T("ShowThumbnail"), ShowThumbnail); - view.SetDWORDValue(_T("SnapToGrid"), SnapToGrid); - view.SetDWORDValue(_T("ThumbHeight"), ThumbHeight); - view.SetDWORDValue(_T("ThumbWidth"), ThumbWidth); - 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)); + view.SetDWORDValue(L"BMPHeight", BMPHeight); + view.SetDWORDValue(L"BMPWidth", BMPWidth); + view.SetDWORDValue(L"GridExtent", GridExtent); + view.SetDWORDValue(L"NoStretching", NoStretching); + view.SetDWORDValue(L"ShowThumbnail", ShowThumbnail); + view.SetDWORDValue(L"SnapToGrid", SnapToGrid); + view.SetDWORDValue(L"ThumbHeight", ThumbHeight); + view.SetDWORDValue(L"ThumbWidth", ThumbWidth); + view.SetDWORDValue(L"ThumbXPos", ThumbXPos); + view.SetDWORDValue(L"ThumbYPos", ThumbYPos); + view.SetDWORDValue(L"UnitSetting", UnitSetting); + view.SetDWORDValue(L"ShowStatusBar", ShowStatusBar); + + view.SetBinaryValue(L"WindowPlacement", &WindowPlacement, sizeof(WINDOWPLACEMENT)); } CRegKey files; - if (files.Create(paint, _T("Recent File List")) == ERROR_SUCCESS) + if (files.Create(paint, L"Recent File List") == ERROR_SUCCESS) { WCHAR szName[64]; for (INT iFile = 0; iFile < MAX_RECENT_FILES; ++iFile) @@ -213,45 +213,45 @@ void RegistrySettings::Store() } CRegKey text; - if (text.Create(paint, _T("Text")) == ERROR_SUCCESS) + if (text.Create(paint, L"Text") == ERROR_SUCCESS) { - text.SetDWORDValue(_T("Bold"), Bold); - text.SetDWORDValue(_T("Italic"), Italic); - text.SetDWORDValue(_T("Underline"), Underline); - text.SetDWORDValue(_T("CharSet"), CharSet); - text.SetDWORDValue(_T("PointSize"), PointSize); - text.SetDWORDValue(_T("PositionX"), FontsPositionX); - text.SetDWORDValue(_T("PositionY"), FontsPositionY); - text.SetDWORDValue(_T("ShowTextTool"), ShowTextTool); - text.SetStringValue(_T("TypeFaceName"), strFontName); + text.SetDWORDValue(L"Bold", Bold); + text.SetDWORDValue(L"Italic", Italic); + text.SetDWORDValue(L"Underline", Underline); + text.SetDWORDValue(L"CharSet", CharSet); + text.SetDWORDValue(L"PointSize", PointSize); + text.SetDWORDValue(L"PositionX", FontsPositionX); + text.SetDWORDValue(L"PositionY", FontsPositionY); + text.SetDWORDValue(L"ShowTextTool", ShowTextTool); + text.SetStringValue(L"TypeFaceName", strFontName); } CRegKey bar1; - if (bar1.Create(paint, _T("General-Bar1")) == ERROR_SUCCESS) + if (bar1.Create(paint, L"General-Bar1") == ERROR_SUCCESS) { - bar1.SetDWORDValue(_T("BarID"), Bar1ID); + bar1.SetDWORDValue(L"BarID", Bar1ID); } CRegKey bar2; - if (bar2.Create(paint, _T("General-Bar2")) == ERROR_SUCCESS) + if (bar2.Create(paint, L"General-Bar2") == ERROR_SUCCESS) { - bar2.SetDWORDValue(_T("BarID"), Bar2ID); + bar2.SetDWORDValue(L"BarID", Bar2ID); } CRegKey bar3; - if (bar3.Create(paint, _T("General-Bar3")) == ERROR_SUCCESS) + if (bar3.Create(paint, L"General-Bar3") == ERROR_SUCCESS) { - bar3.SetDWORDValue(_T("Visible"), ShowToolBox); + bar3.SetDWORDValue(L"Visible", ShowToolBox); } CRegKey bar4; - if (bar4.Create(paint, _T("General-Bar4")) == ERROR_SUCCESS) + if (bar4.Create(paint, L"General-Bar4") == ERROR_SUCCESS) { - bar4.SetDWORDValue(_T("Visible"), ShowPalette); + bar4.SetDWORDValue(L"Visible", ShowPalette); } } -void RegistrySettings::SetMostRecentFile(LPCTSTR szPathName) +void RegistrySettings::SetMostRecentFile(LPCWSTR szPathName) { // Register the file to the user's 'Recent' folder if (szPathName && szPathName[0]) @@ -265,7 +265,7 @@ void RegistrySettings::SetMostRecentFile(LPCTSTR szPathName) if (iFound >= 0) { - CString tmp = strFiles[i]; + CStringW tmp = strFiles[i]; strFiles[i] = strFiles[i - 1]; strFiles[i - 1] = tmp; } diff --git a/base/applications/mspaint/registry.h b/base/applications/mspaint/registry.h index d843c7b2be6..41b3a564594 100644 --- a/base/applications/mspaint/registry.h +++ b/base/applications/mspaint/registry.h @@ -28,9 +28,9 @@ public: DWORD UnitSetting; WINDOWPLACEMENT WindowPlacement; - CString strFiles[MAX_RECENT_FILES]; + CStringW strFiles[MAX_RECENT_FILES]; - CString strFontName; + CStringW strFontName; DWORD PointSize; DWORD Bold; DWORD Italic; @@ -61,9 +61,9 @@ public: STRETCHED }; - static void SetWallpaper(LPCTSTR szFileName, WallpaperStyle style); + static void SetWallpaper(LPCWSTR szFileName, WallpaperStyle style); void Load(INT nCmdShow); void Store(); - void SetMostRecentFile(LPCTSTR szPathName); + void SetMostRecentFile(LPCWSTR szPathName); }; diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index c66361da6e4..a9744ba2d61 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -139,7 +139,7 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar return; BITMAP bm; - if (!GetObject(m_hbmColor, sizeof(BITMAP), &bm)) + if (!GetObjectW(m_hbmColor, sizeof(BITMAP), &bm)) return; COLORREF keyColor = (bBgTransparent ? crBg : CLR_INVALID); @@ -516,7 +516,7 @@ void SelectionModel::InvertSelection() TakeOff(); BITMAP bm; - ::GetObject(m_hbmColor, sizeof(bm), &bm); + ::GetObjectW(m_hbmColor, sizeof(bm), &bm); HDC hdc = ::CreateCompatibleDC(NULL); HGDIOBJ hbmOld = ::SelectObject(hdc, m_hbmColor); diff --git a/base/applications/mspaint/sizebox.cpp b/base/applications/mspaint/sizebox.cpp index a389fefb980..37a24cccec0 100644 --- a/base/applications/mspaint/sizebox.cpp +++ b/base/applications/mspaint/sizebox.cpp @@ -21,7 +21,7 @@ BOOL setCursorOnSizeBox(HITTEST hit) { if (HIT_UPPER_LEFT <= hit && hit <= HIT_LOWER_RIGHT) { - ::SetCursor(::LoadCursor(NULL, s_cursor_shapes[hit - HIT_UPPER_LEFT])); + ::SetCursor(::LoadCursorW(NULL, s_cursor_shapes[hit - HIT_UPPER_LEFT])); return TRUE; } return FALSE; diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index c20ca6bf005..981b32687d1 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -44,9 +44,9 @@ void CTextEditWindow::DrawGrip(HDC hDC, RECT& rc) drawSizeBoxes(hDC, &rc, TRUE, NULL); } -void CTextEditWindow::FixEditPos(LPCTSTR pszOldText) +void CTextEditWindow::FixEditPos(LPCWSTR pszOldText) { - CString szText; + CStringW szText; GetWindowText(szText); RECT rcParent; @@ -62,10 +62,10 @@ void CTextEditWindow::FixEditPos(LPCTSTR pszOldText) SelectObject(hDC, m_hFontZoomed); TEXTMETRIC tm; GetTextMetrics(hDC, &tm); - szText += TEXT("x"); // This is a trick to enable the g_ptEnd newlines + szText += L"x"; // This is a trick to enable the g_ptEnd newlines const UINT uFormat = DT_LEFT | DT_TOP | DT_EDITCONTROL | DT_NOPREFIX | DT_NOCLIP | DT_EXPANDTABS | DT_WORDBREAK; - DrawText(hDC, szText, -1, &rcText, uFormat | DT_CALCRECT); + DrawTextW(hDC, szText, -1, &rcText, uFormat | DT_CALCRECT); if (tm.tmDescent > 0) rcText.bottom += tm.tmDescent; ReleaseDC(hDC); @@ -91,7 +91,7 @@ LRESULT CTextEditWindow::OnChar(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b if (wParam == VK_TAB) return 0; // FIXME: Tabs - CString szText; + CStringW szText; GetWindowText(szText); LRESULT ret = DefWindowProc(nMsg, wParam, lParam); @@ -108,7 +108,7 @@ LRESULT CTextEditWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL return 0; } - CString szText; + CStringW szText; GetWindowText(szText); LRESULT ret = DefWindowProc(nMsg, wParam, lParam); @@ -135,7 +135,7 @@ LRESULT CTextEditWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, B FillRect(hDC, &rc, hbr); DeleteObject(hbr); } - SetTextColor(hDC, paletteModel.GetFgColor()); + ::SetTextColor(hDC, paletteModel.GetFgColor()); return TRUE; } @@ -196,7 +196,7 @@ LRESULT CTextEditWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BO UINT nHitTest = LOWORD(lParam); if (nHitTest == HTCAPTION) { - ::SetCursor(::LoadCursor(NULL, IDC_SIZEALL)); // Enable drag move + ::SetCursor(::LoadCursorW(NULL, (LPCWSTR)IDC_SIZEALL)); // Enable drag move return FALSE; } return DefWindowProc(nMsg, wParam, lParam); @@ -336,7 +336,7 @@ void CTextEditWindow::UpdateFont() m_hFontZoomed = NULL; } - LOGFONT lf; + LOGFONTW lf; ZeroMemory(&lf, sizeof(lf)); lf.lfCharSet = DEFAULT_CHARSET; // registrySettings.CharSet; // Ignore lf.lfWeight = (registrySettings.Bold ? FW_BOLD : FW_NORMAL); @@ -493,7 +493,7 @@ LRESULT CTextEditWindow::OnSizing(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CTextEditWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - return ::SendMessage(GetParent(), nMsg, wParam, lParam); + return ::SendMessageW(GetParent(), nMsg, wParam, lParam); } LRESULT CTextEditWindow::OnCut(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) diff --git a/base/applications/mspaint/textedit.h b/base/applications/mspaint/textedit.h index 884d83e8b23..081632e8a31 100644 --- a/base/applications/mspaint/textedit.h +++ b/base/applications/mspaint/textedit.h @@ -17,7 +17,7 @@ public: HWND Create(HWND hwndParent); void DoFillBack(HWND hwnd, HDC hDC); - void FixEditPos(LPCTSTR pszOldText); + void FixEditPos(LPCWSTR pszOldText); void InvalidateEditRect(); void UpdateFont(); BOOL GetEditRect(LPRECT prc) const; diff --git a/base/applications/mspaint/toolbox.cpp b/base/applications/mspaint/toolbox.cpp index 891093f3f77..85216d366af 100644 --- a/base/applications/mspaint/toolbox.cpp +++ b/base/applications/mspaint/toolbox.cpp @@ -20,12 +20,12 @@ CPaintToolBar::ToolBarWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam { // We have to detect clicking on toolbar even if no change of pressed button POINT pt = { GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam) }; - INT index = (INT)::SendMessage(hwnd, TB_HITTEST, 0, (LPARAM)&pt); + INT index = (INT)::SendMessageW(hwnd, TB_HITTEST, 0, (LPARAM)&pt); if (index >= 0) { TBBUTTON button; - if (::SendMessage(hwnd, TB_GETBUTTON, index, (LPARAM)&button)) - ::PostMessage(::GetParent(hwnd), WM_COMMAND, button.idCommand, 0); + if (::SendMessageW(hwnd, TB_GETBUTTON, index, (LPARAM)&button)) + ::PostMessageW(::GetParent(hwnd), WM_COMMAND, button.idCommand, 0); } } return ::CallWindowProc(oldWndProc, hwnd, uMsg, wParam, lParam); @@ -42,26 +42,26 @@ BOOL CPaintToolBar::DoCreate(HWND hwndParent) }; DWORD style = WS_CHILD | WS_VISIBLE | CCS_NOPARENTALIGN | CCS_VERT | CCS_NORESIZE | TBSTYLE_TOOLTIPS | TBSTYLE_FLAT; - if (!CWindow::Create(TOOLBARCLASSNAME, hwndParent, toolbarPos, NULL, style)) + if (!CWindow::Create(TOOLBARCLASSNAMEW, hwndParent, toolbarPos, NULL, style)) return FALSE; HIMAGELIST hImageList = ImageList_Create(16, 16, ILC_COLOR24 | ILC_MASK, 16, 0); SendMessage(TB_SETIMAGELIST, 0, (LPARAM)hImageList); - HBITMAP hbmIcons = (HBITMAP)::LoadImage(g_hinstExe, MAKEINTRESOURCE(IDB_TOOLBARICONS), - IMAGE_BITMAP, 256, 16, 0); + HBITMAP hbmIcons = (HBITMAP)::LoadImageW(g_hinstExe, MAKEINTRESOURCEW(IDB_TOOLBARICONS), + IMAGE_BITMAP, 256, 16, 0); ImageList_AddMasked(hImageList, hbmIcons, RGB(255, 0, 255)); ::DeleteObject(hbmIcons); SendMessage(TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - TCHAR szToolTip[30]; + WCHAR szToolTip[30]; TBBUTTON tbbutton; ZeroMemory(&tbbutton, sizeof(tbbutton)); tbbutton.fsStyle = TBSTYLE_CHECKGROUP; for (INT i = 0; i < NUM_TOOLS; i++) { - ::LoadString(g_hinstExe, IDS_TOOLTIP1 + i, szToolTip, _countof(szToolTip)); + ::LoadStringW(g_hinstExe, IDS_TOOLTIP1 + i, szToolTip, _countof(szToolTip)); tbbutton.iString = (INT_PTR)szToolTip; tbbutton.fsState = TBSTATE_ENABLED | ((i % 2 == 1) ? TBSTATE_WRAP : 0); tbbutton.idCommand = ID_FREESEL + i; diff --git a/base/applications/mspaint/toolbox.h b/base/applications/mspaint/toolbox.h index 291032c1fcf..aa450fd2e64 100644 --- a/base/applications/mspaint/toolbox.h +++ b/base/applications/mspaint/toolbox.h @@ -24,7 +24,7 @@ public: class CToolBox : public CWindowImpl<CToolBox> { public: - DECLARE_WND_CLASS_EX(_T("ToolBox"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(L"ToolBox", CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CToolBox) MESSAGE_HANDLER(WM_CREATE, OnCreate) diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 745f2afe3e0..e8bd61f1b7e 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -284,10 +284,10 @@ VOID CToolSettingsWindow::drawBox(HDC hdc, LPCRECT prc) LRESULT CToolSettingsWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { /* preloading the draw transparent/nontransparent icons for later use */ - m_hNontranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_NONTRANSPARENT), - IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); - m_hTranspIcon = (HICON)LoadImage(g_hinstExe, MAKEINTRESOURCE(IDI_TRANSPARENT), - IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); + m_hNontranspIcon = (HICON)LoadImageW(g_hinstExe, MAKEINTRESOURCEW(IDI_NONTRANSPARENT), + IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); + m_hTranspIcon = (HICON)LoadImageW(g_hinstExe, MAKEINTRESOURCEW(IDI_TRANSPARENT), + IMAGE_ICON, CX_TRANS_ICON, CY_TRANS_ICON, LR_DEFAULTCOLOR); RECT trackbarZoomPos, rect2; calculateTwoBoxes(trackbarZoomPos, rect2); @@ -313,13 +313,13 @@ LRESULT CToolSettingsWindow::OnVScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, INT zoomRate = toolsModel.GetZoom(); - CString strZoom; + CStringW strZoom; if (zoomRate % 10 == 0) - strZoom.Format(_T("%d%%"), zoomRate / 10); + strZoom.Format(L"%d%%", zoomRate / 10); else - strZoom.Format(_T("%d.%d%%"), zoomRate / 10, zoomRate % 10); + strZoom.Format(L"%d.%d%%", zoomRate / 10, zoomRate % 10); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCTSTR)strZoom); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strZoom); OnToolsModelZoomChanged(nMsg, wParam, lParam, bHandled); return 0; diff --git a/base/applications/mspaint/toolsettings.h b/base/applications/mspaint/toolsettings.h index b6cc0482083..7155d87ae6b 100644 --- a/base/applications/mspaint/toolsettings.h +++ b/base/applications/mspaint/toolsettings.h @@ -10,7 +10,7 @@ class CToolSettingsWindow : public CWindowImpl<CToolSettingsWindow> { public: - DECLARE_WND_CLASS_EX(_T("ToolSettings"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(L"ToolSettings", CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CToolSettingsWindow) MESSAGE_HANDLER(WM_CREATE, OnCreate) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 3beb34c290d..b7d825f1b01 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -144,11 +144,11 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) if (g_askBeforeEnlarging) { - TCHAR programname[20]; - TCHAR shouldEnlargePromptText[100]; + WCHAR programname[20]; + WCHAR shouldEnlargePromptText[100]; - LoadString(g_hinstExe, IDS_PROGRAMNAME, programname, _countof(programname)); - LoadString(g_hinstExe, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); + ::LoadStringW(g_hinstExe, IDS_PROGRAMNAME, programname, _countof(programname)); + ::LoadStringW(g_hinstExe, IDS_ENLARGEPROMPTTEXT, shouldEnlargePromptText, _countof(shouldEnlargePromptText)); switch (MessageBox(shouldEnlargePromptText, programname, MB_YESNOCANCEL | MB_ICONQUESTION)) { @@ -233,7 +233,7 @@ LRESULT CMainWindow::OnMouseWheel(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - TCHAR droppedfile[MAX_PATH]; + WCHAR droppedfile[MAX_PATH]; HDROP hDrop = (HDROP)wParam; DragQueryFile(hDrop, 0, droppedfile, _countof(droppedfile)); @@ -247,14 +247,14 @@ LRESULT CMainWindow::OnDropFiles(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { // Loading and setting the window menu from resource - m_hMenu = ::LoadMenu(g_hinstExe, MAKEINTRESOURCE(ID_MENU)); + m_hMenu = ::LoadMenuW(g_hinstExe, MAKEINTRESOURCEW(ID_MENU)); SetMenu(m_hMenu); // Create the status bar DWORD style = SBARS_SIZEGRIP | WS_CHILD | (registrySettings.ShowStatusBar ? WS_VISIBLE : 0); - g_hStatusBar = ::CreateWindowEx(0, STATUSCLASSNAME, NULL, style, 0, 0, 0, 0, m_hWnd, - NULL, g_hinstExe, NULL); - ::SendMessage(g_hStatusBar, SB_SETMINHEIGHT, 21, 0); + g_hStatusBar = ::CreateWindowExW(0, STATUSCLASSNAME, NULL, style, 0, 0, 0, 0, m_hWnd, + NULL, g_hinstExe, NULL); + ::SendMessageW(g_hStatusBar, SB_SETMINHEIGHT, 21, 0); // Create the tool box toolBoxContainer.DoCreate(m_hWnd); @@ -276,8 +276,8 @@ LRESULT CMainWindow::OnCreate(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHa } // Set icon - SendMessage(WM_SETICON, ICON_BIG, (LPARAM) LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); - SendMessage(WM_SETICON, ICON_SMALL, (LPARAM) LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_BIG, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); + SendMessage(WM_SETICON, ICON_SMALL, (LPARAM)::LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); return 0; } @@ -314,10 +314,10 @@ BOOL CMainWindow::ConfirmSave() if (imageModel.IsImageSaved()) return TRUE; - CString strProgramName; + CStringW strProgramName; strProgramName.LoadString(IDS_PROGRAMNAME); - CString strSavePromptText; + CStringW strSavePromptText; strSavePromptText.Format(IDS_SAVEPROMPTTEXT, PathFindFileName(g_szFileName)); switch (MessageBox(strSavePromptText, strProgramName, MB_YESNOCANCEL | MB_ICONQUESTION)) @@ -345,11 +345,11 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) { - LPCTSTR dotext = PathFindExtensionW(g_szFileName); + LPCWSTR dotext = PathFindExtensionW(g_szFileName); BOOL isBMP = FALSE; - if (_tcsicmp(dotext, _T(".bmp")) == 0 || - _tcsicmp(dotext, _T(".dib")) == 0 || - _tcsicmp(dotext, _T(".rle")) == 0) + if (_wcsicmp(dotext, L".bmp") == 0 || + _wcsicmp(dotext, L".dib") == 0 || + _wcsicmp(dotext, L".rle") == 0) { isBMP = TRUE; } @@ -371,7 +371,7 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) for (INT iItem = 0; iItem < MAX_RECENT_FILES; ++iItem) { - CString& strFile = registrySettings.strFiles[iItem]; + CStringW& strFile = registrySettings.strFiles[iItem]; if (strFile.IsEmpty()) break; @@ -379,7 +379,7 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) #define MAX_RECENT_PATHNAME_DISPLAY 30 CPath pathFile(strFile); pathFile.CompactPathEx(MAX_RECENT_PATHNAME_DISPLAY); - assert(_tcslen((LPCTSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); + assert(wcslen((LPCWSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); // Add an accelerator (by '&') to the item number for quick access WCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; @@ -489,8 +489,8 @@ LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHand int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; if (::IsWindow(g_hStatusBar)) { - ::SendMessage(g_hStatusBar, WM_SIZE, 0, 0); - ::SendMessage(g_hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); + ::SendMessageW(g_hStatusBar, WM_SIZE, 0, 0); + ::SendMessageW(g_hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); } alignChildrenToMainWindow(); return 0; @@ -516,7 +516,7 @@ LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH if (canvasWindow.m_hWnd == hwndCapture || fullscreenWindow.m_hWnd == hwndCapture) { - ::SendMessage(hwndCapture, nMsg, wParam, lParam); + ::SendMessageW(hwndCapture, nMsg, wParam, lParam); } } else if (selectionModel.m_bShow) @@ -551,7 +551,7 @@ LRESULT CMainWindow::OnSysColorChange(UINT nMsg, WPARAM wParam, LPARAM lParam, B { /* Redirect message to common controls */ HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, WM_SYSCOLORCHANGE, 0, 0); + ::SendMessageW(hToolbar, WM_SYSCOLORCHANGE, 0, 0); return 0; } @@ -569,12 +569,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH { case IDM_HELPINFO: { - TCHAR infotitle[100]; - TCHAR infotext[200]; - LoadString(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); - LoadString(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); - ShellAbout(m_hWnd, infotitle, infotext, - LoadIcon(g_hinstExe, MAKEINTRESOURCE(IDI_APPICON))); + WCHAR infotitle[100], infotext[200]; + ::LoadStringW(g_hinstExe, IDS_INFOTITLE, infotitle, _countof(infotitle)); + ::LoadStringW(g_hinstExe, IDS_INFOTEXT, infotext, _countof(infotext)); + ::ShellAboutW(m_hWnd, infotitle, infotext, + LoadIconW(g_hinstExe, MAKEINTRESOURCEW(IDI_APPICON))); break; } case IDM_HELPHELPTOPICS: @@ -591,7 +590,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; case IDM_FILEOPEN: { - TCHAR szFileName[MAX_LONG_PATH] = _T(""); + WCHAR szFileName[MAX_LONG_PATH] = L""; if (ConfirmSave() && GetOpenFileName(szFileName, _countof(szFileName))) { DoLoadImageFile(m_hWnd, szFileName, TRUE); @@ -628,7 +627,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH pd.nMaxPage = 0xffff; if (PrintDlg(&pd) == TRUE) { - BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), imageModel.GetDC(), 0, 0, SRCCOPY); + ::BitBlt(pd.hDC, 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), imageModel.GetDC(), 0, 0, SRCCOPY); DeleteDC(pd.hDC); } if (pd.hDevMode) @@ -795,7 +794,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH // Failed to paste { - CString strText, strTitle; + CStringW strText, strTitle; strText.LoadString(IDS_CANTPASTE); strTitle.LoadString(IDS_PROGRAMNAME); MessageBox(strText, strTitle, MB_ICONINFORMATION); @@ -833,7 +832,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } HWND hToolbar = FindWindowEx(toolBoxContainer.m_hWnd, NULL, TOOLBARCLASSNAME, NULL); - SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); + ::SendMessageW(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolsModel.selectAll(); canvasWindow.Invalidate(TRUE); break; @@ -841,7 +840,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH case IDM_EDITCOPYTO: { WCHAR szFileName[MAX_LONG_PATH]; - LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, szFileName, _countof(szFileName)); + ::LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, szFileName, _countof(szFileName)); if (GetSaveFileName(szFileName, _countof(szFileName))) { HBITMAP hbmSelection = selectionModel.GetSelectionContents(); @@ -948,8 +947,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH CWaitCursor waitCursor; if (attributesDialog.m_bBlackAndWhite && !imageModel.IsBlackAndWhite()) { - CString strText(MAKEINTRESOURCE(IDS_LOSECOLOR)); - CString strTitle(MAKEINTRESOURCE(IDS_PROGRAMNAME)); + CStringW strText(MAKEINTRESOURCEW(IDS_LOSECOLOR)); + CStringW strTitle(MAKEINTRESOURCEW(IDS_PROGRAMNAME)); INT id = MessageBox(strText, strTitle, MB_ICONINFORMATION | MB_YESNOCANCEL); if (id != IDYES) break; diff --git a/base/applications/mspaint/winproc.h b/base/applications/mspaint/winproc.h index fc2861b228c..8f3595bcacb 100644 --- a/base/applications/mspaint/winproc.h +++ b/base/applications/mspaint/winproc.h @@ -11,7 +11,7 @@ class CMainWindow : public CWindowImpl<CMainWindow> { public: - DECLARE_WND_CLASS_EX(_T("MSPaintApp"), CS_DBLCLKS, COLOR_BTNFACE) + DECLARE_WND_CLASS_EX(L"MSPaintApp", CS_DBLCLKS, COLOR_BTNFACE) BEGIN_MSG_MAP(CMainWindow) MESSAGE_HANDLER(WM_DROPFILES, OnDropFiles) @@ -30,8 +30,8 @@ public: CMainWindow() : m_hMenu(NULL) { } HWND DoCreate(); - BOOL GetOpenFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); - BOOL GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile); + BOOL GetOpenFileName(IN OUT LPWSTR pszFile, INT cchMaxFile); + BOOL GetSaveFileName(IN OUT LPWSTR pszFile, INT cchMaxFile); BOOL ChooseColor(IN OUT COLORREF *prgbColor); VOID TrackPopupMenu(POINT ptScreen, INT iSubMenu); BOOL CanUndo() const;

1 year, 2 months

[reactos] 01/01: [IMM32] Sort imm32.spec

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7e1bd27054fe93074759… commit d7e1bd27054fe93074759594020cd1b41394b226 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 05:59:53 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Sat Nov 4 05:59:53 2023 +0900 [IMM32] Sort imm32.spec CORE-19268 --- dll/win32/imm32/imm32.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index eee84f6487e..8173e1e975c 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -1,16 +1,16 @@ @ stdcall CtfAImmActivate(ptr) @ stdcall CtfAImmDeactivate(long) @ stdcall CtfAImmIsIME(ptr) +@ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) +@ stdcall CtfImmGetGuidAtom(ptr long ptr) +@ stdcall CtfImmHideToolbarWnd() @ stdcall CtfImmIsCiceroEnabled() @ stdcall CtfImmIsCiceroStartedInThread() +@ stdcall CtfImmIsGuidMapEnable(ptr) @ stdcall CtfImmIsTextFrameServiceDisabled() -@ stdcall CtfImmTIMActivate(ptr) @ stdcall CtfImmRestoreToolbarWnd(ptr long) -@ stdcall CtfImmHideToolbarWnd() -@ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) -@ stdcall CtfImmIsGuidMapEnable(ptr) -@ stdcall CtfImmGetGuidAtom(ptr long ptr) @ stdcall CtfImmSetAppCompatFlags(long) +@ stdcall CtfImmTIMActivate(ptr) @ stdcall ImmActivateLayout(ptr) @ stdcall ImmAssociateContext(ptr ptr) @ stdcall ImmAssociateContextEx(ptr ptr long)

1 year, 2 months

[reactos] 01/01: [IMM32][SDK] Implement software keyboard, Part 1 (#5865)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=4aa1bcb72b247b41a18b9… commit 4aa1bcb72b247b41a18b971cecdcb6cc3e785d1c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 05:58:17 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 05:58:17 2023 +0900 [IMM32][SDK] Implement software keyboard, Part 1 (#5865) - Add dll/win32/imm32/softkbd.c source file. - Half-implement ImmCreateSoftKeyboard function. - Move ImmShowSoftKeyboard, and ImmDestroySoftKeyboard functions. - Modify ImmCreateSoftKeyboard prototype. CORE-19268 --- dll/win32/imm32/CMakeLists.txt | 1 + dll/win32/imm32/imm.c | 30 ----- dll/win32/imm32/imm32.spec | 2 +- dll/win32/imm32/softkbd.c | 298 +++++++++++++++++++++++++++++++++++++++++ sdk/include/psdk/imm.h | 19 ++- 5 files changed, 316 insertions(+), 34 deletions(-) diff --git a/dll/win32/imm32/CMakeLists.txt b/dll/win32/imm32/CMakeLists.txt index ba1f56641c4..d5b2ea12af4 100644 --- a/dll/win32/imm32/CMakeLists.txt +++ b/dll/win32/imm32/CMakeLists.txt @@ -16,6 +16,7 @@ list(APPEND SOURCE imm.c keymsg.c regword.c + softkbd.c utils.c win3.c ${CMAKE_CURRENT_BINARY_DIR}/imm32_stubs.c diff --git a/dll/win32/imm32/imm.c b/dll/win32/imm32/imm.c index 40f686e44f0..39d4cd3b1ef 100644 --- a/dll/win32/imm32/imm.c +++ b/dll/win32/imm32/imm.c @@ -1103,36 +1103,6 @@ BOOL WINAPI ImmReleaseContext(HWND hWnd, HIMC hIMC) return TRUE; // Do nothing. This is correct. } -/*********************************************************************** - * ImmCreateSoftKeyboard(IMM32.@) - */ -HWND WINAPI ImmCreateSoftKeyboard(UINT uType, UINT hOwner, int x, int y) -{ - FIXME("(%d, %d, %d, %d): stub\n", uType, hOwner, x, y); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - -/*********************************************************************** - * ImmDestroySoftKeyboard(IMM32.@) - */ -BOOL WINAPI ImmDestroySoftKeyboard(HWND hSoftWnd) -{ - TRACE("(%p)\n", hSoftWnd); - return DestroyWindow(hSoftWnd); -} - -/*********************************************************************** - * ImmShowSoftKeyboard(IMM32.@) - */ -BOOL WINAPI ImmShowSoftKeyboard(HWND hSoftWnd, int nCmdShow) -{ - TRACE("(%p, %d)\n", hSoftWnd, nCmdShow); - if (hSoftWnd) - return ShowWindow(hSoftWnd, nCmdShow); - return FALSE; -} - /*********************************************************************** * ImmDisableTextFrameService(IMM32.@) */ diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 3a706be14b4..eee84f6487e 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -19,7 +19,7 @@ @ stdcall ImmConfigureIMEW(ptr ptr long ptr) @ stdcall ImmCreateContext() @ stdcall ImmCreateIMCC(long) -@ stdcall ImmCreateSoftKeyboard(long long long long) +@ stdcall ImmCreateSoftKeyboard(long ptr long long) @ stdcall ImmDestroyContext(ptr) @ stdcall ImmDestroyIMCC(ptr) @ stdcall ImmDestroySoftKeyboard(ptr) diff --git a/dll/win32/imm32/softkbd.c b/dll/win32/imm32/softkbd.c new file mode 100644 index 00000000000..551331ffe40 --- /dev/null +++ b/dll/win32/imm32/softkbd.c @@ -0,0 +1,298 @@ +/* + * PROJECT: ReactOS IMM32 + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Implementing IMM Software Keyboard + * COPYRIGHT: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +#include "precomp.h" + +WINE_DEFAULT_DEBUG_CHANNEL(imm); + +static UINT s_uScanCode[256]; +static RECT s_rcWorkArea; +static POINT s_ptRaiseEdge; +static LOGFONTW s_lfSKT1Font; +static BOOL s_bWannaInitSoftKBD = TRUE; + +static VOID +Imm32GetAllMonitorSize(_Out_ LPRECT prcWork) +{ + if (GetSystemMetrics(SM_CMONITORS) == 1) + { + SystemParametersInfoW(SPI_GETWORKAREA, 0, prcWork, 0); + return; + } + + prcWork->left = GetSystemMetrics(SM_XVIRTUALSCREEN); + prcWork->top = GetSystemMetrics(SM_YVIRTUALSCREEN); + prcWork->right = prcWork->left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + prcWork->bottom = prcWork->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); +} + +static BOOL +Imm32GetNearestMonitorSize( + _In_ HWND hwnd, + _Out_ LPRECT prcWork) +{ + HMONITOR hMonitor; + MONITORINFO mi; + + if (GetSystemMetrics(SM_CMONITORS) == 1) + { + Imm32GetAllMonitorSize(prcWork); + return TRUE; + } + + hMonitor = MonitorFromWindow(hwnd, MONITOR_DEFAULTTONEAREST); + if (!hMonitor) + return FALSE; + + ZeroMemory(&mi, sizeof(mi)); + mi.cbSize = sizeof(mi); + GetMonitorInfoW(hMonitor, &mi); + + *prcWork = mi.rcWork; + return TRUE; +} + +/* Software keyboard window procedure (Traditional Chinese) */ +static LRESULT CALLBACK +SKWndProcT1(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + { + FIXME("stub\n"); + return -1; + } + + default: + { + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + } + return 0; +} + +/* Software keyboard window procedure (Simplified Chinese) */ +static LRESULT CALLBACK +SKWndProcC1(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) +{ + switch (uMsg) + { + case WM_CREATE: + { + FIXME("stub\n"); + return -1; + } + + default: + { + return DefWindowProcW(hwnd, uMsg, wParam, lParam); + } + } + return 0; +} + +static BOOL +Imm32RegisterSoftKeyboard(_In_ UINT uType) +{ + LPCWSTR pszClass; + WNDCLASSEXW wcx; + + if (uType == 1) + pszClass = L"SoftKBDClsT1"; + else if (uType == 2) + pszClass = L"SoftKBDClsC1"; + else + return FALSE; + + if (GetClassInfoExW(ghImm32Inst, pszClass, &wcx)) + return TRUE; + + ZeroMemory(&wcx, sizeof(wcx)); + wcx.cbSize = sizeof(wcx); + wcx.style = CS_IME; + wcx.cbWndExtra = sizeof(LONG_PTR); + wcx.hIcon = LoadIconW(NULL, (LPCWSTR)IDI_APPLICATION); + wcx.hInstance = ghImm32Inst; + wcx.hCursor = LoadCursorW(NULL, (LPCWSTR)IDC_SIZEALL); + wcx.lpszClassName = pszClass; + + if (uType == 1) + { + wcx.lpfnWndProc = SKWndProcT1; + wcx.hbrBackground = (HBRUSH)GetStockObject(NULL_BRUSH); + } + else + { + wcx.lpfnWndProc = SKWndProcC1; + wcx.hbrBackground = (HBRUSH)GetStockObject(LTGRAY_BRUSH); + } + + return !!RegisterClassExW(&wcx); +} + +static VOID +Imm32GetSKT1TextMetric(_Out_ LPTEXTMETRICW lptm) +{ + HDC hDC; + HFONT hFont; + SIZE size; + HGDIOBJ hFontOld; + WCHAR szText[2] = { 0x894E, 0 }; + + hDC = GetDC(NULL); + + ZeroMemory(&s_lfSKT1Font, sizeof(s_lfSKT1Font)); + s_lfSKT1Font.lfHeight = -12; + s_lfSKT1Font.lfWeight = FW_NORMAL; + s_lfSKT1Font.lfCharSet = CHINESEBIG5_CHARSET; + s_lfSKT1Font.lfOutPrecision = OUT_TT_ONLY_PRECIS; + s_lfSKT1Font.lfClipPrecision = CLIP_DEFAULT_PRECIS; + s_lfSKT1Font.lfQuality = PROOF_QUALITY; + s_lfSKT1Font.lfPitchAndFamily = 49; + hFont = CreateFontIndirectW(&s_lfSKT1Font); + + hFontOld = SelectObject(hDC, hFont); + + GetTextMetricsW(hDC, lptm); + + if (GetTextExtentPoint32W(hDC, szText, 1, &size) && lptm->tmMaxCharWidth < size.cx ) + lptm->tmMaxCharWidth = size.cx; + + DeleteObject(SelectObject(hDC, hFontOld)); + ReleaseDC(NULL, hDC); +} + +static VOID +Imm32GetSoftKeyboardDimension( + _In_ UINT uType, + _Out_ LPINT pcx, + _Out_ LPINT pcy) +{ + INT cxEdge, cyEdge; + TEXTMETRICW tm; + + if (uType == 1) + { + Imm32GetSKT1TextMetric(&tm); + *pcx = 15 * tm.tmMaxCharWidth + 2 * s_ptRaiseEdge.x + 139; + *pcy = 5 * tm.tmHeight + 2 * s_ptRaiseEdge.y + 58; + } + else + { + cxEdge = GetSystemMetrics(SM_CXEDGE); + cyEdge = GetSystemMetrics(SM_CYEDGE); + *pcx = 2 * (GetSystemMetrics(SM_CXBORDER) + cxEdge) + 348; + *pcy = 2 * (GetSystemMetrics(SM_CYBORDER) + cyEdge) + 136; + } +} + +/*********************************************************************** + * ImmCreateSoftKeyboard (IMM32.@) + * + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImmCreateSoftKeyboar… + */ +HWND WINAPI +ImmCreateSoftKeyboard( + _In_ UINT uType, + _In_ HWND hwndParent, + _In_ INT x, + _In_ INT y) +{ + HKL hKL; + PIMEDPI pImeDpi; + DWORD dwUICaps, style = (WS_POPUP | WS_DISABLED); + UINT i; + INT xSoftKBD, ySoftKBD, cxSoftKBD, cySoftKBD; + HWND hwndSoftKBD; + + TRACE("(%u, %p, %d, %d)\n", uType, hwndParent, x, y); + + if (uType != 1 && uType != 2) + return 0; + + hKL = GetKeyboardLayout(0); + pImeDpi = ImmLockImeDpi(hKL); + if (!pImeDpi) + return NULL; + + dwUICaps = pImeDpi->ImeInfo.fdwUICaps; + ImmUnlockImeDpi(pImeDpi); + + if (!(dwUICaps & UI_CAP_SOFTKBD)) + return NULL; + + if (s_bWannaInitSoftKBD) + { + if (!Imm32GetNearestMonitorSize(hwndParent, &s_rcWorkArea)) + return NULL; + + for (i = 0; i < 0xFF; ++i) + s_uScanCode[i] = MapVirtualKeyW(i, 0); + + s_ptRaiseEdge.x = GetSystemMetrics(SM_CXBORDER) + GetSystemMetrics(SM_CXEDGE); + s_ptRaiseEdge.y = GetSystemMetrics(SM_CYBORDER) + GetSystemMetrics(SM_CYEDGE); + + s_bWannaInitSoftKBD = FALSE; + } + + if (!Imm32RegisterSoftKeyboard(uType)) + return NULL; + + Imm32GetSoftKeyboardDimension(uType, &cxSoftKBD, &cySoftKBD); + + xSoftKBD = max(s_rcWorkArea.left, min(x, s_rcWorkArea.right - cxSoftKBD)); + ySoftKBD = max(s_rcWorkArea.top, min(y, s_rcWorkArea.bottom - cySoftKBD)); + + if (uType == 1) /* Traditional Chinese */ + { + hwndSoftKBD = CreateWindowExW(0, + L"SoftKBDClsT1", NULL, style, + xSoftKBD, ySoftKBD, cxSoftKBD, cySoftKBD, + hwndParent, NULL, ghImm32Inst, NULL); + } + else /* Simplified Chinese (uType == 2) */ + { + style |= WS_BORDER; + hwndSoftKBD = CreateWindowExW(WS_EX_WINDOWEDGE | WS_EX_DLGMODALFRAME, + L"SoftKBDClsC1", NULL, style, + xSoftKBD, ySoftKBD, cxSoftKBD, cySoftKBD, + hwndParent, NULL, ghImm32Inst, NULL); + } + + ShowWindow(hwndSoftKBD, SW_HIDE); + UpdateWindow(hwndSoftKBD); + + return hwndSoftKBD; +} + +/*********************************************************************** + * ImmShowSoftKeyboard (IMM32.@) + * + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImmShowSoftKeyboard.… + */ +BOOL WINAPI +ImmShowSoftKeyboard( + _In_ HWND hwndSoftKBD, + _In_ INT nCmdShow) +{ + TRACE("(%p, %d)\n", hwndSoftKBD, nCmdShow); + return hwndSoftKBD && ShowWindow(hwndSoftKBD, nCmdShow); +} + +/*********************************************************************** + * ImmDestroySoftKeyboard (IMM32.@) + * + * @see https://katahiromz.web.fc2.com/colony3rd/imehackerz/en/ImmDestroySoftKeyboa… + */ +BOOL WINAPI +ImmDestroySoftKeyboard( + _In_ HWND hwndSoftKBD) +{ + TRACE("(%p)\n", hwndSoftKBD); + return DestroyWindow(hwndSoftKBD); +} diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 95ac099d2e3..9ec9e3cfb18 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -253,9 +253,22 @@ LRESULT WINAPI ImmRequestMessageA(HIMC, WPARAM, LPARAM); LRESULT WINAPI ImmRequestMessageW(HIMC, WPARAM, LPARAM); #define ImmRequestMessage WINELIB_NAME_AW(ImmRequestMessage); BOOL WINAPI ImmTranslateMessage(HWND, UINT, WPARAM, LPARAM); -HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); -BOOL WINAPI ImmDestroySoftKeyboard(HWND); -BOOL WINAPI ImmShowSoftKeyboard(HWND, int); + +HWND WINAPI +ImmCreateSoftKeyboard( + _In_ UINT uType, + _In_ HWND hwndParent, + _In_ INT x, + _In_ INT y); + +BOOL WINAPI +ImmShowSoftKeyboard( + _In_ HWND hwndSoftKBD, + _In_ INT nCmdShow); + +BOOL WINAPI +ImmDestroySoftKeyboard( + _In_ HWND hwndSoftKBD); BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID);

1 year, 2 months

[reactos] 01/01: [MSPAINT] Fix Copy-To-File feature (#5877)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d7ece626cbda18c8d76b9… commit d7ece626cbda18c8d76b93a3d0f5dfa049646a35 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Nov 4 05:56:10 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Nov 4 05:56:10 2023 +0900 [MSPAINT] Fix Copy-To-File feature (#5877) The Copy-To-File feature had some bugs that the user couldn't save. - Modify SelectionModel::GetSelectionContents. - Delete SelectionModel::CopyBitmap, SelectionModel::LockBitmap, and SelectionModel::UnlockBitmap functions. CORE-19186 --- base/applications/mspaint/dialogs.cpp | 6 ++--- base/applications/mspaint/main.cpp | 15 ++++++----- base/applications/mspaint/precomp.h | 1 + base/applications/mspaint/registry.cpp | 6 ++--- base/applications/mspaint/selectionmodel.cpp | 35 +++++++----------------- base/applications/mspaint/selectionmodel.h | 5 +--- base/applications/mspaint/textedit.cpp | 2 +- base/applications/mspaint/winproc.cpp | 40 +++++++++++++++++----------- 8 files changed, 51 insertions(+), 59 deletions(-) diff --git a/base/applications/mspaint/dialogs.cpp b/base/applications/mspaint/dialogs.cpp index faaf5d3fbfa..c56eaaf5f49 100644 --- a/base/applications/mspaint/dialogs.cpp +++ b/base/applications/mspaint/dialogs.cpp @@ -361,10 +361,10 @@ void CFontsDialog::InitFontSizes() HWND hwndSizes = GetDlgItem(IDD_FONTSSIZES); ComboBox_ResetContent(hwndSizes); - TCHAR szText[16]; + WCHAR szText[16]; for (UINT i = 0; i < _countof(s_sizes); ++i) { - wsprintf(szText, TEXT("%d"), s_sizes[i]); + StringCchPrintfW(szText, _countof(szText), L"%d", s_sizes[i]); INT iItem = ComboBox_AddString(hwndSizes, szText); if (s_sizes[i] == (INT)registrySettings.PointSize) ComboBox_SetCurSel(hwndSizes, iItem); @@ -372,7 +372,7 @@ void CFontsDialog::InitFontSizes() if (ComboBox_GetCurSel(hwndSizes) == CB_ERR) { - wsprintf(szText, TEXT("%d"), (INT)registrySettings.PointSize); + StringCchPrintfW(szText, _countof(szText), L"%d", (INT)registrySettings.PointSize); ::SetWindowText(hwndSizes, szText); } } diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 63db53f02de..0f133cbe485 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -7,6 +7,7 @@ #include "precomp.h" +#include <dlgs.h> #include <mapi.h> POINT g_ptStart, g_ptEnd; @@ -55,7 +56,7 @@ FileExtFromFilter(LPTSTR pExt, OPENFILENAME *pOFN) CharLower(pExt); return TRUE; } - pch += lstrlen(pch) + 1; + pch += wcslen(pch) + 1; } return FALSE; } @@ -66,6 +67,7 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { HWND hParent; OFNOTIFY *pon; + WCHAR Path[MAX_PATH]; switch (uMsg) { case WM_NOTIFY: @@ -73,11 +75,10 @@ OFNHookProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) if (pon->hdr.code == CDN_TYPECHANGE) { hParent = GetParent(hwnd); - TCHAR Path[MAX_PATH]; - SendMessage(hParent, CDM_GETFILEPATH, _countof(Path), (LPARAM)Path); - FileExtFromFilter(PathFindExtension(Path), pon->lpOFN); - SendMessage(hParent, CDM_SETCONTROLTEXT, 0x047c, (LPARAM)PathFindFileName(Path)); - lstrcpyn(pon->lpOFN->lpstrFile, Path, pon->lpOFN->nMaxFile); + SendMessageW(hParent, CDM_GETFILEPATH, _countof(Path), (LPARAM)Path); + FileExtFromFilter(PathFindExtensionW(Path), pon->lpOFN); + SendMessageW(hParent, CDM_SETCONTROLTEXT, cmb13, (LPARAM)PathFindFileNameW(Path)); + StringCchCopyW(pon->lpOFN->lpstrFile, pon->lpOFN->nMaxFile, Path); } break; } @@ -251,7 +252,7 @@ BOOL CMainWindow::GetSaveFileName(IN OUT LPTSTR pszFile, INT cchMaxFile) if (*pchDotExt == UNICODE_NULL) { // Choose PNG - wcscat(pszFile, L".png"); + StringCchCatW(pszFile, cchMaxFile, L".png"); for (INT i = 0; i < aguidFileTypesE.GetSize(); ++i) { if (aguidFileTypesE[i] == Gdiplus::ImageFormatPNG) diff --git a/base/applications/mspaint/precomp.h b/base/applications/mspaint/precomp.h index a24f1a3b654..6f22eb69e8d 100644 --- a/base/applications/mspaint/precomp.h +++ b/base/applications/mspaint/precomp.h @@ -25,6 +25,7 @@ #include <math.h> #include <shellapi.h> #include <htmlhelp.h> +#include <strsafe.h> #include "atlimagedx.h" #include <debug.h> diff --git a/base/applications/mspaint/registry.cpp b/base/applications/mspaint/registry.cpp index bdaf7a7cd17..07778117ae8 100644 --- a/base/applications/mspaint/registry.cpp +++ b/base/applications/mspaint/registry.cpp @@ -123,7 +123,7 @@ void RegistrySettings::Load(INT nCmdShow) TCHAR szName[64]; for (INT i = 0; i < MAX_RECENT_FILES; ++i) { - wsprintf(szName, _T("File%u"), i + 1); + StringCchPrintfW(szName, _countof(szName), L"File%u", i + 1); ReadString(files, szName, strFiles[i]); } } @@ -204,10 +204,10 @@ void RegistrySettings::Store() CRegKey files; if (files.Create(paint, _T("Recent File List")) == ERROR_SUCCESS) { - TCHAR szName[64]; + WCHAR szName[64]; for (INT iFile = 0; iFile < MAX_RECENT_FILES; ++iFile) { - wsprintf(szName, _T("File%u"), iFile + 1); + StringCchPrintfW(szName, _countof(szName), L"File%u", iFile + 1); files.SetStringValue(szName, strFiles[iFile]); } } diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index e7263fa4e1f..c66361da6e4 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -152,16 +152,19 @@ void SelectionModel::DrawSelection(HDC hDCImage, COLORREF crBg, BOOL bBgTranspar DeleteDC(hMemDC); } -void SelectionModel::GetSelectionContents(HDC hDCImage) +HBITMAP SelectionModel::GetSelectionContents() { - ClearColorImage(); + if (m_hbmColor) + return CopyDIBImage(m_hbmColor, m_rc.Width(), m_rc.Height()); HDC hMemDC = ::CreateCompatibleDC(NULL); - m_hbmColor = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); - HGDIOBJ hbmOld = ::SelectObject(hMemDC, m_hbmColor); - ::BitBlt(hMemDC, 0, 0, m_rc.Width(), m_rc.Height(), hDCImage, m_rc.left, m_rc.top, SRCCOPY); + HBITMAP hBitmap = CreateColorDIB(m_rc.Width(), m_rc.Height(), RGB(255, 255, 255)); + HGDIOBJ hbmOld = ::SelectObject(hMemDC, hBitmap); + ::BitBlt(hMemDC, 0, 0, m_rc.Width(), m_rc.Height(), imageModel.GetDC(), m_rc.left, m_rc.top, SRCCOPY); ::SelectObject(hMemDC, hbmOld); ::DeleteDC(hMemDC); + + return hBitmap; } BOOL SelectionModel::IsLanded() const @@ -178,7 +181,8 @@ BOOL SelectionModel::TakeOff() m_rgbBack = paletteModel.GetBgColor(); // Get the contents of the selection area - GetSelectionContents(imageModel.GetDC()); + ClearColorImage(); + m_hbmColor = GetSelectionContents(); // RectSel doesn't need the mask image if (toolsModel.GetActiveTool() == TOOL_RECTSEL) @@ -406,13 +410,6 @@ void SelectionModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int NotifyContentChanged(); } -HBITMAP SelectionModel::CopyBitmap() -{ - if (m_hbmColor == NULL) - GetSelectionContents(imageModel.GetDC()); - return CopyDIBImage(m_hbmColor); -} - int SelectionModel::PtStackSize() const { return m_iPtSP; @@ -545,18 +542,6 @@ void SelectionModel::SwapWidthAndHeight() m_rc.bottom = m_rc.top + cx; } -HBITMAP SelectionModel::LockBitmap() -{ - HBITMAP hbm = m_hbmColor; - m_hbmColor = NULL; - return hbm; -} - -void SelectionModel::UnlockBitmap(HBITMAP hbmLocked) -{ - m_hbmColor = hbmLocked; -} - void SelectionModel::StretchSelection(BOOL bShrink) { if (!m_bShow) diff --git a/base/applications/mspaint/selectionmodel.h b/base/applications/mspaint/selectionmodel.h index 308952a6e67..e66b2bff0cc 100644 --- a/base/applications/mspaint/selectionmodel.h +++ b/base/applications/mspaint/selectionmodel.h @@ -40,10 +40,7 @@ public: void HideSelection(); void DeleteSelection(); - HBITMAP CopyBitmap(); - HBITMAP LockBitmap(); - void UnlockBitmap(HBITMAP hbmLocked); - void GetSelectionContents(HDC hDCImage); + HBITMAP GetSelectionContents(); void DrawFramePoly(HDC hDCImage); void DrawBackground(HDC hDCImage); void DrawBackgroundPoly(HDC hDCImage, COLORREF crBg); diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 5261da63a0e..c20ca6bf005 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -342,7 +342,7 @@ void CTextEditWindow::UpdateFont() lf.lfWeight = (registrySettings.Bold ? FW_BOLD : FW_NORMAL); lf.lfItalic = (BYTE)registrySettings.Italic; lf.lfUnderline = (BYTE)registrySettings.Underline; - lstrcpyn(lf.lfFaceName, registrySettings.strFontName, _countof(lf.lfFaceName)); + StringCchCopyW(lf.lfFaceName, _countof(lf.lfFaceName), registrySettings.strFontName); HDC hdc = GetDC(); if (hdc) diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index c1cbff31b8c..3beb34c290d 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -29,7 +29,7 @@ static HWND DoHtmlHelpW(HWND hwndCaller, LPCWSTR pszFile, UINT uCommand, DWORD_P { // The function loads the system library, not local GetSystemDirectoryW(szPath, _countof(szPath)); - wcscat(szPath, L"\\hhctrl.ocx"); + StringCchCatW(szPath, _countof(szPath), L"\\hhctrl.ocx"); s_hHHCTRL_OCX = LoadLibraryW(szPath); if (s_hHHCTRL_OCX) s_pHtmlHelpW = (FN_HtmlHelpW)GetProcAddress(s_hHHCTRL_OCX, "HtmlHelpW"); @@ -382,8 +382,8 @@ void CMainWindow::ProcessFileMenu(HMENU hPopupMenu) assert(_tcslen((LPCTSTR)pathFile) <= MAX_RECENT_PATHNAME_DISPLAY); // Add an accelerator (by '&') to the item number for quick access - TCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; - wsprintf(szText, _T("&%u %s"), iItem + 1, (LPCTSTR)pathFile); + WCHAR szText[4 + MAX_RECENT_PATHNAME_DISPLAY + 1]; + StringCchPrintfW(szText, _countof(szText), L"&%u %s", iItem + 1, (LPCWSTR)pathFile); INT iMenuItem = (cMenuItems - 2) + iItem; InsertMenu(hPopupMenu, iMenuItem, MF_BYPOSITION | MF_STRING, IDM_FILE1 + iItem, szText); @@ -720,14 +720,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH selectionModel.TakeOff(); { - HBITMAP hbmLocked = selectionModel.LockBitmap(); - if (hbmLocked) - { - HGLOBAL hGlobal = BitmapToClipboardDIB(hbmLocked); - if (hGlobal) - ::SetClipboardData(CF_DIB, hGlobal); - selectionModel.UnlockBitmap(hbmLocked); - } + HBITMAP hbmCopy = selectionModel.GetSelectionContents(); + HGLOBAL hGlobal = BitmapToClipboardDIB(hbmCopy); + if (hGlobal) + ::SetClipboardData(CF_DIB, hGlobal); + else + ShowOutOfMemory(); + ::DeleteObject(hbmCopy); } CloseClipboard(); @@ -841,12 +840,18 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH } case IDM_EDITCOPYTO: { - WCHAR szFileName[MAX_LONG_PATH] = L"*.png"; + WCHAR szFileName[MAX_LONG_PATH]; + LoadStringW(g_hinstExe, IDS_DEFAULTFILENAME, szFileName, _countof(szFileName)); if (GetSaveFileName(szFileName, _countof(szFileName))) { - HBITMAP hbmLocked = selectionModel.LockBitmap(); - SaveDIBToFile(hbmLocked, szFileName, FALSE); - selectionModel.UnlockBitmap(hbmLocked); + HBITMAP hbmSelection = selectionModel.GetSelectionContents(); + if (!hbmSelection) + { + ShowOutOfMemory(); + break; + } + SaveDIBToFile(hbmSelection, szFileName, FALSE); + DeleteObject(hbmSelection); } break; } @@ -982,9 +987,12 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); break; case IDM_IMAGECROP: - imageModel.PushImageForUndo(selectionModel.CopyBitmap()); + { + HBITMAP hbmCopy = selectionModel.GetSelectionContents(); + imageModel.PushImageForUndo(hbmCopy); selectionModel.HideSelection(); break; + } case IDM_VIEWTOOLBOX: registrySettings.ShowToolBox = !toolBoxContainer.IsWindowVisible(); toolBoxContainer.ShowWindow(registrySettings.ShowToolBox ? SW_SHOWNOACTIVATE : SW_HIDE);

1 year, 2 months

[reactos] 01/01: [W32TIME] Remember date/time sync settings (#5866)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e627c3b00e7109b5110b9… commit e627c3b00e7109b5110b94fb8253859a29f35d42 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:56:58 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:56:58 2023 +0900 [W32TIME] Remember date/time sync settings (#5866) Based on KRosUser's patch. - In the W32TmServiceMain function, the time check loop does check the registry value. CORE-19292 --- base/services/w32time/w32time.c | 63 +++++++++++++++++++++++++---------------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/base/services/w32time/w32time.c b/base/services/w32time/w32time.c index 69c6bd15abe..0d5508a7b2c 100644 --- a/base/services/w32time/w32time.c +++ b/base/services/w32time/w32time.c @@ -230,8 +230,6 @@ ControlHandler(DWORD request) default: break; } - - return; } @@ -239,8 +237,12 @@ VOID WINAPI W32TmServiceMain(DWORD argc, LPWSTR *argv) { - int result; + LONG error; DWORD dwInterval; + HKEY hKey; + WCHAR szData[8]; + DWORD cbData; + BOOL bNoSync; UNREFERENCED_PARAMETER(argc); UNREFERENCED_PARAMETER(argv); @@ -279,29 +281,44 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv) ServiceStatus.dwCurrentState = SERVICE_RUNNING; SetServiceStatus(hStatus, &ServiceStatus); - /* The worker loop of a service */ + /* The service's worker loop */ for (;;) { - result = SetTime(); - - if (result) - DPRINT("W32Time Service failed to set clock.\n"); - else - DPRINT("W32Time Service successfully set clock.\n"); + /* The default is NoSync */ + bNoSync = TRUE; + + /* TODO: Use RegNotifyChangeKeyValue() when implemented */ + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Services\\W32Time\\Parameters", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + cbData = sizeof(szData); + RegQueryValueExW(hKey, L"Type", NULL, NULL, (LPBYTE)szData, &cbData); + szData[ARRAYSIZE(szData) - 1] = UNICODE_NULL; /* Avoid buffer overrun */ + bNoSync = (_wcsicmp(szData, L"NoSync") == 0); + RegCloseKey(hKey); + } - if (result) + if (!bNoSync) { - /* In general we do not want to stop this service for a single - * Internet read failure but there may be other reasons for which - * we really might want to stop it. - * Therefore this code is left here to make it easy to stop this - * service when the correct conditions can be determined, but it - * is left commented out. - ServiceStatus.dwCurrentState = SERVICE_STOPPED; - ServiceStatus.dwWin32ExitCode = result; - SetServiceStatus(hStatus, &ServiceStatus); - return; - */ + error = SetTime(); + if (error != ERROR_SUCCESS) + { + DPRINT("W32Time Service failed to set clock: 0x%08lX\n", error); +#if 0 + /* + * In general, we do not want to stop this service for a single + * Internet read failure but there may be other reasons for which + * we really might want to stop it. Therefore this code is left here. + */ + ServiceStatus.dwCurrentState = SERVICE_STOPPED; + ServiceStatus.dwWin32ExitCode = error; + SetServiceStatus(hStatus, &ServiceStatus); + return; +#endif + } } if (WaitForSingleObject(hStopEvent, dwInterval * 1000) == WAIT_OBJECT_0) @@ -317,11 +334,9 @@ W32TmServiceMain(DWORD argc, LPWSTR *argv) return; } } - return; } - BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason,

1 year, 2 months

[reactos] 01/01: [IMM32][SDK] Implement CtfImm(Hide, Restore)ToolbarWnd (#5863)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eb4d13c823f1d444e877a… commit eb4d13c823f1d444e877a704eb6a15ea541998c3 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:45:51 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:45:51 2023 +0900 [IMM32][SDK] Implement CtfImm(Hide,Restore)ToolbarWnd (#5863) - Add Imm32GetFn helper function. - Implement CtfImmHideToolbarWnd and CtfImmRestoreToolbarWnd functions. - Add them to <imm32_undoc.h>. CORE-19268 --- dll/win32/imm32/ctf.c | 178 ++++++++++++++++++++++++++++++++++---- dll/win32/imm32/imm32.spec | 2 +- sdk/include/reactos/imm32_undoc.h | 2 + 3 files changed, 165 insertions(+), 17 deletions(-) diff --git a/dll/win32/imm32/ctf.c b/dll/win32/imm32/ctf.c index b403cb3ad59..78f9b09acb9 100644 --- a/dll/win32/imm32/ctf.c +++ b/dll/win32/imm32/ctf.c @@ -6,18 +6,127 @@ */ #include "precomp.h" +#include <msctf.h> +#include <ctfutb.h> WINE_DEFAULT_DEBUG_CHANNEL(imm); -/* - * NOTE: Microsoft CTF protocol has vulnerability. - * If insecure, we don't follow the dangerous design. - * - * https://www.zdnet.com/article/vulnerability-in-microsoft-ctf-protocol-goes-… - * https://googleprojectzero.blogspot.com/2019/08/down-rabbit-hole.html +BOOL +Imm32GetFn( + _Inout_opt_ FARPROC *ppfn, + _Inout_ HINSTANCE *phinstDLL, + _In_ LPCWSTR pszDllName, + _In_ LPCSTR pszFuncName) +{ + WCHAR szPath[MAX_PATH]; + + if (*ppfn) + return TRUE; + + if (*phinstDLL == NULL) + { + Imm32GetSystemLibraryPath(szPath, _countof(szPath), pszDllName); + *phinstDLL = LoadLibraryExW(szPath, NULL, 0); + if (*phinstDLL == NULL) + return FALSE; + } + + *ppfn = (FARPROC)GetProcAddress(*phinstDLL, pszFuncName); + return *ppfn != NULL; +} + +#define IMM32_GET_FN(ppfn, phinstDLL, dll_name, func_name) \ + Imm32GetFn((FARPROC*)(ppfn), (phinstDLL), (dll_name), #func_name) + +/*********************************************************************** + * OLE32.DLL */ -/* +HINSTANCE g_hOle32 = NULL; + +#define OLE32_FN(name) g_pfnOLE32_##name + +typedef HRESULT (WINAPI *FN_CoInitializeEx)(LPVOID, DWORD); +typedef VOID (WINAPI *FN_CoUninitialize)(VOID); +typedef HRESULT (WINAPI *FN_CoRegisterInitializeSpy)(IInitializeSpy*, ULARGE_INTEGER*); +typedef HRESULT (WINAPI *FN_CoRevokeInitializeSpy)(ULARGE_INTEGER); + +FN_CoInitializeEx OLE32_FN(CoInitializeEx) = NULL; +FN_CoUninitialize OLE32_FN(CoUninitialize) = NULL; +FN_CoRegisterInitializeSpy OLE32_FN(CoRegisterInitializeSpy) = NULL; +FN_CoRevokeInitializeSpy OLE32_FN(CoRevokeInitializeSpy) = NULL; + +#define Imm32GetOle32Fn(func_name) \ + IMM32_GET_FN(&OLE32_FN(func_name), &g_hOle32, L"ole32.dll", #func_name) + +HRESULT Imm32CoInitializeEx(VOID) +{ + if (!Imm32GetOle32Fn(CoInitializeEx)) + return E_FAIL; + + return OLE32_FN(CoInitializeEx)(NULL, COINIT_APARTMENTTHREADED); +} + +VOID Imm32CoUninitialize(VOID) +{ + if (!Imm32GetOle32Fn(CoUninitialize)) + return; + + OLE32_FN(CoUninitialize)(); +} + +HRESULT Imm32CoRegisterInitializeSpy(IInitializeSpy* spy, ULARGE_INTEGER* cookie) +{ + if (!Imm32GetOle32Fn(CoRegisterInitializeSpy)) + return E_FAIL; + + return OLE32_FN(CoRegisterInitializeSpy)(spy, cookie); +} + +HRESULT Imm32CoRevokeInitializeSpy(ULARGE_INTEGER cookie) +{ + if (!Imm32GetOle32Fn(CoRevokeInitializeSpy)) + return E_FAIL; + + return OLE32_FN(CoRevokeInitializeSpy)(cookie); +} + +/*********************************************************************** + * MSCTF.DLL + */ + +HINSTANCE g_hMsctf = NULL; + +#define MSCTF_FN(name) g_pfnMSCTF_##name + +typedef HRESULT (WINAPI *FN_TF_CreateLangBarMgr)(ITfLangBarMgr**); +typedef VOID (WINAPI *FN_TF_InvalidAssemblyListCacheIfExist)(VOID); + +FN_TF_CreateLangBarMgr MSCTF_FN(TF_CreateLangBarMgr) = NULL; +FN_TF_InvalidAssemblyListCacheIfExist MSCTF_FN(TF_InvalidAssemblyListCacheIfExist) = NULL; + +#define Imm32GetMsctfFn(func_name) \ + IMM32_GET_FN(&MSCTF_FN(func_name), &g_hMsctf, L"msctf.dll", #func_name) + +HRESULT Imm32TF_CreateLangBarMgr(_Inout_ ITfLangBarMgr **ppBarMgr) +{ + if (!Imm32GetMsctfFn(TF_CreateLangBarMgr)) + return E_FAIL; + + return MSCTF_FN(TF_CreateLangBarMgr)(ppBarMgr); +} + +VOID Imm32TF_InvalidAssemblyListCacheIfExist(VOID) +{ + if (!Imm32GetMsctfFn(TF_InvalidAssemblyListCacheIfExist)) + return; + + MSCTF_FN(TF_InvalidAssemblyListCacheIfExist)(); +} + +/*********************************************************************** + * CTF IME support + * * TSF stands for "Text Services Framework". "Cicero" is the code name of TSF. * CTF stands for "Cicero-aware Text Framework". * @@ -385,22 +494,59 @@ CtfImmTIMActivate(_In_ HKL hKL) } /*********************************************************************** - * CtfImmRestoreToolbarWnd(IMM32.@) + * CtfImmHideToolbarWnd(IMM32.@) + * + * Used with CtfImmRestoreToolbarWnd. */ -VOID WINAPI -CtfImmRestoreToolbarWnd(_In_ DWORD dwStatus) +DWORD WINAPI +CtfImmHideToolbarWnd(VOID) { - FIXME("(0x%lx)\n", dwStatus); + ITfLangBarMgr *pBarMgr; + DWORD dwShowFlags = 0; + BOOL bShown; + + TRACE("()\n"); + + if (FAILED(Imm32TF_CreateLangBarMgr(&pBarMgr))) + return dwShowFlags; + + if (SUCCEEDED(pBarMgr->lpVtbl->GetShowFloatingStatus(pBarMgr, &dwShowFlags))) + { + bShown = !(dwShowFlags & 0x800); + dwShowFlags &= 0xF; + if (bShown) + pBarMgr->lpVtbl->ShowFloating(pBarMgr, 8); + } + + pBarMgr->lpVtbl->Release(pBarMgr); + return dwShowFlags; } /*********************************************************************** - * CtfImmHideToolbarWnd(IMM32.@) + * CtfImmRestoreToolbarWnd(IMM32.@) + * + * Used with CtfImmHideToolbarWnd. */ -DWORD WINAPI -CtfImmHideToolbarWnd(VOID) +VOID WINAPI +CtfImmRestoreToolbarWnd( + _In_ LPVOID pUnused, + _In_ DWORD dwShowFlags) { - FIXME("()\n"); - return 0; + HRESULT hr; + ITfLangBarMgr *pBarMgr; + + UNREFERENCED_PARAMETER(pUnused); + + TRACE("(%p, 0x%X)\n", pUnused, dwShowFlags); + + hr = Imm32TF_CreateLangBarMgr(&pBarMgr); + if (FAILED(hr)) + return; + + if (dwShowFlags) + pBarMgr->lpVtbl->ShowFloating(pBarMgr, dwShowFlags); + + pBarMgr->lpVtbl->Release(pBarMgr); } BOOL Imm32InsideLoaderLock(VOID) diff --git a/dll/win32/imm32/imm32.spec b/dll/win32/imm32/imm32.spec index 89293195098..3a706be14b4 100644 --- a/dll/win32/imm32/imm32.spec +++ b/dll/win32/imm32/imm32.spec @@ -5,7 +5,7 @@ @ stdcall CtfImmIsCiceroStartedInThread() @ stdcall CtfImmIsTextFrameServiceDisabled() @ stdcall CtfImmTIMActivate(ptr) -@ stdcall CtfImmRestoreToolbarWnd(long) +@ stdcall CtfImmRestoreToolbarWnd(ptr long) @ stdcall CtfImmHideToolbarWnd() @ stdcall CtfImmDispatchDefImeMessage(ptr long ptr ptr) @ stdcall CtfImmIsGuidMapEnable(ptr) diff --git a/sdk/include/reactos/imm32_undoc.h b/sdk/include/reactos/imm32_undoc.h index d2622dd8423..61904db0b13 100644 --- a/sdk/include/reactos/imm32_undoc.h +++ b/sdk/include/reactos/imm32_undoc.h @@ -27,6 +27,8 @@ HRESULT WINAPI CtfAImmDeactivate(_In_ BOOL bDestroy); BOOL WINAPI CtfAImmIsIME(_In_ HKL hKL); BOOL WINAPI CtfImmIsCiceroStartedInThread(VOID); VOID WINAPI CtfImmSetAppCompatFlags(_In_ DWORD dwFlags); +DWORD WINAPI CtfImmHideToolbarWnd(VOID); +VOID WINAPI CtfImmRestoreToolbarWnd(_In_ LPVOID pUnused, _In_ DWORD dwShowFlags); LRESULT WINAPI CtfImmDispatchDefImeMessage(

1 year, 2 months

[reactos] 01/01: [MSPAINT] Refactor mouse moving code on canvas (#5878)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a114169c4de46e464ca7c… commit a114169c4de46e464ca7c7d37566b8883da8ec63 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 22:41:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 22:41:06 2023 +0900 [MSPAINT] Refactor mouse moving code on canvas (#5878) Move some mouse moving code to toolsModel. CORE-19094 --- base/applications/mspaint/canvas.cpp | 73 +------------------------------- base/applications/mspaint/toolsmodel.cpp | 72 +++++++++++++++++++++++++++++++ base/applications/mspaint/toolsmodel.h | 2 + 3 files changed, 75 insertions(+), 72 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 4b19a34e10d..b1b76ce9901 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -459,78 +459,7 @@ LRESULT CCanvasWindow::OnMouseMove(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL if (m_drawing) { - // values displayed in statusbar - LONG xRel = pt.x - g_ptStart.x; - LONG yRel = pt.y - g_ptStart.y; - - switch (toolsModel.GetActiveTool()) - { - // freesel, rectsel and text tools always show numbers limited to fit into image area - case TOOL_FREESEL: - case TOOL_RECTSEL: - case TOOL_TEXT: - if (xRel < 0) - xRel = (pt.x < 0) ? -g_ptStart.x : xRel; - else if (pt.x > imageModel.GetWidth()) - xRel = imageModel.GetWidth() - g_ptStart.x; - if (yRel < 0) - yRel = (pt.y < 0) ? -g_ptStart.y : yRel; - else if (pt.y > imageModel.GetHeight()) - yRel = imageModel.GetHeight() - g_ptStart.y; - break; - - // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 - case TOOL_RUBBER: - case TOOL_PEN: - case TOOL_BRUSH: - case TOOL_AIRBRUSH: - case TOOL_SHAPE: - { - CString strCoord; - strCoord.Format(_T("%ld, %ld"), pt.x, pt.y); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 1, (LPARAM) (LPCTSTR) strCoord); - break; - } - default: - break; - } - - // rectsel and shape tools always show non-negative numbers when drawing - if (toolsModel.GetActiveTool() == TOOL_RECTSEL || toolsModel.GetActiveTool() == TOOL_SHAPE) - { - if (xRel < 0) - xRel = -xRel; - if (yRel < 0) - yRel = -yRel; - } - - if (wParam & MK_LBUTTON) - { - toolsModel.OnMouseMove(TRUE, pt.x, pt.y); - Invalidate(FALSE); - if ((toolsModel.GetActiveTool() >= TOOL_TEXT) || toolsModel.IsSelection()) - { - CString strSize; - if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(_T("%ld x %ld"), xRel, yRel); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - } - } - - if (wParam & MK_RBUTTON) - { - toolsModel.OnMouseMove(FALSE, pt.x, pt.y); - Invalidate(FALSE); - if (toolsModel.GetActiveTool() >= TOOL_TEXT) - { - CString strSize; - if ((toolsModel.GetActiveTool() >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) - yRel = xRel; - strSize.Format(_T("%ld x %ld"), xRel, yRel); - ::SendMessage(g_hStatusBar, SB_SETTEXT, 2, (LPARAM) (LPCTSTR) strSize); - } - } + toolsModel.DrawWithMouseTool(pt, wParam); return 0; } diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index 6efb859066b..0700617403e 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -321,3 +321,75 @@ void ToolsModel::SpecialTweak(BOOL bMinus) { m_pToolObject->OnSpecialTweak(bMinus); } + +void ToolsModel::DrawWithMouseTool(POINT pt, WPARAM wParam) +{ + LONG xRel = pt.x - g_ptStart.x, yRel = pt.y - g_ptStart.y; + + switch (m_activeTool) + { + // freesel, rectsel and text tools always show numbers limited to fit into image area + case TOOL_FREESEL: + case TOOL_RECTSEL: + case TOOL_TEXT: + if (xRel < 0) + xRel = (pt.x < 0) ? -g_ptStart.x : xRel; + else if (pt.x > imageModel.GetWidth()) + xRel = imageModel.GetWidth() - g_ptStart.x; + if (yRel < 0) + yRel = (pt.y < 0) ? -g_ptStart.y : yRel; + else if (pt.y > imageModel.GetHeight()) + yRel = imageModel.GetHeight() - g_ptStart.y; + break; + + // while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 + case TOOL_RUBBER: + case TOOL_PEN: + case TOOL_BRUSH: + case TOOL_AIRBRUSH: + case TOOL_SHAPE: + { + CStringW strCoord; + strCoord.Format(L"%ld, %ld", pt.x, pt.y); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 1, (LPARAM)(LPCWSTR)strCoord); + break; + } + default: + break; + } + + // rectsel and shape tools always show non-negative numbers when drawing + if (m_activeTool == TOOL_RECTSEL || m_activeTool == TOOL_SHAPE) + { + xRel = labs(xRel); + yRel = labs(yRel); + } + + if (wParam & MK_LBUTTON) + { + OnMouseMove(TRUE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if ((m_activeTool >= TOOL_TEXT) || IsSelection()) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } + + if (wParam & MK_RBUTTON) + { + OnMouseMove(FALSE, pt.x, pt.y); + canvasWindow.Invalidate(FALSE); + if (m_activeTool >= TOOL_TEXT) + { + CStringW strSize; + if ((m_activeTool >= TOOL_LINE) && (GetAsyncKeyState(VK_SHIFT) < 0)) + yRel = xRel; + strSize.Format(L"%ld x %ld", xRel, yRel); + ::SendMessageW(g_hStatusBar, SB_SETTEXT, 2, (LPARAM)(LPCWSTR)strSize); + } + } +} diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 3cd14e8e6d3..9af67a501c7 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -145,6 +145,8 @@ public: void NotifyZoomChanged(); void SpecialTweak(BOOL bMinus); + + void DrawWithMouseTool(POINT pt, WPARAM wParam); }; extern ToolsModel toolsModel;

1 year, 2 months

[reactos] 01/01: [MSPAINT] Simplify tool creation (#5876)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a6418c848cc50f21c4459… commit a6418c848cc50f21c445906c6687db4b29b6aa2f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 16:49:13 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 16:49:13 2023 +0900 [MSPAINT] Simplify tool creation (#5876) Reduce code and binary size. This will reduce 512 bytes in binary. - Don't use cache for tool creation. CORE-19094 --- base/applications/mspaint/toolsmodel.cpp | 12 +++++------- base/applications/mspaint/toolsmodel.h | 1 - 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index a8a7b490803..6efb859066b 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -22,22 +22,20 @@ ToolsModel::ToolsModel() m_rubberRadius = 4; m_transpBg = FALSE; m_zoom = 1000; - ZeroMemory(&m_tools, sizeof(m_tools)); m_pToolObject = GetOrCreateTool(m_activeTool); } ToolsModel::~ToolsModel() { - for (size_t i = 0; i < _countof(m_tools); ++i) - delete m_tools[i]; + delete m_pToolObject; + m_pToolObject = NULL; } ToolBase *ToolsModel::GetOrCreateTool(TOOLTYPE nTool) { - if (!m_tools[nTool]) - m_tools[nTool] = ToolBase::createToolObject(nTool); - - return m_tools[nTool]; + delete m_pToolObject; + m_pToolObject = ToolBase::createToolObject(nTool); + return m_pToolObject; } BOOL ToolsModel::IsSelection() const diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index 51ddb0d46d2..3cd14e8e6d3 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -84,7 +84,6 @@ private: int m_rubberRadius; BOOL m_transpBg; int m_zoom; - ToolBase* m_tools[TOOL_MAX + 1]; ToolBase *m_pToolObject; ToolBase *GetOrCreateTool(TOOLTYPE nTool);

1 year, 2 months

[reactos] 01/01: [MSPAINT] Commonize OnFinishDraw and OnCancelDraw (#5875)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=37f56d2448059c78f8cde… commit 37f56d2448059c78f8cde65915b7a2103c06c3c4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Fri Nov 3 16:20:03 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Nov 3 16:20:03 2023 +0900 [MSPAINT] Commonize OnFinishDraw and OnCancelDraw (#5875) Reduce code and binary size a bit. This will reduce 1024 bytes in binary. Unify ToolBase::OnFinishDraw and ToolBase::OnCancelDraw to ToolBase::OnEndDraw. CORE-19094 --- base/applications/mspaint/canvas.cpp | 8 +- base/applications/mspaint/mouse.cpp | 140 ++++++++++++------------------- base/applications/mspaint/textedit.cpp | 2 +- base/applications/mspaint/toolsmodel.cpp | 16 +--- base/applications/mspaint/toolsmodel.h | 8 +- 5 files changed, 67 insertions(+), 107 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index b423662d882..4b19a34e10d 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -357,13 +357,13 @@ LRESULT CCanvasWindow::OnButtonDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOO { case TOOL_BEZIER: case TOOL_SHAPE: - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); Invalidate(); break; case TOOL_FREESEL: case TOOL_RECTSEL: - toolsModel.OnFinishDraw(); + toolsModel.OnEndDraw(FALSE); Invalidate(); break; @@ -814,13 +814,13 @@ VOID CCanvasWindow::cancelDrawing() selectionModel.ClearMaskImage(); m_hitSelection = HIT_NONE; m_drawing = FALSE; - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); Invalidate(FALSE); } VOID CCanvasWindow::finishDrawing() { - toolsModel.OnFinishDraw(); + toolsModel.OnEndDraw(FALSE); m_drawing = FALSE; Invalidate(FALSE); } diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index c7c19e16544..01379f97dc7 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -62,13 +62,7 @@ void ToolBase::reset() } } -void ToolBase::OnCancelDraw() -{ - reset(); - imageModel.NotifyImageChanged(); -} - -void ToolBase::OnFinishDraw() +void ToolBase::OnEndDraw(BOOL bCancel) { reset(); imageModel.NotifyImageChanged(); @@ -175,16 +169,13 @@ struct FreeSelTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - selectionModel.Landing(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - selectionModel.HideSelection(); - ToolBase::OnCancelDraw(); + if (bCancel) + selectionModel.HideSelection(); + else + selectionModel.Landing(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -260,16 +251,13 @@ struct RectSelTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - selectionModel.Landing(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - selectionModel.HideSelection(); - ToolBase::OnCancelDraw(); + if (bCancel) + selectionModel.HideSelection(); + else + selectionModel.Landing(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -309,16 +297,10 @@ struct TwoPointDrawTool : ToolBase return TRUE; } - void OnFinishDraw() override - { - m_bDrawing = FALSE; - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { m_bDrawing = FALSE; - ToolBase::OnCancelDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -471,21 +453,19 @@ struct SmoothDrawTool : ToolBase } draw(bLeftButton, x, y); - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } - void OnFinishDraw() override - { - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { - LONG x = 0, y = 0; - OnButtonUp(FALSE, x, y); - imageModel.Undo(TRUE); - ToolBase::OnCancelDraw(); + if (bCancel) + { + LONG x = 0, y = 0; + OnButtonUp(FALSE, x, y); + imageModel.Undo(TRUE); + } + ToolBase::OnEndDraw(bCancel); } }; @@ -799,22 +779,19 @@ struct TextTool : ToolBase return TRUE; } - void OnFinishDraw() override + void OnEndDraw(BOOL bCancel) override { - if (::IsWindowVisible(textEditWindow) && - textEditWindow.GetWindowTextLength() > 0) + if (!bCancel) { - imageModel.PushImageForUndo(); - draw(m_hdc); + if (::IsWindowVisible(textEditWindow) && + textEditWindow.GetWindowTextLength() > 0) + { + imageModel.PushImageForUndo(); + draw(m_hdc); + } } quit(); - ToolBase::OnFinishDraw(); - } - - void OnCancelDraw() override - { - quit(); - ToolBase::OnCancelDraw(); + ToolBase::OnEndDraw(bCancel); } }; @@ -902,25 +879,22 @@ struct BezierTool : ToolBase s_pointStack[s_pointSP].y = y; if (s_pointSP >= 3) { - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } imageModel.NotifyImageChanged(); return TRUE; } - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { + if (!bCancel) + { + imageModel.PushImageForUndo(); + OnDrawOverlayOnImage(m_hdc); + } m_bDrawing = FALSE; - ToolBase::OnCancelDraw(); - } - - void OnFinishDraw() override - { - imageModel.PushImageForUndo(); - OnDrawOverlayOnImage(m_hdc); - m_bDrawing = FALSE; - ToolBase::OnFinishDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override @@ -983,7 +957,7 @@ struct ShapeTool : ToolBase if (s_pointSP && bDoubleClick) { - OnFinishDraw(); + OnEndDraw(FALSE); return; } @@ -1017,7 +991,7 @@ struct ShapeTool : ToolBase m_bClosed = FALSE; if (nearlyEqualPoints(x, y, s_pointStack[0].x, s_pointStack[0].y)) { - OnFinishDraw(); + OnEndDraw(FALSE); return TRUE; } else @@ -1034,26 +1008,22 @@ struct ShapeTool : ToolBase return TRUE; } - void OnCancelDraw() override + void OnEndDraw(BOOL bCancel) override { - ToolBase::OnCancelDraw(); - } - - void OnFinishDraw() override - { - if (s_pointSP) + if (!bCancel) { - --s_pointSP; - m_bClosed = TRUE; + if (s_pointSP) + { + --s_pointSP; + m_bClosed = TRUE; - imageModel.PushImageForUndo(); - OnDrawOverlayOnImage(m_hdc); + imageModel.PushImageForUndo(); + OnDrawOverlayOnImage(m_hdc); + } + m_bClosed = FALSE; + s_pointSP = 0; } - - m_bClosed = FALSE; - s_pointSP = 0; - - ToolBase::OnFinishDraw(); + ToolBase::OnEndDraw(bCancel); } void OnSpecialTweak(BOOL bMinus) override diff --git a/base/applications/mspaint/textedit.cpp b/base/applications/mspaint/textedit.cpp index 39cc1ba40e3..5261da63a0e 100644 --- a/base/applications/mspaint/textedit.cpp +++ b/base/applications/mspaint/textedit.cpp @@ -104,7 +104,7 @@ LRESULT CTextEditWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL { if (wParam == VK_ESCAPE) { - toolsModel.OnCancelDraw(); + toolsModel.OnEndDraw(TRUE); return 0; } diff --git a/base/applications/mspaint/toolsmodel.cpp b/base/applications/mspaint/toolsmodel.cpp index dec101adc9e..a8a7b490803 100644 --- a/base/applications/mspaint/toolsmodel.cpp +++ b/base/applications/mspaint/toolsmodel.cpp @@ -145,7 +145,7 @@ TOOLTYPE ToolsModel::GetOldActiveTool() const void ToolsModel::SetActiveTool(TOOLTYPE nActiveTool) { - OnFinishDraw(); + OnEndDraw(FALSE); selectionModel.Landing(); @@ -288,19 +288,11 @@ void ToolsModel::OnButtonUp(BOOL bLeftButton, LONG x, LONG y) m_pToolObject->endEvent(); } -void ToolsModel::OnCancelDraw() +void ToolsModel::OnEndDraw(BOOL bCancel) { - ATLTRACE("ToolsModel::OnCancelDraw()\n"); + ATLTRACE("ToolsModel::OnEndDraw(%d)\n", bCancel); m_pToolObject->beginEvent(); - m_pToolObject->OnCancelDraw(); - m_pToolObject->endEvent(); -} - -void ToolsModel::OnFinishDraw() -{ - ATLTRACE("ToolsModel::OnFinishDraw()\n"); - m_pToolObject->beginEvent(); - m_pToolObject->OnFinishDraw(); + m_pToolObject->OnEndDraw(bCancel); m_pToolObject->endEvent(); } diff --git a/base/applications/mspaint/toolsmodel.h b/base/applications/mspaint/toolsmodel.h index d90faee117b..51ddb0d46d2 100644 --- a/base/applications/mspaint/toolsmodel.h +++ b/base/applications/mspaint/toolsmodel.h @@ -53,14 +53,13 @@ struct ToolBase virtual BOOL OnMouseMove(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } virtual BOOL OnButtonUp(BOOL bLeftButton, LONG& x, LONG& y) { return TRUE; } - virtual void OnCancelDraw(); - virtual void OnFinishDraw(); - virtual void OnDrawOverlayOnImage(HDC hdc) { } virtual void OnDrawOverlayOnCanvas(HDC hdc) { } virtual void OnSpecialTweak(BOOL bMinus) { } + virtual void OnEndDraw(BOOL bCancel); + void beginEvent(); void endEvent(); void reset(); @@ -135,8 +134,7 @@ public: void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick); void OnMouseMove(BOOL bLeftButton, LONG x, LONG y); void OnButtonUp(BOOL bLeftButton, LONG x, LONG y); - void OnCancelDraw(); - void OnFinishDraw(); + void OnEndDraw(BOOL bCancel); void OnDrawOverlayOnImage(HDC hdc); void OnDrawOverlayOnCanvas(HDC hdc);

1 year, 2 months

[reactos] 01/01: [NOTEPAD] de-DE.rc: Fix CMD_HELP_ABOUT_NOTEPAD, all rc: strip bloat-spaces before \n and ?

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=32b883ef2f7ddc64db9e4… commit 32b883ef2f7ddc64db9e4b72d30048ca375198ce Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Nov 3 02:13:37 2023 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Nov 3 02:19:34 2023 +0100 [NOTEPAD] de-DE.rc: Fix CMD_HELP_ABOUT_NOTEPAD, all rc: strip bloat-spaces before \n and ? --- base/applications/notepad/lang/bg-BG.rc | 2 +- base/applications/notepad/lang/cs-CZ.rc | 8 ++++---- base/applications/notepad/lang/da-DK.rc | 4 ++-- base/applications/notepad/lang/de-DE.rc | 17 ++++++++--------- base/applications/notepad/lang/el-GR.rc | 2 +- base/applications/notepad/lang/en-US.rc | 12 ++++++------ base/applications/notepad/lang/es-ES.rc | 2 +- base/applications/notepad/lang/et-EE.rc | 7 +++---- base/applications/notepad/lang/fi-FI.rc | 8 ++++---- base/applications/notepad/lang/he-IL.rc | 6 +++--- base/applications/notepad/lang/hr-HR.rc | 6 +++--- base/applications/notepad/lang/hu-HU.rc | 2 +- base/applications/notepad/lang/hy-AM.rc | 8 ++++---- base/applications/notepad/lang/id-ID.rc | 5 ++--- base/applications/notepad/lang/it-IT.rc | 6 +++--- base/applications/notepad/lang/ja-JP.rc | 4 ++-- base/applications/notepad/lang/lt-LT.rc | 4 ++-- base/applications/notepad/lang/ms-MY.rc | 4 ++-- base/applications/notepad/lang/nl-NL.rc | 4 ++-- base/applications/notepad/lang/no-NO.rc | 7 +++---- base/applications/notepad/lang/pl-PL.rc | 10 +++++----- base/applications/notepad/lang/pt-BR.rc | 2 +- base/applications/notepad/lang/pt-PT.rc | 2 +- base/applications/notepad/lang/ro-RO.rc | 6 +++--- base/applications/notepad/lang/ru-RU.rc | 4 ++-- base/applications/notepad/lang/sk-SK.rc | 12 +++--------- base/applications/notepad/lang/sl-SI.rc | 6 +++--- base/applications/notepad/lang/sq-AL.rc | 12 +++++------- base/applications/notepad/lang/sv-SE.rc | 4 ++-- base/applications/notepad/lang/th-TH.rc | 4 ++-- base/applications/notepad/lang/tr-TR.rc | 4 ++-- base/applications/notepad/lang/uk-UA.rc | 8 ++++---- 32 files changed, 90 insertions(+), 102 deletions(-) diff --git a/base/applications/notepad/lang/bg-BG.rc b/base/applications/notepad/lang/bg-BG.rc index 9d45a9f5d1d..478f854596b 100644 --- a/base/applications/notepad/lang/bg-BG.rc +++ b/base/applications/notepad/lang/bg-BG.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Словесни файлове (*.txt)" STRING_TOOLARGE "Файлът '%s' е твърде голям за бележника.\n\ Използвайте друг обработчик." - STRING_NOTEXT "Не сте въвел текст. \ + STRING_NOTEXT "Не сте въвел текст.\ \nНапишете нещо и опитайте пак." STRING_DOESNOTEXIST "Файлът '%s'\nне съществува\n\n\ Искате ли да създадете нов файл?" diff --git a/base/applications/notepad/lang/cs-CZ.rc b/base/applications/notepad/lang/cs-CZ.rc index 874854b9cf4..11cf195af20 100644 --- a/base/applications/notepad/lang/cs-CZ.rc +++ b/base/applications/notepad/lang/cs-CZ.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Textové soubory (*.txt)" STRING_TOOLARGE "Soubor '%s' je pro notepad příliš velký.\n\ Použijte jiný editor, prosím." - STRING_NOTEXT "Nebyl zadán žádný text. \ + STRING_NOTEXT "Nebyl zadán žádný text.\ \nVložte nějaký text a zkuste to znovu." STRING_DOESNOTEXIST "Soubor '%s'\nneexistuje.\n\n\ -Chcete ho vytvořit ?" +Chcete ho vytvořit?" STRING_NOTSAVED "Soubor '%s'\nbyl změněn.\n\n\ -Chcete uložit změny ?" +Chcete uložit změny?" STRING_NOTFOUND "'%s' nebyl nalezen." - STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy. \ + STRING_OUT_OF_MEMORY "Není dost paměti na dokončení této úlohy.\ \nUzavřete jednu či více aplikací, abyste získali více\nvolné \ paměti." STRING_CANNOTFIND "Nelze nalézt '%s'" diff --git a/base/applications/notepad/lang/da-DK.rc b/base/applications/notepad/lang/da-DK.rc index dc637207806..c632169f151 100644 --- a/base/applications/notepad/lang/da-DK.rc +++ b/base/applications/notepad/lang/da-DK.rc @@ -152,9 +152,9 @@ BEGIN STRING_UNTITLED "Ikke-navngivet" STRING_ALL_FILES "Alle filer (*.*)" STRING_TEXT_FILES_TXT "Tekst filer (*.txt)" - STRING_TOOLARGE "Filen '%s' er for stor til Notesblok. \ + STRING_TOOLARGE "Filen '%s' er for stor til Notesblok.\ \nBrug en anden editor til at redigere filen." - STRING_NOTEXT "Du har ikke skrevet noget tekst. \ + STRING_NOTEXT "Du har ikke skrevet noget tekst.\ \nSkriv noget tekst, og prøv så igen" STRING_DOESNOTEXIST "Filen '%s'\neksistere ikke\n\n\ Ønkser du at oprette en ny fil?" diff --git a/base/applications/notepad/lang/de-DE.rc b/base/applications/notepad/lang/de-DE.rc index 8220a475df4..24bc433fbf4 100644 --- a/base/applications/notepad/lang/de-DE.rc +++ b/base/applications/notepad/lang/de-DE.rc @@ -65,7 +65,7 @@ BEGIN BEGIN MENUITEM "&Inhalt", CMD_HELP_CONTENTS MENUITEM SEPARATOR - MENUITEM "&About Notepad", CMD_HELP_ABOUT_NOTEPAD + MENUITEM "Inf&o", CMD_HELP_ABOUT_NOTEPAD END END @@ -154,17 +154,16 @@ BEGIN STRING_TEXT_FILES_TXT "Textdateien (*.txt)" STRING_TOOLARGE "Die Datei '%s' ist zu groß für den Editor.\n\ Benutzen Sie bitte einen anderen Editor, um diese Datei zu bearbeiten." - STRING_NOTEXT "Sie haben keinen Text eingegeben, der \ -gespeichert\n werden könnte. Geben Sie Text ein, und versuchen Sie es \ -\nerneut." + STRING_NOTEXT "Sie haben keinen Text eingegeben, der gespeichert\n\ +werden könnte. Geben Sie Text ein, und versuchen Sie es\nerneut." STRING_DOESNOTEXIST "Die Datei '%s'\nexistiert nicht.\n\n\ -Möchten Sie eine neue Datei erstellen ?" +Möchten Sie eine neue Datei erstellen?" STRING_NOTSAVED "Datei %s\n wurde geändert.\n\n\ -Möchten Sie die Änderungen speichern ?" +Möchten Sie die Änderungen speichern?" STRING_NOTFOUND "'%s' kann nicht gefunden werden." - STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, \ -um diese Funktion\nabzuschließen. Beenden Sie eine oder mehrere \ -\nAnwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen." + STRING_OUT_OF_MEMORY "Nicht genügend Arbeitsspeicher, um diese Funktion\n\ +abzuschließen. Beenden Sie eine oder mehrere\n\ +Anwendungen, um den verfügbaren Arbeitsspeicher zu\nerhöhen." STRING_CANNOTFIND "'%s' wurde nicht gefunden." STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/el-GR.rc b/base/applications/notepad/lang/el-GR.rc index 4d8cb846c65..86e75214323 100644 --- a/base/applications/notepad/lang/el-GR.rc +++ b/base/applications/notepad/lang/el-GR.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Αρχεία κειμένου (*.txt)" STRING_TOOLARGE "Το αρχείο '%s' είναι πολύ μεγάλο για το notepad.\n\ Παρακαλώ χρησιμοποιείστε άλλο πρόγραμμα επεξεργασίας κειμένου." - STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι. \ + STRING_NOTEXT "Δεν πληκτρολογήσατε κάτι.\ \nΠαρακαλώ πληκτρολογείστε κάτι και προσπαθείστε ξανά" STRING_DOESNOTEXIST "Το αρχείο '%s'\nδεν υπάρχει\n\n\ Θέλετε να δημιουργήσετε ένα νέο αρχείο;" diff --git a/base/applications/notepad/lang/en-US.rc b/base/applications/notepad/lang/en-US.rc index a3444ea81b6..64b250ba8dd 100644 --- a/base/applications/notepad/lang/en-US.rc +++ b/base/applications/notepad/lang/en-US.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Text files (*.txt)" STRING_TOOLARGE "File '%s' is too large for notepad.\n\ Please use a different editor." - STRING_NOTEXT "You didn't enter any text. \ -\nPlease type something and try again" + STRING_NOTEXT "You didn't enter any text.\n\ +Please type something and try again" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' can not be found." - STRING_OUT_OF_MEMORY "Not enough memory to complete this \ -task.\nClose one or more applications to increase the amount of\nfree memory." + STRING_OUT_OF_MEMORY "Not enough memory to complete this task.\n\ +Close one or more applications to increase the amount of\nfree memory." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/es-ES.rc b/base/applications/notepad/lang/es-ES.rc index 541fdfbad63..b6e7f3b3c27 100644 --- a/base/applications/notepad/lang/es-ES.rc +++ b/base/applications/notepad/lang/es-ES.rc @@ -1,4 +1,4 @@ -/* Spanish translation by Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12) */ +// COPYRIGHT: Ismael Ferreras Morezuelas (Swyter), Catalin Gabriel Draghita (jeffbox12) LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL diff --git a/base/applications/notepad/lang/et-EE.rc b/base/applications/notepad/lang/et-EE.rc index 8b1171328fa..7d31ceb9ec6 100644 --- a/base/applications/notepad/lang/et-EE.rc +++ b/base/applications/notepad/lang/et-EE.rc @@ -1,7 +1,6 @@ /* * PROJECT: NOTEPAD for ReactOS * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) - * FILE: base/applications/notepad/lang/et-EE.rc * PURPOSE: Estonian Language resource file * TRANSLATOR: Joann Mõndresku (joannmondresku at gmail dot com) */ @@ -162,12 +161,12 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstifailid (*.txt)" STRING_TOOLARGE "Fail '%s' on liiga suur Notepad'i jaoks.\n\ Palun kasuta erinevat redigeerijat." - STRING_NOTEXT "Sa ei sisestanud midagi. \ + STRING_NOTEXT "Sa ei sisestanud midagi.\ \nPalun kirjuta midagi ja proovi uuesti." STRING_DOESNOTEXIST "Faili '%s'\nei ole olemas\n\n\ -Kas soovid uut faili koostada ?" +Kas soovid uut faili koostada?" STRING_NOTSAVED "Faili '%s'\non redigeeritud\n\n\ -Kas soovid muudatused salvestada ?" +Kas soovid muudatused salvestada?" STRING_NOTFOUND "'%s' ei suudetud leida." STRING_OUT_OF_MEMORY "Pole piisavalt mälu selle \ käsu lõpetamiseks.\nSulge üks või enam rakendust, et suurendada\nvaba mälu hulka." diff --git a/base/applications/notepad/lang/fi-FI.rc b/base/applications/notepad/lang/fi-FI.rc index 6cc2f9a1a0c..6b4a58d4878 100644 --- a/base/applications/notepad/lang/fi-FI.rc +++ b/base/applications/notepad/lang/fi-FI.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Teksti tiedostot (*.txt)" STRING_TOOLARGE "Tiedosto '%s' on liian suuri.\n\ Please use a different editor." - STRING_NOTEXT "Et syöttänyt lainkaan tekstiä. \ + STRING_NOTEXT "Et syöttänyt lainkaan tekstiä.\ \nKirjoita jotain ja yritä uudelleen" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' ei löydy." - STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän \ + STRING_OUT_OF_MEMORY "Muistia ei ole riittävästi tämän\ \ntehtävän tekemiseksi. Sulje jokin sovellus vapauttaaksesi\n\ muistia." STRING_CANNOTFIND "Cannot find '%s'" diff --git a/base/applications/notepad/lang/he-IL.rc b/base/applications/notepad/lang/he-IL.rc index afcdd1a9e81..c3312dfa326 100644 --- a/base/applications/notepad/lang/he-IL.rc +++ b/base/applications/notepad/lang/he-IL.rc @@ -157,12 +157,12 @@ BEGIN STRING_TEXT_FILES_TXT "קבצי טקסט (*.txt)" STRING_TOOLARGE "File '%s' is too large for notepad.\n\ Please use a different editor." - STRING_NOTEXT "You didn't enter any text. \ + STRING_NOTEXT "You didn't enter any text.\ \nPlease type something and try again" STRING_DOESNOTEXIST "File '%s'\ndoes not exist\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "File '%s'\nhas been modified\n\n\ -Would you like to save the changes ?" +Would you like to save the changes?" STRING_NOTFOUND "'%s' לא נמצא." STRING_OUT_OF_MEMORY "Not enough memory to complete this \ task.\nClose one or more applications to increase the amount of\nfree memory." diff --git a/base/applications/notepad/lang/hr-HR.rc b/base/applications/notepad/lang/hr-HR.rc index dea66511d0a..e316cb2354f 100644 --- a/base/applications/notepad/lang/hr-HR.rc +++ b/base/applications/notepad/lang/hr-HR.rc @@ -161,12 +161,12 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstne datoteke (*.txt)" STRING_TOOLARGE "Datoteka '%s' je prevelik za program Blok za pisanje.\n\ Molimo Vas da koristite drugu aplikaciju." - STRING_NOTEXT "Niste unijeli tekst. \ + STRING_NOTEXT "Niste unijeli tekst.\ \nMolimo Vas da nešto unesete i ponovo pokušate." STRING_DOESNOTEXIST "Datoteka '%s'\nne postoji\n\n\ -Želite li stvoriti novu datoteku ?" +Želite li stvoriti novu datoteku?" STRING_NOTSAVED "Datoteka '%s'\nje bila promijenjena\n\n\ -Želite li spremiti te promjene ?" +Želite li spremiti te promjene?" STRING_NOTFOUND "'%s' ne može biti pronađena." STRING_OUT_OF_MEMORY "Nema dovoljno memorije da se dovrši \ zadatak.\nZatvorite jednu ili više aplikacija da povećate\nslobodnu memoriju." diff --git a/base/applications/notepad/lang/hu-HU.rc b/base/applications/notepad/lang/hu-HU.rc index 1f419e614c7..4f09de0433d 100644 --- a/base/applications/notepad/lang/hu-HU.rc +++ b/base/applications/notepad/lang/hu-HU.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Szövegfájlok (*.txt)" STRING_TOOLARGE "'%s' fájl túl nagy méretű.\n\ Kérem használjon másik szövegszerkesztő programot." - STRING_NOTEXT "A szöveg nem tartalmaz karaktert! \ + STRING_NOTEXT "A szöveg nem tartalmaz karaktert!\ \nKérem gépeljen be néhány karaktert és próbálja újra!" STRING_DOESNOTEXIST "A megadott '%s'\nfájl nem létezik!\n\n\ Kíván létrehozni új fájlt?" diff --git a/base/applications/notepad/lang/hy-AM.rc b/base/applications/notepad/lang/hy-AM.rc index c1b866313b4..b273e56cbbf 100644 --- a/base/applications/notepad/lang/hy-AM.rc +++ b/base/applications/notepad/lang/hy-AM.rc @@ -157,11 +157,11 @@ Please use a different editor." STRING_NOTEXT "Դուք տեքստ չեք ներմուծել \ \nPlease type something and try again" STRING_DOESNOTEXIST "Ֆայլը '%s'\n գոյութնուն չունի\n\n\ -Do you want to create a new file ?" +Do you want to create a new file?" STRING_NOTSAVED "Ֆայլը '%s'\n ենթարկվել է փոփոխման\n\n\ -Would you like to save the changes ?" - STRING_NOTFOUND "'%s' չի գտնվել." - STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն. \ +Would you like to save the changes?" + STRING_NOTFOUND "'%s' չի գտնվել." + STRING_OUT_OF_MEMORY "Կա հիծողությոն անբավարարվախույուն.\ \nՓակեք մի կամ մի քանի ծրագիր." STRING_CANNOTFIND "Չի գտնվել '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/id-ID.rc b/base/applications/notepad/lang/id-ID.rc index 8405f0f0abf..bbd4256c956 100644 --- a/base/applications/notepad/lang/id-ID.rc +++ b/base/applications/notepad/lang/id-ID.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Berkas teks (*.txt)" STRING_TOOLARGE "Berkas '%s' terlalu besar untuk notepad.\n\ Mohon gunakan editor teks yang berbeda." - STRING_NOTEXT "Anda belum memasukkan teks apapun. \ + STRING_NOTEXT "Anda belum memasukkan teks apapun.\ \nMohon ketik sesuatu dan coba lagi." STRING_DOESNOTEXIST "Berkas '%s'\ntidak ada\n\n\ Ingin membuat berkas baru?" @@ -162,8 +162,7 @@ Ingin membuat berkas baru?" Ingin menyimpan perubahan?" STRING_NOTFOUND "'%s' tidak bisa ditemukan." STRING_OUT_OF_MEMORY "Memori tidak cukup untuk menyelesaikan tugas \ -ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori \ -bebas." +ini.\nTutup satu atau lebih aplikasi untuk meningkatkan jumlah\nmemori bebas." STRING_CANNOTFIND "Tidak bisa menemukan '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/it-IT.rc b/base/applications/notepad/lang/it-IT.rc index a22a1586762..1402e2cca32 100644 --- a/base/applications/notepad/lang/it-IT.rc +++ b/base/applications/notepad/lang/it-IT.rc @@ -154,12 +154,12 @@ BEGIN STRING_TEXT_FILES_TXT "File di testo (*.txt)" STRING_TOOLARGE "Il file '%s' è troppo grande per il blocco note.\n\ Per favore usare un altro programma." - STRING_NOTEXT "Non è stato inserito alcun testo. \ + STRING_NOTEXT "Non è stato inserito alcun testo.\ \nPer favore digitare qualcosa e riprovare" STRING_DOESNOTEXIST "Il file '%s'\nnon esiste\n\n\ -Creare un nuovo file ?" +Creare un nuovo file?" STRING_NOTSAVED "Il file '%s'\nè stato modificato\n\ -Salvare le modifiche ?" +Salvare le modifiche?" STRING_NOTFOUND "'%s' non è stato trovato." STRING_OUT_OF_MEMORY "Memoria insufficente per completare \ questa operazione.\nChiudere una o più applicazioni per aumentare la quantità \ diff --git a/base/applications/notepad/lang/ja-JP.rc b/base/applications/notepad/lang/ja-JP.rc index e9df825c3ac..5feee62632d 100644 --- a/base/applications/notepad/lang/ja-JP.rc +++ b/base/applications/notepad/lang/ja-JP.rc @@ -157,9 +157,9 @@ BEGIN STRING_NOTEXT "何も入力されていません。\ \n何か入力してから実行して下さい。" STRING_DOESNOTEXIST "ファイル '%s'\nは存在しません\n\n\ -新しいファイルを作成しますか ?" +新しいファイルを作成しますか?" STRING_NOTSAVED "ファイル '%s'\nは変更されています\n\n\ -変更を保存しますか ?" +変更を保存しますか?" STRING_NOTFOUND "'%s' は見つかりませんでした" STRING_OUT_OF_MEMORY "この操作を実行するためのメモリが\ 足りません。\nメモリの空きを増やすためにいくつかのアプリケーションを\n終了して\ diff --git a/base/applications/notepad/lang/lt-LT.rc b/base/applications/notepad/lang/lt-LT.rc index 3e474ed0041..08f847765b0 100644 --- a/base/applications/notepad/lang/lt-LT.rc +++ b/base/applications/notepad/lang/lt-LT.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstinės bylos (*.txt)" STRING_TOOLARGE "Byla '%s' yra perdidelė.\n\ Prašome naudotis kitu redaktoriumi." - STRING_NOTEXT "Jūs neivedėte jokio teksto. \ + STRING_NOTEXT "Jūs neivedėte jokio teksto.\ \nPrašome parašyti ką nors ir bandyti dar kartą" STRING_DOESNOTEXIST "Byla '%s'\nneegzistuoja\n\n\ Ar norite sukurti naują bylą?" STRING_NOTSAVED "Byla '%s'\nbuvo pakeista\n\n\ Ar norite išsaugoti pakeitimus?" STRING_NOTFOUND "'%s' nerastas." - STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui. \ + STRING_OUT_OF_MEMORY "Nepakanka atminties užduoties užbaigimui.\ \nUžverkite vieną ar kelias programas, kad padidintumėte\nlaisvos atminties kiekį." STRING_CANNOTFIND "Nepavyko rasti '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/ms-MY.rc b/base/applications/notepad/lang/ms-MY.rc index b20afcc378f..23d34acde83 100644 --- a/base/applications/notepad/lang/ms-MY.rc +++ b/base/applications/notepad/lang/ms-MY.rc @@ -1,4 +1,4 @@ -/* Malay translation by Henry Tang Ih 2016 (henrytang2(a)hotmail.com) */ +// COPYRIGHT: 2016 Henry Tang Ih <henrytang2(a)hotmail.com> LANGUAGE LANG_MALAY, SUBLANG_DEFAULT @@ -156,7 +156,7 @@ BEGIN STRING_TEXT_FILES_TXT "Fail teks (*.txt)" STRING_TOOLARGE "Fail '%s' adalah terlalu besar untuk notepad.\n\ Sila gunakan editor yang berbeza." - STRING_NOTEXT "Anda tidak memasukkan sebarang teks. \ + STRING_NOTEXT "Anda tidak memasukkan sebarang teks.\ \nSila taip sesuatu dan cuba lagi" STRING_DOESNOTEXIST "Fail '%s'\ntidak wujud\n\n\ Adakah anda mahu mencipta fail baru?" diff --git a/base/applications/notepad/lang/nl-NL.rc b/base/applications/notepad/lang/nl-NL.rc index 066028754f9..2a41af6b02c 100644 --- a/base/applications/notepad/lang/nl-NL.rc +++ b/base/applications/notepad/lang/nl-NL.rc @@ -154,14 +154,14 @@ BEGIN STRING_TEXT_FILES_TXT "Tekstbestanden (*.txt)" STRING_TOOLARGE "Het bestand '%s' is te groot voor Kladblok.\n\ Gebruik een andere editor." - STRING_NOTEXT "U heeft geen tekst ingevoerd. \ + STRING_NOTEXT "U heeft geen tekst ingevoerd.\ \nType uw tekst en probeer het nogmaals" STRING_DOESNOTEXIST "Het bestand '%s'\nbestaat niet\n\n\ Wilt u een nieuw bestand maken?" STRING_NOTSAVED "Het bestand '%s'\nis gewijzigd\n\n\ Wilt u de wijzigingen opslaan?" STRING_NOTFOUND "'%s' kan niet worden gevonden." - STRING_OUT_OF_MEMORY "Onvoldoende geheugen. \ + STRING_OUT_OF_MEMORY "Onvoldoende geheugen.\ \nSluit een of meer applicaties om de hoeveelheid\nbeschikbaar geheugen te vergroten." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/no-NO.rc b/base/applications/notepad/lang/no-NO.rc index 8df8d4c00b2..fc907a5a743 100644 --- a/base/applications/notepad/lang/no-NO.rc +++ b/base/applications/notepad/lang/no-NO.rc @@ -154,16 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Tekst filer (*.txt)" STRING_TOOLARGE "Filen '%s' er for stor for notisblokk.\n\ Vennligst bruk en annen editor." - STRING_NOTEXT "Du utfører innskrivet tekst. \ + STRING_NOTEXT "Du utfører innskrivet tekst.\ \nVennligst skriv noe og pr?jen" STRING_DOESNOTEXIST "Filen '%s'\n eksistere ikke\n\n\ Vil du opprette en ny fil?" STRING_NOTSAVED "Filen '%s'\nhar ikke blitt lagret\n\n\ Vil du lagre endringen?" STRING_NOTFOUND "'%s' ble ikke funnet." - STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne \ -oppgaven.\nAvslutt en eller mere applikasjoner for øke mengden av\nledig \ -minne." + STRING_OUT_OF_MEMORY "Ikke nok minne for å åpne oppgaven.\n\ +Avslutt en eller mere applikasjoner for øke mengden av\nledig minne." STRING_CANNOTFIND "Kan ikke finne '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/pl-PL.rc b/base/applications/notepad/lang/pl-PL.rc index 97874362419..883f661e0e5 100644 --- a/base/applications/notepad/lang/pl-PL.rc +++ b/base/applications/notepad/lang/pl-PL.rc @@ -152,12 +152,12 @@ BEGIN STRING_UNTITLED "Bez tytułu" STRING_ALL_FILES "Wszystkie pliki (*.*)" STRING_TEXT_FILES_TXT "Pliki tekstowe (*.txt)" - STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\n Proszę użyć innego edytora." - STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\n Proszę coś wpisać i spróbować ponownie." - STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\n Czy chcesz utworzyć nowy plik?" - STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\n Czy chcesz zachować zmiany?" + STRING_TOOLARGE "Plik '%s' jest za duży dla Notatnika.\nProszę użyć innego edytora." + STRING_NOTEXT "Nie wprowadziłeś żadnego tekstu.\nProszę coś wpisać i spróbować ponownie." + STRING_DOESNOTEXIST "Plik '%s' nie istnieje\n\nCzy chcesz utworzyć nowy plik?" + STRING_NOTSAVED "Plik '%s'\nzostał zmodyfikowany\n\nCzy chcesz zachować zmiany?" STRING_NOTFOUND "Nie można odnaleźć '%s'." - STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\n Zamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci." + STRING_OUT_OF_MEMORY "Za mało pamięci do wykonania tego zadania.\nZamknij jedną lub więcej aplikacji, by zwiększyć ilość wolnej pamięci." STRING_CANNOTFIND "Nie można odnaleźć '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/pt-BR.rc b/base/applications/notepad/lang/pt-BR.rc index 5ff0071c77a..202130aa474 100644 --- a/base/applications/notepad/lang/pt-BR.rc +++ b/base/applications/notepad/lang/pt-BR.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)" STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\ Por favor use um editor diferente." - STRING_NOTEXT "Você não digitou nenhum texto. \ + STRING_NOTEXT "Você não digitou nenhum texto.\ \nPor favor digite alguma coisa e tente novamente" STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\ Você deseja criar um novo arquivo?" diff --git a/base/applications/notepad/lang/pt-PT.rc b/base/applications/notepad/lang/pt-PT.rc index 13f0c79f1f5..adc7ab342c6 100644 --- a/base/applications/notepad/lang/pt-PT.rc +++ b/base/applications/notepad/lang/pt-PT.rc @@ -154,7 +154,7 @@ BEGIN STRING_TEXT_FILES_TXT "Arquivos texto (*.txt)" STRING_TOOLARGE "Arquivo '%s' é muito longo para o notepad.\n\ Por favor use um editor diferente." - STRING_NOTEXT "Você não digitou nenhum texto. \ + STRING_NOTEXT "Você não digitou nenhum texto.\ \nPor favor digite alguma coisa e tente novamente" STRING_DOESNOTEXIST "Arquivo '%s'\nnão existe\n\n\ Você deseja criar um novo arquivo?" diff --git a/base/applications/notepad/lang/ro-RO.rc b/base/applications/notepad/lang/ro-RO.rc index 7564a109a27..84f86a00aa9 100644 --- a/base/applications/notepad/lang/ro-RO.rc +++ b/base/applications/notepad/lang/ro-RO.rc @@ -163,14 +163,14 @@ BEGIN STRING_TEXT_FILES_TXT "Fișiere text (*.txt)" STRING_TOOLARGE "Fișierul „%s” este prea mare.\n\ Încercați un alt editor." - STRING_NOTEXT "Nu ați scris nimic. \ + STRING_NOTEXT "Nu ați scris nimic.\ \nScrieți ceva apoi încercați din nou." STRING_DOESNOTEXIST "Fișierul „%s”\nnu există.\n\n\ -Creați un nou fișier ?" +Creați un nou fișier?" STRING_NOTSAVED "Fișierul „%s” a fost modificat!\n\n\ Păstrați modificările aduse?" STRING_NOTFOUND "„%s” nu poate fi găsit." - STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație. \ + STRING_OUT_OF_MEMORY "Nu există suficientă memorie pentru a efectua această operație.\ \nÎnchideți una sau mai multe aplicații pentru a elibera memorie." STRING_CANNOTFIND "„%s” nu poate fi găsit" STRING_ANSI "ANSI" diff --git a/base/applications/notepad/lang/ru-RU.rc b/base/applications/notepad/lang/ru-RU.rc index 9867f769f3e..d6d49297d1e 100644 --- a/base/applications/notepad/lang/ru-RU.rc +++ b/base/applications/notepad/lang/ru-RU.rc @@ -161,8 +161,8 @@ BEGIN STRING_NOTSAVED "Файл '%s'\nбыл изменен\n\n\ Хотите сохранить изменения?" STRING_NOTFOUND "'%s' не найден." - STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции. \ -\nЗакройте одно или несколько приложений и повторите попытку." + STRING_OUT_OF_MEMORY "Недостаточно памяти для завершения этой операции.\n\ +Закройте одно или несколько приложений и повторите попытку." STRING_CANNOTFIND "Невозможно найти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/sk-SK.rc b/base/applications/notepad/lang/sk-SK.rc index cead9a46f5e..45084fe8061 100644 --- a/base/applications/notepad/lang/sk-SK.rc +++ b/base/applications/notepad/lang/sk-SK.rc @@ -1,10 +1,4 @@ -/* - * Notepad (Slovak resources) - * - * TRANSLATOR : Mário Kačmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) - * DATE OF TR.: xx-xx-2007 - * LAST CHANGE: 27-12-2008 - */ +// COPYRIGHT: 2007-2008 Mario Kacmar <kario(a)szm.sk> LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -162,8 +156,8 @@ BEGIN STRING_TEXT_FILES_TXT "Textové súbory (*.txt)" STRING_TOOLARGE "Súbor '%s' je pre Poznámkový blok príliš veľký.\n\ Na otvorenie súboru použite iný editor." - STRING_NOTEXT "Nevložili ste žiadny text. \ -\nProsím, napíšte niečo a skúste to znova." + STRING_NOTEXT "Nevložili ste žiadny text.\n\ +Prosím, napíšte niečo a skúste to znova." STRING_DOESNOTEXIST "Nie je možné nájsť súbor '%s'\n\n\ Chcete vytvoriť nový súbor?" STRING_NOTSAVED "Text súboru '%s'\nsa zmenil.\n\n\ diff --git a/base/applications/notepad/lang/sl-SI.rc b/base/applications/notepad/lang/sl-SI.rc index 0031fd14997..11b869dfda7 100644 --- a/base/applications/notepad/lang/sl-SI.rc +++ b/base/applications/notepad/lang/sl-SI.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Datoteke z besedilom (*.txt)" STRING_TOOLARGE "Datoteka '%s' je prevelika za Beležnico.\n\ Uporabite drug urejevalnik." - STRING_NOTEXT "Niste vnesli besedila. \ -\nVnesite besedilo in poskusite znova." + STRING_NOTEXT "Niste vnesli besedila.\n\ +Vnesite besedilo in poskusite znova." STRING_DOESNOTEXIST "Datoteka '%s' ne obstaja.\n\n\ Ali želite ustvariti novo datoteko?" STRING_NOTSAVED "Vsebina datoteke '%s'je bila spremenjena.\n\n\ Ali želite shraniti spremembe?" STRING_NOTFOUND "Ni mogoèe najti '%s'." STRING_OUT_OF_MEMORY "Na voljo ni dovolj pomnilnika, da bi bilo mogoèe dokonèati to \ -operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova. " +operacijo.\nÈe ga želite sprostiti, konèajte enega ali veè programov in poskusite znova." STRING_CANNOTFIND "Cannot find '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Unicode" diff --git a/base/applications/notepad/lang/sq-AL.rc b/base/applications/notepad/lang/sq-AL.rc index 60d5a04da2e..79340ced5ad 100644 --- a/base/applications/notepad/lang/sq-AL.rc +++ b/base/applications/notepad/lang/sq-AL.rc @@ -1,6 +1,4 @@ -/* TRANSLATOR : Ardit Dani (Ard1t) (ardit.dani(a)gmail.com) -* DATE OF TR: 05-12-2013 -*/ +// COPYRIGHT: 2013 Ardit Dani (Ard1t) <ardit.dani(a)gmail.com> LANGUAGE LANG_ALBANIAN, SUBLANG_NEUTRAL @@ -158,12 +156,12 @@ BEGIN STRING_TEXT_FILES_TXT "Dokumenta teksti (*.txt)" STRING_TOOLARGE "Dokumenti '%s' është shume i madh për notepad.\n\ Ju lutem perdorni editor tjeter." - STRING_NOTEXT "Nuk keni shkruaj ndonje tekst. \ -\nJu lutem shkruani diqka dhe provoni perseri" + STRING_NOTEXT "Nuk keni shkruaj ndonje tekst.\n\ +Ju lutem shkruani diqka dhe provoni perseri" STRING_DOESNOTEXIST "Dokumenti '%s'\nnuk ekziston\n\n\ -Doni te krijoni nje dokument te ri ?" +Doni te krijoni nje dokument te ri?" STRING_NOTSAVED "Dokumenti '%s'\nështë modifikuar\n\n\ -Doni te ruani ndryshimet ?" +Doni te ruani ndryshimet?" STRING_NOTFOUND "'%s' nuk gjindet." STRING_OUT_OF_MEMORY "Nuk ka memorie te mjaftueshme per te kompletuar kete \ detyrë.\nMbyll nje ose me shume programe te rrisesh shumën e\nmemories." diff --git a/base/applications/notepad/lang/sv-SE.rc b/base/applications/notepad/lang/sv-SE.rc index 70b3e3a2baa..55ed5312c5a 100644 --- a/base/applications/notepad/lang/sv-SE.rc +++ b/base/applications/notepad/lang/sv-SE.rc @@ -154,8 +154,8 @@ BEGIN STRING_TEXT_FILES_TXT "Textfiler (*.txt)" STRING_TOOLARGE "Filen '%s' är för stor för Anteckningar.\n\ Använd en annan editor." - STRING_NOTEXT "Du skrev inte in någon text. \ -\nSkriv något och försök sedan igen." + STRING_NOTEXT "Du skrev inte in någon text.\n\ +Skriv något och försök sedan igen." STRING_DOESNOTEXIST "Filen '%s'\nexisterar inte.\n\n\ Vill du skapa en ny fil?" STRING_NOTSAVED "Filen '%s'\nhar ändrats.\n\n\ diff --git a/base/applications/notepad/lang/th-TH.rc b/base/applications/notepad/lang/th-TH.rc index 11fe1192792..3bf2b721583 100644 --- a/base/applications/notepad/lang/th-TH.rc +++ b/base/applications/notepad/lang/th-TH.rc @@ -154,8 +154,8 @@ BEGIN STRING_TEXT_FILES_TXT "แฟ้มตํารา (*.txt)" STRING_TOOLARGE "แฟ้ม '%s' ใหญ่เกินไป" STRING_NOTEXT "คุณไม่ใดเขียนอะไร\nกรุณาลองใหม่" - STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่ ?" - STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่ ?" + STRING_DOESNOTEXIST "ไม่พบแฟ้ม '%s' ที่ต้องการเปิด\nคุณต้องการสร้างใหม่ไม่?" + STRING_NOTSAVED "มีการเปลี่ยนแปลงกับเอกสาร\n\n'%s'\n\nคุณต้องการบันทึกมันหรือไม่?" STRING_NOTFOUND "ไม่พบข้อความ '%s' ที่ต้องการค้นหา" STRING_OUT_OF_MEMORY "ความจําหมด\nกรุณาลองใหม่" STRING_CANNOTFIND "Cannot find '%s'" diff --git a/base/applications/notepad/lang/tr-TR.rc b/base/applications/notepad/lang/tr-TR.rc index 1f37825511e..be2ee95dc73 100644 --- a/base/applications/notepad/lang/tr-TR.rc +++ b/base/applications/notepad/lang/tr-TR.rc @@ -1,5 +1,5 @@ -/* TRANSLATORS: 2012 Arda Tanrıkulu (ardatan) (ardatanrikulu [at] gmail [dot] com) - * 2013-2016, 2018-2019 Erdem Ersoy (eersoy93) (erdemersoy [at] erdemersoy [dot] net) */ +// COPYRIGHT: 2012 Arda Tanrıkulu <ardatanrikulu(a)gmail.com> +// 2013-2019 Erdem Ersoy LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT diff --git a/base/applications/notepad/lang/uk-UA.rc b/base/applications/notepad/lang/uk-UA.rc index a914503457a..06afd58c11a 100644 --- a/base/applications/notepad/lang/uk-UA.rc +++ b/base/applications/notepad/lang/uk-UA.rc @@ -154,15 +154,15 @@ BEGIN STRING_TEXT_FILES_TXT "Текстові файли (*.txt)" STRING_TOOLARGE "Файл '%s' завеликий для блокнота.\n\ Будь ласка, використайте інший редактор." - STRING_NOTEXT "Ви не ввели ніякого тексту. \ -\nБудь ласка, введіть що-небудь і спробуйте ще раз" + STRING_NOTEXT "Ви не ввели ніякого тексту.\n\ +Будь ласка, введіть що-небудь і спробуйте ще раз" STRING_DOESNOTEXIST "Файл '%s'\nне існує\n\n\ Хочете створити новий файл?" STRING_NOTSAVED "Файл '%s'\nбув змінений\n\n\ Хочете зберегти зміни?" STRING_NOTFOUND "'%s' не знайдено." - STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\ -\nЗакрийте один або декілька додатків і повторіть спробу." + STRING_OUT_OF_MEMORY "Недостатньо пам'яті для виконання операції.\n\ +Закрийте один або декілька додатків і повторіть спробу." STRING_CANNOTFIND "Неможливо знайти '%s'" STRING_ANSI "ANSI" STRING_UNICODE "Юнікод"

1 year, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs