Fixed ANSI C related compile problems.

programs/avitools/aviplay.c

@@ -217,7 +217,7 @@ HRESULT (WINAPI *fnAVIStreamGetFrameClose)(PGETFRAME pg);
 	    int		i,palchanged;
 
 	    /* skip used colorentries. */
-	    decodedbits+=bmi->biClrUsed*sizeof(RGBQUAD);
+	    decodedbits=(char*)decodedbits+bmi->biClrUsed*sizeof(RGBQUAD);
 	    palchanged = 0;
 	    for (i=0;i<bmi->biClrUsed;i++) {
 	    	if (	(palent[i].peRed != rgb[i].rgbRed) ||
@@ -245,8 +245,8 @@ HRESULT (WINAPI *fnAVIStreamGetFrameClose)(PGETFRAME pg);
 	}
 	/* Argh. AVIs are upside down. */
 	for (i=0;i<dsdesc.dwHeight;i++) {
-	    memcpy( dsdesc.u1.lpSurface+(i*dsdesc.lPitch),
-		    decodedbits+bytesline*(dsdesc.dwHeight-i-1),
+	    memcpy( (char *)dsdesc.u1.lpSurface+(i*dsdesc.lPitch),
+		    (char *)decodedbits+bytesline*(dsdesc.dwHeight-i-1),
 		    bytesline
 	    );
 	}

programs/notepad/Da.rc

@@ -64,14 +64,14 @@
 #define DIALOG_PAGESETUP_BOTTOM         "&Bund:"
 
 
-/* Strings */
-
-#define STRING_PAGESETUP_HEADERVALUE    "&n"        /* FIXME */
-#define STRING_PAGESETUP_FOOTERVALUE    "Page &s"   /* FIXME */
-#define STRING_PAGESETUP_LEFTVALUE      "20 mm"     /* FIXME */
-#define STRING_PAGESETUP_RIGHTVALUE     "20 mm"     /* FIXME */
-#define STRING_PAGESETUP_TOPVALUE       "25 mm"     /* FIXME */
-#define STRING_PAGESETUP_BOTTOMVALUE    "25 mm"     /* FIXME */
+/* Strings */
+
+#define STRING_PAGESETUP_HEADERVALUE    "&n"        /* FIXME */
+#define STRING_PAGESETUP_FOOTERVALUE    "Page &s"   /* FIXME */
+#define STRING_PAGESETUP_LEFTVALUE      "20 mm"     /* FIXME */
+#define STRING_PAGESETUP_RIGHTVALUE     "20 mm"     /* FIXME */
+#define STRING_PAGESETUP_TOPVALUE       "25 mm"     /* FIXME */
+#define STRING_PAGESETUP_BOTTOMVALUE    "25 mm"     /* FIXME */
 
 #define STRING_NOTEPAD                  "Notesblok"
 #define STRING_ERROR                    "FEJL"

programs/notepad/De.rc

@@ -67,14 +67,14 @@
 
 
 /* Strings */
-
+
 #define STRING_PAGESETUP_HEADERVALUE    "&n"
 #define STRING_PAGESETUP_FOOTERVALUE    "Page &s"
 #define STRING_PAGESETUP_LEFTVALUE      "20 mm"
 #define STRING_PAGESETUP_RIGHTVALUE     "20 mm"
 #define STRING_PAGESETUP_TOPVALUE       "25 mm"
 #define STRING_PAGESETUP_BOTTOMVALUE    "25 mm"
-
+
 #define STRING_NOTEPAD                  "Editor"
 #define STRING_ERROR                    "FEHLER"
 #define STRING_WARNING                  "ACHTUNG"
@@ -102,5 +102,3 @@ um diese Funktion \nabzuschließen. Beenden Sie eine oder mehrere \
 \nAnwendungen, um den verfügbaren Arbeitsspeicher zu \nerhöhen."
 
 #include "notepad.rc"
-
-
\ No newline at end of file

programs/notepad/dialog.c

@@ -150,7 +150,7 @@ void DoOpenFile(LPCSTR szFileName) {
     WORD nResult;
 
     /* Close any files and prompt to save changes */
-    if (DoCloseFile) {
+    if (DoCloseFile()) {
         GetFileTitle(szFileName, Globals.szFileName, sizeof(Globals.szFileName));
         LANGUAGE_UpdateWindowCaption();
         hFile = _lopen(szFileName, OF_READ);

programs/regapi/regapi.c

@@ -160,60 +160,60 @@ static void    processQueryValue(LPSTR cmdline);
 /*
  * Help Text displayed when invalid parameters are provided
  */
-static char helpText[] = "
-NAME
-          regapi - provide a command line interface to the wine registry.
-
-SYNOPSIS
-          regapi commandName [-force] < file
-
-DESCRIPTION
-          regapi allows editing the wine registry.  It processes the given 
-          commandName for every line in the stdin data stream.  Input data 
-          format may vary depending on the commandName see INPUT FILE FORMAT.
-
-OPTIONS
-          commandName
-              Instruct regapi about what action to perform on the data stream.
-              Currently, only setValue and queryValue are supported and 
-              implemented.
-
-          -force 
-              When provided the action will be performed anyway.  This may 
-              have a different meaning depending on the context.  For example,
-              when providing -force to setValue, the value is set even if it 
-              was previously set to another value.
-
-          < file
-              STDIN channel, provide a file name with line of the appropriate
-              format.
-
-INPUT FILE FORMAT
-
-          setValue
-              The input file format required by the setValue command is similar
-              to the one obtained from regedit.exe export option.  The only 
-              difference is that multi line values are not supported, the 
-              value data must be on a single line.
-
-              [KEY_CLASS\\Some\\Path\\For\\A\\Key]
-              \"Value1\"=\"Data1\"
-              \"Value2\"=\"Data2\"
-              \"Valuen\"=\"Datan\"
-              ...
-
-          queryValue
-              The input file format required by the queryValue command is 
-              similar to the one required by setValue.  The only 
-              difference is that you only provide the value name.
-
-              [KEY_CLASS\\Some\\Path\\For\\A\\Key]
-              \"Value1\"
-              \"Value2\"
-              \"Valuen\"
-              ...
-                                February 1999.
-";
+static char helpText[] =
+"NAME\n"
+"          regapi - provide a command line interface to the wine registry.\n"
+"\n"
+"SYNOPSIS\n"
+"          regapi commandName [-force] < file\n"
+"\n"
+"DESCRIPTION\n"
+"          regapi allows editing the wine registry.  It processes the given\n"
+"          commandName for every line in the stdin data stream.  Input data\n"
+"          format may vary depending on the commandName see INPUT FILE FORMAT.\n"
+"\n"
+"OPTIONS\n"
+"          commandName\n"
+"              Instruct regapi about what action to perform on the data stream.\n"
+"              Currently, only setValue and queryValue are supported and\n"
+"              implemented.\n"
+"\n"
+"          -force\n"
+"              When provided the action will be performed anyway.  This may\n"
+"              have a different meaning depending on the context.  For example,\n"
+"              when providing -force to setValue, the value is set even if it\n"
+"              was previously set to another value.\n"
+"\n"
+"          < file\n"
+"              STDIN channel, provide a file name with line of the appropriate\n"
+"              format.\n"
+"\n"
+"INPUT FILE FORMAT\n"
+"\n"
+"          setValue\n"
+"              The input file format required by the setValue command is similar\n"
+"              to the one obtained from regedit.exe export option.  The only\n"
+"              difference is that multi line values are not supported, the\n"
+"              value data must be on a single line.\n"
+"\n"
+"              [KEY_CLASS\\Some\\Path\\For\\A\\Key]\n"
+"              \"Value1\"=\"Data1\"\n"
+"              \"Value2\"=\"Data2\"\n"
+"              \"Valuen\"=\"Datan\"\n"
+"              ...\n"
+"\n"
+"          queryValue\n"
+"              The input file format required by the queryValue command is\n"
+"              similar to the one required by setValue.  The only\n"
+"              difference is that you only provide the value name.\n"
+"\n"
+"              [KEY_CLASS\\Some\\Path\\For\\A\\Key]\n"
+"              \"Value1\"\n"
+"              \"Value2\"\n"
+"              \"Valuen\"\n"
+"              ...\n"
+"                                February 1999.\n"
+;
               
 
 /******************************************************************************

programs/regtest/regtest.c

@@ -20,6 +20,10 @@
 #include <winerror.h>
 #include <winnt.h>
 
+#ifndef __GNUC__
+#define __FUNCTION__ "<function>"
+#endif
+
 /* True this when security is implemented */
 #define CHECK_SAM FALSE
 

programs/view/view.c

@@ -26,9 +26,10 @@ BOOL isAldus;
 BOOL FileOpen(HWND hWnd, char *fn)
 {
   OPENFILENAME ofn = { sizeof(OPENFILENAME),
-		       0, 0, "Metafiles\0*.wmf\0", NULL, 0, 0, NULL, 
+		       0, 0, NULL, NULL, 0, 0, NULL, 
 		       FN_LENGTH, NULL, 0, NULL, NULL, OFN_CREATEPROMPT |
 		       OFN_SHOWHELP, 0, 0, NULL, 0, NULL };
+  ofn.lpstrFilter = "Metafiles\0*.wmf\0";
   ofn.hwndOwner = hWnd;
   ofn.lpstrFile = fn;
   return GetOpenFileName(&ofn);

programs/wcmd/directory.c

@@ -202,7 +202,9 @@ __int64 byte_count;
     if ((recurse) &&
           ((fd+i)->cFileName[0] != '.') &&
       	  ((fd+i)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
-//      GetFullPathName ((fd+i)->cFileName, sizeof(string), string, NULL);
+#if 0
+      GetFullPathName ((fd+i)->cFileName, sizeof(string), string, NULL);
+#endif
       p = strrchr (search_path, '\\');
       lstrcpyn (string, search_path, (p-search_path+2));
       lstrcat (string, (fd+i)->cFileName);

programs/wcmd/wcmdmain.c

@@ -106,7 +106,9 @@ HANDLE h;
   h = CreateFile (string, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
   if (h != INVALID_HANDLE_VALUE) {
     CloseHandle (h);
-//    WCMD_batch (string, " ");
+#if 0
+    WCMD_batch (string, " ");
+#endif
   }
 
 /*