Linker warning fixed.
authorEmanuele Aliberti <ea@iol.it>
Sun, 24 Mar 2002 18:52:10 +0000 (18:52 +0000)
committerEmanuele Aliberti <ea@iol.it>
Sun, 24 Mar 2002 18:52:10 +0000 (18:52 +0000)
svn path=/trunk/; revision=2778

os2/lib/doscalls/doscalls.def
os2/lib/doscalls/doscalls.edf [new file with mode: 0644]
os2/lib/doscalls/makefile
os2/lib/doscalls/misc/doscalls.c
os2/lib/doscalls/misc/doscalls.h

index 27e45b6..1d584c6 100644 (file)
@@ -8,13 +8,14 @@ DESCRIPTION "Part of the ReactOS OS/2 sub system, provides base kernel services
 EXPORTS
 ; FIXME: fill in all exports
 
-Dos32Sleep=Dos32Sleep@4                        @229
-Dos32Close=Dos32Close@4                                @257
-Dos32Open=Dos32Open@32                         @273
-Dos32Read=Dos32Read@16                         @281
-Dos32Write=Dos32Write@16                       @282
-Dos32DevIOCtl=Dos32DevIOCtl@36                 @284
-Dos32Beep=Dos32Beep@8                          @286
-Dos32Exit=Dos32Exit@8                          @234
-Dos32CreateThread=Dos32CreateThread@20         @311
+Dos32Sleep@4                   @229
+Dos32Close@4                   @257
+Dos32Open@32                   @273
+Dos32Read@16                   @281
+Dos32Write@16                  @282
+Dos32DevIOCtl@36               @284
+Dos32Beep@8                    @286
+Dos32Exit@8                    @234
+Dos32CreateThread@20           @311
 
+; EOF
diff --git a/os2/lib/doscalls/doscalls.edf b/os2/lib/doscalls/doscalls.edf
new file mode 100644 (file)
index 0000000..795eb11
--- /dev/null
@@ -0,0 +1,21 @@
+; Def for doscalls.dll - part of the OS/2-sub system
+; for ReactOS. Provides Access to OS/2 kernel services.
+
+LIBRARY doscalls.dll 
+
+DESCRIPTION "Part of the ReactOS OS/2 sub system, provides base kernel services to OS/2-apps"
+
+EXPORTS
+; FIXME: fill in all exports
+
+Dos32Sleep=Dos32Sleep@4                        @229
+Dos32Close=Dos32Close@4                                @257
+Dos32Open=Dos32Open@32                         @273
+Dos32Read=Dos32Read@16                         @281
+Dos32Write=Dos32Write@16                       @282
+Dos32DevIOCtl=Dos32DevIOCtl@36                 @284
+Dos32Beep=Dos32Beep@8                          @286
+Dos32Exit=Dos32Exit@8                          @234
+Dos32CreateThread=Dos32CreateThread@20         @311
+
+; EOF
index d0e2fe1..515aa4b 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.1 2002/03/23 19:23:28 robertk Exp $
+# $Id: makefile,v 1.2 2002/03/24 18:52:10 ea Exp $
 
 PATH_TO_TOP = ../../../..
 
@@ -21,19 +21,16 @@ TARGET_OBJECTS = $(TARGET_NAME).o
 TARGET_CLEAN = file/*.o vio/*.o sync/*.o mem/*.o \
                                misc/*.o mou/*.o kbd/*.o run/*.o
 
-TARGET_DEFONLY=yes
+DOSCALLS_MISC_OBJECTS = misc/doscalls.o
 
-include $(PATH_TO_TOP)/rules.mak
+#SYNC_OBJECTS =
 
-include $(TOOLS_PATH)/helper.mk
+TARGET_OBJECTS = $(DOSCALLS_MISC_OBJECTS)
 
 
-MISC_OBJECTS = misc/doscalls.o
-#SYNC_OBJECTS =
-
+include $(PATH_TO_TOP)/rules.mak
 
-OBJECTS = $(MISC_OBJECTS)
+include $(TOOLS_PATH)/helper.mk
 
-$(TARGET_NAME).o: $(OBJECTS)
-       $(LD) -r $(OBJECTS) -o $(TARGET_NAME).o
 
+# EOF
index a854313..a9aec9e 100644 (file)
@@ -23,7 +23,7 @@ DWORD PROC_Pid;                       // contains the current processes pid. (or is it also in PEB)
 
 
 /* Implementation of the system calls */
-APIRET APIENTRY Dos32Sleep(ULONG msec)
+APIRET STDCALL Dos32Sleep(ULONG msec)
 {
        NTSTATUS stat;
        TIME Interv;
@@ -32,14 +32,14 @@ APIRET APIENTRY Dos32Sleep(ULONG msec)
        return 0;
 }
 
-APIRET APIENTRY Dos32CreateThread(PTID ptid, PFNTHREAD pfn,
+APIRET STDCALL Dos32CreateThread(PTID ptid, PFNTHREAD pfn,
                                    ULONG param, ULONG flag, ULONG cbStack)
 {
        return 0;
 }
 
 
-APIRET APIENTRY  Dos32Open(PSZ    pszFileName,  PHFILE pHf,
+APIRET STDCALL  Dos32Open(PSZ    pszFileName,  PHFILE pHf,
                             PULONG pulAction,  ULONG  cbFile,
                             ULONG  ulAttribute,  ULONG  fsOpenFlags,
                             ULONG  fsOpenMode,  PVOID reserved )  //ULONGPEAOP2 peaop2)
@@ -63,7 +63,7 @@ IN ULONG EaLength
 
 
 /* close a Handle. seems finished */
-APIRET APIENTRY  Dos32Close(HFILE hFile)
+APIRET STDCALL  Dos32Close(HFILE hFile)
 {
        NTSTATUS   nErrCode;
        nErrCode = NtClose( (HANDLE)hFile );
@@ -82,7 +82,7 @@ APIRET APIENTRY  Dos32Close(HFILE hFile)
 
 
 
-APIRET APIENTRY  Dos32Read(HFILE hFile, PVOID pBuffer,
+APIRET STDCALL  Dos32Read(HFILE hFile, PVOID pBuffer,
                             ULONG cbRead, PULONG pcbActual)
 {
        NTSTATUS        nErrCode;
@@ -103,7 +103,7 @@ APIRET APIENTRY  Dos32Read(HFILE hFile, PVOID pBuffer,
 }
 
 /* Generic write to a stream given by hFile */
-APIRET APIENTRY  Dos32Write(HFILE hFile, PVOID pBuffer,
+APIRET STDCALL  Dos32Write(HFILE hFile, PVOID pBuffer,
                              ULONG cbWrite, PULONG pcbActual)
 { 
        NTSTATUS        nErrCode;
@@ -161,7 +161,7 @@ APIRET APIENTRY  Dos32Write(HFILE hFile, PVOID pBuffer,
       165       ERROR_MONITORS_NOT_SUPPORTED 
  
 */
-APIRET APIENTRY Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
+APIRET STDCALL Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
         PVOID pParams,ULONG cbParmLenMax,PULONG pcbParmLen,
         PVOID pData,ULONG cbDataLenMax,PULONG pcbDataLen)
 {
@@ -170,7 +170,7 @@ APIRET APIENTRY Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
 
 
  
-APIRET APIENTRY Dos32Beep(ULONG freq, ULONG dur)
+APIRET STDCALL Dos32Beep(ULONG freq, ULONG dur)
 {
        if( freq<0x25 || freq>0x7FFF )
                return 395;     // ERROR_INVALID_FREQUENCY
@@ -215,7 +215,7 @@ APIRET APIENTRY Dos32Beep(ULONG freq, ULONG dur)
 /* Terminates the current thread or the current Process.
        Decission is made by action 
        FIXME:  move this code to OS2.EXE */
-VOID APIENTRY Dos32Exit(ULONG action, ULONG result)
+VOID STDCALL Dos32Exit(ULONG action, ULONG result)
 {
        // decide what to do
        if( action == EXIT_THREAD)
@@ -230,7 +230,7 @@ VOID APIENTRY Dos32Exit(ULONG action, ULONG result)
 
 
 
-BOOL APIENTRY DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved )
+BOOL STDCALL DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved )
 {
        switch (ul_reason_for_call)
        {
index 3873c14..d6ea5e1 100644 (file)
 #define DosExit                                        Dos32Exit
    
 
-APIRET APIENTRY Dos32Sleep(ULONG msec);
+APIRET STDCALL Dos32Sleep(ULONG msec);
 
-APIRET APIENTRY Dos32CreateThread(PTID ptid,
+APIRET STDCALL Dos32CreateThread(PTID ptid,
                                PFNTHREAD pfn,
                                ULONG param,
                                ULONG flag,
                                ULONG cbStack);
 
-APIRET APIENTRY  Dos32Open(PSZ    pszFileName,
+APIRET STDCALL  Dos32Open(PSZ    pszFileName,
                         PHFILE pHf,
                         PULONG pulAction,
                         ULONG  cbFile,
@@ -50,27 +50,27 @@ APIRET APIENTRY  Dos32Open(PSZ    pszFileName,
                         ULONG  fsOpenMode,
                         PVOID reserved );  //ULONGPEAOP2 peaop2)
 
-APIRET APIENTRY  Dos32Close(HFILE hFile);
+APIRET STDCALL  Dos32Close(HFILE hFile);
 
-APIRET APIENTRY  Dos32Read(HFILE hFile,
+APIRET STDCALL  Dos32Read(HFILE hFile,
                         PVOID pBuffer,
                         ULONG cbRead,
                         PULONG pcbActual);
 
-APIRET APIENTRY  Dos32Write(HFILE hFile,
+APIRET STDCALL  Dos32Write(HFILE hFile,
                          PVOID pBuffer,
                          ULONG cbWrite,
                          PULONG pcbActual);
 
-APIRET APIENTRY Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
+APIRET STDCALL Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
                                                        PVOID pParams,ULONG cbParmLenMax,PULONG pcbParmLen,
                                                        PVOID pData,ULONG cbDataLenMax,PULONG pcbDataLen);
 
 
-APIRET APIENTRY Dos32Beep(ULONG freq,
+APIRET STDCALL Dos32Beep(ULONG freq,
                        ULONG dur);
 
-VOID APIENTRY Dos32Exit(ULONG action,
+VOID STDCALL Dos32Exit(ULONG action,
                      ULONG result);