Performed housekeeping to get the subsystem building. Introduced ros makefile 'standards' throughout.

Is anybody doing any work on the OS/2 support?

svn path=/trunk/; revision=3946
This commit is contained in:
Robert Dickenson 2003-01-07 16:23:12 +00:00
parent a8e38f8c30
commit a6d6844e8a
20 changed files with 256 additions and 123 deletions

View file

@ -0,0 +1,5 @@
*.exe
*.o
*.sym
*.dll
*.coff

View file

@ -0,0 +1 @@
*.o

View file

@ -1,4 +1,4 @@
/* $Id: devices.cpp,v 1.3 2002/09/04 22:19:47 robertk Exp $
/* $Id: devices.cpp,v 1.4 2003/01/07 16:23:11 robd Exp $
*/
/*
*
@ -62,6 +62,4 @@ APIRET STDCALL Dos32DevIOCtl(HFILE hDevice, ULONG category, ULONG function,
return ERROR_CALL_NOT_IMPLEMENTED;
}
/* EOF */
/* EOF */

View file

@ -1,4 +1,4 @@
; $Id: doscalls.def,v 1.4 2002/09/04 22:19:47 robertk Exp $
; $Id: doscalls.def,v 1.5 2003/01/07 16:23:11 robd Exp $
;
; Def for doscalls.dll - part of the OS/2-sub system
; for ReactOS. Provides Access to OS/2 kernel services.
@ -10,14 +10,14 @@ DESCRIPTION "Part of the ReactOS OS/2 sub system, provides base kernel services
EXPORTS
; FIXME: fill in all exports
DosSleep@4
DosClose@4
DosOpen@32
DosRead@16
DosWrite@16
DosDevIOCtl@36
DosBeep@8
DosExit@8
DosCreateThread@20
DosSleep
Dos32Close
Dos32Open
Dos32Read
Dos32Write
;DosDevIOCtl
DosBeep
DosExit
DosCreateThread
; EOF

View file

@ -1,4 +1,4 @@
; $Id: doscalls.edf,v 1.2 2002/03/24 18:55:38 ea Exp $
; $Id: doscalls.edf,v 1.3 2003/01/07 16:23:11 robd Exp $
;
; Def for doscalls.dll - part of the OS/2-sub system
; for ReactOS. Provides Access to OS/2 kernel services.
@ -10,14 +10,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
DosSleep=DosSleep@4 @229
Dos32Close=Dos32Close@4 @257
Dos32Open=Dos32Open@32 @273
Dos32Read=Dos32Read@16 @281
Dos32Write=Dos32Write@16 @282
;DosDevIOCtl=DosDevIOCtl@36 @284
DosBeep=DosBeep@8 @286
DosExit=DosExit@8 @234
DosCreateThread=DosCreateThread@20 @311
; EOF

View file

@ -0,0 +1 @@
*.o

View file

@ -1,4 +1,4 @@
/* $Id: openclose.cpp,v 1.3 2002/09/04 22:19:47 robertk Exp $
/* $Id: openclose.cpp,v 1.4 2003/01/07 16:23:11 robd Exp $
*/
/*
*
@ -20,7 +20,6 @@
#include "ros2.h"
APIRET STDCALL Dos32Open(PSZ pszFileName, PHFILE pHf,
PULONG pulAction, ULONG cbFile,
ULONG ulAttribute, ULONG fsOpenFlags,
@ -130,12 +129,14 @@ APIRET STDCALL Dos32Close(HFILE hFile)
nErrCode = NT::ZwClose( (NT::HANDLE)hFile );
switch( nErrCode )
{
/*
case STATUS_SUCCESS:
return NO_ERROR;
case STATUS_INVALID_HANDLE:
return ERROR_INVALID_HANDLE;
case STATUS_HANDLE_NOT_CLOSABLE:
return ERROR_FILE_NOT_FOUND;
*/
}
return nErrCode;
}
@ -155,9 +156,11 @@ APIRET STDCALL Dos32Read(HFILE hFile, PVOID pBuffer,
*pcbActual = isbStatus.Information;
switch(nErrCode)
{
/*
case STATUS_INVALID_HANDLE:
return ERROR_INVALID_HANDLE;
// FIXME: complete this
*/
}
return NO_ERROR;
}
@ -175,12 +178,14 @@ APIRET STDCALL Dos32Write(HFILE hFile, PVOID pBuffer,
return ERROR_CALL_NOT_IMPLEMENTED;
switch(nErrCode)
{
/*
case STATUS_SUCCESS:
case STATUS_PENDING:
case STATUS_ACCESS_DENIED:
case STATUS_INVALID_HANDLE:
case STATUS_FILE_LOCK_CONFLICT:
return 0;
*/
}
return 0;
}

View file

@ -1,4 +1,4 @@
# $Id: makefile,v 1.5 2002/09/04 22:19:47 robertk Exp $
# $Id: makefile,v 1.6 2003/01/07 16:23:11 robd Exp $
PATH_TO_TOP = ../../../reactos
@ -15,7 +15,7 @@ TARGET_BASE = 0x60000000
TARGET_CPPFLAGS =\
-Wall \
-I$(PATH_TO_OS2_TOP)/include \
-D__DOSCALLSDLL__
-D__DOSCALLSDLL__
# removed CFLAGX
# -fno-builtin \
# -nostdinc \
@ -23,24 +23,33 @@ TARGET_CPPFLAGS =\
TARGET_LFLAGS = -nostartfiles
TARGET_LIBS = doscalls.a
TARGET_SDKLIBS = ntdll.a
#TARGET_GCCLIBS = gcc
TARGET_GCCLIBS = stdc++
TARGET_OBJECTS = $(TARGET_NAME).o
TARGET_CLEAN = file/*.o vio/*.o sync/*.o mem/*.o \
misc/*.o mou/*.o kbd/*.o run/*.o \
doscalls.dll temp.exp
DOSCALLS_MISC_OBJECTS = misc/doscalls.o misc/error.o
MISC_OBJECTS = misc/doscalls.o misc/error.o
DOSCALLS_OTHER_O = file/openclose.o run/process.o devices/devices.o
FILE_OBJECTS = file/openclose.o
#SYNC_OBJECTS =
RUN_OBJECTS = run/process.o
TARGET_OBJECTS = $(DOSCALLS_OTHER_O) $(DOSCALLS_MISC_OBJECTS)
DEVICES_OBJECTS = devices/devices.o
OTHER_OBJECTS =
SYNC_OBJECTS =
TARGET_OBJECTS = $(FILE_OBJECTS) $(RUN_OBJECTS) $(DEVICES_OBJECTS) \
$(MISC_OBJECTS) $(OTHER_OBJECTS) $(SYNC_OBJECTS)
#TARGET_CLEAN = file/*.o vio/*.o sync/*.o mem/*.o \
# misc/*.o mou/*.o kbd/*.o run/*.o \
# doscalls.dll temp.exp
include $(PATH_TO_TOP)/rules.mak

View file

@ -0,0 +1 @@
*.o

View file

@ -1,4 +1,4 @@
/* $Id: error.cpp,v 1.2 2002/09/04 22:19:47 robertk Exp $
/* $Id: error.cpp,v 1.3 2003/01/07 16:23:11 robd Exp $
*/
/*
*
@ -119,7 +119,7 @@ APIRET STDCALL DosBeep(ULONG freq, ULONG dur)
0 NO_ERROR
87 ERROR_INVALID_PARAMETER
/*******************************************/
*******************************************/
APIRET DosError( ULONG error)
{
return ERROR_CALL_NOT_IMPLEMENTED;
@ -162,11 +162,4 @@ APIRET DosMove(PSZ pszOld, PSZ pszNew)
return ERROR_CALL_NOT_IMPLEMENTED;
}
/* EOF */

View file

@ -0,0 +1 @@
*.o

View file

@ -1,4 +1,4 @@
/* $Id: process.cpp,v 1.5 2002/09/04 22:19:47 robertk Exp $
/* $Id: process.cpp,v 1.6 2003/01/07 16:23:11 robd Exp $
*/
/*
*
@ -15,6 +15,7 @@
*/
//#if defined (INCL_DOS)
#define INCL_DOSPROCESS
#define INCL_DOSERRORS
#include "ros2.h"
@ -30,7 +31,7 @@ APIRET STDCALL DosSleep(ULONG msec)
}
/* $Id: process.cpp,v 1.5 2002/09/04 22:19:47 robertk Exp $ */
/* $Id: process.cpp,v 1.6 2003/01/07 16:23:11 robd Exp $ */
/* Terminates the current thread or the current Process.
Decission is made by action
FIXME: move this code to OS2.EXE */