[ros-diffs] [ekohl] 74004: [Fontview] Unicodify it. CORE-7355

Author: ekohl
Date: Tue Feb 28 19:33:28 2017
New Revision: 74004

URL: http://svn.reactos.org/svn/reactos?rev=74004&view=rev
Log:
[Fontview]
Unicodify it.
CORE-7355

Modified:
    trunk/reactos/base/applications/fontview/CMakeLists.txt
    trunk/reactos/base/applications/fontview/display.c
    trunk/reactos/base/applications/fontview/fontview.c

Modified: trunk/reactos/base/applications/fontview/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/CMakeLists.txt	[iso-8859-1] Tue Feb 28 19:33:28 2017
@@ -6,7 +6,7 @@

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)

Modified: trunk/reactos/base/applications/fontview/display.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview/...
==============================================================================
--- trunk/reactos/base/applications/fontview/display.c	[iso-8859-1] (original)
+++ trunk/reactos/base/applications/fontview/display.c	[iso-8859-1] Tue Feb 28 19:33:28 2017
@@ -468,7 +468,7 @@
    	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;

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] Tue Feb 28 19:33:28 2017
@@ -91,9 +91,9 @@
 }

int WINAPI
-WinMain (HINSTANCE hThisInstance,
+wWinMain(HINSTANCE hThisInstance,
          HINSTANCE hPrevInstance,
-         LPSTR lpCmdLine,
+         LPWSTR lpCmdLine,
          int nCmdShow)
 {
    int argc;
@@ -423,7 +423,7 @@
    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);