Ros-diffs March 2007

ros-diffs@reactos.org

20 participants
287 discussions

[hpoussin] 26183: Include nci.mak later, as it needs $(ARCH) variable Fix a typo in ncitool

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Mar 27 03:43:07 2007 New Revision: 26183 URL: http://svn.reactos.org/svn/reactos?rev=26183&view=rev Log: Include nci.mak later, as it needs $(ARCH) variable Fix a typo in ncitool Modified: trunk/reactos/Makefile trunk/reactos/tools/nci/ncitool.c trunk/reactos/tools/tools.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=26183&r1=2618… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Mar 27 03:43:07 2007 @@ -310,7 +310,7 @@ strip = $(Q)strip windres = $(Q)windres else - gcc = $(ROS_PREFIX)-gcc + gcc = $(Q)$(ROS_PREFIX)-gcc gpp = $(Q)$(ROS_PREFIX)-g++ ld = $(Q)$(ROS_PREFIX)-ld nm = $(Q)$(ROS_PREFIX)-nm @@ -391,6 +391,7 @@ include tools/tools.mak include boot/freeldr/bootsect/bootsect.mak -include $(ROS_AUTOMAKE) +include tools/nci/nci.mak PREAUTO := \ $(BIN2C_TARGET) \ @@ -400,7 +401,6 @@ $(BUGCODES_RC) \ $(ERRCODES_H) \ $(ERRCODES_RC) \ - $(NCI_SERVICE_FILES) \ $(GENDIB_DIB_FILES) $(ROS_AUTOMAKE): $(RBUILD_TARGET) $(PREAUTO) $(XMLBUILDFILES) Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=26… ============================================================================== --- trunk/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Tue Mar 27 03:43:07 2007 @@ -1,631 +1,631 @@ -/* - * 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) 4*(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 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); +} Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=26183&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Tue Mar 27 03:43:07 2007 @@ -48,7 +48,6 @@ include tools/dbgprint/dbgprint.mak include tools/gendib/gendib.mak include tools/mkhive/mkhive.mak -include tools/nci/nci.mak include tools/pefixup.mak include tools/raddr2line.mak include tools/rbuild/rbuild.mak

17 years, 5 months

[hpoussin] 26182: Add missing file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Mar 27 03:00:58 2007 New Revision: 26182 URL: http://svn.reactos.org/svn/reactos?rev=26182&view=rev Log: Add missing file Added: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Added: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Tue Mar 27 03:00:58 2007 @@ -1,0 +1,34 @@ +/* + * ReactOS kernel + * Copyright (C) 1998, 1999, 2000, 2001 ReactOS Team + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H +#define __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H + +#ifdef _M_IX86 +#include "../i386/intrin_i.h" +#elif defined(_M_PPC) +#include "../powerpc/intrin_i.h" +#elif defined(_M_MIPS) +#include "../mips/intrin_i.h" +#else +#error "Unknown processor" +#endif + +#endif /* __NTOSKRNL_INCLUDE_INTERNAL_ARCH_INTRIN_I_H */ + +/* EOF */

17 years, 5 months

[hpoussin] 26181: - Move NCI generated files to arch-specific directories - Replace ncitool by the one from powerpc branch, which supports code generation for multiple architectures

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Mar 27 02:56:22 2007 New Revision: 26181 URL: http://svn.reactos.org/svn/reactos?rev=26181&view=rev Log: - Move NCI generated files to arch-specific directories - Replace ncitool by the one from powerpc branch, which supports code generation for multiple architectures Added: trunk/reactos/tools/nci/ncitool.c - copied, changed from r26180, branches/powerpc/reactos/tools/nci/ncitool.c Modified: trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/win32/gdi32/gdi32.rbuild trunk/reactos/dll/win32/user32/user32.rbuild trunk/reactos/ntoskrnl/ntoskrnl.rbuild trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild Tue Mar 27 02:56:22 2007 @@ -47,5 +47,19 @@ <directory name="inc"> <pch>ntdll.h</pch> </directory> - <file>napi.S</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>napi.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>napi.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>napi.S</file> + </directory> + </if> </module> 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 Tue Mar 27 02:56:22 2007 @@ -22,8 +22,22 @@ <file>stubs.c</file> <file>stubsa.c</file> <file>stubsw.c</file> - <file>win32k.S</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> </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 Tue Mar 27 02:56:22 2007 @@ -43,10 +43,24 @@ <file>strpool.c</file> <file>stubs.c</file> <file>timer.c</file> - <file>win32k.S</file> <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/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.rbuild?r… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.rbuild Tue Mar 27 02:56:22 2007 @@ -103,6 +103,17 @@ <file>interlck_asm.S</file> <file>fastinterlck_asm.S</file> <file>ioport.S</file> + <file>zw.S</file> + </directory> + </if> + <if property="ARCH" value="powerpc"> + <directory name="powerpc"> + <file>zw.S</file> + </directory> + </if> + <if property="ARCH" value="mips"> + <directory name="mips"> + <file>zw.S</file> </directory> </if> <file>atom.c</file> @@ -132,7 +143,6 @@ <file>win32k.c</file> <file>work.c</file> <file>zone.c</file> - <file>zw.S</file> </directory> <directory name="fsrtl"> <file>dbcsname.c</file> Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2618… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Tue Mar 27 02:56:22 2007 @@ -44,14 +44,14 @@ # WIN32K.SYS WIN32K_SVC_DB = $(NCI_BASE_)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)win32k.S -WIN32K_USER_STUBS = dll$(SEP)win32$(SEP)user32$(SEP)misc$(SEP)win32k.S +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_SERVICE_TABLE = ntoskrnl$(SEP)include$(SEP)internal$(SEP)napi.h -NTDLL_STUBS = dll$(SEP)ntdll$(SEP)napi.S -KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)zw.S +NTDLL_STUBS = dll$(SEP)ntdll$(SEP)$(ARCH)$(SEP)napi.S +KERNEL_STUBS = ntoskrnl$(SEP)ex$(SEP)$(ARCH)$(SEP)zw.S NCI_SERVICE_FILES = \ $(KERNEL_SERVICE_TABLE) \ @@ -63,7 +63,11 @@ $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) - $(Q)$(NCI_TARGET) \ + ${mkdir} dll$(SEP)ntdll$(SEP)$(ARCH) 2>$(NUL) + ${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) + $(Q)$(NCI_TARGET) -arch $(ARCH) \ $(KERNEL_SVC_DB) \ $(WIN32K_SVC_DB) \ $(KERNEL_SERVICE_TABLE) \ Copied: trunk/reactos/tools/nci/ncitool.c (from r26180, branches/powerpc/reactos/tools/nci/ncitool.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?p2=tru… ============================================================================== --- branches/powerpc/reactos/tools/nci/ncitool.c (original) +++ trunk/reactos/tools/nci/ncitool.c Tue Mar 27 02:56:22 2007 @@ -51,7 +51,7 @@ #if defined(__GNUC__) #define UserModeStub_x86 " movl $0x%x, %%eax\n" \ " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ - " call *%%ecx\n" \ + " call *(%%ecx)\n" \ " ret $0x%x\n\n" #define UserModeStub_ppc " mflr 0\n" \ @@ -112,11 +112,11 @@ }; struct ncitool_data_t ncitool_data[] = { - { "x86", 4, KernelModeStub_x86, UserModeStub_x86, + { "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 } + { 0, } }; int arch_sel = 0; #define ARGS_TO_BYTES(x) 4*(ncitool_data[arch_sel].args_to_bytes) @@ -525,8 +525,9 @@ " zw.S NTOSKRNL Zw stubs\n" " win32k.S GDI32 stubs\n" " win32k.S USER32 stubs\n" - " -arch is optional, default is x86\n", - argv0 + " -arch is optional, default is %s\n", + argv0, + ncitool_data[0].arch ); } @@ -538,14 +539,15 @@ /* Catch architecture argument */ if (argc > 3 && !strcmp(argv[1],"-arch")) { - int i; - for( i = 0; ncitool_data[arch_sel].arch && strcmp(argv[2],ncitool_data[i].arch); i++ ); - if (!ncitool_data[arch_sel].arch) { - usage(argv[0]); - return 1; - } - arch_sel = i; - ArgOffset = 3; + 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) { @@ -565,7 +567,6 @@ perror(argv[FileNumber + ArgOffset]); return (1); } - } /* Write the File Headers */

17 years, 5 months

[hpoussin] 26180: Cleanup code for easier porting to other architectures

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Tue Mar 27 00:28:13 2007 New Revision: 26180 URL: http://svn.reactos.org/svn/reactos?rev=26180&view=rev Log: Cleanup code for easier porting to other architectures Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/shutdown.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/arch/ke.h trunk/reactos/ntoskrnl/include/internal/arch/mm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/ke/freeldr.c trunk/reactos/ntoskrnl/ke/ipi.c trunk/reactos/ntoskrnl/ke/procobj.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ps/debug.c trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=261… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Tue Mar 27 00:28:13 2007 @@ -1010,7 +1010,10 @@ #elif defined(_PPC_) // <3 Arty SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_POWERPC; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_POWERPC; -#elif +#elif defined(_MIPS_) + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000; +#else #error "Unsupported ReactOS Target" #endif } Modified: trunk/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/shutdown.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/shutdown.c (original) +++ trunk/reactos/ntoskrnl/ex/shutdown.c Tue Mar 27 00:28:13 2007 @@ -36,7 +36,11 @@ while (TRUE) { KfRaiseIrql(SYNCH_LEVEL); +#if defined(_M_X86) Ke386HaltProcessor(); +#else + HalProcessorIdle(); +#endif } } Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Tue Mar 27 00:28:13 2007 @@ -1895,7 +1895,16 @@ { PAGED_CODE(); +#if defined(_M_IX86) __wbinvd(); +#elif defined(_M_PPC) +#error Needs to be implemented for PPC architecture! +#elif defined(_M_MIPS) + DPRINT1("NtFlushInstructionCache() is not implemented\n"); + for (;;); +#else +#error Unknown architecture +#endif return STATUS_SUCCESS; } Modified: trunk/reactos/ntoskrnl/include/internal/arch/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/ke.h Tue Mar 27 00:28:13 2007 @@ -21,6 +21,10 @@ #ifdef _M_IX86 #include "../i386/ke.h" +#elif defined(_M_PPC) +#include "../powerpc/ke.h" +#elif defined(_M_MIPS) +#include "../mips/ke.h" #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/mm.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/mm.h Tue Mar 27 00:28:13 2007 @@ -21,6 +21,10 @@ #ifdef _M_IX86 #include <internal/i386/mm.h> +#elif defined(_M_PPC) +#include <internal/powerpc/ke.h> +#elif defined(_M_MIPS) +#include <internal/mips/ke.h> #else #error "Unknown processor" #endif Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Tue Mar 27 00:28:13 2007 @@ -105,6 +105,7 @@ extern PULONG KiInterruptTemplateDispatch; extern PULONG KiInterruptTemplate2ndDispatch; extern ULONG KiUnexpectedEntrySize; +#ifdef _M_IX86 extern PVOID Ki386IopmSaveArea; extern ULONG KeI386EFlagsAndMaskV86; extern ULONG KeI386EFlagsOrMaskV86; @@ -114,6 +115,7 @@ extern KDESCRIPTOR KiGdtDescriptor; extern KDESCRIPTOR KiIdtDescriptor; extern KTSS KiBootTss; +#endif extern UCHAR P0BootStack[]; extern UCHAR KiDoubleFaultStack[]; extern FAST_MUTEX KernelAddressSpaceLock; Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Tue Mar 27 00:28:13 2007 @@ -13,6 +13,7 @@ #define DR_ACTIVE_MASK 0x10 #define DR_REG_MASK 0x4F +#ifdef _M_IX86 // // Sanitizes a selector // @@ -85,6 +86,7 @@ return ((Mode == KernelMode) ? DrAddress : (DrAddress <= MM_HIGHEST_USER_ADDRESS) ? DrAddress : 0); } +#endif /* _M_IX86 */ // // Enters a Guarded Region Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h Tue Mar 27 00:28:13 2007 @@ -22,7 +22,7 @@ #undef PsGetCurrentProcess #define PsGetCurrentProcess _PsGetCurrentProcess -#include "i386/intrin_i.h" +#include "arch/intrin_i.h" #include "ke.h" #include "i386/mm.h" #include "i386/fpu.h" @@ -281,7 +281,7 @@ * Use IsPointerOffset to test whether a pointer should be interpreted as an offset * or as a pointer */ -#if defined(_X86_) || defined(_M_AMD64) +#if defined(_X86_) || defined(_M_AMD64) || defined(_MIPS_) /* for x86 and x86-64 the MSB is 1 so we can simply test on that */ #define IsPointerOffset(Ptr) ((LONG_PTR)(Ptr) >= 0) @@ -309,11 +309,6 @@ C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); -C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); -C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); -C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); //C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); //C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); @@ -321,9 +316,18 @@ C_ASSERT(FIELD_OFFSET(KPCR, Irql) == KPCR_IRQL); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, CurrentThread) == KPCR_CURRENT_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); +C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); + +/* Platform specific checks */ +#ifdef _M_IX86 +C_ASSERT(FIELD_OFFSET(KPROCESS, IopmOffset) == KPROCESS_IOPM_OFFSET); +C_ASSERT(FIELD_OFFSET(KPROCESS, LdtDescriptor) == KPROCESS_LDT_DESCRIPTOR0); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, SavedExceptionStack) == TF_SAVED_EXCEPTION_STACK); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, regs) == TF_REGS); +C_ASSERT(FIELD_OFFSET(KV86M_TRAP_FRAME, orig_ebp) == TF_ORIG_EBP); C_ASSERT(FIELD_OFFSET(KTSS, Esp0) == KTSS_ESP0); C_ASSERT(FIELD_OFFSET(KTSS, IoMapBase) == KTSS_IOMAPBASE); -C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); -C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); +#endif #endif /* INCLUDE_INTERNAL_NTOSKRNL_H */ Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Tue Mar 27 00:28:13 2007 @@ -1400,7 +1400,7 @@ } /* Release the lock */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Check if insertion failed */ if (!Inserted) @@ -1446,7 +1446,7 @@ } /* Release lock */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); /* Return nothing or the extension */ if (!DriverExtensions) return NULL; Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Tue Mar 27 00:28:13 2007 @@ -321,6 +321,7 @@ IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) { PLOADER_PARAMETER_BLOCK NtLoaderBlock; +#if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; @@ -337,6 +338,7 @@ TssEntry->BaseLow = (USHORT)((ULONG_PTR)Tss & 0xFFFF); TssEntry->HighWord.Bytes.BaseMid = (UCHAR)((ULONG_PTR)Tss >> 16); TssEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)Tss >> 24); +#endif /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; @@ -351,8 +353,10 @@ MmFreeLdrLastKrnlPhysAddr = MmFreeLdrLastKernelAddress - KSEG0_BASE + 0x200000; +#if defined(_M_IX86) /* Set up the VDM Data */ NtEarlyInitVdm(); +#endif /* Convert the loader block */ KiRosFrldrLpbToNtLpb(KeRosLoaderBlock, &NtLoaderBlock); Modified: trunk/reactos/ntoskrnl/ke/ipi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/ipi.c?rev=2618… ============================================================================== --- trunk/reactos/ntoskrnl/ke/ipi.c (original) +++ trunk/reactos/ntoskrnl/ke/ipi.c Tue Mar 27 00:28:13 2007 @@ -151,7 +151,7 @@ /* Raise to DPC level if required */ OldIrql = KeGetCurrentIrql(); - if (OldIrql <= DISPATCH_LEVEL) KfRaiseIrql(DISPATCH_LEVEL); + if (OldIrql < DISPATCH_LEVEL) OldIrql = KfRaiseIrql(DISPATCH_LEVEL); /* Acquire the IPI lock */ KefAcquireSpinLockAtDpcLevel(&KiIpiLock); Modified: trunk/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/procobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/procobj.c (original) +++ trunk/reactos/ntoskrnl/ke/procobj.c Tue Mar 27 00:28:13 2007 @@ -157,7 +157,9 @@ Process->QuantumReset = 6; Process->DirectoryTableBase = *DirectoryTableBase; Process->AutoAlignment = Enable; +#if defined(_M_IX86) Process->IopmOffset = KiComputeIopmOffset(IO_ACCESS_MAP_NONE); +#endif /* Initialize the lists */ InitializeListHead(&Process->ThreadListHead); Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Tue Mar 27 00:28:13 2007 @@ -461,7 +461,9 @@ /* Setup static fields from parent */ Thread->DisableBoost = Process->DisableBoost; +#if defined(_M_IX86) Thread->Iopl = Process->Iopl; +#endif Thread->Quantum = Process->QuantumReset; Thread->QuantumReset = Process->QuantumReset; Thread->SystemAffinityActive = FALSE; @@ -815,6 +817,7 @@ KERNEL_STACK_SIZE); MmUpdatePageDir((PEPROCESS)Process, (PVOID)Thread, sizeof(ETHREAD)); +#if defined(_M_IX86) /* Enter SEH to avoid crashes due to user mode */ Status = STATUS_SUCCESS; _SEH_TRY @@ -840,6 +843,9 @@ } } _SEH_END; +#else + Status = STATUS_SUCCESS; +#endif /* Set the Thread to initalized */ Thread->State = Initialized; Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=261… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c Tue Mar 27 00:28:13 2007 @@ -406,7 +406,7 @@ new_entry->Address = Address; new_entry->Process = (PEPROCESS)Process; #ifdef DBG -#ifdef _GNUC_ +#ifdef __GNUC__ new_entry->Caller = __builtin_return_address(0); #else new_entry->Caller = _ReturnAddress(); Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Tue Mar 27 00:28:13 2007 @@ -22,7 +22,7 @@ /* DOS Device Prefix \??\ and \?? */ ALIGNEDNAME ObpDosDevicesShortNamePrefix = {{L'\\',L'?',L'?',L'\\'}}; ALIGNEDNAME ObpDosDevicesShortNameRoot = {{L'\\',L'?',L'?',L'\0'}}; -UNICODE_STRING ObpDosDevicesShortName = +static UNICODE_STRING ObpDosDevicesShortName = { sizeof(ObpDosDevicesShortNamePrefix), sizeof(ObpDosDevicesShortNamePrefix), Modified: trunk/reactos/ntoskrnl/ps/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/debug.c?rev=26… ============================================================================== --- trunk/reactos/ntoskrnl/ps/debug.c (original) +++ trunk/reactos/ntoskrnl/ps/debug.c Tue Mar 27 00:28:13 2007 @@ -109,6 +109,7 @@ IN OUT PVOID* SystemArgument1, IN OUT PVOID* SystemArgument2) { +#if defined(_M_IX86) PGET_SET_CTX_CONTEXT GetSetContext; PKEVENT Event; PCONTEXT Context; @@ -150,6 +151,10 @@ /* Notify the Native API that we are done */ KeSetEvent(Event, IO_NO_INCREMENT, FALSE); +#else + DPRINT1("PspGetOrSetContextKernelRoutine() not implemented!"); + for (;;); +#endif } /* PUBLIC FUNCTIONS **********************************************************/ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Tue Mar 27 00:28:13 2007 @@ -74,7 +74,7 @@ KiInitializeUserApc(NULL, (PVOID)((ULONG_PTR)Thread->Tcb.InitialStack - sizeof(KTRAP_FRAME) - - sizeof(FX_SAVE_AREA)), + SIZEOF_FX_SAVE_AREA), PspSystemDllEntryPoint, NULL, PspSystemDllBase, @@ -320,8 +320,16 @@ } /* Set the Start Addresses */ +#if defined(_M_IX86) Thread->StartAddress = (PVOID)ThreadContext->Eip; Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; +#elif defined(_M_PPC) +#error Not implemented yet for PPC architecture! +#elif defined(_M_MIPS) + for (;;); +#else +#error Unknown architecture +#endif /* Let the kernel intialize the Thread */ Status = KeInitThread(&Thread->Tcb,

17 years, 5 months

[greatlrd] 26178: we now resive DrvGetDirectDrawInfo DD_HALINFO from the driver to win32k from win32k to gdi32.dll or d3dthk.dll or direcly syscall. it take care of allot bugs in my test case. tested with vmware driver

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Mar 26 11:49:05 2007 New Revision: 26178 URL: http://svn.reactos.org/svn/reactos?rev=26178&view=rev Log: we now resive DrvGetDirectDrawInfo DD_HALINFO from the driver to win32k from win32k to gdi32.dll or d3dthk.dll or direcly syscall. it take care of allot bugs in my test case. tested with vmware driver Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Mar 26 11:49:05 2007 @@ -12,7 +12,6 @@ //#define NDEBUG #include <debug.h> -GDIDEVICE IntGetPrimarySurface(VOID); /* swtich this off to get rid of all dx debug msg */ #define DX_DEBUG @@ -107,9 +106,11 @@ */ if (pDirectDraw->dwNumHeaps != 0) { + DPRINT1("Setup pvmList\n"); pDirectDraw->pvmList = (PVIDEOMEMORY) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumHeaps * sizeof(VIDEOMEMORY), TAG_DXPVMLIST); if (pDirectDraw->pvmList == NULL) { + DPRINT1("pvmList memmery alloc fail\n"); return FALSE; } } @@ -120,10 +121,12 @@ if (pDirectDraw->dwNumFourCC != 0) { + DPRINT1("Setup pdwFourCC\n"); pDirectDraw->pdwFourCC = (LPDWORD) ExAllocatePoolWithTag(PagedPool, pDirectDraw->dwNumFourCC * sizeof(DWORD), TAG_DXFOURCC); if (pDirectDraw->pdwFourCC == NULL) { + DPRINT1("pdwFourCC memmery alloc fail\n"); return FALSE; } } @@ -170,15 +173,15 @@ { /* Unknown version found */ DPRINT1(" Fail : did not get DD_HALINFO size \n"); - GDIOBJ_UnlockObjByPtr(DdHandleTable, pDirectDraw); return FALSE; } - - /* Copy it to user mode pointer the data */ - RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); - } - } + } + /* Copy it to user mode pointer the data */ + RtlCopyMemory(&pDirectDraw->Hal, &HalInfo, sizeof(DD_HALINFO)); + } + + DPRINT1("Trying EnableDirectDraw the driver\n"); success = pDirectDraw->EnableDirectDraw( pDirectDraw->Global.dhpdev, &pDirectDraw->DD,

17 years, 5 months

[greatlrd] 26177: ReactOS win32k are using windows 2000 driver and it seam if we want using ms dx interface for graphics driver we must report it is plan NT5 driver we want not higher or lower, this show from vmware own display driver, now we get req for pvmList before we doing second call to DrvGetDirectDrawInfo, it show good sign we got that request from vmware driver.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Mar 26 07:46:11 2007 New Revision: 26177 URL: http://svn.reactos.org/svn/reactos?rev=26177&view=rev Log: ReactOS win32k are using windows 2000 driver and it seam if we want using ms dx interface for graphics driver we must report it is plan NT5 driver we want not higher or lower, this show from vmware own display driver, now we get req for pvmList before we doing second call to DrvGetDirectDrawInfo, it show good sign we got that request from vmware driver. Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Mon Mar 26 07:46:11 2007 @@ -500,7 +500,7 @@ /* Call DDI driver's EnableDriver function */ RtlZeroMemory(&DED, sizeof(DED)); - if (! GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof(DED), &DED)) + if (! GDEnableDriver(DDI_DRIVER_VERSION_NT5, sizeof(DED), &DED)) { DPRINT("DrvEnableDriver failed for %S\n", CurrentName); } @@ -2602,7 +2602,7 @@ /* Call DDI driver's EnableDriver function */ RtlZeroMemory(&DrvEnableData, sizeof (DrvEnableData)); - if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5_01, sizeof (DrvEnableData), &DrvEnableData)) + if (!GDEnableDriver(DDI_DRIVER_VERSION_NT5, sizeof (DrvEnableData), &DrvEnableData)) { DPRINT("DrvEnableDriver failed for %S\n", CurrentName); continue;

17 years, 5 months

[hpoussin] 26176: Allocate enough memory to copy string See issue #2107 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Mar 26 02:42:37 2007 New Revision: 26176 URL: http://svn.reactos.org/svn/reactos?rev=26176&view=rev Log: Allocate enough memory to copy string See issue #2107 for more details. Modified: trunk/reactos/base/shell/cmd/dir.c Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=2… ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c (original) +++ trunk/reactos/base/shell/cmd/dir.c Mon Mar 26 02:42:37 2007 @@ -568,11 +568,11 @@ } /* Terminate the parameters */ if(ptrStart && ptrEnd) - { - temp = malloc((ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + { + temp = malloc((ptrEnd - ptrStart + 2) * sizeof(TCHAR)); if(!temp) return FALSE; - memcpy(temp, ptrStart, (ptrEnd - ptrStart) + 2 * sizeof (TCHAR)); + memcpy(temp, ptrStart, (ptrEnd - ptrStart + 1) * sizeof(TCHAR)); temp[(ptrEnd - ptrStart + 1)] = _T('\0'); if(!add_entry(entries, params, temp)) {

17 years, 5 months

[hpoussin] 26175: Fix warnings by Pierre Schweitzer Add svn:eol-style property See issue #2096 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Mar 26 01:25:11 2007 New Revision: 26175 URL: http://svn.reactos.org/svn/reactos?rev=26175&view=rev Log: Fix warnings by Pierre Schweitzer Add svn:eol-style property See issue #2096 for more details. Modified: trunk/reactos/drivers/multimedia/ks/allocators.c (props changed) trunk/reactos/drivers/multimedia/ks/clocks.c (props changed) trunk/reactos/drivers/multimedia/ks/connectivity.c (props changed) trunk/reactos/drivers/multimedia/ks/events.c (props changed) trunk/reactos/drivers/multimedia/ks/irp.c (contents, props changed) trunk/reactos/drivers/multimedia/ks/ks.def (props changed) trunk/reactos/drivers/multimedia/ks/ks.rc (props changed) trunk/reactos/drivers/multimedia/ks/methods.c (props changed) trunk/reactos/drivers/multimedia/ks/misc.c (props changed) trunk/reactos/drivers/multimedia/ks/properties.c (props changed) trunk/reactos/drivers/multimedia/ks/topology.c (props changed) trunk/reactos/drivers/multimedia/ks/worker.c (props changed) Propchange: trunk/reactos/drivers/multimedia/ks/allocators.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/clocks.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/connectivity.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/events.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/ks/irp.… ============================================================================== --- trunk/reactos/drivers/multimedia/ks/irp.c (original) +++ trunk/reactos/drivers/multimedia/ks/irp.c Mon Mar 26 01:25:11 2007 @@ -4,6 +4,8 @@ */ #include <ks.h> + +#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* @unimplemented @@ -75,7 +77,7 @@ if ( ! Header ) return STATUS_INVALID_PARAMETER; - Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), 'HDSK'); + Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSDEVICE_HEADER), TAG('H','D','S','K')); if ( ! Header ) return STATUS_INSUFFICIENT_RESOURCES; @@ -97,7 +99,7 @@ /* TODO: Free content first */ - ExFreePoolWithTag(Header, 'HDSK'); + ExFreePoolWithTag(Header, TAG('H','D','S','K')); } /* @@ -153,7 +155,7 @@ /* TODO: Validate parameters */ - object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), 'HOSK'); + object_header = ExAllocatePoolWithTag(PagedPool, sizeof(KSOBJECT_HEADER), TAG('H','O','S','K')); if ( ! object_header ) { @@ -176,7 +178,7 @@ KsFreeObjectHeader( IN PVOID Header) { - ExFreePoolWithTag(Header, 'HOSK'); + ExFreePoolWithTag(Header, TAG('H','O','S','K')); /* TODO */ Propchange: trunk/reactos/drivers/multimedia/ks/irp.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/ks.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/ks.rc ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/methods.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/properties.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/topology.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/ks/worker.c ------------------------------------------------------------------------------ svn:eol-style = native

17 years, 5 months

[hpoussin] 26174: Updated French translation by Pierre Schweitzer See issue #2001 for more details.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Mar 26 01:20:32 2007 New Revision: 26174 URL: http://svn.reactos.org/svn/reactos?rev=26174&view=rev Log: Updated French translation by Pierre Schweitzer See issue #2001 for more details. Modified: trunk/reactos/dll/cpl/intl_new/En.rc trunk/reactos/dll/cpl/intl_new/Fr.rc Modified: trunk/reactos/dll/cpl/intl_new/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/En.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/En.rc (original) +++ trunk/reactos/dll/cpl/intl_new/En.rc Mon Mar 26 01:20:32 2007 @@ -153,7 +153,7 @@ LTEXT "Calendar type:", -1, 13, 48, 56, 10 COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Chronology by Hijra:", -1, 13, 59, 60, 16 + LTEXT "Muslim Calendar:", -1, 13, 59, 60, 16 COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED GROUPBOX "Short date format", IDC_GROUPBOX, 7, 83, 238, 81 Modified: trunk/reactos/dll/cpl/intl_new/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl_new/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/cpl/intl_new/Fr.rc (original) +++ trunk/reactos/dll/cpl/intl_new/Fr.rc Mon Mar 26 01:20:32 2007 @@ -1,181 +1,181 @@ -LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL - -IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Options régionales" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Options régionales et standards", IDC_GROUPBOX, 5, 3, 242, 165 - LTEXT "Cette option influence la façon d'affichage par les programmes des nombres, des devises, des dates et de l'heure.", IDC_STATIC, 14, 15, 230, 16 - LTEXT "&Choisir un élément de la liste ou presser le bouton ""Pa&ramétrer"" pour modifier séparément les formats:", IDC_STATIC, 14, 36, 230, 16 - COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - PUSHBUTTON "Pa&ramétrer...", IDC_SETUP_BUTTON, 187, 54, 52, 13 - LTEXT "Exemples", IDC_STATIC, 14, 73, 70, 10 - LTEXT "Nombre:", IDC_STATIC, 16, 86, 48, 10 - LTEXT "Monétaire:", IDC_STATIC, 16, 101, 48, 10 - LTEXT "Heure:", IDC_STATIC, 16, 116, 48, 10 - LTEXT "Date courte:", IDC_STATIC, 16, 131, 48, 10 - LTEXT "Date longue:", IDC_STATIC, 16, 146, 48, 10 - EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Position géographique", IDC_GROUPBOX, 5, 172, 242, 56 - LTEXT "Sélectionner votre position géographique pour les services tels que les infos locales ou la météo" , IDC_STATIC, 14, 184, 225, 24 - COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT -END - -IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Extra" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Program language that not unicode supported", IDC_GROUPBOX, 5, 5, 242, 90 - COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT - LTEXT "This option...", IDC_STATIC, 14, 18, 223, 33 - LTEXT "Sélectionner la langue...", IDC_STATIC, 14, 55, 223, 18 - GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 - /* TODO: add other components*/ -END - -IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Langues" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Langue de saisie du texte et services", IDC_GROUPBOX, 5, 3, 242, 52 - LTEXT "Pour voir ou modifier les langues et les méthodes de saisie de texte, cliquer sur ""Détail...""", -1, 12, 13, 230, 18 - PUSHBUTTON "Dé&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14 - GROUPBOX "Support de langages additionnels", IDC_GROUPBOX, 5, 60, 242, 82 - /* TODO: add other components*/ -END - -IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Nombres" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 48 - LTEXT "Positif:", -1, 11, 20, 28, 10 - EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 20, 31, 10 - EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Positif:", -1, 11, 38, 28, 10 - EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 38, 31, 10 - EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Séparateur décimal:", -1, 18, 61, 126, 9 - COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Nombre de chiffres décimaux:", -1, 18, 77, 126, 9 - COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur de champ:", -1, 18, 93, 126, 9 - COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Nombre de chiffres dans le champ:", -1, 18, 109, 126, 9 - COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Signe de nombre négatif:", -1, 18, 125, 126, 9 - COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Format des nombres négatifs:", -1, 18, 141, 126, 9 - COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Zéros d'en-tête:", -1, 18, 157, 126, 9 - COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur d'éléments de liste :", -1, 18, 173, 126, 9 - COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Unité de mesure:", -1, 18, 189, 126, 9 - COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Region corresponding digits:", -1, 18, 205, 126, 9 - COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Digit replacement:", -1, 18, 221, 126, 9 - COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Monnaie" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 40 - LTEXT "Positif:", -1, 10, 25, 30, 10 - EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Négatif:", -1, 128, 25, 31, 10 - EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Symbole monétaire:", -1, 20, 61, 126, 9 - COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Monnaie au format négatif:", -1, 20, 78, 126, 9 - COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Monnaie au format positif:", -1, 20, 95, 126, 9 - COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur décimal:", -1, 20, 121, 126, 9 - COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Nombre de chiffres décimaux:", -1, 20, 137, 126, 9 - COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Séparateur de champ:", -1, 20, 166, 126, 9 - COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT - LTEXT "Nombre de chiffres dans le champ:", -1, 20, 183, 126, 9 - COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Heure" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 33 - LTEXT "Exemple:", -1, 13, 21, 52, 10 - EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Format de l'heure:", -1, 10, 52, 147, 10 - COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur horaire:", -1, 10, 69, 147, 10 - COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Heure avant midi (AM):", -1, 10, 86, 147, 10 - COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Heure après midi (PM):", -1, 10, 104, 147, 10 - COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 - LTEXT "Description du format de l'heure\nh = heure m = minute s = seconde t = matin ou après-midi\n\nh = heure au format 12 heures\nH = heure au format 24 heures\n\nhh, mm, ss = avec des zéros\nh, m, s = sans zéros", -1, 13, 141, 226, 65 -END - -IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 -STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Date" -FONT 8, "MS Shell Dlg" -BEGIN - GROUPBOX "Calendrier", IDC_GROUPBOX, 5, 7, 242, 74 - LTEXT "Si l'année est saisie sur 2 chiffres, l'afficher en tant qu'année entre:", -1, 13, 18, 225, 8 - EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "et", -1, 55, 32, 17, 8 - EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP - CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 - LTEXT "Calendrier:", -1, 13, 48, 56, 10 - COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - LTEXT "Chronology by Hijra:", -1, 13, 59, 60, 16 - COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | - WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED - GROUPBOX "Format court", IDC_GROUPBOX, 7, 83, 238, 81 - LTEXT "Exemple:", -1, 13, 95, 63, 10 - EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 109, 60, 16 - EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Format court:", -1, 13, 131, 60, 10 - COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - LTEXT "Séparateur de date:", -1, 13, 148, 113, 10 - COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE - GROUPBOX "Format long:", IDC_GROUPBOX, 7, 167, 238, 64 - LTEXT "Exemple:", -1, 13, 179, 61, 10 - EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP - LTEXT "Exemple - lecture de gauche à droite:", -1, 13, 193, 61, 16 - EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED - LTEXT "Format long:", -1, 13, 215, 60, 10 - COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE -END - -STRINGTABLE -BEGIN - IDS_CPLNAME "Langage et options régionales" - IDS_CPLDESCRIPTION "Sélectionner le langage, les formats de nombres, les devises, l'heure et la date." -END +LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL + +IDD_REGOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Options régionales" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Options régionales et standards", IDC_GROUPBOX, 5, 3, 242, 165 + LTEXT "Cette option définit comment certains programmes afficheront les nombres, les devises, les dates et l'heure.", IDC_STATIC, 14, 15, 230, 16 + LTEXT "&Choisissez un élément de la liste ou pressez le bouton ""Pa&ramétrer"" pour modifier séparément les formats:", IDC_STATIC, 14, 36, 230, 16 + COMBOBOX IDC_SETREG_COMBO, 14, 54, 168, 120, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + PUSHBUTTON "Pa&ramétrer...", IDC_SETUP_BUTTON, 187, 54, 52, 13 + LTEXT "Exemples", IDC_STATIC, 14, 73, 70, 10 + LTEXT "Nombre:", IDC_STATIC, 16, 86, 48, 10 + LTEXT "Monétaire:", IDC_STATIC, 16, 101, 48, 10 + LTEXT "Heure:", IDC_STATIC, 16, 116, 48, 10 + LTEXT "Date courte:", IDC_STATIC, 16, 131, 48, 10 + LTEXT "Date longue:", IDC_STATIC, 16, 146, 48, 10 + EDITTEXT IDC_NUMSAMPLE_EDIT, 69, 86, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_MONEYSAMPLE_EDIT, 69, 101, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_TIMESAMPLE_EDIT, 69, 116, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_SHORTTIMESAMPLE_EDIT, 69, 131, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_FULLTIMESAMPLE_EDIT, 69, 146, 170, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + GROUPBOX "Position géographique", IDC_GROUPBOX, 5, 172, 242, 56 + LTEXT "Sélectionnez votre position géographique pour pouvoir utiliser les services tels que les informations locales ou la météo." , IDC_STATIC, 14, 184, 225, 24 + COMBOBOX IDC_LOCATION_COMBO, 14, 211, 225, 40, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT +END + +IDD_EXTRAOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Extra" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue pour les programmes ne supportant pas Unicode", IDC_GROUPBOX, 5, 5, 242, 90 + COMBOBOX IDC_LANGUAGE_COMBO, 14, 75, 225, 60, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT + LTEXT "Cette option...", IDC_STATIC, 14, 18, 223, 33 + LTEXT "Sélectionnez la langue...", IDC_STATIC, 14, 55, 223, 18 + GROUPBOX "Transformation tables codepages", IDC_GROUPBOX, 5, 101, 242, 88 + /* TODO: add other components*/ +END + +IDD_LANGSOPTSPAGE DIALOGEX 0, 0, 252, 236 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Langues" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Langue de saisie du texte et services", IDC_GROUPBOX, 5, 3, 242, 52 + LTEXT "Pour voir ou modifier les langues et les méthodes de saisie de texte, cliquez sur ""Détail...""", -1, 12, 13, 230, 18 + PUSHBUTTON "Dé&tail...", IDC_DETAIL_BUTTON, 186, 34, 54, 14 + GROUPBOX "Support de langues additionnelles", IDC_GROUPBOX, 5, 60, 242, 82 + /* TODO: add other components*/ +END + +IDD_NUMSOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Nombres" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 48 + LTEXT "Positif:", -1, 11, 20, 28, 10 + EDITTEXT IDC_NUM_EDIT, 42, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 20, 31, 10 + EDITTEXT IDC_NEGNUM_EDIT, 162, 18, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Positif:", -1, 11, 38, 28, 10 + EDITTEXT IDC_NUM1_EDIT, 42, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 38, 31, 10 + EDITTEXT IDC_NEGNUM1_EDIT, 162, 36, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Séparateur décimal:", -1, 18, 61, 126, 9 + COMBOBOX IDC_NUMDECIMALSEP_COMBO, 147, 59, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Nombre de chiffres décimaux:", -1, 18, 77, 126, 9 + COMBOBOX IDC_NUMFRACSYBMS_COMBO, 147, 75, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur de champ:", -1, 18, 93, 126, 9 + COMBOBOX IDC_NUMFIELDSEP_COMBO, 147, 91, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Nombre de chiffres dans le champ:", -1, 18, 109, 126, 9 + COMBOBOX IDC_NUMDIGFIELD_COMBO, 147, 107, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Signe de nombre négatif:", -1, 18, 125, 126, 9 + COMBOBOX IDC_NUMNEGSIGN_COMBO, 147, 123, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Format des nombres négatifs:", -1, 18, 141, 126, 9 + COMBOBOX IDC_NUMNEGFMT_COMBO, 147, 139, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Zéros d'en-tête:", -1, 18, 157, 126, 9 + COMBOBOX IDC_NUMLEADZERO_COMBO, 147, 155, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur d'éléments de liste :", -1, 18, 173, 126, 9 + COMBOBOX IDC_NUMELEMLISTSEP_COMBO, 147, 171, 100, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Unité de mesure:", -1, 18, 189, 126, 9 + COMBOBOX IDC_NUMUNITSSYS_COMBO, 147, 187, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Région correspondant aux chiffres:", -1, 18, 205, 126, 9 + COMBOBOX IDC_NUMREGDIG_COMBO, 147, 203, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Remplacement de chiffres:", -1, 18, 221, 126, 9 + COMBOBOX IDC_NUMDIGREPL_COMBO, 147, 219, 100, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_CURRENCYOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Monnaie" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 40 + LTEXT "Positif:", -1, 10, 25, 30, 10 + EDITTEXT IDC_CURRENCY_EDIT, 42, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Négatif:", -1, 128, 25, 31, 10 + EDITTEXT IDC_NEGCURRENCY_EDIT, 162, 23, 80, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Symbole monétaire:", -1, 20, 61, 126, 9 + COMBOBOX IDC_CURRENCYUNIT_COMBO, 148, 59, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Monnaie au format négatif:", -1, 20, 78, 126, 9 + COMBOBOX IDC_POSCURRENCYSUM_COMBO, 148, 76, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Monnaie au format positif:", -1, 20, 95, 126, 9 + COMBOBOX IDC_NEGCURRENCYSUM_COMBO, 148, 93, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur décimal:", -1, 20, 121, 126, 9 + COMBOBOX IDC_WHOLEFRACTSEP_COMBO, 148, 119, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Nombre de chiffres décimaux:", -1, 20, 137, 126, 9 + COMBOBOX IDC_FRACSYMBSNUM_COMBO, 148, 136, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Séparateur de champ:", -1, 20, 166, 126, 9 + COMBOBOX IDC_FIELDSEP_COMBO, 148, 164, 90, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE | CBS_SORT + LTEXT "Nombre de chiffres dans le champ:", -1, 20, 183, 126, 9 + COMBOBOX IDC_DIGINFIELDNUM_COMBO, 148, 181, 90, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +IDD_TIMEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Heure" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Exemples", IDC_GROUPBOX, 5, 7, 242, 33 + LTEXT "Exemple:", -1, 13, 21, 52, 10 + EDITTEXT IDC_TIME_EDIT, 68, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + EDITTEXT IDC_UNKNOWN_EDIT, 156, 19, 84, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Format de l'heure:", -1, 10, 52, 147, 10 + COMBOBOX IDC_TIMEFMT_COMBO, 161, 50, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur horaire:", -1, 10, 69, 147, 10 + COMBOBOX IDC_TIMESEP_COMBO, 161, 67, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Heure avant midi (AM):", -1, 10, 86, 147, 10 + COMBOBOX IDC_TIMEAM_COMBO, 161, 84, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Heure après midi (PM):", -1, 10, 104, 147, 10 + COMBOBOX IDC_TIMEPM_COMBO, 161, 102, 84, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "", IDC_GROUPBOX, 7, 132, 238, 80 + LTEXT "Description du format de l'heure\nh = heure m = minute s = seconde t = matin ou après-midi\n\nh = heure au format 12 heures\nH = heure au format 24 heures\n\nhh, mm, ss = avec des zéros\nh, m, s = sans zéros", -1, 13, 141, 226, 65 +END + +IDD_DATEOPTSSETUP DIALOGEX 0, 0, 252, 236 +STYLE DS_FIXEDSYS | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Date" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Calendrier", IDC_GROUPBOX, 5, 7, 242, 74 + LTEXT "Si l'année est saisie sur 2 chiffres, l'afficher en tant qu'année entre:", -1, 13, 18, 225, 8 + EDITTEXT IDC_FIRSTYEAR_EDIT, 13, 30, 36, 12, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "et", -1, 55, 32, 17, 8 + EDITTEXT IDC_SECONDYEAR_EDIT, 77, 30, 36, 12, ES_LEFT | ES_NUMBER | WS_GROUP + CONTROL "",IDC_SCR_MAX_YEAR, "msctls_updown32", UDS_NOTHOUSANDS | UDS_WRAP | UDS_SETBUDDYINT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_CHILD | WS_VISIBLE, 113, 30, 10, 12 + LTEXT "Calendrier:", -1, 13, 48, 56, 10 + COMBOBOX IDC_CALTYPE_COMBO, 77, 46, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + LTEXT "Calendrier Musulman:", -1, 13, 59, 60, 16 + COMBOBOX IDC_HIJCHRON_COMBO, 77, 64, 161, 100, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | + WS_VSCROLL | WS_TABSTOP | CBS_SORT | WS_DISABLED + GROUPBOX "Format court", IDC_GROUPBOX, 7, 83, 238, 81 + LTEXT "Exemple:", -1, 13, 95, 63, 10 + EDITTEXT IDC_SHRTDATESAMPLE_EDIT, 77, 93, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de droite à gauche:", -1, 13, 109, 60, 16 + EDITTEXT IDC_SHRTDATERTOL_EDIT, 77, 111, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format court:", -1, 13, 131, 60, 10 + COMBOBOX IDC_SHRTDATEFMT_COMBO, 77, 129, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + LTEXT "Séparateur de date:", -1, 13, 148, 113, 10 + COMBOBOX IDC_SHRTDATESEP_COMBO, 187, 146, 51, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE + GROUPBOX "Format long:", IDC_GROUPBOX, 7, 167, 238, 64 + LTEXT "Exemple:", -1, 13, 179, 61, 10 + EDITTEXT IDC_LONGDATESAMPLE_EDIT, 77, 177, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "Exemple - lecture de gauche à droite:", -1, 13, 193, 61, 16 + EDITTEXT IDC_LONGDATERTOL_EDIT, 77, 195, 161, 14, ES_READONLY | WS_CHILD | WS_VISIBLE | WS_GROUP | WS_DISABLED + LTEXT "Format long:", -1, 13, 215, 60, 10 + COMBOBOX IDC_LONGDATEFMT_COMBO, 77, 213, 161, 100, CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP | WS_VISIBLE +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Langue et options régionales" + IDS_CPLDESCRIPTION "Sélectionner la langue, les formats de nombres, les devises, l'heure et la date." +END

17 years, 5 months

[fireball] 26170: - Change ScsiPort prototype to match DDK.

by fireball＠svn.reactos.org

Author: fireball Date: Sun Mar 25 22:21:12 2007 New Revision: 26170 URL: http://svn.reactos.org/svn/reactos?rev=26170&view=rev Log: - Change ScsiPort prototype to match DDK. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sun Mar 25 22:21:12 2007 @@ -1207,7 +1207,7 @@ VOID STDCALL ScsiPortIoMapTransfer(IN PVOID HwDeviceExtension, IN PSCSI_REQUEST_BLOCK Srb, - IN ULONG LogicalAddress, + IN PVOID LogicalAddress, IN ULONG Length) { DPRINT1("ScsiPortIoMapTransfer()\n");

17 years, 5 months

← Newer
1
2
3
4
5
6
7
8
...
29
Older →

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 March 2007