Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-15 05:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

W32kSetTextColor, W32GetDCState16 needed __stdcall; changed the subsystem field from windows to native

Browse source 
svn path=/trunk/; revision=748
This commit is contained in:
Emanuele Aliberti 1999-10-31 22:43:40 +00:00
parent 31c5b7839f
commit f0f8791763
2 changed files with 44 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
reactos/subsys/win32k/makefile
View file

@ -1,3 +1,4 @@
# $Id: makefile,v 1.13 1999/10/31 22:43:40 ea Exp $
# #
# WIN32K.SYS build spec # WIN32K.SYS build spec
# #
@ -24,7 +25,6 @@ OBJECTS = $(ENG_OBJECTS) $(MAIN_OBJECTS) $(MISC_OBJECTS) $(OBJECTS_OBJECTS) \
all: $(TARGET).sys all: $(TARGET).sys
$(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h $(TARGET).coff: $(TARGET).rc ../../include/reactos/resource.h
$(RC) $(TARGET).rc $(TARGET).coff
ifeq ($(DOSCLI),yes) ifeq ($(DOSCLI),yes)
CLEAN_FILES = main\*.o misc\*.o stubs\*.o objects\*.o $(TARGET).coff $(TARGET).o \ CLEAN_FILES = main\*.o misc\*.o stubs\*.o objects\*.o $(TARGET).coff $(TARGET).o \
@ -36,28 +36,48 @@ endif
$(TARGET).sys: $(OBJECTS) $(TARGET).def $(TARGET).sys: $(OBJECTS) $(TARGET).def
$(LD) -r $(OBJECTS) -o $(TARGET).o $(LD) -r $(OBJECTS) -o $(TARGET).o
$(DLLTOOL) --dllname $(TARGET).sys --def $(TARGET).def \ $(DLLTOOL) \
--output-lib $(TARGET).a --dllname $(TARGET).sys \
$(CC) --subsystem=windows -mdll --dll -e _DllMain@12 -o junk.tmp \ --def $(TARGET).def \
-Wl,--image-base,0x0 \ --output-lib $(TARGET).a
-Wl,--file-alignment,0x1000 \ $(CC) \
-Wl,--section-alignment,0x1000 \ --subsystem=native \
-Wl,--defsym,_end=end \ -mdll \
-Wl,--defsym,_edata=__data_end__ \ --dll \
-Wl,--defsym,_etext=etext -Wl,--base-file,base.tmp $(TARGET).o \ -e _DllMain@12 \
-specs=../../specs ../../ntoskrnl/ntoskrnl.a -o junk.tmp \
-Wl,--image-base,0x0 \
-Wl,--file-alignment,0x1000 \
-Wl,--section-alignment,0x1000 \
-Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ \
-Wl,--defsym,_etext=etext \
-Wl,--base-file,base.tmp $(TARGET).o \
-specs=../../specs \
../../ntoskrnl/ntoskrnl.a
- $(RM) junk.tmp - $(RM) junk.tmp
$(DLLTOOL) --dllname $(TARGET).sys --base-file base.tmp \ $(DLLTOOL) \
--output-exp temp.exp --def $(TARGET).def --dllname $(TARGET).sys \
--base-file base.tmp \
--output-exp temp.exp \
--def $(TARGET).def
- $(RM) base.tmp - $(RM) base.tmp
$(CC) --subsystem=windows -mdll --dll -e _DllMain@12 \ $(CC) \
-o $(TARGET).sys $(TARGET).o ../../ntoskrnl/ntoskrnl.a \ --subsystem=native \
-Wl,--image-base,0x0 \ -mdll \
-Wl,--file-alignment,0x1000 \ --dll \
-Wl,--section-alignment,0x1000 \ -e _DllMain@12 \
-Wl,--defsym,_end=end \ -o $(TARGET).sys \
-Wl,--defsym,_edata=__data_end__ \ $(TARGET).o \
-Wl,--defsym,_etext=etext -Wl,temp.exp -specs=../../specs ../../ntoskrnl/ntoskrnl.a \
-Wl,--image-base,0x0 \
-Wl,--file-alignment,0x1000 \
-Wl,--section-alignment,0x1000 \
-Wl,--defsym,_end=end \
-Wl,--defsym,_edata=__data_end__ \
-Wl,--defsym,_etext=etext \
-Wl,temp.exp \
-specs=../../specs
- $(RM) temp.exp - $(RM) temp.exp
$(NM) --numeric-sort $(TARGET).sys > $(TARGET).sym $(NM) --numeric-sort $(TARGET).sys > $(TARGET).sym

5
reactos/subsys/win32k/objects/dc.c
View file

@ -1,4 +1,5 @@
/* /* $Id: dc.c,v 1.8 1999/10/31 22:43:40 ea Exp $
*
* DC.C - Device context functions * DC.C - Device context functions
* *
*/ */
@ -336,7 +337,7 @@ BOOL STDCALL W32kGetDCOrgEx(HDC hDC,
return TRUE; return TRUE;
} }
HDC W32kGetDCState16(HDC hDC) HDC STDCALL W32kGetDCState16(HDC hDC)
{ {
PDC newdc, dc; PDC newdc, dc;