fixed a few warnings

svn path=/trunk/; revision=6358

diff --git a/reactos/apps/tests/lock/lock.c b/reactos/apps/tests/lock/lock.c
index b5e8ba7..cbafdb5 100644 (file)
--- a/reactos/apps/tests/lock/lock.c
+++ b/reactos/apps/tests/lock/lock.c
@@ -70,7 +70,7 @@ BOOL mkfile()
 
 }
 
-void main(void)
+int main(void)
 {
   DWORD ass;
 
@@ -108,5 +108,6 @@ void main(void)
   CloseHandle(hFile);
   Sleep(10000);
 
+  return(0);
+}
 
-}
\ No newline at end of file

diff --git a/reactos/drivers/storage/diskdump/diskdump.c b/reactos/drivers/storage/diskdump/diskdump.c
index 25925d6..14431af 100644 (file)
--- a/reactos/drivers/storage/diskdump/diskdump.c
+++ b/reactos/drivers/storage/diskdump/diskdump.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: diskdump.c,v 1.1 2003/08/27 21:28:08 dwelch Exp $
+/* $Id: diskdump.c,v 1.2 2003/10/18 18:49:08 weiden Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -42,7 +42,7 @@
 /* PROTOTYPES ***************************************************************/
 
 NTSTATUS STDCALL
-DiskDumpPrepare(PDEVICE_OBJECT StorageDevice, PDUMP_POINTERS DumpPointers);
+DiskDumpPrepare(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers);
 VOID
 DiskDumpScsiInvalid(VOID);
 VOID
@@ -287,7 +287,7 @@ DiskDumpWrite(LARGE_INTEGER Address, PMDL Mdl)
 }
 
 NTSTATUS STDCALL
-DiskDumpPrepare(PDEVICE_OBJECT StorageDevice, PDUMP_POINTERS DumpPointers)
+DiskDumpPrepare(PDEVICE_OBJECT DeviceObject, PDUMP_POINTERS DumpPointers)
 {
   PIMAGE_NT_HEADERS NtHeader;
   PVOID ImportDirectory;
@@ -301,7 +301,7 @@ DiskDumpPrepare(PDEVICE_OBJECT StorageDevice, PDUMP_POINTERS DumpPointers)
   PULONG FunctionNameList;
 
   /* Save the information from the kernel. */
-  CoreDumpClassDevice = StorageDevice;
+  CoreDumpClassDevice = DeviceObject;
   CoreDumpPointers = *DumpPointers;
   CoreDumpClass2DeviceExtension = (PDEVICE_EXTENSION)CoreDumpClassDevice->DeviceExtension;
   CoreDumpPortDevice = DumpPointers->DeviceObject;

diff --git a/reactos/subsys/system/usetup/cabinet.c b/reactos/subsys/system/usetup/cabinet.c
index 129241e..96f2fc7 100755 (executable)
--- a/reactos/subsys/system/usetup/cabinet.c
+++ b/reactos/subsys/system/usetup/cabinet.c
@@ -19,7 +19,9 @@
 
 #define SEEK_BEGIN    0
 #define SEEK_CURRENT  1
+#ifndef SEEK_END
 #define SEEK_END      2
+#endif
 
 typedef struct __DOSTIME
 {

diff --git a/reactos/subsys/system/welcome/welcome.c b/reactos/subsys/system/welcome/welcome.c
index 7d803b2..f1bdd20 100755 (executable)
--- a/reactos/subsys/system/welcome/welcome.c
+++ b/reactos/subsys/system/welcome/welcome.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: welcome.c,v 1.2 2003/07/31 22:00:18 mf Exp $
+/* $Id: welcome.c,v 1.3 2003/10/18 18:49:08 weiden Exp $
  *
  * COPYRIGHT:   See COPYING in the top level directory
  * PROJECT:     ReactOS welcome/autorun application
@@ -119,7 +119,7 @@ WinMain(HINSTANCE hInst,
   wndclass.cbWndExtra = 0;
   wndclass.hInstance = hInstance;
   wndclass.hIcon = hMainIcon;
-  wndclass.hCursor = LoadCursor (NULL, IDC_ARROW);
+  wndclass.hCursor = LoadCursor (NULL, (LPCTSTR)IDC_ARROW);
   wndclass.hbrBackground = 0;
   wndclass.lpszMenuName = NULL;
   wndclass.lpszClassName = szFrameClass;