commit 52be93cbb4c7e2404f13c065dba5b97e0616aa9c
author Niels Kristian Bech Jensen <nkbj@image.dk> Sun Mar 19 21:49:49 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Mar 19 21:49:49 2000 +0000
tree 5f6a57f5f7510a0c616d83699c1b2b8707bced30
parent c1a700c4da770aed1a3272105b1cb3e34752da25

Fixed some compiler errors and warnings.

programs/notepad/dialog.c

diff --git a/programs/notepad/dialog.c b/programs/notepad/dialog.c
index f8ebd36..c51b4f8 100644
--- a/programs/notepad/dialog.c
+++ b/programs/notepad/dialog.c
@@ -47,7 +47,7 @@
    return (MessageBox(Globals.hMainWnd, szMessage, szCaption, type));
 }
 
-void AlertFileNotFound(LPCSTR szFileName) {
+void AlertFileNotFound(LPSTR szFileName) {
 
    int nResult;
    CHAR szMessage[MAX_STRING_LEN];
@@ -65,7 +65,7 @@
 
 }
 
-int AlertFileNotSaved(LPCSTR szFileName) {
+int AlertFileNotSaved(LPSTR szFileName) {
 
    int nResult;
    CHAR szMessage[MAX_STRING_LEN];
@@ -373,14 +373,14 @@
 */
 
         /* Let commdlg manage copy settings */
-        printer.nCopies               = PD_USEDEVMODECOPIES;
+        printer.nCopies               = (WORD)PD_USEDEVMODECOPIES;
 
         if (PrintDlg(&printer)) {
 
             /* initialize DOCINFO */
             di.cbSize = sizeof(DOCINFO);
-            lstrcpy(di.lpszDocName, szDocumentName);
-            lstrcpy(di.lpszOutput,  szOutput);
+            lstrcpy((LPSTR)di.lpszDocName, szDocumentName);
+            lstrcpy((LPSTR)di.lpszOutput,  szOutput);
 
             hContext = printer.hDC;
             assert(hContext!=0);
@@ -627,7 +627,7 @@
   WNDPROC lpfnDlg;
 
   lpfnDlg = MakeProcInstance(DIALOG_PAGESETUP_DlgProc, Globals.hInstance);
-  DialogBox(Globals.hInstance, STRING_PAGESETUP_Xx, Globals.hMainWnd, lpfnDlg);
+  DialogBox(Globals.hInstance, STRING_PAGESETUP_Xx, Globals.hMainWnd, (DLGPROC)lpfnDlg);
   FreeProcInstance(lpfnDlg);
 }
 

programs/notepad/main.c

diff --git a/programs/notepad/main.c b/programs/notepad/main.c
index 5a48111..ca628c2 100644
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -17,6 +17,9 @@
 #include "dialog.h"
 #include "language.h"
 
+extern BOOL DoCloseFile(void);
+extern void DoOpenFile(LPCSTR szFileName);
+
 NOTEPAD_GLOBALS Globals;
 
 /***********************************************************************

programs/notepad/search.c

diff --git a/programs/notepad/search.c b/programs/notepad/search.c
index c6218da..e53851b 100644
--- a/programs/notepad/search.c
+++ b/programs/notepad/search.c
@@ -32,7 +32,7 @@
     }
 
     for (i=0; i<nSPLen; i++) {
-       delta[szSP[i]] = (nSPLen - rightmostpos(szSP[i], szSP, nSPLen));
+       delta[(int)szSP[i]] = (nSPLen - rightmostpos(szSP[i], szSP, nSPLen));
     }
  }
 
@@ -41,13 +41,13 @@
     int j = nSPLen;
     
     do {
-       if (szBuf[i] = szSP[j]) {
+       if ((szBuf[i] = szSP[j])) {
          i--; j--;
        } else {
-         if ((nSPLen-j+1) > delta[szBuf[i]]) {
+         if ((nSPLen-j+1) > delta[(int)szBuf[i]]) {
            i+= (nSPLen-j+1);
          } else {
-           i+= delta[szBuf[i]];
+           i+= delta[(int)szBuf[i]];
          }
        }
     } while (j>0 && i<=nBufLen);