Ros-diffs January 2005

ros-diffs@reactos.org

28 participants
703 discussions

[gvg] 13074: Implement LOAD_LIBRARY_AS_DATAFILE flag (forgotten file)

by gvg＠svn.reactos.com

Implement LOAD_LIBRARY_AS_DATAFILE flag (forgotten file) Modified: trunk/reactos/include/ntdll/ldr.h _____ Modified: trunk/reactos/include/ntdll/ldr.h --- trunk/reactos/include/ntdll/ldr.h 2005-01-16 09:36:19 UTC (rev 13073) +++ trunk/reactos/include/ntdll/ldr.h 2005-01-16 09:44:07 UTC (rev 13074) @@ -102,8 +102,8 @@ PIMAGE_NT_HEADERS NTHeaders); NTSTATUS LdrMapNTDllForProcess(HANDLE ProcessHandle, PHANDLE NTDllSectionHandle); +BOOL LdrMappedAsDataFile(PVOID *BaseAddress); - NTSTATUS STDCALL LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress);

19 years, 10 months

[gvg] 13073: Implement LOAD_LIBRARY_AS_DATAFILE flag

by gvg＠svn.reactos.com

Implement LOAD_LIBRARY_AS_DATAFILE flag Modified: trunk/reactos/lib/ntdll/ldr/res.c Modified: trunk/reactos/lib/ntdll/ldr/utils.c _____ Modified: trunk/reactos/lib/ntdll/ldr/res.c --- trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 09:24:00 UTC (rev 13072) +++ trunk/reactos/lib/ntdll/ldr/res.c 2005-01-16 09:36:19 UTC (rev 13073) @@ -110,12 +110,14 @@ int j, pos = 0; LCID UserLCID, SystemLCID; LANGID UserLangID, SystemLangID; + BOOL MappedAsDataFile; + MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); DPRINT("LdrFindResource_U(%08x, %08x, %d, %08x)\n", BaseAddress, ResourceInfo, Level, ResourceDataEntry); /* Get the pointer to the resource directory */ ResDir = (PIMAGE_RESOURCE_DIRECTORY)RtlImageDirectoryEntryToData(BaseAddress, - TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &i); + ! MappedAsDataFile, IMAGE_DIRECTORY_ENTRY_RESOURCE, &i); if (ResDir == NULL) { return STATUS_RESOURCE_DATA_NOT_FOUND; } @@ -278,18 +280,20 @@ ULONG DataSize; ULONG Offset = 0; ULONG Data; + BOOL MappedAsDataFile; if(!ResourceDataEntry) return STATUS_RESOURCE_DATA_NOT_FOUND; + MappedAsDataFile = LdrMappedAsDataFile(&BaseAddress); Data = (ULONG)RtlImageDirectoryEntryToData(BaseAddress, TRUE, IMAGE_DIRECTORY_ENTRY_RESOURCE, &DataSize); if (Data == 0) { return STATUS_RESOURCE_DATA_NOT_FOUND; } - if ((ULONG)BaseAddress & 1) { + if (MappedAsDataFile) { /* loaded as ordinary file */ - NtHeader = RtlImageNtHeader((PVOID)((ULONG)BaseAddress & ~1UL)); + NtHeader = RtlImageNtHeader(BaseAddress); Offset = (ULONG)BaseAddress - Data + NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].V irtualAddress; Section = RtlImageRvaToSection(NtHeader, BaseAddress, NtHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE].V irtualAddress); if (Section == NULL) { _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 09:24:00 UTC (rev 13072) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-01-16 09:36:19 UTC (rev 13073) @@ -61,7 +61,8 @@ static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL, IN ULONG LoadFlags, IN PUNICODE_STRING Name, - OUT PLDR_MODULE *Module); + OUT PLDR_MODULE *Module, + OUT PVOID *BaseAddress OPTIONAL); static NTSTATUS LdrpAttachProcess(VOID); static VOID LdrpDetachProcess(BOOL UnloadAll); @@ -83,6 +84,18 @@ #endif /* DBG || KDBG */ +BOOL +LdrMappedAsDataFile(PVOID *BaseAddress) +{ + if (0 != ((DWORD_PTR) *BaseAddress & (PAGE_SIZE - 1))) + { + *BaseAddress = (PVOID) ((DWORD_PTR) *BaseAddress & ~ ((DWORD_PTR) PAGE_SIZE - 1)); + return TRUE; + } + + return FALSE; +} + static inline LONG LdrpDecrementLoadCount(PLDR_MODULE Module, BOOL Locked) { LONG LoadCount; @@ -548,6 +561,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL, IN PUNICODE_STRING DllName, OUT PUNICODE_STRING FullDosName, + IN BOOL MapAsDataFile, OUT PHANDLE SectionHandle) { WCHAR SearchPathBuffer[MAX_PATH]; @@ -558,8 +572,6 @@ char BlockBuffer [1024]; PIMAGE_DOS_HEADER DosHeader; PIMAGE_NT_HEADERS NTHeaders; - PVOID ImageBase; - ULONG ImageSize; IO_STATUS_BLOCK IoStatusBlock; NTSTATUS Status; ULONG len; @@ -663,11 +675,6 @@ return STATUS_UNSUCCESSFUL; } - ImageBase = (PVOID) NTHeaders->OptionalHeader.ImageBase; - ImageSize = NTHeaders->OptionalHeader.SizeOfImage; - - DPRINT("ImageBase 0x%08x\n", ImageBase); - /* * Create a section for dll. */ @@ -676,7 +683,7 @@ NULL, NULL, PAGE_READWRITE, - SEC_COMMIT | SEC_IMAGE, + SEC_COMMIT | (MapAsDataFile ? 0 : SEC_IMAGE), FileHandle); NtClose(FileHandle); @@ -732,8 +739,8 @@ *BaseAddress = NULL; - Status = LdrpLoadModule(SearchPath, LoadFlags, Name, &Module); - if (NT_SUCCESS(Status)) + Status = LdrpLoadModule(SearchPath, LoadFlags, Name, &Module, BaseAddress); + if (NT_SUCCESS(Status) && 0 == (LoadFlags & LOAD_LIBRARY_AS_DATAFILE)) { RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock); Status = LdrpAttachProcess(); @@ -1346,7 +1353,8 @@ Status = LdrpLoadModule(SerachPath, NtCurrentPeb()->Ldr->Initialized ? 0 : LDRP_PROCESS_CREATION_TIME, &DllName, - Module); + Module, + NULL); if (NT_SUCCESS(Status)) { Status = LdrFindEntryForName (&DllName, Module, FALSE); @@ -1978,7 +1986,8 @@ LdrpLoadModule(IN PWSTR SearchPath OPTIONAL, IN ULONG LoadFlags, IN PUNICODE_STRING Name, - PLDR_MODULE *Module) + PLDR_MODULE *Module, + PVOID *BaseAddress OPTIONAL) { UNICODE_STRING AdjustedName; UNICODE_STRING FullDosName; @@ -1988,6 +1997,7 @@ ULONG ViewSize; PVOID ImageBase; PIMAGE_NT_HEADERS NtHeaders; + BOOL MappedAsDataFile; if (Module == NULL) { @@ -1998,11 +2008,16 @@ DPRINT("%wZ\n", &AdjustedName); + MappedAsDataFile = FALSE; /* Test if dll is already loaded */ Status = LdrFindEntryForName(&AdjustedName, Module, TRUE); if (NT_SUCCESS(Status)) { RtlFreeUnicodeString(&AdjustedName); + if (NULL != BaseAddress) + { + *BaseAddress = (*Module)->BaseAddress; + } } else { @@ -2010,7 +2025,9 @@ Status = LdrpMapKnownDll(&AdjustedName, &FullDosName, &SectionHandle); if (!NT_SUCCESS(Status)) { - Status = LdrpMapDllImageFile(SearchPath, &AdjustedName, &FullDosName, &SectionHandle); + MappedAsDataFile = (0 != (LoadFlags & LOAD_LIBRARY_AS_DATAFILE)); + Status = LdrpMapDllImageFile(SearchPath, &AdjustedName, &FullDosName, + MappedAsDataFile, &SectionHandle); } if (!NT_SUCCESS(Status)) { @@ -2039,6 +2056,10 @@ NtClose(SectionHandle); return(Status); } + if (NULL != BaseAddress) + { + *BaseAddress = ImageBase; + } /* Get and check the NT headers */ NtHeaders = RtlImageNtHeader(ImageBase); if (NtHeaders == NULL) @@ -2049,6 +2070,19 @@ RtlFreeUnicodeString(&FullDosName); return STATUS_UNSUCCESSFUL; } + DPRINT("Mapped %wZ at %x\n", &FullDosName, ImageBase); + if (MappedAsDataFile) + { + assert(NULL != BaseAddress); + if (NULL != BaseAddress) + { + *BaseAddress = (PVOID) ((char *) *BaseAddress + 1); + } + *Module = NULL; + RtlFreeUnicodeString(&FullDosName); + NtClose(SectionHandle); + return STATUS_SUCCESS; + } /* If the base address is different from the * one the DLL is actually loaded, perform any * relocation. */ @@ -2212,12 +2246,20 @@ if (BaseAddress == NULL) return STATUS_SUCCESS; - Status = LdrFindEntryForAddress(BaseAddress, &Module); - if (NT_SUCCESS(Status)) + if (LdrMappedAsDataFile(&BaseAddress)) { - TRACE_LDR("LdrUnloadDll, , unloading %wZ\n", &Module->BaseDllName); - Status = LdrpUnloadModule(Module, TRUE); + Status = NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); } + else + { + Status = LdrFindEntryForAddress(BaseAddress, &Module); + if (NT_SUCCESS(Status)) + { + TRACE_LDR("LdrUnloadDll, , unloading %wZ\n", &Module->BaseDllName); + Status = LdrpUnloadModule(Module, TRUE); + } + } + return Status; }

19 years, 10 months

[arty] 13072: Corrected filename trap.S -> trap.s

by arty＠svn.reactos.com

Corrected filename trap.S -> trap.s Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml _____ Modified: branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml --- branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-15 23:15:04 UTC (rev 13071) +++ branches/xmlbuildsystem/reactos/ntoskrnl/ntoskrnl.xml 2005-01-16 09:24:00 UTC (rev 13072) @@ -45,7 +45,7 @@ <file>syscall.S</file> <file>thread.c</file> <file>tlbflush.S</file> - <file>trap.S</file> + <file>trap.s</file> <file>tskswitch.S</file> <file>tss.c</file> <file>usercall.c</file>

19 years, 10 months

[royce] 13071: msys compatibility fix

by royce＠svn.reactos.com

msys compatibility fix Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/makefile --- branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-15 23:14:53 UTC (rev 13070) +++ branches/xmlbuildsystem/reactos/tools/rbuild/makefile 2005-01-15 23:15:04 UTC (rev 13071) @@ -67,7 +67,7 @@ $(HOST_CXX) $(HOST_CXXFLAGS) -c $< -o $@ test: rbuild_tests$(EXE_POSTFIX) - $(EXE_PREFIX)rbuild_tests$(EXE_POSTFIX) + ./$(EXE_PREFIX)rbuild_tests$(EXE_POSTFIX) rbuild_tests$(EXE_POSTFIX): $(TEST_OBJECTS) $(HOST_CXX) $(TEST_OBJECTS) $(HOST_LFLAGS) -o rbuild_tests$(EXE_POSTFIX)

19 years, 10 months

[royce] 13070: remove unnecessary call to c_str()

by royce＠svn.reactos.com

remove unnecessary call to c_str() Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-15 23:00:02 UTC (rev 13069) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-15 23:14:53 UTC (rev 13070) @@ -83,7 +83,7 @@ string MingwModuleHandler::GetModuleArchiveFilename ( const Module& module ) const { - return ReplaceExtension ( FixupTargetFilename ( module.GetPath () ).c_str (), + return ReplaceExtension ( FixupTargetFilename ( module.GetPath () ), ".a" ); }

19 years, 10 months

[chorns] 13069: Refactor GenerateGlobalCFlagsAndProperties

by chorns＠svn.reactos.com

Refactor GenerateGlobalCFlagsAndProperties Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-15 22:32:01 UTC (rev 13068) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-15 23:00:02 UTC (rev 13069) @@ -60,8 +60,43 @@ } void +MingwBackend::GenerateProjectCFlagsMacro ( const char* assignmentOperation, + const vector<Include*>& includes, + const vector<Define*>& defines ) const +{ + size_t i; + + fprintf ( + fMakefile, + "PROJECT_CFLAGS %s", + assignmentOperation ); + for ( i = 0; i < includes.size(); i++ ) + { + fprintf ( + fMakefile, + " -I%s", + includes[i]->directory.c_str() ); + } + + for ( i = 0; i < defines.size(); i++ ) + { + Define& d = *defines[i]; + fprintf ( + fMakefile, + " -D%s", + d.name.c_str() ); + if ( d.value.size() ) + fprintf ( + fMakefile, + "=%s", + d.value.c_str() ); + } + fprintf ( fMakefile, "\n" ); +} + +void MingwBackend::GenerateGlobalCFlagsAndProperties ( - const char* op, + const char* assignmentOperation, const vector<Property*>& properties, const vector<Include*>& includes, const vector<Define*>& defines, @@ -79,31 +114,9 @@ if ( includes.size() || defines.size() ) { - fprintf ( - fMakefile, - "PROJECT_CFLAGS %s", - op ); - for ( i = 0; i < includes.size(); i++ ) - { - fprintf ( - fMakefile, - " -I%s", - includes[i]->directory.c_str() ); - } - for ( i = 0; i < defines.size(); i++ ) - { - Define& d = *defines[i]; - fprintf ( - fMakefile, - " -D%s", - d.name.c_str() ); - if ( d.value.size() ) - fprintf ( - fMakefile, - "=%s", - d.value.c_str() ); - } - fprintf ( fMakefile, "\n" ); + GenerateProjectCFlagsMacro ( assignmentOperation, + includes, + defines ); } for ( i = 0; i < ifs.size(); i++ ) _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-15 22:32:01 UTC (rev 13068) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.h 2005-01-15 23:00:02 UTC (rev 13069) @@ -14,13 +14,14 @@ void CreateMakefile (); void CloseMakefile (); void GenerateHeader (); - void - MingwBackend::GenerateGlobalCFlagsAndProperties ( - const char* op, - const std::vector<Property*>& properties, - const std::vector<Include*>& includes, - const std::vector<Define*>& defines, - const std::vector<If*>& ifs ); + void GenerateProjectCFlagsMacro ( const char* assignmentOperation, + const std::vector<Include*>& includes, + const std::vector<Define*>& defines ) const; + void GenerateGlobalCFlagsAndProperties ( const char* op, + const std::vector<Property*>& properties, + const std::vector<Include*>& includes, + const std::vector<Define*>& defines, + const std::vector<If*>& ifs ); std::string GenerateProjectLFLAGS (); void GenerateGlobalVariables (); void GenerateAllTarget ();

19 years, 10 months

[chorns] 13068: Windres support.

by chorns＠svn.reactos.com

Windres support. Modified: branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h _____ Modified: branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml --- branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml 2005-01-15 20:28:19 UTC (rev 13067) +++ branches/xmlbuildsystem/reactos/subsys/system/welcome/welcome.xml 2005-01-15 22:32:01 UTC (rev 13068) @@ -1,4 +1,5 @@ <module name="welcome" type="win32gui"> + <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define> <define name="__USE_W32API" /> @@ -6,4 +7,5 @@ <library>gdi32</library> <library>user32</library> <file>welcome.c</file> + <file>welcome.rc</file> </module> _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-15 20:28:19 UTC (rev 13067) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-01-15 22:32:01 UTC (rev 13068) @@ -154,13 +154,16 @@ fprintf ( fMakefile, "ld = ld\n" ); fprintf ( fMakefile, "ar = ar\n" ); fprintf ( fMakefile, "dlltool = dlltool\n\n" ); + fprintf ( fMakefile, "windres = windres\n\n" ); GenerateGlobalCFlagsAndProperties ( "=", ProjectNode.properties, ProjectNode.includes, ProjectNode.defines, ProjectNode.ifs ); - fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n", GenerateProjectLFLAGS ().c_str () ); + fprintf ( fMakefile, "PROJECT_RCFLAGS = $(PROJECT_CFLAGS)\n" ); + fprintf ( fMakefile, "PROJECT_LFLAGS = %s\n", + GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "\n" ); fprintf ( fMakefile, ".PHONY: clean\n\n" ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-15 20:28:19 UTC (rev 13067) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .cpp 2005-01-15 22:32:01 UTC (rev 13068) @@ -34,13 +34,13 @@ } } -/*static*/ void +void MingwModuleHandler::SetMakefile ( FILE* f ) { fMakefile = f; } -/*static*/ MingwModuleHandler* +MingwModuleHandler* MingwModuleHandler::LookupHandler ( const string& location, ModuleType moduletype ) { @@ -160,8 +160,14 @@ string MingwModuleHandler::GetObjectFilename ( const string& sourceFilename ) const { + string newExtension; + string extension = GetExtension ( sourceFilename ); + if ( extension == ".rc" || extension == ".RC" ) + newExtension = ".coff"; + else + newExtension = ".o"; return FixupTargetFilename ( ReplaceExtension ( sourceFilename, - ".o" ) ); + newExtension ) ); } string @@ -239,19 +245,6 @@ return parameters; } -void -MingwModuleHandler::GenerateGccModuleIncludeVariable ( const Module& module ) const -{ -#if 0 - string name ( module.name + "_CFLAGS" ); - fprintf ( fMakefile, - "%s := %s %s\n", - name.c_str(), - GenerateGccDefineParameters(module).c_str(), - GenerateGccIncludeParameters(module).c_str() ); -#endif -} - string MingwModuleHandler::GenerateGccIncludeParameters ( const Module& module ) const { @@ -287,6 +280,42 @@ } void +MingwModuleHandler::GenerateMacro ( const char* assignmentOperation, + const string& macro, + const vector<Include*>& includes, + const vector<Define*>& defines ) const +{ + size_t i; + + fprintf ( + fMakefile, + "%s %s", + macro.c_str(), + assignmentOperation ); + for ( i = 0; i < includes.size(); i++ ) + { + fprintf ( + fMakefile, + " -I%s", + includes[i]->directory.c_str() ); + } + for ( i = 0; i < defines.size(); i++ ) + { + Define& d = *defines[i]; + fprintf ( + fMakefile, + " -D%s", + d.name.c_str() ); + if ( d.value.size() ) + fprintf ( + fMakefile, + "=%s", + d.value.c_str() ); + } + fprintf ( fMakefile, "\n" ); +} + +void MingwModuleHandler::GenerateMacros ( const char* assignmentOperation, const vector<File*>& files, @@ -296,6 +325,7 @@ const vector<If*>& ifs, const string& cflags_macro, const string& nasmflags_macro, + const string& windresflags_macro, const string& linkerflags_macro, const string& objs_macro) const { @@ -303,32 +333,14 @@ if ( includes.size() || defines.size() ) { - fprintf ( - fMakefile, - "%s %s", - cflags_macro.c_str(), - assignmentOperation ); - for ( i = 0; i < includes.size(); i++ ) - { - fprintf ( - fMakefile, - " -I%s", - includes[i]->directory.c_str() ); - } - for ( i = 0; i < defines.size(); i++ ) - { - Define& d = *defines[i]; - fprintf ( - fMakefile, - " -D%s", - d.name.c_str() ); - if ( d.value.size() ) - fprintf ( - fMakefile, - "=%s", - d.value.c_str() ); - } - fprintf ( fMakefile, "\n" ); + GenerateMacro ( assignmentOperation, + cflags_macro, + includes, + defines ); + GenerateMacro ( assignmentOperation, + windresflags_macro, + includes, + defines ); } if ( linkerFlags != NULL ) @@ -382,6 +394,7 @@ rIf.ifs, cflags_macro, nasmflags_macro, + windresflags_macro, linkerflags_macro, objs_macro ); fprintf ( @@ -396,6 +409,7 @@ const Module& module, const string& cflags_macro, const string& nasmflags_macro, + const string& windresflags_macro, const string& linkerflags_macro, const string& objs_macro) const { @@ -408,6 +422,7 @@ module.ifs, cflags_macro, nasmflags_macro, + windresflags_macro, linkerflags_macro, objs_macro ); fprintf ( fMakefile, "\n" ); @@ -419,6 +434,11 @@ fprintf ( fMakefile, + "%s += $(PROJECT_RCFLAGS)\n\n", + windresflags_macro.c_str () ); + + fprintf ( + fMakefile, "%s_LFLAGS += $(PROJECT_LFLAGS)\n\n", module.name.c_str () ); } @@ -465,11 +485,25 @@ } string +MingwModuleHandler::GenerateWindresCommand ( const Module& module, + const string& sourceFilename, + const string& windresflagsMacro ) const +{ + string objectFilename = GetObjectFilename ( sourceFilename ); + return ssprintf ( "%s %s -o %s ${%s}\n", + "${windres}", + sourceFilename.c_str (), + objectFilename.c_str (), + windresflagsMacro.c_str () ); +} + +string MingwModuleHandler::GenerateCommand ( const Module& module, const string& sourceFilename, const string& cc, const string& cflagsMacro, - const string& nasmflagsMacro ) const + const string& nasmflagsMacro, + const string& windresflagsMacro ) const { string extension = GetExtension ( sourceFilename ); if ( extension == ".c" || extension == ".C" ) @@ -486,6 +520,10 @@ return GenerateNasmCommand ( module, sourceFilename, nasmflagsMacro ); + else if ( extension == ".rc" || extension == ".RC" ) + return GenerateWindresCommand ( module, + sourceFilename, + windresflagsMacro ); throw InvalidOperationException ( __FILE__, __LINE__, @@ -517,7 +555,8 @@ const vector<If*>& ifs, const string& cc, const string& cflagsMacro, - const string& nasmflagsMacro ) const + const string& nasmflagsMacro, + const string& windresflagsMacro ) const { size_t i; @@ -535,20 +574,34 @@ sourceFilename, cc, cflagsMacro, - nasmflagsMacro ).c_str () ); + nasmflagsMacro, + windresflagsMacro ).c_str () ); } for ( i = 0; i < ifs.size(); i++ ) - GenerateObjectFileTargets ( module, ifs[i]->files, ifs[i]->ifs, cc, cflagsMacro, nasmflagsMacro ); + GenerateObjectFileTargets ( module, + ifs[i]->files, + ifs[i]->ifs, + cc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); } void MingwModuleHandler::GenerateObjectFileTargets ( const Module& module, const string& cc, const string& cflagsMacro, - const string& nasmflagsMacro ) const + const string& nasmflagsMacro, + const string& windresflagsMacro ) const { - GenerateObjectFileTargets ( module, module.files, module.ifs, cc, cflagsMacro, nasmflagsMacro ); + GenerateObjectFileTargets ( module, + module.files, + module.ifs, + cc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); fprintf ( fMakefile, "\n" ); } @@ -609,10 +662,16 @@ { string cflagsMacro = ssprintf ("%s_CFLAGS", module.name.c_str ()); string nasmflagsMacro = ssprintf ("%s_NASMFLAGS", module.name.c_str ()); + string windresflagsMacro = ssprintf ("%s_RCFLAGS", module.name.c_str ()); string linkerFlagsMacro = ssprintf ("%s_LFLAGS", module.name.c_str ()); string objectsMacro = ssprintf ("%s_OBJS", module.name.c_str ()); - GenerateMacros ( module, cflagsMacro, nasmflagsMacro, linkerFlagsMacro, objectsMacro ); + GenerateMacros ( module, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro, + linkerFlagsMacro, + objectsMacro ); // generate phony target for module name fprintf ( fMakefile, ".PHONY: %s\n", @@ -627,7 +686,11 @@ objectsMacro = ssprintf ("$(%s)", objectsMacro.c_str ()); string ar_target = GenerateArchiveTarget ( module, ar, objectsMacro ); - GenerateObjectFileTargets ( module, cc, cflagsMacro, nasmflagsMacro ); + GenerateObjectFileTargets ( module, + cc, + cflagsMacro, + nasmflagsMacro, + windresflagsMacro ); vector<string> clean_files; clean_files.push_back ( FixupTargetFilename(module.GetPath()) ); _____ Modified: branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h --- branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-15 20:28:19 UTC (rev 13067) +++ branches/xmlbuildsystem/reactos/tools/rbuild/backend/mingw/modulehandler .h 2005-01-15 22:32:01 UTC (rev 13068) @@ -38,9 +38,6 @@ void GeneratePreconditionDependencies ( const Module& module ) const; std::string GetObjectsMacro ( const Module& module ) const; std::string GetLinkerMacro ( const Module& module ) const; - std::string GenerateMacros ( const Module& module, - const std::string& cflags_macro, - const std::string& objs_macro ) const; std::string GenerateLinkerCommand ( const Module& module, const std::string& linker, const std::string& linkerParameters, @@ -54,6 +51,10 @@ std::string GenerateGccIncludeParametersFromVector ( const std::vector<Include*>& includes ) const; std::string GenerateLinkerParametersFromVector ( const std::vector<LinkerFlag*>& linkerFlags ) const; std::string GenerateLinkerParameters ( const Module& module ) const; + void GenerateMacro ( const char* assignmentOperation, + const std::string& macro, + const std::vector<Include*>& includes, + const std::vector<Define*>& defines ) const; void GenerateMacros ( const char* op, const std::vector<File*>& files, const std::vector<Include*>& includes, @@ -62,14 +63,15 @@ const std::vector<If*>& ifs, const std::string& cflags_macro, const std::string& nasmflags_macro, + const std::string& windresflags_macro, const std::string& linkerflags_macro, const std::string& objs_macro) const; void GenerateMacros ( const Module& module, const std::string& cflags_macro, const std::string& nasmflags_macro, + const std::string& windresflags_macro, const std::string& linkerflags_macro, const std::string& objs_macro) const; - void GenerateGccModuleIncludeVariable ( const Module& module ) const; std::string GenerateGccIncludeParameters ( const Module& module ) const; std::string GenerateGccParameters ( const Module& module ) const; std::string GenerateNasmParameters ( const Module& module ) const; @@ -84,21 +86,27 @@ std::string GenerateNasmCommand ( const Module& module, const std::string& sourceFilename, const std::string& nasmflagsMacro ) const; + std::string GenerateWindresCommand ( const Module& module, + const std::string& sourceFilename, + const std::string& windresflagsMacro ) const; std::string GenerateCommand ( const Module& module, const std::string& sourceFilename, const std::string& cc, const std::string& cflagsMacro, - const std::string& nasmflagsMacro ) const; + const std::string& nasmflagsMacro, + const std::string& windresflagsMacro ) const; void GenerateObjectFileTargets ( const Module& module, const std::vector<File*>& files, const std::vector<If*>& ifs, const std::string& cc, const std::string& cflagsMacro, - const std::string& nasmflagsMacro ) const; + const std::string& nasmflagsMacro, + const std::string& windresflagsMacro ) const; void GenerateObjectFileTargets ( const Module& module, const std::string& cc, const std::string& cflagsMacro, - const std::string& nasmflagsMacro ) const; + const std::string& nasmflagsMacro, + const std::string& windresflagsMacro ) const; void GetCleanTargets ( std::vector<std::string>& out, const std::vector<File*>& files, const std::vector<If*>& ifs ) const;

19 years, 10 months

[hbirr] 13067: - Fixed some minor bugs.

by hbirr＠svn.reactos.com

- Fixed some minor bugs. - Moved the definition for unicode compiling to the make file. - Wait on the input handle instead to poll it every 40ms. - Use the number of cpus for time calculations. Modified: trunk/rosapps/sysutils/ctm/Makefile Modified: trunk/rosapps/sysutils/ctm/ctm.c _____ Modified: trunk/rosapps/sysutils/ctm/Makefile --- trunk/rosapps/sysutils/ctm/Makefile 2005-01-15 20:23:32 UTC (rev 13066) +++ trunk/rosapps/sysutils/ctm/Makefile 2005-01-15 20:28:19 UTC (rev 13067) @@ -16,6 +16,8 @@ TARGET_OBJECTS = $(TARGET_NAME).o +TARGET_CFLAGS = -DUNICODE -D_UNICODE + include $(PATH_TO_TOP)/rules.mak include $(TOOLS_PATH)/helper.mk _____ Modified: trunk/rosapps/sysutils/ctm/ctm.c --- trunk/rosapps/sysutils/ctm/ctm.c 2005-01-15 20:23:32 UTC (rev 13066) +++ trunk/rosapps/sysutils/ctm/ctm.c 2005-01-15 20:28:19 UTC (rev 13067) @@ -1,6 +1,3 @@ -#define UNICODE -#define _UNICODE - /* Console Task Manager ctm.c - main program file @@ -90,6 +87,7 @@ int selection=0; int scrolled=0; // offset from which process start showing int first = 0; // first time in DisplayScreen +SYSTEM_BASIC_INFORMATION SystemBasicInfo; #define NEW_CONSOLE @@ -287,7 +285,7 @@ do { GetNumberOfConsoleInputEvents(hStdin, &pId); key = GetKeyPressed(pId); - } while (key == 0); + } while (key != KEY_YES && key != KEY_NO); if (key == KEY_YES) { @@ -341,6 +339,11 @@ return FALSE; } +void PerfInit() +{ + NtQuerySystemInformation(SystemBasicInformation, &SystemBasicInfo, sizeof(SystemBasicInfo), 0); +} + void PerfDataRefresh() { LONG status; @@ -371,15 +374,15 @@ return; #endif // Get processor information - SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * 1/*SystemBasicInfo.bKeNumberProcessors*/); - status = NtQuerySystemInformation(SystemProcessorTimes, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * 1/*SystemBasicInfo.bKeNumberProcessors*/, &ulSize); + SysProcessorTimeInfo = (PSYSTEM_PROCESSORTIME_INFO)malloc(sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.NumberProcessors); + status = NtQuerySystemInformation(SystemProcessorTimes, SysProcessorTimeInfo, sizeof(SYSTEM_PROCESSORTIME_INFO) * SystemBasicInfo.NumberProcessors, &ulSize); // Get process information PsaCaptureProcessesAndThreads((PSYSTEM_PROCESSES *)&pBuffer); #ifdef TIMES - for (CurrentKernelTime=0, Idx=0; Idx<1/*SystemBasicInfo.bKeNumberProcessors*/; Idx++) { + for (CurrentKernelTime=0, Idx=0; Idx<SystemBasicInfo.NumberProcessors; Idx++) { CurrentKernelTime += Li2Double(SysProcessorTimeInfo[Idx].TotalProcessorTime); CurrentKernelTime += Li2Double(SysProcessorTimeInfo[Idx].TotalDPCTime); CurrentKernelTime += Li2Double(SysProcessorTimeInfo[Idx].TotalInterruptTime); @@ -397,8 +400,8 @@ dbKernelTime = dbKernelTime / dbSystemTime; // CurrentCpuUsage% = 100 - (CurrentCpuIdle * 100) / NumberOfProcessors - dbIdleTime = 100.0 - dbIdleTime * 100.0; /* / (double)SystemBasicInfo.bKeNumberProcessors;// + 0.5; */ - dbKernelTime = 100.0 - dbKernelTime * 100.0; /* / (double)SystemBasicInfo.bKeNumberProcessors;// + 0.5; */ + dbIdleTime = 100.0 - dbIdleTime * 100.0 / (double)SystemBasicInfo.NumberProcessors;// + 0.5; + dbKernelTime = 100.0 - dbKernelTime * 100.0 / (double)SystemBasicInfo.NumberProcessors;// + 0.5; } // Store new CPU's idle and system time @@ -460,7 +463,7 @@ double CurTime = Li2Double(pSPI->KernelTime) + Li2Double(pSPI->UserTime); double OldTime = Li2Double(pPDOld->KernelTime) + Li2Double(pPDOld->UserTime); double CpuTime = (CurTime - OldTime) / dbSystemTime; - CpuTime = CpuTime * 100.0; /* / (double)SystemBasicInfo.bKeNumberProcessors;// + 0.5;*/ + CpuTime = CpuTime * 100.0 / (double)SystemBasicInfo.NumberProcessors; // + 0.5; pPerfData[Idx].CPUUsage = (ULONG)CpuTime; #else @@ -537,9 +540,6 @@ for (i=0; i<events; i++) { - if (!ReadConsoleInput(hStdin, &record, 0, &bytesRead)) { - return 0; - } if (!ReadConsoleInput(hStdin, &record, 1, &bytesRead)) { return 0; } @@ -599,6 +599,8 @@ lpSeparator[columnRightPositions[i]] = _T('+'); } lpSeparator[columnRightPositions[4] + 1] = _T('\0'); + lpHeader[columnRightPositions[4] + 1] = _T('\0'); + if (!LoadString(hInst, IDS_APP_TITLE, lpTitle, 80)) lpTitle[0] = _T('\0'); @@ -644,6 +646,8 @@ SetConsoleMode(hStdin, 0); //FIXME: Should check for error! SetConsoleMode(hStdout, 0); //FIXME: Should check for error! + PerfInit(); + while (1) { DWORD numEvents; @@ -651,12 +655,8 @@ PerfDataRefresh(); DisplayScreen(); - //WriteConsole(hStdin, " ", 1, &numEvents, NULL); // TODO: Make another way (this is ugly, I know) -#if 0 /* WaitForSingleObject for console handles is not implemented in ROS */ WaitForSingleObject(hStdin, 1000); -#endif - GetNumberOfConsoleInputEvents(hStdin, &numEvents); if (numEvents > 0) @@ -664,13 +664,6 @@ if (ProcessKeys(numEvents) == TRUE) break; } -#if 1 - else - { - /* Should be removed, if WaitForSingleObject is implemented for console handles */ - Sleep(40); // TODO: Should be done more efficient (might be another thread handling input/etc)*/ - } -#endif } RestoreConsole();

19 years, 10 months

[hbirr] 13066: - 'Y', 'N', 'K' and 'Q' must be upper case.

by hbirr＠svn.reactos.com

- 'Y', 'N', 'K' and 'Q' must be upper case. Modified: trunk/rosapps/sysutils/ctm/En.rc _____ Modified: trunk/rosapps/sysutils/ctm/En.rc --- trunk/rosapps/sysutils/ctm/En.rc 2005-01-15 20:20:53 UTC (rev 13065) +++ trunk/rosapps/sysutils/ctm/En.rc 2005-01-15 20:23:32 UTC (rev 13066) @@ -14,12 +14,12 @@ IDS_COLUMN_PF "Page Faults" IDS_IDLE_PROCESS "System Idle Process" - IDS_YES "y" - IDS_NO "n" + IDS_YES "Y" + IDS_NO "N" IDS_MENU "Press: q - quit, k - kill process" - IDS_MENU_QUIT "q" - IDS_MENU_KILL_PROCESS "k" + IDS_MENU_QUIT "Q" + IDS_MENU_KILL_PROCESS "K" IDS_KILL_PROCESS "Are you sure you want to kill this process? (y/n)" IDS_KILL_PROCESS_ERR1 "Unable to terminate this process..."

19 years, 10 months

[hbirr] 13065: - Fixed a bug which results in losing a character in the write buffer

by hbirr＠svn.reactos.com

- Fixed a bug which results in losing a character in the write buffer if there is a call to lseek immediately after the call to flsbuf. Modified: trunk/reactos/lib/msvcrt/stdio/flsbuf.c _____ Modified: trunk/reactos/lib/msvcrt/stdio/flsbuf.c --- trunk/reactos/lib/msvcrt/stdio/flsbuf.c 2005-01-15 19:27:25 UTC (rev 13064) +++ trunk/reactos/lib/msvcrt/stdio/flsbuf.c 2005-01-15 20:20:53 UTC (rev 13065) @@ -93,6 +93,7 @@ if ((f->_flag & (_IO_LBF|_IONBF)) == 0) { f->_cnt--; *f->_ptr++ = c; + f->_flag |= _IODIRTY; } return c; }

19 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
...
71
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2005