Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [TASKMGR] Fix PerfDataDeallocCommandLineCache
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9a6c85f68aa0e2ec4595d… commit 9a6c85f68aa0e2ec4595d4673e59f5ade2521a6f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 15:36:19 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 15:36:19 2023 +0900 [TASKMGR] Fix PerfDataDeallocCommandLineCache Do not leak memory. CORE-18014 --- base/applications/taskmgr/perfdata.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/base/applications/taskmgr/perfdata.c b/base/applications/taskmgr/perfdata.c index 7eb1d90fd5d..166f7a7ff07 100644 --- a/base/applications/taskmgr/perfdata.c +++ b/base/applications/taskmgr/perfdata.c @@ -649,16 +649,15 @@ cleanup: void PerfDataDeallocCommandLineCache() { - PCMD_LINE_CACHE cache = global_cache; - PCMD_LINE_CACHE cache_old; + PCMD_LINE_CACHE cache, pnext; - while (cache && cache->pnext != NULL) + for (cache = global_cache; cache; cache = pnext) { - cache_old = cache; - cache = cache->pnext; - - HeapFree(GetProcessHeap(), 0, cache_old); + pnext = cache->pnext; + HeapFree(GetProcessHeap(), 0, cache); } + + global_cache = NULL; } ULONG PerfDataGetSessionId(ULONG Index)

1 0

[reactos] 01/01: [TASKMGR] GraphCtrl_Dispose: Delete hdcGraph first
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7989e3f26cafd74c9d8fd… commit 7989e3f26cafd74c9d8fdeef64deece0da591634 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 15:14:32 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 15:14:32 2023 +0900 [TASKMGR] GraphCtrl_Dispose: Delete hdcGraph first The pen might be selected at GraphCtrl_Dispose. Do not delete a drawing object (pen or brush) while it is still selected into a DC. CORE-18014 --- base/applications/taskmgr/graphctl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 78bc157db3d..66cc9e60208 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -116,6 +116,9 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) if (inst->PointBuffer) HeapFree(GetProcessHeap(), 0, inst->PointBuffer); + if (inst->hdcGraph) + DeleteDC(inst->hdcGraph); + if (inst->hPenGrid) DeleteObject(inst->hPenGrid); @@ -130,9 +133,6 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) if (inst->hbmGraph) DeleteObject(inst->hbmGraph); - - if (inst->hdcGraph) - DeleteDC(inst->hdcGraph); } void

1 0

[reactos] 01/01: [TASKMGR] GraphCtrl: Use DeleteDC instead of DeleteObject to delete inst->hdcGraph
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dc14a9f6e0d9b6ce3ccc8… commit dc14a9f6e0d9b6ce3ccc84daba923edb1cc0167f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 14:53:39 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 14:55:25 2023 +0900 [TASKMGR] GraphCtrl: Use DeleteDC instead of DeleteObject to delete inst->hdcGraph This reduces handle leak. CORE-18014 --- base/applications/taskmgr/graphctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/taskmgr/graphctl.c b/base/applications/taskmgr/graphctl.c index 4253eeadc35..78bc157db3d 100644 --- a/base/applications/taskmgr/graphctl.c +++ b/base/applications/taskmgr/graphctl.c @@ -132,7 +132,7 @@ GraphCtrl_Dispose(PTM_GRAPH_CONTROL inst) DeleteObject(inst->hbmGraph); if (inst->hdcGraph) - DeleteObject(inst->hdcGraph); + DeleteDC(inst->hdcGraph); } void

1 0

[reactos] 01/01: [TASKMGR] Report any memory leaks on exit (#5340)
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2441e869638da86106470… commit 2441e869638da86106470f51a166acebdb3b3be0 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 14:27:06 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jun 15 14:27:06 2023 +0900 [TASKMGR] Report any memory leaks on exit (#5340) Use the power of CRT debug to detect memory leaks. - Define _CRTDBG_MAP_ALLOC and include <crtdbg.h> after <stdlib.h>. - Call _CrtSetDbgFlag at prologue of wWinMain. CORE-18014 --- base/applications/taskmgr/precomp.h | 5 +++++ base/applications/taskmgr/taskmgr.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/base/applications/taskmgr/precomp.h b/base/applications/taskmgr/precomp.h index 5593f401fcd..872cc76d0ae 100644 --- a/base/applications/taskmgr/precomp.h +++ b/base/applications/taskmgr/precomp.h @@ -9,6 +9,11 @@ #include <stdlib.h> #include <stdarg.h> +#ifdef _DEBUG + #define _CRTDBG_MAP_ALLOC + #include <crtdbg.h> +#endif + #define WIN32_NO_STATUS #include <windef.h> diff --git a/base/applications/taskmgr/taskmgr.c b/base/applications/taskmgr/taskmgr.c index 1c754858efa..197b6f82e62 100644 --- a/base/applications/taskmgr/taskmgr.c +++ b/base/applications/taskmgr/taskmgr.c @@ -116,6 +116,11 @@ int APIENTRY wWinMain(HINSTANCE hInstance, TOKEN_PRIVILEGES tkp; HANDLE hMutex; +#ifdef _DEBUG + // Report any memory leaks on exit + _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF); +#endif + /* check wether we're already running or not */ hMutex = CreateMutexW(NULL, TRUE, L"taskmgrros"); if (hMutex && GetLastError() == ERROR_ALREADY_EXISTS)

1 0

[reactos] 01/01: [TASKMGR] Follow-up of 'Refactor trayicon.c' (99fb812)
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec93c2340d648c15ff3c1… commit ec93c2340d648c15ff3c1f6d56c993b96c33204b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 14:18:45 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 14:18:45 2023 +0900 [TASKMGR] Follow-up of 'Refactor trayicon.c' (99fb812) --- base/applications/taskmgr/trayicon.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index cbfa26e8b24..dcff4a00f28 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -117,10 +117,12 @@ done: BOOL TrayIcon_ShellAddTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon = TrayIcon_GetProcessorUsageIcon(); + HICON hIcon; BOOL bRetVal; WCHAR szMsg[64]; + hIcon = TrayIcon_GetProcessorUsageIcon(); + ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; @@ -157,10 +159,12 @@ BOOL TrayIcon_ShellRemoveTrayIcon(void) BOOL TrayIcon_ShellUpdateTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon = TrayIcon_GetProcessorUsageIcon(); + HICON hIcon; BOOL bRetVal; WCHAR szTemp[64]; + hIcon = TrayIcon_GetProcessorUsageIcon(); + ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd;

1 0

[reactos] 01/01: [TASKMGR] Refactor trayicon.c
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=99fb812be4ba86139438b… commit 99fb812be4ba86139438bf7961f2030ac9e016be Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 13:26:20 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 13:26:20 2023 +0900 [TASKMGR] Refactor trayicon.c --- base/applications/taskmgr/trayicon.c | 60 ++++++++++++------------------------ 1 file changed, 19 insertions(+), 41 deletions(-) diff --git a/base/applications/taskmgr/trayicon.c b/base/applications/taskmgr/trayicon.c index e34e4578743..cbfa26e8b24 100644 --- a/base/applications/taskmgr/trayicon.c +++ b/base/applications/taskmgr/trayicon.c @@ -1,28 +1,16 @@ /* - * ReactOS Task Manager - * - * trayicon.c - * - * Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> - * 2005 Klemens Friedl <frik85(a)reactos.at> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * PROJECT: ReactOS Task Manager + * LICENSE: LGPL-2.1-or-later (https://spdx.org/licenses/LGPL-2.1-or-later) + * PURPOSE: Task Manager for ReactOS + * COPYRIGHT: Copyright (C) 1999 - 2001 Brian Palmer <brianp(a)reactos.org> + * Copyright (C) 2005 Klemens Friedl <frik85(a)reactos.at> + * Copyright (C) 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" +#include <strsafe.h> + HICON TrayIcon_GetProcessorUsageIcon(void) { HICON hTrayIcon = NULL; @@ -129,14 +117,11 @@ done: BOOL TrayIcon_ShellAddTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon = NULL; + HICON hIcon = TrayIcon_GetProcessorUsageIcon(); BOOL bRetVal; WCHAR szMsg[64]; - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - - hIcon = TrayIcon_GetProcessorUsageIcon(); - + ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; @@ -144,9 +129,8 @@ BOOL TrayIcon_ShellAddTrayIcon(void) nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - - LoadStringW( GetModuleHandleW(NULL), IDS_MSG_TRAYICONCPUUSAGE, szMsg, sizeof(szMsg) / sizeof(szMsg[0])); - wsprintfW(nid.szTip, szMsg, PerfDataGetProcessorUsage()); + LoadStringW(NULL, IDS_MSG_TRAYICONCPUUSAGE, szMsg, _countof(szMsg)); + StringCchPrintfW(nid.szTip, _countof(nid.szTip), szMsg, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_ADD, &nid); @@ -159,40 +143,34 @@ BOOL TrayIcon_ShellAddTrayIcon(void) BOOL TrayIcon_ShellRemoveTrayIcon(void) { NOTIFYICONDATAW nid; - BOOL bRetVal; - - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); + ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = 0; nid.uCallbackMessage = WM_ONTRAYICON; - bRetVal = Shell_NotifyIconW(NIM_DELETE, &nid); - - return bRetVal; + return Shell_NotifyIconW(NIM_DELETE, &nid); } BOOL TrayIcon_ShellUpdateTrayIcon(void) { NOTIFYICONDATAW nid; - HICON hIcon = NULL; + HICON hIcon = TrayIcon_GetProcessorUsageIcon(); BOOL bRetVal; WCHAR szTemp[64]; - memset(&nid, 0, sizeof(NOTIFYICONDATAW)); - - hIcon = TrayIcon_GetProcessorUsageIcon(); - + ZeroMemory(&nid, sizeof(nid)); nid.cbSize = sizeof(NOTIFYICONDATAW); nid.hWnd = hMainWnd; nid.uID = 0; nid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; nid.uCallbackMessage = WM_ONTRAYICON; nid.hIcon = hIcon; - LoadStringW(hInst, IDS_MSG_TRAYICONCPUUSAGE, szTemp, sizeof(szTemp)/sizeof(szTemp[0])); - wsprintfW(nid.szTip, szTemp, PerfDataGetProcessorUsage()); + + LoadStringW(NULL, IDS_MSG_TRAYICONCPUUSAGE, szTemp, _countof(szTemp)); + StringCchPrintfW(nid.szTip, _countof(nid.szTip), szTemp, PerfDataGetProcessorUsage()); bRetVal = Shell_NotifyIconW(NIM_MODIFY, &nid);

1 0

[reactos] 01/01: [MSPAINT] Fix two handle leaks
by Katayama Hirofumi MZ 15 Jun '23

15 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad61c574f4d3f24eb8e3d… commit ad61c574f4d3f24eb8e3df855ef96a5bc0a31fe5 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jun 15 10:55:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Thu Jun 15 10:55:59 2023 +0900 [MSPAINT] Fix two handle leaks CORE-18867 --- base/applications/mspaint/toolsettings.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/base/applications/mspaint/toolsettings.cpp b/base/applications/mspaint/toolsettings.cpp index 6ff0aed291d..323956ba7ca 100644 --- a/base/applications/mspaint/toolsettings.cpp +++ b/base/applications/mspaint/toolsettings.cpp @@ -69,8 +69,7 @@ VOID CToolSettingsWindow::drawTrans(HDC hdc, LPCRECT prc) RECT rc[2]; getTransRects(rc, prc); - HBRUSH hbrHigh = ::GetSysColorBrush(COLOR_HIGHLIGHT); - ::FillRect(hdc, &rc[toolsModel.IsBackgroundTransparent()], hbrHigh); + ::FillRect(hdc, &rc[toolsModel.IsBackgroundTransparent()], (HBRUSH)(COLOR_HIGHLIGHT + 1)); ::DrawIconEx(hdc, rc[0].left, rc[0].top, m_hNontranspIcon, CX_TRANS_ICON, CY_TRANS_ICON, 0, NULL, DI_NORMAL); ::DrawIconEx(hdc, rc[1].left, rc[1].top, m_hTranspIcon, @@ -119,8 +118,7 @@ VOID CToolSettingsWindow::drawBrush(HDC hdc, LPCRECT prc) RECT rects[12]; getBrushRects(rects, prc); - HBRUSH hbrHigh = ::GetSysColorBrush(COLOR_HIGHLIGHT); - ::FillRect(hdc, &rects[toolsModel.GetBrushStyle()], hbrHigh); + ::FillRect(hdc, &rects[toolsModel.GetBrushStyle()], (HBRUSH)(COLOR_HIGHLIGHT + 1)); for (INT i = 0; i < 12; i++) {

1 0

[reactos] 01/01: [MSPAINT] CMiniatureWindow: Avoid too small
by Katayama Hirofumi MZ 14 Jun '23

14 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5675604d2886f843087fe… commit 5675604d2886f843087fe99743d7fdee5c52d795 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jun 14 20:17:49 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Jun 14 20:17:49 2023 +0900 [MSPAINT] CMiniatureWindow: Avoid too small CORE-18867 --- base/applications/mspaint/miniature.cpp | 9 +++++++++ base/applications/mspaint/miniature.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/base/applications/mspaint/miniature.cpp b/base/applications/mspaint/miniature.cpp index d496a7f74a7..223b38e176a 100644 --- a/base/applications/mspaint/miniature.cpp +++ b/base/applications/mspaint/miniature.cpp @@ -106,3 +106,12 @@ LRESULT CMiniatureWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& EndPaint(&ps); return 0; } + +LRESULT CMiniatureWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) +{ + // Avoid too small + LPMINMAXINFO pInfo = (LPMINMAXINFO)lParam; + pInfo->ptMinTrackSize.x = 100; + pInfo->ptMinTrackSize.y = 75; + return 0; +} diff --git a/base/applications/mspaint/miniature.h b/base/applications/mspaint/miniature.h index c8126de691a..e1ec6657f88 100644 --- a/base/applications/mspaint/miniature.h +++ b/base/applications/mspaint/miniature.h @@ -21,6 +21,7 @@ public: MESSAGE_HANDLER(WM_CLOSE, OnClose) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBkgnd) MESSAGE_HANDLER(WM_PAINT, OnPaint) + MESSAGE_HANDLER(WM_GETMINMAXINFO, OnGetMinMaxInfo) END_MSG_MAP() HWND DoCreate(HWND hwndParent); @@ -32,4 +33,5 @@ private: LRESULT OnEraseBkgnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); + LRESULT OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); };

1 0

[reactos] 01/01: [MSPAINT] Refactor ImageModel (#5335)
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b623c1d0427cb0e5d54f… commit 2b623c1d0427cb0e5d54f928a1469f7f32ca7282 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 23:23:48 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 23:23:48 2023 +0900 [MSPAINT] Refactor ImageModel (#5335) - Unify ImageModel::Insert and ImageModel::CopyPrevious to ImageModel::PushImageForUndo. - Delete useless stuffs. - Fix some memory leaks. - Fix IDM_IMAGECROP. CORE-17969, CORE-18867 --- base/applications/mspaint/common.h | 9 - base/applications/mspaint/dib.cpp | 4 +- base/applications/mspaint/dib.h | 2 +- base/applications/mspaint/history.cpp | 246 ++++++++++++--------------- base/applications/mspaint/history.h | 35 ++-- base/applications/mspaint/mouse.cpp | 18 +- base/applications/mspaint/selectionmodel.cpp | 4 +- base/applications/mspaint/winproc.cpp | 7 +- 8 files changed, 143 insertions(+), 182 deletions(-) diff --git a/base/applications/mspaint/common.h b/base/applications/mspaint/common.h index 0b9890d27f9..4aefbb2dcff 100644 --- a/base/applications/mspaint/common.h +++ b/base/applications/mspaint/common.h @@ -21,15 +21,6 @@ #define WM_TOOLSMODELZOOMCHANGED (WM_APP + 2) #define WM_PALETTEMODELCOLORCHANGED (WM_APP + 3) #define WM_PALETTEMODELPALETTECHANGED (WM_APP + 4) -#define WM_IMAGEMODELDIMENSIONSCHANGED (WM_APP + 5) -#define WM_IMAGEMODELIMAGECHANGED (WM_APP + 6) -#define WM_SELECTIONMODELREFRESHNEEDED (WM_APP + 7) - -/* width of the rectangle defined by a RECT structure */ -#define RECT_WIDTH(a) ((a).right - (a).left) - -/* height of the rectangle defined by a RECT structure */ -#define RECT_HEIGHT(a) ((a).bottom - (a).top) /* this simplifies checking and unchecking menu items */ #define CHECKED_IF(a) ((a) ? (MF_CHECKED | MF_BYCOMMAND) : (MF_UNCHECKED | MF_BYCOMMAND)) diff --git a/base/applications/mspaint/dib.cpp b/base/applications/mspaint/dib.cpp index 4afa00c4771..51d09d86d6b 100644 --- a/base/applications/mspaint/dib.cpp +++ b/base/applications/mspaint/dib.cpp @@ -76,7 +76,7 @@ GetDIBHeight(HBITMAP hBitmap) return bm.bmHeight; } -BOOL SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC) +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCTSTR FileName, HDC hDC) { CImageDx img; img.Attach(hBitmap); @@ -135,7 +135,7 @@ HBITMAP SetBitmapAndInfo(HBITMAP hBitmap, LPCTSTR name, DWORD dwFileSize, BOOL i } // update image - imageModel.Insert(hBitmap); + imageModel.PushImageForUndo(hBitmap); imageModel.ClearHistory(); // update fileSize diff --git a/base/applications/mspaint/dib.h b/base/applications/mspaint/dib.h index c01326f7b11..cc873913114 100644 --- a/base/applications/mspaint/dib.h +++ b/base/applications/mspaint/dib.h @@ -20,7 +20,7 @@ int GetDIBWidth(HBITMAP hbm); int GetDIBHeight(HBITMAP hbm); -BOOL SaveDIBToFile(HBITMAP hBitmap, LPTSTR FileName, HDC hDC); +BOOL SaveDIBToFile(HBITMAP hBitmap, LPCTSTR FileName, HDC hDC); HBITMAP DoLoadImageFile(HWND hwnd, LPCTSTR name, BOOL fIsMainFile); diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 4220bae84bd..ae6fb27b451 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -4,6 +4,7 @@ * FILE: base/applications/mspaint/history.cpp * PURPOSE: Undo and redo functionality * PROGRAMMERS: Benedikt Freisen + * Katayama Hirofumi MZ */ #include "precomp.h" @@ -12,97 +13,86 @@ ImageModel imageModel; /* FUNCTIONS ********************************************************/ -void ImageModel::NotifyDimensionsChanged() -{ - if (canvasWindow.IsWindow()) - canvasWindow.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); -} - void ImageModel::NotifyImageChanged() { if (canvasWindow.IsWindow()) - canvasWindow.SendMessage(WM_IMAGEMODELIMAGECHANGED); + canvasWindow.Invalidate(FALSE); } ImageModel::ImageModel() + : hDrawingDC(::CreateCompatibleDC(NULL)) + , currInd(0) + , undoSteps(0) + , redoSteps(0) { - currInd = 0; - undoSteps = 0; - redoSteps = 0; - imageSaved = TRUE; + ZeroMemory(hBms, sizeof(hBms)); - // prepare a minimal usable bitmap - int imgXRes = 1; - int imgYRes = 1; + hBms[0] = CreateDIBWithProperties(1, 1); + ::SelectObject(hDrawingDC, hBms[0]); - hDrawingDC = CreateCompatibleDC(NULL); - SelectObject(hDrawingDC, CreatePen(PS_SOLID, 0, paletteModel.GetFgColor())); - SelectObject(hDrawingDC, CreateSolidBrush(paletteModel.GetBgColor())); - - hBms[0] = CreateDIBWithProperties(imgXRes, imgYRes); - SelectObject(hDrawingDC, hBms[0]); - Rectangle(hDrawingDC, 0 - 1, 0 - 1, imgXRes + 1, imgYRes + 1); + imageSaved = TRUE; } -void ImageModel::CopyPrevious() +ImageModel::~ImageModel() { - ATLTRACE("%s: %d\n", __FUNCTION__, currInd); - DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]); - currInd = (currInd + 1) % HISTORYSIZE; - if (undoSteps < HISTORYSIZE - 1) - undoSteps++; - redoSteps = 0; - SelectObject(hDrawingDC, hBms[currInd]); - imageSaved = FALSE; + ::DeleteDC(hDrawingDC); + + for (size_t i = 0; i < HISTORYSIZE; ++i) + { + if (hBms[i]) + ::DeleteObject(hBms[i]); + } } void ImageModel::Undo(BOOL bClearRedo) { ATLTRACE("%s: %d\n", __FUNCTION__, undoSteps); - if (undoSteps > 0) - { - int oldWidth = GetWidth(); - int oldHeight = GetHeight(); - selectionModel.m_bShow = FALSE; - currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; - SelectObject(hDrawingDC, hBms[currInd]); - undoSteps--; - if (bClearRedo) - redoSteps = 0; - else if (redoSteps < HISTORYSIZE - 1) - redoSteps++; - if (GetWidth() != oldWidth || GetHeight() != oldHeight) - NotifyDimensionsChanged(); - NotifyImageChanged(); - } + if (!CanUndo()) + return; + + selectionModel.m_bShow = FALSE; + + // Select previous item + currInd = (currInd + HISTORYSIZE - 1) % HISTORYSIZE; + ::SelectObject(hDrawingDC, hBms[currInd]); + + undoSteps--; + if (bClearRedo) + redoSteps = 0; + else if (redoSteps < HISTORYSIZE - 1) + redoSteps++; + + NotifyImageChanged(); } void ImageModel::Redo() { ATLTRACE("%s: %d\n", __FUNCTION__, redoSteps); - if (redoSteps > 0) - { - int oldWidth = GetWidth(); - int oldHeight = GetHeight(); - selectionModel.m_bShow = FALSE; - currInd = (currInd + 1) % HISTORYSIZE; - SelectObject(hDrawingDC, hBms[currInd]); - redoSteps--; - if (undoSteps < HISTORYSIZE - 1) - undoSteps++; - if (GetWidth() != oldWidth || GetHeight() != oldHeight) - NotifyDimensionsChanged(); - NotifyImageChanged(); - } + if (!CanRedo()) + return; + + selectionModel.m_bShow = FALSE; + + // Select next item + currInd = (currInd + 1) % HISTORYSIZE; + ::SelectObject(hDrawingDC, hBms[currInd]); + + redoSteps--; + if (undoSteps < HISTORYSIZE - 1) + undoSteps++; + + NotifyImageChanged(); } void ImageModel::ResetToPrevious() { ATLTRACE("%s: %d\n", __FUNCTION__, currInd); - DeleteObject(hBms[currInd]); + + // Revert current item with previous item + ::DeleteObject(hBms[currInd]); hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]); - SelectObject(hDrawingDC, hBms[currInd]); + ::SelectObject(hDrawingDC, hBms[currInd]); + NotifyImageChanged(); } @@ -112,61 +102,61 @@ void ImageModel::ClearHistory() redoSteps = 0; } -void ImageModel::Insert(HBITMAP hbm) +void ImageModel::PushImageForUndo(HBITMAP hbm) { - int oldWidth = GetWidth(); - int oldHeight = GetHeight(); - DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = hbm; + ATLTRACE("%s: %d\n", __FUNCTION__, currInd); + + // Go to the next item with an HBITMAP or current item + ::DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); + hBms[(currInd + 1) % HISTORYSIZE] = (hbm ? hbm : CopyDIBImage(hBms[currInd])); currInd = (currInd + 1) % HISTORYSIZE; + ::SelectObject(hDrawingDC, hBms[currInd]); + if (undoSteps < HISTORYSIZE - 1) undoSteps++; redoSteps = 0; - SelectObject(hDrawingDC, hBms[currInd]); - if (GetWidth() != oldWidth || GetHeight() != oldHeight) - NotifyDimensionsChanged(); + + imageSaved = FALSE; NotifyImageChanged(); } void ImageModel::Crop(int nWidth, int nHeight, int nOffsetX, int nOffsetY) { - HDC hdc; - HPEN oldPen; - HBRUSH oldBrush; - int oldWidth = GetWidth(); - int oldHeight = GetHeight(); - + // We cannot create bitmaps of size zero if (nWidth <= 0) nWidth = 1; if (nHeight <= 0) nHeight = 1; - SelectObject(hDrawingDC, hBms[currInd]); - DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = CreateDIBWithProperties(nWidth, nHeight); - currInd = (currInd + 1) % HISTORYSIZE; - if (undoSteps < HISTORYSIZE - 1) - undoSteps++; - redoSteps = 0; + // Create an HBITMAP + HBITMAP hbmCropped = CreateDIBWithProperties(nWidth, nHeight); + if (!hbmCropped) + return; + + // Select the HBITMAP by memory DC + HDC hdcMem = ::CreateCompatibleDC(hDrawingDC); + HGDIOBJ hbmOld = ::SelectObject(hdcMem, hbmCropped); + + // Fill background of the HBITMAP + RECT rcBack = { 0, 0, nWidth, nHeight }; + HBRUSH hbrBack = ::CreateSolidBrush(paletteModel.GetBgColor()); + ::FillRect(hdcMem, &rcBack, hbrBack); + ::DeleteObject(hbrBack); - hdc = CreateCompatibleDC(hDrawingDC); - SelectObject(hdc, hBms[currInd]); + // Copy the old content + ::BitBlt(hdcMem, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), hDrawingDC, 0, 0, SRCCOPY); - oldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, paletteModel.GetBgColor())); - oldBrush = (HBRUSH) SelectObject(hdc, CreateSolidBrush(paletteModel.GetBgColor())); - Rectangle(hdc, 0, 0, nWidth, nHeight); - BitBlt(hdc, -nOffsetX, -nOffsetY, GetWidth(), GetHeight(), hDrawingDC, 0, 0, SRCCOPY); - DeleteObject(SelectObject(hdc, oldBrush)); - DeleteObject(SelectObject(hdc, oldPen)); - DeleteDC(hdc); - SelectObject(hDrawingDC, hBms[currInd]); + // Clean up + ::SelectObject(hdcMem, hbmOld); + ::DeleteDC(hdcMem); + + // Push it + PushImageForUndo(hbmCropped); - if (GetWidth() != oldWidth || GetHeight() != oldHeight) - NotifyDimensionsChanged(); NotifyImageChanged(); } -void ImageModel::SaveImage(LPTSTR lpFileName) +void ImageModel::SaveImage(LPCTSTR lpFileName) { SaveDIBToFile(hBms[currInd], lpFileName, hDrawingDC); } @@ -176,16 +166,6 @@ BOOL ImageModel::IsImageSaved() const return imageSaved; } -BOOL ImageModel::CanUndo() const -{ - return undoSteps > 0; -} - -BOOL ImageModel::CanRedo() const -{ - return redoSteps > 0; -} - void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX, int nSkewDegY) { int oldWidth = GetWidth(); @@ -195,20 +175,18 @@ void ImageModel::StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSk if (oldWidth != newWidth || oldHeight != newHeight) { HBITMAP hbm0 = CopyDIBImage(hBms[currInd], newWidth, newHeight); - Insert(hbm0); + PushImageForUndo(hbm0); } if (nSkewDegX) { HBITMAP hbm1 = SkewDIB(hDrawingDC, hBms[currInd], nSkewDegX, FALSE); - Insert(hbm1); + PushImageForUndo(hbm1); } if (nSkewDegY) { HBITMAP hbm2 = SkewDIB(hDrawingDC, hBms[currInd], nSkewDegY, TRUE); - Insert(hbm2); + PushImageForUndo(hbm2); } - if (GetWidth() != oldWidth || GetHeight() != oldHeight) - NotifyDimensionsChanged(); NotifyImageChanged(); } @@ -225,17 +203,11 @@ int ImageModel::GetHeight() const void ImageModel::InvertColors() { RECT rect = {0, 0, GetWidth(), GetHeight()}; - CopyPrevious(); + PushImageForUndo(); InvertRect(hDrawingDC, &rect); NotifyImageChanged(); } -void ImageModel::Clear(COLORREF color) -{ - Rectangle(hDrawingDC, 0 - 1, 0 - 1, GetWidth() + 1, GetHeight() + 1); - NotifyImageChanged(); -} - HDC ImageModel::GetDC() { return hDrawingDC; @@ -243,7 +215,7 @@ HDC ImageModel::GetDC() void ImageModel::FlipHorizontally() { - CopyPrevious(); + PushImageForUndo(); StretchBlt(hDrawingDC, GetWidth() - 1, 0, -GetWidth(), GetHeight(), GetDC(), 0, 0, GetWidth(), GetHeight(), SRCCOPY); NotifyImageChanged(); @@ -251,7 +223,7 @@ void ImageModel::FlipHorizontally() void ImageModel::FlipVertically() { - CopyPrevious(); + PushImageForUndo(); StretchBlt(hDrawingDC, 0, GetHeight() - 1, GetWidth(), -GetHeight(), GetDC(), 0, 0, GetWidth(), GetHeight(), SRCCOPY); NotifyImageChanged(); @@ -261,23 +233,21 @@ void ImageModel::RotateNTimes90Degrees(int iN) { switch (iN) { - case 1: - case 3: - DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); - hBms[(currInd + 1) % HISTORYSIZE] = Rotate90DegreeBlt(hDrawingDC, GetWidth(), GetHeight(), iN == 1, FALSE); - currInd = (currInd + 1) % HISTORYSIZE; - if (undoSteps < HISTORYSIZE - 1) - undoSteps++; - redoSteps = 0; - SelectObject(hDrawingDC, hBms[currInd]); - imageSaved = FALSE; - NotifyDimensionsChanged(); - break; - case 2: - CopyPrevious(); - StretchBlt(hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), GetDC(), - 0, 0, GetWidth(), GetHeight(), SRCCOPY); - break; + case 1: + case 3: + { + HBITMAP hbm = Rotate90DegreeBlt(hDrawingDC, GetWidth(), GetHeight(), iN == 1, FALSE); + if (hbm) + PushImageForUndo(hbm); + break; + } + case 2: + { + PushImageForUndo(); + StretchBlt(hDrawingDC, GetWidth() - 1, GetHeight() - 1, -GetWidth(), -GetHeight(), + hDrawingDC, 0, 0, GetWidth(), GetHeight(), SRCCOPY); + break; + } } NotifyImageChanged(); } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index d7a65f9e892..86c312df871 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -13,38 +13,37 @@ class ImageModel { -private: - void NotifyDimensionsChanged(); - void NotifyImageChanged(); - HDC hDrawingDC; -public: - HBITMAP hBms[HISTORYSIZE]; -private: - int currInd; - int undoSteps; - int redoSteps; public: ImageModel(); - void CopyPrevious(void); + virtual ~ImageModel(); + + HDC GetDC(); + BOOL CanUndo() const { return undoSteps > 0; } + BOOL CanRedo() const { return redoSteps > 0; } + void PushImageForUndo(HBITMAP hbm = NULL); + void ResetToPrevious(void); void Undo(BOOL bClearRedo = FALSE); void Redo(void); - void ResetToPrevious(void); void ClearHistory(void); - void Insert(HBITMAP hbm); void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); - void SaveImage(LPTSTR lpFileName); + void SaveImage(LPCTSTR lpFileName); BOOL IsImageSaved() const; - BOOL CanUndo() const; - BOOL CanRedo() const; void StretchSkew(int nStretchPercentX, int nStretchPercentY, int nSkewDegX = 0, int nSkewDegY = 0); int GetWidth() const; int GetHeight() const; void InvertColors(); - void Clear(COLORREF color = 0x00ffffff); - HDC GetDC(); void FlipHorizontally(); void FlipVertically(); void RotateNTimes90Degrees(int iN); void DeleteSelection(); void Bound(POINT& pt); + +protected: + HDC hDrawingDC; // The device context for this class + int currInd; // The current index + int undoSteps; // The undo-able count + int redoSteps; // The redo-able count + HBITMAP hBms[HISTORYSIZE]; // A rotation buffer of HBITMAPs + + void NotifyImageChanged(); }; diff --git a/base/applications/mspaint/mouse.cpp b/base/applications/mspaint/mouse.cpp index 9fe51d00044..23bfa69043c 100644 --- a/base/applications/mspaint/mouse.cpp +++ b/base/applications/mspaint/mouse.cpp @@ -113,7 +113,7 @@ struct FreeSelTool : ToolBase selectionModel.Landing(); if (bLeftButton) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); selectionModel.m_bShow = FALSE; selectionModel.ResetPtStack(); POINT pt = { x, y }; @@ -187,7 +187,7 @@ struct RectSelTool : ToolBase selectionModel.Landing(); if (bLeftButton) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); selectionModel.m_bShow = FALSE; ::SetRectEmpty(&selectionModel.m_rc); } @@ -246,7 +246,7 @@ struct GenericDrawTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); draw(bLeftButton, x, y); } @@ -293,7 +293,7 @@ struct FillTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); Fill(m_hdc, x, y, bLeftButton ? m_fg : m_bg); } }; @@ -341,7 +341,7 @@ struct ZoomTool : ToolBase void OnButtonDown(BOOL bLeftButton, LONG x, LONG y, BOOL bDoubleClick) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); if (bLeftButton) { if (toolsModel.GetZoom() < MAX_ZOOM) @@ -419,7 +419,7 @@ struct TextTool : ToolBase if (!textEditWindow.IsWindow()) textEditWindow.Create(canvasWindow); - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); UpdatePoint(x, y); } @@ -449,7 +449,7 @@ struct TextTool : ToolBase // Draw the text INT style = (toolsModel.IsBackgroundTransparent() ? 0 : 1); - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); Text(m_hdc, rc.left, rc.top, rc.right, rc.bottom, m_fg, m_bg, szText, textEditWindow.GetFont(), style); @@ -554,7 +554,7 @@ struct BezierTool : ToolBase if (pointSP == 0) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); pointSP++; } } @@ -642,7 +642,7 @@ struct ShapeTool : ToolBase if (pointSP == 0 && !bDoubleClick) { - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); draw(bLeftButton, x, y); pointSP++; } diff --git a/base/applications/mspaint/selectionmodel.cpp b/base/applications/mspaint/selectionmodel.cpp index 56d74ce877e..33ff6f05722 100644 --- a/base/applications/mspaint/selectionmodel.cpp +++ b/base/applications/mspaint/selectionmodel.cpp @@ -194,7 +194,7 @@ void SelectionModel::Landing() ClearMask(); ClearColor(); - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); } void SelectionModel::InsertFromHBITMAP(HBITMAP hBm, INT x, INT y) @@ -445,7 +445,7 @@ void SelectionModel::CancelSelection() if (!m_bShow) return; - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); if (m_bShow) imageModel.Undo(TRUE); diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index c1deaa155bc..80a225b8a8a 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -204,7 +204,7 @@ void CMainWindow::InsertSelectionFromHBITMAP(HBITMAP bitmap, HWND window) SendMessage(hToolbar, TB_CHECKBUTTON, ID_RECTSEL, MAKELPARAM(TRUE, 0)); toolBoxContainer.SendMessage(WM_COMMAND, ID_RECTSEL); - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); selectionModel.InsertFromHBITMAP(bitmap, 0, 0); selectionModel.m_bShow = TRUE; canvasWindow.Invalidate(FALSE); @@ -761,7 +761,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH break; } case IDM_IMAGEDELETEIMAGE: - imageModel.CopyPrevious(); + imageModel.PushImageForUndo(); Rect(imageModel.GetDC(), 0, 0, imageModel.GetWidth(), imageModel.GetHeight(), paletteModel.GetBgColor(), paletteModel.GetBgColor(), 0, TRUE); canvasWindow.Invalidate(FALSE); break; @@ -829,7 +829,8 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH toolsModel.SetBackgroundTransparent(!toolsModel.IsBackgroundTransparent()); break; case IDM_IMAGECROP: - imageModel.Insert(CopyDIBImage(selectionModel.GetBitmap())); + imageModel.PushImageForUndo(CopyDIBImage(selectionModel.GetBitmap())); + imageModel.DeleteSelection(); break; case IDM_VIEWTOOLBOX:

1 0

[reactos] 01/01: [FONTVIEW] Add Japanese translation (ja-JP)
by Katayama Hirofumi MZ 13 Jun '23

13 Jun '23

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=70f897e4c92a2a999da79… commit 70f897e4c92a2a999da793a02b71c4405394437d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 22:04:44 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 22:04:44 2023 +0900 [FONTVIEW] Add Japanese translation (ja-JP) --- base/applications/fontview/fontview.rc | 3 +++ base/applications/fontview/lang/ja-JP.rc | 35 ++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/base/applications/fontview/fontview.rc b/base/applications/fontview/fontview.rc index 2b21c00dad7..b84c910958f 100644 --- a/base/applications/fontview/fontview.rc +++ b/base/applications/fontview/fontview.rc @@ -48,6 +48,9 @@ END #ifdef LANGUAGE_IT_IT #include "lang/it-IT.rc" #endif +#ifdef LANGUAGE_JA_JP + #include "lang/ja-JP.rc" +#endif #ifdef LANGUAGE_LT_LT #include "lang/lt-LT.rc" #endif diff --git a/base/applications/fontview/lang/ja-JP.rc b/base/applications/fontview/lang/ja-JP.rc new file mode 100644 index 00000000000..47fa3a1c3b9 --- /dev/null +++ b/base/applications/fontview/lang/ja-JP.rc @@ -0,0 +1,35 @@ +/* + * PROJECT: ReactOS Font Viewer + * LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later) + * PURPOSE: Japanese resource file + * TRANSLATORS: Copyright 2023 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> + */ + +LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_INSTALL "インストール(&I)" + IDS_PRINT "印刷(&P)" + IDS_STRING "ReactOS は万人に開かれたコンピュータのシステムです。1234567890" + IDS_OPEN "フォントを開く..." + IDS_ERROR "エラー" + IDS_ERROR_NOMEM "処理の完了に充分なメモリーがありません。" + IDS_ERROR_NOFONT "ファイル %1 は有効なフォントファイルではありません。" + IDS_ERROR_NOCLASS "ウィンドウクラスを初期化できません。" + IDS_ERROR_ISINSTALLED "このフォントはインストール済みです!" + IDS_ERROR_FONTCPY "フォントファイルのコピーに失敗しました!" + IDS_ERROR_OPENKEY "フォントキーを開くのに失敗しました!" + IDS_ERROR_REGISTER "新しいフォントの登録に失敗しました!" + IDS_SUCCESS "成功" + IDS_COMPLETED "フォントのインストールが完了しました。" + IDS_FILTER_LIST "すべてのサポート済みフォント (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ +フォントファイル (*.fon;*.fnt)\0*.fon;*.fnt\0\ +TrueType フォント (*.ttf)\0*.ttf\0\ +TrueType フォントコレクション (*.ttc)\0*.ttc\0\ +OpenType フォント (*.otf)\0*.otf\0\ +OpenType フォントコレクション (*.otc)\0*.otc\0\ +すべてのファイル (*.*)\0*.*\0" + IDS_PREVIOUS "< 戻る(&R)" + IDS_NEXT "次へ(&N) >" +END

1 0

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