Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[weiden] 13104: fixed GetCurrentDirectoryA() to properly handle the case where the caller only queries the required buffer size.

by weiden＠svn.reactos.com

fixed GetCurrentDirectoryA() to properly handle the case where the caller only queries the required buffer size. Modified: trunk/reactos/lib/kernel32/file/curdir.c _____ Modified: trunk/reactos/lib/kernel32/file/curdir.c --- trunk/reactos/lib/kernel32/file/curdir.c 2005-01-17 21:40:12 UTC (rev 13103) +++ trunk/reactos/lib/kernel32/file/curdir.c 2005-01-17 22:05:00 UTC (rev 13104) @@ -38,39 +38,51 @@ ANSI_STRING AnsiString; UNICODE_STRING UnicodeString; - /* initialize ansi string */ - AnsiString.Length = 0; - AnsiString.MaximumLength = nBufferLength; - AnsiString.Buffer = lpBuffer; - /* allocate buffer for unicode string */ UnicodeString.Length = 0; UnicodeString.MaximumLength = nBufferLength * sizeof(WCHAR); - UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), - 0, - UnicodeString.MaximumLength); + if (nBufferLength > 0) + { + UnicodeString.Buffer = RtlAllocateHeap (RtlGetProcessHeap (), + 0, + UnicodeString.MaximumLength); + /* initialize ansi string */ + AnsiString.Length = 0; + AnsiString.MaximumLength = nBufferLength; + AnsiString.Buffer = lpBuffer; + } + else + { + UnicodeString.Buffer = NULL; + } /* get current directory */ UnicodeString.Length = RtlGetCurrentDirectory_U (UnicodeString.MaximumLength, UnicodeString.Buffer); - DPRINT("UnicodeString.Buffer %S\n", UnicodeString.Buffer); + if (nBufferLength > 0) + { + DPRINT("UnicodeString.Buffer %wZ\n", &UnicodeString); - /* convert unicode string to ansi (or oem) */ - if (bIsFileApiAnsi) - RtlUnicodeStringToAnsiString (&AnsiString, - &UnicodeString, - FALSE); + /* convert unicode string to ansi (or oem) */ + if (bIsFileApiAnsi) + RtlUnicodeStringToAnsiString (&AnsiString, + &UnicodeString, + FALSE); + else + RtlUnicodeStringToOemString (&AnsiString, + &UnicodeString, + FALSE); + DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer); + + /* free unicode string */ + RtlFreeHeap (RtlGetProcessHeap (), + 0, + UnicodeString.Buffer); + } else - RtlUnicodeStringToOemString (&AnsiString, - &UnicodeString, - FALSE); - DPRINT("AnsiString.Buffer %s\n", AnsiString.Buffer); - - /* free unicode string */ - RtlFreeHeap (RtlGetProcessHeap (), - 0, - UnicodeString.Buffer); - + { + AnsiString.Length = UnicodeString.Length / sizeof(WCHAR); + } return AnsiString.Length; }

19 years, 10 months

[chorns] 13103: Build storage drivers

by chorns＠svn.reactos.com

Build storage drivers Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/directory.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml Added: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml _____ Modified: branches/xmlbuildsystem/reactos/drivers/directory.xml --- branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/directory.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -16,3 +16,6 @@ <directory name="net"> <xi:include href="net/directory.xml" /> </directory> +<directory name="storage"> + <xi:include href="storage/directory.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml --- branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/atapi/atapi.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,8 @@ +<module name="atapi" type="kernelmodedriver"> + <include base="atapi">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>scsiport</library> + <file>atapi.c</file> + <file>atapi.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml --- branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/cdrom/cdrom.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,7 @@ +<module name="cdrom" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <library>class2</library> + <file>cdrom.c</file> + <file>cdrom.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml --- branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/class2/class2.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,7 @@ +<module name="class2" type="kernelmodedriver"> + <importlibrary definition="class2.def" /> + <library>ntoskrnl</library> + <library>hal</library> + <file>class2.c</file> + <file>class2.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/directory.xml --- branches/xmlbuildsystem/reactos/drivers/storage/directory.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/directory.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,21 @@ +<directory name="atapi"> + <xi:include href="atapi/atapi.xml" /> +</directory> +<directory name="cdrom"> + <xi:include href="cdrom/cdrom.xml" /> +</directory> +<directory name="class2"> + <xi:include href="class2/class2.xml" /> +</directory> +<directory name="disk"> + <xi:include href="disk/disk.xml" /> +</directory> +<directory name="diskdump"> + <xi:include href="diskdump/diskdump.xml" /> +</directory> +<directory name="floppy"> + <xi:include href="floppy/floppy.xml" /> +</directory> +<directory name="scsiport"> + <xi:include href="scsiport/scsiport.xml" /> +</directory> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml --- branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/disk/disk.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,7 @@ +<module name="disk" type="kernelmodedriver"> + <library>ntoskrnl</library> + <library>hal</library> + <library>class2</library> + <file>disk.c</file> + <file>disk.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml --- branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/diskdump/diskdump.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,9 @@ +<module name="diskdump" type="kernelmodedriver"> + <library definition="diskdump.def" /> + <library>ntoskrnl</library> + <library>hal</library> + <library>class2</library> + <file>diskdump.c</file> + <file>diskdump_helper.S</file> + <file>diskdump.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml --- branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/floppy/floppy.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,12 @@ +<module name="floppy" type="kernelmodedriver"> + <include base="floppy">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>csq</library> + <file>csqrtns.c</file> + <file>floppy.c</file> + <file>hardware.c</file> + <file>ioctl.c</file> + <file>readwrite.c</file> + <file>floppy.rc</file> +</module> _____ Added: branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml --- branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-01-17 21:29:43 UTC (rev 13102) +++ branches/xmlbuildsystem/reactos/drivers/storage/scsiport/scsiport.xml 2005-01-17 21:40:12 UTC (rev 13103) @@ -0,0 +1,8 @@ +<module name="scsiport" type="kernelmodedriver"> + <importlibrary definition="scsiport.def" /> + <include base="scsiport">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>scsiport.c</file> + <file>scsiport.rc</file> +</module>

19 years, 10 months

[hbirr] 13102: - Set the limit of the user mode code/data segment back to 4GB.

by hbirr＠svn.reactos.com

- Set the limit of the user mode code/data segment back to 4GB. Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c --- trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 20:32:09 UTC (rev 13101) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 21:29:43 UTC (rev 13102) @@ -40,13 +40,8 @@ 0x0, 0x0, 0x0, 0x0, /* Null */ 0xffff, 0x0, 0x9a00, 0xcf, /* Kernel CS */ 0xffff, 0x0, 0x9200, 0xcf, /* Kernel DS */ -#ifdef __3GB__ - 0xffff, 0x0, 0xfa00, 0xcb, /* User CS */ - 0xffff, 0x0, 0xf200, 0xcb, /* User DS */ -#else - 0xffff, 0x0, 0xfa00, 0xc7, /* User CS */ - 0xffff, 0x0, 0xf200, 0xc7, /* User DS */ -#endif + 0xffff, 0x0, 0xfa00, 0xcf, /* User CS */ + 0xffff, 0x0, 0xf200, 0xcf, /* User DS */ 0x0, 0x0, 0x0, 0x0, /* TSS */ 0x0fff, 0x0000, 0x9200, 0xff00, /* PCR */ 0x0fff, 0x0, 0xf200, 0x0, /* TEB */

19 years, 10 months

[gvg] 13101: Fix building on Windows

by gvg＠svn.reactos.com

Fix building on Windows Modified: trunk/reactos/tools/nci/ncitool.c _____ Modified: trunk/reactos/tools/nci/ncitool.c --- trunk/reactos/tools/nci/ncitool.c 2005-01-17 19:22:03 UTC (rev 13100) +++ trunk/reactos/tools/nci/ncitool.c 2005-01-17 20:32:09 UTC (rev 13101) @@ -1,556 +1,557 @@ -/* - * 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> - -/* 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. - */ -#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ - " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ - " call *%%ecx\n" \ - " ret $0x%x\n\n" - -/* - * This stub calls KiSystemService directly with a fake INT2E stack. - * Because EIP is pushed during the call, the handler will return here. - */ -#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ - " leal 4(%%esp), %%edx\n" \ - " pushfl\n" \ - " pushl $KERNEL_CS\n" \ - " call _KiSystemService\n" \ - " ret $0x%x\n\n" - -/***** Arch Dependent Stuff ******/ -//#ifdef _M_IX86 -#define ARGS_TO_BYTES(x) x*4 -#define UserModeStub UserModeStub_x86 -#define KernelModeStub KernelModeStub_x86 - -//#elseif -//#error Unsupported Architecture -//#endif - -/* 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 <napi/shared_data.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, ".global _%s@%d\n", SyscallName, StackBytes); - - /* Define it */ - fprintf(StubFile, "_%s@%d:\n\n", 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; - } -} - -/*++ - * 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 *ZwSyscallName = NULL; - 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); - StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); - - /* Make sure we really extracted something */ - if (NtSyscallName) { - - /* Create the ZwXXX name, if requested */ - if (NeedsZw) { - ZwSyscallName = alloca(strlen(NtSyscallName)); - strcpy(ZwSyscallName, NtSyscallName); - ZwSyscallName[0] = 'Z'; - ZwSyscallName[1] = 'w'; - } - - /* 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 (ZwSyscallName) WriteUserModeStub(UserModeFiles[i], - ZwSyscallName, - StackBytes, - SyscallId | Index); - - } - - /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ - if (KernelModeFile) WriteKernelModeStub(KernelModeFile, - ZwSyscallName, - 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,"SSDT %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(PVOID (NTAPI *)(VOID))%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,"SSPT %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. */ - fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); - - /* 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 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", - argv0 - ); -} - -int main(int argc, char* argv[]) -{ - FILE * Files[Arguments]; - int FileNumber; - char * OpenType = "r"; - - /* Make sure all arguments all there */ - if (argc != Arguments + 1) { - 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 + 1], OpenType); - - /* Check for failure and error out if so */ - if (!Files[FileNumber]) { - perror(argv[FileNumber + 1]); - return (1); - } - - } - - /* Write the File Headers */ - WriteFileHeader(Files[NtosUserStubs], - "System Call Stubs for Native API", - argv[NtosUserStubs + 1]); - - WriteFileHeader(Files[NtosKernelStubs], - "System Call Stubs for Native API", - argv[NtosKernelStubs + 1]); - fputs("#include <internal/i386/segment.h>\n\n", Files[NtosKernelStubs]); - - WriteFileHeader(Files[Win32kGdiStubs], - "System Call Stubs for Native API", - argv[Win32kGdiStubs + 1]); - - WriteFileHeader(Files[Win32kUserStubs], - "System Call Stubs for Native API", - argv[Win32kUserStubs + 1]); - - - /* 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 + 1]); - - CreateSystemServiceTable(Files[NativeGuiDb], - Files[Win32kServiceTable], - "Win32k", - argv[Win32kServiceTable + 1]); - - /* Close all files */ - for (FileNumber = 0; FileNumber < Arguments; 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> +#include <malloc.h> + +/* 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. + */ +#define UserModeStub_x86 " movl $0x%x, %%eax\n" \ + " movl $KUSER_SHARED_SYSCALL, %%ecx\n" \ + " call *%%ecx\n" \ + " ret $0x%x\n\n" + +/* + * This stub calls KiSystemService directly with a fake INT2E stack. + * Because EIP is pushed during the call, the handler will return here. + */ +#define KernelModeStub_x86 " movl $0x%x, %%eax\n" \ + " leal 4(%%esp), %%edx\n" \ + " pushfl\n" \ + " pushl $KERNEL_CS\n" \ + " call _KiSystemService\n" \ + " ret $0x%x\n\n" + +/***** Arch Dependent Stuff ******/ +//#ifdef _M_IX86 +#define ARGS_TO_BYTES(x) x*4 +#define UserModeStub UserModeStub_x86 +#define KernelModeStub KernelModeStub_x86 + +//#elseif +//#error Unsupported Architecture +//#endif + +/* 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 <napi/shared_data.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, ".global _%s@%d\n", SyscallName, StackBytes); + + /* Define it */ + fprintf(StubFile, "_%s@%d:\n\n", 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; + } +} + +/*++ + * 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 *ZwSyscallName = NULL; + 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); + StackBytes = ARGS_TO_BYTES(strtoul(SyscallArguments, NULL, 0)); + + /* Make sure we really extracted something */ + if (NtSyscallName) { + + /* Create the ZwXXX name, if requested */ + if (NeedsZw) { + ZwSyscallName = alloca(strlen(NtSyscallName)); + strcpy(ZwSyscallName, NtSyscallName); + ZwSyscallName[0] = 'Z'; + ZwSyscallName[1] = 'w'; + } + + /* 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 (ZwSyscallName) WriteUserModeStub(UserModeFiles[i], + ZwSyscallName, + StackBytes, + SyscallId | Index); + + } + + /* Create the Kernel coutnerparts (only Zw*, Nt* are the real functions!) */ + if (KernelModeFile) WriteKernelModeStub(KernelModeFile, + ZwSyscallName, + 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,"SSDT %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(PVOID (NTAPI *)(VOID))%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,"SSPT %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. */ + fprintf(SyscallTable,"\t\t%lu * sizeof(void *)",strtoul(SyscallArguments, NULL, 0)); + + /* Only increase if we actually added something */ [truncated at 1000 lines; 118 more skipped]

19 years, 10 months

[hbirr] 13100: - Fixed the sysexit check. We must use a kernel mode segment to access KiFastSystemCallDisable.

by hbirr＠svn.reactos.com

- Fixed the sysexit check. We must use a kernel mode segment to access KiFastSystemCallDisable. - Fixed some segment limits. Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/gdt.c --- trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 16:27:28 UTC (rev 13099) +++ trunk/reactos/ntoskrnl/ke/i386/gdt.c 2005-01-17 19:22:03 UTC (rev 13100) @@ -40,11 +40,16 @@ 0x0, 0x0, 0x0, 0x0, /* Null */ 0xffff, 0x0, 0x9a00, 0xcf, /* Kernel CS */ 0xffff, 0x0, 0x9200, 0xcf, /* Kernel DS */ - 0x0, 0x0, 0xfa00, 0xcf, /* User CS */ - 0x0, 0x0, 0xf200, 0xcf, /* User DS */ +#ifdef __3GB__ + 0xffff, 0x0, 0xfa00, 0xcb, /* User CS */ + 0xffff, 0x0, 0xf200, 0xcb, /* User DS */ +#else + 0xffff, 0x0, 0xfa00, 0xc7, /* User CS */ + 0xffff, 0x0, 0xf200, 0xc7, /* User DS */ +#endif 0x0, 0x0, 0x0, 0x0, /* TSS */ - 0x1000, 0x0000, 0x9200, 0xffc0, /* PCR */ - 0x1000, 0x0, 0xf200, 0x0, /* TEB */ + 0x0fff, 0x0000, 0x9200, 0xff00, /* PCR */ + 0x0fff, 0x0, 0xf200, 0x0, /* TEB */ 0x0, 0x0, 0x0, 0x0, /* Reserved */ 0x0, 0x0, 0x0, 0x0, /* LDT */ 0x0, 0x0, 0x0, 0x0 /* Trap TSS */ _____ Modified: trunk/reactos/ntoskrnl/ke/i386/syscall.S --- trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-17 16:27:28 UTC (rev 13099) +++ trunk/reactos/ntoskrnl/ke/i386/syscall.S 2005-01-17 19:22:03 UTC (rev 13100) @@ -270,8 +270,8 @@ FastRet: /* Is SYSEXIT Supported/Wanted? */ - cmpl $1, _KiFastSystemCallDisable - je IntRet + cmpl $0, %ss:_KiFastSystemCallDisable + jnz IntRet /* Restore FS to TIB */ mov $TEB_SELECTOR, %ecx

19 years, 10 months

[arty] 13099: More commits of the same. SVN is being a bit picky about resolved

by arty＠svn.reactos.com

More commits of the same. SVN is being a bit picky about resolved conflicts. Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-17 16:26:11 UTC (rev 13098) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-17 16:27:28 UTC (rev 13099) @@ -2,6 +2,7 @@ #include "../../pch.h" #include "mingw.h" +#include <assert.h> using std::string; using std::vector; @@ -166,8 +167,10 @@ fprintf ( fMakefile, "gcc = gcc\n" ); fprintf ( fMakefile, "ld = ld\n" ); fprintf ( fMakefile, "ar = ar\n" ); + fprintf ( fMakefile, "mkdir = tools%crmkdir\n", CSEP ); fprintf ( fMakefile, "dlltool = dlltool\n" ); fprintf ( fMakefile, "windres = windres\n" ); + fprintf ( fMakefile, "NUL=NUL\n" ); fprintf ( fMakefile, "winebuild = tools" SSEP "winebuild" SSEP "winebuild\n" ); fprintf ( fMakefile, "\n" ); GenerateGlobalCFlagsAndProperties ( @@ -188,7 +191,7 @@ void MingwBackend::GenerateAllTarget () { - fprintf ( fMakefile, "all:" ); + fprintf ( fMakefile, "all:" ); for ( size_t i = 0; i < ProjectNode.modules.size (); i++ ) { Module& module = *ProjectNode.modules[i]; @@ -206,6 +209,7 @@ module.node.location, module.type ); h->Process ( module ); + h->GenerateDirectoryTargets (); } string _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-17 16:26:11 UTC (rev 13098) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-17 16:27:28 UTC (rev 13099) @@ -23,6 +23,7 @@ const std::vector<Define*>& defines, const std::vector<If*>& ifs ); std::string GenerateProjectLFLAGS (); + void GenerateDirectoryTargets (); void GenerateGlobalVariables (); void GenerateAllTarget (); FILE* fMakefile; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-17 16:26:11 UTC (rev 13098) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-17 16:27:28 UTC (rev 13099) @@ -16,9 +16,12 @@ static MingwModuleHandler* LookupHandler ( const std::string& location, ModuleType moduletype_ ); virtual void Process ( const Module& module ) = 0; + void GenerateDirectoryTargets () const; protected: + const std::string &PassThruCacheDirectory ( const std::string &f ) const; std::string GetWorkingDirectory () const; + std::string GetDirectory (const std::string& filename ) const; std::string GetExtension ( const std::string& filename ) const; std::string GetBasename ( const std::string& filename ) const; std::string ReplaceExtension ( const std::string& filename, @@ -51,6 +54,7 @@ std::string GetDefinitionDependencies ( const Module& module ) const; std::string GetLinkingDependencies ( const Module& module ) const; static FILE* fMakefile; + static std::set<std::string> directory_set; private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/pch.h --- branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-17 16:26:11 UTC (rev 13098) +++ branches/xmlbuildsystem/reactos/tools/rbuild/pch.h 2005-01-17 16:27:28 UTC (rev 13099) @@ -10,6 +10,7 @@ #include <string> #include <vector> #include <map> +#include <set> #include <stdarg.h>

19 years, 10 months

[arty] 13098: - Add a NUL definition, as well as rmkdir

by arty＠svn.reactos.com

- Add a NUL definition, as well as rmkdir - Create directory targets for intermediate files area - .def files are in the source tree in our current scheme Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-17 14:30:31 UTC (rev 13097) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-17 16:26:11 UTC (rev 13098) @@ -1,4 +1,3 @@ - #include "../../pch.h" #include <assert.h> @@ -9,9 +8,12 @@ using std::string; using std::vector; using std::map; +using std::set; map<ModuleType,MingwModuleHandler*>* MingwModuleHandler::handler_map = NULL; +set<string> +MingwModuleHandler::directory_set; int MingwModuleHandler::ref = 0; @@ -34,6 +36,13 @@ } } +const string & +MingwModuleHandler::PassThruCacheDirectory( const string &file ) const +{ + directory_set.insert( ReplaceExtension( GetDirectory( file ), "" ) ); + return file; +} + void MingwModuleHandler::SetMakefile ( FILE* f ) { @@ -61,12 +70,23 @@ return "."; } +string +MingwModuleHandler::GetDirectory ( const string& filename ) const +{ + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) return "."; + else return filename.substr ( 0, index ); +} + string MingwModuleHandler::GetExtension ( const string& filename ) const { - size_t index = filename.find_last_of ( '.' ); - if (index != string::npos) - return filename.substr ( index ); + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) index = 0; + string tmp = filename.substr( index, filename.size() - index ); + size_t ext_index = tmp.find_last_of( '.' ); + if (ext_index != string::npos) + return filename.substr ( index + ext_index, filename.size() ); return ""; } @@ -83,10 +103,13 @@ MingwModuleHandler::ReplaceExtension ( const string& filename, const string& newExtension ) const { - size_t index = filename.find_last_of ( '.' ); - if (index != string::npos) - return filename.substr ( 0, index ) + newExtension; - return filename; + size_t index = filename.find_last_of ( '/' ); + if (index == string::npos) index = 0; + string tmp = filename.substr( index, filename.size() - index ); + size_t ext_index = tmp.find_last_of( '.' ); + if (ext_index != string::npos) + return filename.substr ( 0, index + ext_index ) + newExtension; + return filename + newExtension; } string @@ -106,7 +129,7 @@ MingwModuleHandler::GetModuleArchiveFilename ( const Module& module ) const { return ReplaceExtension ( FixupTargetFilename ( module.GetPath () ), - ".a" ); + ".a" ); } string @@ -122,7 +145,7 @@ dependencies += " "; const Module* importedModule = module.project.LocateModule ( module.libraries[i]->name ); assert ( importedModule != NULL ); - dependencies += FixupTargetFilename ( importedModule->GetDependencyPath () ).c_str (); + dependencies += PassThruCacheDirectory ( FixupTargetFilename ( importedModule->GetDependencyPath () ) ).c_str (); } return dependencies; } @@ -195,8 +218,9 @@ newExtension = ".stubs.o"; else newExtension = ".o"; - return FixupTargetFilename ( ReplaceExtension ( sourceFilename, - newExtension ) ); + return PassThruCacheDirectory + ( FixupTargetFilename ( ReplaceExtension ( sourceFilename, + newExtension ) ) ); } string @@ -215,6 +239,32 @@ return objectFilenames; } +void +MingwModuleHandler::GenerateDirectoryTargets() const +{ + fprintf( fMakefile, "ifneq ($(ROS_INTERMEDIATE),)\ndirectories::" ); + + for( set<string>::iterator i = directory_set.begin(); + i != directory_set.end(); + i++ ) + fprintf( fMakefile, " %s", i->c_str() ); + + fprintf( fMakefile, "\n\n" ); + + for( set<string>::iterator i = directory_set.begin(); + i != directory_set.end(); + i++ ) + fprintf( fMakefile, "%s ", i->c_str() ); + + fprintf ( fMakefile, + "::\n\t${mkdir} $@\n\n" + "else\n" + "directories::\n\n" + "endif\n\n" ); + + directory_set.clear(); +} + string MingwModuleHandler::GenerateGccDefineParametersFromVector ( const vector<Define*>& defines ) const { @@ -667,7 +717,7 @@ "\t${dlltool} --dllname %s --base-file %s --def %s --output-exp %s --kill-at\n", targetName.c_str (), base_tmp.c_str (), - FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + (module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), temp_exp.c_str () ); fprintf ( fMakefile, @@ -771,11 +821,11 @@ const string& ar, const string& objs_macro ) const { - string archiveFilename = GetModuleArchiveFilename ( module ); + string archiveFilename = GetModuleArchiveFilename ( module ); fprintf ( fMakefile, "%s: %s\n", - archiveFilename.c_str (), + archiveFilename.c_str (), objs_macro.c_str ()); fprintf ( fMakefile, @@ -864,10 +914,10 @@ for ( size_t i = 0; i < clean_files.size(); i++ ) { if ( 9==(i%10) ) - fprintf ( fMakefile, " 2>NUL\n\t-@$(rm)" ); + fprintf ( fMakefile, " 2>$(NUL)\n\t-@$(rm)" ); fprintf ( fMakefile, " %s", clean_files[i].c_str() ); } - fprintf ( fMakefile, " 2>NUL\n\n" ); + fprintf ( fMakefile, " 2>$(NUL)\n\n" ); } void @@ -1035,13 +1085,13 @@ { string definitionDependencies = GetDefinitionDependencies ( module ); fprintf ( fMakefile, "%s: %s\n", - module.GetDependencyPath ().c_str (), + FixupTargetFilename( module.GetDependencyPath () ).c_str (), definitionDependencies.c_str () ); fprintf ( fMakefile, "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", module.GetTargetName ().c_str (), - FixupTargetFilename ( module.GetBasePath () + SSEP + module.importLibrary->definition ).c_str (), + (module.GetBasePath () + SSEP + module.importLibrary->definition).c_str (), FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); } } @@ -1282,7 +1332,7 @@ MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ( const Module& module ) { static string ros_junk ( "$(ROS_TEMPORARY)" ); - string target ( FixupTargetFilename ( module.GetPath () ) ); + string target ( PassThruCacheDirectory( FixupTargetFilename ( module.GetPath () ) ) ); string workingDirectory = GetWorkingDirectory ( ); string archiveFilename = GetModuleArchiveFilename ( module ); string importLibraryDependencies = GetImportLibraryDependencies ( module ); @@ -1297,7 +1347,7 @@ delete cflags; fprintf ( fMakefile, "%s: %s %s\n", - target.c_str (), + target.c_str (), archiveFilename.c_str (), importLibraryDependencies.c_str () ); @@ -1310,7 +1360,7 @@ else { fprintf ( fMakefile, "%s:\n", - target.c_str ()); + target.c_str () ); fprintf ( fMakefile, ".PHONY: %s\n\n", target.c_str ()); } @@ -1346,6 +1396,16 @@ if ( module.files.size () > 0 ) { + + fprintf ( fMakefile, + "\t${dlltool} --dllname %s --def %s --output-lib %s --kill-at\n\n", + module.GetTargetName ().c_str (), + (module.GetBasePath () + SSEP + module.importLibrary->definition).c_str (), + FixupTargetFilename ( module.GetDependencyPath () ).c_str () ); + } + + if (module.files.size () > 0) + { GenerateMacrosAndTargetsTarget ( module ); fprintf ( fMakefile, "%s: %s %s\n", @@ -1394,7 +1454,6 @@ string linkingDependencies = GetLinkingDependencies ( module ); GenerateImportLibraryTargetIfNeeded ( module ); - if ( module.files.size () > 0 ) { GenerateMacrosAndTargetsTarget ( module );

19 years, 10 months

[ekohl] 13097: Patch by tinus.Fix media change support for CDROMs. This fixes bug #471. Patch by tinus.

by ekohl＠svn.reactos.com

Patch by tinus.Fix media change support for CDROMs. This fixes bug #471. Patch by tinus. Modified: trunk/reactos/drivers/fs/cdfs/common.c Modified: trunk/reactos/drivers/fs/cdfs/create.c Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c Modified: trunk/reactos/drivers/storage/class2/class2.c _____ Modified: trunk/reactos/drivers/fs/cdfs/common.c --- trunk/reactos/drivers/fs/cdfs/common.c 2005-01-17 10:20:03 UTC (rev 13096) +++ trunk/reactos/drivers/fs/cdfs/common.c 2005-01-17 14:30:31 UTC (rev 13097) @@ -191,6 +191,19 @@ *OutputBufferSize = IoStatus.Information; } + if (Status == STATUS_VERIFY_REQUIRED) + { + PDEVICE_OBJECT DeviceToVerify; + NTSTATUS NewStatus; + + DPRINT1("STATUS_VERIFY_REQUIRED\n"); + DeviceToVerify = IoGetDeviceToVerify(PsGetCurrentThread()); + IoSetDeviceToVerify(PsGetCurrentThread(), NULL); + + NewStatus = IoVerifyVolume(DeviceToVerify, FALSE); + DPRINT1("IoVerifyVolume() retuned (Status %lx)\n", NewStatus); + } + DPRINT("Returning Status %x\n", Status); return Status; _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 10:20:03 UTC (rev 13096) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 14:30:31 UTC (rev 13097) @@ -140,29 +140,10 @@ 0, NULL, 0, - TRUE); + FALSE); DPRINT ("Status %lx\n", Status); - if (Status == STATUS_VERIFY_REQUIRED) + if (!NT_SUCCESS(Status)) { - PDEVICE_OBJECT DeviceToVerify; - - DPRINT1 ("Media change detected!\n"); - DPRINT1 ("Device %p\n", DeviceExt->VolumeDevice); - - DeviceToVerify = IoGetDeviceToVerify (PsGetCurrentThread ()); - IoSetDeviceToVerify (PsGetCurrentThread (), - NULL); - - Status = IoVerifyVolume (DeviceToVerify, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1 ("Status %lx\n", Status); - return Status; - } - } - else if (!NT_SUCCESS(Status)) - { DPRINT1 ("Status %lx\n", Status); return Status; } _____ Modified: trunk/reactos/drivers/fs/cdfs/fsctl.c --- trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-01-17 10:20:03 UTC (rev 13096) +++ trunk/reactos/drivers/fs/cdfs/fsctl.c 2005-01-17 14:30:31 UTC (rev 13097) @@ -345,6 +345,7 @@ goto ByeBye; NewDeviceObject->Flags = NewDeviceObject->Flags | DO_DIRECT_IO; + NewDeviceObject->Flags &= ~DO_VERIFY_VOLUME; DeviceExt = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(DeviceExt, sizeof(DEVICE_EXTENSION)); _____ Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c --- trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-01-17 10:20:03 UTC (rev 13096) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c 2005-01-17 14:30:31 UTC (rev 13097) @@ -134,7 +134,11 @@ CdromTimerRoutine(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); +VOID +CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context); + /* FUNCTIONS ****************************************************************/ /********************************************************************** @@ -1203,7 +1207,10 @@ Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; /* FIXME: Update drive capacity */ - + IoCompleteRequest (Irp, + IO_DISK_INCREMENT); + IoStartNextPacket (DeviceObject, + FALSE); return; } } @@ -1614,11 +1621,68 @@ VOID STDCALL -CdromTimerRoutine(PDEVICE_OBJECT DeviceObject, - PVOID Context) +CdromTimerRoutine(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) { + PIO_WORKITEM WorkItem; + DPRINT ("CdromTimerRoutine() called\n"); + WorkItem = IoAllocateWorkItem(DeviceObject); + if (!WorkItem) + { + return; + } + IoQueueWorkItem(WorkItem, + CdromWorkItem, + DelayedWorkQueue, + WorkItem); } + +VOID +CdromWorkItem(IN PDEVICE_OBJECT DeviceObject, + IN PVOID Context) +{ + PIRP Irp; + KEVENT Event; + IO_STATUS_BLOCK IoStatus; + NTSTATUS Status; + + DPRINT("CdromWorkItem() called\n"); + + IoFreeWorkItem((PIO_WORKITEM) Context); + + KeInitializeEvent(&Event, + NotificationEvent, + FALSE); + + Irp = IoBuildDeviceIoControlRequest(IOCTL_CDROM_CHECK_VERIFY, + DeviceObject, + NULL, + 0, + NULL, + 0, + FALSE, + &Event, + &IoStatus); + if (Irp == NULL) + { + DPRINT("IoBuildDeviceIoControlRequest failed\n"); + return; + } + + Status = IoCallDriver(DeviceObject, Irp); + DPRINT("Status: %x\n", Status); + + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, + Suspended, + KernelMode, + FALSE, + NULL); + } +} + /* EOF */ _____ Modified: trunk/reactos/drivers/storage/class2/class2.c --- trunk/reactos/drivers/storage/class2/class2.c 2005-01-17 10:20:03 UTC (rev 13096) +++ trunk/reactos/drivers/storage/class2/class2.c 2005-01-17 14:30:31 UTC (rev 13097) @@ -1027,6 +1027,46 @@ /* + * Implements part of the directives on: + * http://msdn.microsoft.com/library/default.asp?url=/library/en-us/kmarch/ hh/kmarch/other_c694d732-fa95-4841-8d61-2a55ee787905.xml.asp + */ +static VOID +ScsiClassInvalidateMedia(IN PDEVICE_OBJECT DeviceObject, + OUT NTSTATUS *Status) +{ + PDEVICE_EXTENSION DeviceExtension; + PDEVICE_EXTENSION PhysicalExtension; + + DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + PhysicalExtension = (PDEVICE_EXTENSION)DeviceExtension->PhysicalDevice->DeviceExtension; + + if (DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) + { + DPRINT("Invalidate: test char yields TRUE\n"); + } + else + { + DPRINT("Invalidate: test char yields FALSE\n"); + } + + if ((DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) && + (DeviceObject->Vpb->Flags & VPB_MOUNTED)) + { + DPRINT("Set DO_VERIFY_VOLUME\n"); + DeviceObject->Flags |= DO_VERIFY_VOLUME; + *Status = STATUS_VERIFY_REQUIRED; + } + else + { + *Status = STATUS_IO_DEVICE_ERROR; + } + + /* Increment the media change count */ + PhysicalExtension->MediaChangeCount++; +} + + +/* * @implemented */ BOOLEAN STDCALL @@ -1106,9 +1146,12 @@ case SCSI_ADSENSE_NO_MEDIA_IN_DEVICE: DPRINT("SCSI_ADSENSE_NO_MEDIA_IN_DEVICE\n"); - *Status = STATUS_NO_MEDIA_IN_DEVICE; + ScsiClassInvalidateMedia(DeviceObject, + Status); + + *Status = STATUS_NO_MEDIA_IN_DEVICE; Retry = FALSE; - + if((DeviceExtension->MediaChangeEvent != NULL) && (!DeviceExtension->MediaChangeEvent)) { @@ -1200,22 +1243,9 @@ break; } - if ((DeviceObject->Characteristics & FILE_REMOVABLE_MEDIA) && - (DeviceObject->Vpb->Flags & VPB_MOUNTED)) - { - DPRINT("SCSI_SENSE_UNIT_ATTENTION set DoVerifyVol\n"); - - DeviceObject->Flags |= DO_VERIFY_VOLUME; - *Status = STATUS_VERIFY_REQUIRED; - Retry = FALSE; - } - else - { - *Status = STATUS_IO_DEVICE_ERROR; - } - - /* Increment the media change count */ - PhysicalExtension->MediaChangeCount++; + ScsiClassInvalidateMedia(DeviceObject, + Status); + Retry = FALSE; break; case SCSI_SENSE_DATA_PROTECT:

19 years, 10 months

[ekohl] 13096: Enable CdfsOpenFile() to open a file using a relative filename. This fixes bug #477. Patch by tinus.

by ekohl＠svn.reactos.com

Enable CdfsOpenFile() to open a file using a relative filename. This fixes bug #477. Patch by tinus. Modified: trunk/reactos/drivers/fs/cdfs/create.c _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 10:16:17 UTC (rev 13095) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 10:20:03 UTC (rev 13096) @@ -132,10 +132,6 @@ } FileName = &AbsFileName; - - RtlFreeUnicodeString(&AbsFileName); - - return STATUS_UNSUCCESSFUL; } Status = CdfsDeviceIoControl (DeviceExt->StorageDevice,

19 years, 10 months

[ekohl] 13095: Remove obsolete code.

by ekohl＠svn.reactos.com

Remove obsolete code. Modified: trunk/reactos/drivers/fs/cdfs/create.c _____ Modified: trunk/reactos/drivers/fs/cdfs/create.c --- trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 09:50:10 UTC (rev 13094) +++ trunk/reactos/drivers/fs/cdfs/create.c 2005-01-17 10:16:17 UTC (rev 13095) @@ -44,7 +44,6 @@ PUNICODE_STRING AbsoluteFileName) { ULONG Length; -// PWSTR rcName; PFCB Fcb; NTSTATUS Status; @@ -65,42 +64,29 @@ sizeof(WCHAR) + RelativeFileName->Length + sizeof(WCHAR); -// ASSERT(wcslen (Fcb->PathName) + 1 + wcslen (pRelativeFileName) + 1 -// <= MAX_PATH); -// rcName = ExAllocatePool(NonPagedPool, MAX_PATH * sizeof(WCHAR)); -// if (!rcName) -// { -// return(STATUS_INSUFFICIENT_RESOURCES); -// } AbsoluteFileName->Length = 0; AbsoluteFileName->MaximumLength = Length; AbsoluteFileName->Buffer = ExAllocatePool(NonPagedPool, Length); if (AbsoluteFileName->Buffer == NULL) { -CHECKPOINT1; return STATUS_INSUFFICIENT_RESOURCES; } - -// wcscpy(rcName, Fcb->PathName); Status = RtlAppendUnicodeToString(AbsoluteFileName, Fcb->PathName); if (!NT_SUCCESS(Status)) { -CHECKPOINT1; RtlFreeUnicodeString(AbsoluteFileName); return Status; } if (!CdfsFCBIsRoot(Fcb)) { -// wcscat (rcName, L"\\"); Status = RtlAppendUnicodeToString(AbsoluteFileName, L"\\"); if (!NT_SUCCESS(Status)) { -CHECKPOINT1; RtlFreeUnicodeString(AbsoluteFileName); return Status; } @@ -110,14 +96,10 @@ RelativeFileName); if (!NT_SUCCESS(Status)) { -CHECKPOINT1; RtlFreeUnicodeString(AbsoluteFileName); return Status; } -// wcscat (rcName, pRelativeFileName); -// *pAbsoluteFilename = rcName; - return STATUS_SUCCESS; }

19 years, 10 months

← Newer
1
...
25
26
27
28
29
30
31
...
71
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 January 2005