Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some bug fixes

Browse source 
svn path=/trunk/; revision=1387
This commit is contained in:
David Welch 2000-10-07 18:44:08 +00:00
parent fe87b12edd
commit f1096bb7f0
11 changed files with 36 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/apps/utils/net/ping/makefile
View file

@ -4,7 +4,7 @@
PATH_TO_TOP = ../../..
TARGETNAME=ping
BASE_CFLAGS = -I../../../include
CFLAGS = -I../../../include
OBJECTS = $(TARGETNAME).o
PROGS = $(TARGETNAME).exe

2
reactos/apps/utils/net/ping/ping.c
View file

@ -20,6 +20,8 @@
/* Should be in the header files somewhere (exported by ntdll.dll) */
long atol(const char *str);
typedef long long __int64;
char * _i64toa(__int64 value, char *string, int radix);
#endif

7
reactos/drivers/net/dd/ne2000/Makefile
View file

@ -1,9 +1,11 @@
# $Id: Makefile,v 1.3 2000/10/07 13:41:56 dwelch Exp $
# $Id: Makefile,v 1.4 2000/10/07 18:44:07 dwelch Exp $
#
#
PATH_TO_TOP = ../../../..
TARGET = ne2000
CFLAGS = -Iinclude
TARGETNAME = ne2000
OBJECTS = ne2000/main.o ne2000/8390.o $(TARGET).coff $(PATH_TO_TOP)/ntoskrnl/ntoskrnl.a
@ -36,6 +38,7 @@ CLEAN_FILES = \
$(TARGETNAME).sys $(TARGETNAME).sym
endif
clean:
$(TARGETNAME).sys: $(OBJECTS) $(TARGETNAME).def
$(LD) -r $(OBJECTS) -o $(TARGETNAME).o

2
reactos/drivers/net/wshtcpip/makefile
View file

@ -2,7 +2,7 @@
PATH_TO_TOP = ../../..
BASE_CFLAGS = -I./ -I../../../include -DUNICODE
CFLAGS = -I./ -DUNICODE
TARGETNAME=wshtcpip

2
reactos/include/ddk/zwtypes.h
View file

@ -4,6 +4,8 @@
#define NtCurrentProcess() ( (HANDLE) 0xFFFFFFFF )
#define NtCurrentThread() ( (HANDLE) 0xFFFFFFFE )
typedef PVOID RTL_ATOM;
#ifdef __NTOSKRNL__
extern ULONG EXPORTED NtBuildNumber;
#else

10
reactos/include/ntos/types.h
View file

@ -68,11 +68,6 @@ typedef union _LARGE_INTEGER
DWORD LowPart;
LONG HighPart;
} u;
struct
{
DWORD LowPart;
LONG HighPart;
};
LONGLONG QuadPart;
} LARGE_INTEGER, *PLARGE_INTEGER;
@ -83,11 +78,6 @@ typedef union _ULARGE_INTEGER
DWORD LowPart;
DWORD HighPart;
} u;
struct
{
DWORD LowPart;
DWORD HighPart;
};
ULONGLONG QuadPart;
} ULARGE_INTEGER, *PULARGE_INTEGER;

2
reactos/lib/ws2_32/makefile
View file

@ -2,7 +2,7 @@
PATH_TO_TOP = ../..
BASE_CFLAGS = -Iinclude -I../../include -DUNICODE
CFLAGS = -Iinclude -DUNICODE
TARGETNAME=ws2_32

5
reactos/ntoskrnl/cm/registry.c
View file

@ -1,4 +1,4 @@
/* $Id: registry.c,v 1.40 2000/10/05 19:13:48 ekohl Exp $
/* $Id: registry.c,v 1.41 2000/10/07 18:44:06 dwelch Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -23,6 +23,9 @@
/* ----------------------------------------------------- Typedefs */
#define RTL_REGISTRY_MAXIMUM 0
#define RTL_REGISTRY_HANDLE 0
//#define LONG_MAX 0x7fffffff
#define REG_BLOCK_SIZE 4096

20
reactos/ntoskrnl/io/event.c
View file

@ -1,4 +1,4 @@
/* $Id: event.c,v 1.3 2000/10/06 16:54:04 ekohl Exp $
/* $Id: event.c,v 1.4 2000/10/07 18:44:07 dwelch Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -18,8 +18,7 @@
/* FUNCTIONS *****************************************************************/
PKEVENT
STDCALL
PKEVENT STDCALL
IoCreateNotificationEvent(PUNICODE_STRING EventName,
PHANDLE EventHandle)
{
@ -40,13 +39,15 @@ IoCreateNotificationEvent(PUNICODE_STRING EventName,
FALSE,
TRUE);
if (!NT_SUCCESS(Status))
return NULL;
{
return NULL;
}
ObReferenceObjectByHandle(Handle,
0,
ExEventObjectType,
KernelMode,
&Event,
(PVOID*)&Event,
NULL);
ObDereferenceObject(Event);
@ -55,8 +56,7 @@ IoCreateNotificationEvent(PUNICODE_STRING EventName,
return Event;
}
PKEVENT
STDCALL
PKEVENT STDCALL
IoCreateSynchronizationEvent(PUNICODE_STRING EventName,
PHANDLE EventHandle)
{
@ -77,13 +77,15 @@ IoCreateSynchronizationEvent(PUNICODE_STRING EventName,
TRUE,
TRUE);
if (!NT_SUCCESS(Status))
return NULL;
{
return NULL;
}
ObReferenceObjectByHandle(Handle,
0,
ExEventObjectType,
KernelMode,
&Event,
(PVOID*)&Event,
NULL);
ObDereferenceObject(Event);

15
reactos/ntoskrnl/ke/main.c
View file

@ -1,4 +1,4 @@
/* $Id: main.c,v 1.63 2000/10/07 13:41:52 dwelch Exp $
/* $Id: main.c,v 1.64 2000/10/07 18:44:07 dwelch Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -387,7 +387,7 @@ void _main (ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock)
* Initializes the kernel parameter line.
* This should be done by the boot loader.
*/
strcpy (KeLoaderBlock.CommandLine,
strcpy ((PUCHAR)KeLoaderBlock.CommandLine,
"multi(0)disk(0)rdisk(0)partition(1)\\reactos /DEBUGPORT=SCREEN");
/*
@ -475,9 +475,10 @@ void _main (ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock)
}
/* Create the SystemRoot symbolic link */
CreateSystemRootLink (KeLoaderBlock.CommandLine);
CreateSystemRootLink ((PUCHAR)KeLoaderBlock.CommandLine);
CmInitializeRegistry2();
/*
* Load Auto configured drivers
*/
@ -495,11 +496,11 @@ void _main (ULONG MultiBootMagic, PLOADER_PARAMETER_BLOCK _LoaderBlock)
* Initialize shared user page:
* - set dos system path, dos device map, etc.
*/
InitSystemSharedUserPage (KeLoaderBlock.CommandLine);
InitSystemSharedUserPage ((PUCHAR)KeLoaderBlock.CommandLine);
/*
* Launch initial process
*/
/*
* Launch initial process
*/
LdrLoadInitialProcess();
DbgPrint("Finished main()\n");

1
reactos/ntoskrnl/ke/multiboot.S
View file

@ -21,6 +21,7 @@
* EBX = Points to a structure in lowmem with data from the
* loader
*/
_start:
jmp _multiboot_entry