Author: akhaldi Date: Sat Jun 6 17:20:49 2015 New Revision: 68050
URL: http://svn.reactos.org/svn/reactos?rev=68050&view=rev Log: [FONTVIEW][HIVECLS] File filter improvements by Lee Schroeder. See CORE-9763 for details.
Modified: trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/fontview/lang/bg-BG.rc trunk/reactos/base/applications/fontview/lang/cs-CZ.rc trunk/reactos/base/applications/fontview/lang/de-DE.rc trunk/reactos/base/applications/fontview/lang/en-US.rc trunk/reactos/base/applications/fontview/lang/es-ES.rc trunk/reactos/base/applications/fontview/lang/fr-FR.rc trunk/reactos/base/applications/fontview/lang/he-IL.rc trunk/reactos/base/applications/fontview/lang/it-IT.rc trunk/reactos/base/applications/fontview/lang/lt-LT.rc trunk/reactos/base/applications/fontview/lang/no-NO.rc trunk/reactos/base/applications/fontview/lang/pl-PL.rc trunk/reactos/base/applications/fontview/lang/pt-BR.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ru-RU.rc trunk/reactos/base/applications/fontview/lang/sk-SK.rc trunk/reactos/base/applications/fontview/lang/sq-AL.rc trunk/reactos/base/applications/fontview/lang/sv-SE.rc trunk/reactos/base/applications/fontview/lang/tr-TR.rc trunk/reactos/base/applications/fontview/lang/uk-UA.rc trunk/reactos/base/applications/fontview/lang/zh-CN.rc trunk/reactos/base/applications/fontview/lang/zh-TW.rc trunk/reactos/base/applications/fontview/resource.h trunk/reactos/boot/bootdata/hivecls.inf
Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.c [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -24,6 +24,7 @@
#include <winnls.h> #include <shellapi.h> +#include <windowsx.h>
#include "fontview.h" #include "resource.h" @@ -65,7 +66,7 @@ }
static void -ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...) +ErrorMsgBox(HWND hParent, DWORD dwMessageId, ...) { HLOCAL hMemCaption = NULL; HLOCAL hMemText = NULL; @@ -77,7 +78,7 @@ va_end(args);
FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, dwCaptionID, 0, (LPWSTR)&hMemCaption, 0, NULL); + NULL, IDS_ERROR, 0, (LPWSTR)&hMemCaption, 0, NULL);
MessageBoxW(hParent, hMemText, hMemCaption, MB_ICONERROR);
@@ -117,11 +118,10 @@ if (argc < 2) { OPENFILENAMEW fontOpen; - HLOCAL dialogTitle = NULL; - - /* Gets the title for the dialog box ready */ - FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, - NULL, IDS_OPEN, 0, (LPWSTR)&dialogTitle, 0, NULL); + WCHAR filter[MAX_PATH], dialogTitle[MAX_PATH]; + + LoadStringW(NULL, IDS_OPEN, dialogTitle, MAX_PATH); + LoadStringW(NULL, IDS_FILTER_LIST, filter, MAX_PATH);
/* Clears out any values of fontOpen before we use it */ ZeroMemory(&fontOpen, sizeof(fontOpen)); @@ -129,8 +129,7 @@ /* Sets up the open dialog box */ fontOpen.lStructSize = sizeof(fontOpen); fontOpen.hwndOwner = NULL; - fontOpen.lpstrFilter = L"TrueType Font (*.ttf)\0*.ttf\0" - L"All Files (*.*)\0*.*\0"; + fontOpen.lpstrFilter = filter; fontOpen.lpstrFile = szFileName; fontOpen.lpstrTitle = dialogTitle; fontOpen.nMaxFile = MAX_PATH; @@ -145,11 +144,8 @@ } else { /* If the user decides to close out of the open dialog effectively exiting the program altogether */ - LocalFree(dialogTitle); return 0; } - - LocalFree(dialogTitle); } else { @@ -160,7 +156,7 @@
if (!AddFontResourceW(fileName)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; }
@@ -168,20 +164,20 @@ dwSize = sizeof(g_ExtLogFontW.elfFullName); if (!GetFontResourceInfoW(fileName, &dwSize, g_ExtLogFontW.elfFullName, 1)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; }
dwSize = sizeof(LOGFONTW); if (!GetFontResourceInfoW(fileName, &dwSize, &g_ExtLogFontW.elfLogFont, 2)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, fileName); return -1; }
if (!Display_InitClass(hThisInstance)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + ErrorMsgBox(0, IDS_ERROR_NOCLASS); return -1; }
@@ -202,7 +198,7 @@ /* Register the window class, and if it fails quit the program */ if (!RegisterClassExW (&wincl)) { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOCLASS); + ErrorMsgBox(0, IDS_ERROR_NOCLASS); return 0; }
@@ -266,7 +262,7 @@ SendMessage(hDisplay, FVM_SETTYPEFACE, 0, (LPARAM)&g_ExtLogFontW); ShowWindow(hDisplay, SW_SHOWNORMAL);
- /* Create the quit button */ + /* Create the install button */ LoadStringW(g_hInstance, IDS_INSTALL, szQuit, MAX_BUTTONNAME); hButtonInstall = CreateWindowExW( 0, /* Extended style */ @@ -342,7 +338,7 @@ fontExists = GetFileAttributes((LPCSTR)g_fileName); if (fontExists != 0xFFFFFFFF) /* If the file does not exist */ { - ErrorMsgBox(0, IDS_ERROR, IDS_ERROR_NOFONT, g_fileName); + ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName); return -1; }
Modified: trunk/reactos/base/applications/fontview/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/bg-BG.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "ÐÑма доÑÑаÑÑÑно мÑÑÑо за завÑÑÑване на дейÑÑвиеÑо." IDS_ERROR_NOFONT "%1 не е Ñедовен ÑÑиÑÑов Ñайл." IDS_ERROR_NOCLASS "ÐеÑÑпеÑно изпÑлнение на клаÑа на пÑозоÑеÑа." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/cs-CZ.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/de-DE.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/en-US.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "There's 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/es-ES.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/fr-FR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ IDS_ERROR_NOMEM "Mémoire insuffisante pour terminer l'opération." IDS_ERROR_NOFONT "Le fichier %1 n'est pas un fichier police valide." IDS_ERROR_NOCLASS "Impossible d'initialiser la classe de fenêtre." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/he-IL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "××× ×ספ××§ ×××ר×× ××× ××ש××× ×ת ×פע×××." IDS_ERROR_NOFONT "××§×××¥ %1 ××× × ×§×××¥ ×××¤× ×× ×××§×." IDS_ERROR_NOCLASS "Could not initialize window class." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/it-IT.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/lt-LT.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/no-NO.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -10,4 +10,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pl-PL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/pt-BR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ 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 "Nu s-a putut iniÈializa clasa de ferestre." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -12,4 +12,9 @@ IDS_ERROR_NOMEM "ÐедоÑÑаÑоÑно памÑÑи Ð´Ð»Ñ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¾Ð¿ÐµÑаÑии." IDS_ERROR_NOFONT "%1 не ÑвлÑеÑÑÑ ÐºÐ¾ÑÑекÑнÑм Ñайлом ÑÑиÑÑа." IDS_ERROR_NOCLASS "Ðевозможно иниÑиализиÑоваÑÑ ÐºÐ»Ð°ÑÑ Ð¾ÐºÐ½Ð°." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sk-SK.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -15,4 +15,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sq-AL.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -14,4 +14,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/sv-SE.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -17,4 +17,9 @@ 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_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/tr-TR.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -11,4 +11,9 @@ IDS_ERROR_NOMEM "Bu iÅlemi bitirmek için yeterli bellek yok." IDS_ERROR_NOFONT "%1 kütüÄü, geçerli bir yazı tipi kütüÄü deÄil." IDS_ERROR_NOCLASS "Pencere sınıfı baÅlatılamadı." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/uk-UA.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "ÐедоÑÑаÑнÑо пам'ÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ Ð¾Ð¿ÐµÑаÑÑÑ." IDS_ERROR_NOFONT "Файл %1 не Ñ ÐºÐ¾ÑекÑним Ñайлом ÑÑиÑÑÑ." IDS_ERROR_NOCLASS "Ðеможливо ÑнÑÑÑалÑзÑваÑи вÑконний клаÑ." + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-CN.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "没æè¶³å¤çå 忥宿æä½ã" IDS_ERROR_NOFONT "ï¼ 1䏿¯ä¸ä¸ªææçå使¡£æ¡ã" IDS_ERROR_NOCLASS "çªå£æ æ³åå§åã" + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/zh-TW.rc [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -18,4 +18,9 @@ IDS_ERROR_NOMEM "æ²æè¶³å¤ çè¨æ¶é«ä¾å®ææä½ã" IDS_ERROR_NOFONT "%1 䏿¯ä¸åææçå髿ªæ¡ã" IDS_ERROR_NOCLASS "çªå£ç¡æ³åå§åã" + IDS_FILTER_LIST "All Supported Fonts (*.ttf;*.fon;*.otf)\0*.ttf;*.fon;*.otf\0\ +TrueType Font (*.ttf)\0*.ttf\0\ +OpenType Font (*.otf)\0*.otf\0\ +Font File (*.fon)\0*.fon\0\ +All Files (*.*)\0*.*\0" END
Modified: trunk/reactos/base/applications/fontview/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/... ============================================================================== --- trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/resource.h [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -4,6 +4,7 @@ #define IDS_ERROR_NOMEM 101 #define IDS_ERROR_NOFONT 102 #define IDS_ERROR_NOCLASS 103 +#define IDS_FILTER_LIST 104
#define IDS_INSTALL 500 #define IDS_PRINT 501
Modified: trunk/reactos/boot/bootdata/hivecls.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivecls.inf?r... ============================================================================== --- trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivecls.inf [iso-8859-1] Sat Jun 6 17:20:49 2015 @@ -110,15 +110,22 @@
; Fonts HKCR,".fon","",0x00000000,"fonfile" -HKCR,"fonfile","",0x00000000,"Font File" +HKCR,"fonfile","",0x00000000,"Font file" HKCR,"fonfile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-166" HKCR,"fonfile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-155" +HKCR,"fonfile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1"
HKCR,".ttf","",0x00000000,"ttffile" -HKCR,"ttffile","",0x00000000,"TrueType Font File" +HKCR,"ttffile","",0x00000000,"TrueType font file" +HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" HKCR,"ttffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" -HKCR,"ttffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" HKCR,"ttffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1" + +HKCR,".otf","",0x00000000,"otffile" +HKCR,"otffile","",0x00000000,"OpenType font file" +HKCR,"otffile\DefaultIcon","",0x00020000,"%SystemRoot%\system32\shell32.dll,-156" +HKCR,"otffile","FriendlyTypeName",0x00020000,"@%SystemRoot%\system32\shell32.dll,-167" +HKCR,"otffile\shell\open\command","",0x00020000,"%SystemRoot%\system32\fontview.exe %1"
; Help Files HKCR,".hlp","",0x00000000,"hlpfile"