[cfinck] 32138: - Don't set a fixed size for the application name, allocate the needed memory dynamically using AllocAndLoadString - Small fixes to the german translation
Author: cfinck Date: Tue Feb 5 18:12:35 2008 New Revision: 32138
URL: http://svn.reactos.org/svn/reactos?rev=32138&view=rev Log: - Don't set a fixed size for the application name, allocate the needed memory dynamically using AllocAndLoadString - Small fixes to the german translation
Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/main.c trunk/rosapps/devutils/vgafontedit/mainwnd.c trunk/rosapps/devutils/vgafontedit/precomp.h
Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/d... ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Tue Feb 5 18:12:35 2008 @@ -11,7 +11,7 @@
IDD_ABOUT DIALOGEX 10, 10, 130, 62 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Über" +CAPTION "Info" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 @@ -22,7 +22,7 @@
IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Glyphen bearbeiten" +CAPTION "Schriftzeichen bearbeiten" FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_EDIT_GLYPH_TOOLBOX, TOOLBARCLASSNAMEA, CCS_NODIVIDER | CCS_NORESIZE, 5, 5, 24, 82 @@ -39,7 +39,7 @@ BEGIN MENUITEM "&Neu\tStrg+N", ID_FILE_NEW MENUITEM "&Öffnen...\tStrg+O", ID_FILE_OPEN - MENUITEM "Schliessen", ID_FILE_CLOSE + MENUITEM "Schließen", ID_FILE_CLOSE MENUITEM SEPARATOR MENUITEM "Speichern\tStrg+S", ID_FILE_SAVE MENUITEM "Speichern unter...", ID_FILE_SAVE_AS @@ -59,19 +59,19 @@
POPUP "&Hilfe" BEGIN - MENUITEM "&Über...", ID_HELP_ABOUT + MENUITEM "&Info...", ID_HELP_ABOUT END END
STRINGTABLE BEGIN - IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binary Font Files (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Binäre Font Dateien (*.bin)|*.bin|" + IDS_OPENFILTER, "Alle unterstützten Formate (*.bin,*.psf)|*.bin;*.psf|Binäre Schriftdateien (*.bin)|*.bin|PC Screen Fonts Version 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Binäre Schriftdateien (*.bin)|*.bin|" IDS_OPENERROR, "Fehler beim Öffnen der Datei! (Fehlernummer %1!u!)" IDS_READERROR, "Fehler beim Lesen der Datei! (Fehlernummer %1!u!)" IDS_WRITEERROR, "Fehler beim Schreiben der Datei! (Fehlernummer %1!u!)" IDS_UNSUPPORTEDFORMAT, "Nicht unterstütztes Dateiformat!" - IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF Font Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." + IDS_UNSUPPORTEDPSF, "Nicht unterstütztes PSF-Format! Der Editor unterstützt nur Fonts im Format 8x8 ohne spezielle Modi." IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" @@ -79,5 +79,5 @@ IDS_TOOLTIP_NEW, "Neu" IDS_TOOLTIP_OPEN, "Öffnen" IDS_TOOLTIP_SAVE, "Speichern" - IDS_TOOLTIP_EDIT_GLYPH, "Glyphen bearbeiten" + IDS_TOOLTIP_EDIT_GLYPH, "Schriftzeichen bearbeiten" END
Modified: trunk/rosapps/devutils/vgafontedit/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.c... ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.c (original) +++ trunk/rosapps/devutils/vgafontedit/main.c Tue Feb 5 18:12:35 2008 @@ -10,6 +10,7 @@
HINSTANCE hInstance; HANDLE hProcessHeap; +PWSTR szAppName;
INT WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow) @@ -24,6 +25,8 @@
hInstance = hInst; hProcessHeap = GetProcessHeap(); + + AllocAndLoadString(&szAppName, IDS_APPTITLE);
hAccel = LoadAcceleratorsW( hInstance, MAKEINTRESOURCEW(IDA_MAINACCELERATORS) );
@@ -45,6 +48,8 @@ } }
+ HeapFree(hProcessHeap, 0, szAppName); + // Just unregister our window classes, don't care whether they were created or not UnInitEditGlyphWndClasses(); UnInitFontBoxesWndClass();
Modified: trunk/rosapps/devutils/vgafontedit/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/mainwn... ============================================================================== --- trunk/rosapps/devutils/vgafontedit/mainwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/mainwnd.c Tue Feb 5 18:12:35 2008 @@ -433,8 +433,6 @@ { (*Info)->nCmdShow = nCmdShow;
- LoadString(hInstance, IDS_APPTITLE, szAppName, MAX_STRING); - hMainWnd = CreateWindowExW(0, szMainWndClass, szAppName,
Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/precom... ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Tue Feb 5 18:12:35 2008 @@ -14,8 +14,6 @@ #include <commctrl.h> #include "resource.h" #include "customwndclasses.h" - -#define MAX_STRING 128
// Forward declarations typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO; @@ -139,7 +137,7 @@ VOID UnInitFontWndClass(VOID);
// main.c -WCHAR szAppName[MAX_STRING]; +extern PWSTR szAppName; extern HINSTANCE hInstance; extern HANDLE hProcessHeap;
-
cfinck＠svn.reactos.org