[Fontview]

Unicodify it.
CORE-7355

svn path=/trunk/; revision=74004

diff --git a/reactos/base/applications/fontview/CMakeLists.txt b/reactos/base/applications/fontview/CMakeLists.txt
index 5758d49..bfe97f4 100644 (file)
--- a/reactos/base/applications/fontview/CMakeLists.txt
+++ b/reactos/base/applications/fontview/CMakeLists.txt
@@ -6,7 +6,7 @@ list(APPEND SOURCE
 
 add_rc_deps(fontview.rc ${CMAKE_CURRENT_SOURCE_DIR}/ttf.ico)
 add_executable(fontview ${SOURCE} fontview.rc)
-set_module_type(fontview win32gui)
+set_module_type(fontview win32gui UNICODE)
 add_importlibs(fontview comdlg32 gdi32 shell32 user32 msvcrt kernel32)
 add_pch(fontview precomp.h SOURCE)
 add_cd_file(TARGET fontview DESTINATION reactos/system32 FOR all)

diff --git a/reactos/base/applications/fontview/display.c b/reactos/base/applications/fontview/display.c
index 813afb4..49c28d1 100644 (file)
--- a/reactos/base/applications/fontview/display.c
+++ b/reactos/base/applications/fontview/display.c
@@ -468,7 +468,7 @@ Display_OnPrint(HWND hwnd)
                pData = (DISPLAYDATA*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
 #endif
                docinfo.cbSize = sizeof(DOCINFO);
-               docinfo.lpszDocName = "Printing Font";
+               docinfo.lpszDocName = L"Printing Font";
                docinfo.lpszOutput = NULL;
                docinfo.lpszDatatype = NULL;
                docinfo.fwType = 0;

diff --git a/reactos/base/applications/fontview/fontview.c b/reactos/base/applications/fontview/fontview.c
index 3e2539c..695e19e 100644 (file)
--- a/reactos/base/applications/fontview/fontview.c
+++ b/reactos/base/applications/fontview/fontview.c
@@ -91,9 +91,9 @@ ErrorMsgBox(HWND hParent, DWORD dwMessageId, ...)
 }
 
 int WINAPI
-WinMain (HINSTANCE hThisInstance,
+wWinMain(HINSTANCE hThisInstance,
          HINSTANCE hPrevInstance,
-         LPSTR lpCmdLine,
+         LPWSTR lpCmdLine,
          int nCmdShow)
 {
        int argc;
@@ -423,7 +423,7 @@ MainWnd_OnInstall(HWND hwnd)
        DWORD fontExists;
 
        /* First, we have to find out if the font still exists. */
-       fontExists = GetFileAttributes((LPCSTR)g_fileName);
+       fontExists = GetFileAttributes(g_fileName);
        if (fontExists != 0xFFFFFFFF) /* If the file does not exist */
        {
                ErrorMsgBox(0, IDS_ERROR_NOFONT, g_fileName);