Ros-diffs June 2023

ros-diffs@reactos.org

20 participants
155 discussions

[reactos] 01/01: [TASKMGR] Report any memory leaks on exit (#5340)

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [TASKMGR] Follow-up of 'Refactor trayicon.c' (99fb812)

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [TASKMGR] Refactor trayicon.c

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [MSPAINT] Fix two handle leaks

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [MSPAINT] CMiniatureWindow: Avoid too small

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [MSPAINT] Refactor ImageModel (#5335)

by Katayama Hirofumi MZ

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 year, 6 months

[reactos] 01/01: [FONTVIEW] Add Japanese translation (ja-JP)

by Katayama Hirofumi MZ

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 year, 6 months

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

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8d8e81ee7afb224cc95f7… commit 8d8e81ee7afb224cc95f7805a6b701c15e1475d3 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jun 13 14:40:46 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jun 13 14:40:46 2023 +0300 [FONTVIEW] Update Russian (ru-RU) translation Addendum to 5ef3f347. CORE-18952 --- base/applications/fontview/lang/ru-RU.rc | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/base/applications/fontview/lang/ru-RU.rc b/base/applications/fontview/lang/ru-RU.rc index 2edf11d2d44..014d3748191 100644 --- a/base/applications/fontview/lang/ru-RU.rc +++ b/base/applications/fontview/lang/ru-RU.rc @@ -1,4 +1,10 @@ -/* Russian language resource file (Dmitry Chapyshev, 2007-06-21) */ +/* + * PROJECT: ReactOS Font Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Russian resource file + * TRANSLATORS: Copyright 2007 Dmitry Chapyshev <dmitry(a)reactos.org> + * Copyright 2014-2015 Kudratov Olimjon <olim98(a)bk.ru> + */ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT @@ -12,12 +18,12 @@ BEGIN IDS_ERROR_NOMEM "Недостаточно памяти для выполнения операции." IDS_ERROR_NOFONT "%1 не является корректным файлом шрифта." IDS_ERROR_NOCLASS "Невозможно инициализировать класс окна." - IDS_ERROR_ISINSTALLED "This font is already installed!" - IDS_ERROR_FONTCPY "Failed to copy the font file!" - IDS_ERROR_OPENKEY "Failed to open the fonts key!" - IDS_ERROR_REGISTER "Failed to register the new font!" - IDS_SUCCESS "Success" - IDS_COMPLETED "Font installation completed." + 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\

1 year, 6 months

[reactos] 01/01: [FONTVIEW] Make hardcoded messages localizable (#5305)

by Nikita Piatygorskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ef3f347ad0410f064171… commit 5ef3f347ad0410f064171d96e362c645959a1648 Author: Nikita Piatygorskiy <generalhammond16(a)gmail.com> AuthorDate: Tue Jun 13 14:12:26 2023 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 14:12:26 2023 +0300 [FONTVIEW] Make hardcoded messages localizable (#5305) - Move messages from OnInstall procedure to en-US resource file. - Applied the same changes to all language files, now it's available for translation into other languages. CORE-18952 Signed-off-by: Nikita Piatygorskiy <generalhammond16(a)gmail.com> --- base/applications/fontview/fontview.c | 59 ++++++++++++++++++++++---------- base/applications/fontview/lang/bg-BG.rc | 6 ++++ base/applications/fontview/lang/cs-CZ.rc | 6 ++++ base/applications/fontview/lang/de-DE.rc | 6 ++++ base/applications/fontview/lang/en-US.rc | 6 ++++ base/applications/fontview/lang/es-ES.rc | 6 ++++ base/applications/fontview/lang/fr-FR.rc | 6 ++++ base/applications/fontview/lang/he-IL.rc | 6 ++++ base/applications/fontview/lang/id-ID.rc | 6 ++++ base/applications/fontview/lang/it-IT.rc | 6 ++++ base/applications/fontview/lang/lt-LT.rc | 6 ++++ base/applications/fontview/lang/ms-MY.rc | 6 ++++ base/applications/fontview/lang/no-NO.rc | 6 ++++ base/applications/fontview/lang/pl-PL.rc | 6 ++++ base/applications/fontview/lang/pt-BR.rc | 6 ++++ base/applications/fontview/lang/ro-RO.rc | 6 ++++ base/applications/fontview/lang/ru-RU.rc | 6 ++++ base/applications/fontview/lang/sk-SK.rc | 6 ++++ base/applications/fontview/lang/sq-AL.rc | 6 ++++ base/applications/fontview/lang/sv-SE.rc | 6 ++++ base/applications/fontview/lang/tr-TR.rc | 6 ++++ base/applications/fontview/lang/uk-UA.rc | 6 ++++ base/applications/fontview/lang/zh-CN.rc | 6 ++++ base/applications/fontview/lang/zh-HK.rc | 6 ++++ base/applications/fontview/lang/zh-TW.rc | 6 ++++ base/applications/fontview/resource.h | 16 ++++++--- 26 files changed, 195 insertions(+), 24 deletions(-) diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c index da6a2bc5d79..c8dcf32da22 100644 --- a/base/applications/fontview/fontview.c +++ b/base/applications/fontview/fontview.c @@ -58,26 +58,52 @@ FormatString( } static void -ErrorMsgBox(HWND hParent, DWORD dwMessageId, ...) +FormatMsgBox( + _In_ HWND hParent, + _In_ DWORD dwMessageId, + _In_ DWORD dwCaptionId, + _In_ UINT uType, + _In_ va_list args) { HLOCAL hMemCaption = NULL; HLOCAL hMemText = NULL; - va_list args; - va_start(args, dwMessageId); FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); - va_end(args); - FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, IDS_ERROR, 0, (LPWSTR)&hMemCaption, 0, NULL); - - MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); + NULL, dwCaptionId, 0, (LPWSTR)&hMemCaption, 0, NULL); + MessageBoxW(hParent, hMemText, hMemCaption, uType); LocalFree(hMemCaption); LocalFree(hMemText); } +static void +ErrorMsgBox( + HWND hParent, + DWORD dwMessageId, + ...) +{ + va_list args; + + va_start(args, dwMessageId); + FormatMsgBox(hParent, dwMessageId, IDS_ERROR, MB_ICONERROR, args); + va_end(args); +} + +static void +SuccessMsgBox( + HWND hParent, + DWORD dwMessageId, + ...) +{ + va_list args; + + va_start(args, dwMessageId); + FormatMsgBox(hParent, dwMessageId, IDS_SUCCESS, MB_ICONINFORMATION, args); + va_end(args); +} + int WINAPI wWinMain(HINSTANCE hThisInstance, HINSTANCE hPrevInstance, @@ -451,7 +477,6 @@ MainWnd_OnInstall(HWND hwnd) HKEY hKey; SendDlgItemMessage(hwnd, IDC_DISPLAY, FVM_GETFULLNAME, 64, (LPARAM)szFullName); -// MessageBoxW(hwnd, szFullName, L"Debug", MB_OK); /* First, we have to find out if the font still exists */ if (GetFileAttributes(g_fileName) == INVALID_FILE_ATTRIBUTES) @@ -468,21 +493,17 @@ MainWnd_OnInstall(HWND hwnd) wcscat(szDestPath, L"\\Fonts\\"); wcscat(szDestPath, pszFileName); - /* Debug Message */ -// MessageBoxW(hwnd, szDestPath, L"szDestPath", MB_OK); -// MessageBoxW(hwnd, pszFileName, L"pszFileExt", MB_OK); - /* Check if the file already exists */ if (GetFileAttributesW(szDestPath) != INVALID_FILE_ATTRIBUTES) { - MessageBoxW(hwnd, L"This font is already installed!", L"Already Installed", MB_OK); + ErrorMsgBox(hwnd, IDS_ERROR_ISINSTALLED); return 0; } /* Copy the font file */ if (!CopyFileW(g_fileName, szDestPath, TRUE)) { - MessageBoxW(hwnd,L"Failed to copy the font file!", L"File Error", MB_OK); + ErrorMsgBox(hwnd, IDS_ERROR_FONTCPY); return -1; } @@ -494,7 +515,7 @@ MainWnd_OnInstall(HWND hwnd) &hKey); if (res != ERROR_SUCCESS) { - MessageBoxW(hwnd, L"Failed top open the fonts key!", L"Debug1", MB_OK); + ErrorMsgBox(hwnd, IDS_ERROR_OPENKEY); return -1; } @@ -504,10 +525,10 @@ MainWnd_OnInstall(HWND hwnd) 0, REG_SZ, (LPBYTE)pszFileName, - (wcslen(pszFileName) + 1) * sizeof(WCHAR)); + (DWORD)(wcslen(pszFileName) + 1) * sizeof(WCHAR)); if (res != ERROR_SUCCESS) { - MessageBoxW(hwnd, L"Failed to register the new font!", L"Debug2", MB_OK); + ErrorMsgBox(hwnd, IDS_ERROR_REGISTER); RegCloseKey(hKey); return -1; } @@ -519,7 +540,7 @@ MainWnd_OnInstall(HWND hwnd) SendMessageW(HWND_BROADCAST, WM_FONTCHANGE, 0, 0); /* if all of this goes correctly, message the user about success */ - MessageBoxW(hwnd, L"Font Installation Completed.", L"Success", MB_OK); + SuccessMsgBox(hwnd, IDS_COMPLETED); return 0; } diff --git a/base/applications/fontview/lang/bg-BG.rc b/base/applications/fontview/lang/bg-BG.rc index e38905afd6c..d40020e64b5 100644 --- a/base/applications/fontview/lang/bg-BG.rc +++ b/base/applications/fontview/lang/bg-BG.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Няма достатъчно място за завършване на действието." IDS_ERROR_NOFONT "%1 не е редовен шрифтов файл." IDS_ERROR_NOCLASS "Неуспешно изпълнение на класа на прозореца." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/cs-CZ.rc b/base/applications/fontview/lang/cs-CZ.rc index 6dcbdf883a1..d73fd4c9224 100644 --- a/base/applications/fontview/lang/cs-CZ.rc +++ b/base/applications/fontview/lang/cs-CZ.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "K dokončení operace není dostatek paměti." IDS_ERROR_NOFONT "Soubor %1 není platným souborem písma." IDS_ERROR_NOCLASS "Inicializace okna aplikace selhala." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Podporované soubory písem (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Písmo Font (*.fon;*.fnt)\0*.fon;*.fnt\0\ Písmo TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/de-DE.rc b/base/applications/fontview/lang/de-DE.rc index b3ff7113be5..b41acd3855f 100644 --- a/base/applications/fontview/lang/de-DE.rc +++ b/base/applications/fontview/lang/de-DE.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Es steht nicht genügend Speicher zur Verfügung." IDS_ERROR_NOFONT "Die angegebene Datei %1 ist keine gültige Schriftartendatei." IDS_ERROR_NOCLASS "Fehler beim Initialisieren der Fensterklasse." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/en-US.rc b/base/applications/fontview/lang/en-US.rc index 6ae1042ed1a..3c3836b8598 100644 --- a/base/applications/fontview/lang/en-US.rc +++ b/base/applications/fontview/lang/en-US.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "There is not enough memory to complete the operation." IDS_ERROR_NOFONT "The file %1 is not a valid font file." IDS_ERROR_NOCLASS "Could not initialize window class." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/es-ES.rc b/base/applications/fontview/lang/es-ES.rc index 21fcfc1a913..2168a64f6b7 100644 --- a/base/applications/fontview/lang/es-ES.rc +++ b/base/applications/fontview/lang/es-ES.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "No hay memoria suficiente para completar la operación." IDS_ERROR_NOFONT "El archivo %1 no es un archivo de fuente válido." IDS_ERROR_NOCLASS "No es posible iniciar la clase de ventana." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Todas las tipografías (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Tipografía de mapa de bits (*.fon;*.fnt)\0*.fon;*.fnt\0\ Tipografía TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/fr-FR.rc b/base/applications/fontview/lang/fr-FR.rc index 965b11d4665..0d22b91d720 100644 --- a/base/applications/fontview/lang/fr-FR.rc +++ b/base/applications/fontview/lang/fr-FR.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération." IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier de polices valide." IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Toutes polices supportées (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Fichier de polices (*.fon;*.fnt)\0*.fon;*.fnt\0\ Fichier de polices TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/he-IL.rc b/base/applications/fontview/lang/he-IL.rc index 4a6eacdb8a9..b9fd3083233 100644 --- a/base/applications/fontview/lang/he-IL.rc +++ b/base/applications/fontview/lang/he-IL.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "אין מספיק זיכרון כדי להשלים את הפעולה." IDS_ERROR_NOFONT "הקובץ %1 אינו קובץ גופנים חוקי." IDS_ERROR_NOCLASS "Could not initialize window class." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/id-ID.rc b/base/applications/fontview/lang/id-ID.rc index e031a03a254..c6db7b57f02 100644 --- a/base/applications/fontview/lang/id-ID.rc +++ b/base/applications/fontview/lang/id-ID.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Memori tidak cukup untuk menyelesaikan operasi." IDS_ERROR_NOFONT "Berkas %1 bukan berkas fon yang valid." IDS_ERROR_NOCLASS "Tidak bisa memulai window class." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Semua fon yang didukung (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Berkas Fon (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Fon (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/it-IT.rc b/base/applications/fontview/lang/it-IT.rc index 3eaa1cd9326..70bdd487d39 100644 --- a/base/applications/fontview/lang/it-IT.rc +++ b/base/applications/fontview/lang/it-IT.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Memoria insufficiente per completare l'operazione." IDS_ERROR_NOFONT "Il file% 1 non è un file di origine valido." IDS_ERROR_NOCLASS "Impossibile avviare la classe." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Tutti i font supportati (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ Font TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/lt-LT.rc b/base/applications/fontview/lang/lt-LT.rc index bd9703d9be0..52c254b892d 100644 --- a/base/applications/fontview/lang/lt-LT.rc +++ b/base/applications/fontview/lang/lt-LT.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "Užduočiai užbaigti, nepakanka atminties." IDS_ERROR_NOFONT "%1 nėra teisinga šrifto byla." IDS_ERROR_NOCLASS "Nepavyko inicijuoti lango klasės." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/ms-MY.rc b/base/applications/fontview/lang/ms-MY.rc index e22d4ebb02c..2e9a40d8777 100644 --- a/base/applications/fontview/lang/ms-MY.rc +++ b/base/applications/fontview/lang/ms-MY.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "Terdapat tidak cukup ingatan untuk melengkapkan operasi ini." IDS_ERROR_NOFONT "Fail %1 bukanlah fail fon yang sah." IDS_ERROR_NOCLASS "Tidak dapat mengawalkan kelas tetingkap." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Semuanya disokong fon (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/no-NO.rc b/base/applications/fontview/lang/no-NO.rc index f1c7b65587c..4fd6807dbbd 100644 --- a/base/applications/fontview/lang/no-NO.rc +++ b/base/applications/fontview/lang/no-NO.rc @@ -10,6 +10,12 @@ BEGIN IDS_ERROR_NOMEM "Det er ikke nok minne for å fullføre oppgaven." IDS_ERROR_NOFONT "Filen %1 er ikke et gyldig skriftfil." IDS_ERROR_NOCLASS "Kunne ikke initialise vindu klassen." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/pl-PL.rc b/base/applications/fontview/lang/pl-PL.rc index f3f83fc3289..da0568e2c14 100644 --- a/base/applications/fontview/lang/pl-PL.rc +++ b/base/applications/fontview/lang/pl-PL.rc @@ -18,6 +18,12 @@ BEGIN IDS_ERROR_NOMEM "Brakuje pamięci do ukończenia tej operacji." IDS_ERROR_NOFONT "Plik %1 nie jest poprawnym plikiem czcionki." IDS_ERROR_NOCLASS "Nie udało się zainicjować klasy window." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Wszystkie obsługiwane czcionki (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Plik czcionki (*.fon;*.fnt)\0*.fon;*.fnt\0\ Czcionka TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/pt-BR.rc b/base/applications/fontview/lang/pt-BR.rc index 1e39fabb664..7f43f410fe6 100644 --- a/base/applications/fontview/lang/pt-BR.rc +++ b/base/applications/fontview/lang/pt-BR.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "Não há memória suficiente para completar a operação." IDS_ERROR_NOFONT "O arquivo %1 não é um arquivo de fonte válida." IDS_ERROR_NOCLASS "Não foi possível inicializar a janela." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/ro-RO.rc b/base/applications/fontview/lang/ro-RO.rc index ecdd7c599a1..49104b645dd 100644 --- a/base/applications/fontview/lang/ro-RO.rc +++ b/base/applications/fontview/lang/ro-RO.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "Nu e destulă memorie pentru a încheia operația." IDS_ERROR_NOFONT "Fișierul «%1» este un fișier font deteriorat." IDS_ERROR_NOCLASS "Clasa de ferestre nu a putut fi inițializată." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Toate fonturile recunoscute (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Fișiere de tip Font (*.fon;*.fnt)\0*.fon;*.fnt\0\ Fonturi de tip TrueType (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/ru-RU.rc b/base/applications/fontview/lang/ru-RU.rc index 1d16fb34ea2..2edf11d2d44 100644 --- a/base/applications/fontview/lang/ru-RU.rc +++ b/base/applications/fontview/lang/ru-RU.rc @@ -12,6 +12,12 @@ BEGIN IDS_ERROR_NOMEM "Недостаточно памяти для выполнения операции." IDS_ERROR_NOFONT "%1 не является корректным файлом шрифта." IDS_ERROR_NOCLASS "Невозможно инициализировать класс окна." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation 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\ diff --git a/base/applications/fontview/lang/sk-SK.rc b/base/applications/fontview/lang/sk-SK.rc index 29af80a7626..8ec3ebec534 100644 --- a/base/applications/fontview/lang/sk-SK.rc +++ b/base/applications/fontview/lang/sk-SK.rc @@ -15,6 +15,12 @@ BEGIN IDS_ERROR_NOMEM "Na vykonanie tejto operácie nie je dostatok voľnej pamäte." IDS_ERROR_NOFONT "Požadovaný súbor %1 nie je platným súborom písiem." IDS_ERROR_NOCLASS "Nepodarilo sa inicializovať triedu window." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/sq-AL.rc b/base/applications/fontview/lang/sq-AL.rc index 677082bebf3..38ff80531d4 100644 --- a/base/applications/fontview/lang/sq-AL.rc +++ b/base/applications/fontview/lang/sq-AL.rc @@ -14,6 +14,12 @@ BEGIN IDS_ERROR_NOMEM "Nuk ka memorie të mjaftueshme për të përfunduar operacionin." IDS_ERROR_NOFONT "Dokumenti %1 nuk është një font i vlefshem." IDS_ERROR_NOCLASS "Nuk mund të fillojë dritaren e klases." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/sv-SE.rc b/base/applications/fontview/lang/sv-SE.rc index 07eefcf19b5..eb389506897 100644 --- a/base/applications/fontview/lang/sv-SE.rc +++ b/base/applications/fontview/lang/sv-SE.rc @@ -17,6 +17,12 @@ BEGIN IDS_ERROR_NOMEM "Det er inte nog minne för att slutföre operationen." IDS_ERROR_NOFONT "Filen %1 är inte en giltig typsnittsfil." IDS_ERROR_NOCLASS "Kunde inte initialisera Windows klassen." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/tr-TR.rc b/base/applications/fontview/lang/tr-TR.rc index 8d0e0e07623..41ec9878032 100644 --- a/base/applications/fontview/lang/tr-TR.rc +++ b/base/applications/fontview/lang/tr-TR.rc @@ -18,6 +18,12 @@ BEGIN IDS_ERROR_NOMEM "Bu işlemi bitirmek için yeterli bellek yok." IDS_ERROR_NOFONT "%1 dosyası, geçerli bir yazı tipi dosyası değil." IDS_ERROR_NOCLASS "Pencere sınıfı başlatılamadı." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "Tüm Desteklenen Yazı Tipleri (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Yazı Tipi Dosyası (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Yazı Tipi (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/uk-UA.rc b/base/applications/fontview/lang/uk-UA.rc index 66f7c2cff4e..3805e243aca 100644 --- a/base/applications/fontview/lang/uk-UA.rc +++ b/base/applications/fontview/lang/uk-UA.rc @@ -18,6 +18,12 @@ BEGIN IDS_ERROR_NOMEM "Недостатньо пам'яті для завершення операції." IDS_ERROR_NOFONT "Файл %1 не є коректним файлом шрифту." IDS_ERROR_NOCLASS "Неможливо ініціалізувати віконний клас." + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation completed." IDS_FILTER_LIST "All Supported Fonts (*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc)\0*.fon;*.fnt;*.ttf;*.ttc;*.otf;*.otc\0\ Font File (*.fon;*.fnt)\0*.fon;*.fnt\0\ TrueType Font (*.ttf)\0*.ttf\0\ diff --git a/base/applications/fontview/lang/zh-CN.rc b/base/applications/fontview/lang/zh-CN.rc index 4f8d952ba30..dd10e512673 100644 --- a/base/applications/fontview/lang/zh-CN.rc +++ b/base/applications/fontview/lang/zh-CN.rc @@ -20,6 +20,12 @@ BEGIN IDS_ERROR_NOMEM "没有足够的内存来完成操作。" IDS_ERROR_NOFONT "%1不是一个有效的字体文件。" IDS_ERROR_NOCLASS "无法初始化窗口。" + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation 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\ diff --git a/base/applications/fontview/lang/zh-HK.rc b/base/applications/fontview/lang/zh-HK.rc index 91dbd658b7d..a6e4c3d2d29 100644 --- a/base/applications/fontview/lang/zh-HK.rc +++ b/base/applications/fontview/lang/zh-HK.rc @@ -18,6 +18,12 @@ BEGIN IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。" IDS_ERROR_NOFONT "%1 不是一個有效的字型檔案。" IDS_ERROR_NOCLASS "無法初始化視窗。" + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation 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\ diff --git a/base/applications/fontview/lang/zh-TW.rc b/base/applications/fontview/lang/zh-TW.rc index 39bceb4e1fe..0fec829a58d 100644 --- a/base/applications/fontview/lang/zh-TW.rc +++ b/base/applications/fontview/lang/zh-TW.rc @@ -18,6 +18,12 @@ BEGIN IDS_ERROR_NOMEM "沒有足夠的記憶體來完成操作。" IDS_ERROR_NOFONT "%1 不是一個有效的字型檔案。" IDS_ERROR_NOCLASS "無法初始化視窗。" + IDS_ERROR_ISINSTALLED "This font is already installed!" + IDS_ERROR_FONTCPY "Failed to copy the font file!" + IDS_ERROR_OPENKEY "Failed to open the fonts key!" + IDS_ERROR_REGISTER "Failed to register the new font!" + IDS_SUCCESS "Success" + IDS_COMPLETED "Font installation 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\ diff --git a/base/applications/fontview/resource.h b/base/applications/fontview/resource.h index 6018f68fdcf..b9011755d8e 100644 --- a/base/applications/fontview/resource.h +++ b/base/applications/fontview/resource.h @@ -1,10 +1,16 @@ #pragma once -#define IDS_ERROR 100 -#define IDS_ERROR_NOMEM 101 -#define IDS_ERROR_NOFONT 102 -#define IDS_ERROR_NOCLASS 103 -#define IDS_FILTER_LIST 104 +#define IDS_ERROR 100 +#define IDS_ERROR_NOMEM 101 +#define IDS_ERROR_NOFONT 102 +#define IDS_ERROR_NOCLASS 103 +#define IDS_ERROR_ISINSTALLED 104 +#define IDS_ERROR_FONTCPY 105 +#define IDS_ERROR_OPENKEY 106 +#define IDS_ERROR_REGISTER 107 +#define IDS_SUCCESS 108 +#define IDS_COMPLETED 109 +#define IDS_FILTER_LIST 110 #define IDS_INSTALL 500 #define IDS_PRINT 501

1 year, 6 months

[reactos] 01/01: [FONTVIEW] Formatting only (for PR #5305)

by Stanislav Motylkov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2e836fb339b89f3e97647… commit 2e836fb339b89f3e97647d07425f66d3e72a6456 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jun 13 12:44:46 2023 +0300 Commit: Stanislav Motylkov <x86corez(a)gmail.com> CommitDate: Tue Jun 13 12:44:46 2023 +0300 [FONTVIEW] Formatting only (for PR #5305) --- base/applications/fontview/display.c | 842 +++++++++++++++++----------------- base/applications/fontview/fontview.c | 759 +++++++++++++++--------------- 2 files changed, 784 insertions(+), 817 deletions(-) diff --git a/base/applications/fontview/display.c b/base/applications/fontview/display.c index 7ffc9b10795..0c4f771b27e 100644 --- a/base/applications/fontview/display.c +++ b/base/applications/fontview/display.c @@ -1,23 +1,8 @@ /* - * fontview display class - * - * display.c - * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS Font Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Display class + * COPYRIGHT: Copyright 2007 Timo Kreuzer <timo.kreuzer(a)reactos.org> */ #include "precomp.h" @@ -37,488 +22,488 @@ LRESULT CALLBACK DisplayProc(HWND, UINT, WPARAM, LPARAM); /* Internal data storage type */ typedef struct { - int nPageHeight; - WCHAR szTypeFaceName[LF_FULLFACESIZE]; - WCHAR szFormat[MAX_FORMAT]; - WCHAR szString[MAX_STRING]; - - HFONT hCaptionFont; - HFONT hCharSetFont; - HFONT hSizeFont; - HFONT hFonts[MAX_SIZES]; - int nSizes[MAX_SIZES]; - int nHeights[MAX_SIZES]; + int nPageHeight; + WCHAR szTypeFaceName[LF_FULLFACESIZE]; + WCHAR szFormat[MAX_FORMAT]; + WCHAR szString[MAX_STRING]; + + HFONT hCaptionFont; + HFONT hCharSetFont; + HFONT hSizeFont; + HFONT hFonts[MAX_SIZES]; + int nSizes[MAX_SIZES]; + int nHeights[MAX_SIZES]; } DISPLAYDATA; /* This is the only public function, it registers the class */ BOOL Display_InitClass(HINSTANCE hInstance) { - WNDCLASSEXW wincl; - - /* Set the fontdisplay window class structure */ - wincl.cbSize = sizeof(WNDCLASSEX); - wincl.style = CS_DBLCLKS; - wincl.lpfnWndProc = DisplayProc; - wincl.cbClsExtra = 0; - wincl.cbWndExtra = 0; - wincl.hInstance = hInstance; - wincl.hIcon = NULL; - wincl.hCursor = LoadCursor (NULL, IDC_ARROW); - wincl.hbrBackground = GetStockObject(WHITE_BRUSH); - wincl.lpszMenuName = NULL; - wincl.lpszClassName = g_szFontDisplayClassName; - wincl.hIconSm = NULL; - - /* Register the window class, and if it fails return FALSE */ - if (!RegisterClassExW (&wincl)) - { - return FALSE; - } - return TRUE; + WNDCLASSEXW wincl; + + /* Set the fontdisplay window class structure */ + wincl.cbSize = sizeof(WNDCLASSEX); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = DisplayProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hInstance; + wincl.hIcon = NULL; + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = GetStockObject(WHITE_BRUSH); + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontDisplayClassName; + wincl.hIconSm = NULL; + + /* Register the window class, and if it fails return FALSE */ + if (!RegisterClassExW (&wincl)) + { + return FALSE; + } + return TRUE; } static int Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos) { - HFONT hOldFont; - TEXTMETRIC tm; - int i, y; - WCHAR szSize[5]; - WCHAR szCaption[LF_FULLFACESIZE + 20]; - - /* This is the location on the DC where we draw */ - y = -nYPos; - - hOldFont = SelectObject(hDC, pData->hCaptionFont); - GetTextMetrics(hDC, &tm); - - swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat); - TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); - y += tm.tmHeight + SPACING1; - - /* Draw a separation Line */ - SelectObject(hDC, GetStockObject(BLACK_PEN)); - MoveToEx(hDC, 0, y, NULL); - LineTo(hDC, 10000, y); - y += SPACING2; - - /* TODO: Output font info */ - - /* Output Character set */ - SelectObject(hDC, pData->hCharSetFont); - GetTextMetrics(hDC, &tm); - swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); - TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); - y += tm.tmHeight + 1; - - swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); - TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); - y += tm.tmHeight + 1; - - swprintf(szCaption, L"0123456789.:,;(\"~!@#$%%^&*')"); - TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); - y += tm.tmHeight + 1; - - /* Draw a separation Line */ - SelectObject(hDC, GetStockObject(BLACK_PEN)); - MoveToEx(hDC, 0, y, NULL); - LineTo(hDC, 10000, y); - y += SPACING2; - - /* Output the strings for different sizes */ - for (i = 0; i < MAX_SIZES; i++) - { - SelectObject(hDC, pData->hFonts[i]); - TextOutW(hDC, 20, y, pData->szString, (INT)wcslen(pData->szString)); - GetTextMetrics(hDC, &tm); - y += tm.tmHeight + 1; - SelectObject(hDC, pData->hSizeFont); - swprintf(szSize, L"%d", pData->nSizes[i]); - TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, (INT)wcslen(szSize)); - } - SelectObject(hDC, hOldFont); - - return y; + HFONT hOldFont; + TEXTMETRIC tm; + int i, y; + WCHAR szSize[5]; + WCHAR szCaption[LF_FULLFACESIZE + 20]; + + /* This is the location on the DC where we draw */ + y = -nYPos; + + hOldFont = SelectObject(hDC, pData->hCaptionFont); + GetTextMetrics(hDC, &tm); + + swprintf(szCaption, L"%s%s", pData->szTypeFaceName, pData->szFormat); + TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); + y += tm.tmHeight + SPACING1; + + /* Draw a separation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* TODO: Output font info */ + + /* Output Character set */ + SelectObject(hDC, pData->hCharSetFont); + GetTextMetrics(hDC, &tm); + swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); + TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"ABCDEFGHIJKLMNOPQRSTUVWXYZ"); + TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); + y += tm.tmHeight + 1; + + swprintf(szCaption, L"0123456789.:,;(\"~!@#$%%^&*')"); + TextOutW(hDC, 0, y, szCaption, (INT)wcslen(szCaption)); + y += tm.tmHeight + 1; + + /* Draw a separation Line */ + SelectObject(hDC, GetStockObject(BLACK_PEN)); + MoveToEx(hDC, 0, y, NULL); + LineTo(hDC, 10000, y); + y += SPACING2; + + /* Output the strings for different sizes */ + for (i = 0; i < MAX_SIZES; i++) + { + SelectObject(hDC, pData->hFonts[i]); + TextOutW(hDC, 20, y, pData->szString, (INT)wcslen(pData->szString)); + GetTextMetrics(hDC, &tm); + y += tm.tmHeight + 1; + SelectObject(hDC, pData->hSizeFont); + swprintf(szSize, L"%d", pData->nSizes[i]); + TextOutW(hDC, 0, y - 13 - tm.tmDescent, szSize, (INT)wcslen(szSize)); + } + SelectObject(hDC, hOldFont); + + return y; } static int CALLBACK EnumFontFamProcW( - const LOGFONTW *lpelfe, - const TEXTMETRICW *lptm, - DWORD FontType, - LPARAM lParam) + const LOGFONTW *lpelfe, + const TEXTMETRICW *lptm, + DWORD FontType, + LPARAM lParam) { - PNEWTEXTMETRICW pntmw = (PNEWTEXTMETRICW)lptm; - PBOOL pfOpenType = (PBOOL)lParam; - - if (FontType & TRUETYPE_FONTTYPE) - { - if (pntmw->ntmFlags & (NTM_TT_OPENTYPE | NTM_PS_OPENTYPE)) - { - *pfOpenType = TRUE; - return FALSE; - } - } - return TRUE; + PNEWTEXTMETRICW pntmw = (PNEWTEXTMETRICW)lptm; + PBOOL pfOpenType = (PBOOL)lParam; + + if (FontType & TRUETYPE_FONTTYPE) + { + if (pntmw->ntmFlags & (NTM_TT_OPENTYPE | NTM_PS_OPENTYPE)) + { + *pfOpenType = TRUE; + return FALSE; + } + } + return TRUE; } static LRESULT Display_SetTypeFace(HWND hwnd, PLOGFONTW pLogFont) { - DISPLAYDATA* pData; - TEXTMETRIC tm; - HDC hDC; - RECT rect; - SCROLLINFO si; - int i; - LOGFONTW logfont; - BOOL fOpenType; - BYTE Buffer[512]; - LPOUTLINETEXTMETRICW pOTM = (LPOUTLINETEXTMETRICW)Buffer; - LPWSTR pch; - - /* Set the new type face name */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - lstrcpynW(pData->szTypeFaceName, pLogFont->lfFaceName, - ARRAYSIZE(pData->szTypeFaceName)); - - /* Create the new fonts */ - hDC = GetDC(hwnd); - DeleteObject(pData->hCharSetFont); - - logfont = *pLogFont; - logfont.lfHeight = -MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72); - pData->hCharSetFont = CreateFontIndirectW(&logfont); - - /* Get font format */ - SelectObject(hDC, pData->hCharSetFont); - GetTextMetrics(hDC, &tm); - if (tm.tmPitchAndFamily & TMPF_TRUETYPE) - { - if (GetOutlineTextMetricsW(hDC, sizeof(Buffer), pOTM)) - { - LPBYTE pb = Buffer; - pb += (WORD)(DWORD_PTR)pOTM->otmpStyleName; - pch = (LPWSTR)pb; - if (*pch) - { - lstrcatW(pData->szTypeFaceName, L" "); - lstrcatW(pData->szTypeFaceName, pch); - } - } - - fOpenType = FALSE; - EnumFontFamiliesExW(hDC, &logfont, - EnumFontFamProcW, (LPARAM)&fOpenType, 0); - - if (fOpenType) - swprintf(pData->szFormat, L" (OpenType)"); - else - swprintf(pData->szFormat, L" (TrueType)"); - } - else if (tm.tmPitchAndFamily & TMPF_VECTOR) - { - swprintf(pData->szFormat, L" (Vector)"); - } - else - { - swprintf(pData->szFormat, L" (Raster)"); - } - - for (i = 0; i < MAX_SIZES; i++) - { - DeleteObject(pData->hFonts[i]); - logfont.lfHeight = -MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72); - pData->hFonts[i] = CreateFontIndirectW(&logfont); - } - - /* Calculate new page dimensions */ - pData->nPageHeight = Display_DrawText(hDC, pData, 0); - ReleaseDC(hwnd, hDC); - - /* Set the vertical scrolling range and page size */ - GetClientRect(hwnd, &rect); - si.cbSize = sizeof(si); - si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; - si.nMin = 0; - si.nMax = pData->nPageHeight; - si.nPage = rect.bottom; - si.nPos = 0; - si.nTrackPos = 0; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - - return 0; + DISPLAYDATA* pData; + TEXTMETRIC tm; + HDC hDC; + RECT rect; + SCROLLINFO si; + int i; + LOGFONTW logfont; + BOOL fOpenType; + BYTE Buffer[512]; + LPOUTLINETEXTMETRICW pOTM = (LPOUTLINETEXTMETRICW)Buffer; + LPWSTR pch; + + /* Set the new type face name */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + lstrcpynW(pData->szTypeFaceName, pLogFont->lfFaceName, + ARRAYSIZE(pData->szTypeFaceName)); + + /* Create the new fonts */ + hDC = GetDC(hwnd); + DeleteObject(pData->hCharSetFont); + + logfont = *pLogFont; + logfont.lfHeight = -MulDiv(16, GetDeviceCaps(GetDC(NULL), LOGPIXELSY), 72); + pData->hCharSetFont = CreateFontIndirectW(&logfont); + + /* Get font format */ + SelectObject(hDC, pData->hCharSetFont); + GetTextMetrics(hDC, &tm); + if (tm.tmPitchAndFamily & TMPF_TRUETYPE) + { + if (GetOutlineTextMetricsW(hDC, sizeof(Buffer), pOTM)) + { + LPBYTE pb = Buffer; + pb += (WORD)(DWORD_PTR)pOTM->otmpStyleName; + pch = (LPWSTR)pb; + if (*pch) + { + lstrcatW(pData->szTypeFaceName, L" "); + lstrcatW(pData->szTypeFaceName, pch); + } + } + + fOpenType = FALSE; + EnumFontFamiliesExW(hDC, &logfont, + EnumFontFamProcW, (LPARAM)&fOpenType, 0); + + if (fOpenType) + swprintf(pData->szFormat, L" (OpenType)"); + else + swprintf(pData->szFormat, L" (TrueType)"); + } + else if (tm.tmPitchAndFamily & TMPF_VECTOR) + { + swprintf(pData->szFormat, L" (Vector)"); + } + else + { + swprintf(pData->szFormat, L" (Raster)"); + } + + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + logfont.lfHeight = -MulDiv(pData->nSizes[i], GetDeviceCaps(hDC, LOGPIXELSY), 72); + pData->hFonts[i] = CreateFontIndirectW(&logfont); + } + + /* Calculate new page dimensions */ + pData->nPageHeight = Display_DrawText(hDC, pData, 0); + ReleaseDC(hwnd, hDC); + + /* Set the vertical scrolling range and page size */ + GetClientRect(hwnd, &rect); + si.cbSize = sizeof(si); + si.fMask = SIF_RANGE | SIF_PAGE | SIF_POS | SIF_TRACKPOS; + si.nMin = 0; + si.nMax = pData->nPageHeight; + si.nPage = rect.bottom; + si.nPos = 0; + si.nTrackPos = 0; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + return 0; } static LRESULT Display_SetString(HWND hwnd, LPCWSTR pszString) { - DISPLAYDATA* pData; + DISPLAYDATA* pData; - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - lstrcpynW(pData->szString, pszString, ARRAYSIZE(pData->szString)); + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + lstrcpynW(pData->szString, pszString, ARRAYSIZE(pData->szString)); - InvalidateRect(hwnd, NULL, TRUE); + InvalidateRect(hwnd, NULL, TRUE); - return 0; + return 0; } static LRESULT Display_OnCreate(HWND hwnd) { - DISPLAYDATA* pData; - const int nSizes[MAX_SIZES] = {8, 12, 18, 24, 36, 48, 60, 72}; - int i; - LOGFONTW LogFont = {50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, - ANSI_CHARSET, OUT_DEFAULT_PRECIS, - CLIP_DEFAULT_PRECIS, PROOF_QUALITY, - DEFAULT_PITCH , L"MS Shell Dlg"}; - - /* Create data structure */ - pData = malloc(sizeof(DISPLAYDATA)); - ZeroMemory(pData, sizeof(DISPLAYDATA)); - - /* Set the window's GWLP_USERDATA to our data structure */ - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); - - for (i = 0; i < MAX_SIZES; i++) - { - pData->nSizes[i] = nSizes[i]; - } + DISPLAYDATA* pData; + const int nSizes[MAX_SIZES] = {8, 12, 18, 24, 36, 48, 60, 72}; + int i; + LOGFONTW LogFont = {50, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, + ANSI_CHARSET, OUT_DEFAULT_PRECIS, + CLIP_DEFAULT_PRECIS, PROOF_QUALITY, + DEFAULT_PITCH , L"MS Shell Dlg"}; + + /* Create data structure */ + pData = malloc(sizeof(DISPLAYDATA)); + ZeroMemory(pData, sizeof(DISPLAYDATA)); + + /* Set the window's GWLP_USERDATA to our data structure */ + SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pData); + + for (i = 0; i < MAX_SIZES; i++) + { + pData->nSizes[i] = nSizes[i]; + } - pData->hCaptionFont = CreateFontIndirectW(&LogFont); - LogFont.lfHeight = 12; - pData->hSizeFont = CreateFontIndirectW(&LogFont); + pData->hCaptionFont = CreateFontIndirectW(&LogFont); + LogFont.lfHeight = 12; + pData->hSizeFont = CreateFontIndirectW(&LogFont); - Display_SetString(hwnd, - L"Jackdaws love my big sphinx of quartz. 1234567890"); + Display_SetString(hwnd, + L"Jackdaws love my big sphinx of quartz. 1234567890"); - Display_SetTypeFace(hwnd, &LogFont); + Display_SetTypeFace(hwnd, &LogFont); - return 0; + return 0; } static LRESULT Display_OnPaint(HWND hwnd) { - DISPLAYDATA* pData; - PAINTSTRUCT ps; - SCROLLINFO si; + DISPLAYDATA* pData; + PAINTSTRUCT ps; + SCROLLINFO si; - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - /* Get the Scroll position */ - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - GetScrollInfo(hwnd, SB_VERT, &si); + /* Get the Scroll position */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); - BeginPaint(hwnd, &ps); + BeginPaint(hwnd, &ps); - /* Erase background */ - FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); + /* Erase background */ + FillRect(ps.hdc, &ps.rcPaint, GetStockObject(WHITE_BRUSH)); - /* Draw the text */ - Display_DrawText(ps.hdc, pData, si.nPos); + /* Draw the text */ + Display_DrawText(ps.hdc, pData, si.nPos); - EndPaint(hwnd, &ps); + EndPaint(hwnd, &ps); - return 0; + return 0; } static LRESULT Display_OnSize(HWND hwnd) { - RECT rect; - SCROLLINFO si; - int nOldPos; - - GetClientRect(hwnd, &rect); - - /* Get the old scroll pos */ - si.cbSize = sizeof(si); - si.fMask = SIF_POS; - GetScrollInfo(hwnd, SB_VERT, &si); - nOldPos = si.nPos; - - /* Set the new page size */ - si.fMask = SIF_PAGE; - si.nPage = rect.bottom; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - - /* Get the new scroll pos */ - si.fMask = SIF_POS; - GetScrollInfo(hwnd, SB_VERT, &si); - - /* If they don't match ... */ - if (nOldPos != si.nPos) - { - /* ... scroll the window */ - ScrollWindowEx(hwnd, 0, nOldPos - si.nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); - UpdateWindow(hwnd); - } - - return 0; + RECT rect; + SCROLLINFO si; + int nOldPos; + + GetClientRect(hwnd, &rect); + + /* Get the old scroll pos */ + si.cbSize = sizeof(si); + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + nOldPos = si.nPos; + + /* Set the new page size */ + si.fMask = SIF_PAGE; + si.nPage = rect.bottom; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + + /* Get the new scroll pos */ + si.fMask = SIF_POS; + GetScrollInfo(hwnd, SB_VERT, &si); + + /* If they don't match ... */ + if (nOldPos != si.nPos) + { + /* ... scroll the window */ + ScrollWindowEx(hwnd, 0, nOldPos - si.nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); + UpdateWindow(hwnd); + } + + return 0; } static LRESULT Display_OnVScroll(HWND hwnd, WPARAM wParam) { - SCROLLINFO si; - int nPos; - - si.cbSize = sizeof(si); - si.fMask = SIF_POS | SIF_RANGE | SIF_TRACKPOS; - GetScrollInfo(hwnd, SB_VERT, &si); - - switch(LOWORD(wParam)) - { - case SB_PAGEUP: - nPos = si.nPos - 50; - break; - case SB_PAGEDOWN: - nPos = si.nPos + 50; - break; - case SB_LINEUP: - nPos = si.nPos - 10; - break; - case SB_LINEDOWN: - nPos = si.nPos + 10; - break; - case SB_THUMBTRACK: - case SB_THUMBPOSITION: - nPos = si.nTrackPos; - break; - default: - nPos = si.nPos; - } - - nPos = max(nPos, si.nMin); - nPos = min(nPos, si.nMax); - if (nPos != si.nPos) - { - ScrollWindowEx(hwnd, 0, si.nPos - nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); - si.cbSize = sizeof(si); - si.nPos = nPos; - si.fMask = SIF_POS; - SetScrollInfo(hwnd, SB_VERT, &si, TRUE); - UpdateWindow(hwnd); - } - - return 0; + SCROLLINFO si; + int nPos; + + si.cbSize = sizeof(si); + si.fMask = SIF_POS | SIF_RANGE | SIF_TRACKPOS; + GetScrollInfo(hwnd, SB_VERT, &si); + + switch(LOWORD(wParam)) + { + case SB_PAGEUP: + nPos = si.nPos - 50; + break; + case SB_PAGEDOWN: + nPos = si.nPos + 50; + break; + case SB_LINEUP: + nPos = si.nPos - 10; + break; + case SB_LINEDOWN: + nPos = si.nPos + 10; + break; + case SB_THUMBTRACK: + case SB_THUMBPOSITION: + nPos = si.nTrackPos; + break; + default: + nPos = si.nPos; + } + + nPos = max(nPos, si.nMin); + nPos = min(nPos, si.nMax); + if (nPos != si.nPos) + { + ScrollWindowEx(hwnd, 0, si.nPos - nPos, NULL, NULL, NULL, NULL, SW_INVALIDATE); + si.cbSize = sizeof(si); + si.nPos = nPos; + si.fMask = SIF_POS; + SetScrollInfo(hwnd, SB_VERT, &si, TRUE); + UpdateWindow(hwnd); + } + + return 0; } static LRESULT Display_OnDestroy(HWND hwnd) { - DISPLAYDATA* pData; - int i; + DISPLAYDATA* pData; + int i; - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); - /* Delete the fonts */ - DeleteObject(pData->hCaptionFont); - DeleteObject(pData->hCharSetFont); - DeleteObject(pData->hSizeFont); + /* Delete the fonts */ + DeleteObject(pData->hCaptionFont); + DeleteObject(pData->hCharSetFont); + DeleteObject(pData->hSizeFont); - for (i = 0; i < MAX_SIZES; i++) - { - DeleteObject(pData->hFonts[i]); - } + for (i = 0; i < MAX_SIZES; i++) + { + DeleteObject(pData->hFonts[i]); + } - /* Free the data structure */ - free(pData); + /* Free the data structure */ + free(pData); - return 0; + return 0; } LRESULT Display_OnPrint(HWND hwnd) { - PRINTDLG pfont; - TEXTMETRIC tm; - int copies, yPos; - - /* Clears the memory before using it */ - ZeroMemory(&pfont, sizeof(pfont)); - - pfont.lStructSize = sizeof(pfont); - pfont.hwndOwner = hwnd; - pfont.hDevMode = NULL; - pfont.hDevNames = NULL; - pfont.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; - pfont.nCopies = 1; - pfont.nFromPage = 0xFFFF; - pfont.nToPage = 0xFFFF; - pfont.nMinPage = 1; - pfont.nMaxPage = 0xFFFF; - - /* Opens up the print dialog box */ - if (PrintDlg(&pfont)) - { - DOCINFO docinfo; + PRINTDLG pfont; + TEXTMETRIC tm; + int copies, yPos; + + /* Clears the memory before using it */ + ZeroMemory(&pfont, sizeof(pfont)); + + pfont.lStructSize = sizeof(pfont); + pfont.hwndOwner = hwnd; + pfont.hDevMode = NULL; + pfont.hDevNames = NULL; + pfont.Flags = PD_USEDEVMODECOPIESANDCOLLATE | PD_RETURNDC; + pfont.nCopies = 1; + pfont.nFromPage = 0xFFFF; + pfont.nToPage = 0xFFFF; + pfont.nMinPage = 1; + pfont.nMaxPage = 0xFFFF; + + /* Opens up the print dialog box */ + if (PrintDlg(&pfont)) + { + DOCINFO docinfo; #if 0 - DISPLAYDATA* pData; + DISPLAYDATA* pData; - pData = malloc(sizeof(DISPLAYDATA)); - ZeroMemory(pData, sizeof(DISPLAYDATA)); + pData = malloc(sizeof(DISPLAYDATA)); + ZeroMemory(pData, sizeof(DISPLAYDATA)); - /* Sets up the font layout */ - pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); + /* Sets up the font layout */ + pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA); #endif - docinfo.cbSize = sizeof(DOCINFO); - docinfo.lpszDocName = L"Printing Font"; - docinfo.lpszOutput = NULL; - docinfo.lpszDatatype = NULL; - docinfo.fwType = 0; + docinfo.cbSize = sizeof(DOCINFO); + docinfo.lpszDocName = L"Printing Font"; + docinfo.lpszOutput = NULL; + docinfo.lpszDatatype = NULL; + docinfo.fwType = 0; - /* We start printing */ - StartDoc(pfont.hDC, &docinfo); + /* We start printing */ + StartDoc(pfont.hDC, &docinfo); - /* Grabs the text metrics for the printer */ - GetTextMetrics(pfont.hDC, &tm); + /* Grabs the text metrics for the printer */ + GetTextMetrics(pfont.hDC, &tm); - /* Start out with 0 for the y position for the page */ - yPos = 0; + /* Start out with 0 for the y position for the page */ + yPos = 0; - /* Starts out with the current page */ - StartPage(pfont.hDC); + /* Starts out with the current page */ + StartPage(pfont.hDC); - /* Used when printing for more than one copy */ - for (copies = 0; copies < pfont.nCopies; copies++) - { - /* Test output */ - TextOutW(pfont.hDC, 10, yPos, L"Testing...1...2...3", 19); + /* Used when printing for more than one copy */ + for (copies = 0; copies < pfont.nCopies; copies++) + { + /* Test output */ + TextOutW(pfont.hDC, 10, yPos, L"Testing...1...2...3", 19); - /* TODO: Determine if using Display_DrawText() will work for both rendering out to the - window and to the printer output */ + /* TODO: Determine if using Display_DrawText() will work for both rendering out to the + window and to the printer output */ #if 0 - Display_DrawText(pfont.hDC, pData, yPos); + Display_DrawText(pfont.hDC, pData, yPos); #endif - /* Ends the current page */ - EndPage(pfont.hDC); + /* Ends the current page */ + EndPage(pfont.hDC); - /* If we are making more than one copy, start a new page */ - if (copies != pfont.nCopies) - { - yPos = 0; - StartPage(pfont.hDC); - } - } + /* If we are making more than one copy, start a new page */ + if (copies != pfont.nCopies) + { + yPos = 0; + StartPage(pfont.hDC); + } + } - /* The printing is now over */ - EndDoc(pfont.hDC); + /* The printing is now over */ + EndDoc(pfont.hDC); - DeleteDC(pfont.hDC); + DeleteDC(pfont.hDC); #if 0 - /* Frees the memory since we no longer need it for now */ - free(pData); + /* Frees the memory since we no longer need it for now */ + free(pData); #endif - } + } - return 0; + return 0; } LRESULT @@ -542,36 +527,35 @@ Display_GetFullName(HWND hwnd, INT length, PWSTR ptr) LRESULT CALLBACK DisplayProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { - switch (message) - { - case WM_CREATE: - return Display_OnCreate(hwnd); + switch (message) + { + case WM_CREATE: + return Display_OnCreate(hwnd); - case WM_PAINT: - return Display_OnPaint(hwnd); + case WM_PAINT: + return Display_OnPaint(hwnd); - case WM_SIZE: - return Display_OnSize(hwnd); + case WM_SIZE: + return Display_OnSize(hwnd); - case WM_VSCROLL: - return Display_OnVScroll(hwnd, wParam); + case WM_VSCROLL: + return Display_OnVScroll(hwnd, wParam); - case FVM_SETTYPEFACE: - return Display_SetTypeFace(hwnd, (PLOGFONTW)lParam); + case FVM_SETTYPEFACE: + return Display_SetTypeFace(hwnd, (PLOGFONTW)lParam); - case FVM_SETSTRING: - return Display_SetString(hwnd, (WCHAR *)lParam); + case FVM_SETSTRING: + return Display_SetString(hwnd, (WCHAR *)lParam); - case FVM_GETFULLNAME: - return Display_GetFullName(hwnd, (INT)wParam, (PWSTR)lParam); + case FVM_GETFULLNAME: + return Display_GetFullName(hwnd, (INT)wParam, (PWSTR)lParam); - case WM_DESTROY: - return Display_OnDestroy(hwnd); + case WM_DESTROY: + return Display_OnDestroy(hwnd); - default: - return DefWindowProcW(hwnd, message, wParam, lParam); - } + default: + return DefWindowProcW(hwnd, message, wParam, lParam); + } - return 0; + return 0; } - diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c index 1ad824f786d..da6a2bc5d79 100644 --- a/base/applications/fontview/fontview.c +++ b/base/applications/fontview/fontview.c @@ -1,24 +1,9 @@ /* - * fontview - * - * fontview.c - * - * Copyright (C) 2007 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> - * Copyright (C) 2016-2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * PROJECT: ReactOS Font Viewer + * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) + * PURPOSE: Main source file + * COPYRIGHT: Copyright 2007 Timo Kreuzer <timo.kreuzer(a)reactos.org> + * Copyright 2016-2017 Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> */ #include "precomp.h" @@ -47,50 +32,50 @@ BOOL WINAPI GetFontResourceInfoW(LPCWSTR lpFileName, DWORD *pdwBufSize, void* lp DWORD FormatString( - DWORD dwFlags, - HINSTANCE hInstance, - DWORD dwStringId, - DWORD dwLanguageId, - LPWSTR lpBuffer, - DWORD nSize, - va_list* Arguments + DWORD dwFlags, + HINSTANCE hInstance, + DWORD dwStringId, + DWORD dwLanguageId, + LPWSTR lpBuffer, + DWORD nSize, + va_list* Arguments ) { - DWORD dwRet; - int len; - WCHAR Buffer[1000]; - - len = LoadStringW(hInstance, dwStringId, (LPWSTR)Buffer, 1000); - - if (len) - { - dwFlags |= FORMAT_MESSAGE_FROM_STRING; - dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM); - dwRet = FormatMessageW(dwFlags, Buffer, 0, dwLanguageId, lpBuffer, nSize, Arguments); - return dwRet; - } - return 0; + DWORD dwRet; + int len; + WCHAR Buffer[1000]; + + len = LoadStringW(hInstance, dwStringId, (LPWSTR)Buffer, 1000); + + if (len) + { + dwFlags |= FORMAT_MESSAGE_FROM_STRING; + dwFlags &= ~(FORMAT_MESSAGE_FROM_HMODULE | FORMAT_MESSAGE_FROM_SYSTEM); + dwRet = FormatMessageW(dwFlags, Buffer, 0, dwLanguageId, lpBuffer, nSize, Arguments); + return dwRet; + } + return 0; } static void ErrorMsgBox(HWND hParent, DWORD dwMessageId, ...) { - HLOCAL hMemCaption = NULL; - HLOCAL hMemText = NULL; - va_list args; + HLOCAL hMemCaption = NULL; + HLOCAL hMemText = NULL; + va_list args; - va_start(args, dwMessageId); - FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); - va_end(args); + va_start(args, dwMessageId); + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); + va_end(args); - FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, IDS_ERROR, 0, (LPWSTR)&hMemCaption, 0, NULL); + FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, + NULL, IDS_ERROR, 0, (LPWSTR)&hMemCaption, 0, NULL); - MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); + MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR); - LocalFree(hMemCaption); - LocalFree(hMemText); + LocalFree(hMemCaption); + LocalFree(hMemText); } int WINAPI @@ -99,14 +84,14 @@ wWinMain(HINSTANCE hThisInstance, LPWSTR lpCmdLine, int nCmdShow) { - int argc; - INT i; - WCHAR** argv; - DWORD dwSize; - HWND hMainWnd; - MSG msg; - WNDCLASSEXW wincl; - LPCWSTR fileName; + int argc; + INT i; + WCHAR** argv; + DWORD dwSize; + HWND hMainWnd; + MSG msg; + WNDCLASSEXW wincl; + LPCWSTR fileName; switch (GetUserDefaultUILanguage()) { @@ -118,48 +103,48 @@ wWinMain(HINSTANCE hThisInstance, break; } - g_hInstance = hThisInstance; + g_hInstance = hThisInstance; - /* Get unicode command line */ - argv = CommandLineToArgvW(GetCommandLineW(), &argc); - if (argc < 2) - { + /* Get unicode command line */ + argv = CommandLineToArgvW(GetCommandLineW(), &argc); + if (argc < 2) + { #if 0 - WCHAR szFileName[MAX_PATH] = L""; - OPENFILENAMEW fontOpen; + WCHAR szFileName[MAX_PATH] = L""; + OPENFILENAMEW fontOpen; WCHAR filter[MAX_PATH*2] = {0}, dialogTitle[MAX_PATH]; - LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle)); - LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter) - 1); - - /* Clears out any values of fontOpen before we use it */ - ZeroMemory(&fontOpen, sizeof(fontOpen)); - - /* Sets up the open dialog box */ - fontOpen.lStructSize = sizeof(fontOpen); - fontOpen.hwndOwner = NULL; - fontOpen.lpstrFilter = filter; - fontOpen.lpstrFile = szFileName; - fontOpen.lpstrTitle = dialogTitle; - fontOpen.nMaxFile = MAX_PATH; - fontOpen.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; - fontOpen.lpstrDefExt = L"ttf"; - - /* Opens up the Open File dialog box in order to chose a font file. */ - if(GetOpenFileNameW(&fontOpen)) - { - fileName = fontOpen.lpstrFile; - g_fileName = fileName; - } else { - /* If the user decides to close out of the open dialog effectively - exiting the program altogether */ - return 0; - } + LoadStringW(NULL, IDS_OPEN, dialogTitle, ARRAYSIZE(dialogTitle)); + LoadStringW(NULL, IDS_FILTER_LIST, filter, ARRAYSIZE(filter) - 1); + + /* Clears out any values of fontOpen before we use it */ + ZeroMemory(&fontOpen, sizeof(fontOpen)); + + /* Sets up the open dialog box */ + fontOpen.lStructSize = sizeof(fontOpen); + fontOpen.hwndOwner = NULL; + fontOpen.lpstrFilter = filter; + fontOpen.lpstrFile = szFileName; + fontOpen.lpstrTitle = dialogTitle; + fontOpen.nMaxFile = MAX_PATH; + fontOpen.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + fontOpen.lpstrDefExt = L"ttf"; + + /* Opens up the Open File dialog box in order to chose a font file. */ + if(GetOpenFileNameW(&fontOpen)) + { + fileName = fontOpen.lpstrFile; + g_fileName = fileName; + } else { + /* If the user decides to close out of the open dialog effectively + exiting the program altogether */ + return 0; + } #endif - } - else - { - /* Try to add the font resource from command line */ + } + else + { + /* Try to add the font resource from command line */ for (i = 1; i < argc; ++i) { // Treat the last argument as filename @@ -189,269 +174,269 @@ wWinMain(HINSTANCE hThisInstance, fileName = argv[i]; } } - g_fileName = fileName; - } - - if (!AddFontResourceW(g_fileName)) - { - ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); - return -1; - } - - /* Get the font name */ - dwSize = sizeof(g_LogFonts); - ZeroMemory(g_LogFonts, sizeof(g_LogFonts)); - if (!GetFontResourceInfoW(fileName, &dwSize, g_LogFonts, 2)) - { - ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); - return -1; - } - g_NumFonts = 0; - for (i = 0; i < ARRAYSIZE(g_LogFonts); ++i) - { - if (g_LogFonts[i].lfFaceName[0] == 0) - break; - - ++g_NumFonts; - } - if (g_NumFonts == 0) - { - ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); - return -1; - } - - /* get font title */ - dwSize = sizeof(g_FontTitle); - ZeroMemory(g_FontTitle, sizeof(g_FontTitle)); - GetFontResourceInfoW(fileName, &dwSize, g_FontTitle, 1); - - if (!Display_InitClass(hThisInstance)) - { - ErrorMsgBox(0, IDS_ERROR_NOCLASS); - return -1; - } - - /* The main window class */ - wincl.cbSize = sizeof (WNDCLASSEXW); - wincl.style = CS_DBLCLKS; - wincl.lpfnWndProc = MainWndProc; - wincl.cbClsExtra = 0; - wincl.cbWndExtra = 0; - wincl.hInstance = hThisInstance; - wincl.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); - wincl.hCursor = LoadCursor (NULL, IDC_ARROW); - wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND; - wincl.lpszMenuName = NULL; - wincl.lpszClassName = g_szFontViewClassName; - wincl.hIconSm = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); - - /* Register the window class, and if it fails quit the program */ - if (!RegisterClassExW (&wincl)) - { - ErrorMsgBox(0, IDS_ERROR_NOCLASS); - return 0; - } - - /* The class is registered, let's create the main window */ - hMainWnd = CreateWindowExW( - 0, /* Extended possibilities for variation */ - g_szFontViewClassName, /* Classname */ - g_FontTitle, /* Title Text */ - WS_OVERLAPPEDWINDOW, /* default window */ - CW_USEDEFAULT, /* Windows decides the position */ - CW_USEDEFAULT, /* where the window ends up on the screen */ - 544, /* The programs width */ - 375, /* and height in pixels */ - HWND_DESKTOP, /* The window is a child-window to desktop */ - NULL, /* No menu */ - hThisInstance, /* Program Instance handler */ - NULL /* No Window Creation data */ - ); - ShowWindow(hMainWnd, nCmdShow); - - /* Main message loop */ - while (GetMessage (&msg, NULL, 0, 0)) - { - if (IsDialogMessage(hMainWnd, &msg)) - continue; - TranslateMessage(&msg); - DispatchMessage(&msg); - } - - RemoveFontResourceW(argv[1]); - - return (int)msg.wParam; + g_fileName = fileName; + } + + if (!AddFontResourceW(g_fileName)) + { + ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); + return -1; + } + + /* Get the font name */ + dwSize = sizeof(g_LogFonts); + ZeroMemory(g_LogFonts, sizeof(g_LogFonts)); + if (!GetFontResourceInfoW(fileName, &dwSize, g_LogFonts, 2)) + { + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); + return -1; + } + g_NumFonts = 0; + for (i = 0; i < ARRAYSIZE(g_LogFonts); ++i) + { + if (g_LogFonts[i].lfFaceName[0] == 0) + break; + + ++g_NumFonts; + } + if (g_NumFonts == 0) + { + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); + return -1; + } + + /* get font title */ + dwSize = sizeof(g_FontTitle); + ZeroMemory(g_FontTitle, sizeof(g_FontTitle)); + GetFontResourceInfoW(fileName, &dwSize, g_FontTitle, 1); + + if (!Display_InitClass(hThisInstance)) + { + ErrorMsgBox(0, IDS_ERROR_NOCLASS); + return -1; + } + + /* The main window class */ + wincl.cbSize = sizeof (WNDCLASSEXW); + wincl.style = CS_DBLCLKS; + wincl.lpfnWndProc = MainWndProc; + wincl.cbClsExtra = 0; + wincl.cbWndExtra = 0; + wincl.hInstance = hThisInstance; + wincl.hIcon = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); + wincl.hCursor = LoadCursor (NULL, IDC_ARROW); + wincl.hbrBackground = (HBRUSH)COLOR_BACKGROUND; + wincl.lpszMenuName = NULL; + wincl.lpszClassName = g_szFontViewClassName; + wincl.hIconSm = LoadIcon (GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TT)); + + /* Register the window class, and if it fails quit the program */ + if (!RegisterClassExW (&wincl)) + { + ErrorMsgBox(0, IDS_ERROR_NOCLASS); + return 0; + } + + /* The class is registered, let's create the main window */ + hMainWnd = CreateWindowExW( + 0, /* Extended possibilities for variation */ + g_szFontViewClassName, /* Classname */ + g_FontTitle, /* Title Text */ + WS_OVERLAPPEDWINDOW, /* default window */ + CW_USEDEFAULT, /* Windows decides the position */ + CW_USEDEFAULT, /* where the window ends up on the screen */ + 544, /* The programs width */ + 375, /* and height in pixels */ + HWND_DESKTOP, /* The window is a child-window to desktop */ + NULL, /* No menu */ + hThisInstance, /* Program Instance handler */ + NULL /* No Window Creation data */ + ); + ShowWindow(hMainWnd, nCmdShow); + + /* Main message loop */ + while (GetMessage (&msg, NULL, 0, 0)) + { + if (IsDialogMessage(hMainWnd, &msg)) + continue; + TranslateMessage(&msg); + DispatchMessage(&msg); + } + + RemoveFontResourceW(argv[1]); + + return (int)msg.wParam; } static LRESULT MainWnd_OnCreate(HWND hwnd) { - WCHAR szQuit[MAX_BUTTONNAME]; - WCHAR szPrint[MAX_BUTTONNAME]; - WCHAR szString[MAX_STRING]; - WCHAR szPrevious[MAX_STRING]; - WCHAR szNext[MAX_STRING]; - HWND hDisplay, hButtonInstall, hButtonPrint, hButtonPrev, hButtonNext; - - /* create the display window */ - hDisplay = CreateWindowExW( - 0, /* Extended style */ - g_szFontDisplayClassName, /* Classname */ - L"", /* Title text */ - WS_CHILD | WS_VSCROLL, /* Window style */ - 0, /* X-pos */ - HEADER_SIZE, /* Y-Pos */ - 550, /* Width */ - 370-HEADER_SIZE, /* Height */ - hwnd, /* Parent */ - (HMENU)IDC_DISPLAY, /* Identifier */ - g_hInstance, /* Program Instance handler */ - NULL /* Window Creation data */ - ); - - LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); - SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); - - /* Create the install button */ - LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME); - hButtonInstall = CreateWindowExW( - 0, /* Extended style */ - L"button", /* Classname */ - szQuit, /* Title text */ - WS_CHILD | WS_VISIBLE, /* Window style */ - BUTTON_POS_X, /* X-pos */ - BUTTON_POS_Y, /* Y-Pos */ - BUTTON_WIDTH, /* Width */ - BUTTON_HEIGHT, /* Height */ - hwnd, /* Parent */ - (HMENU)IDC_INSTALL, /* Identifier */ - g_hInstance, /* Program Instance handler */ - NULL /* Window Creation data */ - ); - SendMessage(hButtonInstall, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + WCHAR szQuit[MAX_BUTTONNAME]; + WCHAR szPrint[MAX_BUTTONNAME]; + WCHAR szString[MAX_STRING]; + WCHAR szPrevious[MAX_STRING]; + WCHAR szNext[MAX_STRING]; + HWND hDisplay, hButtonInstall, hButtonPrint, hButtonPrev, hButtonNext; + + /* create the display window */ + hDisplay = CreateWindowExW( + 0, /* Extended style */ + g_szFontDisplayClassName, /* Classname */ + L"", /* Title text */ + WS_CHILD | WS_VSCROLL, /* Window style */ + 0, /* X-pos */ + HEADER_SIZE, /* Y-Pos */ + 550, /* Width */ + 370-HEADER_SIZE, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_DISPLAY, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + + LoadStringW(g_hInstance, IDS_STRING, szString, MAX_STRING); + SendMessage(hDisplay, FVM_SETSTRING, 0, (LPARAM)szString); + + /* Create the install button */ + LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME); + hButtonInstall = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szQuit, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + BUTTON_POS_X, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_INSTALL, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonInstall, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); EnableWindow(hButtonInstall, !g_DisableInstall); - /* Create the print button */ - LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME); - hButtonPrint = CreateWindowExW( - 0, /* Extended style */ - L"button", /* Classname */ - szPrint, /* Title text */ - WS_CHILD | WS_VISIBLE, /* Window style */ - 450, /* X-pos */ - BUTTON_POS_Y, /* Y-Pos */ - BUTTON_WIDTH, /* Width */ - BUTTON_HEIGHT, /* Height */ - hwnd, /* Parent */ - (HMENU)IDC_PRINT, /* Identifier */ - g_hInstance, /* Program Instance handler */ - NULL /* Window Creation data */ - ); - SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); - - /* Create the previous button */ - LoadStringW(g_hInstance, IDS_PREVIOUS, szPrevious, MAX_BUTTONNAME); - hButtonPrev = CreateWindowExW( - 0, /* Extended style */ - L"button", /* Classname */ - szPrevious, /* Title text */ - WS_CHILD | WS_VISIBLE, /* Window style */ - 450, /* X-pos */ - BUTTON_POS_Y, /* Y-Pos */ - BUTTON_WIDTH, /* Width */ - BUTTON_HEIGHT, /* Height */ - hwnd, /* Parent */ - (HMENU)IDC_PREV, /* Identifier */ - g_hInstance, /* Program Instance handler */ - NULL /* Window Creation data */ - ); - SendMessage(hButtonPrev, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); - - /* Create the next button */ - LoadStringW(g_hInstance, IDS_NEXT, szNext, MAX_BUTTONNAME); - hButtonNext = CreateWindowExW( - 0, /* Extended style */ - L"button", /* Classname */ - szNext, /* Title text */ - WS_CHILD | WS_VISIBLE, /* Window style */ - 450, /* X-pos */ - BUTTON_POS_Y, /* Y-Pos */ - BUTTON_WIDTH, /* Width */ - BUTTON_HEIGHT, /* Height */ - hwnd, /* Parent */ - (HMENU)IDC_NEXT, /* Identifier */ - g_hInstance, /* Program Instance handler */ - NULL /* Window Creation data */ - ); - SendMessage(hButtonNext, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); - - EnableWindow(hButtonPrev, FALSE); - if (g_NumFonts <= 1) - EnableWindow(hButtonNext, FALSE); - - /* Init the display window with the font name */ - g_FontIndex = 0; - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); - ShowWindow(hDisplay, SW_SHOWNORMAL); - - if (g_FontPrint) - PostMessage(hwnd, WM_COMMAND, IDC_PRINT, 0); - - return 0; + /* Create the print button */ + LoadStringW(g_hInstance, IDS_PRINT, szPrint, MAX_BUTTONNAME); + hButtonPrint = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szPrint, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + 450, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_PRINT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonPrint, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + /* Create the previous button */ + LoadStringW(g_hInstance, IDS_PREVIOUS, szPrevious, MAX_BUTTONNAME); + hButtonPrev = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szPrevious, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + 450, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_PREV, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonPrev, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + /* Create the next button */ + LoadStringW(g_hInstance, IDS_NEXT, szNext, MAX_BUTTONNAME); + hButtonNext = CreateWindowExW( + 0, /* Extended style */ + L"button", /* Classname */ + szNext, /* Title text */ + WS_CHILD | WS_VISIBLE, /* Window style */ + 450, /* X-pos */ + BUTTON_POS_Y, /* Y-Pos */ + BUTTON_WIDTH, /* Width */ + BUTTON_HEIGHT, /* Height */ + hwnd, /* Parent */ + (HMENU)IDC_NEXT, /* Identifier */ + g_hInstance, /* Program Instance handler */ + NULL /* Window Creation data */ + ); + SendMessage(hButtonNext, WM_SETFONT, (WPARAM)GetStockObject(DEFAULT_GUI_FONT), (LPARAM)TRUE); + + EnableWindow(hButtonPrev, FALSE); + if (g_NumFonts <= 1) + EnableWindow(hButtonNext, FALSE); + + /* Init the display window with the font name */ + g_FontIndex = 0; + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); + ShowWindow(hDisplay, SW_SHOWNORMAL); + + if (g_FontPrint) + PostMessage(hwnd, WM_COMMAND, IDC_PRINT, 0); + + return 0; } static LRESULT MainWnd_OnSize(HWND hwnd) { - RECT rc; - HWND hInstall, hPrint, hPrev, hNext, hDisplay; - HDWP hDWP; + RECT rc; + HWND hInstall, hPrint, hPrev, hNext, hDisplay; + HDWP hDWP; - GetClientRect(hwnd, &rc); + GetClientRect(hwnd, &rc); - hDWP = BeginDeferWindowPos(5); + hDWP = BeginDeferWindowPos(5); - hInstall = GetDlgItem(hwnd, IDC_INSTALL); - if (hDWP) - hDWP = DeferWindowPos(hDWP, hInstall, NULL, BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); + hInstall = GetDlgItem(hwnd, IDC_INSTALL); + if (hDWP) + hDWP = DeferWindowPos(hDWP, hInstall, NULL, BUTTON_POS_X, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); - hPrint = GetDlgItem(hwnd, IDC_PRINT); - if (hDWP) - hDWP = DeferWindowPos(hDWP, hPrint, NULL, BUTTON_POS_X + BUTTON_WIDTH + BUTTON_PADDING, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); + hPrint = GetDlgItem(hwnd, IDC_PRINT); + if (hDWP) + hDWP = DeferWindowPos(hDWP, hPrint, NULL, BUTTON_POS_X + BUTTON_WIDTH + BUTTON_PADDING, BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); - hPrev = GetDlgItem(hwnd, IDC_PREV); - if (hDWP) - hDWP = DeferWindowPos(hDWP, hPrev, NULL, rc.right - (BUTTON_WIDTH * 2 + BUTTON_PADDING + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); + hPrev = GetDlgItem(hwnd, IDC_PREV); + if (hDWP) + hDWP = DeferWindowPos(hDWP, hPrev, NULL, rc.right - (BUTTON_WIDTH * 2 + BUTTON_PADDING + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); - hNext = GetDlgItem(hwnd, IDC_NEXT); - if (hDWP) - hDWP = DeferWindowPos(hDWP, hNext, NULL, rc.right - (BUTTON_WIDTH + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); + hNext = GetDlgItem(hwnd, IDC_NEXT); + if (hDWP) + hDWP = DeferWindowPos(hDWP, hNext, NULL, rc.right - (BUTTON_WIDTH + BUTTON_POS_X), BUTTON_POS_Y, BUTTON_WIDTH, BUTTON_HEIGHT, SWP_NOZORDER); - hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); - if (hDWP) - hDWP = DeferWindowPos(hDWP, hDisplay, NULL, 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, SWP_NOZORDER); + hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); + if (hDWP) + hDWP = DeferWindowPos(hDWP, hDisplay, NULL, 0, HEADER_SIZE, rc.right, rc.bottom - HEADER_SIZE, SWP_NOZORDER); - EndDeferWindowPos(hDWP); + EndDeferWindowPos(hDWP); - InvalidateRect(hwnd, NULL, TRUE); + InvalidateRect(hwnd, NULL, TRUE); - return 0; + return 0; } static LRESULT MainWnd_OnPaint(HWND hwnd) { - HDC hDC; - PAINTSTRUCT ps; - RECT rc; - - hDC = BeginPaint(hwnd, &ps); - GetClientRect(hwnd, &rc); - rc.top = HEADER_SIZE - 2; - rc.bottom = HEADER_SIZE; - FillRect(hDC, &rc, GetStockObject(GRAY_BRUSH)); - EndPaint(hwnd, &ps); - return 0; + HDC hDC; + PAINTSTRUCT ps; + RECT rc; + + hDC = BeginPaint(hwnd, &ps); + GetClientRect(hwnd, &rc); + rc.top = HEADER_SIZE - 2; + rc.bottom = HEADER_SIZE; + FillRect(hDC, &rc, GetStockObject(GRAY_BRUSH)); + EndPaint(hwnd, &ps); + return 0; } static LRESULT @@ -542,37 +527,37 @@ MainWnd_OnInstall(HWND hwnd) static LRESULT MainWnd_OnPrev(HWND hwnd) { - HWND hDisplay; - if (g_FontIndex > 0) - { - --g_FontIndex; - EnableWindow(GetDlgItem(hwnd, IDC_NEXT), TRUE); - if (g_FontIndex == 0) - EnableWindow(GetDlgItem(hwnd, IDC_PREV), FALSE); - - hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); - InvalidateRect(hDisplay, NULL, TRUE); - } - return 0; + HWND hDisplay; + if (g_FontIndex > 0) + { + --g_FontIndex; + EnableWindow(GetDlgItem(hwnd, IDC_NEXT), TRUE); + if (g_FontIndex == 0) + EnableWindow(GetDlgItem(hwnd, IDC_PREV), FALSE); + + hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); + InvalidateRect(hDisplay, NULL, TRUE); + } + return 0; } static LRESULT MainWnd_OnNext(HWND hwnd) { - HWND hDisplay; - if (g_FontIndex + 1 < g_NumFonts) - { - ++g_FontIndex; - EnableWindow(GetDlgItem(hwnd, IDC_PREV), TRUE); - if (g_FontIndex == g_NumFonts - 1) - EnableWindow(GetDlgItem(hwnd, IDC_NEXT), FALSE); - - hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); - SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); - InvalidateRect(hDisplay, NULL, TRUE); - } - return 0; + HWND hDisplay; + if (g_FontIndex + 1 < g_NumFonts) + { + ++g_FontIndex; + EnableWindow(GetDlgItem(hwnd, IDC_PREV), TRUE); + if (g_FontIndex == g_NumFonts - 1) + EnableWindow(GetDlgItem(hwnd, IDC_NEXT), FALSE); + + hDisplay = GetDlgItem(hwnd, IDC_DISPLAY); + SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_LogFonts[g_FontIndex]); + InvalidateRect(hDisplay, NULL, TRUE); + } + return 0; } LRESULT CALLBACK @@ -580,41 +565,39 @@ MainWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { switch (message) { - case WM_CREATE: - return MainWnd_OnCreate(hwnd); + case WM_CREATE: + return MainWnd_OnCreate(hwnd); - case WM_PAINT: - return MainWnd_OnPaint(hwnd); + case WM_PAINT: + return MainWnd_OnPaint(hwnd); - case WM_SIZE: - return MainWnd_OnSize(hwnd); + case WM_SIZE: + return MainWnd_OnSize(hwnd); - case WM_COMMAND: - switch(LOWORD(wParam)) - { - case IDC_INSTALL: - return MainWnd_OnInstall(hwnd); + case WM_COMMAND: + switch(LOWORD(wParam)) + { + case IDC_INSTALL: + return MainWnd_OnInstall(hwnd); - case IDC_PRINT: - return Display_OnPrint(hwnd); + case IDC_PRINT: + return Display_OnPrint(hwnd); - case IDC_PREV: - return MainWnd_OnPrev(hwnd); + case IDC_PREV: + return MainWnd_OnPrev(hwnd); - case IDC_NEXT: - return MainWnd_OnNext(hwnd); - } - break; + case IDC_NEXT: + return MainWnd_OnNext(hwnd); + } + break; - case WM_DESTROY: - PostQuitMessage (0); /* send a WM_QUIT to the message queue */ - break; + case WM_DESTROY: + PostQuitMessage (0); /* send a WM_QUIT to the message queue */ + break; - default: /* for messages that we don't deal with */ - return DefWindowProcW(hwnd, message, wParam, lParam); - } + default: /* for messages that we don't deal with */ + return DefWindowProcW(hwnd, message, wParam, lParam); + } - return 0; + return 0; } - -/* EOF */

1 year, 6 months

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2023