Ros-diffs

ros-diffs@reactos.org

20 participants
81109 discussions

[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, 7 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, 7 months

[reactos] 01/01: [MSPAINT] s/HasUndoSteps/CanUndo/ and s/HasRedoSteps/CanRedo/

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fa4c3bd560802d4e7d455… commit fa4c3bd560802d4e7d4553c4625dbaf404086aed Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 18:24:42 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 18:24:42 2023 +0900 [MSPAINT] s/HasUndoSteps/CanUndo/ and s/HasRedoSteps/CanRedo/ CORE-18867 --- base/applications/mspaint/history.cpp | 4 ++-- base/applications/mspaint/history.h | 4 ++-- base/applications/mspaint/winproc.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/applications/mspaint/history.cpp b/base/applications/mspaint/history.cpp index 5be421fdfa0..4220bae84bd 100644 --- a/base/applications/mspaint/history.cpp +++ b/base/applications/mspaint/history.cpp @@ -176,12 +176,12 @@ BOOL ImageModel::IsImageSaved() const return imageSaved; } -BOOL ImageModel::HasUndoSteps() const +BOOL ImageModel::CanUndo() const { return undoSteps > 0; } -BOOL ImageModel::HasRedoSteps() const +BOOL ImageModel::CanRedo() const { return redoSteps > 0; } diff --git a/base/applications/mspaint/history.h b/base/applications/mspaint/history.h index 40792f8d661..d7a65f9e892 100644 --- a/base/applications/mspaint/history.h +++ b/base/applications/mspaint/history.h @@ -34,8 +34,8 @@ public: void Crop(int nWidth, int nHeight, int nOffsetX = 0, int nOffsetY = 0); void SaveImage(LPTSTR lpFileName); BOOL IsImageSaved() const; - BOOL HasUndoSteps() const; - BOOL HasRedoSteps() 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; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 087c50fd76e..c1deaa155bc 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -431,8 +431,8 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO ProcessFileMenu((HMENU)wParam); break; case 1: /* Edit menu */ - EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.HasUndoSteps())); - EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.HasRedoSteps())); + EnableMenuItem(menu, IDM_EDITUNDO, ENABLED_IF(imageModel.CanUndo())); + EnableMenuItem(menu, IDM_EDITREDO, ENABLED_IF(imageModel.CanRedo())); EnableMenuItem(menu, IDM_EDITCUT, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITCOPY, ENABLED_IF(trueSelection)); EnableMenuItem(menu, IDM_EDITDELETESELECTION, ENABLED_IF(trueSelection));

1 year, 7 months

[reactos] 01/01: [MSPAINT] Move selection by arrow keys (#5334)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1a886073876781c410fb2… commit 1a886073876781c410fb2e815a3528a1430b852b Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 16:31:18 2023 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 16:31:18 2023 +0900 [MSPAINT] Move selection by arrow keys (#5334) Improve keyboard usability. - Add CCanvasWindow::MoveSelection. - Modify CMainWindow::OnKeyDown. - If Esc key is pressed, then the selection will land to canvas. - If any arrow key is pressed, then the selection will move a bit. CORE-18867 --- base/applications/mspaint/canvas.cpp | 10 +++++++++ base/applications/mspaint/canvas.h | 1 + base/applications/mspaint/winproc.cpp | 38 +++++++++++++++++++++++++++-------- 3 files changed, 41 insertions(+), 8 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index a6aa9b461f9..b83a692ab7c 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -777,6 +777,16 @@ VOID CCanvasWindow::EndSelectionDrag(POINT ptImage) Invalidate(FALSE); } +VOID CCanvasWindow::MoveSelection(INT xDelta, INT yDelta) +{ + if (!selectionModel.m_bShow) + return; + + selectionModel.TakeOff(); + ::OffsetRect(&selectionModel.m_rc, xDelta, yDelta); + Invalidate(FALSE); +} + LRESULT CCanvasWindow::OnCtlColorEdit(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { SetTextColor((HDC)wParam, paletteModel.GetFgColor()); diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index a201bdc2c7a..53d5fa1acc1 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -48,6 +48,7 @@ public: VOID CanvasToImage(POINT& pt, BOOL bZoomed = FALSE); VOID CanvasToImage(RECT& rc, BOOL bZoomed = FALSE); VOID GetImageRect(RECT& rc); + VOID MoveSelection(INT xDelta, INT yDelta); protected: CANVAS_HITTEST m_hitSelection; diff --git a/base/applications/mspaint/winproc.cpp b/base/applications/mspaint/winproc.cpp index 857eedd81ae..087c50fd76e 100644 --- a/base/applications/mspaint/winproc.cpp +++ b/base/applications/mspaint/winproc.cpp @@ -493,17 +493,39 @@ LRESULT CMainWindow::OnGetMinMaxInfo(UINT nMsg, WPARAM wParam, LPARAM lParam, BO LRESULT CMainWindow::OnKeyDown(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - if (wParam == VK_ESCAPE) + HWND hwndCapture; + switch (wParam) { - HWND hwndCapture = GetCapture(); - if (hwndCapture) - { - if (canvasWindow.m_hWnd == hwndCapture || - fullscreenWindow.m_hWnd == hwndCapture) + case VK_ESCAPE: + hwndCapture = GetCapture(); + if (hwndCapture) + { + if (canvasWindow.m_hWnd == hwndCapture || + fullscreenWindow.m_hWnd == hwndCapture) + { + SendMessage(hwndCapture, nMsg, wParam, lParam); + } + } + else if (selectionModel.m_bShow) { - SendMessage(hwndCapture, nMsg, wParam, lParam); + selectionModel.Landing(); + selectionModel.m_bShow = FALSE; + canvasWindow.Invalidate(FALSE); } - } + break; + + case VK_LEFT: + canvasWindow.MoveSelection(-1, 0); + break; + case VK_RIGHT: + canvasWindow.MoveSelection(+1, 0); + break; + case VK_UP: + canvasWindow.MoveSelection(0, -1); + break; + case VK_DOWN: + canvasWindow.MoveSelection(0, +1); + break; } return 0; }

1 year, 7 months

[reactos] 01/01: [MSPAINT] Set CC_RGBINIT to CMainWindow::ChooseColor

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0087ea65977dbefab1755… commit 0087ea65977dbefab17551799c740537a6588c31 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 15:47:41 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 15:51:52 2023 +0900 [MSPAINT] Set CC_RGBINIT to CMainWindow::ChooseColor It had failed to set initial color. CORE-18867 --- base/applications/mspaint/main.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/base/applications/mspaint/main.cpp b/base/applications/mspaint/main.cpp index 971bfbba622..8d328de1e84 100644 --- a/base/applications/mspaint/main.cpp +++ b/base/applications/mspaint/main.cpp @@ -159,6 +159,7 @@ BOOL CMainWindow::ChooseColor(IN OUT COLORREF *prgbColor) choosecolor.lpCustColors = custColors; } + choosecolor.Flags = CC_RGBINIT; choosecolor.rgbResult = *prgbColor; if (!::ChooseColor(&choosecolor)) return FALSE;

1 year, 7 months

[reactos] 01/01: [MSPAINT] Scrolled canvas has defects in dragging a selection

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cb245ff7119466d05d000… commit cb245ff7119466d05d000343ac6a3c0db996b3a1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 14:57:59 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 14:57:59 2023 +0900 [MSPAINT] Scrolled canvas has defects in dragging a selection CORE-18990, CORE-18867 --- base/applications/mspaint/canvas.cpp | 18 +++++++++--------- base/applications/mspaint/canvas.h | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index e6977e3c2c0..a6aa9b461f9 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -258,7 +258,7 @@ LRESULT CCanvasWindow::OnLRButtonDown(BOOL bLeftButton, UINT nMsg, WPARAM wParam { if (bLeftButton) { - UnZoomed(pt); + CanvasToImage(pt); StartSelectionDrag(hitSelection, pt); } return 0; @@ -741,7 +741,7 @@ VOID CCanvasWindow::finishDrawing() Invalidate(FALSE); } -CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptZoomed) +CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptImage) { if (!selectionModel.m_bShow) return HIT_NONE; @@ -751,28 +751,28 @@ CANVAS_HITTEST CCanvasWindow::SelectionHitTest(POINT ptZoomed) ::OffsetRect(&rcSelection, GRIP_SIZE - GetScrollPos(SB_HORZ), GRIP_SIZE - GetScrollPos(SB_VERT)); ::InflateRect(&rcSelection, GRIP_SIZE, GRIP_SIZE); - return getSizeBoxHitTest(ptZoomed, &rcSelection); + return getSizeBoxHitTest(ptImage, &rcSelection); } -VOID CCanvasWindow::StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed) +VOID CCanvasWindow::StartSelectionDrag(CANVAS_HITTEST hit, POINT ptImage) { m_hitSelection = hit; - selectionModel.m_ptHit = ptUnZoomed; + selectionModel.m_ptHit = ptImage; selectionModel.TakeOff(); SetCapture(); Invalidate(FALSE); } -VOID CCanvasWindow::SelectionDragging(POINT ptUnZoomed) +VOID CCanvasWindow::SelectionDragging(POINT ptImage) { - selectionModel.Dragging(m_hitSelection, ptUnZoomed); + selectionModel.Dragging(m_hitSelection, ptImage); Invalidate(FALSE); } -VOID CCanvasWindow::EndSelectionDrag(POINT ptUnZoomed) +VOID CCanvasWindow::EndSelectionDrag(POINT ptImage) { - selectionModel.Dragging(m_hitSelection, ptUnZoomed); + selectionModel.Dragging(m_hitSelection, ptImage); m_hitSelection = HIT_NONE; Invalidate(FALSE); } diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index 4a41652adc0..a201bdc2c7a 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -61,10 +61,10 @@ protected: VOID OnHVScroll(WPARAM wParam, INT fnBar); VOID drawZoomFrame(INT mouseX, INT mouseY); - CANVAS_HITTEST SelectionHitTest(POINT ptZoomed); - VOID StartSelectionDrag(CANVAS_HITTEST hit, POINT ptUnZoomed); - VOID SelectionDragging(POINT ptUnZoomed); - VOID EndSelectionDrag(POINT ptUnZoomed); + CANVAS_HITTEST SelectionHitTest(POINT ptImage); + VOID StartSelectionDrag(CANVAS_HITTEST hit, POINT ptImage); + VOID SelectionDragging(POINT ptImage); + VOID EndSelectionDrag(POINT ptImage); LRESULT OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled); LRESULT OnHScroll(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled);

1 year, 7 months

[reactos] 01/01: [MSPAINT] Follow-up of #5332 (9ff9580)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=62b6859a672765e28df9b… commit 62b6859a672765e28df9b36964ecf549a8aada3d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jun 13 14:18:12 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Tue Jun 13 14:18:12 2023 +0900 [MSPAINT] Follow-up of #5332 (9ff9580) Simplify the epilogue code of CCanvasWindow::OnSetCursor by using bHandle variable. CORE-18867 --- base/applications/mspaint/canvas.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index c9f2ec887ba..e6977e3c2c0 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -668,7 +668,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL } if (selectionModel.m_bShow || !setCursorOnSizeBox(CanvasHitTest(pt))) - ::SetCursor(::LoadCursor(NULL, IDC_ARROW)); + bHandled = FALSE; return 0; }

1 year, 7 months

[reactos] 01/01: [MSPAINT] Fix the type of cursor displayed when overlaying scrollbars (#5332)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ff9580fb0c873bddca8c… commit 9ff9580fb0c873bddca8c29551aad879090dc2d4 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Tue Jun 13 00:01:39 2023 -0400 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jun 13 13:01:39 2023 +0900 [MSPAINT] Fix the type of cursor displayed when overlaying scrollbars (#5332) When the window size is smaller than the image size in both directions, the wrong cursor is displayed when hovering the mouse over the scrollbars. Readjust position for file date and file size objects, to fit all text. CORE-18867 --- base/applications/mspaint/canvas.cpp | 10 ++++++++++ base/applications/mspaint/lang/pt-PT.rc | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/base/applications/mspaint/canvas.cpp b/base/applications/mspaint/canvas.cpp index 38951215c42..c9f2ec887ba 100644 --- a/base/applications/mspaint/canvas.cpp +++ b/base/applications/mspaint/canvas.cpp @@ -621,6 +621,15 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL ::GetCursorPos(&pt); ScreenToClient(&pt); + CRect rcClient; + GetClientRect(&rcClient); + + if (!::PtInRect(&rcClient, pt)) + { + bHandled = FALSE; + return 0; + } + CANVAS_HITTEST hitSelection = SelectionHitTest(pt); if (hitSelection != HIT_NONE) { @@ -632,6 +641,7 @@ LRESULT CCanvasWindow::OnSetCursor(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL CRect rcImage; GetImageRect(rcImage); ImageToCanvas(rcImage); + if (::PtInRect(&rcImage, pt)) { switch (toolsModel.GetActiveTool()) diff --git a/base/applications/mspaint/lang/pt-PT.rc b/base/applications/mspaint/lang/pt-PT.rc index f67a2339464..ef8a793a3c1 100644 --- a/base/applications/mspaint/lang/pt-PT.rc +++ b/base/applications/mspaint/lang/pt-PT.rc @@ -151,9 +151,9 @@ BEGIN LTEXT "Data do ficheiro:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 LTEXT "Tamanho no disco:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 LTEXT "Resolução:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10 - LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10 - LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10 /* This unit must match IDS_PRINTRES */ + LTEXT "não disponível", IDD_ATTRIBUTESTEXT6, 80, 5, 90, 10 + LTEXT "não disponível", IDD_ATTRIBUTESTEXT7, 80, 15, 90, 10 + LTEXT "ppcm", IDD_ATTRIBUTESTEXT8, 80, 25, 90, 10 /* This unit must match IDS_PRINTRES */ GROUPBOX "Unidades", IDD_ATTRIBUTESGROUP1, 6, 57, 158, 27 AUTORADIOBUTTON "P&olegadas", IDD_ATTRIBUTESRB1, 12, 69, 45, 10, WS_GROUP AUTORADIOBUTTON "c&m", IDD_ATTRIBUTESRB2, 62, 69, 45, 10

1 year, 7 months

[reactos] 01/01: [MMSYS] Use PWSTR instead of PWCHAR for string (#5333)

by Thamatip Chitpong

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3da25b73c2ac2ec15e498… commit 3da25b73c2ac2ec15e498ebb55862401ef67f163 Author: Thamatip Chitpong <tangaming123456(a)outlook.com> AuthorDate: Tue Jun 13 02:52:56 2023 +0700 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Jun 12 21:52:56 2023 +0200 [MMSYS] Use PWSTR instead of PWCHAR for string (#5333) Use PWSTR instead of PWCHAR for string Constify some function arguments --- dll/cpl/mmsys/audio.c | 2 +- dll/cpl/mmsys/mmsys.c | 2 +- dll/cpl/mmsys/sounds.c | 40 ++++++++++++++++++++-------------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dll/cpl/mmsys/audio.c b/dll/cpl/mmsys/audio.c index 2841cc2127c..c3bf27bd9f9 100644 --- a/dll/cpl/mmsys/audio.c +++ b/dll/cpl/mmsys/audio.c @@ -162,7 +162,7 @@ InitAudioDlg(HWND hwnd, PGLOBAL_DATA pGlobalData) } VOID -UpdateRegistryString(HWND hwnd, INT ctrl, LPWSTR key, LPWSTR value) +UpdateRegistryString(HWND hwnd, INT ctrl, LPCWSTR key, LPCWSTR value) { HWND hwndCombo = GetDlgItem(hwnd, ctrl); INT CurSel = SendMessageW(hwndCombo, CB_GETCURSEL, 0, 0); diff --git a/dll/cpl/mmsys/mmsys.c b/dll/cpl/mmsys/mmsys.c index bde437eda15..4cd0aa66823 100644 --- a/dll/cpl/mmsys/mmsys.c +++ b/dll/cpl/mmsys/mmsys.c @@ -365,7 +365,7 @@ IsSoftwareBusPnpEnumeratorInstalled() } DWORD -InstallSoftwareBusPnpEnumerator(LPWSTR InfPath, LPCWSTR HardwareIdList) +InstallSoftwareBusPnpEnumerator(LPCWSTR InfPath, LPCWSTR HardwareIdList) { HDEVINFO DeviceInfoSet = INVALID_HANDLE_VALUE; SP_DEVINFO_DATA DeviceInfoData; diff --git a/dll/cpl/mmsys/sounds.c b/dll/cpl/mmsys/sounds.c index cec3e34e273..40b2d09a06b 100644 --- a/dll/cpl/mmsys/sounds.c +++ b/dll/cpl/mmsys/sounds.c @@ -20,9 +20,9 @@ typedef struct _LABEL_MAP { - PWCHAR szName; - PWCHAR szDesc; - PWCHAR szIcon; + PWSTR szName; + PWSTR szDesc; + PWSTR szIcon; struct _APP_MAP *AppMap; struct _LABEL_MAP *Next; } LABEL_MAP, *PLABEL_MAP; @@ -82,7 +82,7 @@ LPWSTR MakeFilter(LPWSTR psz) return psz; } -PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PWCHAR szName) +PLABEL_MAP FindLabel(PGLOBAL_DATA pGlobalData, PAPP_MAP pAppMap, PCWSTR szName) { PLABEL_MAP pMap = pGlobalData->pLabelMap; @@ -172,7 +172,7 @@ FreeLabelMap(PGLOBAL_DATA pGlobalData) } } -PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PWCHAR szName) +PAPP_MAP FindApp(PGLOBAL_DATA pGlobalData, PCWSTR szName) { PAPP_MAP pMap = pGlobalData->pAppMap; @@ -201,7 +201,7 @@ FreeAppMap(PGLOBAL_DATA pGlobalData) } } -PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PWCHAR AppName, PWCHAR LabelName) +PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT pSoundScheme, PCWSTR AppName, PCWSTR LabelName) { PLABEL_CONTEXT pLabelContext; @@ -236,7 +236,7 @@ PLABEL_CONTEXT FindLabelContext(PGLOBAL_DATA pGlobalData, PSOUND_SCHEME_CONTEXT BOOL -LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PWCHAR szSubKey) +LoadEventLabel(PGLOBAL_DATA pGlobalData, HKEY hKey, PCWSTR szSubKey) { HKEY hSubKey; DWORD cbValue; @@ -350,7 +350,7 @@ LoadEventLabels(PGLOBAL_DATA pGlobalData) BOOL -AddSoundProfile(HWND hwndDlg, HKEY hKey, PWCHAR szSubKey, BOOL SetDefault) +AddSoundProfile(HWND hwndDlg, HKEY hKey, PCWSTR szSubKey, BOOL SetDefault) { HKEY hSubKey; WCHAR szValue[MAX_PATH]; @@ -467,7 +467,7 @@ EnumerateSoundProfiles(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey) } -PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PWCHAR szName) +PSOUND_SCHEME_CONTEXT FindSoundProfile(HWND hwndDlg, PCWSTR szName) { LRESULT lCount, lIndex, lResult; PSOUND_SCHEME_CONTEXT pScheme; @@ -533,7 +533,7 @@ FreeSoundProfiles(HWND hwndDlg) } BOOL -ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szProfile, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) +ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szProfile, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP AppMap, PLABEL_MAP LabelMap) { HKEY hSubKey; WCHAR szValue[MAX_PATH]; @@ -594,7 +594,7 @@ ImportSoundLabel(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szPro DWORD -ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLabelName, PWCHAR szAppName, PAPP_MAP pAppMap) +ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szLabelName, PCWSTR szAppName, PAPP_MAP pAppMap) { HKEY hSubKey; DWORD dwNumProfiles; @@ -653,7 +653,7 @@ ImportSoundEntry(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szLab DWORD -ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PWCHAR szAppName) +ImportAppProfile(PGLOBAL_DATA pGlobalData, HWND hwndDlg, HKEY hKey, PCWSTR szAppName) { HKEY hSubKey; WCHAR szDefault[MAX_PATH]; @@ -817,7 +817,7 @@ LoadSoundFiles(HWND hwndDlg) { WCHAR szList[256]; WCHAR szPath[MAX_PATH]; - PWCHAR ptr; + PWSTR ptr; WIN32_FIND_DATAW FileData; HANDLE hFile; LRESULT lResult; @@ -879,7 +879,7 @@ VOID FreeSoundFiles(HWND hwndDlg) { LRESULT lCount, lIndex, lResult; - PWCHAR pSoundPath; + PWSTR pSoundPath; HWND hwndComboBox; hwndComboBox = GetDlgItem(hwndDlg, IDC_SOUND_LIST); @@ -895,7 +895,7 @@ FreeSoundFiles(HWND hwndDlg) continue; } - pSoundPath = (PWCHAR)lResult; + pSoundPath = (PWSTR)lResult; free(pSoundPath); } } @@ -1433,7 +1433,7 @@ SoundsDlgProc(HWND hwndDlg, break; } - if (_wcsicmp(pLabelContext->szValue, (PWCHAR)lResult) || (lIndex != pLabelContext->szValue[0])) + if (_wcsicmp(pLabelContext->szValue, (PWSTR)lResult) || (lIndex != pLabelContext->szValue[0])) { /* Update the tree view item image */ item.mask = TVIF_IMAGE | TVIF_SELECTEDIMAGE; @@ -1446,10 +1446,10 @@ SoundsDlgProc(HWND hwndDlg, /// /// Should store in current member /// - StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWCHAR)lResult); + StringCchCopyW(pLabelContext->szValue, _countof(pLabelContext->szValue), (PWSTR)lResult); } - if (wcslen((PWCHAR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) + if (wcslen((PWSTR)lResult) && lIndex != 0 && pGlobalData->NumWavOut != 0) { EnableWindow(GetDlgItem(hwndDlg, IDC_PLAY_SOUND), TRUE); } @@ -1486,7 +1486,7 @@ SoundsDlgProc(HWND hwndDlg, case WM_NOTIFY: { PLABEL_CONTEXT pLabelContext; - PWCHAR ptr; + PWSTR ptr; LPNMHDR lpnm = (LPNMHDR)lParam; @@ -1549,7 +1549,7 @@ SoundsDlgProc(HWND hwndDlg, if (lResult == CB_ERR || lResult == 0) continue; - if (!wcscmp((PWCHAR)lResult, pLabelContext->szValue)) + if (!wcscmp((PWSTR)lResult, pLabelContext->szValue)) { ComboBox_SetCurSel(GetDlgItem(hwndDlg, IDC_SOUND_LIST), lIndex); return FALSE;

1 year, 7 months

[reactos] 01/01: [MSPAINT] Add (CS_HREDRAW | CS_VREDRAW) style to CCanvasWindow

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=83762575e18a307fb7e69… commit 83762575e18a307fb7e692613a1f7f6fc2e52c86 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Jun 12 21:12:37 2023 +0900 Commit: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Mon Jun 12 21:12:37 2023 +0900 [MSPAINT] Add (CS_HREDRAW | CS_VREDRAW) style to CCanvasWindow Reduce repainting defects. CORE-18867 --- base/applications/mspaint/canvas.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/base/applications/mspaint/canvas.h b/base/applications/mspaint/canvas.h index e884fa4df2a..4a41652adc0 100644 --- a/base/applications/mspaint/canvas.h +++ b/base/applications/mspaint/canvas.h @@ -11,7 +11,8 @@ class CCanvasWindow : public CWindowImpl<CCanvasWindow> { public: - DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), CS_DBLCLKS, COLOR_APPWORKSPACE) + DECLARE_WND_CLASS_EX(_T("ReactOSPaintCanvas"), CS_DBLCLKS | CS_HREDRAW | CS_VREDRAW, + COLOR_APPWORKSPACE) BEGIN_MSG_MAP(CCanvasWindow) MESSAGE_HANDLER(WM_SIZE, OnSize)

1 year, 7 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs