commit 3e7647ad72455f8527c65971fa60a52aad940ceb
author Michael Stefaniuc <mstefani@redhat.de> Thu May 07 11:08:48 2009 +0200
committer Alexandre Julliard <julliard@winehq.org> Thu May 07 14:44:22 2009 +0200
tree 8d0eb247a558bce99d917fe41428ed9db3adfeb3
parent 4bc8e87ab604a3b655420a40405f159eae22f748

notepad: Use the explicit W-form of the types.

programs/notepad/dialog.c

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 65f9b09..b651269 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -50,8 +50,7 @@
         LoadString(Globals.hInstance, STRING_ERROR, szTitle, SIZEOF(szTitle));
         FormatMessage(
             FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL, error, 0,
-            (LPTSTR) &lpMsgBuf, 0, NULL);
+            NULL, error, 0, (LPWSTR)&lpMsgBuf, 0, NULL);
         MessageBox(NULL, lpMsgBuf, szTitle, MB_OK | MB_ICONERROR);
         LocalFree(lpMsgBuf);
     }
@@ -122,7 +121,7 @@
  */
 BOOL FileExists(LPCWSTR szFilename)
 {
-   WIN32_FIND_DATA entry;
+   WIN32_FIND_DATAW entry;
    HANDLE hFile;
 
    hFile = FindFirstFile(szFilename, &entry);
@@ -287,7 +286,7 @@
 
 VOID DIALOG_FileOpen(VOID)
 {
-    OPENFILENAME openfilename;
+    OPENFILENAMEW openfilename;
     WCHAR szPath[MAX_PATH];
     WCHAR szDir[MAX_PATH];
     static const WCHAR szDefaultExt[] = { 't','x','t',0 };
@@ -326,7 +325,7 @@
 
 BOOL DIALOG_FileSaveAs(VOID)
 {
-    OPENFILENAME saveas;
+    OPENFILENAMEW saveas;
     WCHAR szPath[MAX_PATH];
     WCHAR szDir[MAX_PATH];
     static const WCHAR szDefaultExt[] = { 't','x','t',0 };
@@ -337,7 +336,7 @@
     GetCurrentDirectory(SIZEOF(szDir), szDir);
     lstrcpy(szPath, txt_files);
 
-    saveas.lStructSize       = sizeof(OPENFILENAME);
+    saveas.lStructSize       = sizeof(OPENFILENAMEW);
     saveas.hwndOwner         = Globals.hMainWnd;
     saveas.hInstance         = Globals.hInstance;
     saveas.lpstrFilter       = Globals.szFilter;
@@ -384,7 +383,7 @@
 static BOOL notepad_print_page(HDC hdc, RECT *rc, BOOL dopage, int page, LPTEXTINFO tInfo)
 {
     int b, y;
-    TEXTMETRIC tm;
+    TEXTMETRICW tm;
     SIZE szMetrics;
 
     if (dopage)
@@ -478,10 +477,10 @@
 
 VOID DIALOG_FilePrint(VOID)
 {
-    DOCINFO di;
-    PRINTDLG printer;
+    DOCINFOW di;
+    PRINTDLGW printer;
     int page, dopage, copy;
-    LOGFONT lfFont;
+    LOGFONTW lfFont;
     HFONT hTextFont, old_font = 0;
     DWORD size;
     BOOL ret = FALSE;
@@ -516,7 +515,7 @@
     SetMapMode(printer.hDC, MM_TEXT);
 
     /* initialize DOCINFO */
-    di.cbSize = sizeof(DOCINFO);
+    di.cbSize = sizeof(DOCINFOW);
     di.lpszDocName = Globals.szFileTitle;
     di.lpszOutput = NULL;
     di.lpszDatatype = NULL;
@@ -594,7 +593,7 @@
 
 VOID DIALOG_FilePrinterSetup(VOID)
 {
-    PRINTDLG printer;
+    PRINTDLGW printer;
 
     ZeroMemory(&printer, sizeof(printer));
     printer.lStructSize         = sizeof(printer);
@@ -701,8 +700,8 @@
 
 VOID DIALOG_SelectFont(VOID)
 {
-    CHOOSEFONT cf;
-    LOGFONT lf=Globals.lfFont;
+    CHOOSEFONTW cf;
+    LOGFONTW lf=Globals.lfFont;
 
     ZeroMemory( &cf, sizeof(cf) );
     cf.lStructSize=sizeof(cf);