commit 0e2d0e076f2ef746427f19d2b754ec1dd3ed76b4
author Mike McCormack <mike_mccormack@looksmart.com.au> Sun Jul 23 14:22:47 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jul 23 14:22:47 2000 +0000
tree 26af7ab1938bba4fc1b159e37e89694bcc1ae78c
parent 7f392f5e1b0def068ab50500b397b4c8efe9aacf

Added some basic text display and editing capabilities, cursor
positioning, a bit of scrolling and a text file loader.

programs/notepad/dialog.c

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index 8d237e4..a7827b4 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -55,7 +55,7 @@
 
    /* Load and format szMessage */
    LoadString(Globals.hInstance, IDS_NOTFOUND, szRessource, sizeof(szRessource));
-   wvsprintf(szMessage, szRessource, szFileName);
+   wsprintf(szMessage, szRessource, szFileName);
    
    /* Load szCaption */
    LoadString(Globals.hInstance, IDS_ERROR,  szRessource, sizeof(szRessource));
@@ -74,7 +74,7 @@
    /* Load and format Message */
 
    LoadString(Globals.hInstance, IDS_NOTSAVED, szRessource, sizeof(szRessource));
-   wvsprintf(szMessage, szRessource, szFileName);
+   wsprintf(szMessage, szRessource, szFileName);
    
    /* Load Caption */
 
@@ -146,19 +146,12 @@
 
 void DoOpenFile(LPCSTR szFileName) {
 
-    int  hFile;
-    WORD nResult;
-
     /* Close any files and prompt to save changes */
     if (DoCloseFile()) {
         GetFileTitle(szFileName, Globals.szFileName, sizeof(Globals.szFileName));
         LANGUAGE_UpdateWindowCaption();
-        hFile = _lopen(szFileName, OF_READ);
-        nResult = _lread(hFile, Globals.Buffer, sizeof(Globals.Buffer));
-        _lclose(hFile);
 
-        /* FIXME: Append time/date if first line contains LOGPREFIX */
-        /* (Globals.Buffer, ) */
+        LoadBufferFromFile(szFileName);
     }
 }
 
@@ -167,7 +160,7 @@
 {
     /* Close any files and promt to save changes */
     if (DoCloseFile()) {
-        /* do nothing yet */
+        TrashBuffer();
     }
 }