Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gvg] 15499: Sync to Wine-20050524:
by gvg＠svn.reactos.com 26 May '05

26 May '05

Sync to Wine-20050524: Alexandre Julliard <julliard(a)winehq.org> - Free delayed import modules on PROCESS_DETACH. - Removed no longer used support for 32-bit register entry points. - Added support in winebuild for specifying import libraries directly on the command line without the -l option. - Changed the -d option to only mark the library as delayed, the actual loading is now done separately. - Generate 16-bit resources in the proper format inside the module data, and get rid of the special case for builtins in NE_DefResourceHandler. - Generate the 16-bit module header in the standard on-disk format, so that winebuild doesn't need to know about kernel internal structures. - Moved the generated code segment for 16-bit builtins inside the module structure. - Get rid of the BUILTIN16_DESCRIPTOR structure and directly register the MZ header instead. - Use RaiseException instead of RtlRaiseException in 16-bit spec files since they already depend on kernel32. - Renamed __wine_(un)register_dll_16 to __wine_dll_(un)register_16 for consistency with the 32-bit version, and also make the register function use the same prototype as the 32-bit one. - Use the exported IMAGE_OS2_HEADER to generate the module header in the spec file, and moved the NE_MODULE structure definition to kernel16_private.h. - Avoid referencing stackframe.h from outside kernel32. - Moved data structures for 16-bit relay calls to winbase16.h and removed builtin16.h. - Store the 16-bit stack pointer in the WOW32Reserved TEB field. - Use RaiseException instead of RtlRaiseException for delayed entry points load failure to avoid creating a dependency on ntdll. Modified: trunk/reactos/include/wine/exception.h Modified: 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 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/spec16.c Modified: trunk/reactos/tools/winebuild/spec32.c Modified: trunk/reactos/tools/winebuild/utils.c Modified: trunk/reactos/tools/winebuild/winebuild.man.in _____ Modified: trunk/reactos/include/wine/exception.h --- trunk/reactos/include/wine/exception.h 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/include/wine/exception.h 2005-05-26 09:44:59 UTC (rev 15499) @@ -24,6 +24,7 @@ #include <setjmp.h> #include <windef.h> #include <excpt.h> +#include <wine/port.h> /* The following definitions allow using exceptions in Wine and Winelib code * @@ -75,6 +76,10 @@ #else /* USE_COMPILER_EXCEPTIONS */ +#ifndef __GNUC__ +#define __attribute__(x) /* nothing */ +#endif + #define __TRY \ do { __WINE_FRAME __f; \ int __first = 1; \ @@ -91,7 +96,7 @@ __f.u.filter = (func); \ __wine_push_frame( &__f.frame ); \ if (sigsetjmp( __f.jmp, 1 )) { \ - const __WINE_FRAME * const __eptr WINE_UNUSED = &__f; \ + const __WINE_FRAME * const __eptr __attribute__((unused)) = &__f; \ do { #define __ENDTRY \ @@ -125,10 +130,7 @@ #define GetExceptionInformation() (__eptr) #define GetExceptionCode() (__eptr->ExceptionRecord->ExceptionCode) -#if defined(AbnormalTermination) && defined(__REACTOS__) #undef AbnormalTermination -#endif - #define AbnormalTermination() (!__normal) typedef struct __tagWINE_FRAME @@ -175,8 +177,6 @@ { #if defined(__GNUC__) && defined(__i386__) __asm__ __volatile__(".byte 0x64\n\tmovl %0,(0)" - //: : "r" (frame->Prev) : "memory" ); - //return frame->Prev; : : "r" (frame->prev) : "memory" ); return frame->prev; _____ Modified: trunk/reactos/tools/winebuild/Makefile --- trunk/reactos/tools/winebuild/Makefile 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/Makefile 2005-05-26 09:44:59 UTC (rev 15499) @@ -22,7 +22,7 @@ CLEAN_FILES = *.o $(TARGET) -HOST_CFLAGS = $(HOSTARCH) -D__USE_W32API -I$(PATH_TO_TOP)/include/wine +HOST_CFLAGS = $(HOSTARCH) -D__USE_W32API -I$(PATH_TO_TOP)/include/wine -I$(PATH_TO_TOP)/include %.o: %.c $(HOST_CC) $(HOST_CFLAGS) -c $< -o $@ _____ Modified: trunk/reactos/tools/winebuild/build.h --- trunk/reactos/tools/winebuild/build.h 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/build.h 2005-05-26 09:44:59 UTC (rev 15499) @@ -133,7 +133,7 @@ #define STACK32OFFSET(reg) STRUCTOFFSET(STACK32FRAME,reg) /* Offset of the stack pointer relative to %fs:(0) */ -#define STACKOFFSET (STRUCTOFFSET(TEB,cur_stack)) +#define STACKOFFSET (STRUCTOFFSET(TEB,WOW32Reserved)) #define MAX_ORDINALS 65535 @@ -148,6 +148,7 @@ extern void *xrealloc (void *ptr, size_t size); extern char *xstrdup( const char *str ); extern char *strupper(char *s); +extern int strendswith(const char* str, const char* end); extern void fatal_error( const char *msg, ... ) __attribute__ ((__format__ (__printf__, 1, 2))); extern void fatal_perror( const char *msg, ... ) @@ -167,16 +168,22 @@ extern const char *make_c_identifier( const char *str ); extern int get_alignment(int alignBoundary); -extern void add_import_dll( const char *name, int delay ); +extern void add_import_dll( const char *name, const char *filename ); +extern void add_delayed_import( const char *name ); extern void add_ignore_symbol( const char *name ); extern void read_undef_symbols( char **argv ); extern int resolve_imports( DLLSPEC *spec ); -extern int output_imports( FILE *outfile, DLLSPEC *spec ); +extern int output_imports( FILE *outfile, DLLSPEC *spec, int *nb_delayed ); extern int load_res32_file( const char *name, DLLSPEC *spec ); extern void output_resources( FILE *outfile, DLLSPEC *spec ); extern void load_res16_file( const char *name, DLLSPEC *spec ); -extern int output_res16_data( FILE *outfile, DLLSPEC *spec ); -extern int output_res16_directory( unsigned char *buffer, DLLSPEC *spec ); +extern unsigned int get_res16_data_size( DLLSPEC *spec, unsigned int res_offset, + unsigned int alignment ); +extern unsigned int output_res16_data( unsigned char **ret_buf, DLLSPEC *spec, + unsigned int res_offset, unsigned int alignment ); +extern unsigned int get_res16_directory_size( DLLSPEC *spec ); +extern unsigned int output_res16_directory( unsigned char **ret_buf, DLLSPEC *spec, + unsigned int res_offset, unsigned int alignment ); extern void output_dll_init( FILE *outfile, const char *constructor, const char *destructor ); extern void BuildRelays16( FILE *outfile ); _____ Modified: trunk/reactos/tools/winebuild/import.c --- trunk/reactos/tools/winebuild/import.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/import.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -26,16 +26,23 @@ #include <stdio.h> #include <string.h> #include <stdarg.h> +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif #ifdef HAVE_UNISTD_H # include <unistd.h> #endif #include "winglue.h" +#include "wine/exception.h" #include "build.h" struct import { - DLLSPEC *spec; /* description of the imported dll */ + DLLSPEC *spec; /* description of the imported dll */ + char *full_name; /* full name of the input file */ + dev_t dev; /* device/inode of the input file */ + ino_t ino; int delay; /* delay or not dll loading ? */ ORDDEF **exports; /* functions exported from this dll */ int nb_exports; /* number of exported functions */ @@ -58,6 +65,8 @@ static int nb_delayed = 0; /* number of delayed dlls */ static int total_imports = 0; /* total number of imported functions */ static int total_delayed = 0; /* total number of imported functions in delayed DLLs */ +static char **delayed_imports; /* names of delayed import dlls */ +static int nb_delayed_imports; /* size of the delayed_imports array */ /* list of symbols that are ignored by default */ static const char * const default_ignored_symbols[] = @@ -187,6 +196,7 @@ free( imp->exports ); free( imp->imports ); free_dll_spec( imp->spec ); + free( imp->full_name ); free( imp ); } @@ -196,16 +206,28 @@ if (ld_tmp_file) unlink( ld_tmp_file ); } +/* check whether a given dll is imported in delayed mode */ +static int is_delayed_import( const char *name ) +{ + int i; + + for (i = 0; i < nb_delayed_imports; i++) + { + if (!strcmp( delayed_imports[i], name )) return 1; + } + return 0; +} + /* check whether a given dll has already been imported */ -static int is_already_imported( const char *name ) +static struct import *is_already_imported( const char *name ) { int i; for (i = 0; i < nb_imports; i++) { - if (!strcmp( dll_imports[i]->spec->file_name, name )) return 1; + if (!strcmp( dll_imports[i]->spec->file_name, name )) return dll_imports[i]; } - return 0; + return NULL; } /* open the .so library for a given dll in a specified path */ @@ -227,8 +249,8 @@ return NULL; } -/* open the .so library for a given dll */ -static char *open_library( const char *name ) +/* find the .def import library for a given dll */ +static char *find_library( const char *name ) { char *fullname; int i; @@ -242,25 +264,37 @@ } /* read in the list of exported symbols of an import library */ -static int read_import_lib( const char *name, struct import *imp ) +static int read_import_lib( struct import *imp ) { FILE *f; - char *fullname; int i, ret; + struct stat stat; + struct import *prev_imp; DLLSPEC *spec = imp->spec; - imp->exports = NULL; - imp->nb_exports = 0; - - fullname = open_library( name ); - f = open_input_file( NULL, fullname ); - free( fullname ); - + f = open_input_file( NULL, imp->full_name ); + fstat( fileno(f), &stat ); + imp->dev = stat.st_dev; + imp->ino = stat.st_ino; ret = parse_def_file( f, spec ); close_input_file( f ); if (!ret) return 0; - if (is_already_imported( spec->file_name )) return 0; + /* check if we already imported that library from a different file */ + if ((prev_imp = is_already_imported( spec->file_name ))) + { + if (prev_imp->dev != imp->dev || prev_imp->ino != imp->ino) + fatal_error( "%s and %s have the same export name '%s'\n", + prev_imp->full_name, imp->full_name, spec->file_name ); + return 0; /* the same file was already loaded, ignore this one */ + } + + if (is_delayed_import( spec->file_name )) + { + imp->delay = 1; + nb_delayed++; + } + imp->exports = xmalloc( spec->nb_entry_points * sizeof(*imp->exports) ); for (i = 0; i < spec->nb_entry_points; i++) @@ -277,32 +311,47 @@ return 1; } -/* add a dll to the list of imports */ -void add_import_dll( const char *name, int delay ) +/* build the dll exported name from the import lib name or path */ +static char *get_dll_name( const char *name, const char *filename ) { - struct import *imp; - char *fullname; + char *ret; - fullname = xmalloc( strlen(name) + 5 ); - strcpy( fullname, name ); - if (!strchr( fullname, '.' )) strcat( fullname, ".dll" ); - - /* check if we already imported it */ - if (is_already_imported( fullname )) + if (filename) { - free( fullname ); - return; + const char *basename = strrchr( filename, '/' ); + if (!basename) basename = filename; + else basename++; + if (!strncmp( basename, "lib", 3 )) basename += 3; + ret = xmalloc( strlen(basename) + 5 ); + strcpy( ret, basename ); + if (strendswith( ret, ".def" )) ret[strlen(ret)-4] = 0; } + else + { + ret = xmalloc( strlen(name) + 5 ); + strcpy( ret, name ); + } + if (!strchr( ret, '.' )) strcat( ret, ".dll" ); + return ret; +} - imp = xmalloc( sizeof(*imp) ); +/* add a dll to the list of imports */ +void add_import_dll( const char *name, const char *filename ) +{ + struct import *imp = xmalloc( sizeof(*imp) ); + imp->spec = alloc_dll_spec(); - imp->spec->file_name = fullname; - imp->delay = delay; + imp->spec->file_name = get_dll_name( name, filename ); + imp->delay = 0; imp->imports = NULL; imp->nb_imports = 0; - if (delay) nb_delayed++; + imp->exports = NULL; + imp->nb_exports = 0; - if (read_import_lib( name, imp )) + if (filename) imp->full_name = xstrdup( filename ); + else imp->full_name = find_library( name ); + + if (read_import_lib( imp )) { dll_imports = xrealloc( dll_imports, (nb_imports+1) * sizeof(*dll_imports) ); dll_imports[nb_imports++] = imp; @@ -314,6 +363,21 @@ } } +/* add a library to the list of delayed imports */ +void add_delayed_import( const char *name ) +{ + struct import *imp; + char *fullname = get_dll_name( name, NULL ); + + delayed_imports = xrealloc( delayed_imports, (nb_delayed_imports+1) * sizeof(*delayed_imports) ); + delayed_imports[nb_delayed_imports++] = fullname; + if ((imp = is_already_imported( fullname )) && !imp->delay) + { + imp->delay = 1; + nb_delayed++; + } +} + /* remove an imported dll, based on its index in the dll_imports array */ static void remove_import_dll( int index ) { @@ -438,7 +502,7 @@ static void add_extra_undef_symbols( const DLLSPEC *spec ) { const char *extras[10]; - int i, count = 0, nb_stubs = 0, nb_regs = 0; + int i, count = 0, nb_stubs = 0; int kernel_imports = 0, ntdll_imports = 0; sort_symbols( undef_symbols, nb_undef_symbols ); @@ -447,7 +511,6 @@ { ORDDEF *odp = &spec->entry_points[i]; if (odp->type == TYPE_STUB) nb_stubs++; - if (odp->flags & FLAG_REGISTER) nb_regs++; } /* add symbols that will be contained in the spec file itself */ @@ -467,16 +530,16 @@ if (nb_delayed) { kernel_imports += add_extra_symbol( extras, &count, "LoadLibraryA", spec ); + kernel_imports += add_extra_symbol( extras, &count, "FreeLibrary", spec ); kernel_imports += add_extra_symbol( extras, &count, "GetProcAddress", spec ); + kernel_imports += add_extra_symbol( extras, &count, "RaiseException", spec ); } - if (nb_regs) - ntdll_imports += add_extra_symbol( extras, &count, "__wine_call_from_32_regs", spec ); - if (nb_delayed || nb_stubs) + if (nb_stubs) ntdll_imports += add_extra_symbol( extras, &count, "RtlRaiseException", spec ); /* make sure we import the dlls that contain these functions */ - if (kernel_imports) add_import_dll( "kernel32", 0 ); - if (ntdll_imports) add_import_dll( "ntdll", 0 ); + if (kernel_imports) add_import_dll( "kernel32", NULL ); + if (ntdll_imports) add_import_dll( "ntdll", NULL ); if (count) { @@ -777,10 +840,10 @@ if (!nb_delayed) goto done; + fprintf( outfile, "static void *__wine_delay_imp_hmod[%d];\n", nb_delayed ); for (i = 0; i < nb_imports; i++) { if (!dll_imports[i]->delay) continue; - fprintf( outfile, "static void *__wine_delay_imp_%d_hmod;\n", i); for (j = 0; j < dll_imports[i]->nb_imports; j++) { ORDDEF *odp = dll_imports[i]->imports[j]; @@ -807,7 +870,7 @@ for (i = j = 0; i < nb_imports; i++) { if (!dll_imports[i]->delay) continue; - fprintf( outfile, " { 0, \"%s\", &__wine_delay_imp_%d_hmod, &delay_imports.IAT[%d], &delay_imports.INT[%d], 0, 0, 0 },\n", + fprintf( outfile, " { 0, \"%s\", &__wine_delay_imp_hmod[%d], &delay_imports.IAT[%d], &delay_imports.INT[%d], 0, 0, 0 },\n", dll_imports[i]->spec->file_name, i, j, j ); j += dll_imports[i]->nb_imports; } @@ -839,21 +902,7 @@ } fprintf( outfile, " }\n};\n\n" ); - /* check if there's some stub defined. if so, exception struct - * is already defined, so don't emit it twice - */ - for (i = 0; i < spec->nb_entry_points; i++) if (spec->entry_points[i].type == TYPE_STUB) break; - - if (i == spec->nb_entry_points) { - fprintf( outfile, "struct exc_record {\n" ); - fprintf( outfile, " unsigned int code, flags;\n" ); - fprintf( outfile, " void *rec, *addr;\n" ); - fprintf( outfile, " unsigned int params;\n" ); - fprintf( outfile, " const void *info[15];\n" ); - fprintf( outfile, "};\n\n" ); - fprintf( outfile, "extern void __stdcall RtlRaiseException( struct exc_record * );\n" ); - } - + fprintf( outfile, "extern void __stdcall RaiseException(unsigned int, unsigned int, unsigned int, const void *args[]);\n" ); fprintf( outfile, "extern void * __stdcall LoadLibraryA(const char*);\n"); fprintf( outfile, "extern void * __stdcall GetProcAddress(void *, const char*);\n"); fprintf( outfile, "\n" ); @@ -871,20 +920,12 @@ fprintf( outfile, " /* patch IAT with final value */\n" ); fprintf( outfile, " return *pIAT = fn;\n" ); fprintf( outfile, " else {\n"); - fprintf( outfile, " struct exc_record rec;\n" ); - fprintf( outfile, " rec.code = 0x80000100;\n" ); - fprintf( outfile, " rec.flags = 1;\n" ); - fprintf( outfile, " rec.rec = 0;\n" ); - fprintf( outfile, " rec.params = 2;\n" ); - fprintf( outfile, " rec.info[0] = imd->szName;\n" ); - fprintf( outfile, " rec.info[1] = *pINT;\n" ); - fprintf( outfile, "#ifdef __GNUC__\n" ); - fprintf( outfile, " rec.addr = __builtin_return_address(1);\n" ); - fprintf( outfile, "#else\n" ); - fprintf( outfile, " rec.addr = 0;\n" ); - fprintf( outfile, "#endif\n" ); - fprintf( outfile, " for (;;) RtlRaiseException( &rec );\n" ); - fprintf( outfile, " return 0; /* shouldn't go here */\n" ); + fprintf( outfile, " const void *args[2];\n" ); + fprintf( outfile, " args[0] = imd->szName;\n" ); + fprintf( outfile, " args[1] = *pINT;\n" ); + fprintf( outfile, " RaiseException( 0x%08x, %d, 2, args );\n", + EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE ); + fprintf( outfile, " return 0;\n" ); fprintf( outfile, " }\n}\n\n" ); fprintf( outfile, "#ifndef __GNUC__\n" ); @@ -1100,8 +1141,8 @@ /* output the import and delayed import tables of a Win32 module * returns number of DLLs exported in 'immediate' mode */ -int output_imports( FILE *outfile, DLLSPEC *spec ) +int output_imports( FILE *outfile, DLLSPEC *spec, int *nb_delayed ) { - output_delayed_imports( outfile, spec ); - return output_immediate_imports( outfile ); + *nb_delayed = output_delayed_imports( outfile, spec ); + return output_immediate_imports( outfile ); } _____ Modified: trunk/reactos/tools/winebuild/main.c --- trunk/reactos/tools/winebuild/main.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/main.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -283,7 +283,7 @@ spec->dll_name = xstrdup( optarg ); break; case 'd': - add_import_dll( optarg, 1 ); + add_delayed_import( optarg ); break; case 'e': spec->init_func = xstrdup( optarg ); @@ -312,7 +312,7 @@ kill_at = 1; break; case 'l': - add_import_dll( optarg, 0 ); + add_import_dll( optarg, NULL ); break; case 'o': if (unlink( optarg ) == -1 && errno != ENOENT) @@ -408,6 +408,21 @@ } } +/* add input files that look like import libs to the import list */ +static void load_import_libs( char *argv[] ) +{ + char **ptr, **last; + + for (ptr = last = argv; *ptr; ptr++) + { + if (strendswith( *ptr, ".def" )) + add_import_dll( NULL, *ptr ); + else + *last++ = *ptr; /* not an import dll, keep it in the list */ + } + *last = NULL; +} + static int parse_input_file( DLLSPEC *spec ) { FILE *input_file = open_input_file( NULL, spec_file_name ); @@ -444,6 +459,7 @@ case MODE_DLL: spec->characteristics |= IMAGE_FILE_DLL; load_resources( argv, spec ); + load_import_libs( argv ); if (!spec_file_name) fatal_error( "missing .spec file\n" ); if (!parse_input_file( spec )) break; switch (spec->type) @@ -462,6 +478,7 @@ if (spec->type == SPEC_WIN16) fatal_error( "Cannot build 16-bit exe files\n" ); if (!spec->file_name) fatal_error( "executable must be named via the -F option\n" ); load_resources( argv, spec ); + load_import_libs( argv ); if (spec_file_name && !parse_input_file( spec )) break; read_undef_symbols( argv ); BuildSpec32File( output_file, spec ); _____ Modified: trunk/reactos/tools/winebuild/parser.c --- trunk/reactos/tools/winebuild/parser.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/parser.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -511,6 +511,12 @@ odp->ordinal = ordinal; } + if (spec->type == SPEC_WIN32 && odp->flags & FLAG_REGISTER) + { + error( "-register flag not supported for Win32 entry points\n" ); + goto error; + } + if (odp->type == TYPE_STDCALL && !(odp->flags & FLAG_PRIVATE)) { if (!strcmp( odp->name, "DllRegisterServer" ) || _____ Modified: trunk/reactos/tools/winebuild/relay.c --- trunk/reactos/tools/winebuild/relay.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/relay.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -27,7 +27,7 @@ #include <ctype.h> #include "thread.h" -#include "stackframe.h" +#include "wine/winbase16.h" #include "build.h" _____ Modified: trunk/reactos/tools/winebuild/res16.c --- trunk/reactos/tools/winebuild/res16.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/res16.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -20,6 +20,7 @@ #include "config.h" +#include <assert.h> #include <ctype.h> #include <stdlib.h> #include <string.h> @@ -39,9 +40,6 @@ #include "winglue.h" #include "build.h" -#define ALIGNMENT 2 /* alignment for resource data */ -#define ALIGN_MASK ((1 << ALIGNMENT) - 1) - /* Unicode string or integer id */ struct string_id { @@ -265,49 +263,116 @@ while (len--) put_byte( buffer, *str++ ); } +/* get the resource data total size */ +unsigned int get_res16_data_size( DLLSPEC *spec, unsigned int res_offset, unsigned int alignment ) +{ + const struct resource *res; + unsigned int i, total; + unsigned int align_mask = (1 << alignment) - 1; + + if (!spec->nb_resources) return 0; + + /* add padding at the beginning if needed so that resources are properly aligned */ + total = ((res_offset + align_mask) & ~align_mask) - res_offset; + + for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) + total += (res->data_size + align_mask) & ~align_mask; + + return total; +} + /* output the resource data */ -int output_res16_data( FILE *outfile, DLLSPEC *spec ) +unsigned int output_res16_data( unsigned char **ret_buf, DLLSPEC *spec, + unsigned int res_offset, unsigned int alignment ) { const struct resource *res; - unsigned char *buffer, *p; - unsigned int i; - int total; + unsigned char *p; + unsigned int i, total, padding; + unsigned int align_mask = (1 << alignment) - 1; if (!spec->nb_resources) return 0; + /* add padding at the beginning if needed so that resources are properly aligned */ + padding = ((res_offset + align_mask) & ~align_mask) - res_offset; + for (i = total = 0, res = spec->resources; i < spec->nb_resources; i++, res++) - total += (res->data_size + ALIGN_MASK) & ~ALIGN_MASK; + total += (res->data_size + align_mask) & ~align_mask; - buffer = p = xmalloc( total ); + *ret_buf = p = xmalloc( total + padding ); + memset( p, 0, padding ); + p += padding; for (i = 0, res = spec->resources; i < spec->nb_resources; i++, res++) { + unsigned int size = (res->data_size + align_mask) & ~align_mask; memcpy( p, res->data, res->data_size ); - p += res->data_size; - while ((int)p & ALIGN_MASK) *p++ = 0; + memset( p + res->data_size, 0, size - res->data_size ); + p += size; } - dump_bytes( outfile, buffer, total, "resource_data", 1 ); - free( buffer ); return total; } +/* get the resource definitions total size */ +unsigned int get_res16_directory_size( DLLSPEC *spec ) +{ + unsigned int i, j, total_size; + struct res_tree *tree; + const struct res_type *type; + const struct resource *res; + + tree = build_resource_tree( spec ); + + total_size = 4; /* alignment + terminator */ + total_size += tree->nb_types * 8; /* typeinfo structures */ + total_size += spec->nb_resources * 12; /* nameinfo structures */ + + for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) + { + if (type->type->str) total_size += strlen(type->type->str) + 1; + for (j = 0, res = type->res; j < type->nb_names; j++, res++) + if (res->name.str) total_size += strlen(res->name.str) + 1; + } + total_size++; /* final terminator */ + if (total_size & 1) total_size++; + return total_size; +} + /* output the resource definitions */ -int output_res16_directory( unsigned char *buffer, DLLSPEC *spec ) +unsigned int output_res16_directory( unsigned char **ret_buf, DLLSPEC *spec, + unsigned int res_offset, unsigned int alignment ) { - int offset, res_offset = 0; - unsigned int i, j; + int offset; + unsigned int i, j, total_size; + unsigned int align_mask = (1 << alignment) - 1; struct res_tree *tree; const struct res_type *type; const struct resource *res; - unsigned char *start = buffer; + unsigned char *buffer; tree = build_resource_tree( spec ); + /* make sure data offset is properly aligned */ + res_offset = (res_offset + align_mask) & ~align_mask; + + /* first compute total size */ + offset = 4; /* alignment + terminator */ offset += tree->nb_types * 8; /* typeinfo structures */ offset += spec->nb_resources * 12; /* nameinfo structures */ - put_word( &buffer, ALIGNMENT ); + total_size = offset; + for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) + { + if (type->type->str) total_size += strlen(type->type->str) + 1; + for (j = 0, res = type->res; j < type->nb_names; j++, res++) + if (res->name.str) total_size += strlen(res->name.str) + 1; + } + total_size++; /* final terminator */ + if (total_size & 1) total_size++; + *ret_buf = buffer = xmalloc( total_size ); + + put_word( &buffer, alignment ); + /* type and name structures */ for (i = 0, type = tree->types; i < tree->nb_types; i++, type++) @@ -326,8 +391,8 @@ for (j = 0, res = type->res; j < type->nb_names; j++, res++) { - put_word( &buffer, res_offset >> ALIGNMENT ); - put_word( &buffer, (res->data_size + ALIGN_MASK) >> ALIGNMENT ); + put_word( &buffer, res_offset >> alignment ); + put_word( &buffer, (res->data_size + align_mask) >> alignment ); put_word( &buffer, res->memopt ); if (res->name.str) { @@ -338,7 +403,7 @@ put_word( &buffer, res->name.id | 0x8000 ); put_word( &buffer, 0 ); put_word( &buffer, 0 ); - res_offset += (res->data_size + ALIGN_MASK) & ~ALIGN_MASK; + res_offset += (res->data_size + align_mask) & ~align_mask; } } put_word( &buffer, 0 ); /* terminator */ @@ -354,8 +419,9 @@ } } put_byte( &buffer, 0 ); /* names terminator */ - if ((buffer - start) & 1) put_byte( &buffer, 0 ); /* align on word boundary */ + if ((buffer - *ret_buf) & 1) put_byte( &buffer, 0 ); /* align on word boundary */ + assert( buffer - *ret_buf == total_size ); free_resource_tree( tree ); - return buffer - start; + return total_size; } _____ Modified: trunk/reactos/tools/winebuild/spec16.c --- trunk/reactos/tools/winebuild/spec16.c 2005-05-26 06:30:47 UTC (rev 15498) +++ trunk/reactos/tools/winebuild/spec16.c 2005-05-26 09:44:59 UTC (rev 15499) @@ -28,9 +28,7 @@ #include <ctype.h> #include "wine/exception.h" -#include "stackframe.h" -#include "builtin16.h" -#include "module.h" +#include "wine/winbase16.h" #include "build.h" @@ -76,230 +74,95 @@ /******************************************************************* - * StoreVariableCode - * - * Store a list of ints into a byte array. + * output_entry_table */ -static int StoreVariableCode( unsigned char *buffer, int size, ORDDEF *odp ) +static int output_entry_table( unsigned char **ret_buff, DLLSPEC *spec ) { - int i; + int i, prev = 0, prev_sel = -1; + unsigned char *pstr, *buffer; + unsigned char *bundle = NULL; - switch(size) - { - case 1: - for (i = 0; i < odp->u.var.n_values; i++) - buffer[i] = odp->u.var.values[i]; - break; - case 2: - for (i = 0; i < odp->u.var.n_values; i++) - ((unsigned short *)buffer)[i] = odp->u.var.values[i]; - break; - case 4: - for (i = 0; i < odp->u.var.n_values; i++) - ((unsigned int *)buffer)[i] = odp->u.var.values[i]; - break; - } - return odp->u.var.n_values * size; -} + buffer = xmalloc( spec->limit * 5 ); /* we use at most 5 bytes per entry-point */ + pstr = buffer; - -/******************************************************************* - * BuildModule16 - * - * Build the in-memory representation of a 16-bit NE module, and dump it - * as a byte stream into the assembly code. - */ -static int BuildModule16( FILE *outfile, int max_code_offset, - int max_data_offset, DLLSPEC *spec ) -{ - int i; - char *buffer; - NE_MODULE *pModule; - SEGTABLEENTRY *pSegment; - OFSTRUCT *pFileInfo; - BYTE *pstr; - ET_BUNDLE *bundle = 0; - ET_ENTRY entry; - - /* Module layout: - * NE_MODULE Module - * OFSTRUCT File information - * SEGTABLEENTRY Segment 1 (code) - * SEGTABLEENTRY Segment 2 (data) - * WORD[2] Resource table (empty) - * BYTE[2] Imported names (empty) - * BYTE[n] Resident names table - * BYTE[n] Entry table - */ - - buffer = xmalloc( 0x10000 ); - memset( buffer, 0, 0x10000 ); - - pModule = (NE_MODULE *)buffer; - pModule->magic = IMAGE_OS2_SIGNATURE; - pModule->count = 1; - pModule->next = 0; - pModule->flags = NE_FFLAGS_SINGLEDATA | NE_FFLAGS_BUILTIN | NE_FFLAGS_LIBMODULE; - pModule->dgroup = 2; - pModule->heap_size = spec->heap_size; - pModule->stack_size = 0; - pModule->ip = 0; - pModule->cs = 0; - pModule->sp = 0; - pModule->ss = 0; - pModule->seg_count = 2; - pModule->modref_count = 0; - pModule->nrname_size = 0; - pModule->modref_table = 0; - pModule->nrname_fpos = 0; - pModule->moveable_entries = 0; - pModule->alignment = 0; - pModule->truetype = 0; - pModule->os_flags = NE_OSFLAGS_WINDOWS; - pModule->misc_flags = 0; - pModule->dlls_to_init = 0; - pModule->nrname_handle = 0; - pModule->min_swap_area = 0; - pModule->expected_version = 0; - pModule->module32 = 0; - pModule->self = 0; - pModule->self_loading_sel = 0; - - /* File information */ - - pFileInfo = (OFSTRUCT *)(pModule + 1); - pModule->fileinfo = (int)pFileInfo - (int)pModule; - memset( pFileInfo, 0, sizeof(*pFileInfo) - sizeof(pFileInfo->szPathName) ); - pFileInfo->cBytes = sizeof(*pFileInfo) - sizeof(pFileInfo->szPathName) - + strlen(spec->file_name); - strcpy( pFileInfo->szPathName, spec->file_name ); - pstr = (char *)pFileInfo + pFileInfo->cBytes + 1; - - /* Segment table */ - - pstr = (char *)(((long)pstr + 3) & ~3); - pSegment = (SEGTABLEENTRY *)pstr; - pModule->seg_table = (int)pSegment - (int)pModule; - pSegment->filepos = 0; - pSegment->size = max_code_offset; - pSegment->flags = 0; - pSegment->minsize = max_code_offset; - pSegment->hSeg = 0; - pSegment++; - - pModule->dgroup_entry = (int)pSegment - (int)pModule; - pSegment->filepos = 0; - pSegment->size = max_data_offset; - pSegment->flags = NE_SEGFLAGS_DATA; - pSegment->minsize = max_data_offset; - pSegment->hSeg = 0; - pSegment++; - - /* Resource table */ - - pstr = (char *)pSegment; - pstr = (char *)(((long)pstr + 3) & ~3); - pModule->res_table = (int)pstr - (int)pModule; - pstr += output_res16_directory( pstr, spec ); - - /* Imported names table */ - - pstr = (char *)(((long)pstr + 3) & ~3); - pModule->import_table = (int)pstr - (int)pModule; - *pstr++ = 0; - *pstr++ = 0; - - /* Resident names table */ - - pstr = (char *)(((long)pstr + 3) & ~3); - pModule->name_table = (int)pstr - (int)pModule; - /* First entry is module name */ - *pstr = strlen( spec->dll_name ); - strcpy( pstr + 1, spec->dll_name ); - strupper( pstr + 1 ); - pstr += *pstr + 1; - *pstr++ = 0; - *pstr++ = 0; - /* Store all ordinals */ for (i = 1; i <= spec->limit; i++) { - ORDDEF *odp = spec->ordinals[i]; - WORD ord = i; - if (!odp || !odp->name[0]) continue; - *pstr = strlen( odp->name ); - strcpy( pstr + 1, odp->name ); - strupper( pstr + 1 ); - pstr += *pstr + 1; - memcpy( pstr, &ord, sizeof(WORD) ); - pstr += sizeof(WORD); - } - *pstr++ = 0; - - /* Entry table */ - - pstr = (char *)(((long)pstr + 3) & ~3); - pModule->entry_table = (int)pstr - (int)pModule; - for (i = 1; i <= spec->limit; i++) - { int selector = 0; + WORD offset; ORDDEF *odp = spec->ordinals[i]; if (!odp) continue; - switch (odp->type) - { + switch (odp->type) + { case TYPE_CDECL: case TYPE_PASCAL: case TYPE_VARARGS: case TYPE_STUB: selector = 1; /* Code selector */ break; - case TYPE_VARIABLE: selector = 2; /* Data selector */ break; - case TYPE_ABS: selector = 0xfe; /* Constant selector */ break; - default: - selector = 0; /* Invalid selector */ - break; + continue; } - if ( !selector ) - continue; - - if ( bundle && bundle->last+1 == i ) - bundle->last++; - else + if (!bundle || prev + 1 != i || prev_sel != selector || *bundle == 255) { - pstr = (char *)(((long)pstr + 1) & ~1); - if ( bundle ) - bundle->next = (char *)pstr - (char *)pModule; + /* need to start a new bundle */ - bundle = (ET_BUNDLE *)pstr; - bundle->first = i-1; - bundle->last = i; - bundle->next = 0; - pstr += sizeof(ET_BUNDLE); + if (prev + 1 != i) + { + int skip = i - (prev + 1); + while (skip > 255) + { + *pstr++ = 255; + *pstr++ = 0; + skip -= 255; + } + *pstr++ = skip; + *pstr++ = 0; + } + + bundle = pstr; + *pstr++ = 0; + *pstr++ = selector; + prev_sel = selector; } - - /* FIXME: is this really correct ?? */ - entry.type = 0xff; /* movable */ - entry.flags = 3; /* exported & public data */ - entry.segnum = selector; - entry.offs = odp->offset; - memcpy( pstr, &entry, sizeof(ET_ENTRY) ); - pstr += sizeof(ET_ENTRY); [truncated at 1000 lines; 698 more skipped]

1 0

[hpoussin] 15498: Fix DPRINT1 messages to display correctly memory ranges
by hpoussin＠svn.reactos.com 26 May '05

26 May '05

Fix DPRINT1 messages to display correctly memory ranges Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c _____ Modified: trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c --- trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-05-25 22:36:35 UTC (rev 15497) +++ trunk/reactos/drivers/usb/cromwell/linux/pci_hal.c 2005-05-26 06:30:47 UTC (rev 15498) @@ -126,7 +126,7 @@ */ static int __inline__ request_mem_region(PHYSICAL_ADDRESS addr, unsigned long len, const char * d) { - DPRINT1("request_mem_region(): addr=0x%x, len=0x%x\n", addr, len); + DPRINT1("request_mem_region(): addr=0x%lx, len=0x%lx\n", addr.u.LowPart, len); return 1; } @@ -143,7 +143,7 @@ static void __inline__ *ioremap_nocache(PHYSICAL_ADDRESS addr, unsigned long len) { // MmMapIoSpace with NoCache param - DPRINT1("ioremap_nocache(): addr=0x%x, len=0x%x\n", addr, len); + DPRINT1("ioremap_nocache(): addr=0x%lx, len=0x%lx\n", addr.u.LowPart, len); return MmMapIoSpace(addr, len, MmNonCached); } @@ -157,6 +157,6 @@ */ static int __inline__ release_mem_region(PHYSICAL_ADDRESS addr, unsigned long len) { - DPRINT1("release_mem_region(): addr=0x%x, len=0x%x\n", addr, len); + DPRINT1("release_mem_region(): addr=0x%lx, len=0x%lx\n", addr.u.LowPart, len); return 0; }

1 0

[gvg] 15497: Implement sub-allocation of small requests
by gvg＠svn.reactos.com 25 May '05

25 May '05

Implement sub-allocation of small requests Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr.c --- trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-25 20:59:13 UTC (rev 15496) +++ trunk/reactos/boot/freeldr/freeldr/freeldr.c 2005-05-25 22:36:35 UTC (rev 15497) @@ -35,7 +35,7 @@ DebugInit(); - DbgPrint((DPRINT_WARNING, "BootMain() called. BootDrive = 0x%x BootPartition = %d\n", BootDrive, BootPartition)); + DbgPrint((DPRINT_WARNING, "BootMain() called.\n")); if (!MmInitializeMemoryManager()) { _____ Modified: trunk/reactos/boot/freeldr/freeldr/mm/mm.c --- trunk/reactos/boot/freeldr/freeldr/mm/mm.c 2005-05-25 20:59:13 UTC (rev 15496) +++ trunk/reactos/boot/freeldr/freeldr/mm/mm.c 2005-05-25 22:36:35 UTC (rev 15497) @@ -36,10 +36,30 @@ VOID MemAllocTest(VOID); #endif // DEBUG +/* + * Hack alert + * Normally, we allocate whole pages. This is ofcourse wastefull for small + * allocations (a few bytes). So, for small allocations (smaller than a page) + * we sub-allocate. When the first small allocation is done, a page is + * requested. We keep a pointer to that page in SubAllocationPage. The alloc + * is satisfied by returning a pointer to the beginning of the page. We also + * keep track of how many bytes are still available in the page in SubAllocationRest. + * When the next small request comes in, we try to allocate it just after the + * memory previously allocated. If it won't fit, we allocate a new page and + * the whole process starts again. + * Note that suballocations are done back-to-back, there's no bookkeeping at all. + * That also means that we cannot really free suballocations. So, when a free is + * done and it is determined that this might be a free of a sub-allocation, we + * just no-op the free. + * Perhaps we should use the heap routines from ntdll here. + */ +static PVOID SubAllocationPage = NULL; +static unsigned SubAllocationRest = 0; + PVOID MmAllocateMemory(ULONG MemorySize) { - ULONG PagesNeeded; - ULONG FirstFreePageFromEnd; + ULONG PagesNeeded; + ULONG FirstFreePageFromEnd; PVOID MemPointer; if (MemorySize == 0) @@ -49,6 +69,14 @@ return NULL; } + MemorySize = ROUND_UP(MemorySize, 4); + if (MemorySize <= SubAllocationRest) + { + MemPointer = SubAllocationPage + MM_PAGE_SIZE - SubAllocationRest; + SubAllocationRest -= MemorySize; + return MemPointer; + } + // Find out how many blocks it will take to // satisfy this allocation PagesNeeded = ROUND_UP(MemorySize, MM_PAGE_SIZE) / MM_PAGE_SIZE; @@ -76,6 +104,13 @@ FreePagesInLookupTable -= PagesNeeded; MemPointer = (PVOID)(FirstFreePageFromEnd * MM_PAGE_SIZE); + if (MemorySize < MM_PAGE_SIZE) + { + SubAllocationPage = MemPointer; + SubAllocationRest = MM_PAGE_SIZE - MemorySize; + } + + #ifdef DEBUG IncrementAllocationCount(); DbgPrint((DPRINT_MEMORY, "Allocated %d bytes (%d pages) of memory starting at page %d. AllocCount: %d\n", MemorySize, PagesNeeded, FirstFreePageFromEnd, AllocationCount)); @@ -235,6 +270,13 @@ #endif + /* If this allocation is only a single page, it could be a sub-allocated page. + * Just don't free it */ + if (1 == PageCount) + { + return; + } + // Loop through our array and mark all the // blocks as free for (Idx=PageNumber; Idx<(PageNumber + PageCount); Idx++)

1 0

[fireball] 15496: Now UHCI HCD driver supports recognizing Memory type of resource. Should help James Tabor's problem (VIA chipset, getting only memory resource as unrecognized, and thus driver failing loading).
by fireball＠svn.reactos.com 25 May '05

25 May '05

Now UHCI HCD driver supports recognizing Memory type of resource. Should help James Tabor's problem (VIA chipset, getting only memory resource as unrecognized, and thus driver failing loading). Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-25 14:25:19 UTC (rev 15495) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci-hcd.c 2005-05-25 20:59:13 UTC (rev 15496) @@ -2491,7 +2491,7 @@ static const char hcd_name[] = "uhci-hcd"; -static const struct hc_driver uhci_driver = { +static struct hc_driver uhci_driver = { .description = hcd_name, /* Generic hardware linkage */ _____ Modified: trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c --- trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-25 14:25:19 UTC (rev 15495) +++ trunk/reactos/drivers/usb/cromwell/uhci/uhci_main.c 2005-05-25 20:59:13 UTC (rev 15496) @@ -6,9 +6,14 @@ #include <ddk/ntddk.h> #include <debug.h> -#include "../linux/linux_wrapper.h" + +// config and include core/hcd.h, for hc_device struct +#include "../usb_wrapper.h" +#include "../core/hcd.h" + #include "../host/ohci_main.h" + // declare basic init funcs void init_wrapper(struct pci_dev *probe_dev); int uhci_hcd_init(void); @@ -16,15 +21,13 @@ int STDCALL usb_init(void); void STDCALL usb_exit(void); extern struct pci_driver uhci_pci_driver; -extern const struct pci_device_id uhci_pci_ids[]; +extern struct pci_device_id uhci_pci_ids[]; - // This should be removed, but for testing purposes it's here struct pci_dev *dev; //struct pci_device_id *dev_id; - #define USB_UHCI_TAG TAG('u','s','b','u') NTSTATUS STDCALL AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT pdo) @@ -229,10 +232,23 @@ DeviceExtension->BaseAddress = Descriptor->u.Port.Start; DeviceExtension->BaseAddrLength = Descriptor->u.Port.Length; DeviceExtension->Flags = Descriptor->Flags; + + ((struct hc_driver *)uhci_pci_ids->driver_data)->flags &= ~HCD_MEMORY; DPRINT1("I/O resource: start=0x%x, length=0x%x\n", DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength); } + else if (Descriptor->Type == CmResourceTypeMemory) + { + DeviceExtension->BaseAddress = Descriptor->u.Memory.Start; + DeviceExtension->BaseAddrLength = Descriptor->u.Memory.Length; + DeviceExtension->Flags = Descriptor->Flags; + + ((struct hc_driver *)uhci_pci_ids->driver_data)->flags |= HCD_MEMORY; + + DPRINT1("Memory resource: start=0x%x, length=0x%x\n", + DeviceExtension->BaseAddress.u.LowPart, DeviceExtension->BaseAddrLength); + } else DPRINT1("Get resource type: %d, Generic start=0x%x Generic length=0x%x\n", Descriptor->Type, Descriptor->u.Generic.Start.u.LowPart, Descriptor->u.Generic.Length);

1 0

[greatlrd] 15495: New normal curosr by irc:mf
by greatlrd＠svn.reactos.com 25 May '05

25 May '05

New normal curosr by irc:mf Modified: trunk/reactos/lib/user32/resources/ocr_normal.cur _____ Modified: trunk/reactos/lib/user32/resources/ocr_normal.cur (Binary files differ)

1 0

[ion] 15494: Build usetup and ntoskrnl and winmm in gcc 4.0
by ion＠svn.reactos.com 25 May '05

25 May '05

Build usetup and ntoskrnl and winmm in gcc 4.0 Modified: trunk/reactos/lib/mmdrv/wave.c Modified: trunk/reactos/ntoskrnl/ob/object.c Modified: trunk/reactos/subsys/system/usetup/cabinet.c _____ Modified: trunk/reactos/lib/mmdrv/wave.c --- trunk/reactos/lib/mmdrv/wave.c 2005-05-25 09:14:29 UTC (rev 15493) +++ trunk/reactos/lib/mmdrv/wave.c 2005-05-25 13:07:27 UTC (rev 15494) @@ -275,7 +275,7 @@ case WODM_GETVOLUME: DPRINT("WODM_GETVOLUME"); { - WAVE_DD_VOLUME Vol; + WAVE_DD_VOLUME Vol = {}; DWORD res; res = soundGetData(WaveOutDevice, dwId, sizeof(Vol), _____ Modified: trunk/reactos/ntoskrnl/ob/object.c --- trunk/reactos/ntoskrnl/ob/object.c 2005-05-25 09:14:29 UTC (rev 15493) +++ trunk/reactos/ntoskrnl/ob/object.c 2005-05-25 13:07:27 UTC (rev 15494) @@ -31,7 +31,7 @@ IN KPROCESSOR_MODE AccessMode) { NTSTATUS Status = STATUS_SUCCESS; - UNICODE_STRING LocalName; + UNICODE_STRING LocalName = {}; /* <= GCC 4.0 + Optimizer */ /* First Probe the String */ DPRINT("ObpCaptureObjectName: %wZ\n", ObjectName); _____ Modified: trunk/reactos/subsys/system/usetup/cabinet.c --- trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-25 09:14:29 UTC (rev 15493) +++ trunk/reactos/subsys/system/usetup/cabinet.c 2005-05-25 13:07:27 UTC (rev 15494) @@ -599,7 +599,7 @@ wcscpy(CabinetPrev, CabinetName); RemoveFileName(CabinetPrev); CabinetNormalizePath(CabinetPrev, 256); - RtlInitAnsiString( &astring, Buffer ); + RtlInitAnsiString( &astring, (LPSTR)Buffer ); ustring.Length = wcslen( CabinetPrev ); ustring.Buffer = CabinetPrev + ustring.Length; ustring.MaximumLength = sizeof( CabinetPrev ) - ustring.Length; @@ -607,7 +607,7 @@ Buffer += astring.Length + 1; /* Read label of prev disk */ - RtlInitAnsiString( &astring, Buffer ); + RtlInitAnsiString( &astring, (LPSTR)Buffer ); ustring.Length = 0; ustring.Buffer = DiskPrev; ustring.MaximumLength = sizeof( DiskPrev ); @@ -626,7 +626,7 @@ wcscpy(CabinetNext, CabinetName); RemoveFileName(CabinetNext); CabinetNormalizePath(CabinetNext, 256); - RtlInitAnsiString( &astring, Buffer ); + RtlInitAnsiString( &astring, (LPSTR)Buffer ); ustring.Length = wcslen( CabinetNext ); ustring.Buffer = CabinetNext + ustring.Length; ustring.MaximumLength = sizeof( CabinetNext ) - ustring.Length; @@ -634,7 +634,7 @@ Buffer += astring.Length + 1; /* Read label of next disk */ - RtlInitAnsiString( &astring, Buffer ); + RtlInitAnsiString( &astring, (LPSTR)Buffer ); ustring.Length = 0; ustring.Buffer = DiskNext; ustring.MaximumLength = sizeof( DiskNext ); @@ -999,7 +999,7 @@ CFData = (PCFDATA)((char *)(CFData+1) + DataReserved + CFData->CompSize); } // now decompress and discard any data in the block before the start of the file - CurrentBuffer = ((char *)(CFData+1)) + DataReserved; // start of comp data + CurrentBuffer = ((unsigned char *)(CFData+1)) + DataReserved; // start of comp data RemainingBlock = CFData->CompSize; InputLength = RemainingBlock; while( CurrentOffset < Search->File->FileOffset ) @@ -1047,7 +1047,7 @@ DPRINT( "Out of block data\n" ); CFData = (PCFDATA)CurrentBuffer; RemainingBlock = CFData->CompSize; - CurrentBuffer = ((char *)(CFData+1) + DataReserved); + CurrentBuffer = ((unsigned char *)(CFData+1) + DataReserved); InputLength = RemainingBlock; } }

1 0

[greatlrd] 15493: Correct bug do not enum other color deep that 8, 16, 24, 32 it will create memmory leek other wise.
by greatlrd＠svn.reactos.com 25 May '05

25 May '05

Correct bug do not enum other color deep that 8,16,24,32 it will create memmory leek other wise. in the current code. Modified: trunk/reactos/lib/cpl/desk/settings.c _____ Modified: trunk/reactos/lib/cpl/desk/settings.c --- trunk/reactos/lib/cpl/desk/settings.c 2005-05-25 04:16:56 UTC (rev 15492) +++ trunk/reactos/lib/cpl/desk/settings.c 2005-05-25 09:14:29 UTC (rev 15493) @@ -88,7 +88,7 @@ PSETTINGS_ENTRY Settings = NULL; HDC hDC; PSETTINGS_ENTRY Current; - DWORD bpp, xres, yres; + DWORD bpp, xres, yres, checkbpp; /* Get current settings */ *CurrentSettings = NULL; @@ -105,13 +105,16 @@ while (EnumDisplaySettingsEx(DeviceName, iMode, &devmode, dwFlags)) { + if (devmode.dmBitsPerPel==8 || devmode.dmBitsPerPel==16 || devmode.dmBitsPerPel==24 || devmode.dmBitsPerPel==32) checkbpp=1; + else checkbpp=0; + if (devmode.dmPelsWidth < 640 || - devmode.dmPelsHeight < 480) + devmode.dmPelsHeight < 480 || checkbpp == 0) { iMode++; continue; } - + Current = HeapAlloc(GetProcessHeap(), 0, sizeof(SETTINGS_ENTRY)); if (Current != NULL) {

1 0

[ion] 15492: Nonpaged Pool Liberation Day: Allow PagedPool to be used earlier, allow fast mutex to be used earlier on debug builds. Allocate all Se stuff from PagedPool, set the right object types to use paged pool, allocate all strings from paged pool, allocate PE sections from paged pool, and a bunch of other things which should, imo, be in paged pool. If anyone has any contradicting proof, let me know...until then, enjoy ~4-6MB more NonPagedPool
by ion＠svn.reactos.com 25 May '05

25 May '05

Nonpaged Pool Liberation Day: Allow PagedPool to be used earlier, allow fast mutex to be used earlier on debug builds. Allocate all Se stuff from PagedPool, set the right object types to use paged pool, allocate all strings from paged pool, allocate PE sections from paged pool, and a bunch of other things which should, imo, be in paged pool. If anyone has any contradicting proof, let me know...until then, enjoy ~4-6MB more NonPagedPool Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/ntoskrnl/cm/registry.c Modified: trunk/reactos/ntoskrnl/ex/fmutex.c Modified: trunk/reactos/ntoskrnl/ex/init.c Modified: trunk/reactos/ntoskrnl/include/internal/tag.h Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/rtl/handle.c Modified: trunk/reactos/ntoskrnl/se/acl.c Modified: trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/se/semgr.c Modified: trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/ntoskrnl/se/token.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/lib/rtl/unicode.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -990,7 +990,7 @@ AnsiDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -1073,7 +1073,7 @@ UniDest, OemSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -1157,7 +1157,7 @@ OemDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -1304,7 +1304,7 @@ UniDest, OemSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -1634,7 +1634,7 @@ OemDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } /* @@ -1766,7 +1766,7 @@ UniDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -1833,7 +1833,7 @@ AnsiDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } /* @@ -1921,7 +1921,7 @@ OemDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -2007,7 +2007,7 @@ OemDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -2287,7 +2287,7 @@ { DPRINT("RtlCreateUnicodeString\n"); - return RtlpCreateUnicodeString(UniDest, Source, NonPagedPool); + return RtlpCreateUnicodeString(UniDest, Source, PagedPool); } @@ -2306,7 +2306,7 @@ ULONG Length; Length = (wcslen (Source) + 1) * sizeof(WCHAR); - + PoolType = PagedPool; UniDest->Buffer = ExAllocatePoolWithTag(PoolType, Length, TAG_USTR); if (UniDest->Buffer == NULL) return FALSE; @@ -2363,7 +2363,7 @@ UniDest, UniSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -2473,7 +2473,7 @@ UniDest, AnsiSource, AllocateDestinationString, - NonPagedPool); + PagedPool); } @@ -2664,7 +2664,7 @@ AddNull, SourceString, DestinationString, - NonPagedPool); + PagedPool); } _____ Modified: trunk/reactos/ntoskrnl/cm/registry.c --- trunk/reactos/ntoskrnl/cm/registry.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/cm/registry.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -356,9 +356,9 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Key"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(KEY_OBJECT); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(KEY_OBJECT); ObjectTypeInitializer.GenericMapping = CmiKeyMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = KEY_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = CmiObjectDelete; _____ Modified: trunk/reactos/ntoskrnl/ex/fmutex.c --- trunk/reactos/ntoskrnl/ex/fmutex.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/ex/fmutex.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -21,7 +21,7 @@ VOID FASTCALL ExAcquireFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(FastMutex->Owner != KeGetCurrentThread()); + //ASSERT(FastMutex->Owner != KeGetCurrentThread()); InterlockedIncrementUL(&FastMutex->Contention); while (InterlockedExchange(&FastMutex->Count, 0) == 0) { @@ -41,7 +41,7 @@ VOID FASTCALL ExReleaseFastMutexUnsafe(PFAST_MUTEX FastMutex) { - ASSERT(FastMutex->Owner == KeGetCurrentThread()); + //ASSERT(FastMutex->Owner == KeGetCurrentThread()); FastMutex->Owner = NULL; InterlockedExchange(&FastMutex->Count, 1); if (FastMutex->Contention > 0) _____ Modified: trunk/reactos/ntoskrnl/ex/init.c --- trunk/reactos/ntoskrnl/ex/init.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/ex/init.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -481,10 +481,10 @@ /* Set 1 CPU for now, we'll increment this later */ KeNumberProcessors = 1; - + /* Initalize the Process Manager */ PiInitProcessManager(); - + /* Break into the Debugger if requested */ if (KdPollBreakIn()) DbgBreakPointWithStatus (DBG_STATUS_CONTROL_C); _____ Modified: trunk/reactos/ntoskrnl/include/internal/tag.h --- trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/include/internal/tag.h 2005-05-25 04:16:56 UTC (rev 15492) @@ -134,12 +134,12 @@ #define TAG_HDTB TAG('H', 'D', 'T', 'B') /* formerly located in se/acl.c */ -#define TAG_ACL TAG('A', 'C', 'L', 'T') +#define TAG_ACL TAG('S', 'e', 'A', 'c') -/* formerly located in se/semgr.c */ -#define TAG_SXPT TAG('S', 'X', 'P', 'T') - /* formerly located in se/sid.c */ -#define TAG_SID TAG('S', 'I', 'D', 'T') +#define TAG_SID TAG('S', 'e', 'S', 'i') +/* formerly located in se/sd.c */ +#define TAG_SD TAG('S', 'e', 'S', 'd') + #endif /* _NTOSKRNL_TAG_H */ _____ Modified: trunk/reactos/ntoskrnl/mm/mm.c --- trunk/reactos/ntoskrnl/mm/mm.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/mm/mm.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -321,8 +321,11 @@ } if (PsGetCurrentProcess() == NULL) { + /* Allow this! It lets us page alloc much earlier! It won't be needed + * after my init patch anyways + */ DbgPrint("No current process\n"); - return(STATUS_UNSUCCESSFUL); + //return(STATUS_UNSUCCESSFUL); } /* _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -2123,8 +2123,8 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Section"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(SECTION_OBJECT); - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(SECTION_OBJECT); + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.GenericMapping = MmpSectionMapping; ObjectTypeInitializer.DeleteProcedure = MmpDeleteSection; @@ -2499,7 +2499,7 @@ /* TODO: check for integer overflow */ SizeOfSegments = sizeof(MM_SECTION_SEGMENT) * NrSegments; - Segments = ExAllocatePoolWithTag(NonPagedPool, + Segments = ExAllocatePoolWithTag(PagedPool, SizeOfSegments, TAG_MM_SECTION_SEGMENT); _____ Modified: trunk/reactos/ntoskrnl/rtl/handle.c --- trunk/reactos/ntoskrnl/rtl/handle.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/rtl/handle.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -63,7 +63,7 @@ { /* allocate handle array */ ArraySize = sizeof(RTL_HANDLE) * HandleTable->TableSize; - ArrayPointer = ExAllocatePoolWithTag(NonPagedPool, + ArrayPointer = ExAllocatePoolWithTag(PagedPool, ArraySize, TAG_HDTB); if (ArrayPointer == NULL) _____ Modified: trunk/reactos/ntoskrnl/se/acl.c --- trunk/reactos/ntoskrnl/se/acl.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/se/acl.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -36,7 +36,7 @@ (sizeof(ACE) + RtlLengthSid(SeWorldSid)) + (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)); - SePublicDefaultDacl = ExAllocatePoolWithTag(NonPagedPool, + SePublicDefaultDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SePublicDefaultDacl == NULL) @@ -64,7 +64,7 @@ (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)) + (sizeof(ACE) + RtlLengthSid(SeRestrictedCodeSid)); - SePublicDefaultUnrestrictedDacl = ExAllocatePoolWithTag(NonPagedPool, + SePublicDefaultUnrestrictedDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SePublicDefaultUnrestrictedDacl == NULL) @@ -100,7 +100,7 @@ (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)) + (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)); - SePublicOpenDacl = ExAllocatePoolWithTag(NonPagedPool, + SePublicOpenDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SePublicOpenDacl == NULL) @@ -132,7 +132,7 @@ (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)) + (sizeof(ACE) + RtlLengthSid(SeRestrictedCodeSid)); - SePublicOpenUnrestrictedDacl = ExAllocatePoolWithTag(NonPagedPool, + SePublicOpenUnrestrictedDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SePublicOpenUnrestrictedDacl == NULL) @@ -167,7 +167,7 @@ (sizeof(ACE) + RtlLengthSid(SeLocalSystemSid)) + (sizeof(ACE) + RtlLengthSid(SeAliasAdminsSid)); - SeSystemDefaultDacl = ExAllocatePoolWithTag(NonPagedPool, + SeSystemDefaultDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SeSystemDefaultDacl == NULL) @@ -192,7 +192,7 @@ (sizeof(ACE) + RtlLengthSid(SeWorldSid)) + (sizeof(ACE) + RtlLengthSid(SeRestrictedCodeSid)); - SeUnrestrictedDacl = ExAllocatePoolWithTag(NonPagedPool, + SeUnrestrictedDacl = ExAllocatePoolWithTag(PagedPool, AclLength, TAG_ACL); if (SeUnrestrictedDacl == NULL) _____ Modified: trunk/reactos/ntoskrnl/se/sd.c --- trunk/reactos/ntoskrnl/se/sd.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/se/sd.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -28,8 +28,8 @@ SepInitSDs(VOID) { /* Create PublicDefaultSd */ - SePublicDefaultSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SePublicDefaultSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SePublicDefaultSd == NULL) return FALSE; @@ -41,8 +41,8 @@ FALSE); /* Create PublicDefaultUnrestrictedSd */ - SePublicDefaultUnrestrictedSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SePublicDefaultUnrestrictedSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SePublicDefaultUnrestrictedSd == NULL) return FALSE; @@ -54,8 +54,8 @@ FALSE); /* Create PublicOpenSd */ - SePublicOpenSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SePublicOpenSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SePublicOpenSd == NULL) return FALSE; @@ -67,8 +67,8 @@ FALSE); /* Create PublicOpenUnrestrictedSd */ - SePublicOpenUnrestrictedSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SePublicOpenUnrestrictedSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SePublicOpenUnrestrictedSd == NULL) return FALSE; @@ -80,8 +80,8 @@ FALSE); /* Create SystemDefaultSd */ - SeSystemDefaultSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SeSystemDefaultSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SeSystemDefaultSd == NULL) return FALSE; @@ -93,8 +93,8 @@ FALSE); /* Create UnrestrictedSd */ - SeUnrestrictedSd = ExAllocatePool(NonPagedPool, - sizeof(SECURITY_DESCRIPTOR)); + SeUnrestrictedSd = ExAllocatePoolWithTag(PagedPool, + sizeof(SECURITY_DESCRIPTOR), TAG_SD); if (SeUnrestrictedSd == NULL) return FALSE; _____ Modified: trunk/reactos/ntoskrnl/se/semgr.c --- trunk/reactos/ntoskrnl/se/semgr.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/se/semgr.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -17,6 +17,7 @@ /* GLOBALS ******************************************************************/ PSE_EXPORTS EXPORTED SeExports = NULL; +SE_EXPORTS SepExports; static ERESOURCE SepSubjectContextLock; @@ -121,56 +122,51 @@ static BOOLEAN INIT_FUNCTION SepInitExports(VOID) { - SeExports = ExAllocatePoolWithTag(NonPagedPool, - sizeof(SE_EXPORTS), - TAG_SXPT); - if (SeExports == NULL) - return FALSE; + SepExports.SeCreateTokenPrivilege = SeCreateTokenPrivilege; + SepExports.SeAssignPrimaryTokenPrivilege = SeAssignPrimaryTokenPrivilege; + SepExports.SeLockMemoryPrivilege = SeLockMemoryPrivilege; + SepExports.SeIncreaseQuotaPrivilege = SeIncreaseQuotaPrivilege; + SepExports.SeUnsolicitedInputPrivilege = SeUnsolicitedInputPrivilege; + SepExports.SeTcbPrivilege = SeTcbPrivilege; + SepExports.SeSecurityPrivilege = SeSecurityPrivilege; + SepExports.SeTakeOwnershipPrivilege = SeTakeOwnershipPrivilege; + SepExports.SeLoadDriverPrivilege = SeLoadDriverPrivilege; + SepExports.SeCreatePagefilePrivilege = SeCreatePagefilePrivilege; + SepExports.SeIncreaseBasePriorityPrivilege = SeIncreaseBasePriorityPrivilege; + SepExports.SeSystemProfilePrivilege = SeSystemProfilePrivilege; + SepExports.SeSystemtimePrivilege = SeSystemtimePrivilege; + SepExports.SeProfileSingleProcessPrivilege = SeProfileSingleProcessPrivilege; + SepExports.SeCreatePermanentPrivilege = SeCreatePermanentPrivilege; + SepExports.SeBackupPrivilege = SeBackupPrivilege; + SepExports.SeRestorePrivilege = SeRestorePrivilege; + SepExports.SeShutdownPrivilege = SeShutdownPrivilege; + SepExports.SeDebugPrivilege = SeDebugPrivilege; + SepExports.SeAuditPrivilege = SeAuditPrivilege; + SepExports.SeSystemEnvironmentPrivilege = SeSystemEnvironmentPrivilege; + SepExports.SeChangeNotifyPrivilege = SeChangeNotifyPrivilege; + SepExports.SeRemoteShutdownPrivilege = SeRemoteShutdownPrivilege; - SeExports->SeCreateTokenPrivilege = SeCreateTokenPrivilege; - SeExports->SeAssignPrimaryTokenPrivilege = SeAssignPrimaryTokenPrivilege; - SeExports->SeLockMemoryPrivilege = SeLockMemoryPrivilege; - SeExports->SeIncreaseQuotaPrivilege = SeIncreaseQuotaPrivilege; - SeExports->SeUnsolicitedInputPrivilege = SeUnsolicitedInputPrivilege; - SeExports->SeTcbPrivilege = SeTcbPrivilege; - SeExports->SeSecurityPrivilege = SeSecurityPrivilege; - SeExports->SeTakeOwnershipPrivilege = SeTakeOwnershipPrivilege; - SeExports->SeLoadDriverPrivilege = SeLoadDriverPrivilege; - SeExports->SeCreatePagefilePrivilege = SeCreatePagefilePrivilege; - SeExports->SeIncreaseBasePriorityPrivilege = SeIncreaseBasePriorityPrivilege; - SeExports->SeSystemProfilePrivilege = SeSystemProfilePrivilege; - SeExports->SeSystemtimePrivilege = SeSystemtimePrivilege; - SeExports->SeProfileSingleProcessPrivilege = SeProfileSingleProcessPrivilege; - SeExports->SeCreatePermanentPrivilege = SeCreatePermanentPrivilege; - SeExports->SeBackupPrivilege = SeBackupPrivilege; - SeExports->SeRestorePrivilege = SeRestorePrivilege; - SeExports->SeShutdownPrivilege = SeShutdownPrivilege; - SeExports->SeDebugPrivilege = SeDebugPrivilege; - SeExports->SeAuditPrivilege = SeAuditPrivilege; - SeExports->SeSystemEnvironmentPrivilege = SeSystemEnvironmentPrivilege; - SeExports->SeChangeNotifyPrivilege = SeChangeNotifyPrivilege; - SeExports->SeRemoteShutdownPrivilege = SeRemoteShutdownPrivilege; + SepExports.SeNullSid = SeNullSid; + SepExports.SeWorldSid = SeWorldSid; + SepExports.SeLocalSid = SeLocalSid; + SepExports.SeCreatorOwnerSid = SeCreatorOwnerSid; + SepExports.SeCreatorGroupSid = SeCreatorGroupSid; + SepExports.SeNtAuthoritySid = SeNtAuthoritySid; + SepExports.SeDialupSid = SeDialupSid; + SepExports.SeNetworkSid = SeNetworkSid; + SepExports.SeBatchSid = SeBatchSid; + SepExports.SeInteractiveSid = SeInteractiveSid; + SepExports.SeLocalSystemSid = SeLocalSystemSid; + SepExports.SeAliasAdminsSid = SeAliasAdminsSid; + SepExports.SeAliasUsersSid = SeAliasUsersSid; + SepExports.SeAliasGuestsSid = SeAliasGuestsSid; + SepExports.SeAliasPowerUsersSid = SeAliasPowerUsersSid; + SepExports.SeAliasAccountOpsSid = SeAliasAccountOpsSid; + SepExports.SeAliasSystemOpsSid = SeAliasSystemOpsSid; + SepExports.SeAliasPrintOpsSid = SeAliasPrintOpsSid; + SepExports.SeAliasBackupOpsSid = SeAliasBackupOpsSid; - SeExports->SeNullSid = SeNullSid; - SeExports->SeWorldSid = SeWorldSid; - SeExports->SeLocalSid = SeLocalSid; - SeExports->SeCreatorOwnerSid = SeCreatorOwnerSid; - SeExports->SeCreatorGroupSid = SeCreatorGroupSid; - SeExports->SeNtAuthoritySid = SeNtAuthoritySid; - SeExports->SeDialupSid = SeDialupSid; - SeExports->SeNetworkSid = SeNetworkSid; - SeExports->SeBatchSid = SeBatchSid; - SeExports->SeInteractiveSid = SeInteractiveSid; - SeExports->SeLocalSystemSid = SeLocalSystemSid; - SeExports->SeAliasAdminsSid = SeAliasAdminsSid; - SeExports->SeAliasUsersSid = SeAliasUsersSid; - SeExports->SeAliasGuestsSid = SeAliasGuestsSid; - SeExports->SeAliasPowerUsersSid = SeAliasPowerUsersSid; - SeExports->SeAliasAccountOpsSid = SeAliasAccountOpsSid; - SeExports->SeAliasSystemOpsSid = SeAliasSystemOpsSid; - SeExports->SeAliasPrintOpsSid = SeAliasPrintOpsSid; - SeExports->SeAliasBackupOpsSid = SeAliasBackupOpsSid; - + SeExports = &SepExports; return TRUE; } @@ -498,7 +494,7 @@ DaclLength, SaclLength); - Descriptor = ExAllocatePool(NonPagedPool, + Descriptor = ExAllocatePool(PagedPool, Length); RtlZeroMemory( Descriptor, Length ); _____ Modified: trunk/reactos/ntoskrnl/se/sid.c --- trunk/reactos/ntoskrnl/se/sid.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/se/sid.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -67,7 +67,7 @@ SidLength2 = RtlLengthRequiredSid(2); /* create NullSid */ - SeNullSid = ExAllocatePoolWithTag(NonPagedPool, + SeNullSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeNullSid == NULL) @@ -81,7 +81,7 @@ *SubAuthority = SECURITY_NULL_RID; /* create WorldSid */ - SeWorldSid = ExAllocatePoolWithTag(NonPagedPool, + SeWorldSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeWorldSid == NULL) @@ -95,7 +95,7 @@ *SubAuthority = SECURITY_WORLD_RID; /* create LocalSid */ - SeLocalSid = ExAllocatePoolWithTag(NonPagedPool, + SeLocalSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeLocalSid == NULL) @@ -109,7 +109,7 @@ *SubAuthority = SECURITY_LOCAL_RID; /* create CreatorOwnerSid */ - SeCreatorOwnerSid = ExAllocatePoolWithTag(NonPagedPool, + SeCreatorOwnerSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeCreatorOwnerSid == NULL) @@ -123,7 +123,7 @@ *SubAuthority = SECURITY_CREATOR_OWNER_RID; /* create CreatorGroupSid */ - SeCreatorGroupSid = ExAllocatePoolWithTag(NonPagedPool, + SeCreatorGroupSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeCreatorGroupSid == NULL) @@ -137,7 +137,7 @@ *SubAuthority = SECURITY_CREATOR_GROUP_RID; /* create CreatorOwnerServerSid */ - SeCreatorOwnerServerSid = ExAllocatePoolWithTag(NonPagedPool, + SeCreatorOwnerServerSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeCreatorOwnerServerSid == NULL) @@ -151,7 +151,7 @@ *SubAuthority = SECURITY_CREATOR_OWNER_SERVER_RID; /* create CreatorGroupServerSid */ - SeCreatorGroupServerSid = ExAllocatePoolWithTag(NonPagedPool, + SeCreatorGroupServerSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeCreatorGroupServerSid == NULL) @@ -166,7 +166,7 @@ /* create NtAuthoritySid */ - SeNtAuthoritySid = ExAllocatePoolWithTag(NonPagedPool, + SeNtAuthoritySid = ExAllocatePoolWithTag(PagedPool, SidLength0, TAG_SID); if (SeNtAuthoritySid == NULL) @@ -177,7 +177,7 @@ 0); /* create DialupSid */ - SeDialupSid = ExAllocatePoolWithTag(NonPagedPool, + SeDialupSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeDialupSid == NULL) @@ -191,7 +191,7 @@ *SubAuthority = SECURITY_DIALUP_RID; /* create NetworkSid */ - SeNetworkSid = ExAllocatePoolWithTag(NonPagedPool, + SeNetworkSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeNetworkSid == NULL) @@ -205,7 +205,7 @@ *SubAuthority = SECURITY_NETWORK_RID; /* create BatchSid */ - SeBatchSid = ExAllocatePoolWithTag(NonPagedPool, + SeBatchSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeBatchSid == NULL) @@ -219,7 +219,7 @@ *SubAuthority = SECURITY_BATCH_RID; /* create InteractiveSid */ - SeInteractiveSid = ExAllocatePoolWithTag(NonPagedPool, + SeInteractiveSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeInteractiveSid == NULL) @@ -233,7 +233,7 @@ *SubAuthority = SECURITY_INTERACTIVE_RID; /* create ServiceSid */ - SeServiceSid = ExAllocatePoolWithTag(NonPagedPool, + SeServiceSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeServiceSid == NULL) @@ -247,7 +247,7 @@ *SubAuthority = SECURITY_SERVICE_RID; /* create AnonymousLogonSid */ - SeAnonymousLogonSid = ExAllocatePoolWithTag(NonPagedPool, + SeAnonymousLogonSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeAnonymousLogonSid == NULL) @@ -261,7 +261,7 @@ *SubAuthority = SECURITY_ANONYMOUS_LOGON_RID; /* create PrincipalSelfSid */ - SePrincipalSelfSid = ExAllocatePoolWithTag(NonPagedPool, + SePrincipalSelfSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SePrincipalSelfSid == NULL) @@ -275,7 +275,7 @@ *SubAuthority = SECURITY_PRINCIPAL_SELF_RID; /* create LocalSystemSid */ - SeLocalSystemSid = ExAllocatePoolWithTag(NonPagedPool, + SeLocalSystemSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeLocalSystemSid == NULL) @@ -289,7 +289,7 @@ *SubAuthority = SECURITY_LOCAL_SYSTEM_RID; /* create AuthenticatedUserSid */ - SeAuthenticatedUserSid = ExAllocatePoolWithTag(NonPagedPool, + SeAuthenticatedUserSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeAuthenticatedUserSid == NULL) @@ -303,7 +303,7 @@ *SubAuthority = SECURITY_AUTHENTICATED_USER_RID; /* create RestrictedCodeSid */ - SeRestrictedCodeSid = ExAllocatePoolWithTag(NonPagedPool, + SeRestrictedCodeSid = ExAllocatePoolWithTag(PagedPool, SidLength1, TAG_SID); if (SeRestrictedCodeSid == NULL) @@ -317,7 +317,7 @@ *SubAuthority = SECURITY_RESTRICTED_CODE_RID; /* create AliasAdminsSid */ - SeAliasAdminsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasAdminsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasAdminsSid == NULL) @@ -335,7 +335,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_ADMINS; /* create AliasUsersSid */ - SeAliasUsersSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasUsersSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasUsersSid == NULL) @@ -353,7 +353,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_USERS; /* create AliasGuestsSid */ - SeAliasGuestsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasGuestsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasGuestsSid == NULL) @@ -371,7 +371,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_GUESTS; /* create AliasPowerUsersSid */ - SeAliasPowerUsersSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasPowerUsersSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasPowerUsersSid == NULL) @@ -389,7 +389,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_POWER_USERS; /* create AliasAccountOpsSid */ - SeAliasAccountOpsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasAccountOpsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasAccountOpsSid == NULL) @@ -407,7 +407,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_ACCOUNT_OPS; /* create AliasSystemOpsSid */ - SeAliasSystemOpsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasSystemOpsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasSystemOpsSid == NULL) @@ -425,7 +425,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_SYSTEM_OPS; /* create AliasPrintOpsSid */ - SeAliasPrintOpsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasPrintOpsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasPrintOpsSid == NULL) @@ -443,7 +443,7 @@ *SubAuthority = DOMAIN_ALIAS_RID_PRINT_OPS; /* create AliasBackupOpsSid */ - SeAliasBackupOpsSid = ExAllocatePoolWithTag(NonPagedPool, + SeAliasBackupOpsSid = ExAllocatePoolWithTag(PagedPool, SidLength2, TAG_SID); if (SeAliasBackupOpsSid == NULL) _____ Modified: trunk/reactos/ntoskrnl/se/token.c --- trunk/reactos/ntoskrnl/se/token.c 2005-05-25 02:20:01 UTC (rev 15491) +++ trunk/reactos/ntoskrnl/se/token.c 2005-05-25 04:16:56 UTC (rev 15492) @@ -571,9 +571,9 @@ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); RtlInitUnicodeString(&Name, L"Token"); ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(TOKEN); + ObjectTypeInitializer.DefaultPagedPoolCharge = sizeof(TOKEN); ObjectTypeInitializer.GenericMapping = SepTokenMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; + ObjectTypeInitializer.PoolType = PagedPool; ObjectTypeInitializer.ValidAccessMask = TOKEN_ALL_ACCESS; ObjectTypeInitializer.UseDefaultObject = TRUE; ObjectTypeInitializer.DeleteProcedure = SepDeleteToken; @@ -1853,7 +1853,7 @@ uSize += uAdminsLength; AccessToken->UserAndGroups = - (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(NonPagedPool, + (PSID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, TAG('T', 'O', 'K', 'u')); SidArea = &AccessToken->UserAndGroups[AccessToken->UserAndGroupCount]; @@ -1885,7 +1885,7 @@ uSize = AccessToken->PrivilegeCount * sizeof(LUID_AND_ATTRIBUTES); AccessToken->Privileges = - (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(NonPagedPool, + (PLUID_AND_ATTRIBUTES)ExAllocatePoolWithTag(PagedPool, uSize, TAG('T', 'O', 'K', 'p')); @@ -1964,7 +1964,7 @@ uSize += sizeof(ACE) + uAdminsLength; uSize = (uSize & (~3)) + 8; AccessToken->DefaultDacl = - (PACL) ExAllocatePoolWithTag(NonPagedPool, + (PACL) ExAllocatePoolWithTag(PagedPool, uSize, TAG('T', 'O', 'K', 'd')); Status = RtlCreateAcl(AccessToken->DefaultDacl, uSize, ACL_REVISION);

1 0

[ion] 15491: Tag the MDL buffer
by ion＠svn.reactos.com 25 May '05

25 May '05

Tag the MDL buffer Modified: trunk/reactos/ntoskrnl/mm/mdl.c _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-05-25 01:49:50 UTC (rev 15490) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-05-25 02:20:01 UTC (rev 15491) @@ -85,7 +85,9 @@ } MmUnlockAddressSpace(MmGetKernelAddressSpace()); - Buffer = ExAllocatePool(NonPagedPool, MI_MDL_MAPPING_REGION_SIZE / (PAGE_SIZE * 8)); + Buffer = ExAllocatePoolWithTag(NonPagedPool, + MI_MDL_MAPPING_REGION_SIZE / (PAGE_SIZE * 8), + TAG_MDL); RtlInitializeBitMap(&MiMdlMappingRegionAllocMap, Buffer, MI_MDL_MAPPING_REGION_SIZE / PAGE_SIZE); RtlClearAllBits(&MiMdlMappingRegionAllocMap);

1 0

[ion] 15490: remove debug message
by ion＠svn.reactos.com 25 May '05

25 May '05

remove debug message Modified: trunk/reactos/ntoskrnl/ob/namespc.c _____ Modified: trunk/reactos/ntoskrnl/ob/namespc.c --- trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-25 00:04:12 UTC (rev 15489) +++ trunk/reactos/ntoskrnl/ob/namespc.c 2005-05-25 01:49:50 UTC (rev 15490) @@ -570,7 +570,7 @@ Tag[3] = TypeName->Buffer[3]; /* Set Tag */ - DPRINT1("Convert: %s \n", Tag); + DPRINT("Convert: %s \n", Tag); LocalObjectType->Key = *(PULONG)Tag; }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs