Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 01:45:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix nci tool to only generate one stub file for our win32ksys lib to silence the warning. Fix some comments.

Browse source 
svn path=/trunk/; revision=28060
This commit is contained in:
Timo Kreuzer 2007-07-31 23:00:31 +00:00
parent 2412a1aeb1
commit 4ef86834f9
2 changed files with 627 additions and 635 deletions
Download patch file Download diff file Expand all files Collapse all files

6
reactos/tools/nci/nci.mak
View file

@ -44,8 +44,7 @@ clean: nci_clean
# WIN32K.SYS # WIN32K.SYS
WIN32K_SVC_DB = subsystems$(SEP)win32$(SEP)win32k$(SEP)w32ksvc.db WIN32K_SVC_DB = subsystems$(SEP)win32$(SEP)win32k$(SEP)w32ksvc.db
WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h WIN32K_SERVICE_TABLE = subsystems$(SEP)win32$(SEP)win32k$(SEP)include$(SEP)napi.h
WIN32K_GDI_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S WIN32K_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S
WIN32K_USER_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S
@ -78,8 +77,7 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB)
$(WIN32K_SERVICE_TABLE) \ $(WIN32K_SERVICE_TABLE) \
$(NTDLL_STUBS) \ $(NTDLL_STUBS) \
$(KERNEL_STUBS) \ $(KERNEL_STUBS) \
$(WIN32K_GDI_STUBS) \ $(WIN32K_STUBS)
$(WIN32K_USER_STUBS)
.PHONY: nci_service_files_clean .PHONY: nci_service_files_clean
nci_service_files_clean: nci_service_files_clean:

24
reactos/tools/nci/ncitool.c
View file

@ -21,7 +21,7 @@
/* DEFINES ****************************************************************/ /* DEFINES ****************************************************************/
#define INPUT_BUFFER_SIZE 255 #define INPUT_BUFFER_SIZE 255
#define Arguments 8 #define Arguments 7
/******* Table Indexes ************/ /******* Table Indexes ************/
#define MAIN_INDEX 0x0 #define MAIN_INDEX 0x0
@ -39,8 +39,7 @@
/* And finally, the stub files. */ /* And finally, the stub files. */
#define NtosUserStubs 4 #define NtosUserStubs 4
#define NtosKernelStubs 5 #define NtosKernelStubs 5
#define Win32kGdiStubs 6 #define Win32kStubs 6
#define Win32kUserStubs 7
/********** Stub Code ************/ /********** Stub Code ************/
@ -333,11 +332,11 @@ GetNameAndArgumentsFromDb(char Line[],
* *
* KernelModeFile - Kernelmode Stub Files to which to write the stubs. * KernelModeFile - Kernelmode Stub Files to which to write the stubs.
* *
* Index - Name of System Call for which to add the stub. * Index - Number of first syscall
* *
* UserFiles - Number of bytes on the stack to return after doing the system call. * UserFiles - Number of Usermode Stub Files to create
* *
* NeedsZw - Service Descriptor Table ID for this System Call. * NeedsZw - Write Zw prefix?
* *
* Returns: * Returns:
* None. * None.
@ -579,14 +578,9 @@ int main(int argc, char* argv[])
argv[NtosKernelStubs + ArgOffset]); argv[NtosKernelStubs + ArgOffset]);
fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]);
WriteFileHeader(Files[Win32kGdiStubs], WriteFileHeader(Files[Win32kStubs],
"System Call Stubs for Native API", "System Call Stubs for Native API",
argv[Win32kGdiStubs + ArgOffset]); argv[Win32kStubs + ArgOffset]);
WriteFileHeader(Files[Win32kUserStubs],
"System Call Stubs for Native API",
argv[Win32kUserStubs + ArgOffset]);
/* Create the System Stubs */ /* Create the System Stubs */
CreateStubs(Files[NativeSystemDb], CreateStubs(Files[NativeSystemDb],
@ -598,10 +592,10 @@ int main(int argc, char* argv[])
/* Create the Graphics Stubs */ /* Create the Graphics Stubs */
CreateStubs(Files[NativeGuiDb], CreateStubs(Files[NativeGuiDb],
&Files[Win32kGdiStubs], &Files[Win32kStubs],
NULL, NULL,
WIN32K_INDEX, WIN32K_INDEX,
2, 1,
0); 0);
/* Rewind the databases */ /* Rewind the databases */