Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

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

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Aug 1 03:00:31 2007 New Revision: 28060 URL: http://svn.reactos.org/svn/reactos?rev=28060&view=rev Log: fix nci tool to only generate one stub file for our win32ksys lib to silence the warning. Fix some comments. Modified: trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/nci/ncitool.c Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2806… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Aug 1 03:00:31 2007 @@ -44,8 +44,7 @@ # WIN32K.SYS 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_GDI_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S -WIN32K_USER_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S +WIN32K_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S @@ -78,8 +77,7 @@ $(WIN32K_SERVICE_TABLE) \ $(NTDLL_STUBS) \ $(KERNEL_STUBS) \ - $(WIN32K_GDI_STUBS) \ - $(WIN32K_USER_STUBS) + $(WIN32K_STUBS) .PHONY: nci_service_files_clean nci_service_files_clean: Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=28… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Wed Aug 1 03:00:31 2007 @@ -1,631 +1,625 @@ -/* - * FILE: tools/nci/ncitool.c - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: Native Call Interface Support Tool - * PURPOSE: Generates NCI Tables and Stubs. - * PROGRAMMER; Alex Ionescu (alex(a)relsoft.net) - * CHANGE HISTORY: 14/01/05 - Created. Based on original code by - * KJK::Hyperion and Emanuelle Aliberti. - * - */ - -/* INCLUDE ******************************************************************/ - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#ifndef __FreeBSD__ -# include <malloc.h> -#endif // __FreeBSD__ - -/* DEFINES ****************************************************************/ - -#define INPUT_BUFFER_SIZE 255 -#define Arguments 8 - -/******* Table Indexes ************/ -#define MAIN_INDEX 0x0 -#define WIN32K_INDEX 0x1000 - -/******* Argument List ************/ -/* First, define the Databases */ -#define NativeSystemDb 0 -#define NativeGuiDb 1 - -/* Now the Service Tables */ -#define NtosServiceTable 2 -#define Win32kServiceTable 3 - -/* And finally, the stub files. */ -#define NtosUserStubs 4 -#define NtosKernelStubs 5 -#define Win32kGdiStubs 6 -#define Win32kUserStubs 7 - -/********** Stub Code ************/ - -/* - * This stubs calls into KUSER_SHARED_DATA where either a - * sysenter or interrupt is performed, depending on CPU support. - */ -#if defined(__GNUC__) -#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ - " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ - " call *(%%ecx)\n" \ - " ret $0x%x\n\n" - -#define UserModeStub_ppc " mflr 0\n" \ - " addi 1,1,-16\n" \ - " li 0,%x\n" \ - " stw 0,1(0)\n" \ - " sc\n" \ - " lwz 0,1(0)\n" \ - " mtlr 0\n" \ - " addi 1,1,16\n" \ - " blr\n" -#elif defined(_MSC_VER) -#define UserModeStub_x86 " asm { \n" \ - " mov eax, %xh\n" \ - " mov ecx, KUSER_SHARED_SYSCALL\n" \ - " call [ecx]\n" \ - " ret %xh\n" \ - " }\n" -#else -#error Unknown compiler for inline assembler -#endif - -/* - * This stub calls KiSystemService directly with a fake INT2E stack. - * Because EIP is pushed during the call, the handler will return here. - */ -#if defined(__GNUC__) -#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ - " leal 4(%%esp), %%edx\n" \ - " pushfl\n" \ - " pushl $KGDT_R0_CODE\n" \ - " call _KiSystemService\n" \ - " ret $0x%x\n\n" - -#define KernelModeStub_ppc " bl KiSystemService\n" \ - " rfi\n" -#elif defined(_MSC_VER) -#define KernelModeStub_x86 " asm { \n" \ - " mov eax, %xh\n" \ - " lea edx, [esp+4]\n" \ - " pushf\n" \ - " push KGDT_R0_CODE\n" \ - " call _KiSystemService\n" \ - " ret %xh\n" \ - " }\n" -#else -#error Unknown compiler for inline assembler -#endif - -/***** Arch Dependent Stuff ******/ -struct ncitool_data_t { - const char *arch; - int args_to_bytes; - const char *km_stub; - const char *um_stub; - const char *global_header; - const char *declaration; -}; - -struct ncitool_data_t ncitool_data[] = { - { "i386", 4, KernelModeStub_x86, UserModeStub_x86, - ".global _%s@%d\n", "_%s@%d:\n" }, - { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, - "\t.globl %s\n", "%s:\n" }, - { 0, } -}; -int arch_sel = 0; -#define ARGS_TO_BYTES(x) (x)*(ncitool_data[arch_sel].args_to_bytes) -#define UserModeStub ncitool_data[arch_sel].um_stub -#define KernelModeStub ncitool_data[arch_sel].km_stub -#define GlobalHeader ncitool_data[arch_sel].global_header -#define Declaration ncitool_data[arch_sel].declaration - -/* FUNCTIONS ****************************************************************/ - -/*++ - * WriteFileHeader - * - * Prints out the File Header for a Stub File. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * FileDescription - Description of the Stub file to which to write the header. - * - * FileLocation - Name of the Stub file to which to write the header. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for printing the header. - * - *--*/ -void -WriteFileHeader(FILE * StubFile, - char* FileDescription, - char* FileLocation) -{ - /* This prints out the file header */ - fprintf(StubFile, - "/* FILE: %s\n" - " * COPYRIGHT: See COPYING in the top level directory\n" - " * PURPOSE: %s\n" - " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" - " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" - " */\n\n\n" - "#include <ndk/asm.h>\n\n", - FileDescription, - FileLocation); -} - -/*++ - * WriteFileHeader - * - * Prints out the File Header for a Stub File. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * FileDescription - Description of the Stub file to which to write the header. - * - * FileLocation - Name of the Stub file to which to write the header. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for printing the header. - * - *--*/ -void -WriteStubHeader(FILE* StubFile, - char* SyscallName, - unsigned StackBytes) -{ - /* Export the function */ - fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); - - /* Define it */ - fprintf(StubFile, Declaration, SyscallName, StackBytes); -} - - -/*++ - * WriteKernelModeStub - * - * Prints out the Kernel Mode Stub for a System Call. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * SyscallName - Name of System Call for which to add the stub. - * - * StackBytes - Number of bytes on the stack to return after doing the system call. - * - * SyscallId - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -WriteKernelModeStub(FILE* StubFile, - char* SyscallName, - unsigned StackBytes, - unsigned int SyscallId) -{ - /* Write the Stub Header and export the Function */ - WriteStubHeader(StubFile, SyscallName, StackBytes); - - /* Write the Stub Code */ - fprintf(StubFile, KernelModeStub, SyscallId, StackBytes); -} - -/*++ - * WriteUserModeStub - * - * Prints out the User Mode Stub for a System Call. - * - * Params: - * StubFile - Stub File to which to write the header. - * - * SyscallName - Name of System Call for which to add the stub. - * - * StackBytes - Number of bytes on the stack to return after doing the system call. - * - * SyscallId - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -WriteUserModeStub(FILE* StubFile, - char* SyscallName, - unsigned StackBytes, - unsigned int SyscallId) -{ - /* Write the Stub Header and export the Function */ - WriteStubHeader(StubFile, SyscallName, StackBytes); - - /* Write the Stub Code */ - fprintf(StubFile, UserModeStub, SyscallId, StackBytes); -} - -/*++ - * GetNameAndArgumentsFromDb - * - * Parses an entry from a System Call Database, extracting - * the function's name and arguments that it takes. - * - * Params: - * Line - Entry from the Database to parse. - * - * NtSyscallName - Output string to which to save the Function Name - * - * SyscallArguments - Output string to which to save the number of - * arguments that the function takes. - * - * Returns: - * None. - * - * Remarks: - * On i386, StackBytes is the number of arguments x 4. - * - *--*/ -void -GetNameAndArgumentsFromDb(char Line[], - char ** NtSyscallName, - char ** SyscallArguments) -{ - char *s; - char *stmp; - - /* Remove new line */ - if ((s = (char *) strchr(Line,'\r')) != NULL) { - *s = '\0'; - } - - /* Skip comments (#) and empty lines */ - s = &Line[0]; - if ((*s) != '#' && (*s) != '\0') { - - /* Extract the NtXXX name */ - *NtSyscallName = (char *)strtok(s," \t"); - - /* Extract the argument count */ - *SyscallArguments = (char *)strtok(NULL," \t"); - - /* Remove, if present, the trailing LF */ - if ((stmp = strchr(*SyscallArguments, '\n')) != NULL) { - *stmp = '\0'; - } - - } else { - - /* Skip this entry */ - *NtSyscallName = NULL; - *SyscallArguments = NULL; - } -} - -/*++ - * CreateStubs - * - * Parses a System Call Database and creates stubs for all the entries. - * - * Params: - * SyscallDb - System Call Database to parse. - * - * UserModeFiles - Array of Usermode 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. - * - * UserFiles - Number of bytes on the stack to return after doing the system call. - * - * NeedsZw - Service Descriptor Table ID for this System Call. - * - * Returns: - * None. - * - * Remarks: - * None. - * - *--*/ -void -CreateStubs(FILE * SyscallDb, - FILE * UserModeFiles[], - FILE * KernelModeFile, - unsigned Index, - unsigned UserFiles, - unsigned NeedsZw) -{ - char Line[INPUT_BUFFER_SIZE]; - char *NtSyscallName; - char *SyscallArguments; - int SyscallId; - unsigned StackBytes; - - /* We loop, incrementing the System Call Index, until the end of the file */ - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - if (SyscallArguments != NULL) - StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); - else - StackBytes = 0; - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ - int i; - for (i= 0; i < UserFiles; i++) { - - /* Write the Nt Version */ - WriteUserModeStub(UserModeFiles[i], - NtSyscallName, - StackBytes, - SyscallId | Index); - - /* If a Zw Version is needed (was specified), write it too */ - if (NeedsZw) { - - NtSyscallName[0] = 'Z'; - NtSyscallName[1] = 'w'; - WriteUserModeStub(UserModeFiles[i], - NtSyscallName, - StackBytes, - SyscallId | Index); - } - - } - - /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ - if (KernelModeFile) { - - NtSyscallName[0] = 'Z'; - NtSyscallName[1] = 'w'; - WriteKernelModeStub(KernelModeFile, - NtSyscallName, - StackBytes, - SyscallId | Index); - } - - /* Only increase if we actually added something */ - SyscallId++; - } - } -} - -/*++ - * CreateSystemServiceTable - * - * Parses a System Call Database and creates a System Call Service Table for it. - * - * Params: - * SyscallDb - System Call Database to parse. - * - * SyscallTable - File in where to create System Call Service Table. - * - * Name - Name of the Service Table. - * - * FileLocation - Filename containing the Table. - * - * Returns: - * None. - * - * Remarks: - * FileLocation is only used for the header generation. - * - *--*/ -void -CreateSystemServiceTable(FILE *SyscallDb, - FILE *SyscallTable, - char * Name, - char * FileLocation) -{ - char Line[INPUT_BUFFER_SIZE]; - char *NtSyscallName; - char *SyscallArguments; - int SyscallId; - - /* Print the Header */ - WriteFileHeader(SyscallTable, "System Call Table for Native API", FileLocation); - - /* First we build the SSDT */ - fprintf(SyscallTable,"\n\n\n"); - fprintf(SyscallTable,"ULONG_PTR %sSSDT[] = {\n", Name); - - /* We loop, incrementing the System Call Index, until the end of the file */ - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Add a new line */ - if (SyscallId > 0) fprintf(SyscallTable,",\n"); - - /* Write the syscall name in the service table. */ - fprintf(SyscallTable,"\t\t(ULONG_PTR)%s", NtSyscallName); - - /* Only increase if we actually added something */ - SyscallId++; - } - } - - /* Close the service table (C syntax) */ - fprintf(SyscallTable,"\n};\n"); - - /* Now we build the SSPT */ - rewind(SyscallDb); - fprintf(SyscallTable,"\n\n\n"); - fprintf(SyscallTable,"UCHAR %sSSPT[] = {\n", Name); - - for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { - - /* Extract the Name and Arguments */ - GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Add a new line */ - if (SyscallId > 0) fprintf(SyscallTable,",\n"); - - /* Write the syscall arguments in the argument table. */ - if (SyscallArguments != NULL) - fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); - else - fprintf(SyscallTable,"\t\t0"); - - /* Only increase if we actually added something */ - SyscallId++; - } - } - - /* Close the service table (C syntax) */ - fprintf(SyscallTable,"\n};\n"); - - /* - * We write some useful defines - */ - fprintf(SyscallTable, "\n\n#define MIN_SYSCALL_NUMBER 0\n"); - fprintf(SyscallTable, "#define MAX_SYSCALL_NUMBER %d\n", SyscallId - 1); - fprintf(SyscallTable, "#define NUMBER_OF_SYSCALLS %d\n", SyscallId); - fprintf(SyscallTable, "ULONG %sNumberOfSysCalls = %d;\n", Name, SyscallId); -} - -void usage(char * argv0) -{ - printf("Usage: %s [-arch <arch>] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" - " sysfuncs.lst native system functions database\n" - " w32ksvc.db native graphic functions database\n" - " napi.h NTOSKRNL service table\n" - " ssdt.h WIN32K service table\n" - " napi.S NTDLL stubs\n" - " zw.S NTOSKRNL Zw stubs\n" - " win32k.S GDI32 stubs\n" - " win32k.S USER32 stubs\n" - " -arch is optional, default is %s\n", - argv0, - ncitool_data[0].arch - ); -} - -int main(int argc, char* argv[]) -{ - FILE * Files[Arguments] = { }; - int FileNumber, ArgOffset = 1; - char * OpenType = "r"; - - /* Catch architecture argument */ - if (argc > 3 && !strcmp(argv[1],"-arch")) { - for( arch_sel = 0; ncitool_data[arch_sel].arch; arch_sel++ ) - if (strcmp(argv[2],ncitool_data[arch_sel].arch) == 0) - break; - if (!ncitool_data[arch_sel].arch) { - printf("Invalid arch '%s'\n", argv[2]); - usage(argv[0]); - return 1; - } - ArgOffset = 3; - } - /* Make sure all arguments all there */ - if (argc != Arguments + ArgOffset) { - usage(argv[0]); - return(1); - } - - /* Open all Output and bail out if any fail */ - for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { - - /* Open the File */ - if (FileNumber == 2) OpenType = "wb"; - Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); - - /* Check for failure and error out if so */ - if (!Files[FileNumber]) { - perror(argv[FileNumber + ArgOffset]); - return (1); - } - } - - /* Write the File Headers */ - WriteFileHeader(Files[NtosUserStubs], - "System Call Stubs for Native API", - argv[NtosUserStubs + ArgOffset]); - - WriteFileHeader(Files[NtosKernelStubs], - "System Call Stubs for Native API", - argv[NtosKernelStubs + ArgOffset]); - fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); - - WriteFileHeader(Files[Win32kGdiStubs], - "System Call Stubs for Native API", - argv[Win32kGdiStubs + ArgOffset]); - - WriteFileHeader(Files[Win32kUserStubs], - "System Call Stubs for Native API", - argv[Win32kUserStubs + ArgOffset]); - - - /* Create the System Stubs */ - CreateStubs(Files[NativeSystemDb], - &Files[NtosUserStubs], - Files[NtosKernelStubs], - MAIN_INDEX, - 1, - 1); - - /* Create the Graphics Stubs */ - CreateStubs(Files[NativeGuiDb], - &Files[Win32kGdiStubs], - NULL, - WIN32K_INDEX, - 2, - 0); - - /* Rewind the databases */ - rewind(Files[NativeSystemDb]); - rewind(Files[NativeGuiDb]); - - /* Create the Service Tables */ - CreateSystemServiceTable(Files[NativeSystemDb], - Files[NtosServiceTable], - "Main", - argv[NtosServiceTable + ArgOffset]); - - CreateSystemServiceTable(Files[NativeGuiDb], - Files[Win32kServiceTable], - "Win32k", - argv[Win32kServiceTable + ArgOffset]); - - /* Close all files */ - for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { - - /* Close the File */ - fclose(Files[FileNumber]); - - } - - return(0); -} +/* + * FILE: tools/nci/ncitool.c + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Native Call Interface Support Tool + * PURPOSE: Generates NCI Tables and Stubs. + * PROGRAMMER; Alex Ionescu (alex(a)relsoft.net) + * CHANGE HISTORY: 14/01/05 - Created. Based on original code by + * KJK::Hyperion and Emanuelle Aliberti. + * + */ + +/* INCLUDE ******************************************************************/ + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#ifndef __FreeBSD__ +# include <malloc.h> +#endif // __FreeBSD__ + +/* DEFINES ****************************************************************/ + +#define INPUT_BUFFER_SIZE 255 +#define Arguments 7 + +/******* Table Indexes ************/ +#define MAIN_INDEX 0x0 +#define WIN32K_INDEX 0x1000 + +/******* Argument List ************/ +/* First, define the Databases */ +#define NativeSystemDb 0 +#define NativeGuiDb 1 + +/* Now the Service Tables */ +#define NtosServiceTable 2 +#define Win32kServiceTable 3 + +/* And finally, the stub files. */ +#define NtosUserStubs 4 +#define NtosKernelStubs 5 +#define Win32kStubs 6 + +/********** Stub Code ************/ + +/* + * This stubs calls into KUSER_SHARED_DATA where either a + * sysenter or interrupt is performed, depending on CPU support. + */ +#if defined(__GNUC__) +#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ + " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ + " call *(%%ecx)\n" \ + " ret $0x%x\n\n" + +#define UserModeStub_ppc " mflr 0\n" \ + " addi 1,1,-16\n" \ + " li 0,%x\n" \ + " stw 0,1(0)\n" \ + " sc\n" \ + " lwz 0,1(0)\n" \ + " mtlr 0\n" \ + " addi 1,1,16\n" \ + " blr\n" +#elif defined(_MSC_VER) +#define UserModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " mov ecx, KUSER_SHARED_SYSCALL\n" \ + " call [ecx]\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif + +/* + * This stub calls KiSystemService directly with a fake INT2E stack. + * Because EIP is pushed during the call, the handler will return here. + */ +#if defined(__GNUC__) +#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ + " leal 4(%%esp), %%edx\n" \ + " pushfl\n" \ + " pushl $KGDT_R0_CODE\n" \ + " call _KiSystemService\n" \ + " ret $0x%x\n\n" + +#define KernelModeStub_ppc " bl KiSystemService\n" \ + " rfi\n" +#elif defined(_MSC_VER) +#define KernelModeStub_x86 " asm { \n" \ + " mov eax, %xh\n" \ + " lea edx, [esp+4]\n" \ + " pushf\n" \ + " push KGDT_R0_CODE\n" \ + " call _KiSystemService\n" \ + " ret %xh\n" \ + " }\n" +#else +#error Unknown compiler for inline assembler +#endif + +/***** Arch Dependent Stuff ******/ +struct ncitool_data_t { + const char *arch; + int args_to_bytes; + const char *km_stub; + const char *um_stub; + const char *global_header; + const char *declaration; +}; + +struct ncitool_data_t ncitool_data[] = { + { "i386", 4, KernelModeStub_x86, UserModeStub_x86, + ".global _%s@%d\n", "_%s@%d:\n" }, + { "powerpc", 4, KernelModeStub_ppc, UserModeStub_ppc, + "\t.globl %s\n", "%s:\n" }, + { 0, } +}; +int arch_sel = 0; +#define ARGS_TO_BYTES(x) (x)*(ncitool_data[arch_sel].args_to_bytes) +#define UserModeStub ncitool_data[arch_sel].um_stub +#define KernelModeStub ncitool_data[arch_sel].km_stub +#define GlobalHeader ncitool_data[arch_sel].global_header +#define Declaration ncitool_data[arch_sel].declaration + +/* FUNCTIONS ****************************************************************/ + +/*++ + * WriteFileHeader + * + * Prints out the File Header for a Stub File. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * FileDescription - Description of the Stub file to which to write the header. + * + * FileLocation - Name of the Stub file to which to write the header. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for printing the header. + * + *--*/ +void +WriteFileHeader(FILE * StubFile, + char* FileDescription, + char* FileLocation) +{ + /* This prints out the file header */ + fprintf(StubFile, + "/* FILE: %s\n" + " * COPYRIGHT: See COPYING in the top level directory\n" + " * PURPOSE: %s\n" + " * PROGRAMMER: Computer Generated File. See tools/nci/ncitool.c\n" + " * REMARK: DO NOT EDIT OR COMMIT MODIFICATIONS TO THIS FILE\n" + " */\n\n\n" + "#include <ndk/asm.h>\n\n", + FileDescription, + FileLocation); +} + +/*++ + * WriteFileHeader + * + * Prints out the File Header for a Stub File. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * FileDescription - Description of the Stub file to which to write the header. + * + * FileLocation - Name of the Stub file to which to write the header. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for printing the header. + * + *--*/ +void +WriteStubHeader(FILE* StubFile, + char* SyscallName, + unsigned StackBytes) +{ + /* Export the function */ + fprintf(StubFile, GlobalHeader, SyscallName, StackBytes); + + /* Define it */ + fprintf(StubFile, Declaration, SyscallName, StackBytes); +} + + +/*++ + * WriteKernelModeStub + * + * Prints out the Kernel Mode Stub for a System Call. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * SyscallName - Name of System Call for which to add the stub. + * + * StackBytes - Number of bytes on the stack to return after doing the system call. + * + * SyscallId - Service Descriptor Table ID for this System Call. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +WriteKernelModeStub(FILE* StubFile, + char* SyscallName, + unsigned StackBytes, + unsigned int SyscallId) +{ + /* Write the Stub Header and export the Function */ + WriteStubHeader(StubFile, SyscallName, StackBytes); + + /* Write the Stub Code */ + fprintf(StubFile, KernelModeStub, SyscallId, StackBytes); +} + +/*++ + * WriteUserModeStub + * + * Prints out the User Mode Stub for a System Call. + * + * Params: + * StubFile - Stub File to which to write the header. + * + * SyscallName - Name of System Call for which to add the stub. + * + * StackBytes - Number of bytes on the stack to return after doing the system call. + * + * SyscallId - Service Descriptor Table ID for this System Call. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +WriteUserModeStub(FILE* StubFile, + char* SyscallName, + unsigned StackBytes, + unsigned int SyscallId) +{ + /* Write the Stub Header and export the Function */ + WriteStubHeader(StubFile, SyscallName, StackBytes); + + /* Write the Stub Code */ + fprintf(StubFile, UserModeStub, SyscallId, StackBytes); +} + +/*++ + * GetNameAndArgumentsFromDb + * + * Parses an entry from a System Call Database, extracting + * the function's name and arguments that it takes. + * + * Params: + * Line - Entry from the Database to parse. + * + * NtSyscallName - Output string to which to save the Function Name + * + * SyscallArguments - Output string to which to save the number of + * arguments that the function takes. + * + * Returns: + * None. + * + * Remarks: + * On i386, StackBytes is the number of arguments x 4. + * + *--*/ +void +GetNameAndArgumentsFromDb(char Line[], + char ** NtSyscallName, + char ** SyscallArguments) +{ + char *s; + char *stmp; + + /* Remove new line */ + if ((s = (char *) strchr(Line,'\r')) != NULL) { + *s = '\0'; + } + + /* Skip comments (#) and empty lines */ + s = &Line[0]; + if ((*s) != '#' && (*s) != '\0') { + + /* Extract the NtXXX name */ + *NtSyscallName = (char *)strtok(s," \t"); + + /* Extract the argument count */ + *SyscallArguments = (char *)strtok(NULL," \t"); + + /* Remove, if present, the trailing LF */ + if ((stmp = strchr(*SyscallArguments, '\n')) != NULL) { + *stmp = '\0'; + } + + } else { + + /* Skip this entry */ + *NtSyscallName = NULL; + *SyscallArguments = NULL; + } +} + +/*++ + * CreateStubs + * + * Parses a System Call Database and creates stubs for all the entries. + * + * Params: + * SyscallDb - System Call Database to parse. + * + * UserModeFiles - Array of Usermode Stub Files to which to write the stubs. + * + * KernelModeFile - Kernelmode Stub Files to which to write the stubs. + * + * Index - Number of first syscall + * + * UserFiles - Number of Usermode Stub Files to create + * + * NeedsZw - Write Zw prefix? + * + * Returns: + * None. + * + * Remarks: + * None. + * + *--*/ +void +CreateStubs(FILE * SyscallDb, + FILE * UserModeFiles[], + FILE * KernelModeFile, + unsigned Index, + unsigned UserFiles, + unsigned NeedsZw) +{ + char Line[INPUT_BUFFER_SIZE]; + char *NtSyscallName; + char *SyscallArguments; + int SyscallId; + unsigned StackBytes; + + /* We loop, incrementing the System Call Index, until the end of the file */ + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + if (SyscallArguments != NULL) + StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); + else + StackBytes = 0; + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Create Usermode Stubs for Nt/Zw syscalls in each Usermode file */ + int i; + for (i= 0; i < UserFiles; i++) { + + /* Write the Nt Version */ + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, + SyscallId | Index); + + /* If a Zw Version is needed (was specified), write it too */ + if (NeedsZw) { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteUserModeStub(UserModeFiles[i], + NtSyscallName, + StackBytes, + SyscallId | Index); + } + + } + + /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ + if (KernelModeFile) { + + NtSyscallName[0] = 'Z'; + NtSyscallName[1] = 'w'; + WriteKernelModeStub(KernelModeFile, + NtSyscallName, + StackBytes, + SyscallId | Index); + } + + /* Only increase if we actually added something */ + SyscallId++; + } + } +} + +/*++ + * CreateSystemServiceTable + * + * Parses a System Call Database and creates a System Call Service Table for it. + * + * Params: + * SyscallDb - System Call Database to parse. + * + * SyscallTable - File in where to create System Call Service Table. + * + * Name - Name of the Service Table. + * + * FileLocation - Filename containing the Table. + * + * Returns: + * None. + * + * Remarks: + * FileLocation is only used for the header generation. + * + *--*/ +void +CreateSystemServiceTable(FILE *SyscallDb, + FILE *SyscallTable, + char * Name, + char * FileLocation) +{ + char Line[INPUT_BUFFER_SIZE]; + char *NtSyscallName; + char *SyscallArguments; + int SyscallId; + + /* Print the Header */ + WriteFileHeader(SyscallTable, "System Call Table for Native API", FileLocation); + + /* First we build the SSDT */ + fprintf(SyscallTable,"\n\n\n"); + fprintf(SyscallTable,"ULONG_PTR %sSSDT[] = {\n", Name); + + /* We loop, incrementing the System Call Index, until the end of the file */ + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Add a new line */ + if (SyscallId > 0) fprintf(SyscallTable,",\n"); + + /* Write the syscall name in the service table. */ + fprintf(SyscallTable,"\t\t(ULONG_PTR)%s", NtSyscallName); + + /* Only increase if we actually added something */ + SyscallId++; + } + } + + /* Close the service table (C syntax) */ + fprintf(SyscallTable,"\n};\n"); + + /* Now we build the SSPT */ + rewind(SyscallDb); + fprintf(SyscallTable,"\n\n\n"); + fprintf(SyscallTable,"UCHAR %sSSPT[] = {\n", Name); + + for (SyscallId = 0; ((!feof(SyscallDb)) && (fgets(Line, sizeof(Line), SyscallDb) != NULL));) { + + /* Extract the Name and Arguments */ + GetNameAndArgumentsFromDb(Line, &NtSyscallName, &SyscallArguments); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Add a new line */ + if (SyscallId > 0) fprintf(SyscallTable,",\n"); + + /* Write the syscall arguments in the argument table. */ + if (SyscallArguments != NULL) + fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); + else + fprintf(SyscallTable,"\t\t0"); + + /* Only increase if we actually added something */ + SyscallId++; + } + } + + /* Close the service table (C syntax) */ + fprintf(SyscallTable,"\n};\n"); + + /* + * We write some useful defines + */ + fprintf(SyscallTable, "\n\n#define MIN_SYSCALL_NUMBER 0\n"); + fprintf(SyscallTable, "#define MAX_SYSCALL_NUMBER %d\n", SyscallId - 1); + fprintf(SyscallTable, "#define NUMBER_OF_SYSCALLS %d\n", SyscallId); + fprintf(SyscallTable, "ULONG %sNumberOfSysCalls = %d;\n", Name, SyscallId); +} + +void usage(char * argv0) +{ + printf("Usage: %s [-arch <arch>] sysfuncs.lst w32ksvc.db napi.h ssdt.h napi.S zw.S win32k.S win32k.S\n" + " sysfuncs.lst native system functions database\n" + " w32ksvc.db native graphic functions database\n" + " napi.h NTOSKRNL service table\n" + " ssdt.h WIN32K service table\n" + " napi.S NTDLL stubs\n" + " zw.S NTOSKRNL Zw stubs\n" + " win32k.S GDI32 stubs\n" + " win32k.S USER32 stubs\n" + " -arch is optional, default is %s\n", + argv0, + ncitool_data[0].arch + ); +} + +int main(int argc, char* argv[]) +{ + FILE * Files[Arguments] = { }; + int FileNumber, ArgOffset = 1; + char * OpenType = "r"; + + /* Catch architecture argument */ + if (argc > 3 && !strcmp(argv[1],"-arch")) { + for( arch_sel = 0; ncitool_data[arch_sel].arch; arch_sel++ ) + if (strcmp(argv[2],ncitool_data[arch_sel].arch) == 0) + break; + if (!ncitool_data[arch_sel].arch) { + printf("Invalid arch '%s'\n", argv[2]); + usage(argv[0]); + return 1; + } + ArgOffset = 3; + } + /* Make sure all arguments all there */ + if (argc != Arguments + ArgOffset) { + usage(argv[0]); + return(1); + } + + /* Open all Output and bail out if any fail */ + for (FileNumber = 0; FileNumber < Arguments; FileNumber++) { + + /* Open the File */ + if (FileNumber == 2) OpenType = "wb"; + Files[FileNumber] = fopen(argv[FileNumber + ArgOffset], OpenType); + + /* Check for failure and error out if so */ + if (!Files[FileNumber]) { + perror(argv[FileNumber + ArgOffset]); + return (1); + } + } + + /* Write the File Headers */ + WriteFileHeader(Files[NtosUserStubs], + "System Call Stubs for Native API", + argv[NtosUserStubs + ArgOffset]); + + WriteFileHeader(Files[NtosKernelStubs], + "System Call Stubs for Native API", + argv[NtosKernelStubs + ArgOffset]); + fputs("#include <ndk/asm.h>\n\n", Files[NtosKernelStubs]); + + WriteFileHeader(Files[Win32kStubs], + "System Call Stubs for Native API", + argv[Win32kStubs + ArgOffset]); + + /* Create the System Stubs */ + CreateStubs(Files[NativeSystemDb], + &Files[NtosUserStubs], + Files[NtosKernelStubs], + MAIN_INDEX, + 1, + 1); + + /* Create the Graphics Stubs */ + CreateStubs(Files[NativeGuiDb], + &Files[Win32kStubs], + NULL, + WIN32K_INDEX, + 1, + 0); + + /* Rewind the databases */ + rewind(Files[NativeSystemDb]); + rewind(Files[NativeGuiDb]); + + /* Create the Service Tables */ + CreateSystemServiceTable(Files[NativeSystemDb], + Files[NtosServiceTable], + "Main", + argv[NtosServiceTable + ArgOffset]); + + CreateSystemServiceTable(Files[NativeGuiDb], + Files[Win32kServiceTable], + "Win32k", + argv[Win32kServiceTable + ArgOffset]); + + /* Close all files */ + for (FileNumber = 0; FileNumber < Arguments-ArgOffset; FileNumber++) { + + /* Close the File */ + fclose(Files[FileNumber]); + + } + + return(0); +}

17 years, 4 months

[gedmurphy] 28059: convert timedate.cpl to unicode

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Aug 1 02:17:07 2007 New Revision: 28059 URL: http://svn.reactos.org/svn/reactos?rev=28059&view=rev Log: convert timedate.cpl to unicode Modified: trunk/reactos/dll/cpl/timedate/clock.c trunk/reactos/dll/cpl/timedate/dateandtime.c trunk/reactos/dll/cpl/timedate/monthcal.c trunk/reactos/dll/cpl/timedate/ntpclient.c trunk/reactos/dll/cpl/timedate/timedate.c trunk/reactos/dll/cpl/timedate/timedate.h trunk/reactos/dll/cpl/timedate/timedate.rbuild trunk/reactos/dll/cpl/timedate/timezone.c Modified: trunk/reactos/dll/cpl/timedate/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/clock.c?r… ============================================================================== --- trunk/reactos/dll/cpl/timedate/clock.c (original) +++ trunk/reactos/dll/cpl/timedate/clock.c Wed Aug 1 02:17:07 2007 @@ -25,7 +25,7 @@ #define TWOPI (2 * 3.14159) -static const TCHAR szClockWndClass[] = TEXT("ClockWndClass"); +static const WCHAR szClockWndClass[] = L"ClockWndClass"; static VOID @@ -144,13 +144,13 @@ HDC hdc; PAINTSTRUCT ps; - pClockData = (PCLOCKDATA)GetWindowLongPtr(hwnd, GWLP_USERDATA); + pClockData = (PCLOCKDATA)GetWindowLongPtrW(hwnd, GWLP_USERDATA); switch (uMsg) { case WM_CREATE: pClockData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(CLOCKDATA)); - SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)pClockData); + SetWindowLongPtrW(hwnd, GWLP_USERDATA, (LONG_PTR)pClockData); pClockData->hGreyPen = CreatePen(PS_SOLID, 1, RGB(128, 128, 128)); pClockData->hGreyBrush = CreateSolidBrush(RGB(128, 128, 128)); @@ -206,10 +206,10 @@ break; default: - DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); } return TRUE; @@ -219,22 +219,22 @@ BOOL RegisterClockControl(VOID) { - WNDCLASSEX wc = {0}; - - wc.cbSize = sizeof(WNDCLASSEX); + WNDCLASSEXW wc = {0}; + + wc.cbSize = sizeof(WNDCLASSEXW); wc.lpfnWndProc = ClockWndProc; wc.hInstance = hApplet; - wc.hCursor = LoadCursor(NULL, IDC_ARROW); + wc.hCursor = LoadCursorW(NULL, IDC_ARROW); wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszClassName = szClockWndClass; - return RegisterClassEx(&wc) != (ATOM)0; + return RegisterClassExW(&wc) != (ATOM)0; } VOID UnregisterClockControl(VOID) { - UnregisterClass(szClockWndClass, - hApplet); -} + UnregisterClassW(szClockWndClass, + hApplet); +} Modified: trunk/reactos/dll/cpl/timedate/dateandtime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/dateandti… ============================================================================== --- trunk/reactos/dll/cpl/timedate/dateandtime.c (original) +++ trunk/reactos/dll/cpl/timedate/dateandtime.c Wed Aug 1 02:17:07 2007 @@ -32,9 +32,9 @@ priv.PrivilegeCount = 1; priv.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; - if (LookupPrivilegeValue(NULL, - SE_SYSTEMTIME_NAME, - &priv.Privileges[0].Luid)) + if (LookupPrivilegeValueW(NULL, + SE_SYSTEMTIME_NAME, + &priv.Privileges[0].Luid)) { if (AdjustTokenPrivileges(hToken, FALSE, @@ -80,29 +80,29 @@ if (DateTime_GetSystemtime(GetDlgItem(hwnd, IDC_TIMEPICKER), &Time) == GDT_VALID && - SendMessage(GetDlgItem(hwnd, - IDC_MONTHCALENDAR), - MCCM_GETDATE, - (WPARAM)&Time, - 0)) + SendMessageW(GetDlgItem(hwnd, + IDC_MONTHCALENDAR), + MCCM_GETDATE, + (WPARAM)&Time, + 0)) { SystemSetLocalTime(&Time); - SetWindowLong(hwnd, - DWL_MSGRESULT, - PSNRET_NOERROR); - - SendMessage(GetDlgItem(hwnd, - IDC_MONTHCALENDAR), - MCCM_RESET, - (WPARAM)&Time, - 0); + SetWindowLongPtrW(hwnd, + DWL_MSGRESULT, + PSNRET_NOERROR); + + SendMessageW(GetDlgItem(hwnd, + IDC_MONTHCALENDAR), + MCCM_RESET, + (WPARAM)&Time, + 0); /* Broadcast the time change message */ - SendMessage(HWND_BROADCAST, - WM_TIMECHANGE, - 0, - 0); + SendMessageW(HWND_BROADCAST, + WM_TIMECHANGE, + 0, + 0); } } @@ -155,10 +155,10 @@ GetLocalTime(&LocalDate); - SendMessage(hCombo, - CB_RESETCONTENT, - 0, - 0); + SendMessageW(hCombo, + CB_RESETCONTENT, + 0, + 0); for (Month = 1; Month <= 13; @@ -170,23 +170,23 @@ sizeof(szBuf) / sizeof(szBuf[0])); if (i > 1) { - i = (INT)SendMessage(hCombo, - CB_ADDSTRING, - 0, - (LPARAM)szBuf); + i = (INT)SendMessageW(hCombo, + CB_ADDSTRING, + 0, + (LPARAM)szBuf); if (i != CB_ERR) { - SendMessage(hCombo, - CB_SETITEMDATA, - (WPARAM)i, - Month); + SendMessageW(hCombo, + CB_SETITEMDATA, + (WPARAM)i, + Month); if (Month == (UINT)LocalDate.wMonth) { - SendMessage(hCombo, - CB_SETCURSEL, - (WPARAM)i, - 0); + SendMessageW(hCombo, + CB_SETCURSEL, + (WPARAM)i, + 0); } } } @@ -200,16 +200,16 @@ INT i; WORD Ret = (WORD)-1; - i = (INT)SendMessage(hCombo, - CB_GETCURSEL, - 0, - 0); + i = (INT)SendMessageW(hCombo, + CB_GETCURSEL, + 0, + 0); if (i != CB_ERR) { - i = (INT)SendMessage(hCombo, - CB_GETITEMDATA, - (WPARAM)i, - 0); + i = (INT)SendMessageW(hCombo, + CB_GETITEMDATA, + (WPARAM)i, + 0); if (i >= 1 && i <= 13) Ret = (WORD)i; @@ -225,12 +225,12 @@ WORD Month, WORD Year) { - SendMessage(hMonthCal, - MCCM_SETDATE, - MAKEWPARAM(Day, - Month), - MAKELPARAM(Year, - 0)); + SendMessageW(hMonthCal, + MCCM_SETDATE, + MAKEWPARAM(Day, + Month), + MAKELPARAM(Year, + 0)); } static VOID @@ -260,7 +260,7 @@ break; } - return CallWindowProc(pOldWndProc, hwnd, uMsg, wParam, lParam); + return CallWindowProcW(pOldWndProc, hwnd, uMsg, wParam, lParam); } /* Property page dialog callback */ @@ -282,14 +282,14 @@ SetTimer(hwndDlg, ID_TIMER, 1000, NULL); /* set range and current year */ - SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); - SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); - - pOldWndProc = (WNDPROC) SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); + SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETRANGE, 0, MAKELONG ((short) 9999, (short) 1900)); + SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_SETPOS, 0, MAKELONG( (short) st.wYear, 0)); + + pOldWndProc = (WNDPROC) SetWindowLongPtrW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), GWL_WNDPROC, (INT_PTR) DTPProc); break; case WM_TIMER: - SendMessage(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st); + SendMessageW(GetDlgItem(hwndDlg, IDC_TIMEPICKER), DTM_SETSYSTEMTIME, GDT_VALID, (LPARAM) &st); break; case WM_COMMAND: @@ -326,7 +326,7 @@ { SHORT wYear; LPNMUPDOWN updown = (LPNMUPDOWN)lpnm; - wYear = (SHORT)SendMessage(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); + wYear = (SHORT)SendMessageW(GetDlgItem(hwndDlg, IDC_YEAR), UDM_GETPOS, 0, 0); /* Enable the 'Apply' button */ PropSheet_Changed(GetParent(hwndDlg), hwndDlg); ChangeMonthCalDate(GetDlgItem(hwndDlg, @@ -347,7 +347,7 @@ KillTimer(hwndDlg, ID_TIMER); /* Tell the clock to stop ticking */ - SendDlgItemMessage(hwndDlg, IDC_CLOCKWND, CLM_SETTIME, + SendDlgItemMessageW(hwndDlg, IDC_CLOCKWND, CLM_SETTIME, 0, (LPARAM)&((LPNMDATETIMECHANGE)lpnm)->st); /* Enable the 'Apply' button */ @@ -390,11 +390,11 @@ case WM_TIMECHANGE: /* FIXME - we don't get this message as we're not a top-level window... */ - SendMessage(GetDlgItem(hwndDlg, - IDC_MONTHCALENDAR), - MCCM_RESET, - 0, - 0); + SendMessageW(GetDlgItem(hwndDlg, + IDC_MONTHCALENDAR), + MCCM_RESET, + 0, + 0); break; case WM_DESTROY: Modified: trunk/reactos/dll/cpl/timedate/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/monthcal.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/monthcal.c (original) +++ trunk/reactos/dll/cpl/timedate/monthcal.c Wed Aug 1 02:17:07 2007 @@ -9,7 +9,7 @@ #include <timedate.h> -static const TCHAR szMonthCalWndClass[] = TEXT("MonthCalWnd"); +static const WCHAR szMonthCalWndClass[] = L"MonthCalWnd"; #define MONTHCAL_HEADERBG COLOR_INACTIVECAPTION #define MONTHCAL_HEADERFG COLOR_INACTIVECAPTIONTEXT @@ -35,7 +35,7 @@ WORD Year; WORD FirstDayOfWeek; BYTE Days[6][7]; - TCHAR Week[7]; + WCHAR Week[7]; SIZE CellSize; SIZE ClientSize; @@ -62,14 +62,14 @@ LPNMHDR pnmh = (LPNMHDR)data; pnmh->hwndFrom = infoPtr->hSelf; - pnmh->idFrom = GetWindowLongPtr(infoPtr->hSelf, - GWLP_ID); + pnmh->idFrom = GetWindowLongPtrW(infoPtr->hSelf, + GWLP_ID); pnmh->code = code; - Ret = SendMessage(infoPtr->hNotify, - WM_NOTIFY, - (WPARAM)pnmh->idFrom, - (LPARAM)pnmh); + Ret = SendMessageW(infoPtr->hNotify, + WM_NOTIFY, + (WPARAM)pnmh->idFrom, + (LPARAM)pnmh); } return Ret; @@ -112,13 +112,13 @@ static WORD MonthCalFirstDayOfWeek(VOID) { - TCHAR szBuf[2] = {0}; + WCHAR szBuf[2] = {0}; WORD Ret = 0; - if (GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_IFIRSTDAYOFWEEK, - szBuf, - sizeof(szBuf) / sizeof(szBuf[0])) != 0) + if (GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_IFIRSTDAYOFWEEK, + szBuf, + sizeof(szBuf) / sizeof(szBuf[0])) != 0) { Ret = (WORD)(szBuf[0] - TEXT('0')); } @@ -234,14 +234,14 @@ static VOID MonthCalReload(IN PMONTHCALWND infoPtr) { - TCHAR szBuf[64]; + WCHAR szBuf[64]; UINT i; - infoPtr->UIState = (DWORD)SendMessage(GetAncestor(infoPtr->hSelf, - GA_PARENT), - WM_QUERYUISTATE, - 0, - 0); + infoPtr->UIState = (DWORD)SendMessageW(GetAncestor(infoPtr->hSelf, + GA_PARENT), + WM_QUERYUISTATE, + 0, + 0); /* cache the configuration */ infoPtr->FirstDayOfWeek = MonthCalFirstDayOfWeek(); @@ -251,11 +251,11 @@ for (i = 0; i < 7; i++) { - if (GetLocaleInfo(LOCALE_USER_DEFAULT, - LOCALE_SABBREVDAYNAME1 + - ((i + infoPtr->FirstDayOfWeek) % 7), - szBuf, - sizeof(szBuf) / sizeof(szBuf[0])) != 0) + if (GetLocaleInfoW(LOCALE_USER_DEFAULT, + LOCALE_SABBREVDAYNAME1 + + ((i + infoPtr->FirstDayOfWeek) % 7), + szBuf, + sizeof(szBuf) / sizeof(szBuf[0])) != 0) { infoPtr->Week[i] = szBuf[0]; } @@ -489,11 +489,11 @@ rcCell.right = rcCell.left + infoPtr->CellSize.cx; /* write the first letter of each weekday */ - DrawText(hDC, - &infoPtr->Week[x], - 1, - &rcCell, - DT_SINGLELINE | DT_NOPREFIX | DT_CENTER | DT_VCENTER); + DrawTextW(hDC, + &infoPtr->Week[x], + 1, + &rcCell, + DT_SINGLELINE | DT_NOPREFIX | DT_CENTER | DT_VCENTER); } SetTextColor(hDC, @@ -519,19 +519,19 @@ /* write the day number */ if (Day != 0 && Day < 100) { - TCHAR szDay[3]; + WCHAR szDay[3]; INT szDayLen; RECT rcText; SIZE TextSize; - szDayLen = _stprintf(szDay, - TEXT("%lu"), + szDayLen = swprintf(szDay, + L"%lu", Day); - if (GetTextExtentPoint32(hDC, - szDay, - szDayLen, - &TextSize)) + if (GetTextExtentPoint32W(hDC, + szDay, + szDayLen, + &TextSize)) { RECT rcHighlight = {0}; @@ -566,11 +566,11 @@ crOldText = CLR_INVALID; } - TextOut(hDC, - rcText.left, - rcText.top, - szDay, - szDayLen); + TextOutW(hDC, + rcText.left, + rcText.top, + szDay, + szDayLen); if (Day == infoPtr->Day && crOldText != CLR_INVALID) { @@ -658,8 +658,8 @@ PMONTHCALWND infoPtr; LRESULT Ret = 0; - infoPtr = (PMONTHCALWND)GetWindowLongPtr(hwnd, - 0); + infoPtr = (PMONTHCALWND)GetWindowLongPtrW(hwnd, + 0); if (infoPtr == NULL && uMsg != WM_CREATE) { @@ -811,12 +811,12 @@ case VK_TAB: { /* change the UI status */ - SendMessage(GetAncestor(hwnd, - GA_PARENT), - WM_CHANGEUISTATE, - MAKEWPARAM(UIS_INITIALIZE, - 0), - 0); + SendMessageW(GetAncestor(hwnd, + GA_PARENT), + WM_CHANGEUISTATE, + MAKEWPARAM(UIS_INITIALIZE, + 0), + 0); break; } } @@ -1013,9 +1013,9 @@ break; } - SetWindowLongPtr(hwnd, - 0, - (LONG_PTR)infoPtr); + SetWindowLongPtrW(hwnd, + 0, + (LONG_PTR)infoPtr); ZeroMemory(infoPtr, sizeof(MONTHCALWND)); @@ -1036,19 +1036,19 @@ HeapFree(GetProcessHeap(), 0, infoPtr); - SetWindowLongPtr(hwnd, - 0, - (DWORD_PTR)NULL); + SetWindowLongPtrW(hwnd, + 0, + (DWORD_PTR)NULL); break; } default: { HandleDefaultMessage: - Ret = DefWindowProc(hwnd, - uMsg, - wParam, - lParam); + Ret = DefWindowProcW(hwnd, + uMsg, + wParam, + lParam); break; } } @@ -1059,23 +1059,23 @@ BOOL RegisterMonthCalControl(IN HINSTANCE hInstance) { - WNDCLASS wc = {0}; + WNDCLASSW wc = {0}; wc.style = CS_DBLCLKS; wc.lpfnWndProc = MonthCalWndProc; wc.cbWndExtra = sizeof(PMONTHCALWND); wc.hInstance = hInstance; - wc.hCursor = LoadCursor(NULL, - (LPWSTR)IDC_ARROW); + wc.hCursor = LoadCursorW(NULL, + (LPWSTR)IDC_ARROW); wc.hbrBackground = (HBRUSH)(MONTHCAL_CTRLBG + 1); wc.lpszClassName = szMonthCalWndClass; - return RegisterClass(&wc) != 0; + return RegisterClassW(&wc) != 0; } VOID UnregisterMonthCalControl(IN HINSTANCE hInstance) { - UnregisterClass(szMonthCalWndClass, - hInstance); -} + UnregisterClassW(szMonthCalWndClass, + hInstance); +} Modified: trunk/reactos/dll/cpl/timedate/ntpclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/ntpclient… ============================================================================== --- trunk/reactos/dll/cpl/timedate/ntpclient.c (original) +++ trunk/reactos/dll/cpl/timedate/ntpclient.c Wed Aug 1 02:17:07 2007 @@ -23,7 +23,7 @@ static BOOL InitConnection(PINFO pInfo, - LPSTR lpAddress) + LPSTR lpAddress) { WSADATA wsaData; HOSTENT *he; Modified: trunk/reactos/dll/cpl/timedate/timedate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.c (original) +++ trunk/reactos/dll/cpl/timedate/timedate.c Wed Aug 1 02:17:07 2007 @@ -30,23 +30,23 @@ { LPVOID lpMsgBuf; #if DBG - TCHAR szMsg[255]; + WCHAR szMsg[255]; #endif - FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | - FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS, - NULL, - dwErrorCode, - MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), - (LPTSTR) &lpMsgBuf, - 0, - NULL ); + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | + FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, + NULL, + dwErrorCode, + MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), + (LPWSTR) &lpMsgBuf, + 0, + NULL ); #if DBG - if (_stprintf(szMsg, _T("%hs:%d: %s"), file, line, lpMsgBuf)) + if (swprintf(szMsg, L"%hs:%d: %s", file, line, lpMsgBuf)) { - MessageBox(NULL, szMsg, NULL, MB_OK | MB_ICONERROR); + MessageBoxW(NULL, szMsg, NULL, MB_OK | MB_ICONERROR); } #else MessageBox(NULL, lpMsgBuf, NULL, MB_OK | MB_ICONERROR); @@ -57,13 +57,13 @@ static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc) +InitPropSheetPage(PROPSHEETPAGEW *psp, WORD idDlg, DLGPROC DlgProc) { - ZeroMemory(psp, sizeof(PROPSHEETPAGE)); - psp->dwSize = sizeof(PROPSHEETPAGE); + ZeroMemory(psp, sizeof(PROPSHEETPAGEW)); + psp->dwSize = sizeof(PROPSHEETPAGEW); psp->dwFlags = PSP_DEFAULT; psp->hInstance = hApplet; - psp->pszTemplate = MAKEINTRESOURCE(idDlg); + psp->pszTemplate = MAKEINTRESOURCEW(idDlg); psp->pfnDlgProc = DlgProc; } @@ -72,8 +72,8 @@ Applet(HWND hwnd, UINT uMsg, LPARAM wParam, LPARAM lParam) { PROPSHEETHEADER psh; - PROPSHEETPAGE psp[3]; - TCHAR Caption[256]; + PROPSHEETPAGEW psp[3]; + WCHAR Caption[256]; LONG Ret = 0; UNREFERENCED_PARAMETER(hwnd); @@ -84,16 +84,16 @@ if (RegisterMonthCalControl(hApplet) && RegisterClockControl()) { - LoadString(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(TCHAR)); + LoadStringW(hApplet, IDS_CPLNAME, Caption, sizeof(Caption) / sizeof(WCHAR)); - ZeroMemory(&psh, sizeof(PROPSHEETHEADER)); - psh.dwSize = sizeof(PROPSHEETHEADER); + ZeroMemory(&psh, sizeof(PROPSHEETHEADERW)); + psh.dwSize = sizeof(PROPSHEETHEADERW); psh.dwFlags = PSH_PROPSHEETPAGE | PSH_PROPTITLE; psh.hwndParent = NULL; psh.hInstance = hApplet; - psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCE(IDC_CPLICON)); + psh.hIcon = LoadIcon(hApplet, MAKEINTRESOURCEW(IDC_CPLICON)); psh.pszCaption = Caption; - psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); + psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGEW); psh.nStartPage = 0; psh.ppsp = psp; @@ -101,7 +101,7 @@ InitPropSheetPage(&psp[1], IDD_TIMEZONEPAGE, (DLGPROC) TimeZonePageProc); InitPropSheetPage(&psp[2], IDD_INETTIMEPAGE, (DLGPROC) InetTimePageProc); - Ret = (LONG)(PropertySheet(&psh) != -1); + Ret = (LONG)(PropertySheetW(&psh) != -1); UnregisterMonthCalControl(hApplet); UnregisterClockControl(); Modified: trunk/reactos/dll/cpl/timedate/timedate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.h (original) +++ trunk/reactos/dll/cpl/timedate/timedate.h Wed Aug 1 02:17:07 2007 @@ -3,7 +3,6 @@ #include <windows.h> #include <windowsx.h> -#include <tchar.h> #include <stdio.h> #include <math.h> #include <commctrl.h> Modified: trunk/reactos/dll/cpl/timedate/timedate.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timedate.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timedate.rbuild (original) +++ trunk/reactos/dll/cpl/timedate/timedate.rbuild Wed Aug 1 02:17:07 2007 @@ -1,8 +1,6 @@ -<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl"> +<module name="timedate" type="win32dll" extension=".cpl" baseaddress="${BASEADDRESS_TIMEDATE}" installbase="system32" installname="timedate.cpl" unicode="yes"> <importlibrary definition="timedate.def" /> <include base="timedate">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define> Modified: trunk/reactos/dll/cpl/timedate/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/timezone.… ============================================================================== --- trunk/reactos/dll/cpl/timedate/timezone.c (original) +++ trunk/reactos/dll/cpl/timedate/timezone.c Wed Aug 1 02:17:07 2007 @@ -59,7 +59,7 @@ static VOID CreateTimeZoneList(VOID) { - TCHAR szKeyName[256]; + WCHAR szKeyName[256]; DWORD dwIndex; DWORD dwNameSize; DWORD dwValueSize; @@ -70,33 +70,33 @@ PTIMEZONE_ENTRY Entry; PTIMEZONE_ENTRY Current; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"), - 0, - KEY_ENUMERATE_SUB_KEYS, - &hZonesKey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", + 0, + KEY_ENUMERATE_SUB_KEYS, + &hZonesKey)) return; dwIndex = 0; while (TRUE) { - dwNameSize = 256 * sizeof(TCHAR); - lError = RegEnumKeyEx(hZonesKey, - dwIndex, - szKeyName, - &dwNameSize, - NULL, - NULL, - NULL, - NULL); + dwNameSize = 256 * sizeof(WCHAR); + lError = RegEnumKeyExW(hZonesKey, + dwIndex, + szKeyName, + &dwNameSize, + NULL, + NULL, + NULL, + NULL); if (lError != ERROR_SUCCESS && lError != ERROR_MORE_DATA) break; - if (RegOpenKeyEx(hZonesKey, - szKeyName, - 0, - KEY_QUERY_VALUE, - &hZoneKey)) + if (RegOpenKeyEx (hZonesKey, + szKeyName, + 0, + KEY_QUERY_VALUE, + &hZoneKey)) break; Entry = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(TIMEZONE_ENTRY)); @@ -106,61 +106,61 @@ break; } - dwValueSize = 64 * sizeof(TCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Display"), - NULL, - NULL, - (LPBYTE)&Entry->Description, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 33 * sizeof(TCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Std"), - NULL, - NULL, - (LPBYTE)&Entry->StandardName, - &dwValueSize)) - { - RegCloseKey(hZoneKey); - break; - } - - dwValueSize = 33 * sizeof(TCHAR); - if (RegQueryValueEx(hZoneKey, - _T("Dlt"), - NULL, - NULL, - (LPBYTE)&Entry->DaylightName, - &dwValueSize)) + dwValueSize = 64 * sizeof(WCHAR); + if (RegQueryValueExW(hZoneKey, + L"Display", + NULL, + NULL, + (LPBYTE)&Entry->Description, + &dwValueSize)) + { + RegCloseKey(hZoneKey); + break; + } + + dwValueSize = 33 * sizeof(WCHAR); + if (RegQueryValueExW(hZoneKey, + L"Std", + NULL, + NULL, + (LPBYTE)&Entry->StandardName, + &dwValueSize)) + { + RegCloseKey(hZoneKey); + break; + } + + dwValueSize = 33 * sizeof(WCHAR); + if (RegQueryValueExW(hZoneKey, + L"Dlt", + NULL, + NULL, + (LPBYTE)&Entry->DaylightName, + &dwValueSize)) { RegCloseKey(hZoneKey); break; } dwValueSize = sizeof(DWORD); - if (RegQueryValueEx(hZoneKey, - _T("Index"), - NULL, - NULL, - (LPBYTE)&Entry->Index, - &dwValueSize)) + if (RegQueryValueExW(hZoneKey, + L"Index", + NULL, + NULL, + (LPBYTE)&Entry->Index, + &dwValueSize)) { RegCloseKey(hZoneKey); break; } dwValueSize = sizeof(TZ_INFO); - if (RegQueryValueEx(hZoneKey, - _T("TZI"), - NULL, - NULL, - (LPBYTE)&Entry->TimezoneInfo, - &dwValueSize)) + if (RegQueryValueExW(hZoneKey, + L"TZI", + NULL, + NULL, + (LPBYTE)&Entry->TimezoneInfo, + &dwValueSize)) { RegCloseKey(hZoneKey); break; @@ -252,22 +252,22 @@ Entry = TimeZoneListHead; while (Entry != NULL) { - SendMessage(hwnd, - CB_ADDSTRING, - 0, - (LPARAM)Entry->Description); - - if (!_tcscmp(Entry->StandardName, TimeZoneInfo.StandardName)) + SendMessageW(hwnd, + CB_ADDSTRING, + 0, + (LPARAM)Entry->Description); + + if (!wcscmp(Entry->StandardName, TimeZoneInfo.StandardName)) dwIndex = i; i++; Entry = Entry->Next; } - SendMessage(hwnd, - CB_SETCURSEL, - (WPARAM)dwIndex, - 0); + SendMessageW(hwnd, + CB_SETCURSEL, + (WPARAM)dwIndex, + 0); } @@ -279,10 +279,10 @@ DWORD dwIndex; DWORD i; - dwIndex = (DWORD)SendMessage(hwnd, - CB_GETCURSEL, - 0, - 0); + dwIndex = (DWORD)SendMessageW(hwnd, + CB_GETCURSEL, + 0, + 0); i = 0; Entry = TimeZoneListHead; @@ -295,9 +295,9 @@ Entry = Entry->Next; } - _tcscpy(TimeZoneInformation.StandardName, + wcscpy(TimeZoneInformation.StandardName, Entry->StandardName); - _tcscpy(TimeZoneInformation.DaylightName, + wcscpy(TimeZoneInformation.DaylightName, Entry->DaylightName); TimeZoneInformation.Bias = Entry->TimezoneInfo.Bias; @@ -321,28 +321,28 @@ { HKEY hKey; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation"), - 0, - KEY_QUERY_VALUE, - &hKey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", + 0, + KEY_QUERY_VALUE, + &hKey)) return; /* if the call fails (non zero), the reg value isn't available, * which means it shouldn't be disabled, so we should check the button. */ - if (RegQueryValueEx(hKey, - _T("DisableAutoDaylightTimeSet"), - NULL, - NULL, - NULL, - NULL)) - { - SendMessage(hwnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); + if (RegQueryValueExW(hKey, + L"DisableAutoDaylightTimeSet", + NULL, + NULL, + NULL, + NULL)) + { + SendMessageW(hwnd, BM_SETCHECK, (WPARAM)BST_CHECKED, 0); } else { - SendMessage(hwnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); + SendMessageW(hwnd, BM_SETCHECK, (WPARAM)BST_UNCHECKED, 0); } RegCloseKey(hKey); @@ -355,26 +355,26 @@ HKEY hKey; DWORD dwValue = 1; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation"), - 0, - KEY_SET_VALUE, - &hKey)) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\TimeZoneInformation", + 0, + KEY_SET_VALUE, + &hKey)) return; - if (SendMessage(hwnd, BM_GETCHECK, 0, 0) == BST_UNCHECKED) - { - RegSetValueEx(hKey, - _T("DisableAutoDaylightTimeSet"), - 0, - REG_DWORD, - (LPBYTE)&dwValue, - sizeof(DWORD)); + if (SendMessageW(hwnd, BM_GETCHECK, 0, 0) == BST_UNCHECKED) + { + RegSetValueExW(hKey, + L"DisableAutoDaylightTimeSet", + 0, + REG_DWORD, + (LPBYTE)&dwValue, + sizeof(DWORD)); } else { - RegDeleteValue(hKey, - _T("DisableAutoDaylightTimeSet")); + RegDeleteValueW(hKey, + L"DisableAutoDaylightTimeSet"); } RegCloseKey(hKey); @@ -396,10 +396,10 @@ CreateTimeZoneList(); ShowTimeZoneList(GetDlgItem(hwndDlg, IDC_TIMEZONELIST)); GetAutoDaylightInfo(GetDlgItem(hwndDlg, IDC_AUTODAYLIGHT)); - hBitmap = LoadImage(hApplet, MAKEINTRESOURCE(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); + hBitmap = LoadImageW(hApplet, MAKEINTRESOURCEW(IDC_WORLD), IMAGE_BITMAP, 0, 0, LR_DEFAULTCOLOR); if (hBitmap != NULL) { - GetObject(hBitmap, sizeof(BITMAP), &bitmap); + GetObjectW(hBitmap, sizeof(BITMAP), &bitmap); cxSource = bitmap.bmWidth; cySource = bitmap.bmHeight;

17 years, 4 months

[greatlrd] 28058: revers guiconsole.c changes that was mistake committed in r28057

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Aug 1 01:41:15 2007 New Revision: 28058 URL: http://svn.reactos.org/svn/reactos?rev=28058&view=rev Log: revers guiconsole.c changes that was mistake committed in r28057 Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Aug 1 01:41:15 2007 @@ -139,8 +139,8 @@ hSubMenu = CreatePopupMenu(); if (hSubMenu != NULL) { - /*GuiConsoleAppendMenuItems(hSubMenu, - Items[i].SubMenu);*/ + GuiConsoleAppendMenuItems(hSubMenu, + Items[i].SubMenu); if (!AppendMenuW(hMenu, MF_STRING | MF_POPUP, @@ -148,7 +148,6 @@ szMenuString)) { DestroyMenu(hSubMenu); - DPRINT1("DestroyMenu \n"); } } } @@ -180,13 +179,8 @@ FALSE); if (hMenu != NULL) { - DPRINT1("adding menu\n"); GuiConsoleAppendMenuItems(hMenu, GuiConsoleMainMenuItems); - } - else - { - DPRINT1("This should never happen, GetSystemMenu == NULL \n"); } } @@ -242,12 +236,10 @@ RtlFreeUnicodeString(&SidName); CloseHandle(hProcessToken); - CloseHandle(hProcess); - - //if (hProcHandle) - // *hProcHandle = hProcess; - //else - // CloseHandle(hProcess); + if (hProcHandle) + *hProcHandle = hProcess; + else + CloseHandle(hProcess); if (res != ERROR_SUCCESS) return FALSE; @@ -284,26 +276,21 @@ DPRINT("GuiConsoleOpenUserSettings entered\n"); - DPRINT1("ProcessId %d\n",ProcessId); - if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey, samDesired)) { - DPRINT1("GuiConsoleOpenUserRegistryPathPerProcessId failed\n"); + DPRINT("GuiConsoleOpenUserRegistryPathPerProcessId failed\n"); return FALSE; } - - hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessId ); - /* FIXME we do not getting the process name so no menu will be loading, why ?*/ fLength = GetProcessImageFileNameW(hProcess, szProcessName, sizeof(GuiData->szProcessName) / sizeof(WCHAR)); CloseHandle(hProcess); - DPRINT1("szProcessName3 : %S\n",szProcessName); + //DPRINT1("szProcessName3 : %S\n",szProcessName); if (!fLength) { - DPRINT1("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); + DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); return FALSE; } /* @@ -671,8 +658,6 @@ if (Console->ProcessList.Flink != &Console->ProcessList) { ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); - DPRINT1("PtrToUlong(ProcessData->ProcessId) == %d",PtrToUlong(ProcessData->ProcessId)); - if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ, FALSE)) { GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); @@ -1278,20 +1263,13 @@ { PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; - HMENU menu; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); KillTimer(hWnd, 1); Console->PrivateData = NULL; DeleteCriticalSection(&GuiData->Lock); - - menu = GetSystemMenu(hWnd, TRUE); - if (menu == NULL) - { - DPRINT1("This should never happen, GetSystemMenu == NULL \n"); - } - + GetSystemMenu(hWnd, TRUE); if (GuiData->ConsoleLibrary) FreeLibrary(GuiData->ConsoleLibrary);

17 years, 4 months

[greatlrd] 28057: adding win32ksys the syscall lib for win32k waring type make clean, delete makefile.auto make clean does not delete the gdi32/misc/i386 delete that folder and need delete it u self make clean does not delete the user32/misc/i386 delete that folder and need delete it u self

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Aug 1 01:38:52 2007 New Revision: 28057 URL: http://svn.reactos.org/svn/reactos?rev=28057&view=rev Log: adding win32ksys the syscall lib for win32k waring type make clean, delete makefile.auto make clean does not delete the gdi32/misc/i386 delete that folder and need delete it u self make clean does not delete the user32/misc/i386 delete that folder and need delete it u self Added: trunk/reactos/lib/win32ksys/ trunk/reactos/lib/win32ksys/win32ksys.rbuild (with props) Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/lib/lib.rbuild trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/dll/win32/gdi32/gdi32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.rbui… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.rbuild (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.rbuild Wed Aug 1 01:38:52 2007 @@ -9,6 +9,8 @@ <library>ntdll</library> <library>kernel32</library> <library>advapi32</library> + <library>win32ksys</library> + <directory name="include"> <pch>precomp.h</pch> </directory> @@ -22,22 +24,7 @@ <file>stubs.c</file> <file>stubsa.c</file> <file>stubsw.c</file> - <file>wingl.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="mips"> - <directory name="mips"> - <file>win32k.S</file> - </directory> - </if> + <file>wingl.c</file> </directory> <directory name="objects"> <file>bitmap.c</file> Modified: trunk/reactos/dll/win32/user32/user32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.rb… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.rbuild (original) +++ trunk/reactos/dll/win32/user32/user32.rbuild Wed Aug 1 01:38:52 2007 @@ -15,6 +15,8 @@ <library>kernel32</library> <library>advapi32</library> <library>imm32</library> + <library>win32ksys</library> + <directory name="include"> <pch>user32.h</pch> </directory> @@ -46,21 +48,6 @@ <file>winhelp.c</file> <file>winsta.c</file> <file>wsprintf.c</file> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="powerpc"> - <directory name="powerpc"> - <file>win32k.S</file> - </directory> - </if> - <if property="ARCH" value="mips"> - <directory name="mips"> - <file>win32k.S</file> - </directory> - </if> </directory> <directory name="windows"> <file>accel.c</file> Modified: trunk/reactos/lib/lib.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lib.rbuild?rev=28057&r… ============================================================================== --- trunk/reactos/lib/lib.rbuild (original) +++ trunk/reactos/lib/lib.rbuild Wed Aug 1 01:38:52 2007 @@ -40,5 +40,9 @@ <directory name="smlib"> <xi:include href="smlib/smlib.rbuild" /> </directory> + <directory name="win32ksys"> + <xi:include href="win32ksys/win32ksys.rbuild" /> + </directory> + </group> Added: trunk/reactos/lib/win32ksys/win32ksys.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/win32ksys/win32ksys.rb… ============================================================================== --- trunk/reactos/lib/win32ksys/win32ksys.rbuild (added) +++ trunk/reactos/lib/win32ksys/win32ksys.rbuild Wed Aug 1 01:38:52 2007 @@ -1,0 +1,22 @@ +<module name="win32ksys" type="staticlibrary"> + <define name="_DISABLE_TIDENTS" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>win32k.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>win32k.S</file> + </directory> + </if> + +</module> Propchange: trunk/reactos/lib/win32ksys/win32ksys.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Wed Aug 1 01:38:52 2007 @@ -139,8 +139,8 @@ hSubMenu = CreatePopupMenu(); if (hSubMenu != NULL) { - GuiConsoleAppendMenuItems(hSubMenu, - Items[i].SubMenu); + /*GuiConsoleAppendMenuItems(hSubMenu, + Items[i].SubMenu);*/ if (!AppendMenuW(hMenu, MF_STRING | MF_POPUP, @@ -148,6 +148,7 @@ szMenuString)) { DestroyMenu(hSubMenu); + DPRINT1("DestroyMenu \n"); } } } @@ -179,8 +180,13 @@ FALSE); if (hMenu != NULL) { + DPRINT1("adding menu\n"); GuiConsoleAppendMenuItems(hMenu, GuiConsoleMainMenuItems); + } + else + { + DPRINT1("This should never happen, GetSystemMenu == NULL \n"); } } @@ -236,10 +242,12 @@ RtlFreeUnicodeString(&SidName); CloseHandle(hProcessToken); - if (hProcHandle) - *hProcHandle = hProcess; - else - CloseHandle(hProcess); + CloseHandle(hProcess); + + //if (hProcHandle) + // *hProcHandle = hProcess; + //else + // CloseHandle(hProcess); if (res != ERROR_SUCCESS) return FALSE; @@ -276,21 +284,26 @@ DPRINT("GuiConsoleOpenUserSettings entered\n"); + DPRINT1("ProcessId %d\n",ProcessId); + if (!GuiConsoleOpenUserRegistryPathPerProcessId(ProcessId, &hProcess, &hKey, samDesired)) { - DPRINT("GuiConsoleOpenUserRegistryPathPerProcessId failed\n"); + DPRINT1("GuiConsoleOpenUserRegistryPathPerProcessId failed\n"); return FALSE; } + + hProcess = OpenProcess( PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, ProcessId ); + /* FIXME we do not getting the process name so no menu will be loading, why ?*/ fLength = GetProcessImageFileNameW(hProcess, szProcessName, sizeof(GuiData->szProcessName) / sizeof(WCHAR)); CloseHandle(hProcess); - //DPRINT1("szProcessName3 : %S\n",szProcessName); + DPRINT1("szProcessName3 : %S\n",szProcessName); if (!fLength) { - DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); + DPRINT1("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); return FALSE; } /* @@ -658,6 +671,8 @@ if (Console->ProcessList.Flink != &Console->ProcessList) { ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); + DPRINT1("PtrToUlong(ProcessData->ProcessId) == %d",PtrToUlong(ProcessData->ProcessId)); + if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ, FALSE)) { GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); @@ -1263,13 +1278,20 @@ { PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; + HMENU menu; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); KillTimer(hWnd, 1); Console->PrivateData = NULL; DeleteCriticalSection(&GuiData->Lock); - GetSystemMenu(hWnd, TRUE); + + menu = GetSystemMenu(hWnd, TRUE); + if (menu == NULL) + { + DPRINT1("This should never happen, GetSystemMenu == NULL \n"); + } + if (GuiData->ConsoleLibrary) FreeLibrary(GuiData->ConsoleLibrary); Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2805… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Aug 1 01:38:52 2007 @@ -44,8 +44,9 @@ # WIN32K.SYS 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_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S -WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S +WIN32K_GDI_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S +WIN32K_USER_STUBS = lib$(SEP)win32ksys$(SEP)$(ARCH)$(SEP)win32k.S + # NTOSKRNL.EXE @@ -69,6 +70,7 @@ ${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) ${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) ${mkdir} lib$(SEP)win32ksys$(SEP)$(ARCH) 2>$(NUL) + $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \

17 years, 4 months

[gedmurphy] 28056: - don't write more bytes to the reg key than is required. fixes bug 2402 - use unicode explicitly See issue #2402 for more details.

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Wed Aug 1 01:17:57 2007 New Revision: 28056 URL: http://svn.reactos.org/svn/reactos?rev=28056&view=rev Log: - don't write more bytes to the reg key than is required. fixes bug 2402 - use unicode explicitly See issue #2402 for more details. Modified: trunk/reactos/dll/cpl/timedate/internettime.c Modified: trunk/reactos/dll/cpl/timedate/internettime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/internett… ============================================================================== --- trunk/reactos/dll/cpl/timedate/internettime.c (original) +++ trunk/reactos/dll/cpl/timedate/internettime.c Wed Aug 1 01:17:57 2007 @@ -13,8 +13,8 @@ CreateNTPServerList(HWND hwnd) { HWND hList; - TCHAR szValName[MAX_VALUE_NAME]; - TCHAR szData[256]; + WCHAR szValName[MAX_VALUE_NAME]; + WCHAR szData[256]; DWORD dwIndex = 0; DWORD dwValSize; DWORD dwNameSize; @@ -25,8 +25,8 @@ hList = GetDlgItem(hwnd, IDC_SERVERLIST); - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"), + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers", 0, KEY_QUERY_VALUE, &hKey); @@ -35,30 +35,30 @@ while (TRUE) { - dwValSize = MAX_VALUE_NAME * sizeof(TCHAR); - szValName[0] = '\0'; - lRet = RegEnumValue(hKey, - dwIndex, - szValName, - &dwValSize, - NULL, - NULL, - (LPBYTE)szData, - &dwNameSize); + dwValSize = MAX_VALUE_NAME * sizeof(WCHAR); + szValName[0] = L'\0'; + lRet = RegEnumValueW(hKey, + dwIndex, + szValName, + &dwValSize, + NULL, + NULL, + (LPBYTE)szData, + &dwNameSize); if (lRet == ERROR_SUCCESS) { /* get date from default reg value */ - if (_tcscmp(szValName, _T("")) == 0) // if (Index == 0) + if (wcscmp(szValName, L"") == 0) // if (Index == 0) { - dwDefault = _ttoi(szData); + dwDefault = _wtoi(szData); dwIndex++; } else { - SendMessage(hList, - CB_ADDSTRING, - 0, - (LPARAM)szData); + SendMessageW(hList, + CB_ADDSTRING, + 0, + (LPARAM)szData); dwIndex++; } } @@ -75,10 +75,10 @@ * combo boxes count from 0 */ dwDefault--; - SendMessage(hList, - CB_SETCURSEL, - dwDefault, - 0); + SendMessageW(hList, + CB_SETCURSEL, + dwDefault, + 0); RegCloseKey(hKey); } @@ -91,13 +91,13 @@ HKEY hKey; HWND hList; UINT uSel; - TCHAR szSel[4]; + WCHAR szSel[4]; LONG lRet; hList = GetDlgItem(hwnd, IDC_SERVERLIST); - uSel = (UINT)SendMessage(hList, CB_GETCURSEL, 0, 0); + uSel = (UINT)SendMessageW(hList, CB_GETCURSEL, 0, 0); /* server reg entries count from 1, * combo boxes count from 0 */ @@ -106,11 +106,11 @@ /* convert to wide char */ _itow(uSel, szSel, 10); - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"), - 0, - KEY_SET_VALUE, - &hKey); + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers", + 0, + KEY_SET_VALUE, + &hKey); if (lRet != ERROR_SUCCESS) { DisplayWin32Error(lRet); @@ -118,11 +118,11 @@ } lRet = RegSetValueExW(hKey, - _T(""), + L"", 0, REG_SZ, (LPBYTE)szSel, - sizeof(szSel)); + (wcslen(szSel) + 1) * sizeof(WCHAR)); if (lRet != ERROR_SUCCESS) DisplayWin32Error(lRet); @@ -132,43 +132,43 @@ /* get the domain name from the registry */ static BOOL -GetNTPServerAddress(LPTSTR *lpAddress) +GetNTPServerAddress(LPWSTR *lpAddress) { HKEY hKey; - TCHAR szSel[4]; + WCHAR szSel[4]; DWORD dwSize; LONG lRet; - lRet = RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers"), - 0, - KEY_QUERY_VALUE, - &hKey); + lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Servers", + 0, + KEY_QUERY_VALUE, + &hKey); if (lRet != ERROR_SUCCESS) goto fail; /* Get data from default value */ - dwSize = 4 * sizeof(TCHAR); - lRet = RegQueryValueEx(hKey, - _T(""), - NULL, - NULL, - (LPBYTE)szSel, - &dwSize); + dwSize = 4 * sizeof(WCHAR); + lRet = RegQueryValueExW(hKey, + NULL, + NULL, + NULL, + (LPBYTE)szSel, + &dwSize); if (lRet != ERROR_SUCCESS) goto fail; dwSize = 0; - lRet = RegQueryValueEx(hKey, - szSel, - NULL, - NULL, - NULL, - &dwSize); - if (lRet != ERROR_SUCCESS) - goto fail; - - (*lpAddress) = (LPTSTR)HeapAlloc(GetProcessHeap(), + lRet = RegQueryValueExW(hKey, + szSel, + NULL, + NULL, + NULL, + &dwSize); + if (lRet != ERROR_SUCCESS) + goto fail; + + (*lpAddress) = (LPWSTR)HeapAlloc(GetProcessHeap(), 0, dwSize); if ((*lpAddress) == NULL) @@ -177,12 +177,12 @@ goto fail; } - lRet = RegQueryValueEx(hKey, - szSel, - NULL, - NULL, - (LPBYTE)*lpAddress, - &dwSize); + lRet = RegQueryValueExW(hKey, + szSel, + NULL, + NULL, + (LPBYTE)*lpAddress, + &dwSize); if (lRet != ERROR_SUCCESS) goto fail; @@ -203,7 +203,7 @@ static ULONG GetTimeFromServer(VOID) { - LPTSTR lpAddress = NULL; + LPWSTR lpAddress = NULL; ULONG ulTime = 0; if (GetNTPServerAddress(&lpAddress)) @@ -269,7 +269,7 @@ BOOL bChecked; UINT uCheck; - uCheck = (UINT)SendDlgItemMessage(hwnd, IDC_AUTOSYNC, BM_GETCHECK, 0, 0); + uCheck = (UINT)SendDlgItemMessageW(hwnd, IDC_AUTOSYNC, BM_GETCHECK, 0, 0); bChecked = (uCheck == BST_CHECKED) ? TRUE : FALSE; EnableWindow(GetDlgItem(hwnd, IDC_SERVERTEXT), bChecked); @@ -284,25 +284,25 @@ GetSyncSetting(HWND hwnd) { HKEY hKey; - TCHAR szData[8]; + WCHAR szData[8]; DWORD dwSize; - if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, - _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Parameters"), - 0, - KEY_QUERY_VALUE, - &hKey) == ERROR_SUCCESS) - { - dwSize = 8 * sizeof(TCHAR); - if (RegQueryValueEx(hKey, - _T("Type"), - NULL, - NULL, - (LPBYTE)szData, - &dwSize) == ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\DateTime\\Parameters", + 0, + KEY_QUERY_VALUE, + &hKey) == ERROR_SUCCESS) + { + dwSize = 8 * sizeof(WCHAR); + if (RegQueryValueExW(hKey, + L"Type", + NULL, + NULL, + (LPBYTE)szData, + &dwSize) == ERROR_SUCCESS) { - if (_tcscmp(szData, _T("NTP")) == 0) - SendDlgItemMessage(hwnd, IDC_AUTOSYNC, BM_SETCHECK, 0, 0); + if (wcscmp(szData, L"NTP") == 0) + SendDlgItemMessageW(hwnd, IDC_AUTOSYNC, BM_SETCHECK, 0, 0); } RegCloseKey(hKey);

17 years, 4 months

[greatlrd] 28055: user32 cleanup lite redirect the InvalidateRect@12 to NtUserInvalidateRect@12 in the def file nci tools changes (done of timo and me) frist part moving the w32ksvc.db and sysfuncs.lst where they belong

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Wed Aug 1 00:22:13 2007 New Revision: 28055 URL: http://svn.reactos.org/svn/reactos?rev=28055&view=rev Log: user32 cleanup lite redirect the InvalidateRect@12 to NtUserInvalidateRect@12 in the def file nci tools changes (done of timo and me) frist part moving the w32ksvc.db and sysfuncs.lst where they belong Added: trunk/reactos/ntoskrnl/sysfuncs.lst - copied unchanged from r28054, trunk/reactos/tools/nci/sysfuncs.lst trunk/reactos/subsystems/win32/win32k/w32ksvc.db - copied unchanged from r28054, trunk/reactos/tools/nci/w32ksvc.db Removed: trunk/reactos/tools/nci/sysfuncs.lst trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/dll/win32/user32/controls/button.c trunk/reactos/dll/win32/user32/controls/combo.c trunk/reactos/dll/win32/user32/controls/edit.c trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/user32.def trunk/reactos/dll/win32/user32/windows/paint.c trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/dll/win32/user32/controls/button.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/button.c (original) +++ trunk/reactos/dll/win32/user32/controls/button.c Wed Aug 1 00:22:13 2007 @@ -400,7 +400,7 @@ if (unicode) DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam ); else DefWindowProcA( hWnd, WM_SETTEXT, wParam, lParam ); if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */ - InvalidateRect( hWnd, NULL, TRUE ); + NtUserInvalidateRect( hWnd, NULL, TRUE ); else paint_button( hWnd, btn_type, ODA_DRAWENTIRE ); return 1; /* success. FIXME: check text length */ @@ -436,7 +436,7 @@ break; case WM_SYSCOLORCHANGE: - InvalidateRect( hWnd, NULL, FALSE ); + NtUserInvalidateRect( hWnd, NULL, FALSE ); break; #ifndef __REACTOS__ @@ -473,8 +473,8 @@ return 0; } oldHbitmap = (HBITMAP)SetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET, lParam ); - InvalidateRect( hWnd, NULL, FALSE ); - return (LRESULT)oldHbitmap; + NtUserInvalidateRect( hWnd, NULL, FALSE ); + return (LRESULT)oldHbitmap; case BM_GETIMAGE: return GetWindowLongPtrW( hWnd, HIMAGE_GWL_OFFSET ); Modified: trunk/reactos/dll/win32/user32/controls/combo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/combo.c (original) +++ trunk/reactos/dll/win32/user32/controls/combo.c Wed Aug 1 00:22:13 2007 @@ -1215,7 +1215,7 @@ */ static void CBRepaintButton( LPHEADCOMBO lphc ) { - InvalidateRect(lphc->self, &lphc->buttonRect, TRUE); + NtUserInvalidateRect(lphc->self, &lphc->buttonRect, TRUE); UpdateWindow(lphc->self); } @@ -1234,7 +1234,9 @@ /* lphc->wState |= CBF_FOCUSED; */ if( !(lphc->wState & CBF_EDIT) ) - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + { + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); + } CB_NOTIFY( lphc, CBN_SETFOCUS ); lphc->wState |= CBF_FOCUSED; @@ -1256,11 +1258,11 @@ if( CB_GETTYPE(lphc) == CBS_DROPDOWNLIST ) SendMessageW(lphc->hWndLBox, LB_CARETOFF, 0, 0); - lphc->wState &= ~CBF_FOCUSED; + lphc->wState &= ~CBF_FOCUSED; /* redraw text */ - if( !(lphc->wState & CBF_EDIT) ) - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + if( !(lphc->wState & CBF_EDIT) ) + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); CB_NOTIFY( lphc, CBN_KILLFOCUS ); } @@ -1278,12 +1280,12 @@ switch( HIWORD(wParam) >> 8 ) { - case (EN_SETFOCUS >> 8): + case (EN_SETFOCUS >> 8): TRACE("[%p]: edit [%p] got focus\n", lphc->self, lphc->hWndEdit ); - COMBO_SetFocus( lphc ); - break; + COMBO_SetFocus( lphc ); + break; case (EN_KILLFOCUS >> 8): @@ -1357,7 +1359,7 @@ SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1)); } else - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); } /* do not roll up if selection is being tracked @@ -1679,7 +1681,7 @@ CBUpdateEdit( lphc, index ); else { - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); } } return (LRESULT)index; @@ -1988,7 +1990,7 @@ EnableWindow( lphc->hWndLBox, (BOOL)wParam ); /* Force the control to repaint when the enabled state changes. */ - InvalidateRect(lphc->self, NULL, TRUE); + NtUserInvalidateRect(lphc->self, NULL, TRUE); return TRUE; case WM_SETREDRAW: if( wParam ) @@ -2170,7 +2172,7 @@ SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)empty_stringW); } else - InvalidateRect(lphc->self, NULL, TRUE); + NtUserInvalidateRect(lphc->self, NULL, TRUE); return TRUE; case CB_INITSTORAGE: return SendMessageW(lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam); @@ -2259,7 +2261,7 @@ if( lphc->wState & CBF_EDIT ) CBUpdateEdit( lphc, (INT)wParam ); else - InvalidateRect(lphc->self, &lphc->textRect, TRUE); + NtUserInvalidateRect(lphc->self, &lphc->textRect, TRUE); lphc->wState &= ~CBF_SELCHANGE; return lParam; #ifndef __REACTOS__ Modified: trunk/reactos/dll/win32/user32/controls/edit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/edit.c (original) +++ trunk/reactos/dll/win32/user32/controls/edit.c Wed Aug 1 00:22:13 2007 @@ -5386,7 +5386,7 @@ es->flags &= ~EF_UPDATE; EDIT_NOTIFY_PARENT(es, EN_UPDATE); } - InvalidateRect(es->hwndSelf, rc, bErase); + NtUserInvalidateRect(es->hwndSelf, rc, bErase); } /******************************************************************** Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c Wed Aug 1 00:22:13 2007 @@ -386,7 +386,7 @@ else scroll = FALSE; } - if (!scroll) InvalidateRect( descr->self, NULL, TRUE ); + if (!scroll) NtUserInvalidateRect( descr->self, NULL, TRUE ); descr->top_item = index; LISTBOX_UpdateScroll( descr ); return LB_OKAY; @@ -408,7 +408,7 @@ if (page_size == descr->page_size) return; descr->page_size = page_size; if (descr->style & LBS_MULTICOLUMN) - InvalidateRect( descr->self, NULL, TRUE ); + NtUserInvalidateRect( descr->self, NULL, TRUE ); LISTBOX_SetTopItem( descr, descr->top_item, FALSE ); } @@ -463,7 +463,7 @@ /* Invalidate the focused item so it will be repainted correctly */ if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1) { - InvalidateRect( descr->self, &rect, FALSE ); + NtUserInvalidateRect( descr->self, &rect, FALSE ); } } @@ -685,7 +685,7 @@ descr->style &= ~LBS_NOREDRAW; if (descr->style & LBS_DISPLAYCHANGED) { /* page was changed while setredraw false, refresh automatically */ - InvalidateRect(descr->self, NULL, TRUE); + NtUserInvalidateRect(descr->self, NULL, TRUE); if ((descr->top_item + descr->page_size) > descr->nb_items) { /* reset top of page if less than number of items/page */ descr->top_item = descr->nb_items - descr->page_size; @@ -1198,14 +1198,14 @@ return; } rect.bottom = descr->height; - InvalidateRect( descr->self, &rect, TRUE ); + NtUserInvalidateRect( descr->self, &rect, TRUE ); if (descr->style & LBS_MULTICOLUMN) { /* Repaint the other columns */ rect.left = rect.right; rect.right = descr->width; rect.top = 0; - InvalidateRect( descr->self, &rect, TRUE ); + NtUserInvalidateRect( descr->self, &rect, TRUE ); } } } @@ -1215,7 +1215,7 @@ RECT rect; if (LISTBOX_GetItemRect( descr, index, &rect ) == 1) - InvalidateRect( descr->self, &rect, TRUE ); + NtUserInvalidateRect( descr->self, &rect, TRUE ); } /*********************************************************************** @@ -1267,7 +1267,7 @@ LISTBOX_UpdatePage( descr ); LISTBOX_UpdateScroll( descr ); if (repaint) - InvalidateRect( descr->self, 0, TRUE ); + NtUserInvalidateRect( descr->self, 0, TRUE ); } return LB_OKAY; } @@ -1292,12 +1292,12 @@ RECT rect; /* Invalidate the focused item so it will be repainted correctly */ if (LISTBOX_GetItemRect( descr, descr->focus_item, &rect ) == 1) - InvalidateRect( descr->self, &rect, TRUE ); + NtUserInvalidateRect( descr->self, &rect, TRUE ); ScrollWindowEx( descr->self, diff, 0, NULL, NULL, 0, NULL, SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); } else - InvalidateRect( descr->self, NULL, TRUE ); + NtUserInvalidateRect( descr->self, NULL, TRUE ); } @@ -2646,7 +2646,7 @@ case LB_RESETCONTENT: LISTBOX_ResetContent( descr ); LISTBOX_UpdateScroll( descr ); - InvalidateRect( descr->self, NULL, TRUE ); + NtUserInvalidateRect( descr->self, NULL, TRUE ); return 0; #ifndef __REACTOS__ @@ -3158,7 +3158,7 @@ return LISTBOX_Destroy( descr ); case WM_ENABLE: - InvalidateRect( hwnd, NULL, TRUE ); + NtUserInvalidateRect( hwnd, NULL, TRUE ); return 0; case WM_SETREDRAW: @@ -3184,7 +3184,7 @@ return (LRESULT)descr->font; case WM_SETFONT: LISTBOX_SetFont( descr, (HFONT)wParam ); - if (lParam) InvalidateRect( hwnd, 0, TRUE ); + if (lParam) NtUserInvalidateRect( hwnd, 0, TRUE ); return 0; case WM_SETFOCUS: descr->in_focus = TRUE; Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c Wed Aug 1 00:22:13 2007 @@ -1357,7 +1357,7 @@ Rect.bottom = Rect.top + ThumbSize; } HideCaret(Wnd); - InvalidateRect(Wnd, &Rect, FALSE); + NtUserInvalidateRect(Wnd, &Rect, FALSE); DestroyCaret(); } break; Modified: trunk/reactos/dll/win32/user32/user32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user32.de… ============================================================================== --- trunk/reactos/dll/win32/user32/user32.def (original) +++ trunk/reactos/dll/win32/user32/user32.def Wed Aug 1 00:22:13 2007 @@ -407,7 +407,7 @@ InsertMenuW@20 InternalGetWindowText@12 IntersectRect@12 -InvalidateRect@12 +InvalidateRect@12=NtUserInvalidateRect@12 InvalidateRgn@12 InvertRect@8 IsCharAlphaA@4 Modified: trunk/reactos/dll/win32/user32/windows/paint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/paint.c (original) +++ trunk/reactos/dll/win32/user32/windows/paint.c Wed Aug 1 00:22:13 2007 @@ -147,18 +147,6 @@ } -/* - * @implemented - */ -BOOL -STDCALL -InvalidateRect( - HWND hWnd, - CONST RECT *lpRect, - BOOL bErase) -{ - return NtUserInvalidateRect(hWnd, lpRect, bErase); -} /* Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2805… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Aug 1 00:22:13 2007 @@ -42,13 +42,14 @@ clean: nci_clean # WIN32K.SYS -WIN32K_SVC_DB = $(NCI_BASE_)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_GDI_STUBS = dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH)$(SEP)win32k.S + # NTOSKRNL.EXE -KERNEL_SVC_DB = $(NCI_BASE_)sysfuncs.lst +KERNEL_SVC_DB = ntoskrnl$(SEP)sysfuncs.lst KERNEL_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S @@ -67,6 +68,7 @@ ${mkdir} ntoskrnl$(SEP)ex$(SEP)$(ARCH) 2>$(NUL) ${mkdir} dll$(SEP)win32$(SEP)gdi32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) ${mkdir} dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)$(ARCH) 2>$(NUL) + ${mkdir} lib$(SEP)win32ksys$(SEP)$(ARCH) 2>$(NUL) $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ Removed: trunk/reactos/tools/nci/sysfuncs.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/sysfuncs.lst?rev… ============================================================================== --- trunk/reactos/tools/nci/sysfuncs.lst (original) +++ trunk/reactos/tools/nci/sysfuncs.lst (removed) @@ -1,293 +1,0 @@ -NtAcceptConnectPort 6 -NtAccessCheck 8 -NtAccessCheckAndAuditAlarm 11 -NtAccessCheckByType 11 -NtAccessCheckByTypeAndAuditAlarm 16 -NtAccessCheckByTypeResultList 11 -NtAccessCheckByTypeResultListAndAuditAlarm 16 -NtAccessCheckByTypeResultListAndAuditAlarmByHandle 17 -NtAddAtom 3 -NtAddBootEntry 2 -NtAddDriverEntry 2 -NtAdjustGroupsToken 6 -NtAdjustPrivilegesToken 6 -NtAlertResumeThread 2 -NtAlertThread 1 -NtAllocateLocallyUniqueId 1 -NtAllocateUserPhysicalPages 3 -NtAllocateUuids 4 -NtAllocateVirtualMemory 6 -NtApphelpCacheControl 2 -NtAreMappedFilesTheSame 2 -NtAssignProcessToJobObject 2 -NtCallbackReturn 3 -NtCancelIoFile 2 -NtCancelTimer 2 -NtClearEvent 1 -NtClose 1 -NtCloseObjectAuditAlarm 3 -NtCompactKeys 2 -NtCompareTokens 3 -NtCompleteConnectPort 1 -NtCompressKey 1 -NtConnectPort 8 -NtContinue 2 -NtCreateDebugObject 4 -NtCreateDirectoryObject 3 -NtCreateEvent 5 -NtCreateEventPair 3 -NtCreateFile 11 -NtCreateIoCompletion 4 -NtCreateJobObject 3 -NtCreateJobSet 3 -NtCreateKey 7 -NtCreateMailslotFile 8 -NtCreateMutant 4 -NtCreateNamedPipeFile 14 -NtCreatePagingFile 4 -NtCreatePort 5 -NtCreateProcess 8 -NtCreateProcessEx 9 -NtCreateProfile 9 -NtCreateSection 7 -NtCreateSemaphore 5 -NtCreateSymbolicLinkObject 4 -NtCreateThread 8 -NtCreateTimer 4 -NtCreateToken 13 -NtCreateWaitablePort 5 -NtDebugActiveProcess 2 -NtDebugContinue 3 -NtDelayExecution 2 -NtDeleteAtom 1 -NtDeleteBootEntry 1 -NtDeleteDriverEntry 1 -NtDeleteFile 1 -NtDeleteKey 1 -NtDeleteObjectAuditAlarm 3 -NtDeleteValueKey 2 -NtDeviceIoControlFile 10 -NtDisplayString 1 -NtDuplicateObject 7 -NtDuplicateToken 6 -NtEnumerateBootEntries 2 -NtEnumerateDriverEntries 2 -NtEnumerateKey 6 -NtEnumerateSystemEnvironmentValuesEx 3 -NtEnumerateValueKey 6 -NtExtendSection 2 -NtFilterToken 6 -NtFindAtom 3 -NtFlushBuffersFile 2 -NtFlushInstructionCache 3 -NtFlushKey 1 -NtFlushVirtualMemory 4 -NtFlushWriteBuffer 0 -NtFreeUserPhysicalPages 3 -NtFreeVirtualMemory 4 -NtFsControlFile 10 -NtGetContextThread 2 -NtGetDevicePowerState 2 -NtGetPlugPlayEvent 4 -NtGetWriteWatch 7 -NtImpersonateAnonymousToken 1 -NtImpersonateClientOfPort 2 -NtImpersonateThread 3 -NtInitializeRegistry 1 -NtInitiatePowerAction 4 -NtIsProcessInJob 2 -NtIsSystemResumeAutomatic 0 -NtListenPort 2 -NtLoadDriver 1 -NtLoadKey 2 -NtLoadKey2 3 -NtLoadKeyEx 7 -NtLockFile 10 -NtLockProductActivationKeys 2 -NtLockRegistryKey 1 -NtLockVirtualMemory 4 -NtMakePermanentObject 1 -NtMakeTemporaryObject 1 -NtMapUserPhysicalPages 3 -NtMapUserPhysicalPagesScatter 3 -NtMapViewOfSection 10 -NtModifyBootEntry 1 -NtModifyDriverEntry 1 -NtNotifyChangeDirectoryFile 9 -NtNotifyChangeKey 10 -NtNotifyChangeMultipleKeys 12 -NtOpenDirectoryObject 3 -NtOpenEvent 3 -NtOpenEventPair 3 -NtOpenFile 6 -NtOpenIoCompletion 3 -NtOpenJobObject 3 -NtOpenKey 3 -NtOpenMutant 3 -NtOpenObjectAuditAlarm 12 -NtOpenProcess 4 -NtOpenProcessToken 3 -NtOpenProcessTokenEx 4 -NtOpenSection 3 -NtOpenSemaphore 3 -NtOpenSymbolicLinkObject 3 -NtOpenThread 4 -NtOpenThreadToken 4 -NtOpenThreadTokenEx 5 -NtOpenTimer 3 -NtPlugPlayControl 3 -NtPowerInformation 5 -NtPrivilegeCheck 3 -NtPrivilegedServiceAuditAlarm 5 -NtPrivilegeObjectAuditAlarm 6 -NtProtectVirtualMemory 5 -NtPulseEvent 2 -NtQueryAttributesFile 2 -NtQueryBootEntryOrder 2 -NtQueryBootOptions 2 -NtQueryDebugFilterState 2 -NtQueryDefaultLocale 2 -NtQueryDefaultUILanguage 1 -NtQueryDirectoryFile 11 -NtQueryDirectoryObject 7 -NtQueryDriverEntryOrder 2 -NtQueryEaFile 9 -NtQueryEvent 5 -NtQueryFullAttributesFile 2 -NtQueryInformationAtom 5 -NtQueryInformationFile 5 -NtQueryInformationJobObject 5 -NtQueryInformationPort 5 -NtQueryInformationProcess 5 -NtQueryInformationThread 5 -NtQueryInformationToken 5 -NtQueryInstallUILanguage 1 -NtQueryIntervalProfile 2 -NtQueryIoCompletion 5 -NtQueryKey 5 -NtQueryMultipleValueKey 6 -NtQueryMutant 5 -NtQueryObject 5 -NtQueryOpenSubKeys 2 -NtQueryOpenSubKeysEx 4 -NtQueryPerformanceCounter 2 -NtQueryQuotaInformationFile 9 -NtQuerySection 5 -NtQuerySecurityObject 5 -NtQuerySemaphore 5 -NtQuerySymbolicLinkObject 3 -NtQuerySystemEnvironmentValue 4 -NtQuerySystemEnvironmentValueEx 5 -NtQuerySystemInformation 4 -NtQuerySystemTime 1 -NtQueryTimer 5 -NtQueryTimerResolution 3 -NtQueryValueKey 6 -NtQueryVirtualMemory 6 -NtQueryVolumeInformationFile 5 -NtQueueApcThread 5 -NtRaiseException 3 -NtRaiseHardError 6 -NtReadFile 9 -NtReadFileScatter 9 -NtReadRequestData 6 -NtReadVirtualMemory 5 -NtRegisterThreadTerminatePort 1 -NtReleaseMutant 2 -NtReleaseSemaphore 3 -NtRemoveIoCompletion 5 -NtRemoveProcessDebug 2 -NtReplaceKey 3 -NtReplyPort 2 -NtReplyWaitReceivePort 4 -NtReplyWaitReceivePortEx 5 -NtReplyWaitReplyPort 2 -NtRequestPort 2 -NtRequestWaitReplyPort 3 -NtRequestWakeupLatency 1 -NtResetEvent 2 -NtResetWriteWatch 3 -NtRestoreKey 3 -NtResumeProcess 1 -NtResumeThread 2 -NtSaveKey 2 -NtSaveKeyEx 3 -NtSaveMergedKeys 3 -NtSecureConnectPort 9 -NtSetBootEntryOrder 2 -NtSetBootOptions 2 -NtSetContextThread 2 -NtSetDebugFilterState 3 -NtSetDefaultHardErrorPort 1 -NtSetDefaultLocale 2 -NtSetDefaultUILanguage 1 -NtSetDriverEntryOrder 2 -NtSetEaFile 4 -NtSetEvent 2 -NtSetEventBoostPriority 1 -NtSetHighEventPair 1 -NtSetHighWaitLowEventPair 1 -NtSetInformationDebugObject 5 -NtSetInformationFile 5 -NtSetInformationJobObject 4 -NtSetInformationKey 4 -NtSetInformationObject 4 -NtSetInformationProcess 4 -NtSetInformationThread 4 -NtSetInformationToken 4 -NtSetIntervalProfile 2 -NtSetIoCompletion 5 -NtSetLdtEntries 6 -NtSetLowEventPair 1 -NtSetLowWaitHighEventPair 1 -NtSetQuotaInformationFile 4 -NtSetSecurityObject 3 -NtSetSystemEnvironmentValue 2 -NtSetSystemEnvironmentValueEx 2 -NtSetSystemInformation 3 -NtSetSystemPowerState 3 -NtSetSystemTime 2 -NtSetThreadExecutionState 2 -NtSetTimer 7 -NtSetTimerResolution 3 -NtSetUuidSeed 1 -NtSetValueKey 6 -NtSetVolumeInformationFile 5 -NtShutdownSystem 1 -NtSignalAndWaitForSingleObject 4 -NtStartProfile 1 -NtStopProfile 1 -NtSuspendProcess 1 -NtSuspendThread 2 -NtSystemDebugControl 6 -NtTerminateJobObject 2 -NtTerminateProcess 2 -NtTerminateThread 2 -NtTestAlert 0 -NtTraceEvent 4 -NtTranslateFilePath 4 -NtUnloadDriver 1 -NtUnloadKey 1 -NtUnloadKey2 2 -NtUnloadKeyEx 2 -NtUnlockFile 5 -NtUnlockVirtualMemory 4 -NtUnmapViewOfSection 2 -NtVdmControl 2 -NtWaitForDebugEvent 4 -NtWaitForMultipleObjects 5 -NtWaitForSingleObject 3 -NtWaitHighEventPair 1 -NtWaitLowEventPair 1 -NtWriteFile 9 -NtWriteFileGather 9 -NtWriteRequestData 6 -NtWriteVirtualMemory 5 -NtYieldExecution 0 -NtCreateKeyedEvent 4 -NtOpenKeyedEvent 3 -NtReleaseKeyedEvent 4 -NtWaitForKeyedEvent 4 -NtQueryPortInformationProcess 0 -NtGetCurrentProcessorNumber 0 -NtWaitForMultipleObjects32 5 Removed: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db (removed) @@ -1,621 +1,0 @@ -# NAME ARG_COUNT -NtGdiAbortDoc 1 -NtGdiAbortPath 1 -NtGdiAddFontResource 2 -NtGdiAlphaBlend 11 -NtGdiAngleArc 6 -NtGdiAnimatePalette 4 -NtGdiArc 9 -NtGdiArcInternal 10 -NtGdiArcTo 9 -NtGdiBeginPath 1 -NtGdiBitBlt 11 -NtGdiCancelDC 1 -NtGdiChord 9 -NtGdiCloseEnhMetaFile 1 -NtGdiCloseFigure 1 -NtGdiCloseMetaFile 1 -NtGdiColorMatchToTarget 3 -NtGdiCombineRgn 4 -NtGdiCombineTransform 3 -NtGdiCopyEnhMetaFile 2 -NtGdiCopyMetaFile 2 -NtGdiCreateBitmap 5 -NtGdiCreateClientObj 1 -NtGdiCreateColorSpace 1 -NtGdiCreateCompatibleBitmap 3 -NtGdiCreateCompatibleDC 1 -NtGdiCreateDIBitmap 6 -NtGdiCreateDIBBrush 6 -NtGdiCreateDIBSection 9 -NtGdiCreateEllipticRgn 4 -NtGdiCreateEnhMetaFile 4 -NtGdiCreateHalftonePalette 1 -NtGdiCreateHatchBrushInternal 3 -NtGdiCreateMetaFile 1 -NtGdiCreatePalette 1 -NtGdiCreatePatternBrushInternal 3 -NtGdiCreatePen 4 -NtGdiCreatePolygonRgn 3 -NtGdiCreatePolyPolygonRgn 4 -NtGdiCreateRectRgn 4 -NtGdiCreateRoundRectRgn 6 -NtGdiCreateScalableFontResource 4 -NtGdiCreateSolidBrush 2 -NtGdiDPtoLP 3 -NtGdiDeleteClientObj 1 -NtGdiDeleteColorSpace 1 -NtGdiDeleteObjectApp 1 -NtGdiDeleteEnhMetaFile 1 -NtGdiDeleteMetaFile 1 -NtGdiDeleteObject 1 -NtGdiDescribePixelFormat 4 -#NtGdiDeviceCapabilitiesEx ? -NtGdiDrawEscape 4 -NtGdiEllipse 5 -NtGdiEndDoc 1 -NtGdiEndPage 1 -NtGdiEndPath 1 -NtGdiEnumEnhMetaFile 5 -NtGdiEnumFonts 4 -NtGdiEnumICMProfiles 3 -NtGdiEnumMetaFile 4 -NtGdiEnumObjects 4 -NtGdiEqualRgn 2 -NtGdiEscape 5 -NtGdiExcludeClipRect 5 -NtGdiExtCreatePen 11 -NtGdiExtCreateRegion 3 -NtGdiExtEscape 6 -NtGdiExtFloodFill 5 -NtGdiExtGetObjectW 3 -NtGdiExtSelectClipRgn 3 -NtGdiExtTextOut 8 -NtGdiFillPath 1 -NtGdiFillRgn 3 -NtGdiFlattenPath 1 -NtGdiFrameRgn 5 -NtGdiGdiComment 3 -NtGdiFlush 0 -#NtGdiGdiPlayDCScript ? -#NtGdiGdiPlayJournal ? -#NtGdiGdiPlayScript ? -#NtGdiGdiPlaySpoolStream ? -NtGdiGetArcDirection 1 -NtGdiGetAspectRatioFilterEx 2 -NtGdiGetBitmapBits 3 -NtGdiGetBitmapDimensionEx 2 -NtGdiGetBkColor 1 -NtGdiGetBkMode 1 -NtGdiGetBoundsRect 3 -NtGdiGetBrushOrgEx 2 -NtGdiGetCharABCWidths 4 -NtGdiGetCharABCWidthsFloat 4 -NtGdiGetCharacterPlacement 6 -NtGdiGetCharSet 1 -NtGdiGetCharWidth32 4 -NtGdiGetCharWidthFloat 4 -NtGdiGetClipBox 2 -NtGdiGetClipRgn 1 -NtGdiGetColorAdjustment 2 -NtGdiGetColorSpace 1 -NtGdiGetCurrentObject 2 -NtGdiGetCurrentPositionEx 2 -NtGdiGetDCOrgEx 2 -NtGdiGetDIBColorTable 4 -NtGdiGetDIBits 7 -NtGdiGetDeviceCaps 2 -NtGdiGetDeviceGammaRamp 2 -NtGdiGetEnhMetaFile 1 -NtGdiGetEnhMetaFileBits 3 -NtGdiGetEnhMetaFileDescription 3 -NtGdiGetEnhMetaFileHeader 3 -NtGdiGetEnhMetaFilePaletteEntries 3 -NtGdiGetEnhMetaFilePixelFormat 3 -NtGdiGetFontData 5 -NtGdiGetFontFamilyInfo 4 -NtGdiGetFontLanguageInfo 1 -NtGdiGetFontResourceInfoInternalW 7 -NtGdiGetGlyphOutline 8 -#NtGdiGetGlyphOutlineWow ? -NtGdiGetGraphicsMode 1 -NtGdiGetICMProfile 3 -NtGdiGetKerningPairs 3 -NtGdiGetLogColorSpace 3 -NtGdiGetMapMode 1 -NtGdiGetMetaFile 1 -NtGdiGetMetaFileBitsEx 3 -NtGdiGetMetaRgn 2 -NtGdiGetMiterLimit 2 -NtGdiGetNearestColor 2 -NtGdiGetNearestPaletteIndex 2 -NtGdiGetOutlineTextMetricsInternalW 4 -NtGdiGetPaletteEntries 4 -NtGdiGetPath 4 -NtGdiGetPixel 3 -NtGdiGetPixelFormat 1 -NtGdiGetPolyFillMode 1 -NtGdiGetROP2 1 -#NtGdiGetRandomRgn ? -NtGdiGetRasterizerCaps 2 -NtGdiGetRelAbs 1 -NtGdiGetRegionData 3 -NtGdiGetRgnBox 2 -NtGdiGetSetTextCharExtra 3 -NtGdiGetStockObject 1 -NtGdiGetStretchBltMode 1 -NtGdiGetSystemPaletteEntries 4 -NtGdiGetSystemPaletteUse 1 -NtGdiGetTextAlign 1 -NtGdiGetTextCharsetInfo 3 -NtGdiGetTextColor 1 -NtGdiGetTextExtentExW 8 -NtGdiGetTextExtent 5 -NtGdiGetTextExtentPoint32 4 -NtGdiGetTextFaceW 4 -NtGdiGetTextMetricsW 3 -NtGdiGetViewportExtEx 2 -NtGdiGetViewportOrgEx 2 -NtGdiGetWinMetaFileBits 5 -NtGdiGetWindowExtEx 2 -NtGdiGetWindowOrgEx 2 -NtGdiGetWorldTransform 2 -NtGdiGradientFill 6 -NtGdiHfontCreate 5 -NtGdiIntersectClipRect 5 -NtGdiInvertRgn 2 -NtGdiLPtoDP 3 -NtGdiLineTo 3 -NtGdiMaskBlt 12 -NtGdiModifyWorldTransform 3 -NtGdiMoveToEx 4 -NtGdiOffsetClipRgn 3 -NtGdiOffsetRgn 3 -NtGdiOffsetViewportOrgEx 4 -NtGdiOffsetWindowOrgEx 4 -NtGdiOpenDCW 7 -NtGdiPaintRgn 2 -NtGdiPatBlt 6 -NtGdiPathToRegion 1 -NtGdiPie 9 -NtGdiPlayEnhMetaFile 3 -NtGdiPlayEnhMetaFileRecord 4 -NtGdiPlayMetaFile 2 -NtGdiPlayMetaFileRecord 4 -NtGdiPlgBlt 10 -NtGdiPolyBezier 3 -NtGdiPolyBezierTo 3 -NtGdiPolyDraw 4 -NtGdiPolyline 3 -NtGdiPolylineTo 3 -NtGdiPolyPatBlt 5 -NtGdiPolyPolyDraw 5 -NtGdiPolyPolyline 4 -NtGdiPolyTextOut 3 -NtGdiPolygon 3 -NtGdiPolyPolygon 4 -NtGdiPtInRegion 3 -NtGdiPtVisible 3 -NtGdiRealizePalette 1 -NtGdiRectInRegion 2 -NtGdiRectVisible 2 -NtGdiRectangle 5 -NtGdiRemoveFontResource 1 -NtGdiResetDC 5 -NtGdiResizePalette 2 -NtGdiRestoreDC 2 -NtGdiRoundRect 7 -NtGdiSaveDC 1 -NtGdiScaleViewportExtEx 6 -NtGdiScaleWindowExtEx 6 -#NtGdiSelectBrushLocal ? -NtGdiSelectClipPath 2 -NtGdiSelectClipRgn 2 -#NtGdiSelectFontLocal ? -NtGdiSelectObject 2 -NtGdiSelectPalette 3 -NtGdiSetAbortProc 2 -NtGdiSetArcDirection 2 -NtGdiSetBitmapBits 3 -NtGdiSetBitmapDimensionEx 4 -NtGdiSetBkColor 2 -NtGdiSetBkMode 2 -NtGdiSetBoundsRect 3 -NtGdiSetBrushOrgEx 4 -NtGdiSetColorAdjustment 2 -NtGdiSetColorSpace 2 -NtGdiSetDIBColorTable 4 -NtGdiSetDIBits 7 -NtGdiSetDIBitsToDevice 12 -NtGdiSetDeviceGammaRamp 2 -NtGdiSetEnhMetaFileBits 2 -#NtGdiSetFontEnumeration ? -NtGdiSetGraphicsMode 2 -NtGdiSetICMMode 2 -NtGdiSetICMProfile 2 -NtGdiSetMapMode 2 -NtGdiSetMapperFlags 2 -NtGdiSetMetaFileBitsEx 2 -NtGdiSetMetaRgn 1 -NtGdiSetMiterLimit 3 -NtGdiSetPaletteEntries 4 -NtGdiSetPixel 4 -NtGdiSetPixelFormat 3 -NtGdiSetPixelV 4 -NtGdiSetPolyFillMode 2 -NtGdiSetROP2 2 -NtGdiSetRectRgn 5 -#NtGdiSetRelAbs 2 -NtGdiSetStretchBltMode 2 -NtGdiSetSystemPaletteUse 2 -NtGdiSetTextAlign 2 -NtGdiSetTextColor 2 -NtGdiSetTextJustification 3 -NtGdiSetViewportExtEx 4 -NtGdiSetViewportOrgEx 4 -#NtGdiSetWinMetaFileBits 1 -NtGdiSetWindowExtEx 4 -NtGdiSetWindowOrgEx 4 -NtGdiSetWorldTransform 2 -NtGdiStartDoc 4 -NtGdiStartPage 1 -NtGdiStretchBlt 12 -NtGdiStretchDIBits 13 -NtGdiStrokeAndFillPath 1 -NtGdiStrokePath 1 -NtGdiSwapBuffers 1 -NtGdiTransparentBlt 11 -NtGdiTranslateCharsetInfo 3 -NtGdiUnrealizeObject 1 -NtGdiUpdateColors 1 -NtGdiUpdateICMRegKey 4 -NtGdiWidenPath 1 -NtUserActivateKeyboardLayout 2 -NtUserAlterWindowStyle 3 -NtUserAttachThreadInput 3 -NtUserBeginPaint 2 -NtUserBitBltSysBmp 8 -NtUserBlockInput 1 -NtUserBuildHwndList 7 -NtUserBuildMenuItemList 4 -NtUserBuildNameList 4 -NtUserBuildPropList 4 -NtUserCallHwnd 2 -NtUserCallHwndLock 2 -NtUserCallHwndOpt 2 -NtUserCallHwndParam 3 -NtUserCallHwndParamLock 3 -NtUserCallMsgFilter 2 -NtUserCallNextHookEx 4 -NtUserCallNoParam 1 -NtUserCallOneParam 2 -NtUserCallTwoParam 3 -NtUserChangeClipboardChain 2 -NtUserChangeDisplaySettings 5 -NtUserCheckMenuItem 3 -NtUserChildWindowFromPointEx 4 -NtUserClipCursor 1 -NtUserCloseClipboard 0 -NtUserCloseDesktop 1 -NtUserCloseWindowStation 1 -NtUserConvertMemHandle 2 -NtUserCopyAcceleratorTable 3 -NtUserCountClipboardFormats 0 -NtUserCreateAcceleratorTable 2 -NtUserCreateCaret 4 -NtUserCreateCursorIconHandle 2 -NtUserCreateDesktop 5 -NtUserCreateLocalMemHandle 4 -NtUserCreateMenu 1 -NtUserCreateWindowEx 14 -NtUserCreateWindowStation 6 -NtUserDdeGetQualityOfService 3 -NtUserDdeInitialize 5 -NtUserDdeSetQualityOfService 3 -NtUserDeferWindowPos 8 -NtUserDefSetText 2 -NtUserDeleteMenu 3 -NtUserDestroyAcceleratorTable 1 -NtUserDestroyCursorIcon 2 -NtUserDestroyMenu 1 -NtUserDestroyWindow 1 -NtUserDispatchMessage 1 -NtUserDragDetect 3 -NtUserDragObject 5 -NtUserDrawAnimatedRects 4 -NtUserDrawCaption 4 -NtUserDrawCaptionTemp 7 -NtUserDrawIconEx 11 -NtUserDrawMenuBarTemp 5 -NtUserEmptyClipboard 0 -NtUserEnableMenuItem 3 -NtUserEnableScrollBar 3 -NtUserEndDeferWindowPosEx 2 -NtUserEndMenu 0 -NtUserEndPaint 2 -NtUserEnumClipboardFormats 1 -NtUserEnumDisplayDevices 4 -NtUserEnumDisplayMonitors 5 -NtUserEnumDisplaySettings 4 -NtUserEvent 1 -NtUserExcludeUpdateRgn 2 -NtUserFillWindow 4 -NtUserFindExistingCursorIcon 4 -NtUserFindWindowEx 4 -NtUserFlashWindowEx 1 -NtUserGetActiveWindow 0 -NtUserGetAltTabInfo 6 -NtUserGetAncestor 2 -NtUserGetAsyncKeyState 1 -NtUserGetCapture 0 -NtUserGetCaretBlinkTime 0 -NtUserGetCaretPos 1 -NtUserGetClassInfo 4 -NtUserGetClassLong 3 -NtUserGetClassName 3 -NtUserGetClientOrigin 2 -NtUserGetClientRect 2 -NtUserGetClipboardData 2 -NtUserGetClipboardFormatName 3 -NtUserGetClipboardOwner 0 -NtUserGetClipboardSequenceNumber 0 -NtUserGetClipboardViewer 0 -NtUserGetClipCursor 1 -NtUserGetComboBoxInfo 2 -NtUserGetControlBrush 3 -NtUserGetControlColor 4 -NtUserGetCPD 3 -NtUserGetCursorFrameInfo 4 -NtUserGetCursorInfo 1 -NtUserGetDC 1 -NtUserGetDCEx 3 -NtUserGetMenuDefaultItem 3 -NtUserGetDoubleClickTime 0 -NtUserGetForegroundWindow 0 -NtUserGetGuiResources 2 -NtUserGetGUIThreadInfo 2 -NtUserGetCursorIconInfo 2 -NtUserGetCursorIconSize 3 -NtUserGetImeHotKey 4 -NtUserGetInternalWindowPos 3 -NtUserGetKeyboardLayoutList 2 -NtUserGetKeyboardLayoutName 1 -NtUserGetKeyboardState 1 -NtUserGetKeyNameText 3 -NtUserGetKeyState 1 -NtUserGetLastInputInfo 1 -NtUserGetListBoxInfo 1 -NtUserGetMenuBarInfo 4 -NtUserGetMenuIndex 2 -NtUserGetMenuItemRect 4 -NtUserGetMessage 4 -NtUserGetMinMaxInfo 3 -NtUserGetMonitorInfo 2 -NtUserGetMouseMovePointsEx 5 -NtUserGetObjectInformation 5 -NtUserGetOpenClipboardWindow 0 -NtUserGetProp 2 -NtUserGetPriorityClipboardFormat 2 -NtUserGetProcessWindowStation 0 -NtUserGetScrollBarInfo 3 -NtUserGetScrollInfo 3 -NtUserGetSystemMenu 2 -NtUserGetSystemMetrics 1 -NtUserGetThreadDesktop 2 -NtUserGetThreadState 1 -NtUserGetTitleBarInfo 2 -NtUserGetUpdateRect 3 -NtUserGetUpdateRgn 3 -NtUserGetWindowDC 1 -NtUserGetWindowPlacement 2 -NtUserGetWindowLong 3 -NtUserGetWindowRect 2 -NtUserGetWOWClass 2 -NtUserHideCaret 1 -NtUserHiliteMenuItem 4 -NtUserImpersonateDdeClientWindow 2 -NtUserInitializeClientPfnArrays 4 -NtUserInitTask 11 -NtUserInsertMenuItem 4 -NtUserInternalGetWindowText 3 -NtUserInvalidateRect 3 -NtUserInvalidateRgn 3 -NtUserIsClipboardFormatAvailable 1 -NtUserKillSystemTimer 2 -NtUserKillTimer 2 -NtUserLoadKeyboardLayoutEx 6 -NtUserLockWindowStation 1 -NtUserLockWindowUpdate 1 -NtUserLockWorkStation 0 -NtUserMapVirtualKeyEx 4 -NtUserMenuInfo 3 -NtUserMenuItemFromPoint 4 -NtUserMenuItemInfo 5 -NtUserMessageCall 7 -NtUserMNDragLeave 0 -NtUserMNDragOver 2 -NtUserModifyUserStartupInfoFlags 2 -NtUserMonitorFromPoint 3 -NtUserMonitorFromRect 2 -NtUserMonitorFromWindow 2 -NtUserMoveWindow 6 -NtUserNotifyIMEStatus 3 -NtUserNotifyWinEvent 4 -NtUserOpenClipboard 2 -NtUserOpenDesktop 3 -NtUserOpenInputDesktop 3 -NtUserOpenWindowStation 2 -NtUserPaintDesktop 1 -NtUserPeekMessage 5 -NtUserPostMessage 4 -NtUserPostThreadMessage 4 -NtUserQuerySendMessage 1 -NtUserQueryUserCounters 5 -NtUserQueryWindow 2 -NtUserReleaseDC 2 -NtUserRealChildWindowFromPoint 3 -NtUserRedrawWindow 4 -NtUserRegisterClassEx 6 -NtUserRegisterClipboardFormat 1 -NtUserRegisterHotKey 4 -NtUserRegisterTasklist 1 -NtUserRegisterWindowMessage 1 -NtUserRemoveMenu 3 -NtUserRemoveProp 2 -NtUserResolveDesktopForWOW 1 -NtUserSBGetParms 4 -NtUserScrollDC 7 -NtUserScrollWindowEx 8 -NtUserSendInput 3 -NtUserSendMessage 5 -NtUserSendMessageCallback 6 -NtUserSendMessageTimeout 8 -NtUserSendNotifyMessage 4 -NtUserSetActiveWindow 1 -NtUserSetCapture 1 -NtUserSetClassLong 4 -NtUserSetClassWord 3 -NtUserSetClipboardData 3 -NtUserSetClipboardViewer 1 -NtUserSetConsoleReserveKeys 2 -NtUserSetCursor 1 -NtUserSetCursorIconContents 2 -NtUserSetCursorIconData 6 -NtUserSetDbgTag 2 -NtUserSetFocus 1 -NtUserSetImeHotKey 5 -NtUserSetImeOwnerWindow 2 -NtUserSetInternalWindowPos 4 -NtUserSetKeyboardState 1 -NtUserSetLayeredWindowAttributes 4 -NtUserSetLogonNotifyWindow 1 -NtUserSetMenu 3 -NtUserSetMenuContextHelpId 2 -NtUserSetMenuDefaultItem 3 -NtUserSetMenuFlagRtoL 1 -NtUserSetObjectInformation 4 -NtUserSetParent 2 -NtUserSetProcessWindowStation 1 -NtUserSetProp 3 -NtUserSetRipFlags 2 -NtUserSetScrollBarInfo 3 -NtUserSetScrollInfo 4 -NtUserSetShellWindowEx 2 -NtUserSetSysColors 4 -NtUserSetSystemCursor 2 -NtUserSetSystemMenu 2 -NtUserSetSystemTimer 4 -NtUserSetThreadDesktop 1 -NtUserSetThreadState 2 -NtUserSetTimer 4 -NtUserSetWindowFNID 2 -NtUserSetWindowLong 4 -NtUserSetWindowPlacement 2 -NtUserSetWindowPos 7 -NtUserSetWindowRgn 3 -NtUserSetWindowsHookAW 3 -NtUserSetWindowsHookEx 6 -NtUserSetWindowStationUser 4 -NtUserSetWindowWord 3 -NtUserSetWinEventHook 8 -NtUserShowCaret 1 -NtUserShowScrollBar 3 -NtUserShowWindow 2 -NtUserShowWindowAsync 2 -NtUserSwitchDesktop 1 -NtUserSystemParametersInfo 4 -NtUserThunkedMenuInfo 2 -NtUserThunkedMenuItemInfo 6 -NtUserToUnicodeEx 7 -NtUserTrackMouseEvent 1 -NtUserTrackPopupMenuEx 6 -NtUserTranslateAccelerator 3 -NtUserTranslateMessage 2 -NtUserUnhookWindowsHookEx 1 -NtUserUnhookWinEvent 1 -NtUserUnloadKeyboardLayout 1 -NtUserUnlockWindowStation 1 -NtUserUnregisterClass 2 -NtUserUnregisterHotKey 2 -NtUserUpdateInputContext 3 -NtUserUpdateInstance 3 -NtUserUpdateLayeredWindow 9 -NtUserUpdatePerUserSystemParameters 2 -NtUserUserHandleGrantAccess 3 -NtUserValidateHandleSecure 1 -NtUserVkKeyScanEx 3 -NtUserWaitForInputIdle 3 -NtUserWaitForMsgAndEvent 1 -NtUserWaitMessage 0 -NtUserWin32PoolAllocationStats 6 -NtUserWindowFromPoint 2 -NtUserYieldTask 0 -NtUserGetDesktopWindow 0 -# ReactOS only system calls -NtUserAcquireOrReleaseInputOwnership 1 -NtUserGetWindowThreadProcessId 2 -NtUserGetQueueStatus 1 -NtUserGetParent 1 -NtUserGetWindow 2 -NtUserGetLastActivePopup 1 -NtUserGetShellWindow 0 -NtUserDereferenceWndProcHandle 2 -NtUserManualGuiCheck 1 -# DirectDraw system calls -NtGdiD3dContextCreate 4 -NtGdiD3dContextDestroy 1 -NtGdiD3dContextDestroyAll 0 -NtGdiD3dDrawPrimitives2 7 -NtGdiD3dValidateTextureStageState 1 -NtGdiDdAddAttachedSurface 3 -NtGdiDdAlphaBlt 3 -NtGdiDdAttachSurface 2 -NtGdiDdBeginMoCompFrame 2 -NtGdiDdBlt 3 -NtGdiDdCanCreateD3DBuffer 2 -NtGdiDdCanCreateSurface 2 -NtGdiDdColorControl 2 -NtGdiDdCreateD3DBuffer 8 -NtGdiDdCreateDirectDrawObject 1 -NtGdiDdCreateMoComp 2 -NtGdiDdCreateSurface 8 -NtGdiDdCreateSurfaceEx 3 -NtGdiDdCreateSurfaceObject 6 -NtGdiDdDeleteDirectDrawObject 1 -NtGdiDdDeleteSurfaceObject 1 -NtGdiDdDestroyD3DBuffer 1 -NtGdiDdDestroyMoComp 2 -NtGdiDdDestroySurface 2 -NtGdiDdEndMoCompFrame 2 -NtGdiDdFlip 5 -NtGdiDdFlipToGDISurface 2 -NtGdiDdGetAvailDriverMemory 2 -NtGdiDdGetBltStatus 2 -NtGdiDdGetDC 2 -NtGdiDdGetDriverInfo 2 -NtGdiDdGetDriverState 1 -NtGdiDdGetDxHandle 3 -NtGdiDdGetFlipStatus 2 -NtGdiDdGetInternalMoCompInfo 2 -NtGdiDdGetMoCompBuffInfo 2 -NtGdiDdGetMoCompFormats 2 -NtGdiDdGetMoCompGuids 2 -NtGdiDdGetScanLine 2 -NtGdiDdLock 3 -NtGdiDdLockD3D 2 -NtGdiDdQueryDirectDrawObject 11 -NtGdiDdQueryMoCompStatus 2 -NtGdiDdReenableDirectDrawObject 2 -NtGdiDdReleaseDC 1 -NtGdiDdRenderMoComp 2 -NtGdiDdResetVisrgn 2 -NtGdiDdSetColorKey 2 -NtGdiDdSetExclusiveMode 2 -NtGdiDdSetGammaRamp 3 -NtGdiDdSetOverlayPosition 3 -NtGdiDdUnattachSurface 2 -NtGdiDdUnlock 2 -NtGdiDdUnlockD3D 2 -NtGdiDdUpdateOverlay 3 -NtGdiDdWaitForVerticalBlank 2 -NtGdiGetRandomRgn 3

17 years, 4 months

[jimtabor] 28054: Add NtGdiCreate-DeleteClientObj to win32k. This is used for Metafile not EnhMeta.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 31 11:06:06 2007 New Revision: 28054 URL: http://svn.reactos.org/svn/reactos?rev=28054&view=rev Log: Add NtGdiCreate-DeleteClientObj to win32k. This is used for Metafile not EnhMeta. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Tue Jul 31 11:06:06 2007 @@ -1477,4 +1477,26 @@ return MappedView; } +W32KAPI +HANDLE +APIENTRY +NtGdiCreateClientObj( + IN ULONG ulType + ) +{ + UNIMPLEMENTED; + return 0; +} + +W32KAPI +BOOL +APIENTRY +NtGdiDeleteClientObj( + IN HANDLE h + ) +{ + UNIMPLEMENTED; + return 0; +} + /* EOF */ Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Tue Jul 31 11:06:06 2007 @@ -21,6 +21,7 @@ NtGdiCopyEnhMetaFile 2 NtGdiCopyMetaFile 2 NtGdiCreateBitmap 5 +NtGdiCreateClientObj 1 NtGdiCreateColorSpace 1 NtGdiCreateCompatibleBitmap 3 NtGdiCreateCompatibleDC 1 @@ -42,6 +43,7 @@ NtGdiCreateScalableFontResource 4 NtGdiCreateSolidBrush 2 NtGdiDPtoLP 3 +NtGdiDeleteClientObj 1 NtGdiDeleteColorSpace 1 NtGdiDeleteObjectApp 1 NtGdiDeleteEnhMetaFile 1

17 years, 4 months

[jimtabor] 28053: Remove NtGdiGdiGet-SetBatchLimit.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Tue Jul 31 08:41:24 2007 New Revision: 28053 URL: http://svn.reactos.org/svn/reactos?rev=28053&view=rev Log: Remove NtGdiGdiGet-SetBatchLimit. Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/paintobj.c trunk/reactos/tools/nci/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Tue Jul 31 08:41:24 2007 @@ -337,12 +337,6 @@ CONST LPBYTE Data ); -/* Should be done in user-mode. */ -DWORD STDCALL NtGdiGdiGetBatchLimit (VOID); - -/* Should be done in user-mode. */ -DWORD STDCALL NtGdiGdiSetBatchLimit (DWORD Limit); - /* Use NtGdiGetDCDword with GdiGetArcDirection. */ INT STDCALL Modified: trunk/reactos/subsystems/win32/win32k/objects/paintobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/paintobj.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/paintobj.c Tue Jul 31 08:41:24 2007 @@ -31,22 +31,6 @@ } DWORD -STDCALL -NtGdiGdiGetBatchLimit(VOID) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD -STDCALL -NtGdiGdiSetBatchLimit(DWORD Limit) -{ - UNIMPLEMENTED; - return 0; -} - -DWORD APIENTRY NtGdiGetBoundsRect( IN HDC hdc, Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=2… ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Tue Jul 31 08:41:24 2007 @@ -75,12 +75,10 @@ NtGdiFrameRgn 5 NtGdiGdiComment 3 NtGdiFlush 0 -NtGdiGdiGetBatchLimit 0 #NtGdiGdiPlayDCScript ? #NtGdiGdiPlayJournal ? #NtGdiGdiPlayScript ? #NtGdiGdiPlaySpoolStream ? -NtGdiGdiSetBatchLimit 1 NtGdiGetArcDirection 1 NtGdiGetAspectRatioFilterEx 2 NtGdiGetBitmapBits 3

17 years, 4 months

[cwittich] 28052: don't allow renaming of root keys See issue #2508 for more details.

by cwittich＠svn.reactos.org

Author: cwittich Date: Tue Jul 31 03:27:52 2007 New Revision: 28052 URL: http://svn.reactos.org/svn/reactos?rev=28052&view=rev Log: don't allow renaming of root keys See issue #2508 for more details. Modified: trunk/reactos/base/applications/regedit/childwnd.c Modified: trunk/reactos/base/applications/regedit/childwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/childwnd.c (original) +++ trunk/reactos/base/applications/regedit/childwnd.c Tue Jul 31 03:27:52 2007 @@ -506,6 +506,16 @@ case NM_SETFOCUS: pChildWnd->nFocusPanel = 0; break; + case TVN_BEGINLABELEDIT: + { + LPNMTVDISPINFO ptvdi; + /* cancel label edit for rootkeys */ + ptvdi = (LPNMTVDISPINFO) lParam; + if (!TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem) || + !TreeView_GetParent(pChildWnd->hTreeWnd, TreeView_GetParent(pChildWnd->hTreeWnd, ptvdi->item.hItem))) + return TRUE; + break; + } case TVN_ENDLABELEDIT: { LPCTSTR keyPath;

17 years, 4 months

[gedmurphy] 28051: remove the 'enterprise' text

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Tue Jul 31 02:07:43 2007 New Revision: 28051 URL: http://svn.reactos.org/svn/reactos?rev=28051&view=rev Log: remove the 'enterprise' text Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/inbv/inbv.c Modified: branches/ros-branch-0_3_3/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_3/reactos/ntoskr… ============================================================================== --- branches/ros-branch-0_3_3/reactos/ntoskrnl/inbv/inbv.c (original) +++ branches/ros-branch-0_3_3/reactos/ntoskrnl/inbv/inbv.c Tue Jul 31 02:07:43 2007 @@ -572,7 +572,7 @@ InbvSolidColorFill(0, 421, 639, 479, 1); /* Get resources */ - Bitmap = InbvGetResourceAddress(14); + Bitmap = InbvGetResourceAddress(6); Header = InbvGetResourceAddress(15); }

17 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007