Ros-diffs February 2005

ros-diffs@reactos.org

23 participants
411 discussions

[weiden] 13576: 1. a few previous mode fixes

by weiden＠svn.reactos.com

1. a few previous mode fixes 2. implemented NtSetDefaultHardErrorPort() with help of pseudo code from windowsitlibrary.com Modified: trunk/reactos/ntoskrnl/ke/alert.c Modified: trunk/reactos/ntoskrnl/ke/apc.c Modified: trunk/reactos/ntoskrnl/ke/error.c _____ Modified: trunk/reactos/ntoskrnl/ke/alert.c --- trunk/reactos/ntoskrnl/ke/alert.c 2005-02-14 18:45:17 UTC (rev 13575) +++ trunk/reactos/ntoskrnl/ke/alert.c 2005-02-14 21:00:05 UTC (rev 13576) @@ -107,13 +107,16 @@ NTSTATUS STDCALL NtAlertThread (IN HANDLE ThreadHandle) { + KPROCESSOR_MODE PreviousMode; PETHREAD Thread; NTSTATUS Status; + + PreviousMode = ExGetPreviousMode(); Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_SUSPEND_RESUME, PsThreadType, - ExGetPreviousMode(), + PreviousMode, (PVOID*)&Thread, NULL); if (!NT_SUCCESS(Status)) @@ -125,7 +128,7 @@ * ZwAlertThread was called? * -Gunnar */ - KeAlertThread((PKTHREAD)Thread, UserMode); + KeAlertThread((PKTHREAD)Thread, PreviousMode); ObDereferenceObject(Thread); return(STATUS_SUCCESS); _____ Modified: trunk/reactos/ntoskrnl/ke/apc.c --- trunk/reactos/ntoskrnl/ke/apc.c 2005-02-14 18:45:17 UTC (rev 13575) +++ trunk/reactos/ntoskrnl/ke/apc.c 2005-02-14 21:00:05 UTC (rev 13576) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -517,13 +517,16 @@ PKAPC Apc; PETHREAD Thread; + KPROCESSOR_MODE PreviousMode; NTSTATUS Status; + + PreviousMode = ExGetPreviousMode(); /* Get ETHREAD from Handle */ Status = ObReferenceObjectByHandle(ThreadHandle, THREAD_SET_CONTEXT, PsThreadType, - KeGetPreviousMode(), + PreviousMode, (PVOID)&Thread, NULL); @@ -552,7 +555,7 @@ KiFreeApcRoutine, NULL, ApcRoutine, - UserMode, + PreviousMode, NormalContext); if (!KeInsertQueueApc(Apc, SystemArgument1, SystemArgument2, IO_NO_INCREMENT)) { Status = STATUS_UNSUCCESSFUL; _____ Modified: trunk/reactos/ntoskrnl/ke/error.c --- trunk/reactos/ntoskrnl/ke/error.c 2005-02-14 18:45:17 UTC (rev 13575) +++ trunk/reactos/ntoskrnl/ke/error.c 2005-02-14 21:00:05 UTC (rev 13576) @@ -1,4 +1,4 @@ -/* $Id:$ +/* $Id$ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -15,6 +15,10 @@ /* FUNCTIONS ***************************************************************/ +BOOLEAN ExReadyForErrors = FALSE; +PEPORT ExpDefaultErrorPort = NULL; +PEPROCESS ExpDefaultErrorPortProcess = NULL; + /* * @unimplemented */ @@ -54,8 +58,41 @@ NTSTATUS STDCALL NtSetDefaultHardErrorPort(IN HANDLE PortHandle) { - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); + KPROCESSOR_MODE PreviousMode; + NTSTATUS Status; + + PreviousMode = ExGetPreviousMode(); + + if(!SeSinglePrivilegeCheck(SeTcbPrivilege, + PreviousMode)) + { + DPRINT1("NtSetDefaultHardErrorPort: Caller requires the SeTcbPrivilege privilege!\n"); + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* serialization shouldn't be required here as it usually is just called once + during startup */ + + if(!ExReadyForErrors) + { + Status = ObReferenceObjectByHandle(PortHandle, + 0, + LpcPortObjectType, + PreviousMode, + (PVOID*)&ExpDefaultErrorPort, + NULL); + if(NT_SUCCESS(Status)) + { + ExpDefaultErrorPortProcess = PsGetCurrentProcess(); + ExReadyForErrors = TRUE; + } + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + + return Status; } /* EOF */

19 years, 10 months

[gvg] 13575: Tag Wine-20050211

by gvg＠svn.reactos.com

Tag Wine-20050211 Added: vendor/wine/tools/winebuild/Wine-20050211/ _____ Copied: vendor/wine/tools/winebuild/Wine-20050211 (from rev 13565, vendor/wine/tools/winebuild/current)

19 years, 10 months

[gvg] 13574: SVN maintenance

by gvg＠svn.reactos.com

SVN maintenance Property changes on: trunk/reactos/tools/winebuild ___________________________________________________________________ Name: svn:ignore + *.o *.exe winebuild

19 years, 10 months

[gvg] 13573: Sync to Wine-20050211

by gvg＠svn.reactos.com

Sync to Wine-20050211 Added: trunk/reactos/tools/winebuild/ Deleted: trunk/reactos/tools/winebuild/CVS/ Added: trunk/reactos/tools/winebuild/Makefile Modified: trunk/reactos/tools/winebuild/build.h Modified: trunk/reactos/tools/winebuild/import.c Modified: trunk/reactos/tools/winebuild/main.c Added: trunk/reactos/tools/winebuild/mkstemps.c Modified: trunk/reactos/tools/winebuild/parser.c Modified: trunk/reactos/tools/winebuild/relay.c Modified: trunk/reactos/tools/winebuild/res16.c Modified: trunk/reactos/tools/winebuild/res32.c Modified: trunk/reactos/tools/winebuild/spec16.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/winebuild/winebuild.man.in Added: trunk/reactos/tools/winebuild/winglue.h _____ Copied: trunk/reactos/tools/winebuild (from rev 13572, vendor/wine/tools/winebuild/current) _____ Added: trunk/reactos/tools/winebuild/Makefile --- vendor/wine/tools/winebuild/current/Makefile 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/Makefile 2005-02-14 18:39:15 UTC (rev 13573) @@ -0,0 +1,43 @@ +# +# winebuild +# +PATH_TO_TOP = ../.. + +include $(PATH_TO_TOP)/rules.mak + +TARGET = winebuild$(EXE_POSTFIX) + +all: $(TARGET) + +# relay.o spec16.o +OBJECTS = \ + import.o \ + main.o \ + parser.o \ + res16.o \ + res32.o \ + spec32.o \ + utils.o \ + mkstemps.o + +CLEAN_FILES = *.o $(TARGET) + +HOST_CFLAGS = -D__USE_W32API -I$(PATH_TO_TOP)/include/wine + +%.o: %.c + $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ + +$(TARGET): $(OBJECTS) + $(HOST_CC) $(OBJECTS) -o $(TARGET) + +ifeq ($(HOST),mingw32-linux) +clean: + rm -f $(CLEAN_FILES) +endif +ifneq ($(HOST),mingw32-linux) +clean: + del $(CLEAN_FILES) +endif + +.PHONY: clean + Property changes on: trunk/reactos/tools/winebuild/Makefile ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/winebuild/build.h --- vendor/wine/tools/winebuild/current/build.h 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/build.h 2005-02-14 18:39:15 UTC (rev 13573) @@ -185,6 +185,7 @@ extern void BuildSpec32File( FILE *outfile, DLLSPEC *spec ); extern void BuildDef32File( FILE *outfile, DLLSPEC *spec ); extern void BuildDebugFile( FILE *outfile, const char *srcdir, char **argv ); +extern void BuildPedllFile( FILE *outfile, DLLSPEC *spec ); extern int parse_spec_file( FILE *file, DLLSPEC *spec ); extern int parse_def_file( FILE *file, DLLSPEC *spec ); _____ Modified: trunk/reactos/tools/winebuild/import.c --- vendor/wine/tools/winebuild/current/import.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/import.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -20,7 +20,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <fcntl.h> @@ -31,8 +30,7 @@ # include <unistd.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" struct import _____ Modified: trunk/reactos/tools/winebuild/main.c --- vendor/wine/tools/winebuild/current/main.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/main.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdio.h> @@ -36,8 +35,7 @@ # include <getopt.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int UsePIC = 0; @@ -78,7 +76,8 @@ MODE_DEF, MODE_DEBUG, MODE_RELAY16, - MODE_RELAY32 + MODE_RELAY32, + MODE_PEDLL }; static enum exec_mode_values exec_mode = MODE_NONE; @@ -170,7 +169,8 @@ " --exe=NAME Build a .c file for the named executable\n" " --debug [FILES] Build a .c file with the debug channels declarations\n" " --relay16 Build the 16-bit relay assembly routines\n" -" --relay32 Build the 32-bit relay assembly routines\n\n" +" --relay32 Build the 32-bit relay assembly routines\n" +" --pedll Build a .c file for PE dll\n\n" "The mode options are mutually exclusive; you must specify one and only one.\n\n"; enum long_options_values @@ -184,7 +184,8 @@ LONG_OPT_RELAY16, LONG_OPT_RELAY32, LONG_OPT_SUBSYSTEM, - LONG_OPT_VERSION + LONG_OPT_VERSION, + LONG_OPT_PEDLL }; static const char short_options[] = "C:D:F:H:I:K:L:M:N:d:e:f:hi:kl:m:o:r:w"; @@ -201,6 +202,7 @@ { "relay32", 0, 0, LONG_OPT_RELAY32 }, { "subsystem",1, 0, LONG_OPT_SUBSYSTEM }, { "version", 0, 0, LONG_OPT_VERSION }, + { "pedll", 1, 0, LONG_OPT_PEDLL }, /* aliases for short options */ { "source-dir", 1, 0, 'C' }, { "delay-lib", 1, 0, 'd' }, @@ -362,6 +364,11 @@ case LONG_OPT_VERSION: printf( "winebuild version " PACKAGE_VERSION "\n" ); exit(0); + case LONG_OPT_PEDLL: + set_exec_mode( MODE_PEDLL ); + spec_file_name = xstrdup( optarg ); + set_dll_file_name( optarg, spec ); + break; case '?': usage(1); break; @@ -439,9 +446,7 @@ switch (spec->type) { case SPEC_WIN16: - if (argv[0]) - fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildSpec16File( output_file, spec ); + fatal_error( "Win16 specs are not supported in ReactOS version of winebuild\n" ); break; case SPEC_WIN32: read_undef_symbols( argv ); @@ -466,12 +471,15 @@ BuildDebugFile( output_file, current_src_dir, argv ); break; case MODE_RELAY16: - if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays16( output_file ); + fatal_error( "Win16 relays are not supported in ReactOS version of winebuild\n" ); break; case MODE_RELAY32: + fatal_error( "Win32 relays are not supported in ReactOS version of winebuild\n" ); + break; + case MODE_PEDLL: if (argv[0]) fatal_error( "file argument '%s' not allowed in this mode\n", argv[0] ); - BuildRelays32( output_file ); + if (!parse_input_file( spec )) break; + BuildPedllFile( output_file, spec ); break; default: usage(1); _____ Added: trunk/reactos/tools/winebuild/mkstemps.c --- vendor/wine/tools/winebuild/current/mkstemps.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/mkstemps.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -0,0 +1,138 @@ +/* Copyright (C) 1991, 1992, 1996, 1998 Free Software Foundation, Inc. + This file is derived from mkstemp.c from the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include "config.h" + +#include <sys/types.h> +#include <stdlib.h> +#include <string.h> +#include <errno.h> +#include <stdio.h> +#include <fcntl.h> +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif +#ifdef HAVE_SYS_TIME_H +#include <sys/time.h> +#endif +#ifdef HAVE_PROCESS_H +#include <process.h> +#endif + +/* We need to provide a type for gcc_uint64_t. */ +#ifdef __GNUC__ +__extension__ typedef unsigned long long gcc_uint64_t; +#else +typedef unsigned long gcc_uint64_t; +#endif + +#ifndef TMP_MAX +#define TMP_MAX 16384 +#endif + +/* + +@deftypefn Replacement int mkstemps (char *@var{template}, int @var{suffix_len}) + +Generate a unique temporary file name from @var{template}. +@var{template} has the form: + +@example + @var{path}/ccXXXXXX@var{suffix} +@end example + +@var{suffix_len} tells us how long @var{suffix} is (it can be zero +length). The last six characters of @var{template} before @var{suffix} +must be @samp{XXXXXX}; they are replaced with a string that makes the +filename unique. Returns a file descriptor open on the file for +reading and writing. + +@end deftypefn + +*/ + +int +mkstemps ( + char *template, + int suffix_len) +{ + static const char letters[] + = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; + static gcc_uint64_t value; +#ifdef HAVE_GETTIMEOFDAY + struct timeval tv; +#endif + char *XXXXXX; + size_t len; + int count; + + len = strlen (template); + + if ((int) len < 6 + suffix_len + || strncmp (&template[len - 6 - suffix_len], "XXXXXX", 6)) + { + return -1; + } + + XXXXXX = &template[len - 6 - suffix_len]; + +#ifdef HAVE_GETTIMEOFDAY + /* Get some more or less random data. */ + gettimeofday (&tv, NULL); + value += ((gcc_uint64_t) tv.tv_usec << 16) ^ tv.tv_sec ^ getpid (); +#else + value += getpid (); +#endif + + for (count = 0; count < TMP_MAX; ++count) + { + gcc_uint64_t v = value; + int fd; + + /* Fill in the random bits. */ + XXXXXX[0] = letters[v % 62]; + v /= 62; + XXXXXX[1] = letters[v % 62]; + v /= 62; + XXXXXX[2] = letters[v % 62]; + v /= 62; + XXXXXX[3] = letters[v % 62]; + v /= 62; + XXXXXX[4] = letters[v % 62]; + v /= 62; + XXXXXX[5] = letters[v % 62]; + +#ifdef VMS + fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600, "fop=tmd"); +#else + fd = open (template, O_RDWR|O_CREAT|O_EXCL, 0600); +#endif + if (fd >= 0) + /* The file does not exist. */ + return fd; + + /* This is a random value. It is only necessary that the next + TMP_MAX values generated by adding 7777 to VALUE are different + with (module 2^32). */ + value += 7777; + } + + /* We return the null string if we can't find a unique file name. */ + template[0] = '\0'; + return -1; +} Property changes on: trunk/reactos/tools/winebuild/mkstemps.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/winebuild/parser.c --- vendor/wine/tools/winebuild/current/parser.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/parser.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> @@ -32,8 +31,7 @@ #include <stdlib.h> #include <string.h> -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" int current_line = 0; _____ Modified: trunk/reactos/tools/winebuild/relay.c --- vendor/wine/tools/winebuild/current/relay.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/relay.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/res16.c --- vendor/wine/tools/winebuild/current/res16.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/res16.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdlib.h> @@ -37,8 +36,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" #define ALIGNMENT 2 /* alignment for resource data */ _____ Modified: trunk/reactos/tools/winebuild/res32.c --- vendor/wine/tools/winebuild/current/res32.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/res32.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -19,7 +19,6 @@ */ #include "config.h" -#include "wine/port.h" #include <ctype.h> #include <stdlib.h> @@ -37,8 +36,7 @@ #include <sys/mman.h> #endif -#include "windef.h" -#include "winbase.h" +#include "winglue.h" #include "build.h" /* Unicode string or integer id */ _____ Modified: trunk/reactos/tools/winebuild/spec16.c --- vendor/wine/tools/winebuild/current/spec16.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/spec16.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -23,7 +23,6 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> _____ Modified: trunk/reactos/tools/winebuild/spec32.c --- vendor/wine/tools/winebuild/current/spec32.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/spec32.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -23,16 +23,17 @@ */ #include "config.h" -#include "wine/port.h" #include <assert.h> #include <ctype.h> #include <stdarg.h> #include <string.h> -#include "windef.h" -#include "winbase.h" -#include "wine/exception.h" +#include "winglue.h" + +#define EXCEPTION_WINE_STUB 0x80000100 /* stub entry point called */ +#define EH_NONCONTINUABLE 0x01 + #include "build.h" @@ -860,12 +861,10 @@ int is_data = 0; if (!odp) continue; - if (odp->flags & FLAG_REGISTER) continue; - if (odp->type == TYPE_STUB) continue; - if (odp->name) name = odp->name; + else if (odp->type == TYPE_STUB) name = make_internal_name( odp, spec, "stub" ); else if (odp->export_name) name = odp->export_name; - else continue; + else name = make_internal_name( odp, spec, "noname_export" ); fprintf(outfile, " %s", name); @@ -895,13 +894,42 @@ } break; } + case TYPE_STUB: + { + if (!kill_at) + { + const char *check = name + strlen(name); + while (name != check && + '0' <= check[-1] && check[-1] <= '9') + { + check--; + } + if (name != check && check != name + strlen(name) && + '@' == check[-1]) + { + fprintf(outfile, "%s", check - 1); + } + } + if (NULL != odp->name) + { + fprintf(outfile, "=%s", make_internal_name( odp, spec, "stub" )); + } + break; + } default: assert(0); } fprintf( outfile, " @%d", odp->ordinal ); +#if 0 /* MinGW binutils cannot handle this correctly */ if (!odp->name) fprintf( outfile, " NONAME" ); +#else + if (!odp->name && (odp->type == TYPE_STUB || odp->export_name)) fprintf( outfile, " NONAME" ); +#endif if (is_data) fprintf( outfile, " DATA" ); +#if 0 + /* MinGW binutils cannot handle this correctly */ if (odp->flags & FLAG_PRIVATE) fprintf( outfile, " PRIVATE" ); +#endif fprintf( outfile, "\n" ); } } @@ -1006,3 +1034,24 @@ free( prefix ); } + + +/******************************************************************* + * BuildPedllFile + * + * Build a PE DLL C file from a spec file. + */ +void BuildPedllFile( FILE *outfile, DLLSPEC *spec ) +{ + int nr_exports; + + nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0; + output_standard_file_header( outfile ); + + if (nr_exports) + { + /* Output the stub functions */ + + output_stub_funcs( outfile, spec ); + } +} _____ Modified: trunk/reactos/tools/winebuild/utils.c --- vendor/wine/tools/winebuild/current/utils.c 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/utils.c 2005-02-14 18:39:15 UTC (rev 13573) @@ -19,8 +19,11 @@ */ #include "config.h" -#include "wine/port.h" +#if !defined(WIN32) +#undef strdup +#endif + #include <ctype.h> #include <stdarg.h> #include <stdio.h> _____ Modified: trunk/reactos/tools/winebuild/winebuild.man.in --- vendor/wine/tools/winebuild/current/winebuild.man.in 2005-02-14 18:36:46 UTC (rev 13572) +++ trunk/reactos/tools/winebuild/winebuild.man.in 2005-02-14 18:39:15 UTC (rev 13573) @@ -1,434 +1,434 @@ -.\" -*- nroff -*- -.TH WINEBUILD 1 "March 2003" "@PACKAGE_STRING@" "Wine dll builder" -.SH NAME -winebuild \- Wine dll builder -.SH SYNOPSIS -.BI winebuild\ [options]\ [input\ files] -.SH DESCRIPTION -.B winebuild -generates the C and assembly files that are necessary to build a Wine -dll, which is basically a Win32 dll encapsulated inside a Unix -library. -.PP -.B winebuild -has different modes, depending on what kind of file it is asked to -generate. The mode is specified by one of the mode options specified -below. In addition to the mode option, various other command-line -option can be specified, as described in the \fBOPTIONS\fR section. -.SH "MODE OPTIONS" -You have to specify exactly one of the following options, depending on -what you want winebuild to generate. -.TP -.BI \--dll= filename -Build a C file from a .spec file (see \fBSPEC FILE SYNTAX\fR for -details), or from a standard Windows .def file. The resulting C file -must be compiled and linked to the other object files to build a -working Wine dll. -.br -In that mode, the -.I input files -should be the list of all object files that will be linked into the -final dll, to allow -.B winebuild -to get the list of all undefined symbols that need to be imported from -other dlls. -.TP -.BI \--exe= name -Build a C file for the named executable. This is basically the same as -the --dll mode except that it doesn't require a .spec file as input, -since an executable doesn't export functions. The resulting C file -must be compiled and linked to the other object files to build a -working Wine executable, and all the other object files must be listed -as -.I input files. -.TP -.BI \--def= file.spec -Build a .def file from a spec file. This is used when building dlls -with a PE (Win32) compiler. -.TP -.B \--debug -Build a C file containing the definitions for debugging channels. In -that mode the -.I input files -should be a list of C files to search for debug channel -definitions. The resulting C file must be compiled and linked with the -dll. -.TP -.B \--relay16 -Generate the assembly code for the 16-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.TP -.B \--relay32 -Generate the assembly code for the 32-bit relay routines. This is for -Wine internal usage only, you should never need to use this option. -.SH OPTIONS -.TP -.BI \-C,\ --source-dir= directory -Change to the specified directory before reading source files. Only -meaningful in -.BR \--debug\ mode. -.TP -.BI \-D\ symbol -Ignored for compatibility with the C compiler. -.TP -.BI \-e,\ --entry= function -Specify the module entry point function; if not specified, the default -is -.B DllMain -for dlls, and -.B WinMain -for executables (if -.B WinMain -is not defined, the standard C -.B main -is used instead). This is only valid for Win32 modules. -.TP -.BI \-f\ flags -Ignored for compatibility with the C compiler. -.TP -.BI \-F,\ --filename= filename -Set the file name of the module. The default is to use the base name -of the spec file (without any extension). -.TP -.B \-h, --help -Display a usage message and exit. -.TP -.BI \-H,\ --heap= size -Specify the size of the module local heap in bytes (only valid for -Win16 modules); default is no local heap. -.TP -.BI \-i,\ --ignore= [-]symbol[,[-]symbol] -Specify a list of symbols that should be ignored when resolving -undefined symbols against the imported libraries. This forces these -symbols to be resolved from the Unix C library (or from another Unix -library linked with the application). If a symbol is prefixed by '-' -it is removed from the list instead of being added; a stand-alone '-' -clears the whole list. -.TP -.BI \-I\ directory -Ignored for compatibility with the C compiler. -.TP -.B \-k, --kill-at -Remove the stdcall decorations from the symbol names in the -generated .def file. Only meaningful in \fB--def\fR mode. -.TP -.BI \-K\ flags -Ignored for compatibility with the C compiler. -.TP -.BI \--ld-cmd= ld-command -Specify the command to use to link the object files; the default is -\fBld\fR. -.TP -.BI \--nm-cmd= nm-command -Specify the command to use to get the list of undefined symbols; the -default is \fBnm\fR. -.TP -.BI \-L,\ --library-path= directory -Append the specified directory to the list of directories that are -searched for import libraries. -.TP -.BI \-l,\ --library= name -Import the specified library, looking for a corresponding -\fIlibname.def\fR file in the directories specified with the \fB-L\fR -option. -.TP -.BI \-d,\ --delay-lib= name -Same as the \fB-l\fR option, but import the specified library in -delayed mode (i.e. the library won't be loaded until a function -imported from it is actually called). -.TP -.BI \-M,\ --main-module= module -Specify that we are building a 16-bit dll, that will ultimately be -linked together with the 32-bit dll specified in \fImodule\fR. Only -meaningful in \fB--dll\fR mode. -.TP -.BI \-N,\ --dll-name= dllname -Set the internal name of the module. It is only used in Win16 -modules. The default is to use the base name of the spec file (without -any extension). This is used for KERNEL, since it lives in -KRNL386.EXE. It shouldn't be needed otherwise. -.TP -.BI \-o,\ --output= file -Set the name of the output file (default is standard output). -.TP -.BI \-r,\ --res= rsrc.res -Load resources from the specified binary resource file. The -\fIrsrc.res\fR can be produced from a source resource file with -.BR wrc(1) -(or with a Windows resource compiler). -.br -This option is only necessary for Win16 resource files, the Win32 ones -can simply listed as -.I input files -and will automatically be handled correctly (though the -.B \-r -option will also work for Win32 files). -.TP -.BI --subsystem= subsystem[:major[.minor]] -Set the subsystem of the executable, which can be one of the following: -.br -.B console -for a command line executable, -.br -.B windows -for a graphical executable, -.br -.B native -for a native-mode dll. -.br -The entry point of a command line executable is a normal C \fBmain\fR -function. A \fBwmain\fR function can be used instead if you need the -argument array to use Unicode strings. A graphical executable has a -\fBWinMain\fR entry point. -.br -Optionally a major and minor subsystem version can also be specified; -the default subsystem version is 4.0. -.TP -.B \--version -Display the program version and exit. -.TP -.B \-w, --warnings -Turn on warnings. -.SH "SPEC FILE SYNTAX" -.SS "General syntax" -A spec file should contain a list of ordinal declarations. The general -syntax is the following: -.PP -.I ordinal functype -.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] -.br -.IB ordinal\ variable -.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) -.br -.IB ordinal\ extern -.RI [ flags ]\ exportname \ [ symbolname ] -.br -.IB ordinal\ stub -.RI [ flags ]\ exportname -.br -.IB ordinal\ equate -.RI [ flags ]\ exportname\ data -.br -.BI #\ comments -.PP -Declarations must fit on a single line, except if the end of line is -escaped using a backslash character. The -.B # -character anywhere in a line causes the rest of the line to be ignored -as a comment. -.PP -.I ordinal -specifies the ordinal number corresponding to the entry point, or '@' -for automatic ordinal allocation (Win32 only). -.PP -.I flags -is a series of optional flags, preceded by a '-' character. The -supported flags are: -.RS -.TP -.B -norelay -The entry point is not displayed in relay debugging traces (Win32 -only). -.TP -.B -noname -The entry point will be imported by ordinal instead of by name. -.TP -.B -ret16 -The function returns a 16-bit value (Win16 only). -.TP -.B -ret64 -The function returns a 64-bit value (Win32 only). -.TP -.B -i386 -The entry point is only available on i386 platforms. -.TP -.B -register -The function uses CPU register to pass arguments. -.TP -.B -private -The function cannot be imported from other dlls, it can only be -accessed through GetProcAddress. -.SS "Function ordinals" -Syntax: -.br -.I ordinal functype -.RI [ flags ]\ exportname \ \fB(\fR\ [ args... ] \ \fB) \ [ handler ] -.br - -This declaration defines a function entry point. The prototype defined by -.IR exportname \ \fB(\fR\ [ args... ] \ \fB) -specifies the name available for dynamic linking and the format of the -arguments. '@' can be used instead of -.I exportname -for ordinal-only exports. -.PP -.I functype -should be one of: -.RS -.TP -.B stdcall -for a normal Win32 function -.TP -.B pascal -for a normal Win16 function -.TP -.B cdecl -for a Win16 or Win32 function using the C calling convention -.TP -.B varargs -for a Win16 or Win32 function using the C calling convention with a -variable number of arguments -.RE -.PP -.I args -should be one or several of: -.RS -.TP -.B word -(16-bit unsigned value) -.TP -.B s_word -(16-bit signed word) -.TP -.B long -(32-bit value) -.TP -.B double -(64-bit value) -.TP -.B ptr -(linear pointer) -.TP -.B str -(linear pointer to a null-terminated ASCII string) -.TP -.B wstr -(linear pointer to a null-terminated Unicode string) -.TP -.B segptr -(segmented pointer) -.TP -.B segstr -(segmented pointer to a null-terminated ASCII string). -.HP -.RB Only\ ptr ,\ str ,\ wstr ,\ long\ and\ double -are valid for Win32 functions. -.RE -.PP -.I handler -is the name of the actual C function that will implement that entry -point in 32-bit mode. The handler can also be specified as -.IB dllname . function -to define a forwarded function (one whose implementation is in another -dll). If -.I handler -is not specified, it is assumed to be identical to -.I exportname. -.PP -This first example defines an entry point for the 32-bit GetFocus() -call: -.IP -@ stdcall GetFocus() GetFocus -.PP -This second example defines an entry point for the 16-bit -CreateWindow() call (the ordinal 100 is just an example); it also -shows how long lines can be split using a backslash: -.IP -100 pascal CreateWindow(ptr ptr long s_word s_word s_word \\ - s_word word word word ptr) WIN_CreateWindow -.PP -To declare a function using a variable number of arguments, specify -the function as -.B varargs -and declare it in the C file with a '...' parameter for a Win32 -function, or with an extra VA_LIST16 argument for a Win16 function. -See the wsprintf* functions in user.exe.spec and user32.spec for an -example. -.SS "Variable ordinals" -Syntax: -.br -.IB ordinal\ variable -.RI [ flags ]\ exportname \ \fB(\fR\ [ data... ] \ \fB) -.PP -This declaration defines data storage as 32-bit words at the ordinal -specified. -.I exportname -will be the name available for dynamic -linking. -.I data -can be a decimal number or a hex number preceeded by "0x". The -following example defines the variable VariableA at ordinal 2 and -containing 4 ints: -.IP -2 variable VariableA(-1 0xff 0 0) -.PP -This declaration only works in Win16 spec files. In Win32 you should -use -.B extern -instead (see below). -.SS "Extern ordinals" -Syntax: -.br -.IB ordinal\ extern -.RI [ flags ]\ exportname \ [ symbolname ] -.PP -This declaration defines an entry that simply maps to a C symbol -(variable or function). It only works in Win32 spec files. -.I exportname -will point to the symbol -.I symbolname -that must be defined in the C code. Alternatively, it can be of the -form -.IB dllname . symbolname -to define a forwarded symbol (one whose implementation is in another -dll). If -.I symbolname -is not specified, it is assumed to be identical to -.I exportname. -.SS "Stub ordinals" -Syntax: -.br -.IB ordinal\ stub -.RI [ flags ]\ exportname -.PP -This declaration defines a stub function. It makes the name and -ordinal available for dynamic linking, but will terminate execution -with an error message if the function is ever called. -.SS "Equate ordinals" -Syntax: -.br -.IB ordinal\ equate -.RI [ flags ]\ exportname\ data -.PP -This declaration defines an ordinal as an absolute value. -.I exportname -will be the name available for dynamic linking. -.I data -can be a decimal number or a hex number preceeded by "0x". -.SH AUTHORS -.B winebuild -has been worked on by many people over the years. The main authors are -Robert J. Amstadt, Alexandre Julliard, Martin von Loewis, Ulrich -Weigand and Eric Youngdale. Many other Wine developers have -contributed, please check the file Changelog in the Wine distribution -for the complete details. -.SH BUGS -It is not yet possible to use a PE-format dll in an import -specification; only Wine dlls can be imported. -.PP -If you find a bug, please submit a bug report at -.UR http://bugs.winehq.org -.B http://bugs.winehq.org. -.UE -.SH AVAILABILITY -.B winebuild -is part of the wine distribution, which is available through WineHQ, -the -.B wine -development headquarters, at -.UR http://www.winehq.org/ -.B http://www.winehq.org/. -.UE -.SH "SEE ALSO" -.BR wine (1), -.BR wrc (1). +.\" -*- nroff -*- +.TH WINEBUILD 1 "March 2003" "@PACKAGE_STRING@" "Wine dll builder" +.SH NAME +winebuild \- Wine dll builder +.SH SYNOPSIS [truncated at 1000 lines; 471 more skipped]

19 years, 10 months

[gvg] 13572: Delete old version in preparation of vendor drop

by gvg＠svn.reactos.com

Delete old version in preparation of vendor drop Deleted: trunk/reactos/tools/winebuild/

19 years, 10 months

[hbirr] 13571: - Ported 13554, 13556, 13566 and 13568 (recent changes within the timer implementation) from trunk.

by hbirr＠svn.reactos.com

- Ported 13554, 13556, 13566 and 13568 (recent changes within the timer implementation) from trunk. Modified: branches/cache_manager_rewrite/reactos/include/ddk/kefuncs.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/Makefile Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ex/timer.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/internal/ke.h Added: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/clock.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/i386/kernel.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/kthread.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/profile.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/timer.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ke/wait.c _____ Modified: branches/cache_manager_rewrite/reactos/include/ddk/kefuncs.h --- branches/cache_manager_rewrite/reactos/include/ddk/kefuncs.h 2005-02-14 17:34:10 UTC (rev 13570) +++ branches/cache_manager_rewrite/reactos/include/ddk/kefuncs.h 2005-02-14 18:19:29 UTC (rev 13571) @@ -246,6 +246,12 @@ VOID ); +ULONGLONG +STDCALL +KeQueryInterruptTime( + VOID + ); + VOID STDCALL KeRaiseIrql ( _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/Makefile --- branches/cache_manager_rewrite/reactos/ntoskrnl/Makefile 2005-02-14 17:34:10 UTC (rev 13570) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/Makefile 2005-02-14 18:19:29 UTC (rev 13571) @@ -96,6 +96,7 @@ ke/apc.o \ ke/bug.o \ ke/catch.o \ + ke/clock.o \ ke/critical.o \ ke/dpc.o \ ke/device.o \ _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ex/timer.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/ex/timer.c 2005-02-14 17:34:10 UTC (rev 13570) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/ex/timer.c 2005-02-14 18:19:29 UTC (rev 13571) @@ -5,7 +5,8 @@ * FILE: ntoskrnl/ex/timer.c * PURPOSE: User-mode timers * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) + * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Reimplemented + * David Welch (welch(a)mcmail.com) */ /* INCLUDES *****************************************************************/ @@ -13,528 +14,670 @@ #include <ntoskrnl.h> #include <internal/debug.h> - /* TYPES ********************************************************************/ -typedef struct _NTTIMER -{ - KTIMER Timer; - KDPC Dpc; - KAPC Apc; - BOOLEAN Running; -} NTTIMER, *PNTTIMER; +/* Executive Timer Object */ +typedef struct _ETIMER { + KTIMER KeTimer; + KAPC TimerApc; + KDPC TimerDpc; + LIST_ENTRY ActiveTimerListEntry; + KSPIN_LOCK Lock; + LONG Period; + BOOLEAN ApcAssociated; + BOOLEAN WakeTimer; + LIST_ENTRY WakeTimerListEntry; +} ETIMER, *PETIMER; - /* GLOBALS ******************************************************************/ +/* Timer Object Type */ POBJECT_TYPE ExTimerType = NULL; +KSPIN_LOCK ExpWakeListLock; +LIST_ENTRY ExpWakeList; + +/* Timer Mapping */ static GENERIC_MAPPING ExpTimerMapping = { - STANDARD_RIGHTS_READ | TIMER_QUERY_STATE, - STANDARD_RIGHTS_WRITE | TIMER_MODIFY_STATE, - STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, - TIMER_ALL_ACCESS}; + STANDARD_RIGHTS_READ | TIMER_QUERY_STATE, + STANDARD_RIGHTS_WRITE | TIMER_MODIFY_STATE, + STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE, + TIMER_ALL_ACCESS +}; -static const INFORMATION_CLASS_INFO ExTimerInfoClass[] = -{ - ICI_SQ_SAME( sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), /* TimerBasicInformation */ +/* Timer Information Classes */ +static const INFORMATION_CLASS_INFO ExTimerInfoClass[] = { + + /* TimerBasicInformation */ + ICI_SQ_SAME( sizeof(TIMER_BASIC_INFORMATION), sizeof(ULONG), ICIF_QUERY ), }; /* FUNCTIONS *****************************************************************/ -NTSTATUS STDCALL -ExpCreateTimer(PVOID ObjectBody, - PVOID Parent, - PWSTR RemainingPath, - POBJECT_ATTRIBUTES ObjectAttributes) -{ - DPRINT("ExpCreateTimer(ObjectBody %x, Parent %x, RemainingPath %S)\n", - ObjectBody, Parent, RemainingPath); - - if (RemainingPath != NULL && wcschr(RemainingPath+1, '\\') != NULL) - { - return(STATUS_UNSUCCESSFUL); - } - - return(STATUS_SUCCESS); -} - - -VOID STDCALL +VOID +STDCALL ExpDeleteTimer(PVOID ObjectBody) { - KIRQL OldIrql; - PNTTIMER Timer = ObjectBody; + KIRQL OldIrql; + PETIMER Timer = ObjectBody; - DPRINT("ExpDeleteTimer()\n"); + DPRINT("ExpDeleteTimer(Timer: %x)\n", Timer); - OldIrql = KeRaiseIrqlToDpcLevel(); + /* Lock the Wake List */ + KeAcquireSpinLock(&ExpWakeListLock, &OldIrql); + + /* Check if it has a Wait List */ + if (!IsListEmpty(&Timer->WakeTimerListEntry)) { + + /* Remove it from the Wait List */ + DPRINT("Removing wake list\n"); + RemoveEntryList(&Timer->WakeTimerListEntry); + } + + /* Release the Wake List */ + KeReleaseSpinLock(&ExpWakeListLock, OldIrql); - KeCancelTimer(&Timer->Timer); - KeRemoveQueueDpc(&Timer->Dpc); - KeRemoveQueueApc(&Timer->Apc); - Timer->Running = FALSE; - - KeLowerIrql(OldIrql); + /* Tell the Kernel to cancel the Timer */ + DPRINT("Cancelling Timer\n"); + KeCancelTimer(&Timer->KeTimer); } - -VOID STDCALL +VOID +STDCALL ExpTimerDpcRoutine(PKDPC Dpc, - PVOID DeferredContext, - PVOID SystemArgument1, - PVOID SystemArgument2) + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) { - PNTTIMER Timer; + PETIMER Timer; + KIRQL OldIrql; - DPRINT("ExpTimerDpcRoutine()\n"); + DPRINT("ExpTimerDpcRoutine(Dpc: %x)\n", Dpc); - Timer = (PNTTIMER)DeferredContext; + /* Get the Timer Object */ + Timer = (PETIMER)DeferredContext; - if ( Timer->Running ) - { - KeInsertQueueApc(&Timer->Apc, - SystemArgument1, - SystemArgument2, - IO_NO_INCREMENT); - } + /* Lock the Timer */ + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Queue the APC */ + if(Timer->ApcAssociated) { + + DPRINT("Queuing APC\n"); + KeInsertQueueApc(&Timer->TimerApc, + SystemArgument1, + SystemArgument2, + IO_NO_INCREMENT); + } + + /* Release the Timer */ + KeReleaseSpinLock(&Timer->Lock, OldIrql); } -VOID STDCALL +VOID +STDCALL ExpTimerApcKernelRoutine(PKAPC Apc, - PKNORMAL_ROUTINE* NormalRoutine, - PVOID* NormalContext, - PVOID* SystemArgument1, - PVOID* SystemArguemnt2) + PKNORMAL_ROUTINE* NormalRoutine, + PVOID* NormalContext, + PVOID* SystemArgument1, + PVOID* SystemArguemnt2) { - DPRINT("ExpTimerApcKernelRoutine()\n"); - + PETIMER Timer; + PETHREAD CurrentThread = PsGetCurrentThread(); + KIRQL OldIrql; + + /* We need to find out which Timer we are */ + Timer = CONTAINING_RECORD(Apc, ETIMER, TimerApc); + DPRINT("ExpTimerApcKernelRoutine(Apc: %x. Timer: %x)\n", Apc, Timer); + + /* Lock the Timer */ + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Lock the Thread's Active Timer List*/ + KeAcquireSpinLockAtDpcLevel(&CurrentThread->ActiveTimerListLock); + + /* + * Make sure that the Timer is still valid, and that it belongs to this thread + * Remove it if it's not periodic + */ + if ((Timer->ApcAssociated) && + (&CurrentThread->Tcb == Timer->TimerApc.Thread) && + (!Timer->Period)) { + + /* Remove it from the Active Timers List */ + DPRINT("Removing Timer\n"); + RemoveEntryList(&Timer->ActiveTimerListEntry); + + /* Disable it */ + Timer->ApcAssociated = FALSE; + + /* Release spinlocks */ + KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); + KeReleaseSpinLock(&Timer->Lock, OldIrql); + + /* Dereference the Timer Object */ + ObDereferenceObject(Timer); + return; + } + + /* Release spinlocks */ + KeReleaseSpinLockFromDpcLevel(&CurrentThread->ActiveTimerListLock); + KeReleaseSpinLock(&Timer->Lock, OldIrql); } - -VOID INIT_FUNCTION +VOID +INIT_FUNCTION ExpInitializeTimerImplementation(VOID) { - ASSERT(!ExTimerType) - ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); + DPRINT("ExpInitializeTimerImplementation()\n"); + + /* Allocate Memory for the Timer */ + ExTimerType = ExAllocatePool(NonPagedPool, sizeof(OBJECT_TYPE)); - RtlpCreateUnicodeString(&ExTimerType->TypeName, L"Timer", NonPagedPool); - - ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); - ExTimerType->PeakObjects = 0; - ExTimerType->PeakHandles = 0; - ExTimerType->TotalObjects = 0; - ExTimerType->TotalHandles = 0; - ExTimerType->PagedPoolCharge = 0; - ExTimerType->NonpagedPoolCharge = sizeof(NTTIMER); - ExTimerType->Mapping = &ExpTimerMapping; - ExTimerType->Dump = NULL; - ExTimerType->Open = NULL; - ExTimerType->Close = NULL; - ExTimerType->Delete = ExpDeleteTimer; - ExTimerType->Parse = NULL; - ExTimerType->Security = NULL; - ExTimerType->QueryName = NULL; - ExTimerType->OkayToClose = NULL; - ExTimerType->Create = ExpCreateTimer; - ExTimerType->DuplicationNotify = NULL; - - ObpCreateTypeObject(ExTimerType); + /* Create the Executive Timer Object */ + RtlpCreateUnicodeString(&ExTimerType->TypeName, L"Timer", NonPagedPool); + ExTimerType->Tag = TAG('T', 'I', 'M', 'T'); + ExTimerType->PeakObjects = 0; + ExTimerType->PeakHandles = 0; + ExTimerType->TotalObjects = 0; + ExTimerType->TotalHandles = 0; + ExTimerType->PagedPoolCharge = 0; + ExTimerType->NonpagedPoolCharge = sizeof(ETIMER); + ExTimerType->Mapping = &ExpTimerMapping; + ExTimerType->Dump = NULL; + ExTimerType->Open = NULL; + ExTimerType->Close = NULL; + ExTimerType->Delete = ExpDeleteTimer; + ExTimerType->Parse = NULL; + ExTimerType->Security = NULL; + ExTimerType->QueryName = NULL; + ExTimerType->OkayToClose = NULL; + ExTimerType->Create = NULL; + ExTimerType->DuplicationNotify = NULL; + ObpCreateTypeObject(ExTimerType); + + /* Initialize the Wait List and Lock */ + KeInitializeSpinLock(&ExpWakeListLock); + InitializeListHead(&ExpWakeList); } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtCancelTimer(IN HANDLE TimerHandle, - OUT PBOOLEAN CurrentState OPTIONAL) + OUT PBOOLEAN CurrentState OPTIONAL) { - PNTTIMER Timer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PETIMER Timer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + BOOLEAN State; + KIRQL OldIrql; + BOOLEAN KillTimer = FALSE; + PETHREAD TimerThread; - PreviousMode = ExGetPreviousMode(); + DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState); - DPRINT("NtCancelTimer(0x%x, 0x%x)\n", TimerHandle, CurrentState); - - if(CurrentState != NULL && PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(CurrentState, - sizeof(BOOLEAN), - sizeof(BOOLEAN)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check Parameter Validity */ + if(CurrentState != NULL && PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForWrite(CurrentState, + sizeof(BOOLEAN), + sizeof(BOOLEAN)); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + if(!NT_SUCCESS(Status)) { + return Status; + } + } - Status = ObReferenceObjectByHandle(TimerHandle, - TIMER_ALL_ACCESS, - ExTimerType, - PreviousMode, - (PVOID*)&Timer, - NULL); - if(NT_SUCCESS(Status)) - { - BOOLEAN State; - KIRQL OldIrql = KeRaiseIrqlToDpcLevel(); + /* Get the Timer Object */ + Status = ObReferenceObjectByHandle(TimerHandle, + TIMER_ALL_ACCESS, + ExTimerType, + PreviousMode, + (PVOID*)&Timer, + NULL); + + /* Check for success */ + if(NT_SUCCESS(Status)) { + + DPRINT("Timer Referencced: %x\n", Timer); + + /* Lock the Timer */ + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Check if it's enabled */ + if (Timer->ApcAssociated) { + + /* + * First, remove it from the Thread's Active List + * Get the Thread. + */ + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); + DPRINT("Removing from Thread: %x\n", TimerThread); + + /* Lock its active list */ + KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); + + /* Remove it */ + RemoveEntryList(&TimerThread->ActiveTimerListHead); + + /* Unlock the list */ + KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); + + /* Cancel the Timer */ + KeCancelTimer(&Timer->KeTimer); + KeRemoveQueueDpc(&Timer->TimerDpc); + KeRemoveQueueApc(&Timer->TimerApc); + Timer->ApcAssociated = FALSE; + KillTimer = TRUE; + + } else { + + /* If timer was disabled, we still need to cancel it */ + DPRINT("APC was not Associated. Cancelling Timer\n"); + KeCancelTimer(&Timer->KeTimer); + } + + /* Read the old State */ + State = KeReadStateTimer(&Timer->KeTimer); + + /* Dereference the Object */ + ObDereferenceObject(Timer); + + /* Unlock the Timer */ + KeReleaseSpinLock(&Timer->Lock, OldIrql); + + /* Dereference if it was previously enabled */ + if (KillTimer) ObDereferenceObject(Timer); + DPRINT1("Timer disabled\n"); - State = KeCancelTimer(&Timer->Timer); - KeRemoveQueueDpc(&Timer->Dpc); - KeRemoveQueueApc(&Timer->Apc); - Timer->Running = FALSE; + /* Make sure it's safe to write to the handle */ + if(CurrentState != NULL) { + _SEH_TRY { + *CurrentState = State; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } + } - KeLowerIrql(OldIrql); - ObDereferenceObject(Timer); - - if(CurrentState != NULL) - { - _SEH_TRY - { - *CurrentState = State; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; + /* Return to Caller */ + return Status; } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtCreateTimer(OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, - IN TIMER_TYPE TimerType) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes OPTIONAL, + IN TIMER_TYPE TimerType) { - PNTTIMER Timer; - HANDLE hTimer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PETIMER Timer; + HANDLE hTimer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtCreateTimer()\n"); + DPRINT("NtCreateTimer(Handle: %x, Type: %d)\n", TimerHandle, TimerType); + + /* Check Parameter Validity */ + if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForWrite(TimerHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if(!NT_SUCCESS(Status)) { + return Status; + } + } + + /* Create the Object */ + Status = ObCreateObject(PreviousMode, + ExTimerType, + ObjectAttributes, + PreviousMode, + NULL, + sizeof(ETIMER), + 0, + 0, + (PVOID*)&Timer); - PreviousMode = ExGetPreviousMode(); - - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(TimerHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + /* Initialize the Kernel Timer */ + DPRINT("Initializing Timer: %x\n", Timer); + KeInitializeTimerEx(&Timer->KeTimer, TimerType); - if(!NT_SUCCESS(Status)) - { - return Status; - } - } + /* Initialize the Timer Lock */ + KeInitializeSpinLock(&Timer->Lock); + + /* Initialize the DPC */ + KeInitializeDpc(&Timer->TimerDpc, ExpTimerDpcRoutine, Timer); - Status = ObCreateObject(PreviousMode, - ExTimerType, - ObjectAttributes, - PreviousMode, - NULL, - sizeof(NTTIMER), - 0, - 0, - (PVOID*)&Timer); - if(NT_SUCCESS(Status)) - { - KeInitializeTimerEx(&Timer->Timer, - TimerType); + /* Set Initial State */ + Timer->ApcAssociated = FALSE; + InitializeListHead(&Timer->WakeTimerListEntry); + Timer->WakeTimer = FALSE; + + /* Insert the Timer */ + Status = ObInsertObject((PVOID)Timer, + NULL, + DesiredAccess, + 0, + NULL, + &hTimer); + DPRINT("Timer Inserted\n"); - KeInitializeDpc(&Timer->Dpc, - &ExpTimerDpcRoutine, - Timer); + + /* Make sure it's safe to write to the handle */ + _SEH_TRY { + *TimerHandle = hTimer; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } - Timer->Running = FALSE; - - Status = ObInsertObject ((PVOID)Timer, - NULL, - DesiredAccess, - 0, - NULL, - &hTimer); - ObDereferenceObject(Timer); - - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *TimerHandle = hTimer; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - } - - return Status; + /* Return to Caller */ + return Status; } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtOpenTimer(OUT PHANDLE TimerHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes) + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes) { - HANDLE hTimer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + HANDLE hTimer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; - DPRINT("NtOpenTimer()\n"); + DPRINT("NtOpenTimer(TimerHandle: %x)\n", TimerHandle); - PreviousMode = ExGetPreviousMode(); + /* Check Parameter Validity */ + if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForWrite(TimerHandle, + sizeof(HANDLE), + sizeof(ULONG)); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if(!NT_SUCCESS(Status)) { + return Status; + } + } - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForWrite(TimerHandle, - sizeof(HANDLE), - sizeof(ULONG)); - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; + /* Open the Timer */ + Status = ObOpenObjectByName(ObjectAttributes, + ExTimerType, + NULL, + PreviousMode, + DesiredAccess, + NULL, + &hTimer); + + /* Check for success */ + if(NT_SUCCESS(Status)) { + + /* Make sure it's safe to write to the handle */ + _SEH_TRY { + *TimerHandle = hTimer; + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + } - if(!NT_SUCCESS(Status)) - { - return Status; - } - } - - Status = ObOpenObjectByName(ObjectAttributes, - ExTimerType, - NULL, - PreviousMode, - DesiredAccess, - NULL, - &hTimer); - if(NT_SUCCESS(Status)) - { - _SEH_TRY - { - *TimerHandle = hTimer; - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - } - - return Status; + /* Return to Caller */ + return Status; } -NTSTATUS STDCALL +NTSTATUS +STDCALL NtQueryTimer(IN HANDLE TimerHandle, - IN TIMER_INFORMATION_CLASS TimerInformationClass, - OUT PVOID TimerInformation, - IN ULONG TimerInformationLength, - OUT PULONG ReturnLength OPTIONAL) + IN TIMER_INFORMATION_CLASS TimerInformationClass, + OUT PVOID TimerInformation, + IN ULONG TimerInformationLength, + OUT PULONG ReturnLength OPTIONAL) { - PNTTIMER Timer; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PETIMER Timer; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + NTSTATUS Status = STATUS_SUCCESS; + PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; - PreviousMode = ExGetPreviousMode(); + DPRINT("NtQueryTimer(TimerHandle: %x, Class: %d)\n", TimerHandle, TimerInformationClass); + + /* Check Validity */ + DefaultQueryInfoBufferCheck(TimerInformationClass, + ExTimerInfoClass, + TimerInformation, + TimerInformationLength, + ReturnLength, + PreviousMode, + &Status); + if(!NT_SUCCESS(Status)) { + + DPRINT1("NtQueryTimer() failed, Status: 0x%x\n", Status); + return Status; + } - DefaultQueryInfoBufferCheck(TimerInformationClass, - ExTimerInfoClass, - TimerInformation, - TimerInformationLength, - ReturnLength, - PreviousMode, - &Status); - if(!NT_SUCCESS(Status)) - { - DPRINT1("NtQueryTimer() failed, Status: 0x%x\n", Status); - return Status; - } + /* Get the Timer Object */ + Status = ObReferenceObjectByHandle(TimerHandle, + TIMER_QUERY_STATE, + ExTimerType, + PreviousMode, + (PVOID*)&Timer, + NULL); + + /* Check for Success */ + if(NT_SUCCESS(Status)) { + + switch(TimerInformationClass) { + case TimerBasicInformation: { + /* Return the Basic Information */ + _SEH_TRY { - Status = ObReferenceObjectByHandle(TimerHandle, - TIMER_QUERY_STATE, - ExTimerType, - PreviousMode, - (PVOID*)&Timer, - NULL); - if(NT_SUCCESS(Status)) - { - switch(TimerInformationClass) - { - case TimerBasicInformation: - { - PTIMER_BASIC_INFORMATION BasicInfo = (PTIMER_BASIC_INFORMATION)TimerInformation; + /* FIXME: Interrupt correction based on Interrupt Time */ + DPRINT("Returning Information for Timer: %x. Time Remaining: %d\n", Timer, Timer->KeTimer.DueTime.QuadPart); + BasicInfo->TimeRemaining.QuadPart = Timer->KeTimer.DueTime.QuadPart; + BasicInfo->SignalState = KeReadStateTimer(&Timer->KeTimer); - _SEH_TRY - { - /* FIXME - interrupt correction */ - BasicInfo->TimeRemaining.QuadPart = Timer->Timer.DueTime.QuadPart; - BasicInfo->SignalState = (BOOLEAN)Timer->Timer.Header.SignalState; + if(ReturnLength != NULL) { + *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); + } - if(ReturnLength != NULL) - { - *ReturnLength = sizeof(TIMER_BASIC_INFORMATION); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; } - } - _SEH_HANDLE - { - Status = _SEH_GetExceptionCode(); - } - _SEH_END; - break; - } - - default: - Status = STATUS_NOT_IMPLEMENTED; - break; - } - - ObDereferenceObject(Timer); - } - - return Status; + } + + ObDereferenceObject(Timer); + } + + /* Return Status */ + return Status; } - -NTSTATUS STDCALL +NTSTATUS +STDCALL NtSetTimer(IN HANDLE TimerHandle, - IN PLARGE_INTEGER DueTime, - IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, - IN PVOID TimerContext OPTIONAL, - IN BOOLEAN ResumeTimer, - IN LONG Period OPTIONAL, - OUT PBOOLEAN PreviousState OPTIONAL) + IN PLARGE_INTEGER DueTime, + IN PTIMER_APC_ROUTINE TimerApcRoutine OPTIONAL, + IN PVOID TimerContext OPTIONAL, + IN BOOLEAN WakeTimer, + IN LONG Period OPTIONAL, + OUT PBOOLEAN PreviousState OPTIONAL) { - PNTTIMER Timer; - BOOLEAN Result; - BOOLEAN State; - LARGE_INTEGER TimerDueTime; - KPROCESSOR_MODE PreviousMode; - NTSTATUS Status = STATUS_SUCCESS; + PETIMER Timer; + KIRQL OldIrql; + BOOLEAN KillTimer = FALSE; + BOOLEAN State; + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); + PETHREAD CurrentThread = PsGetCurrentThread(); + NTSTATUS Status = STATUS_SUCCESS; + LARGE_INTEGER TimerDueTime; + PETHREAD TimerThread; - DPRINT("NtSetTimer()\n"); + DPRINT("NtSetTimer(TimerHandle: %x, DueTime: %d, Apc: %x, Period: %d)\n", TimerHandle, DueTime->QuadPart, TimerApcRoutine, Period); - PreviousMode = ExGetPreviousMode(); + /* Check Parameter Validity */ + if (PreviousMode != KernelMode) { + _SEH_TRY { + ProbeForRead(DueTime, + sizeof(LARGE_INTEGER), + sizeof(ULONG)); + TimerDueTime = *DueTime; + + if(PreviousState != NULL) { + ProbeForWrite(PreviousState, + sizeof(BOOLEAN), + sizeof(BOOLEAN)); + } + + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; + + if(!NT_SUCCESS(Status)) { + return Status; + } + } + + /* Get the Timer Object */ + Status = ObReferenceObjectByHandle(TimerHandle, + TIMER_ALL_ACCESS, + ExTimerType, + PreviousMode, + (PVOID*)&Timer, + NULL); + + /* Check status */ + if (NT_SUCCESS(Status)) { + + /* Lock the Timer */ + DPRINT("Timer Referencced: %x\n", Timer); + KeAcquireSpinLock(&Timer->Lock, &OldIrql); + + /* Cancel Running Timer */ + if (Timer->ApcAssociated) { + + /* + * First, remove it from the Thread's Active List + * Get the Thread. + */ + TimerThread = CONTAINING_RECORD(Timer->TimerApc.Thread, ETHREAD, Tcb); + DPRINT("Thread already running. Removing from Thread: %x\n", TimerThread); + + /* Lock its active list */ + KeAcquireSpinLockAtDpcLevel(&TimerThread->ActiveTimerListLock); + + /* Remove it */ + RemoveEntryList(&TimerThread->ActiveTimerListHead); + + /* Unlock the list */ + KeReleaseSpinLockFromDpcLevel(&TimerThread->ActiveTimerListLock); + + /* Cancel the Timer */ + KeCancelTimer(&Timer->KeTimer); + KeRemoveQueueDpc(&Timer->TimerDpc); + KeRemoveQueueApc(&Timer->TimerApc); + Timer->ApcAssociated = FALSE; + KillTimer = TRUE; + + } else { + + /* If timer was disabled, we still need to cancel it */ + DPRINT("No APCs. Simply cancelling\n"); + KeCancelTimer(&Timer->KeTimer); + } + + /* Read the State */ + State = KeReadStateTimer(&Timer->KeTimer); - if(PreviousMode != KernelMode) - { - _SEH_TRY - { - ProbeForRead(DueTime, - sizeof(LARGE_INTEGER), - sizeof(ULONG)); - TimerDueTime = *DueTime; + /* Handle Wake Timers */ + DPRINT("Doing Wake Semantics\n"); + KeAcquireSpinLockAtDpcLevel(&ExpWakeListLock); + if (WakeTimer) { + + /* Insert it into the list */ + InsertTailList(&ExpWakeList, &Timer->WakeTimerListEntry); + [truncated at 1000 lines; 1583 more skipped]

19 years, 10 months

[hbirr] 13570: - Started the rewriting of the cache manger.

by hbirr＠svn.reactos.com

- Started the rewriting of the cache manger. - The new cache manager uses section objects and maps the content of cached files into the kernel address space for functions like CcCopyRead. - The implementation isn't complete. It works for me to compile ros on ros if enough ram is available. Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/ntfs.h Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/cleanup.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/close.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/create.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/fcb.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/finfo.c Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/vfat.h Modified: branches/cache_manager_rewrite/reactos/include/reactos/exeformat.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/fs.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/pin.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/view.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/config.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/internal/cc.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/include/internal/mm.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/kd/kdebug.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ldr/init.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ldr/loader.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/elf.inc.h Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/freelist.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/mm.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/mminit.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/mpw.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/npool.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pageop.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/pe.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/rmap.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/mm/section.c Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/ntoskrnl.def _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h --- branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/cdfs/cdfs.h 2005-02-14 17:34:10 UTC (rev 13570) @@ -3,7 +3,7 @@ #include <ddk/ntifs.h> -#define USE_ROS_CC_AND_FS +//#define USE_ROS_CC_AND_FS #define CDFS_BASIC_SECTOR 2048 #define CDFS_PRIMARY_DESCRIPTOR_LOCATION 16 _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/ntfs.h --- branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/ntfs.h 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/ntfs/ntfs.h 2005-02-14 17:34:10 UTC (rev 13570) @@ -3,7 +3,7 @@ #include <ddk/ntifs.h> -#define USE_ROS_CC_AND_FS +//#define USE_ROS_CC_AND_FS #define CACHEPAGESIZE(pDeviceExt) \ _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/cleanup.c --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/cleanup.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/cleanup.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -25,46 +25,94 @@ PFILE_OBJECT FileObject = IrpContext->FileObject; DPRINT("VfatCleanupFile(DeviceExt %x, FileObject %x)\n", - IrpContext->DeviceExt, FileObject); + IrpContext->DeviceExt, FileObject); /* FIXME: handle file/directory deletion here */ pFcb = (PVFATFCB) FileObject->FsContext; if (pFcb) { - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && - FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) - { - /* remove all locks this process have on this file */ - FsRtlFastUnlockAll(&pFcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } + DPRINT("'%wZ'\n", &pFcb->PathNameU); + if (pFcb->Flags & FCB_IS_VOLUME) + { + CHECKPOINT1; + pFcb->OpenHandleCount--; - if (pFcb->Flags & FCB_IS_DIRTY) - { - VfatUpdateEntry (pFcb); - } + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + } + else + { + if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + CHECKPOINT1; + return STATUS_PENDING; + } + if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + ExReleaseResourceLite (&pFcb->MainResource); + CHECKPOINT; + return STATUS_PENDING; + } + + pFcb->OpenHandleCount--; - if (pFcb->Flags & FCB_DELETE_PENDING && - pFcb->OpenHandleCount == 1) - { + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) + { + /* remove all locks this process have on this file */ + FsRtlFastUnlockAll(&pFcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } + + if (pFcb->Flags & FCB_IS_DIRTY) + { + CHECKPOINT; + VfatUpdateEntry (pFcb); + } + + if (pFcb->Flags & FCB_DELETE_PENDING && + pFcb->OpenHandleCount == 0) + { + DPRINT("'%wZ'\n", &pFcb->PathNameU); #if 0 - /* FIXME: - * CcPurgeCacheSection is unimplemented. - */ - CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); + /* FIXME: + * CcPurgeCacheSection is unimplemented. + */ + CcPurgeCacheSection(FileObject->SectionObjectPointer, NULL, 0, FALSE); #endif - } - /* Uninitialize file cache if. */ +// VfatDelEntry(IrpContext->DeviceExt, pFcb); +// pFcb->RFCB.FileSize.QuadPart = 0; +// pFcb->RFCB.AllocationSize.QuadPart = 0; +// pFcb->RFCB.ValidDataLength.QuadPart = 0; + + } + /* Uninitialize file cache if. */ #ifdef USE_ROS_CC_AND_FS - CcRosReleaseFileCache (FileObject); + CcRosReleaseFileCache (FileObject); #else - CcUninitializeCacheMap (FileObject, NULL, NULL); + if (FileObject->SectionObjectPointer->SharedCacheMap) + { + CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + } #endif - pFcb->OpenHandleCount--; - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + + FileObject->Flags |= FO_CLEANUP_COMPLETE; + + ExReleaseResourceLite (&pFcb->PagingIoResource); + ExReleaseResourceLite (&pFcb->MainResource); + } } + CHECKPOINT; return STATUS_SUCCESS; } @@ -86,6 +134,7 @@ if (!ExAcquireResourceExclusiveLite (&IrpContext->DeviceExt->DirResource, (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) { + CHECKPOINT; return VfatQueueRequest (IrpContext); } @@ -93,12 +142,19 @@ ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); + if (Status == STATUS_PENDING) + { + CHECKPOINT; + return VfatQueueRequest(IrpContext); + } + ByeBye: IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; IoCompleteRequest (IrpContext->Irp, IO_NO_INCREMENT); VfatFreeIrpContext(IrpContext); + CHECKPOINT; return (Status); } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/close.c --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/close.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/close.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -32,11 +32,14 @@ pCcb = (PVFATCCB) (FileObject->FsContext2); pFcb = (PVFATFCB) (FileObject->FsContext); + FileObject->FsContext2 = NULL; + if (pFcb == NULL) { return STATUS_SUCCESS; } + DPRINT("'%wZ'\n", &pFcb->PathNameU); if (pFcb->Flags & FCB_IS_VOLUME) { DPRINT1("Volume\n"); @@ -48,7 +51,7 @@ // This a FO, that was created outside from FSD. // Some FO's are created with IoCreateStreamFileObject() insid from FSD. // This FO's haven't a FileName. - if (FileObject->DeletePending) +// if (FileObject->DeletePending) { if (pFcb->Flags & FCB_DELETE_PENDING) { @@ -62,7 +65,6 @@ vfatReleaseFCB (DeviceExt, pFcb); } - FileObject->FsContext2 = NULL; FileObject->FsContext = NULL; FileObject->SectionObjectPointer = NULL; @@ -70,7 +72,7 @@ { vfatDestroyCCB(pCcb); } - + CHECKPOINT; return Status; } _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/create.c --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/create.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/create.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -637,7 +637,24 @@ VfatCloseFile (DeviceExt, FileObject); return(STATUS_NOT_A_DIRECTORY); } - +#if 1 + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + { + if (Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA || + RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF) + { + if (!MmFlushImageSection(&pFcb->SectionObjectPointers, MmFlushForWrite)) + { + DPRINT1("%wZ\n", &pFcb->PathNameU); + DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, + RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); + VfatCloseFile (DeviceExt, FileObject); + return STATUS_SHARING_VIOLATION; + } + } + } +#endif if (PagingFileCreate) { /* FIXME: _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/fcb.c --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/fcb.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/fcb.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -369,7 +369,7 @@ /* FIXME: Guard by SEH. */ CcInitializeCacheMap(fileObject, (PCC_FILE_SIZES)(&fcb->RFCB.AllocationSize), - FALSE, + TRUE, &VfatGlobalData->CacheMgrCallbacks, fcb); #endif _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/finfo.c --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/finfo.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/finfo.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -101,6 +101,34 @@ } static NTSTATUS +VfatGetAttributeTagInformation(PVFATFCB FCB, + PFILE_ATTRIBUTE_TAG_INFORMATION AttributeTagInfo, + PULONG BufferLength) +{ + if (*BufferLength < sizeof(FILE_ATTRIBUTE_TAG_INFORMATION)) + return STATUS_BUFFER_OVERFLOW; + + /* PRECONDITION */ + ASSERT(StandardInfo != NULL); + ASSERT(FCB != NULL); + + AttributeTagInfo->FileAttributes = *FCB->Attributes & 0x3f; + /* Synthesize FILE_ATTRIBUTE_NORMAL */ + if (0 == (AttributeTagInfo->FileAttributes & (FILE_ATTRIBUTE_DIRECTORY | + FILE_ATTRIBUTE_ARCHIVE | + FILE_ATTRIBUTE_SYSTEM | + FILE_ATTRIBUTE_HIDDEN | + FILE_ATTRIBUTE_READONLY))) + { + AttributeTagInfo->FileAttributes |= FILE_ATTRIBUTE_NORMAL; + } + AttributeTagInfo->ReparseTag = 0; + + *BufferLength -= sizeof(FILE_ATTRIBUTE_TAG_INFORMATION); + return(STATUS_SUCCESS); +} + +static NTSTATUS VfatSetPositionInformation(PFILE_OBJECT FileObject, PFILE_POSITION_INFORMATION PositionInfo) { @@ -309,7 +337,7 @@ } else { - DPRINT("MmFlushImageSection returned FALSE\n"); + DPRINT1("MmFlushImageSection returned FALSE\n"); Status = STATUS_CANNOT_DELETE; } if (NT_SUCCESS(Status) && vfatFCBIsDirectory(FCB)) @@ -762,6 +790,12 @@ &BufferLength); break; + case FileAttributeTagInformation: + RC = VfatGetAttributeTagInformation(FCB, + SystemBuffer, + &BufferLength); + break; + case FileAlternateNameInformation: RC = STATUS_NOT_IMPLEMENTED; break; @@ -848,6 +882,7 @@ SystemBuffer); break; case FileRenameInformation: + case FileAttributeTagInformation: RC = STATUS_NOT_IMPLEMENTED; break; default: _____ Modified: branches/cache_manager_rewrite/reactos/drivers/fs/vfat/vfat.h --- branches/cache_manager_rewrite/reactos/drivers/fs/vfat/vfat.h 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/drivers/fs/vfat/vfat.h 2005-02-14 17:34:10 UTC (rev 13570) @@ -1,11 +1,19 @@ /* $Id$ */ +//#define USE_ROS_CC_AND_FS + +#ifndef USE_ROS_CC_AND_FS +#ifdef WINVER +#undef WINVER +#endif +#define WINVER 0x0400 +#endif + #include <ddk/ntifs.h> #include <ddk/ntdddisk.h> #include <limits.h> #include <debug.h> -#define USE_ROS_CC_AND_FS /* FIXME */ #ifdef __USE_W32API _____ Modified: branches/cache_manager_rewrite/reactos/include/reactos/exeformat.h --- branches/cache_manager_rewrite/reactos/include/reactos/exeformat.h 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/include/reactos/exeformat.h 2005-02-14 17:34:10 UTC (rev 13570) @@ -34,7 +34,8 @@ typedef NTSTATUS (NTAPI * PEXEFMT_CB_READ_FILE) ( - IN PVOID File, + IN PFILE_OBJECT FileObject, + ULONG SectorSize, IN PLARGE_INTEGER Offset, IN ULONG Length, OUT PVOID * Data, @@ -51,7 +52,7 @@ ( IN CONST VOID * FileHeader, IN SIZE_T FileHeaderSize, - IN PVOID File, + IN PFILE_OBJECT FileObject, OUT PMM_IMAGE_SECTION_OBJECT ImageSectionObject, OUT PULONG Flags, IN PEXEFMT_CB_READ_FILE ReadFileCb, _____ Modified: branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c --- branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c 2005-02-14 17:10:20 UTC (rev 13569) +++ branches/cache_manager_rewrite/reactos/ntoskrnl/cc/copy.c 2005-02-14 17:34:10 UTC (rev 13570) @@ -37,9 +37,16 @@ ULONG CcFastReadNoWait; ULONG CcFastReadResourceMiss; +extern FAST_MUTEX CcCacheViewLock; +extern LIST_ENTRY CcFreeCacheViewListHead; +extern LIST_ENTRY CcInUseCacheViewListHead; /* FUNCTIONS *****************************************************************/ +NTSTATUS STDCALL +MmMapViewInSystemCache(PCACHE_VIEW); + + VOID CcInitCacheZeroPage(VOID) { @@ -59,226 +66,6 @@ } } -NTSTATUS -ReadCacheSegmentChain(PBCB Bcb, ULONG ReadOffset, ULONG Length, - PVOID Buffer) -{ - PCACHE_SEGMENT head; - PCACHE_SEGMENT current; - PCACHE_SEGMENT previous; - IO_STATUS_BLOCK Iosb; - LARGE_INTEGER SegOffset; - NTSTATUS Status; - ULONG TempLength; - KEVENT Event; - PMDL Mdl; - - Mdl = alloca(MmSizeOfMdl(NULL, MAX_RW_LENGTH)); - - Status = CcRosGetCacheSegmentChain(Bcb, ReadOffset, Length, &head); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - current = head; - while (current != NULL) - { - /* - * If the current segment is valid then copy it into the - * user buffer. - */ - if (current->Valid) - { - TempLength = min(Bcb->CacheSegmentSize, Length); - memcpy(Buffer, current->BaseAddress, TempLength); -#if defined(__GNUC__) - Buffer += TempLength; -#else - { - char* pTemp = Buffer; - pTemp += TempLength; - Buffer = pTemp; - } -#endif - Length = Length - TempLength; - previous = current; - current = current->NextInChain; - CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); - } - /* - * Otherwise read in as much as we can. - */ - else - { - PCACHE_SEGMENT current2; - ULONG current_size; - ULONG i; - PPFN_TYPE MdlPages; - - /* - * Count the maximum number of bytes we could read starting - * from the current segment. - */ - current2 = current; - current_size = 0; - while (current2 != NULL && !current2->Valid && current_size < MAX_RW_LENGTH) - { - current2 = current2->NextInChain; - current_size += Bcb->CacheSegmentSize; - } - - /* - * Create an MDL which contains all their pages. - */ - MmInitializeMdl(Mdl, NULL, current_size); - Mdl->MdlFlags |= (MDL_PAGES_LOCKED | MDL_IO_PAGE_READ); - current2 = current; - current_size = 0; - MdlPages = (PPFN_TYPE)(Mdl + 1); - while (current2 != NULL && !current2->Valid && current_size < MAX_RW_LENGTH) - { - PVOID address = current2->BaseAddress; - for (i = 0; i < (Bcb->CacheSegmentSize / PAGE_SIZE); i++, address += PAGE_SIZE) - { - *MdlPages++ = MmGetPfnForProcess(NULL, address); - } - current2 = current2->NextInChain; - current_size += Bcb->CacheSegmentSize; - } - - /* - * Read in the information. - */ - SegOffset.QuadPart = current->FileOffset; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(Bcb->FileObject, - Mdl, - &SegOffset, - &Event, - &Iosb); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Iosb.Status; - } - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); - } - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) - { - while (current != NULL) - { - previous = current; - current = current->NextInChain; - CcRosReleaseCacheSegment(Bcb, previous, FALSE, FALSE, FALSE); - } - return(Status); - } - current_size = 0; - while (current != NULL && !current->Valid && current_size < MAX_RW_LENGTH) - { - previous = current; - current = current->NextInChain; - TempLength = min(Bcb->CacheSegmentSize, Length); - memcpy(Buffer, previous->BaseAddress, TempLength); -#if defined(__GNUC__) - Buffer += TempLength; -#else - { - char* pTemp = Buffer; - pTemp += TempLength; - Buffer = pTemp; - } -#endif - Length = Length - TempLength; - CcRosReleaseCacheSegment(Bcb, previous, TRUE, FALSE, FALSE); - current_size += Bcb->CacheSegmentSize; - } - } - } - return(STATUS_SUCCESS); -} - -NTSTATUS -ReadCacheSegment(PCACHE_SEGMENT CacheSeg) -{ - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - LARGE_INTEGER SegOffset; - IO_STATUS_BLOCK IoStatus; - KEVENT Event; - - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; - } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageRead(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, & Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - - if (!NT_SUCCESS(Status) && Status != STATUS_END_OF_FILE) - { - DPRINT1("IoPageRead failed, Status %x\n", Status); - return Status; - } - if (CacheSeg->Bcb->CacheSegmentSize > Size) - { - memset ((char*)CacheSeg->BaseAddress + Size, 0, - CacheSeg->Bcb->CacheSegmentSize - Size); - } - return STATUS_SUCCESS; -} - -NTSTATUS -WriteCacheSegment(PCACHE_SEGMENT CacheSeg) -{ - ULONG Size; - PMDL Mdl; - NTSTATUS Status; - IO_STATUS_BLOCK IoStatus; - LARGE_INTEGER SegOffset; - KEVENT Event; - - CacheSeg->Dirty = FALSE; - SegOffset.QuadPart = CacheSeg->FileOffset; - Size = (ULONG)(CacheSeg->Bcb->AllocationSize.QuadPart - CacheSeg->FileOffset); - if (Size > CacheSeg->Bcb->CacheSegmentSize) - { - Size = CacheSeg->Bcb->CacheSegmentSize; - } - Mdl = alloca(MmSizeOfMdl(CacheSeg->BaseAddress, Size)); - MmInitializeMdl(Mdl, CacheSeg->BaseAddress, Size); - MmBuildMdlForNonPagedPool(Mdl); - Mdl->MdlFlags |= MDL_IO_PAGE_READ; - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoPageWrite(CacheSeg->Bcb->FileObject, Mdl, &SegOffset, &Event, &IoStatus); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = IoStatus.Status; - } - if (!NT_SUCCESS(Status) && (Status != STATUS_END_OF_FILE)) - { - DPRINT1("IoPageWrite failed, Status %x\n", Status); - CacheSeg->Dirty = TRUE; - return(Status); - } - return(STATUS_SUCCESS); -} - - /* * @unimplemented */ @@ -293,10 +80,6 @@ return FALSE; } - -/* - * @implemented - */ BOOLEAN STDCALL CcCopyRead (IN PFILE_OBJECT FileObject, IN PLARGE_INTEGER FileOffset, @@ -305,234 +88,295 @@ OUT PVOID Buffer, OUT PIO_STATUS_BLOCK IoStatus) { - ULONG ReadOffset; - ULONG TempLength; - NTSTATUS Status = STATUS_SUCCESS; - PVOID BaseAddress; - PCACHE_SEGMENT CacheSeg; - BOOLEAN Valid; - ULONG ReadLength = 0; - PBCB Bcb; - KIRQL oldirql; - PLIST_ENTRY current_entry; - PCACHE_SEGMENT current; - - DPRINT("CcCopyRead(FileObject %x, FileOffset %x, " - "Length %d, Wait %d, Buffer %x, IoStatus %x)\n", - FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, - Buffer, IoStatus); - Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - ReadOffset = (ULONG)FileOffset->QuadPart; - - DPRINT("AllocationSize %d, FileSize %d\n", - (ULONG)Bcb->AllocationSize.QuadPart, - (ULONG)Bcb->FileSize.QuadPart); + ULONG Index; + PBCB Bcb; + LARGE_INTEGER Offset; + PLIST_ENTRY entry; + PCACHE_VIEW current = NULL; + ULONG CurrentLength; + NTSTATUS Status; - /* - * Check for the nowait case that all the cache segments that would - * cover this read are in memory. - */ - if (!Wait) - { - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) - { - current = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (!current->Valid && current->FileOffset < ReadOffset + Length - && current->FileOffset + Bcb->CacheSegmentSize > ReadOffset) - { - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - IoStatus->Status = STATUS_UNSUCCESSFUL; - IoStatus->Information = 0; - return FALSE; - } - current_entry = current_entry->Flink; - } - KeReleaseSpinLock(&Bcb->BcbLock, oldirql); - } + DPRINT("CcCopyRead(%x, %x, %x, %x, %x, %x\n", + FileObject, FileOffset, Length, Wait, Buffer, IoStatus); - TempLength = ReadOffset % Bcb->CacheSegmentSize; - if (TempLength != 0) - { - TempLength = min (Length, Bcb->CacheSegmentSize - TempLength); - Status = CcRosRequestCacheSegment(Bcb, - ROUND_DOWN(ReadOffset, - Bcb->CacheSegmentSize), - &BaseAddress, &Valid, &CacheSeg); - if (!NT_SUCCESS(Status)) - { - IoStatus->Information = 0; - IoStatus->Status = Status; - DPRINT("CcRosRequestCacheSegment faild, Status %x\n", Status); - return FALSE; - } - if (!Valid) - { - Status = ReadCacheSegment(CacheSeg); - if (!NT_SUCCESS(Status)) + if (!Wait) + { + IoStatus->Information = 0; + IoStatus->Status = STATUS_UNSUCCESSFUL; + CHECKPOINT; + return FALSE; + } + + IoStatus->Information = Length; + IoStatus->Status = STATUS_SUCCESS; + + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; + + if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) + { + KEBUGCHECK(0); + } + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK(0); + } + + Offset = *FileOffset; + + ExAcquireFastMutex(&CcCacheViewLock); + while (Length) + { + Index = Offset.QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { + CHECKPOINT; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); + InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + Bcb->CacheView[Index]->RefCount++; + } + else + { + CHECKPOINT; + if (IsListEmpty(&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK(0); + } + + entry = CcFreeCacheViewListHead.Flink; + while (entry != &CcFreeCacheViewListHead) + { + current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) { - IoStatus->Information = 0; - IoStatus->Status = Status; - CcRosReleaseCacheSegment(Bcb, CacheSeg, FALSE, FALSE, FALSE); - return FALSE; + break; } - } - memcpy (Buffer, (char*)BaseAddress + ReadOffset % Bcb->CacheSegmentSize, - TempLength); - CcRosReleaseCacheSegment(Bcb, CacheSeg, TRUE, FALSE, FALSE); - ReadLength += TempLength; - Length -= TempLength; - ReadOffset += TempLength; - Buffer = (PVOID)((char*)Buffer + TempLength); - } - while (Length > 0) - { - TempLength = min(max(Bcb->CacheSegmentSize, MAX_RW_LENGTH), Length); - ReadCacheSegmentChain(Bcb, ReadOffset, TempLength, Buffer); - ReadLength += TempLength; - Length -= TempLength; - ReadOffset += TempLength; -#if defined(__GNUC__) - Buffer += TempLength; -#else - { - char* pTemp = Buffer; - pTemp += TempLength; - Buffer = pTemp; - } -#endif - } - IoStatus->Status = STATUS_SUCCESS; - IoStatus->Information = ReadLength; - DPRINT("CcCopyRead O.K.\n"); - return TRUE; + } + if (entry == &CcFreeCacheViewListHead) + { + KEBUGCHECK(0); + } + + if (current->Bcb) + { + current->Bcb->CacheView[current->SectionData.ViewOffset / CACHE_VIEW_SIZE] = NULL; + } + Bcb->CacheView[Index] = current; + + + if(Bcb->CacheView[Index]->Bcb != NULL) + { + DPRINT1("%x\n", Bcb->CacheView[Index]->Bcb); + /* not implemented */ + KEBUGCHECK(0); + } + Bcb->CacheView[Index]->RefCount = 1; + Bcb->CacheView[Index]->Bcb = Bcb; + Bcb->CacheView[Index]->SectionData.ViewOffset = Index * CACHE_VIEW_SIZE; + Bcb->CacheView[Index]->SectionData.Section = Bcb->Section; + Bcb->CacheView[Index]->SectionData.Segment = Bcb->Section->Segment; + + Status = MmMapViewInSystemCache(Bcb->CacheView[Index]); + + if (!NT_SUCCESS(Status)) + { + KEBUGCHECK(0); + } + } + ExReleaseFastMutex(&CcCacheViewLock); + + if (Offset.QuadPart % CACHE_VIEW_SIZE) + { + if (Length > CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE) + { + CurrentLength = CACHE_VIEW_SIZE - Offset.u.LowPart % CACHE_VIEW_SIZE; + } + else + { + CurrentLength = Length; + } + memcpy(Buffer, Bcb->CacheView[Index]->BaseAddress + Offset.u.LowPart % CACHE_VIEW_SIZE, CurrentLength); + Buffer += CurrentLength; + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + else + { + CurrentLength = Length > CACHE_VIEW_SIZE ? CACHE_VIEW_SIZE : Length; + memcpy(Buffer, Bcb->CacheView[Index]->BaseAddress, CurrentLength); + Buffer += CurrentLength; + Length -= CurrentLength; + Offset.QuadPart += CurrentLength; + } + ExAcquireFastMutex(&CcCacheViewLock); + + Bcb->CacheView[Index]->RefCount--; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); + InsertHeadList(&CcFreeCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + } + ExReleaseFastMutex(&CcCacheViewLock); + + CHECKPOINT; + + return TRUE; } /* * @implemented */ BOOLEAN STDCALL -CcCopyWrite (IN PFILE_OBJECT FileObject, - IN PLARGE_INTEGER FileOffset, - IN ULONG Length, - IN BOOLEAN Wait, - IN PVOID Buffer) +CcCopyWrite(IN PFILE_OBJECT FileObject, + IN PLARGE_INTEGER FileOffset, + IN ULONG Length, + IN BOOLEAN Wait, + IN PVOID Buffer) { - NTSTATUS Status; - ULONG WriteOffset; - KIRQL oldirql; + + ULONG Index; PBCB Bcb; - PLIST_ENTRY current_entry; - PCACHE_SEGMENT CacheSeg; - ULONG TempLength; - PVOID BaseAddress; - BOOLEAN Valid; + LARGE_INTEGER Offset; + PLIST_ENTRY entry; + PCACHE_VIEW current = NULL; + ULONG CurrentLength; + NTSTATUS Status; - DPRINT("CcCopyWrite(FileObject %x, FileOffset %x, " - "Length %d, Wait %d, Buffer %x)\n", - FileObject, (ULONG)FileOffset->QuadPart, Length, Wait, Buffer); + DPRINT("CcCopyWrite(%x, %x, %x, %x, %x\n", + FileObject, FileOffset, Length, Wait, Buffer); + if (!Wait) + { + CHECKPOINT; + return FALSE; + } + Bcb = FileObject->SectionObjectPointer->SharedCacheMap; - WriteOffset = (ULONG)FileOffset->QuadPart; - if (!Wait) - { - /* testing, if the requested datas are available */ - KeAcquireSpinLock(&Bcb->BcbLock, &oldirql); - current_entry = Bcb->BcbSegmentListHead.Flink; - while (current_entry != &Bcb->BcbSegmentListHead) + if (FileOffset->QuadPart + Length > Bcb->FileSizes.FileSize.QuadPart) + { + KEBUGCHECK(0); + } + + if (Bcb->FileSizes.AllocationSize.QuadPart > sizeof(Bcb->CacheView) / sizeof(Bcb->CacheView[0]) * CACHE_VIEW_SIZE) + { + /* not implemented */ + KEBUGCHECK(0); + } + + Offset = *FileOffset; + + ExAcquireFastMutex(&CcCacheViewLock); + while (Length) + { + Index = Offset.QuadPart / CACHE_VIEW_SIZE; + if (Bcb->CacheView[Index] && Bcb->CacheView[Index]->Bcb == Bcb) + { + CHECKPOINT; + if (Bcb->CacheView[Index]->RefCount == 0) + { + RemoveEntryList(&Bcb->CacheView[Index]->ListEntry); + InsertHeadList(&CcInUseCacheViewListHead, &Bcb->CacheView[Index]->ListEntry); + } + Bcb->CacheView[Index]->RefCount++; + } + else + { + CHECKPOINT; + if (IsListEmpty(&CcFreeCacheViewListHead)) + { + /* not implemented */ + KEBUGCHECK(0); + } + + entry = CcFreeCacheViewListHead.Flink; + while (entry != &CcFreeCacheViewListHead) + { + current = CONTAINING_RECORD(entry, CACHE_VIEW, ListEntry); + entry = entry->Flink; + if (current->Bcb == NULL) + { + break; + } + } + if (entry == &CcFreeCacheViewListHead) + { + KEBUGCHECK(0); + } + + if (current->Bcb) { - CacheSeg = CONTAINING_RECORD(current_entry, CACHE_SEGMENT, - BcbSegmentListEntry); - if (!CacheSeg->Valid) - { [truncated at 1000 lines; 7554 more skipped]

19 years, 10 months

[ekohl] 13569: Export splay-tree and generic table functions.

by ekohl＠svn.reactos.com

Export splay-tree and generic table functions. Modified: trunk/reactos/lib/ntdll/def/ntdll.def _____ Modified: trunk/reactos/lib/ntdll/def/ntdll.def --- trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-14 17:03:16 UTC (rev 13568) +++ trunk/reactos/lib/ntdll/def/ntdll.def 2005-02-14 17:10:20 UTC (rev 13569) @@ -365,12 +365,13 @@ RtlDeNormalizeProcessParams@4 RtlDecompressBuffer@24 RtlDecompressFragment@32 -;RtlDelete +RtlDelete@4 RtlDeleteAce@8 RtlDeleteAtomFromAtomTable@8 RtlDeleteCriticalSection@4 -;RtlDeleteElementGenericTable -;RtlDeleteNoSplay +RtlDeleteElementGenericTable@8 +RtlDeleteElementGenericTableAvl@8 +RtlDeleteNoSplay@8 RtlDeleteOwnersRanges@8 RtlDeleteRange@24 RtlDeleteRegistryValue@12 @@ -399,8 +400,11 @@ RtlEnlargedUnsignedMultiply@8 RtlEnterCriticalSection@4 RtlEnumProcessHeaps@8 -;RtlEnumerateGenericTable -;RtlEnumerateGenericTableWithoutSplaying +RtlEnumerateGenericTable@8 +RtlEnumerateGenericTableAvl@8 +RtlEnumerateGenericTableLikeADirectory@28 +RtlEnumerateGenericTableWithoutSplaying@8 +RtlEnumerateGenericTableWithoutSplayingAvl@8 RtlEqualComputerName@8 RtlEqualDomainName@8 RtlEqualLuid@8 @@ -449,7 +453,8 @@ RtlGetControlSecurityDescriptor@12 RtlGetCurrentDirectory_U@8 RtlGetDaclSecurityDescriptor@16 -;RtlGetElementGenericTable +RtlGetElementGenericTable@8 +RtlGetElementGenericTableAvl@8 RtlGetFirstRange@12 RtlGetFullPathName_U@16 RtlGetGroupSecurityDescriptor@12 @@ -483,13 +488,17 @@ RtlInitializeContext@20 RtlInitializeCriticalSection@4 RtlInitializeCriticalSectionAndSpinCount@8 -;RtlInitializeGenericTable +RtlInitializeGenericTable@20 +RtlInitializeGenericTableAvl@20 RtlInitializeHandleTable@12 RtlInitializeRangeList@4 RtlInitializeResource@4 ;RtlInitializeRXact RtlInitializeSid@12 -;RtlInsertElementGenericTable +RtlInsertElementGenericTable@16 +RtlInsertElementGenericTableAvl@16 +RtlInsertElementGenericTableFull@24 +RtlInsertElementGenericTableFullAvl@24 RtlInt64ToUnicodeString@16 RtlIntegerToChar@16 RtlIntegerToUnicodeString@12 @@ -512,6 +521,7 @@ RtlIpv6StringToAddressW@16 RtlIsDosDeviceName_U@4 RtlIsGenericTableEmpty@4 +RtlIsGenericTableEmptyAvl@4 RtlIsNameLegalDOS8Dot3@12 RtlIsRangeAvailable@40 RtlIsTextUnicode@12 @@ -532,7 +542,10 @@ RtlLocalTimeToSystemTime@8 RtlLockHeap@4 RtlLookupAtomInAtomTable@12 -;RtlLookupElementGenericTable +RtlLookupElementGenericTable@8 +RtlLookupElementGenericTableAvl@8 +RtlLookupElementGenericTableFull@16 +RtlLookupElementGenericTableFullAvl@16 RtlMakeSelfRelativeSD@12 RtlMapGenericMask@8 RtlMergeRangeLists@16 @@ -545,7 +558,8 @@ RtlNormalizeProcessParams@4 RtlNtPathNameToDosPathName@16 RtlNtStatusToDosError@4 -;RtlNumberGenericTableElements +RtlNumberGenericTableElements@4 +RtlNumberGenericTableElementsAvl@4 RtlNumberOfClearBits@4 RtlNumberOfSetBits@4 RtlOemStringToUnicodeSize@4 @@ -573,8 +587,8 @@ RtlRandom@4 RtlRandomEx=RtlRandom@4 RtlReAllocateHeap@16 -;RtlRealPredecessor -;RtlRealSuccessor +RtlRealPredecessor@4 +RtlRealSuccessor@4 RtlReleasePebLock@0 RtlReleaseResource@4 ;RtlRemoteCall @@ -607,7 +621,7 @@ ;RtlSetUserFlagsHeap ;RtlSetUserValueHeap RtlSizeHeap@12 -;RtlSplay +RtlSplay@4 ;RtlStartRXact RtlStringFromGUID@8 RtlSubAuthorityCountSid@4

19 years, 10 months

[weiden] 13568: don't walk all the timers as they're sorted.

by weiden＠svn.reactos.com

don't walk all the timers as they're sorted. Modified: trunk/reactos/ntoskrnl/ke/timer.c _____ Modified: trunk/reactos/ntoskrnl/ke/timer.c --- trunk/reactos/ntoskrnl/ke/timer.c 2005-02-14 16:49:36 UTC (rev 13567) +++ trunk/reactos/ntoskrnl/ke/timer.c 2005-02-14 17:03:16 UTC (rev 13568) @@ -245,15 +245,14 @@ Timer = CONTAINING_RECORD(CurrentEntry, KTIMER, TimerListEntry); DPRINT("Looping for Timer: %x. Duetime: %I64d. InterruptTime %I64d \n", Timer, Timer->DueTime.QuadPart, InterruptTime); - CurrentEntry = CurrentEntry->Flink; - /* Check if we have to Expire it */ - if (InterruptTime >= Timer->DueTime.QuadPart) { + if (InterruptTime < Timer->DueTime.QuadPart) break; + + CurrentEntry = CurrentEntry->Flink; - /* Remove it from the Timer List, add it to the Expired List */ - RemoveEntryList(&Timer->TimerListEntry); - InsertTailList(&ExpiredTimerList, &Timer->TimerListEntry); - } + /* Remove it from the Timer List, add it to the Expired List */ + RemoveEntryList(&Timer->TimerListEntry); + InsertTailList(&ExpiredTimerList, &Timer->TimerListEntry); } /* Expire the Timers */

19 years, 10 months

[weiden] 13567: fixed typo and don't use memcpy to just copy a 32bit variable...

by weiden＠svn.reactos.com

fixed typo and don't use memcpy to just copy a 32bit variable... Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/ntoskrnl/include/internal/ex.h _____ Modified: trunk/reactos/lib/kernel32/process/proc.c --- trunk/reactos/lib/kernel32/process/proc.c 2005-02-14 16:41:53 UTC (rev 13566) +++ trunk/reactos/lib/kernel32/process/proc.c 2005-02-14 16:49:36 UTC (rev 13567) @@ -297,7 +297,7 @@ return(FALSE); } - memcpy(lpExitCode, &ProcessBasic.ExitStatus, sizeof(DWORD)); + *lpExitCode = (DWORD)ProcessBasic.ExitStatus; return(TRUE); } _____ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h --- trunk/reactos/ntoskrnl/include/internal/ex.h 2005-02-14 16:41:53 UTC (rev 13566) +++ trunk/reactos/ntoskrnl/include/internal/ex.h 2005-02-14 16:49:36 UTC (rev 13567) @@ -121,7 +121,7 @@ ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation); NTSTATUS -ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId);; +ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId); #define InterlockedDecrementUL(Addend) \ (ULONG)InterlockedDecrement((PLONG)(Addend))

19 years, 10 months

← Newer
1
...
19
20
21
22
23
24
25
...
42
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 February 2005