Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[blight] 18964: (Hopefully) fix (parts of) terribly broken NtSet/GetContextThread functions ; -)
by blight＠svn.reactos.com 03 Nov '05

03 Nov '05

(Hopefully) fix (parts of) terribly broken NtSet/GetContextThread functions ;-) If we have a test for this anywhere, it must be reaaally broken! Thanks to Alex and KJK for helping! Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-11-02 23:57:38 UTC (rev 18963) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-11-03 00:09:19 UTC (rev 18964) @@ -23,6 +23,7 @@ KEVENT Event; CONTEXT Context; KPROCESSOR_MODE Mode; + NTSTATUS Status; } GET_SET_CTX_CONTEXT, *PGET_SET_CTX_CONTEXT; @@ -44,9 +45,11 @@ PKEVENT Event; PCONTEXT Context; KPROCESSOR_MODE Mode; - PETHREAD Thread; PKTRAP_FRAME TrapFrame; + TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)KeGetCurrentThread()->InitialStack - + sizeof (FX_SAVE_AREA) - sizeof (KTRAP_FRAME)); + /* Get the Context Structure */ GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); Context = &GetSetContext->Context; @@ -54,20 +57,21 @@ Mode = GetSetContext->Mode; Thread = SystemArgument2; - /* Get trap frame */ - TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)Thread->Tcb.InitialStack - - sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); - - /* Check if it's a set or get */ - if (SystemArgument1) + if (TrapFrame->Cs == KERNEL_CS && Mode != KernelMode) { - /* Get the Context */ - KeTrapFrameToContext(TrapFrame, NULL, Context); + GetSetContext->Status = STATUS_ACCESS_DENIED; } else { - /* Set the Context */ - KeContextToTrapFrame(Context, NULL, TrapFrame, Mode); + /* Check if it's a set or get */ + if (*SystemArgument1) { + /* Get the Context */ + KeTrapFrameToContext(TrapFrame, NULL, Context); + } else { + /* Set the Context */ + KeContextToTrapFrame(Context, NULL, TrapFrame, Mode); + } + GetSetContext->Status = STATUS_SUCCESS; } /* Notify the Native API that we are done */ @@ -77,7 +81,7 @@ NTSTATUS STDCALL NtGetContextThread(IN HANDLE ThreadHandle, - OUT PCONTEXT ThreadContext) + IN OUT PCONTEXT ThreadContext) { PETHREAD Thread; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); @@ -94,6 +98,8 @@ ProbeForWrite(ThreadContext, sizeof(CONTEXT), sizeof(ULONG)); + GetSetContext.Context = *ThreadContext; + } _SEH_HANDLE { Status = _SEH_GetExceptionCode(); @@ -159,6 +165,8 @@ KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = GetSetContext.Status; } } @@ -167,7 +175,6 @@ /* Check for success and return the Context */ if(NT_SUCCESS(Status)) { - _SEH_TRY { *ThreadContext = GetSetContext.Context; @@ -231,13 +238,17 @@ if(Thread == PsGetCurrentThread()) { /* - * I don't know if trying to get your own context makes much + * I don't know if trying to set your own context makes much * sense but we can handle it more efficently. */ - KeContextToTrapFrame(&GetSetContext.Context, NULL, Thread->Tcb.TrapFrame, PreviousMode); + KeContextToTrapFrame(ThreadContext, NULL, Thread->Tcb.TrapFrame, PreviousMode); } else { + /* Copy context into GetSetContext if not already done */ + if(PreviousMode == KernelMode) + GetSetContext.Context = *ThreadContext; + /* Use an APC... Initialize the Event */ KeInitializeEvent(&GetSetContext.Event, NotificationEvent, @@ -258,8 +269,8 @@ /* Queue it as a Get APC */ if (!KeInsertQueueApc(&GetSetContext.Apc, + (PVOID)0, NULL, - NULL, IO_NO_INCREMENT)) { Status = STATUS_THREAD_IS_TERMINATING; @@ -272,6 +283,8 @@ KernelMode, FALSE, NULL); + if (NT_SUCCESS(Status)) + Status = GetSetContext.Status; } }

1 0

[ion] 18963: - Use correct trapframe during set/get context. Thanks to blight for noticing the bug.
by ion＠svn.reactos.com 02 Nov '05

02 Nov '05

- Use correct trapframe during set/get context. Thanks to blight for noticing the bug. Modified: trunk/reactos/ntoskrnl/ps/debug.c _____ Modified: trunk/reactos/ntoskrnl/ps/debug.c --- trunk/reactos/ntoskrnl/ps/debug.c 2005-11-02 23:47:58 UTC (rev 18962) +++ trunk/reactos/ntoskrnl/ps/debug.c 2005-11-02 23:57:38 UTC (rev 18963) @@ -44,23 +44,30 @@ PKEVENT Event; PCONTEXT Context; KPROCESSOR_MODE Mode; + PETHREAD Thread; + PKTRAP_FRAME TrapFrame; /* Get the Context Structure */ GetSetContext = CONTAINING_RECORD(Apc, GET_SET_CTX_CONTEXT, Apc); Context = &GetSetContext->Context; Event = &GetSetContext->Event; Mode = GetSetContext->Mode; + Thread = SystemArgument2; + /* Get trap frame */ + TrapFrame = (PKTRAP_FRAME)((ULONG_PTR)Thread->Tcb.InitialStack - + sizeof(KTRAP_FRAME) - sizeof(FX_SAVE_AREA)); + /* Check if it's a set or get */ - if (SystemArgument1) { - + if (SystemArgument1) + { /* Get the Context */ - KeTrapFrameToContext(KeGetCurrentThread()->TrapFrame, NULL, Context); - - } else { - + KeTrapFrameToContext(TrapFrame, NULL, Context); + } + else + { /* Set the Context */ - KeContextToTrapFrame(Context, NULL, KeGetCurrentThread()->TrapFrame, Mode); + KeContextToTrapFrame(Context, NULL, TrapFrame, Mode); } /* Notify the Native API that we are done */

1 0

[hbirr] 18962: Don't print a CR, if the command line is from a batch file and starts with a '@'.
by hbirr＠svn.reactos.com 02 Nov '05

02 Nov '05

Don't print a CR, if the command line is from a batch file and starts with a '@'. Modified: trunk/reactos/subsys/system/cmd/cmd.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-11-02 23:24:05 UTC (rev 18961) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-11-02 23:47:58 UTC (rev 18962) @@ -1282,6 +1282,7 @@ LPCTSTR tmp; BOOL bEchoThisLine; BOOL bModeSetA; + BOOL bIsBatch; do { @@ -1294,7 +1295,12 @@ ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; + bIsBatch = FALSE; } + else + { + bIsBatch = TRUE; + } /* skip leading blanks */ while ( _istspace(*ip) ) @@ -1403,7 +1409,7 @@ if (*commandline) { ParseCommandLine (commandline); - if (bEcho && !bIgnoreEcho) + if (bEcho && !bIgnoreEcho && (!bIsBatch || bEchoThisLine)) ConOutChar ('\n'); bIgnoreEcho = FALSE; }

1 0

[hbirr] 18961: - The separator (slash or back slash), exepostfix and exeprefix are initialized from environment variables.
by hbirr＠svn.reactos.com 02 Nov '05

02 Nov '05

- The separator (slash or back slash), exepostfix and exeprefix are initialized from environment variables. - The separators in the path for the system command are always converted for the host system. - Our own build utilities must convert paths itself (bin2res). Modified: trunk/reactos/Makefile Modified: trunk/reactos/tools/bin2res/bin2res.c Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Modified: trunk/reactos/tools/rbuild/cdfile.cpp Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/installfile.cpp Modified: trunk/reactos/tools/rbuild/linkerscript.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/wineresource.cpp _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/Makefile 2005-11-02 23:24:05 UTC (rev 18961) @@ -115,7 +115,11 @@ ifeq ($(HOST),) ifeq ($(word 1,$(shell gcc -dumpmachine)),mingw32) +ifeq ($(OSTYPE),msys) +HOST=mingw32-linux +else HOST=mingw32-windows +endif else HOST=mingw32-linux endif @@ -207,9 +211,13 @@ host_ar = $(Q)ar host_objcopy = $(Q)objcopy ifeq ($(HOST),mingw32-linux) - EXEPREFIX = ./ - EXEPOSTFIX = - SEP = / + export EXEPREFIX = ./ +ifeq ($(OSTYPE),msys) + export EXEPOSTFIX = .exe +else + export EXEPOSTFIX = +endif + export SEP = / mkdir = -$(Q)mkdir -p gcc = $(Q)$(PREFIX)-gcc gpp = $(Q)$(PREFIX)-g++ @@ -224,10 +232,29 @@ cp = $(Q)cp NUL = /dev/null else # mingw32-windows - EXEPREFIX = - EXEPOSTFIX = .exe + ifeq ($(OSTYPE),msys) + HOST=mingw32-linux + export EXEPREFIX = ./ + export EXEPOSTFIX = .exe + export SEP = / + mkdir = -$(Q)mkdir -p + gcc = $(Q)gcc + gpp = $(Q)g++ + ld = $(Q)ld + nm = $(Q)nm + objdump = $(Q)objdump + ar = $(Q)ar + objcopy = $(Q)objcopy + dlltool = $(Q)dlltool + windres = $(Q)windres + rm = $(Q)rm -f + cp = $(Q)cp + NUL = /dev/null + else + export EXEPREFIX = + export EXEPOSTFIX = .exe ROS_EMPTY = - SEP = \$(ROS_EMPTY) + export SEP = \$(ROS_EMPTY) mkdir = -$(Q)mkdir gcc = $(Q)gcc gpp = $(Q)g++ @@ -241,6 +268,7 @@ rm = $(Q)del /f /q cp = $(Q)copy /y NUL = NUL + endif endif ifneq ($(ROS_INTERMEDIATE),) _____ Modified: trunk/reactos/tools/bin2res/bin2res.c --- trunk/reactos/tools/bin2res/bin2res.c 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/bin2res/bin2res.c 2005-11-02 23:24:05 UTC (rev 18961) @@ -37,8 +37,12 @@ #if defined(WIN32) #define DIR_SEPARATOR "\\" +#define C_SEP '\\' +#define C_BAD_SEP '/' #else #define DIR_SEPARATOR "/" +#define C_SEP '/' +#define C_BAD_SEP '\\' #endif extern int mkstemps(char *template, int suffix_len); @@ -275,6 +279,22 @@ return c == EOF; } +char* fix_path_sep(char* name) +{ + char *new_name, *ptr; + + ptr = new_name = strdup(name); + while(*ptr) + { + if (*ptr == C_BAD_SEP) + { + *ptr = C_SEP; + } + ptr++; + } + return new_name; +} + int main(int argc, char **argv) { int convert_dir = 0, optc; @@ -295,14 +315,14 @@ case 'i': case 'o': if (specific_file_name) usage(); - specific_file_name = optarg; + specific_file_name = fix_path_sep(optarg); optc = ((optc == 'i') ? 'a' : 'x'); if (convert_dir && convert_dir != optc) usage(); convert_dir = optc; break; case 'b': if (relative_path) usage(); - relative_path = optarg; + relative_path = fix_path_sep(optarg); break; case 'f': force_overwrite = 1; @@ -320,7 +340,7 @@ } if (optind + 1 != argc) usage(); - input_file_name = argv[optind]; + input_file_name = fix_path_sep(argv[optind]); if (!convert_dir) usage(); _____ Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp --- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -46,7 +46,7 @@ void SourceFile::GetDirectoryAndFilenameParts () { - size_t index = filename.find_last_of ( CSEP ); + size_t index = filename.find_last_of ( cSep ); if ( index != string::npos ) { directoryPart = filename.substr ( 0, index ); @@ -347,7 +347,7 @@ const string& includedFilename, string& resolvedFilename ) { - string normalizedFilename = NormalizeFilename ( directory + SSEP + includedFilename ); + string normalizedFilename = NormalizeFilename ( directory + sSep + includedFilename ); FILE* f = fopen ( normalizedFilename.c_str (), "rb" ); if ( f != NULL ) { @@ -362,7 +362,7 @@ string AutomaticDependency::GetFilename ( const string& filename ) { - size_t index = filename.find_last_of ( CSEP ); + size_t index = filename.find_last_of ( cSep ); if (index == string::npos) return filename; else _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -119,17 +119,17 @@ { size_t index = 0; size_t nextIndex; - if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == CSEP ) + if ( isalpha ( path[0] ) && path[1] == ':' && path[2] == cSep ) { - nextIndex = path.find ( CSEP, 3); + nextIndex = path.find ( cSep, 3); } else - nextIndex = path.find ( CSEP ); + nextIndex = path.find ( cSep ); bool directoryWasCreated = false; while ( nextIndex != string::npos ) { - nextIndex = path.find ( CSEP, index + 1 ); + nextIndex = path.find ( cSep, index + 1 ); directoryWasCreated = mkdir_p ( path.substr ( 0, nextIndex ).c_str () ); index = nextIndex; } @@ -168,7 +168,7 @@ { char buf[256]; - path = parent + SSEP + name; + path = parent + sSep + name; ResolveVariablesInPath ( buf, path ); if ( CreateDirectory ( buf ) && verbose ) printf ( "Created %s\n", buf ); @@ -212,7 +212,7 @@ fprintf ( f, "%s%c%s: | %s\n", escapedParent.c_str (), - CSEP, + cSep, EscapeSpaces ( name ).c_str (), escapedParent.c_str () ); @@ -222,7 +222,7 @@ fprintf ( f, "\t${mkdir} $@\n" ); - path = parent + SSEP + name; + path = parent + sSep + name; } else path = name; @@ -687,7 +687,7 @@ string MingwBackend::GetBin2ResExecutable () { - return NormalizeFilename ( Environment::GetOutputPath () + SSEP + "tools/bin2res/bin2res" + EXEPOSTFIX ); + return NormalizeFilename ( Environment::GetOutputPath () + sSep + "tools/bin2res/bin2res" + ExePostfix ); } void @@ -743,7 +743,7 @@ bool MingwBackend::IncludeDirectoryTarget ( const string& directory ) const { - if ( directory == "$(INTERMEDIATE)" SSEP "tools") + if ( directory == "$(INTERMEDIATE)" + sSep + "tools") return false; else return true; @@ -765,7 +765,7 @@ { string command = ssprintf ( "%s -v 1>%s 2>%s", - compiler.c_str (), + FixSeparatorForSystemCommand(compiler).c_str (), NUL, NUL ); int exitcode = system ( command.c_str () ); @@ -810,7 +810,7 @@ { string command = ssprintf ( "%s -h 1>%s 2>%s", - assembler.c_str (), + FixSeparatorForSystemCommand(assembler).c_str (), NUL, NUL ); int exitcode = system ( command.c_str () ); @@ -822,7 +822,7 @@ { string command = ssprintf ( "%s -v 1>%s", - binutils.c_str (), + FixSeparatorForSystemCommand(binutils).c_str (), NUL, NUL ); int exitcode = system ( command.c_str () ); @@ -955,12 +955,12 @@ { printf ( "Detecting compiler -pipe support..." ); - string pipe_detection = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pipe_detection.c"; + string pipe_detection = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pipe_detection.c"; string pipe_detectionObjectFilename = ReplaceExtension ( pipe_detection, ".o" ); string command = ssprintf ( "%s -pipe -c %s -o %s 1>%s 2>%s", - compilerCommand.c_str (), + FixSeparatorForSystemCommand(compilerCommand).c_str (), pipe_detection.c_str (), pipe_detectionObjectFilename.c_str (), NUL, @@ -987,10 +987,10 @@ { printf ( "Detecting compiler pre-compiled header support..." ); - string path = "tools" SSEP "rbuild" SSEP "backend" SSEP "mingw" SSEP "pch_detection.h"; + string path = "tools" + sSep + "rbuild" + sSep + "backend" + sSep + "mingw" + sSep + "pch_detection.h"; string cmd = ssprintf ( "%s -c %s 1>%s 2>%s", - compilerCommand.c_str (), + FixSeparatorForSystemCommand(compilerCommand).c_str (), path.c_str (), NUL, NUL ); @@ -1020,7 +1020,7 @@ for ( size_t i = 0; i < ProjectNode.installfiles.size (); i++ ) { const InstallFile& installfile = *ProjectNode.installfiles[i]; - string targetFilenameNoFixup = installfile.base + SSEP + installfile.newname; + string targetFilenameNoFixup = installfile.base + sSep + installfile.newname; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), installDirectory ); @@ -1041,7 +1041,7 @@ { string targetFilenameNoFixup; if ( module.installBase.length () > 0 ) - targetFilenameNoFixup = module.installBase + SSEP + module.installName; + targetFilenameNoFixup = module.installBase + sSep + module.installName; else targetFilenameNoFixup = module.installName; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( @@ -1067,7 +1067,7 @@ { string fullTargetFilename; if ( targetDirectory.length () > 0) - fullTargetFilename = targetDirectory + SSEP + targetFilename; + fullTargetFilename = targetDirectory + sSep + targetFilename; else fullTargetFilename = targetFilename; string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( @@ -1138,11 +1138,11 @@ string MingwBackend::GetRegistrySourceFiles () { - return "bootdata" SSEP "hivecls.inf " - "bootdata" SSEP "hivedef.inf " - "bootdata" SSEP "hiveinst.inf " - "bootdata" SSEP "hivesft.inf " - "bootdata" SSEP "hivesys.inf"; + return "bootdata" + sSep + "hivecls.inf " + "bootdata" + sSep + "hivedef.inf " + "bootdata" + sSep + "hiveinst.inf " + "bootdata" + sSep + "hivesft.inf " + "bootdata" + sSep + "hivesys.inf"; } string @@ -1150,13 +1150,13 @@ { string system32ConfigDirectory = NormalizeFilename ( MingwModuleHandler::PassThruCacheDirectory ( - "system32" SSEP "config" SSEP, + "system32" + sSep + "config" + sSep, installDirectory ) ); - return system32ConfigDirectory + SSEP "default " + - system32ConfigDirectory + SSEP "sam " + - system32ConfigDirectory + SSEP "security " + - system32ConfigDirectory + SSEP "software " + - system32ConfigDirectory + SSEP "system"; + return system32ConfigDirectory + sSep + "default " + + system32ConfigDirectory + sSep + "sam " + + system32ConfigDirectory + sSep + "security " + + system32ConfigDirectory + sSep + "software " + + system32ConfigDirectory + sSep + "system"; } void @@ -1164,7 +1164,7 @@ { string system32ConfigDirectory = NormalizeFilename ( MingwModuleHandler::PassThruCacheDirectory ( - "system32" SSEP "config" SSEP, + "system32" + sSep + "config" + sSep, installDirectory ) ); string registrySourceFiles = GetRegistrySourceFiles (); @@ -1180,8 +1180,9 @@ fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "hiveinst.inf\n", - system32ConfigDirectory.c_str () ); + "\t$(MKHIVE_TARGET) bootdata %s bootdata%chiveinst.inf\n", + system32ConfigDirectory.c_str (), + cSep ); fprintf ( fMakefile, "\n" ); } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -50,7 +50,7 @@ { if ( p2 > p1 ) p1 = p2; - out += string(pfilename,p1-pfilename) + CSEP; + out += string(pfilename,p1-pfilename) + cSep; pfilename = p1 + 1; } out += prefix + pfilename; @@ -106,7 +106,7 @@ size_t j = path.find ( ')', i ); if ( j != string::npos ) { - if ( j + 2 < path.length () && path[j + 1] == CSEP ) + if ( j + 2 < path.length () && path[j + 1] == cSep ) return path.substr ( j + 2); else return path.substr ( j + 1); @@ -130,7 +130,7 @@ { if ( file == "" ) return generatedFilesDirectory; - return generatedFilesDirectory + SSEP + file; + return generatedFilesDirectory + sSep + file; } } @@ -518,7 +518,7 @@ return; fprintf ( fMakefile, ".PHONY: %s_install\n", module.name.c_str() ); string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( module.installBase + SSEP + module.installName ), + NormalizeFilename ( module.installBase + sSep + module.installName ), backend->installDirectory ); fprintf ( fMakefile, "%s_install: %s\n", @@ -581,7 +581,7 @@ return parameters; } -string +string MingwModuleHandler::GenerateGccDefineParameters () const { string parameters = GenerateGccDefineParametersFromVector ( module.project.non_if_data.defines ); @@ -601,10 +601,10 @@ { if ( ( path1.length () == 0 ) || ( path1 == "." ) || ( path1 == "./" ) ) return path2; - if ( path1[path1.length ()] == CSEP ) + if ( path1[path1.length ()] == cSep ) return path1 + path2; else - return path1 + CSEP + path2; + return path1 + cSep + path2; } /* static */ string @@ -1838,7 +1838,7 @@ if ( module.name != "zlib" ) /* Avoid make warning */ { string proxyMakefile = PassThruCacheDirectory ( - NormalizeFilename ( module.GetBasePath () + SSEP + "makefile" ), + NormalizeFilename ( module.GetBasePath () + sSep + "makefile" ), backend->outputDirectory ); CLEAN_FILE ( proxyMakefile ); } @@ -2009,7 +2009,7 @@ { if ( module.importLibrary != NULL ) { - string defFilename = module.GetBasePath () + SSEP + module.importLibrary->definition; + string defFilename = module.GetBasePath () + sSep + module.importLibrary->definition; if ( IsWineModule () ) return PassThruCacheDirectory ( NormalizeFilename ( defFilename ), backend->intermediateDirectory ); @@ -2017,7 +2017,7 @@ return defFilename; } else - return "tools" SSEP "rbuild" SSEP "empty.def"; + return "tools" + sSep + "rbuild" + sSep + "empty.def"; } void @@ -2181,8 +2181,9 @@ string dependencies = linkDepsMacro + " " + objectsMacro; - string linkerParameters = ssprintf ( "-Wl,-T,%s" SSEP "ntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", + string linkerParameters = ssprintf ( "-Wl,-T,%s%cntoskrnl.lnk -Wl,--subsystem,native -Wl,--entry,%s -Wl,--image-base,%s -Wl,--file-alignment,0x1000 -Wl,--section-alignment,0x1000 -nostartfiles -shared", module.GetBasePath ().c_str (), + cSep, module.entrypoint.c_str (), module.baseaddress.c_str () ); GenerateLinkerCommand ( dependencies, @@ -2693,7 +2694,7 @@ string sourceFilename = PassThruCacheDirectory ( NormalizeFilename ( m.GetPath () ), backend->outputDirectory ); - string targetFilenameNoFixup ( bootcdDirectory + SSEP + m.bootstrap->base + SSEP + m.bootstrap->nameoncd ); + string targetFilenameNoFixup ( bootcdDirectory + sSep + m.bootstrap->base + sSep + m.bootstrap->nameoncd ); string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), backend->outputDirectory ); @@ -2714,7 +2715,7 @@ for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { const CDFile& cdfile = *module.project.cdfiles[i]; - string targetFilenameNoFixup = bootcdDirectory + SSEP + cdfile.base + SSEP + cdfile.nameoncd; + string targetFilenameNoFixup = bootcdDirectory + sSep + cdfile.base + sSep + cdfile.nameoncd; string targetFilename = MingwModuleHandler::PassThruCacheDirectory ( NormalizeFilename ( targetFilenameNoFixup ), backend->outputDirectory ); @@ -2738,7 +2739,7 @@ continue; if ( m.bootstrap != NULL ) { - string targetDirectory ( bootcdDirectory + SSEP + m.bootstrap->base ); + string targetDirectory ( bootcdDirectory + sSep + m.bootstrap->base ); if ( directories.size () > 0 ) directories += " "; directories += PassThruCacheDirectory ( @@ -2756,7 +2757,7 @@ for ( size_t i = 0; i < module.project.cdfiles.size (); i++ ) { const CDFile& cdfile = *module.project.cdfiles[i]; - string targetDirectory ( bootcdDirectory + SSEP + cdfile.base ); + string targetDirectory ( bootcdDirectory + sSep + cdfile.base ); if ( directories.size () > 0 ) directories += " "; directories += PassThruCacheDirectory ( @@ -2817,20 +2818,20 @@ { string bootcdDirectory = "cd"; string bootcd = PassThruCacheDirectory ( - NormalizeFilename ( bootcdDirectory + SSEP ), + NormalizeFilename ( bootcdDirectory + sSep ), backend->outputDirectory ); string isoboot = PassThruCacheDirectory ( - NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ), + NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + "isoboot.o" ), backend->outputDirectory ); - string bootcdReactosNoFixup = bootcdDirectory + SSEP "reactos"; + string bootcdReactosNoFixup = bootcdDirectory + sSep + "reactos"; string bootcdReactos = PassThruCacheDirectory ( - NormalizeFilename ( bootcdReactosNoFixup + SSEP ), + NormalizeFilename ( bootcdReactosNoFixup + sSep ), backend->outputDirectory ); CLEAN_FILE ( bootcdReactos ); string reactosInf = PassThruCacheDirectory ( - NormalizeFilename ( bootcdReactosNoFixup + SSEP "reactos.inf" ), + NormalizeFilename ( bootcdReactosNoFixup + sSep + "reactos.inf" ), backend->outputDirectory ); - string reactosDff = NormalizeFilename ( "bootdata" SSEP "packages" SSEP "reactos.dff" ); + string reactosDff = NormalizeFilename ( "bootdata" + sSep + "packages" + sSep + "reactos.dff" ); string cdDirectories = GetCdDirectories ( bootcdDirectory ); vector<string> vCdFiles; GetCdFiles ( vCdFiles ); @@ -2887,7 +2888,7 @@ MingwLiveIsoModuleHandler::CreateDirectory ( const string& directory ) { string normalizedDirectory = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( directory ) + SSEP, + NormalizeFilename ( directory ) + sSep, backend->outputDirectory ); } @@ -2897,7 +2898,7 @@ const string& targetDirectory ) { string normalizedTargetFilename = MingwModuleHandler::PassThruCacheDirectory ( - NormalizeFilename ( targetDirectory + SSEP + targetFilename ), + NormalizeFilename ( targetDirectory + sSep + targetFilename ), backend->outputDirectory ); fprintf ( fMakefile, "\t$(ECHO_CP)\n" ); @@ -2924,7 +2925,7 @@ backend->outputDirectory ); OutputCopyCommand ( sourceFilename, m.installName, - livecdDirectory + SSEP + reactosDirectory + SSEP + m.installBase ); + livecdDirectory + sSep + reactosDirectory + sSep + m.installBase ); } } } @@ -2938,21 +2939,21 @@ const InstallFile& installfile = *module.project.installfiles[i]; OutputCopyCommand ( installfile.GetPath (), installfile.newname, - livecdDirectory + SSEP + reactosDirectory + SSEP + installfile.base ); + livecdDirectory + sSep + reactosDirectory + sSep + installfile.base ); } } void MingwLiveIsoModuleHandler::OutputProfilesDirectoryCommands ( string& livecdDirectory ) { - CreateDirectory ( livecdDirectory + SSEP "Profiles" ); - CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users") ; - CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "All Users" SSEP "Desktop" ); - CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" ); - CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "Desktop" ); - CreateDirectory ( livecdDirectory + SSEP "Profiles" SSEP "Default User" SSEP "My Documents" ); + CreateDirectory ( livecdDirectory + sSep + "Profiles" ); + CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users") ; + CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "All Users" + sSep + "Desktop" ); + CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" ); + CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "Desktop" ); + CreateDirectory ( livecdDirectory + sSep + "Profiles" + sSep + "Default User" + sSep + "My Documents" ); - string livecdIni = "bootdata" SSEP "livecd.ini"; + string livecdIni = "bootdata" + sSep + "livecd.ini"; OutputCopyCommand ( livecdIni, "freeldr.ini", livecdDirectory ); @@ -2962,12 +2963,12 @@ MingwLiveIsoModuleHandler::OutputLoaderCommands ( string& livecdDirectory ) { string freeldr = PassThruCacheDirectory ( - NormalizeFilename ( "boot" SSEP "freeldr" SSEP "freeldr" SSEP "freeldr.sys" ), + NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "freeldr" + sSep + "freeldr.sys" ), backend->outputDirectory ); - CreateDirectory ( livecdDirectory + SSEP "loader" ); + CreateDirectory ( livecdDirectory + sSep + "loader" ); OutputCopyCommand ( freeldr, "setupldr.sys", - livecdDirectory + SSEP + "loader" ); + livecdDirectory + sSep + "loader" ); } void @@ -2975,13 +2976,15 @@ { string reactosSystem32ConfigDirectory = NormalizeFilename ( MingwModuleHandler::PassThruCacheDirectory ( - livecdDirectory + SSEP "reactos" SSEP "system32" SSEP "config" SSEP, + livecdDirectory + sSep + "reactos" + sSep + "system32" + sSep + "config" + sSep, backend->outputDirectory ) ); fprintf ( fMakefile, "\t$(ECHO_MKHIVE)\n" ); fprintf ( fMakefile, - "\t$(MKHIVE_TARGET) bootdata %s bootdata" SSEP "livecd.inf bootdata" SSEP "hiveinst.inf\n", - reactosSystem32ConfigDirectory.c_str () ); + "\t$(MKHIVE_TARGET) bootdata %s bootdata%clivecd.inf bootdata%chiveinst.inf\n", + reactosSystem32ConfigDirectory.c_str (), + cSep, + cSep ); } void @@ -2989,15 +2992,15 @@ { string livecdDirectory = "livecd"; string livecd = PassThruCacheDirectory ( - NormalizeFilename ( livecdDirectory + SSEP ), + NormalizeFilename ( livecdDirectory + sSep ), backend->outputDirectory ); string isoboot = PassThruCacheDirectory ( - NormalizeFilename ( "boot" SSEP "freeldr" SSEP "bootsect" SSEP "isoboot.o" ), + NormalizeFilename ( "boot" + sSep + "freeldr" + sSep + "bootsect" + sSep + "isoboot.o" ), backend->outputDirectory ); string reactosDirectory = "reactos"; - string livecdReactosNoFixup = livecdDirectory + SSEP + reactosDirectory; + string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory; string livecdReactos = NormalizeFilename ( PassThruCacheDirectory ( - NormalizeFilename ( livecdReactosNoFixup + SSEP ), + NormalizeFilename ( livecdReactosNoFixup + sSep ), backend->outputDirectory ) ); CLEAN_FILE ( livecdReactos ); @@ -3041,10 +3044,10 @@ void MingwTestModuleHandler::GetModuleSpecificSourceFiles ( vector<File*>& sourceFiles ) { - string basePath = "$(INTERMEDIATE)" SSEP + module.GetBasePath (); - sourceFiles.push_back ( new File ( basePath + SSEP "_hooks.c", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + SSEP "_stubs.S", false, "", false ) ); - sourceFiles.push_back ( new File ( basePath + SSEP "_startup.c", false, "", false ) ); + string basePath = "$(INTERMEDIATE)" + sSep + module.GetBasePath (); + sourceFiles.push_back ( new File ( basePath + sSep + "_hooks.c", false, "", false ) ); + sourceFiles.push_back ( new File ( basePath + sSep + "_stubs.S", false, "", false ) ); + sourceFiles.push_back ( new File ( basePath + sSep + "_startup.c", false, "", false ) ); } void _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -62,7 +62,7 @@ for ( int i = 0; i < numberOfParentDirectories; i++ ) { if ( path != "" ) - path += SSEP; + path += sSep; path += ".."; } return path; @@ -75,7 +75,7 @@ string basePath = NormalizeFilename ( module.GetBasePath () ); for ( size_t i = 0; i < basePath.length (); i++ ) { - if ( basePath[i] == CSEP ) + if ( basePath[i] == cSep ) numberOfDirectories++; } return GeneratePathToParentDirectory ( numberOfDirectories ); @@ -99,7 +99,7 @@ string pathToTopDirectory; if ( outputTree.length () > 0 ) { - base = outputTree + SSEP + module.GetBasePath (); + base = outputTree + sSep + module.GetBasePath (); Path path; pathToTopDirectory = working_directory; } @@ -108,7 +108,7 @@ base = module.GetBasePath (); pathToTopDirectory = GetPathToTopDirectory ( module ); } - string proxyMakefile = NormalizeFilename ( base + SSEP "GNUmakefile" ); + string proxyMakefile = NormalizeFilename ( base + sSep + "GNUmakefile" ); string defaultTarget = module.name; buf = (char*) malloc ( 10*1024 ); _____ Modified: trunk/reactos/tools/rbuild/cdfile.cpp --- trunk/reactos/tools/rbuild/cdfile.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/cdfile.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -50,7 +50,7 @@ string CDFile::GetPath () const { - return path + SSEP + name; + return path + sSep + name; } void _____ Modified: trunk/reactos/tools/rbuild/include.cpp --- trunk/reactos/tools/rbuild/include.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/include.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -50,7 +50,7 @@ node ( NULL ), baseModule ( NULL ) { - this->directory = NormalizeFilename ( basePath + SSEP + directory ); + this->directory = NormalizeFilename ( basePath + sSep + directory ); this->basePath = NormalizeFilename ( basePath ); } @@ -91,7 +91,7 @@ node->location, "<include> attribute 'base' references non-existant project or module '%s'", att->value.c_str() ); - directory = NormalizeFilename ( basePath + SSEP + node->value ); + directory = NormalizeFilename ( basePath + sSep + node->value ); } else directory = NormalizeFilename ( node->value ); _____ Modified: trunk/reactos/tools/rbuild/installfile.cpp --- trunk/reactos/tools/rbuild/installfile.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/installfile.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -50,7 +50,7 @@ string InstallFile::GetPath () const { - return path + SSEP + name; + return path + sSep + name; } void _____ Modified: trunk/reactos/tools/rbuild/linkerscript.cpp --- trunk/reactos/tools/rbuild/linkerscript.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/linkerscript.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -66,7 +66,7 @@ node.location, "<linkerscript> attribute 'base' references non-existant project or module '%s'", att->value.c_str() ); - directory = NormalizeFilename ( basePath + SSEP + node.value ); + directory = NormalizeFilename ( basePath + sSep + node.value ); } else directory = NormalizeFilename ( node.value ); _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -55,16 +55,29 @@ FixSeparator ( const string& s ) { string s2(s); - char* p = strchr ( &s2[0], CBAD_SEP ); + char* p = strchr ( &s2[0], cBadSep ); while ( p ) { - *p++ = CSEP; - p = strchr ( p, CBAD_SEP ); + *p++ = cSep; + p = strchr ( p, cBadSep ); } return s2; } string +FixSeparatorForSystemCommand ( const string& s ) +{ + string s2(s); + char* p = strchr ( &s2[0], DEF_CBAD_SEP ); + while ( p ) + { + *p++ = DEF_CSEP; + p = strchr ( p, DEF_CBAD_SEP ); + } + return s2; +} + +string DosSeparator ( const string& s ) { string s2(s); @@ -111,7 +124,7 @@ "<directory> tag has invalid characters in 'name' attribute" ); if ( !path.size() ) return att_value; - return FixSeparator(path + CSEP + att_value); + return FixSeparator(path + cSep + att_value); } string @@ -129,7 +142,7 @@ string GetDirectory ( const string& filename ) { - size_t index = filename.find_last_of ( CSEP ); + size_t index = filename.find_last_of ( cSep ); if ( index == string::npos ) return ""; else @@ -139,7 +152,7 @@ string GetFilename ( const string& filename ) { - size_t index = filename.find_last_of ( CSEP ); + size_t index = filename.find_last_of ( cSep ); if ( index == string::npos ) return filename; else @@ -453,7 +466,7 @@ else if ( !stricmp ( ext.c_str(), ".cxx" ) ) cplusplus = true; } - File* pFile = new File ( FixSeparator ( path + CSEP + e.value ), + File* pFile = new File ( FixSeparator ( path + cSep + e.value ), first, switches, false ); @@ -597,7 +610,7 @@ e.location, "Only one <pch> is valid per module" ); pch = new PchFile ( - e, *this, File ( FixSeparator ( path + CSEP + e.value ), false, "", true ) ); + e, *this, File ( FixSeparator ( path + cSep + e.value ), false, "", true ) ); subs_invalid = true; } if ( subs_invalid && e.subElements.size() > 0 ) @@ -661,7 +674,7 @@ switch (type) { case BuildTool: - return EXEPOSTFIX; + return ExePostfix; case StaticLibrary: return ".a"; case ObjectLibrary: @@ -868,7 +881,7 @@ Module::GetPath () const { if ( path.length() > 0 ) - return path + CSEP + GetTargetName (); + return path + cSep + GetTargetName (); else return GetTargetName (); } @@ -876,7 +889,7 @@ string Module::GetPathWithPrefix ( const string& prefix ) const { - return path + CSEP + prefix + GetTargetName (); + return path + cSep + prefix + GetTargetName (); } string @@ -914,7 +927,7 @@ for ( size_t i = 0; i < invocations.size (); i++ ) { Invoke& invoke = *invocations[i]; - string command = invoke.invokeModule->GetPath () + " " + invoke.GetParameters (); + string command = FixSeparatorForSystemCommand(invoke.invokeModule->GetPath ()) + " " + invoke.GetParameters (); printf ( "Executing '%s'\n\n", command.c_str () ); int exitcode = system ( command.c_str () ); if ( exitcode != 0 ) @@ -1034,7 +1047,7 @@ bool subs_invalid = false; if ( e.name == "inputfile" && e.value.size () > 0 ) { - input.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) ); + input.push_back ( new InvokeFile ( e, FixSeparator ( module.path + cSep + e.value ) ) ); subs_invalid = true; } if ( subs_invalid && e.subElements.size() > 0 ) @@ -1049,7 +1062,7 @@ bool subs_invalid = false; if ( e.name == "outputfile" && e.value.size () > 0 ) { - output.push_back ( new InvokeFile ( e, FixSeparator ( module.path + CSEP + e.value ) ) ); + output.push_back ( new InvokeFile ( e, FixSeparator ( module.path + cSep + e.value ) ) ); subs_invalid = true; } if ( subs_invalid && e.subElements.size() > 0 ) _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -198,7 +198,7 @@ s = s + sprintf ( s, "#endif /* __INCLUDE_CONFIG_H */\n" ); - FileSupportCode::WriteIfChanged ( buf, "include" SSEP "roscfg.h" ); + FileSupportCode::WriteIfChanged ( buf, "include" + sSep + "roscfg.h" ); free ( buf ); } _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-02 23:24:05 UTC (rev 18961) @@ -35,6 +35,13 @@ static string RootXmlFile = "ReactOS.xml"; static Configuration configuration; +string ExePrefix; +string ExePostfix; +string sSep; +string sBadSep; +char cSep; +char cBadSep; + bool ParseAutomaticDependencySwitch ( char switchChar2, char* switchStart ) @@ -186,6 +193,43 @@ int main ( int argc, char** argv ) { + char *SepValue, *ExePostfixValue, *ExePrefixValue;; + + SepValue = getenv("SEP"); + if (SepValue && (0 == strcmp(SepValue, DEF_SSEP) || 0 == strcmp(SepValue, DEF_SBAD_SEP))) + { + cSep = SepValue[0]; + sSep = SepValue; + } + else + { + cSep = DEF_CSEP; + sSep = DEF_SSEP; + } + if (cSep == DEF_CSEP) + { + cBadSep = DEF_CBAD_SEP; + sBadSep = DEF_SBAD_SEP; + } + else + { + cBadSep = DEF_CSEP; + sBadSep = DEF_SSEP; + } + ExePostfixValue = getenv("EXEPOSTFIX"); + ExePrefixValue = getenv("EXEPREFIX"); + if ((ExePostfixValue == NULL || 0 == strlen(ExePostfixValue)) && + (ExePrefixValue == NULL || 0 == strlen(ExePrefixValue))) + { + ExePostfix = DEF_EXEPOSTFIX; + ExePrefix = DEF_EXEPREFIX; + } + else + { + ExePostfix = ExePostfixValue ? ExePostfixValue : ""; + ExePrefix = ExePrefixValue ? ExePrefixValue : ""; + } + if ( !ParseArguments ( argc, argv ) ) { printf ( "Generates project files for buildsystems\n\n" ); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-02 23:15:40 UTC (rev 18960) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-02 23:24:05 UTC (rev 18961) @@ -41,20 +41,27 @@ typedef std::vector<std::string> string_list; +extern std::string ExePrefix; +extern std::string ExePostfix; +extern std::string sSep; +extern std::string sBadSep; +extern char cSep; +extern char cBadSep; + #ifdef WIN32 [truncated at 1000 lines; 86 more skipped]

1 0

[gvg] 18960: Return character heights instead of cell heights in the LOGFONTs in the
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Return character heights instead of cell heights in the LOGFONTs in the NONCLIENTMETRICS structure Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-02 23:12:55 UTC (rev 18959) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-11-02 23:15:40 UTC (rev 18960) @@ -813,8 +813,9 @@ { RTL_QUERY_REGISTRY_TABLE QueryTable[2]; NTSTATUS Status; + /* Firefox 1.0.7 depends on the lfHeight value being negative */ static LOGFONTW DefaultFont = { - 11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, + -11, 0, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, ANSI_CHARSET, 0, 0, DEFAULT_QUALITY, VARIABLE_PITCH | FF_SWISS, L"Bitstream Vera Sans" };

1 0

[blight] 18959: Convert tabs to spaces.
by blight＠svn.reactos.com 02 Nov '05

02 Nov '05

Convert tabs to spaces. Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/irq.c --- trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-02 21:10:50 UTC (rev 18958) +++ trunk/reactos/ntoskrnl/ke/i386/irq.c 2005-11-02 23:12:55 UTC (rev 18959) @@ -53,10 +53,10 @@ (ULONG)& INT_NAME2(x##y) #define L16(x) \ - L(x,0), L(x,1), L(x,2), L(x,3), \ - L(x,4), L(x,5), L(x,6), L(x,7), \ - L(x,8), L(x,9), L(x,A), L(x,B), \ - L(x,C), L(x,D), L(x,E), L(x,F) + L(x,0), L(x,1), L(x,2), L(x,3), \ + L(x,4), L(x,5), L(x,6), L(x,7), \ + L(x,8), L(x,9), L(x,A), L(x,B), \ + L(x,C), L(x,D), L(x,E), L(x,F) static ULONG irq_handler[ROUND_UP(NR_IRQS, 16)] = { L16(3), L16(4), L16(5), L16(6), @@ -150,25 +150,25 @@ */ for (i=0;i<NR_IRQS;i++) { - KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16); - KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ - I486_INTERRUPT_GATE; + KiIdt[IRQ_BASE+i].a=(irq_handler[i]&0xffff)+(KERNEL_CS<<16); + KiIdt[IRQ_BASE+i].b=(irq_handler[i]&0xffff0000)+PRESENT+ + I486_INTERRUPT_GATE; #ifdef CONFIG_SMP - for (j = 0; j < MAXIMUM_PROCESSORS; j++) + for (j = 0; j < MAXIMUM_PROCESSORS; j++) #else - j = 0; + j = 0; #endif - { - InitializeListHead(&IsrTable[i][j].ListHead); + { + InitializeListHead(&IsrTable[i][j].ListHead); KeInitializeSpinLock(&IsrTable[i][j].Lock); - IsrTable[i][j].Count = 0; - } + IsrTable[i][j].Count = 0; + } } } STATIC VOID KeIRQTrapFrameToTrapFrame(PKIRQ_TRAPFRAME IrqTrapFrame, - PKTRAP_FRAME TrapFrame) + PKTRAP_FRAME TrapFrame) { TrapFrame->Gs = (USHORT)IrqTrapFrame->Gs; TrapFrame->Fs = (USHORT)IrqTrapFrame->Fs; @@ -189,7 +189,7 @@ STATIC VOID KeTrapFrameToIRQTrapFrame(PKTRAP_FRAME TrapFrame, - PKIRQ_TRAPFRAME IrqTrapFrame) + PKIRQ_TRAPFRAME IrqTrapFrame) { IrqTrapFrame->Gs = TrapFrame->Gs; IrqTrapFrame->Fs = TrapFrame->Fs; @@ -242,8 +242,8 @@ if (isr->ServiceRoutine(isr, isr->ServiceContext)) { KeReleaseInterruptSpinLock(isr, oldlvl); - break; - } + break; + } KeReleaseInterruptSpinLock(isr, oldlvl); current = current->Flink; } @@ -275,8 +275,8 @@ * default HAL this will send an EOI to the PIC and alter the IRQL. */ if (!HalBeginSystemInterrupt (vector, - VECTOR2IRQL(vector), - &old_level)) + VECTOR2IRQL(vector), + &old_level)) { return; } @@ -316,28 +316,28 @@ if (CurrentThread!=NULL && CurrentThread->ApcState.UserApcPending) { DPRINT("PID: %d, TID: %d CS %04x/%04x\n", - ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, - ((PETHREAD)CurrentThread)->Cid.UniqueThread, - Trapframe->Cs, - CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); - if (CurrentThread->TrapFrame == NULL) - { - OldTrapFrame = CurrentThread->TrapFrame; - KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); - CurrentThread->TrapFrame = &KernelTrapFrame; - } + ((PETHREAD)CurrentThread)->ThreadsProcess->UniqueProcessId, + ((PETHREAD)CurrentThread)->Cid.UniqueThread, + Trapframe->Cs, + CurrentThread->TrapFrame ? CurrentThread->TrapFrame->Cs : 0); + if (CurrentThread->TrapFrame == NULL) + { + OldTrapFrame = CurrentThread->TrapFrame; + KeIRQTrapFrameToTrapFrame(Trapframe, &KernelTrapFrame); + CurrentThread->TrapFrame = &KernelTrapFrame; + } Ke386EnableInterrupts(); KiDeliverApc(UserMode, NULL, NULL); Ke386DisableInterrupts(); - ASSERT(KeGetCurrentThread() == CurrentThread); + ASSERT(KeGetCurrentThread() == CurrentThread); if (CurrentThread->TrapFrame == &KernelTrapFrame) - { + { KeTrapFrameToIRQTrapFrame(&KernelTrapFrame, Trapframe); - CurrentThread->TrapFrame = OldTrapFrame; - } - } + CurrentThread->TrapFrame = OldTrapFrame; + } + } KeLowerIrql(PASSIVE_LEVEL); } else @@ -358,28 +358,28 @@ for (i=0;i<NR_IRQS;i++) { - printed = FALSE; + printed = FALSE; KeRaiseIrql(VECTOR2IRQL(i + IRQ_BASE),&oldlvl); - for (j=0; j < KeNumberProcessors; j++) - { - KiAcquireSpinLock(&IsrTable[i][j].Lock); + for (j=0; j < KeNumberProcessors; j++) + { + KiAcquireSpinLock(&IsrTable[i][j].Lock); - current_entry = IsrTable[i][j].ListHead.Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); - while (current_entry!=&(IsrTable[i][j].ListHead)) - { - if (printed == FALSE) - { - printed = TRUE; - DPRINT("For irq %x:\n",i); - } - DPRINT(" Isr %x\n",current); - current_entry = current_entry->Flink; - current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); - } - KiReleaseSpinLock(&IsrTable[i][j].Lock); - } + current_entry = IsrTable[i][j].ListHead.Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + while (current_entry!=&(IsrTable[i][j].ListHead)) + { + if (printed == FALSE) + { + printed = TRUE; + DPRINT("For irq %x:\n",i); + } + DPRINT(" Isr %x\n",current); + current_entry = current_entry->Flink; + current = CONTAINING_RECORD(current_entry,KINTERRUPT,InterruptListEntry); + } + KiReleaseSpinLock(&IsrTable[i][j].Lock); + } KeLowerIrql(oldlvl); } } @@ -575,12 +575,11 @@ for (i = 0; i < NR_IRQS; i++) { if (IsrTable[i][j].Count) - { - DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); - } + { + DPRINT1(" Irq %x(%d): %d\n", i, VECTOR2IRQ(i + IRQ_BASE), IsrTable[i][j].Count); + } } } } - /* EOF */

1 0

[gedmurphy] 18958: - Split files
by gedmurphy＠svn.reactos.com 02 Nov '05

02 Nov '05

- Split files - start to implement 'start' - split and rewrite much of the 'query' functionality - a lot of code "altering" Comments are a bit vauge, but it's still very incomplete and untested and most changes aren't worth mentioning. Added: trunk/reactos/subsys/system/sc/control.c Added: trunk/reactos/subsys/system/sc/create.c Added: trunk/reactos/subsys/system/sc/delete.c Deleted: trunk/reactos/subsys/system/sc/manage.c Modified: trunk/reactos/subsys/system/sc/query.c Modified: trunk/reactos/subsys/system/sc/sc.c Modified: trunk/reactos/subsys/system/sc/sc.h Added: trunk/reactos/subsys/system/sc/start.c Modified: trunk/reactos/subsys/system/sc/usage.c _____ Added: trunk/reactos/subsys/system/sc/control.c --- trunk/reactos/subsys/system/sc/control.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/control.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,45 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/control.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +/* + * handles the following commands: + * control, continue, interrogate, pause, stop + */ + +BOOL Control(DWORD Control, TCHAR **Args) +{ + SC_HANDLE hSc; + SERVICE_STATUS Status; + LPCTSTR ServiceName = *Args; + + + hSc = OpenService(hSCManager, ServiceName, DELETE); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! ControlService(hSc, Control, &Status)) + { + _tprintf(_T("controlService failed\n")); + ReportLastError(); + return FALSE; + } + + CloseServiceHandle(hSc); + return TRUE; + +} Property changes on: trunk/reactos/subsys/system/sc/control.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/sc/create.c --- trunk/reactos/subsys/system/sc/create.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/create.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,57 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/create.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Create(TCHAR **Args) +{ + SC_HANDLE hSc; + LPCTSTR ServiceName = *Args; + LPCTSTR BinaryPathName = *++Args; + LPCTSTR *Options = (LPCTSTR *)++Args; + + /* testing */ + printf("service to create - %s\n", ServiceName); + printf("Binary path - %s\n", BinaryPathName); + printf("Arguments :\n"); + while (*Options) + { + printf("%s\n", *Options); + Options++; + } + + + hSc = CreateService(hSCManager, + ServiceName, + ServiceName, + SERVICE_ALL_ACCESS, + SERVICE_WIN32_OWN_PROCESS, + SERVICE_DEMAND_START, + SERVICE_ERROR_NORMAL, + BinaryPathName, + NULL, + NULL, + NULL, + NULL, + NULL); + + if (hSc == NULL) + { + _tprintf(_T("CreateService failed\n")); + ReportLastError(); + return FALSE; + } + else + { + CloseServiceHandle(hSc); + return TRUE; + } +} Property changes on: trunk/reactos/subsys/system/sc/create.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/sc/delete.c --- trunk/reactos/subsys/system/sc/delete.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/delete.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/delete.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Delete(TCHAR **Args) +{ + SC_HANDLE hSc; + LPCTSTR ServiceName = *Args; + + /* testing */ + printf("service to delete - %s\n\n", ServiceName); + + hSc = OpenService(hSCManager, ServiceName, DELETE); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! DeleteService(hSc)) + { + _tprintf(_T("DeleteService failed\n")); + ReportLastError(); + return FALSE; + } + + CloseServiceHandle(hSc); + return TRUE; +} Property changes on: trunk/reactos/subsys/system/sc/delete.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Deleted: trunk/reactos/subsys/system/sc/manage.c --- trunk/reactos/subsys/system/sc/manage.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/manage.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,121 +0,0 @@ -#include "sc.h" - -extern SC_HANDLE hSCManager; // declared in sc.c - -BOOL Start(INT ArgCount, TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR ServiceName = *Args++; - LPCTSTR *ServiceArgs = &*Args; - - hSc = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! StartService(hSc, ArgCount, ServiceArgs)) - { - dprintf("DeleteService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; - -} - - -BOOL Create(TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR Name = *Args; - LPCTSTR BinaryPathName = *++Args; - - - hSc = CreateService(hSCManager, - Name, - Name, - SERVICE_ALL_ACCESS, - SERVICE_WIN32_OWN_PROCESS, - SERVICE_DEMAND_START, - SERVICE_ERROR_NORMAL, - BinaryPathName, - NULL, - NULL, - NULL, - NULL, - NULL); - - if (hSc == NULL) - { - dprintf("CreateService failed (%d)\n"); - ReportLastError(); - return FALSE; - } - else - { - CloseServiceHandle(hSc); - return TRUE; - } -} - -BOOL Delete(TCHAR **Args) -{ - SC_HANDLE hSc; - LPCTSTR ServiceName = *Args; - - hSc = OpenService(hSCManager, ServiceName, DELETE); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! DeleteService(hSc)) - { - dprintf("DeleteService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; -} - - -BOOL Control(DWORD Control, TCHAR **Args) -{ - SC_HANDLE hSc; - SERVICE_STATUS Status; - LPCTSTR ServiceName = *Args; - - - hSc = OpenService(hSCManager, ServiceName, DELETE); - - if (hSc == NULL) - { - dprintf("openService failed\n"); - ReportLastError(); - return FALSE; - } - - if (! ControlService(hSc, Control, &Status)) - { - dprintf("controlService failed\n"); - ReportLastError(); - return FALSE; - } - - CloseServiceHandle(hSc); - return TRUE; - -} - - _____ Modified: trunk/reactos/subsys/system/sc/query.c --- trunk/reactos/subsys/system/sc/query.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/query.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,107 +1,175 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/query.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" -extern SC_HANDLE hSCManager; /* declared in sc.c */ +/* local function decs */ +VOID PrintService(ENUM_SERVICE_STATUS_PROCESS *pSStatus, BOOL bExtended); +INT EnumServices(DWORD ServiceType, DWORD ServiceState); +/* global variables */ +static ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; + BOOL Query(TCHAR **Args, BOOL bExtended) { - SC_HANDLE hSc; - ENUM_SERVICE_STATUS_PROCESS *pServiceStatus = NULL; - DWORD BufSize = 0; - DWORD BytesNeeded; - DWORD NumServices; - DWORD ResumeHandle; - INT i; + + LPCTSTR ServiceName = *Args; - /* determine required buffer size */ - EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0); + if (! *Args) + { + printf("Service name %s\n", ServiceName); // test - /* exit on failure */ - if (GetLastError() != ERROR_MORE_DATA) - { - ReportLastError(); - return FALSE; + /* get default values */ + EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); + + /* print default values */ + PrintService(pServiceStatus, bExtended); } - /* reserve memory for service info array */ - pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); - - /* fill array with service info */ - if (! EnumServicesStatusEx(hSCManager, - SC_ENUM_PROCESS_INFO, - SERVICE_DRIVER | SERVICE_WIN32, - SERVICE_STATE_ALL, - (LPBYTE)pServiceStatus, - BufSize, - &BytesNeeded, - &NumServices, - &ResumeHandle, - 0)) + if (_tcsicmp(Args[0], _T("type=")) == 0) { - dprintf("Call to EnumServicesStatusEx failed : "); - ReportLastError(); - return FALSE; + TCHAR *Type = *++Args; + _tprintf(_T("got type\narg = %s\n"), Type); // test + if (_tcsicmp(Type, _T("driver")) == 0) + EnumServices(SERVICE_DRIVER, SERVICE_STATE_ALL); + else if (_tcsicmp(Type, _T("service")) == 0) + EnumServices(SERVICE_WIN32, SERVICE_STATE_ALL); + else if (_tcsicmp(Type, _T("all")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + else + { + _tprintf(_T("\nERROR following \"type=\"!\n")); + _tprintf(_T("Must be \"driver\" or \"service\" or \"all\"\n")); + } + + PrintService(pServiceStatus, bExtended); } -/* - for (i=0; i<NumServices; i++) + else if(_tcsicmp(Args[0], _T("state=")) == 0) { - if (Args == NULL) + TCHAR *State = *++Args; + + if (_tcsicmp(State, _T("active")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_ACTIVE); + else if (_tcsicmp(State, _T("inactive")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_INACTIVE); + else if (_tcsicmp(State, _T("all")) == 0) + EnumServices(SERVICE_DRIVER|SERVICE_WIN32, SERVICE_STATE_ALL); + else { - if (pServiceStatus[i]->dwServiceType == SERVICE_WIN32 && - pServiceStatus[i]->dwServiceState == SERVICE_ACTIVE) - PrintService(pServiceStatus[i], bExtended); - continue; + _tprintf(_T("\nERROR following \"state=\"!\n")); + _tprintf(_T("Must be \"active\" or \"inactive\" or \"all\"\n")); } - - if(_tcsicmp(Args[0], _T("type=")) + + PrintService(pServiceStatus, bExtended); + } + else + { + printf("no args\n"); // test + /* get default values */ + EnumServices(SERVICE_WIN32, SERVICE_ACTIVE); - else if(_tcsicmp(Args[0], _T("state=")) + /* print default values */ + PrintService(pServiceStatus, bExtended); + } - else if(_tcsicmp(Args[0], _T("bufsize=")) +/* + else if(_tcsicmp(Args[0], _T("bufsize="))) - else if(_tcsicmp(Args[0], _T("ri=")) - - else if(_tcsicmp(Args[0], _T("group=")) + else if(_tcsicmp(Args[0], _T("ri="))) + else if(_tcsicmp(Args[0], _T("group="))) */ } +INT EnumServices(DWORD ServiceType, DWORD ServiceState) +{ + SC_HANDLE hSc; + DWORD BufSize = 0; + DWORD BytesNeeded = 0; + DWORD NumServices = 0; + DWORD ResumeHandle = 0; + + /* determine required buffer size */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + ServiceType, + ServiceState, + (LPBYTE)pServiceStatus, + BufSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) + { + /* Call function again if required size was returned */ + if (GetLastError() == ERROR_MORE_DATA) + { + /* reserve memory for service info array */ + pServiceStatus = (ENUM_SERVICE_STATUS_PROCESS *) malloc(BytesNeeded); + + /* fill array with service info */ + if (! EnumServicesStatusEx(hSCManager, + SC_ENUM_PROCESS_INFO, + SERVICE_DRIVER | SERVICE_WIN32, + SERVICE_STATE_ALL, + (LPBYTE)pServiceStatus, + BufSize, + &BytesNeeded, + &NumServices, + &ResumeHandle, + 0)) + { + _tprintf(_T("Second call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + } + else /* exit on failure */ + { + _tprintf(_T("First call to EnumServicesStatusEx failed : ")); + ReportLastError(); + return FALSE; + } + } +} + + VOID PrintService(ENUM_SERVICE_STATUS_PROCESS *pServiceStatus, BOOL bExtended) { - dprintf("SERVICE_NAME: %s\n", pServiceStatus->lpServiceName); - dprintf("DISPLAY_NAME: %s\n", pServiceStatus->lpDisplayName); - dprintf("TYPE : %lu\n", + _tprintf(_T("SERVICE_NAME: %s\n"), pServiceStatus->lpServiceName); + _tprintf(_T("DISPLAY_NAME: %s\n"), pServiceStatus->lpDisplayName); + _tprintf(_T("TYPE : %lu\n"), pServiceStatus->ServiceStatusProcess.dwServiceType); - dprintf("STATE : %lu\n", + _tprintf(_T("STATE : %lu\n"), pServiceStatus->ServiceStatusProcess.dwCurrentState); // (STOPPABLE,NOT_PAUSABLE,ACCEPTS_SHUTDOWN) - dprintf("WIN32_EXIT_CODE : %lu \n", + _tprintf(_T("WIN32_EXIT_CODE : %lu \n"), pServiceStatus->ServiceStatusProcess.dwWin32ExitCode); - dprintf("SERVICE_EXIT_CODE : %lu \n", + _tprintf(_T("SERVICE_EXIT_CODE : %lu \n"), pServiceStatus->ServiceStatusProcess.dwServiceSpecificExitCode); - dprintf("CHECKPOINT : %lu\n", + _tprintf(_T("CHECKPOINT : %lu\n"), pServiceStatus->ServiceStatusProcess.dwCheckPoint); - dprintf("WAIT_HINT : %lu\n", + _tprintf(_T("WAIT_HINT : %lu\n"), pServiceStatus->ServiceStatusProcess.dwWaitHint); if (bExtended) { - dprintf("PID : %lu\n", + _tprintf(_T("PID : %lu\n"), pServiceStatus->ServiceStatusProcess.dwProcessId); - dprintf("FLAGS : %lu\n", + _tprintf(_T("FLAGS : %lu\n"), pServiceStatus->ServiceStatusProcess.dwServiceFlags); } } _____ Modified: trunk/reactos/subsys/system/sc/sc.c --- trunk/reactos/subsys/system/sc/sc.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/sc.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,21 +1,18 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/sc.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" -HANDLE OutputHandle; -HANDLE InputHandle; - SC_HANDLE hSCManager; -VOID dprintf(TCHAR* fmt, ...) -{ - va_list args; - char buffer[255]; - - va_start(args, fmt); - wvsprintfA(buffer, fmt, args); - WriteConsole(OutputHandle, buffer, lstrlenA(buffer), NULL, NULL); - va_end(args); -} - DWORD ReportLastError(VOID) { LPVOID lpMsgBuf; @@ -52,19 +49,19 @@ if (MachineName) { - dprintf("Remote service control is not yet implemented\n"); + _tprintf(_T("Remote service control is not yet implemented\n")); return 2; } - +/* hSCManager = OpenSCManager(MachineName, NULL, SC_MANAGER_ALL_ACCESS); if (hSCManager == NULL) { - dprintf("[SC] OpenSCManager FAILED \n"); + _tprintf(_T("[SC] OpenSCManager FAILED %d:\n\n"), GetLastError()); ReportLastError(); return -1; } +*/ - if (_tcsicmp(Command, _T("query")) == 0) Query(Args, FALSE); @@ -73,46 +70,70 @@ else if (_tcsicmp(Command, _T("start")) == 0) { - /*if (! **Args) + if (*Args) + Start(3, Args); + else StartUsage(); + } + else if (_tcsicmp(Command, _T("pause")) == 0) + { + if (*Args) + Control(SERVICE_CONTROL_PAUSE, Args); else - Start(Args);*/ + PauseUsage(); } - else if (_tcsicmp(Command, _T("pause")) == 0) - Control(SERVICE_CONTROL_PAUSE, ++Args); - else if (_tcsicmp(Command, _T("interrogate")) == 0) - Control(SERVICE_CONTROL_INTERROGATE, ++Args); - - else if (_tcsicmp(Command, _T("interrogate")) == 0) - Control(SERVICE_CONTROL_INTERROGATE, ++Args); - + { + if (*Args) + Control(SERVICE_CONTROL_INTERROGATE, Args); + else + InterrogateUsage(); + } + else if (_tcsicmp(Command, _T("stop")) == 0) + { + if (*Args) + Control(SERVICE_CONTROL_STOP, Args); + else + StopUsage(); + } else if (_tcsicmp(Command, _T("continue")) == 0) - Control(SERVICE_CONTROL_CONTINUE, ++Args); - + { + if (*Args) + Control(SERVICE_CONTROL_CONTINUE, Args); + else + ContinueUsage(); + } else if (_tcsicmp(Command, _T("delete")) == 0) - Delete(Args); - + { + if (*Args) + Delete(Args); + else + DeleteUsage(); + } else if (_tcsicmp(Command, _T("create")) == 0) - Create(Args); - + { + if (*Args) + Create(Args); + else + CreateUsage(); + } else if (_tcsicmp(Command, _T("control")) == 0) - Control((DWORD)NULL, Args); - + { + if (*Args) + Control((DWORD)NULL, ++Args); + else + ContinueUsage(); + } return 0; } -int main(int argc, char* argv[]) +int _tmain(DWORD argc, LPCTSTR argv[]) { LPTSTR MachineName = NULL; // remote machine LPCTSTR Command = argv[1]; // sc command TCHAR **Args = NULL; // rest of args - /* initialize standard input / output and get handles */ - AllocConsole(); - InputHandle = GetStdHandle(STD_INPUT_HANDLE); - OutputHandle = GetStdHandle(STD_OUTPUT_HANDLE); if (argc < 2) return MainUsage(); @@ -125,12 +146,12 @@ _tcscpy(MachineName, argv[1]); Command = argv[2]; - Args = &argv[3]; + Args = (TCHAR **)&argv[3]; return ScControl(MachineName, Command, Args); } else { - Args = &argv[2]; + Args = (TCHAR **)&argv[2]; return ScControl(MachineName, Command, Args); } _____ Modified: trunk/reactos/subsys/system/sc/sc.h --- trunk/reactos/subsys/system/sc/sc.h 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/sc.h 2005-11-02 21:10:50 UTC (rev 18958) @@ -2,9 +2,21 @@ #include <stdio.h> #include <tchar.h> +extern SC_HANDLE hSCManager; // declared in sc.c + +//#define DBG + +/* control functions */ +BOOL Query(TCHAR **Args, BOOL bExtended); +BOOL Start(INT ArgCount, TCHAR **Args); +BOOL Create(TCHAR **Args); +BOOL Delete(TCHAR **Args); +BOOL Control(DWORD Control, TCHAR **Args); + +/* print and error functions */ DWORD ReportLastError(VOID); -VOID dprintf(TCHAR* fmt, ...); +/* usage functions */ INT MainUsage(VOID); INT StartUsage(VOID); INT PauseUsage(VOID); @@ -13,9 +25,3 @@ INT StopUsage(VOID); INT ConfigUsage(VOID); INT DescriptionUsage(VOID); - -BOOL Query(TCHAR **Args, BOOL bExtended); -BOOL Start(INT ArgCount, TCHAR **Args); -BOOL Create(TCHAR **Args); -BOOL Delete(TCHAR **Args); -BOOL Control(DWORD Control, TCHAR **Args); _____ Added: trunk/reactos/subsys/system/sc/start.c --- trunk/reactos/subsys/system/sc/start.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/start.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -0,0 +1,101 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/start.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + +#include "sc.h" + +BOOL Start(INT ArgCount, TCHAR **Args) +{ + SC_HANDLE hSc; + SERVICE_STATUS_PROCESS ServiceStatus; + LPCTSTR ServiceName = *Args++; + LPCTSTR *ServiceArgs = (LPCTSTR *)Args; + DWORD BytesNeeded; + + + /* testing */ + printf("service to start - %s\n\n", ServiceName); + printf("Arguments :\n"); + while (*ServiceArgs) + { + printf("%s\n", *ServiceArgs); + ServiceArgs++; + } + + /* get a handle to the service requested for starting */ + hSc = OpenService(hSCManager, ServiceName, SERVICE_ALL_ACCESS); + + if (hSc == NULL) + { + _tprintf(_T("openService failed\n")); + ReportLastError(); + return FALSE; + } + + /* start the service opened */ + if (! StartService(hSc, ArgCount, ServiceArgs)) + { + _tprintf(_T("StartService failed\n")); + ReportLastError(); + return FALSE; + } + + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + _tprintf(_T("QueryServiceStatusEx 1 failed\n")); + ReportLastError(); + return FALSE; + } + + + while (ServiceStatus.dwCurrentState == SERVICE_START_PENDING) + { + /* wait before checking status */ + Sleep(ServiceStatus.dwWaitHint); + + /* check status again */ + if (! QueryServiceStatusEx( + hSc, + SC_STATUS_PROCESS_INFO, + (LPBYTE)&ServiceStatus, + sizeof(SERVICE_STATUS_PROCESS), + &BytesNeeded)) + { + _tprintf(_T("QueryServiceStatusEx 2 failed\n")); + ReportLastError(); + return FALSE; + } + } + + CloseServiceHandle(hSc); + + if (ServiceStatus.dwCurrentState == SERVICE_RUNNING) + { + _tprintf(_T("%s is running\n"), ServiceName); + return TRUE; + } + else + { + _tprintf(_T("Failed to start %s\n"), ServiceName); + _tprintf(_T("Curent state: %lu\n"), ServiceStatus.dwCurrentState); + _tprintf(_T("Exit code: %lu\n"), ServiceStatus.dwWin32ExitCode); + _tprintf(_T("Service Specific exit code: %lu\n"), + ServiceStatus.dwServiceSpecificExitCode); + _tprintf(_T("Check point: %lu\n"), ServiceStatus.dwCheckPoint); + _tprintf(_T("Wait hint: %lu\n"), ServiceStatus.dwWaitHint); + + return FALSE; + } +} Property changes on: trunk/reactos/subsys/system/sc/start.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/sc/usage.c --- trunk/reactos/subsys/system/sc/usage.c 2005-11-02 21:05:35 UTC (rev 18957) +++ trunk/reactos/subsys/system/sc/usage.c 2005-11-02 21:10:50 UTC (rev 18958) @@ -1,3 +1,14 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS SC utility + * FILE: subsys/system/sc/usage.c + * PURPOSE: control ReactOS services + * PROGRAMMERS: Ged Murphy (gedmurphy(a)gmail.com) + * REVISIONS: + * Ged Murphy 20/10/05 Created + * + */ + #include "sc.h" INT MainUsage(VOID) @@ -2,40 +13,40 @@ { - dprintf("DESCRIPTION:\n"); - dprintf("\tSC is a command line program used for communicating with\n"); - dprintf("\tthe Service Control Manager and its services.\n"); - dprintf("USAGE:\n"); - dprintf("\tsc <server> [command] [service name] <option1> <option2>...\n"); + _tprintf(_T("DESCRIPTION:\n") + _T("\tSC is a command line program used for communicating with\n") + _T("\tthe Service Control Manager and its services.\n") + _T("USAGE:\n") + _T("\tsc <server> [command] [service name] <option1> <option2>...\n") - dprintf("\tThe optional parameter <server> has the form \"\\ServerName\"\n"); - dprintf("\tFurther help on commands can be obtained by typing: \"sc [command]\"\n"); - dprintf("\tService Commands:\n"); - dprintf("\t query : Queries the status for a service, or\n"); - dprintf("\t enumerates the status for types of services.\n"); - dprintf("\t queryex : Queries the extended status for a service, or\n"); -// dprintf("\t enumerates the status for types of services.\n"); - dprintf("\t start : Starts a service.\n"); - dprintf("\t pause : Sends a PAUSE control request to a service.\n"); - dprintf("\t interrogate : Sends a INTERROGATE control request to a service.\n"); -// dprintf("\t continue : Sends a CONTINUE control request to a service.\n"); - dprintf("\t stop : Sends a STOP request to a service.\n"); -// dprintf("\t config : Changes the configuration of a service (persistant).\n"); -// dprintf("\t description : Changes the description of a service.\n"); -// dprintf("\t failure : Changes the actions taken by a service upon failure.\n"); -// dprintf("\t qc : Queries the configuration information for a service.\n"); -// dprintf("\t qdescription : Queries the description for a service.\n"); -// dprintf("\t qfailure : Queries the actions taken by a service upon failure.\n"); - dprintf("\t delete : Deletes a service (from the registry).\n"); - dprintf("\t create : Creates a service. (adds it to the registry).\n"); - dprintf("\t control : Sends a control to a service.\n"); -// dprintf("\t sdshow : Displays a service's security descriptor.\n"); -// dprintf("\t sdset : Sets a service's security descriptor.\n"); -// dprintf("\t GetDisplayName : Gets the DisplayName for a service.\n"); -// dprintf("\t GetKeyName : Gets the ServiceKeyName for a service.\n"); -// dprintf("\t EnumDepend : Enumerates Service Dependencies.\n"); -// dprintf("\n"); -// dprintf("\tService Name Independant Commands:\n"); -// dprintf("\t boot : (ok | bad) Indicates whether the last boot should\n"); -// dprintf("\t be saved as the last-known-good boot configuration\n"); -// dprintf("\t Lock : Locks the SCM Database\n"); -// dprintf("\t QueryLock : Queries the LockStatus for the SCM Database\n"); + _T("\tThe optional parameter <server> has the form \"\\ServerName\"\n") + _T("\tFurther help on commands can be obtained by typing: \"sc [command]\"\n") + _T("\tService Commands:\n") + _T("\t query : Queries the status for a service, or\n") + _T("\t enumerates the status for types of services.\n") + _T("\t queryex : Queries the extended status for a service, or\n") +// _T("\t enumerates the status for types of services.\n" + _T("\t start : Starts a service.\n") + _T("\t pause : Sends a PAUSE control request to a service.\n") + _T("\t interrogate : Sends a INTERROGATE control request to a service.\n") + _T("\t continue : Sends a CONTINUE control request to a service.\n") + _T("\t stop : Sends a STOP request to a service.\n") +// "\t config : Changes the configuration of a service (persistant).\n" +// "\t description : Changes the description of a service.\n" +// "\t failure : Changes the actions taken by a service upon failure.\n" +// "\t qc : Queries the configuration information for a service.\n" +// "\t qdescription : Queries the description for a service.\n" +// "\t qfailure : Queries the actions taken by a service upon failure.\n" + _T("\t delete : Deletes a service (from the registry).\n") + _T("\t create : Creates a service. (adds it to the registry).\n") + _T("\t control : Sends a control to a service.\n")); +// "\t sdshow : Displays a service's security descriptor.\n") +// "\t sdset : Sets a service's security descriptor.\n") +// "\t GetDisplayName : Gets the DisplayName for a service.\n") +// "\t GetKeyName : Gets the ServiceKeyName for a service.\n") +// "\t EnumDepend : Enumerates Service Dependencies.\n") +// "\n") +// "\tService Name Independant Commands:\n") +// "\t boot : (ok | bad) Indicates whether the last boot should\n") +// "\t be saved as the last-known-good boot configuration\n") +// "\t Lock : Locks the SCM Database\n") +// "\t QueryLock : Queries the LockStatus for the SCM Database\n") @@ -47,10 +58,10 @@ INT StartUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Starts a service running.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> start [service name] <arg1> <arg2> ...\n"); + _tprintf(_T("DESCRIPTION:\n") + _T(" Starts a service running.\n") + _T("USAGE:\n") + _T(" sc <server> start [service name] <arg1> <arg2> ...\n")); return 0; } @@ -58,48 +69,49 @@ INT PauseUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Sends a PAUSE control request to a service.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> pause [service name]\n"); + _tprintf(_T("DESCRIPTION:\n") + _T(" Sends a PAUSE control request to a service.\n") + _T("USAGE:\n") + _T(" sc <server> pause [service name]\n")); return 0; } INT InterrogateUsage(VOID) { - dprintf("DESCRIPTION:\n"); - dprintf(" Sends an INTERROGATE control request to a service.\n"); - dprintf("USAGE:\n"); - dprintf(" sc <server> interrogate [service name]\n"); + _tprintf(_T("DESCRIPTION:\n") [truncated at 1000 lines; 87 more skipped]

1 0

[gvg] 18957: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Vincent Béron <vberon(a)mecano.gme.usherb.ca> - Allow file:/// protocol to be used to download the Mozilla ActiveX control. - Remove tempfile used to download Mozilla ActiveX control once it's not used anymore. Alexandre Julliard <julliard(a)winehq.org> - Fixed a handle leak. Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c _____ Modified: trunk/reactos/lib/shdocvw/shdocvw_main.c --- trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-02 20:50:50 UTC (rev 18956) +++ trunk/reactos/lib/shdocvw/shdocvw_main.c 2005-11-02 21:05:35 UTC (rev 18957) @@ -307,6 +307,7 @@ { IBindStatusCallback *dl; static const WCHAR szUrlVal[] = {'M','o','z','i','l','l','a','U','r','l',0}; + static const WCHAR szFileProtocol[] = {'f','i','l','e',':','/','/','/',0}; WCHAR path[MAX_PATH], szUrl[MAX_PATH]; LPWSTR p; STARTUPINFOW si; @@ -315,6 +316,7 @@ DWORD r, sz, type; HKEY hkey; BOOL bCancelled = FALSE; + BOOL bTempfile = FALSE; /* find the name of the thing to download */ szUrl[0] = 0; @@ -329,21 +331,27 @@ if( r != ERROR_SUCCESS ) goto end; - /* built the path for the download */ - p = strrchrW( szUrl, '/' ); - if (!p) - goto end; - if (!GetTempPathW( MAX_PATH, path )) - goto end; - strcatW( path, p+1 ); + if( !strncmpW(szUrl, szFileProtocol, strlenW(szFileProtocol)) ) + lstrcpynW( path, szUrl+strlenW(szFileProtocol), MAX_PATH ); + else + { + /* built the path for the download */ + p = strrchrW( szUrl, '/' ); + if (!p) + goto end; + if (!GetTempPathW( MAX_PATH, path )) + goto end; + strcatW( path, p+1 ); - /* download it */ - dl = create_dl(info, &bCancelled); - r = URLDownloadToFileW( NULL, szUrl, path, 0, dl ); - if( dl ) - IBindStatusCallback_Release( dl ); - if( (r != S_OK) || bCancelled ) - goto end; + /* download it */ + bTempfile = TRUE; + dl = create_dl(info, &bCancelled); + r = URLDownloadToFileW( NULL, szUrl, path, 0, dl ); + if( dl ) + IBindStatusCallback_Release( dl ); + if( (r != S_OK) || bCancelled ) + goto end; + } /* run it */ memset( &si, 0, sizeof si ); @@ -352,8 +360,12 @@ if( !r ) goto end; WaitForSingleObject( pi.hProcess, INFINITE ); + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); end: + if( bTempfile ) + DeleteFileW( path ); EndDialog( hDlg, 0 ); return 0; }

1 0

[gvg] 18956: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Lionel Ulmer <lionel.ulmer(a)free.fr> - fix first two arguments to 'FindExecutableA' (input strings instead of pointers) - fix last argument to 'FindExecutableW' (it's an output string) Francois Gouget <fgouget(a)free.fr> - Use "static const" rather than "const static" as gcc -W complains about the former. Jonathan Ernst <Jonathan(a)ErnstFamily.ch> - First creation of registry entries missed AppData. Aric Stewart <aric(a)codeweavers.com> - MSDN states that the pszDisplayName member of BROWSEINFO is assumed to be MAX_PATH in length. So when doing the A->W conversion in BrowseForFolderA do not set that member to be the size of the incoming string, instead make it MAX_PATH. Dmitry Timoshkov <dmitry(a)codeweavers.com> - Use appropriate DDE APIs (ANSI or unicode) for ShellExecuteA/W, Excel 2000 depends on that. Martin Fuchs <martin-fuchs(a)gmx.net> - Simplify 'sei' structure initialization in ShellExecuteA/W. Mike McCormack <mike(a)codeweavers.com> - Use ShellLink_QueryInterface to return the right interface in IShellLink_Constructor. Richard Cohen <richard(a)daijobu.co.uk> - Don't hardcode "windows" directory. Modified: trunk/reactos/lib/shell32/brsfolder.c Modified: trunk/reactos/lib/shell32/enumidlist.c Modified: trunk/reactos/lib/shell32/shell.c Modified: trunk/reactos/lib/shell32/shell32.spec Modified: trunk/reactos/lib/shell32/shell32_main.h Modified: trunk/reactos/lib/shell32/shelllink.c Modified: trunk/reactos/lib/shell32/shellpath.c Modified: trunk/reactos/lib/shell32/shfldr_desktop.c Modified: trunk/reactos/lib/shell32/shlexec.c _____ Modified: trunk/reactos/lib/shell32/brsfolder.c --- trunk/reactos/lib/shell32/brsfolder.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/brsfolder.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -627,9 +627,8 @@ bi.pidlRoot = lpbi->pidlRoot; if (lpbi->pszDisplayName) { - len = MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, NULL, 0 ); - bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, len * sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, len ); + bi.pszDisplayName = HeapAlloc( GetProcessHeap(), 0, MAX_PATH * sizeof(WCHAR) ); + MultiByteToWideChar( CP_ACP, 0, lpbi->pszDisplayName, -1, bi.pszDisplayName, MAX_PATH ); } else bi.pszDisplayName = NULL; _____ Modified: trunk/reactos/lib/shell32/enumidlist.c --- trunk/reactos/lib/shell32/enumidlist.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/enumidlist.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -112,9 +112,9 @@ HANDLE hFile; WCHAR szPath[MAX_PATH]; BOOL succeeded = TRUE; - const static WCHAR stars[] = { '*','.','*',0 }; - const static WCHAR dot[] = { '.',0 }; - const static WCHAR dotdot[] = { '.','.',0 }; + static const WCHAR stars[] = { '*','.','*',0 }; + static const WCHAR dot[] = { '.',0 }; + static const WCHAR dotdot[] = { '.','.',0 }; TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); _____ Modified: trunk/reactos/lib/shell32/shell.c --- trunk/reactos/lib/shell32/shell.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -625,7 +625,7 @@ seiW.dwHotKey = 0; seiW.hProcess = hProcess; - ShellExecuteExW32 (&seiW, SHELL_Execute16); + SHELL_execute( &seiW, SHELL_Execute16, FALSE ); if (wVerb) SHFree(wVerb); if (wFile) SHFree(wFile); _____ Modified: trunk/reactos/lib/shell32/shell32.spec --- trunk/reactos/lib/shell32/shell32.spec 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell32.spec 2005-11-02 20:50:50 UTC (rev 18956) @@ -290,8 +290,8 @@ @ stdcall ExtractIconW(long wstr long) @ stub ExtractVersionResource16W @ stub FindExeDlgProc -@ stdcall FindExecutableA(ptr ptr ptr) -@ stdcall FindExecutableW(wstr wstr wstr) +@ stdcall FindExecutableA(str str ptr) +@ stdcall FindExecutableW(wstr wstr ptr) @ stub FixupOptionalComponents @ stdcall FreeIconList(long) @ stub InternalExtractIconListA _____ Modified: trunk/reactos/lib/shell32/shell32_main.h --- trunk/reactos/lib/shell32/shell32_main.h 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shell32_main.h 2005-11-02 20:50:50 UTC (rev 18956) @@ -213,7 +213,7 @@ typedef UINT_PTR (*SHELL_ExecuteW32)(const WCHAR *lpCmd, WCHAR *env, BOOL shWait, LPSHELLEXECUTEINFOW sei, LPSHELLEXECUTEINFOW sei_out); -BOOL WINAPI ShellExecuteExW32(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc); +BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode); UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation, LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args); _____ Modified: trunk/reactos/lib/shell32/shelllink.c --- trunk/reactos/lib/shell32/shelllink.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shelllink.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -1152,6 +1152,7 @@ REFIID riid, LPVOID *ppv ) { IShellLinkImpl * sl; + HRESULT r; TRACE("unkOut=%p riid=%s\n",pUnkOuter, debugstr_guid(riid)); @@ -1176,18 +1177,9 @@ TRACE("(%p)->()\n",sl); - if (IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IShellLinkA)) - *ppv = sl; - else if (IsEqualIID(riid, &IID_IShellLinkW)) - *ppv = &(sl->lpvtblw); - else { - LocalFree((HLOCAL)sl); - ERR("E_NOINTERFACE\n"); - return E_NOINTERFACE; - } - - return S_OK; + r = ShellLink_QueryInterface( sl, riid, ppv ); + ShellLink_Release( sl ); + return r; } _____ Modified: trunk/reactos/lib/shell32/shellpath.c --- trunk/reactos/lib/shell32/shellpath.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shellpath.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -805,7 +805,7 @@ /* This defaults to L"Documents and Settings" on Windows 2000/XP, but we're * acting more Windows 9x-like for now. */ -static const WCHAR szDefaultProfileDirW[] = {'w','i','n','d','o','w','s','\\','p','r','o','f','i','l','e','s','\0'}; +static const WCHAR szDefaultProfileDirW[] = {'p','r','o','f','i','l','e','s','\0'}; static const WCHAR AllUsersW[] = {'A','l','l',' ','U','s','e','r','s','\0'}; typedef enum _CSIDL_Type { @@ -1259,6 +1259,9 @@ switch (folder) { case CSIDL_PERSONAL: + case CSIDL_MYMUSIC: + case CSIDL_MYPICTURES: + case CSIDL_MYVIDEO: { const char *home = getenv("HOME"); @@ -1792,6 +1795,7 @@ CSIDL_PROGRAMS, CSIDL_PERSONAL, CSIDL_FAVORITES, + CSIDL_APPDATA, CSIDL_STARTUP, CSIDL_RECENT, CSIDL_SENDTO, _____ Modified: trunk/reactos/lib/shell32/shfldr_desktop.c --- trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shfldr_desktop.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -427,7 +427,7 @@ { IGenericSFImpl *This = (IGenericSFImpl *)iface; HRESULT hr = S_OK; - const static DWORD dwDesktopAttributes = + static const DWORD dwDesktopAttributes = SFGAO_STORAGE | SFGAO_HASPROPSHEET | SFGAO_STORAGEANCESTOR | SFGAO_FILESYSANCESTOR | SFGAO_FOLDER | SFGAO_FILESYSTEM | SFGAO_HASSUBFOLDER; _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2005-11-02 20:03:07 UTC (rev 18955) +++ trunk/reactos/lib/shell32/shlexec.c 2005-11-02 20:50:50 UTC (rev 18956) @@ -772,7 +772,8 @@ static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec, const WCHAR* lpFile, WCHAR *env, LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, + BOOL unicode) { static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0}; static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0}; @@ -803,10 +804,16 @@ strcpyW(topic, wSystem); } - if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + if (unicode) { - return 2; + if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + return 2; } + else + { + if (DdeInitializeA(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR) + return 2; + } hszApp = DdeCreateStringHandleW(ddeInst, app, CP_WINUNICODE); hszTopic = DdeCreateStringHandleW(ddeInst, topic, CP_WINUNICODE); @@ -845,8 +852,18 @@ /* It's documented in the KB 330337 that IE has a bug and returns * error DMLERR_NOTPROCESSED on XTYP_EXECUTE request. */ - hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0, - XTYP_EXECUTE, 10000, &tid); + if (unicode) + hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0, + XTYP_EXECUTE, 10000, &tid); + else + { + DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL); + char *resA = HeapAlloc(GetProcessHeap(), 0, lenA); + WideCharToMultiByte(CP_ACP, 0, res, -1, resA, lenA, NULL, NULL); + hDdeData = DdeClientTransaction( (LPBYTE)resA, lenA, hConv, 0L, 0, + XTYP_EXECUTE, 10000, &tid ); + HeapFree(GetProcessHeap(), 0, resA); + } if (hDdeData) DdeFreeDataHandle(hDdeData); else @@ -866,7 +883,8 @@ */ static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline, SHELL_ExecuteW32 execfunc, - LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out) + LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out, + BOOL unicode) { WCHAR cmd[1024]; LONG cmdlen = sizeof(cmd); @@ -894,7 +912,7 @@ if (RegQueryValueW(HKEY_CLASSES_ROOT, key, param, &paramlen) == ERROR_SUCCESS) { TRACE("Got ddeexec %s => %s\n", debugstr_w(key), debugstr_w(param)); - retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out); + retval = dde_connect(key, cmd, param, lpFile, env, szCommandline, psei->lpIDList, execfunc, psei, psei_out, unicode); } else { @@ -966,9 +984,9 @@ } /*********************************************************************** ** - * ShellExecuteExW32 [Internal] + * SHELL_execute [Internal] */ -BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc) +BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc, BOOL unicode ) { static const WCHAR wQuote[] = {'"',0}; static const WCHAR wSpace[] = {' ',0}; @@ -1296,7 +1314,7 @@ } TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(sei_tmp.lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol)); if (*lpstrProtocol) - retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); else retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei); HeapFree( GetProcessHeap(), 0, env ); @@ -1329,7 +1347,7 @@ lpFile += iSize; while (*lpFile == ':') lpFile++; } - retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei); + retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei, unicode); } /* Check if file specified is in the form www.??????.*** */ else if (!strncmpiW(lpFile, wWww, 3)) @@ -1414,7 +1432,7 @@ else seiW.lpClass = NULL; - ret = ShellExecuteExW32 (&seiW, SHELL_ExecuteW); + ret = SHELL_execute( &seiW, SHELL_ExecuteW, FALSE ); sei->hInstApp = seiW.hInstApp; @@ -1436,7 +1454,7 @@ */ BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei) { - return ShellExecuteExW32 (sei, SHELL_ExecuteW); + return SHELL_execute( sei, SHELL_ExecuteW, TRUE ); } /*********************************************************************** ** @@ -1465,6 +1483,6 @@ sei.dwHotKey = 0; sei.hProcess = 0; - ShellExecuteExW32 (&sei, SHELL_ExecuteW); + SHELL_execute( &sei, SHELL_ExecuteW, TRUE ); return sei.hInstApp; }

1 0

[gvg] 18955: Sync to Wine-0_9:
by gvg＠svn.reactos.com 02 Nov '05

02 Nov '05

Sync to Wine-0_9: Phil Krylov <phil(a)newstar.rinet.ru> - Fixed encoding of non-ASCII chars. Krzysztof Foltman <wdev(a)foltman.com> - Bugfix in EM_GETTEXTEX - Additional traces helpful in diagnosing similar (text retrieval-related) bugs. - Fix unnecessary (and harmful) repeated statement. - Removed buffer overrun error (incrementing output pointer one time too much in non-CRLF mode) making KeyNote fail to install. - Style trace information is written to different debug channel (it's not very useful anymore, reference counting looks correct for now). - The document dump contains the character position of the end-of-text mark. - The previous implementation was a workaround for off-by-one bug in ME_RunOfsFromCharOfs, this one relies on correct behavior of that function introduced by the previous patch. - Send verbose info to different debug channels (richedit_check for output from offset checker, richedit_lists for the document list dumps). - Fix a bug in 1.0 emulation mode in EM_LINELENGTH (which broke PTE installer). - Fixed EOL detection in ME_RunOfsFromCharOfs in 1.0 emulation mode (necessary for a non-workaround version of EM_POSFROMCHAR). - Fix 1.0 emulation mode in ME_GetTextW. - Remove another potential sources of infinite loops caused by EOF in the middle of the font and color tables. - Closing brace on text level is treated as EOF (effectively protecting the control from trash after the end of RTF). - Removed misleading comment about incomplete buffers (I was definitely wrong). - Implemented EM_GETFIRSTVISIBLELINE and EM_POSFROMCHAR (basic suboptimal implementation, can be optimized to skip whole paragraphs later if it's useful at all). - Fixed another case of misunderstanding MSDN wrt StreamInProc, causing license text to be truncated in Picasa installer (as well as some other programs, especially those that display long texts with NSIS). Modified: trunk/reactos/lib/riched20/editor.c Modified: trunk/reactos/lib/riched20/list.c Modified: trunk/reactos/lib/riched20/reader.c Modified: trunk/reactos/lib/riched20/run.c Modified: trunk/reactos/lib/riched20/style.c Modified: trunk/reactos/lib/riched20/writer.c _____ Modified: trunk/reactos/lib/riched20/editor.c --- trunk/reactos/lib/riched20/editor.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/editor.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -43,7 +43,7 @@ - EM_GETCHARFORMAT (partly done) - EM_GETEDITSTYLE + EM_GETEVENTMASK - - EM_GETFIRSTVISIBLELINE + + EM_GETFIRSTVISIBLELINE (can be optimized if needed) - EM_GETIMECOLOR 1.0asian - EM_GETIMECOMPMODE 2.0 - EM_GETIMEOPTIONS 1.0asian @@ -81,7 +81,7 @@ + EM_LINELENGTH + EM_LINESCROLL - EM_PASTESPECIAL - - EM_POSFROMCHARS + + EM_POSFROMCHAR + EM_REDO 2.0 - EM_REQUESTRESIZE + EM_REPLACESEL (proper style?) ANSI&Unicode @@ -290,7 +290,7 @@ } ME_InsertTextFromCursor(editor, 0, pText, nWideChars, style); - if (stream->dwSize < STREAMIN_BUFFER_SIZE) + if (stream->dwSize == 0) break; stream->dwSize = 0; } while(1); @@ -483,7 +483,12 @@ { ME_Style *s; RTFFlushOutputBuffer(info); + if (info->stackTop<=1) { + info->rtfClass = rtfEOF; + return; + } info->stackTop--; + assert(info->stackTop >= 0); if (info->styleChanged) { /* FIXME too slow ? how come ? */ @@ -1111,7 +1116,6 @@ UNSUPPORTED_MSG(EM_GETAUTOURLDETECT) UNSUPPORTED_MSG(EM_GETBIDIOPTIONS) UNSUPPORTED_MSG(EM_GETEDITSTYLE) - UNSUPPORTED_MSG(EM_GETFIRSTVISIBLELINE) UNSUPPORTED_MSG(EM_GETIMECOMPMODE) /* UNSUPPORTED_MSG(EM_GETIMESTATUS) missing in Wine headers */ UNSUPPORTED_MSG(EM_GETLANGOPTIONS) @@ -1130,7 +1134,6 @@ UNSUPPORTED_MSG(EM_HIDESELECTION) UNSUPPORTED_MSG(EM_LIMITTEXT) /* also known as EM_SETLIMITTEXT */ UNSUPPORTED_MSG(EM_PASTESPECIAL) -/* UNSUPPORTED_MSG(EM_POSFROMCHARS) missing in Wine headers */ UNSUPPORTED_MSG(EM_REQUESTRESIZE) UNSUPPORTED_MSG(EM_SCROLL) UNSUPPORTED_MSG(EM_SCROLLCARET) @@ -1350,6 +1353,30 @@ case EM_GETPARAFORMAT: ME_GetSelectionParaFormat(editor, (PARAFORMAT2 *)lParam); return 0; + case EM_GETFIRSTVISIBLELINE: + { + ME_DisplayItem *p = editor->pBuffer->pFirst; + int y = editor->nScrollPosY; + int ypara = 0; + int count = 0; + int ystart, yend; + while(p) { + p = ME_FindItemFwd(p, diStartRowOrParagraphOrEnd); + if (p->type == diTextEnd) + break; + if (p->type == diParagraph) { + ypara = p->member.para.nYPos; + continue; + } + ystart = ypara + p->member.row.nYPos; + yend = ystart + p->member.row.nHeight; + if (y < yend) { + break; + } + count++; + } + return count; + } case EM_LINESCROLL: { int nPos = editor->nScrollPosY, nEnd= editor->nTotalLength - editor->sizeWindow.cy; @@ -1538,16 +1565,19 @@ } else { - LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (nCount + 1) * sizeof(WCHAR)); - DWORD buflen = ex->cb; - LRESULT rc; - DWORD flags = 0; + /* potentially each char may be a CR, why calculate the exact value with O(N) when + we can just take a bigger buffer? :) */ + int crlfmul = (ex->flags & GT_USECRLF) ? 2 : 1; + LPWSTR buffer = HeapAlloc(GetProcessHeap(), 0, (crlfmul*nCount + 1) * sizeof(WCHAR)); + DWORD buflen = ex->cb; + LRESULT rc; + DWORD flags = 0; - buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); - rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); + buflen = ME_GetTextW(editor, buffer, nStart, nCount, ex->flags & GT_USECRLF); + rc = WideCharToMultiByte(ex->codepage, flags, buffer, buflen, (LPSTR)lParam, ex->cb, ex->lpDefaultChar, ex->lpUsedDefaultChar); - HeapFree(GetProcessHeap(),0,buffer); - return rc; + HeapFree(GetProcessHeap(),0,buffer); + return rc; } } case EM_GETSELTEXT: @@ -1563,6 +1593,9 @@ case EM_GETTEXTRANGE: { TEXTRANGEW *rng = (TEXTRANGEW *)lParam; + TRACE("EM_GETTEXTRANGE min=%ld max=%ld unicode=%d emul1.0=%d length=%d\n", + rng->chrg.cpMin, rng->chrg.cpMax, IsWindowUnicode(hWnd), + editor->bEmulateVersion10, ME_GetTextLength(editor)); if (IsWindowUnicode(hWnd)) return ME_GetTextW(editor, rng->lpstrText, rng->chrg.cpMin, rng->chrg.cpMax-rng->chrg.cpMin, editor->bEmulateVersion10); else @@ -1639,7 +1672,8 @@ if (item_end) nNextLineOfs = ME_CharOfsFromRunOfs(editor, ME_FindItemFwd(item_end, diRun), 0); else - nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs-1; + nNextLineOfs = ME_FindItemFwd(item, diParagraphOrEnd)->member.para.nCharOfs + - (editor->bEmulateVersion10?2:1); nChars = nNextLineOfs - nThisLineOfs; TRACE("EM_LINELENGTH(%d)==%d\n",wParam, nChars); return nChars; @@ -1684,6 +1718,33 @@ return ME_SetZoom(editor, wParam, lParam); case EM_CHARFROMPOS: return ME_CharFromPos(editor, ((POINTL *)lParam)->x, ((POINTL *)lParam)->y); + case EM_POSFROMCHAR: + { + ME_DisplayItem *pRun; + int nCharOfs, nOffset, nLength; + POINTL pt = {0,0}; + + nCharOfs = wParam; + /* detect which API version we're dealing with */ + if (wParam >= 0x40000) + nCharOfs = lParam; + nLength = ME_GetTextLength(editor); + + if (nCharOfs < nLength) { + ME_RunOfsFromCharOfs(editor, nCharOfs, &pRun, &nOffset); + assert(pRun->type == diRun); + pt.y = pRun->member.run.pt.y; + pt.x = pRun->member.run.pt.x + ME_PointFromChar(editor, &pRun->member.run, nOffset); + pt.y += ME_GetParagraph(pRun)->member.para.nYPos; + } else { + pt.x = 0; + pt.y = editor->pBuffer->pLast->member.para.nYPos; + } + if (wParam >= 0x40000) { + *(POINTL *)wParam = pt; + } + return MAKELONG( pt.x, pt.y ); + } case WM_CREATE: ME_CommitUndo(editor); ME_WrapMarkedParagraphs(editor); @@ -1982,12 +2043,12 @@ { ME_DisplayItem *item = ME_FindItemAtOffset(editor, diRun, nStart, &nStart); int nWritten = 0; + WCHAR *pStart = buffer; if (!item) { *buffer = L'\0'; return 0; } - assert(item); if (nStart) { @@ -2012,13 +2073,16 @@ if (item->member.run.nFlags & MERF_ENDPARA) { - *buffer++ = '\r'; + *buffer = '\r'; if (bCRLF) { - *buffer = '\n'; + *(++buffer) = '\n'; nWritten++; } assert(nLen == 1); + /* our end paragraph consists of 2 characters now */ + if (editor->bEmulateVersion10) + nChars--; } else CopyMemory(buffer, item->member.run.strText->szData, sizeof(WCHAR)*nLen); @@ -2028,12 +2092,14 @@ if (!nChars) { + TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); *buffer = L'\0'; return nWritten; } item = ME_FindItemFwd(item, diRun); } *buffer = L'\0'; + TRACE("nWritten=%d, actual=%d\n", nWritten, buffer-pStart); return nWritten; } _____ Modified: trunk/reactos/lib/riched20/list.c --- trunk/reactos/lib/riched20/list.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/list.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -21,7 +21,7 @@ #include "editor.h" -WINE_DEFAULT_DEBUG_CHANNEL(riched20); +WINE_DEFAULT_DEBUG_CHANNEL(richedit_lists); void ME_InsertBefore(ME_DisplayItem *diWhere, ME_DisplayItem *diWhat) { @@ -181,7 +181,7 @@ pItem->member.run.nCharOfs); break; case diTextEnd: - TRACE("\nEnd\n"); + TRACE("\nEnd(ofs=%d)\n", pItem->member.para.nCharOfs); break; default: break; _____ Modified: trunk/reactos/lib/riched20/reader.c --- trunk/reactos/lib/riched20/reader.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/reader.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -127,13 +127,6 @@ TRACE("\n"); - /* Doc says, that if the last buffer wasn't full, it's EOF. - Actually, that's not true. */ -/* - if (stream->dwSize > 0 && stream->dwSize == stream->dwUsed - && stream->dwSize < sizeof(stream->buffer)) - return EOF; -*/ if (stream->dwSize <= stream->dwUsed) { ME_StreamInFill(stream); @@ -455,6 +448,10 @@ RTFFuncPtr p; TRACE("\n"); + /* don't try to return anything once EOF is reached */ + if (info->rtfClass == rtfEOF) { + return rtfEOF; + } for (;;) { @@ -885,6 +882,8 @@ for (;;) { RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; if (old < 0) /* first entry - determine tbl type */ @@ -901,6 +900,8 @@ if (!RTFCheckCM (info, rtfGroup, rtfBeginGroup)) RTFPanic (info, "%s: missing \"{\"", fn); RTFGetToken (info); /* yes, skip to next token */ + if (info->rtfClass == rtfEOF) + break; } fp = New (RTFFont); if (fp == NULL) @@ -1002,12 +1003,18 @@ fn,info->rtfTextBuf); } RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; } + if (info->rtfClass == rtfEOF) + break; if (old == 0) /* need to see "}" here */ { RTFGetToken (info); if (!RTFCheckCM (info, rtfGroup, rtfEndGroup)) RTFPanic (info, "%s: missing \"}\"", fn); + if (info->rtfClass == rtfEOF) + break; } /* Apply the real properties of the default font */ @@ -1055,6 +1062,8 @@ for (;;) { RTFGetToken (info); + if (info->rtfClass == rtfEOF) + break; if (RTFCheckCM (info, rtfGroup, rtfEndGroup)) break; cp = New (RTFColor); @@ -1074,6 +1083,8 @@ } RTFGetToken (info); } + if (info->rtfClass == rtfEOF) + break; if (!RTFCheckCM (info, rtfText, ';')) RTFPanic (info,"%s: malformed entry", fn); } _____ Modified: trunk/reactos/lib/riched20/run.c --- trunk/reactos/lib/riched20/run.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/run.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -23,6 +23,8 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_check); +WINE_DECLARE_DEBUG_CHANNEL(richedit_lists); int ME_CanJoinRuns(ME_Run *run1, ME_Run *run2) { @@ -72,26 +74,26 @@ { ME_DisplayItem *p = editor->pBuffer->pFirst; int ofs = 0, ofsp = 0; - if(TRACE_ON(richedit)) + if(TRACE_ON(richedit_lists)) { - TRACE("---\n"); + TRACE_(richedit_lists)("---\n"); ME_DumpDocument(editor->pBuffer); } do { p = ME_FindItemFwd(p, diRunOrParagraphOrEnd); switch(p->type) { case diTextEnd: - TRACE("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); + TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); return; case diParagraph: - TRACE("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); + TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); ofsp = p->member.para.nCharOfs; ofs = 0; break; case diRun: - TRACE("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = \"%s\", flags=%08x, fx&mask = %08lx\n", + TRACE_(richedit_check)("run, real ofs = %d (+ofsp = %d), counted = %d, len = %d, txt = \"%s\", flags=%08x, fx&mask = %08lx\n", p->member.run.nCharOfs, p->member.run.nCharOfs+ofsp, ofsp+ofs, p->member.run.strText->nLen, debugstr_w(p->member.run.strText->szData), p->member.run.nFlags, @@ -143,6 +145,7 @@ if (nCharOfs < pPara->member.para.next_para->member.para.nCharOfs) { + int eollen = 1; *ppRun = ME_FindItemFwd(pPara, diRun); assert(*ppRun); while (!((*ppRun)->member.run.nFlags & MERF_ENDPARA)) @@ -157,7 +160,10 @@ } *ppRun = pNext; } - if (nCharOfs == nParaOfs + (*ppRun)->member.run.nCharOfs) { + /* the handling of bEmulateVersion10 may be a source of many bugs, I'm afraid */ + eollen = (editor->bEmulateVersion10 ? 2 : 1); + if (nCharOfs >= nParaOfs + (*ppRun)->member.run.nCharOfs && + nCharOfs < nParaOfs + (*ppRun)->member.run.nCharOfs + eollen) { *pOfs = 0; return; } _____ Modified: trunk/reactos/lib/riched20/style.c --- trunk/reactos/lib/riched20/style.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/style.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -21,6 +21,7 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_style); static int all_refs = 0; @@ -197,7 +198,7 @@ { char buf[2048]; ME_DumpStyleToBuf(&s->fmt, buf); - TRACE("%s\n", buf); + TRACE_(richedit_style)("%s\n", buf); } void ME_DumpStyleToBuf(CHARFORMAT2W *pFmt, char buf[2048]) @@ -321,7 +322,7 @@ if (i < HFONT_CACHE_SIZE) /* found */ { item = &editor->pFontCache[i]; - TRACE("font reused %d\n", i); + TRACE_(richedit_style)("font reused %d\n", i); s->hFont = item->hFont; item->nRefs++; @@ -332,13 +333,13 @@ assert(nEmpty != -1); /* otherwise we leak cache entries or get too many fonts at once*/ if (item->hFont) { - TRACE("font deleted %d\n", nEmpty); + TRACE_(richedit_style)("font deleted %d\n", nEmpty); DeleteObject(item->hFont); item->hFont = NULL; } s->hFont = CreateFontIndirectW(&lf); assert(s->hFont); - TRACE("font created %d\n", nEmpty); + TRACE_(richedit_style)("font created %d\n", nEmpty); item->hFont = s->hFont; item->nRefs = 1; memcpy(&item->lfSpecs, &lf, sizeof(LOGFONTW)); @@ -391,9 +392,9 @@ s->nRefs--; all_refs--; if (s->nRefs==0) - TRACE("destroy style %p, total refs=%d\n", s, all_refs); + TRACE_(richedit_style)("destroy style %p, total refs=%d\n", s, all_refs); else - TRACE("release style %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); + TRACE_(richedit_style)("release style %p, new refs=%d, total refs=%d\n", s, s->nRefs, all_refs); if (!all_refs) TRACE("all style references freed (good!)\n"); assert(s->nRefs>=0); if (!s->nRefs) _____ Modified: trunk/reactos/lib/riched20/writer.c --- trunk/reactos/lib/riched20/writer.c 2005-11-02 19:28:16 UTC (rev 18954) +++ trunk/reactos/lib/riched20/writer.c 2005-11-02 20:03:07 UTC (rev 18955) @@ -616,7 +616,7 @@ buffer[pos++] = *letter; } else { for (i = 0; i < nBytes; i++) - pos += sprintf(buffer + pos, "\\'%02x", letter[i]); + pos += sprintf(buffer + pos, "\\'%02x", (BYTE)letter[i]); } text++; nChars--;

1 0

← Newer
1
...
81
82
83
84
85
86
87
88
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2005