From b129b2caea45ae1c244d199b4b3fe16a3fb066be Mon Sep 17 00:00:00 2001 From: Emanuele Aliberti Date: Wed, 8 Mar 2000 22:37:04 +0000 Subject: [PATCH] Some minor fixes. svn path=/trunk/; revision=1037 --- reactos/drivers/net/ndis/Makefile | 4 ++-- reactos/drivers/net/tcpip/Makefile_rex | 4 ++-- reactos/drivers/net/tcpip/misc/main.c | 9 +++++---- reactos/drivers/net/tdi/Makefile | 4 ++-- reactos/drivers/net/tdi/misc/main.c | 9 +++++---- reactos/include/ddk/winddi.h | 2 +- reactos/subsys/win32k/ldr/loader.c | 8 ++++++-- reactos/subsys/win32k/makefile | 4 ++-- reactos/subsys/win32k/stubs/stubs.c | 1 - reactos/subsys/win32k/win32k.def | 4 ++-- 10 files changed, 27 insertions(+), 22 deletions(-) diff --git a/reactos/drivers/net/ndis/Makefile b/reactos/drivers/net/ndis/Makefile index 3ec428d9822..bbe7a43f717 100644 --- a/reactos/drivers/net/ndis/Makefile +++ b/reactos/drivers/net/ndis/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1999/11/24 23:06:23 ea Exp $ +# $Id: Makefile,v 1.2 2000/03/08 22:37:01 ea Exp $ # # NDIS.SYS build spec # @@ -44,7 +44,7 @@ $(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def --subsystem=native \ -mdll \ --dll \ - -e _DllMain@8 \ + -e _DriverEntry@8 \ -o junk.tmp \ -Wl,--image-base,0x0 \ -Wl,--file-alignment,0x1000 \ diff --git a/reactos/drivers/net/tcpip/Makefile_rex b/reactos/drivers/net/tcpip/Makefile_rex index 92a3c09c472..5adb05c2851 100644 --- a/reactos/drivers/net/tcpip/Makefile_rex +++ b/reactos/drivers/net/tcpip/Makefile_rex @@ -1,4 +1,4 @@ -# $Id: Makefile_rex,v 1.1 1999/11/20 20:36:45 ea Exp $ +# $Id: Makefile_rex,v 1.2 2000/03/08 22:37:02 ea Exp $ # # TCPIP.SYS build spec # @@ -40,7 +40,7 @@ $(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def --subsystem=native \ -mdll \ --dll \ - -e _DllMain@8 \ + -e _DriverEntry@8 \ -o junk.tmp \ -Wl,--image-base,0x0 \ -Wl,--file-alignment,0x1000 \ diff --git a/reactos/drivers/net/tcpip/misc/main.c b/reactos/drivers/net/tcpip/misc/main.c index 84e00d8e9e5..52c89f30d30 100644 --- a/reactos/drivers/net/tcpip/misc/main.c +++ b/reactos/drivers/net/tcpip/misc/main.c @@ -1,15 +1,16 @@ -/* $Id: main.c,v 1.1 1999/11/20 20:36:46 ea Exp $ */ +/* $Id: main.c,v 1.2 2000/03/08 22:37:02 ea Exp $ */ #include -BOOLEAN +NTSTATUS STDCALL -DllMain ( +DriverEntry ( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ) { - return TRUE; + return STATUS_UNSUCCESSFUL; } + /* EOF */ diff --git a/reactos/drivers/net/tdi/Makefile b/reactos/drivers/net/tdi/Makefile index 19bfc094d0b..8b8ada8c68c 100644 --- a/reactos/drivers/net/tdi/Makefile +++ b/reactos/drivers/net/tdi/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.4 1999/11/28 07:59:28 ea Exp $ +# $Id: Makefile,v 1.5 2000/03/08 22:37:02 ea Exp $ # # TDI.SYS build spec # @@ -66,7 +66,7 @@ $(TARGETNAME).sys: $(OBJECTS) misc/$(TARGETNAME).def --subsystem=native \ -mdll \ --dll \ - -e _DllMain@8 \ + -e _DriverEntry@8 \ -o $(TARGETNAME).sys \ $(TARGETNAME).o \ ../../../ntoskrnl/ntoskrnl.a \ diff --git a/reactos/drivers/net/tdi/misc/main.c b/reactos/drivers/net/tdi/misc/main.c index 42f0667748b..e14c8004d01 100644 --- a/reactos/drivers/net/tdi/misc/main.c +++ b/reactos/drivers/net/tdi/misc/main.c @@ -1,18 +1,19 @@ -/* $Id: main.c,v 1.1 1999/11/20 20:41:29 ea Exp $ +/* $Id: main.c,v 1.2 2000/03/08 22:37:03 ea Exp $ * * DESCRIPTION: Entry point for TDI.SYS */ #include -BOOLEAN +NTSTATUS STDCALL -DllMain ( +DriverEntry ( IN PDRIVER_OBJECT DriverObject, IN PUNICODE_STRING RegistryPath ) { - return FALSE; /* ? */ + return STATUS_UNSUCCESSFUL; } + /* EOF */ diff --git a/reactos/include/ddk/winddi.h b/reactos/include/ddk/winddi.h index 14b7404730c..14812e3f793 100644 --- a/reactos/include/ddk/winddi.h +++ b/reactos/include/ddk/winddi.h @@ -924,7 +924,7 @@ VOID APIENTRY EngDebugPrint(PCHAR StandardPrefix, PCHAR DebugMessage, va_list ArgList); -HANDLE EngLoadImage(LPWSTR DriverName); +HANDLE STDCALL EngLoadImage(LPWSTR DriverName); /* EngDeleteClip diff --git a/reactos/subsys/win32k/ldr/loader.c b/reactos/subsys/win32k/ldr/loader.c index f9976e6caed..dc509856d38 100644 --- a/reactos/subsys/win32k/ldr/loader.c +++ b/reactos/subsys/win32k/ldr/loader.c @@ -1,6 +1,10 @@ #include -HANDLE EngLoadImage(LPWSTR DriverName) +HANDLE __cdecl LdrLoadModule (LPWSTR); + +HANDLE +STDCALL +EngLoadImage (LPWSTR DriverName) { - return LdrLoadModule(DriverName); + return (HANDLE) LdrLoadModule(DriverName); } diff --git a/reactos/subsys/win32k/makefile b/reactos/subsys/win32k/makefile index e3b6d9fa0f7..ca3b2020e59 100644 --- a/reactos/subsys/win32k/makefile +++ b/reactos/subsys/win32k/makefile @@ -1,4 +1,4 @@ -# $Id: makefile,v 1.16 2000/03/08 21:23:13 jfilby Exp $ +# $Id: makefile,v 1.17 2000/03/08 22:37:03 ea Exp $ # # WIN32K.SYS build spec # @@ -63,7 +63,7 @@ $(TARGET).sys: $(OBJECTS) $(TARGET).def --dllname $(TARGET).sys \ --base-file base.tmp \ --output-exp temp.exp \ - --def $(TARGET).def + --def $(TARGET).edf - $(RM) base.tmp $(CC) \ --subsystem=native \ diff --git a/reactos/subsys/win32k/stubs/stubs.c b/reactos/subsys/win32k/stubs/stubs.c index 49576bbe1fa..71165d85569 100644 --- a/reactos/subsys/win32k/stubs/stubs.c +++ b/reactos/subsys/win32k/stubs/stubs.c @@ -62,7 +62,6 @@ STUB(EngGetPrinterDataFileName) STUB(EngGetProcessHandle) STUB(EngGetType1FontList) STUB(EngLineTo) -STUB(EngLoadImage) STUB(EngLoadModule) STUB(EngLoadModuleForWrite) STUB(EngLockDriverObj) diff --git a/reactos/subsys/win32k/win32k.def b/reactos/subsys/win32k/win32k.def index 28776fe4d92..83e54d99cec 100644 --- a/reactos/subsys/win32k/win32k.def +++ b/reactos/subsys/win32k/win32k.def @@ -1,4 +1,4 @@ -; $Id: win32k.def,v 1.7 1999/11/20 21:47:58 ekohl Exp $ +; $Id: win32k.def,v 1.8 2000/03/08 22:37:03 ea Exp $ ; ; win32k.def ; @@ -63,7 +63,7 @@ EngGetPrinterDataFileName EngGetProcessHandle EngGetType1FontList EngLineTo -EngLoadImage +EngLoadImage@4 EngLoadModule EngLoadModuleForWrite EngLockDriverObj