Ros-dev

ros-dev@reactos.org

1 participants
5793 discussions

Re: [ros-dev] [ros-diffs] [cwittich] 32018: compilerflags can be set for compiler {ALL|CC|CPP} now (ALL is default)
by Marc Piulachs 26 Jan '08

26 Jan '08

Hi, I'm not very sure about r32018-r32022. Some compiler warnings are stupid and useless, some others not. I think we should solve the underlying problem when possible. Yes, I know it's easier to say than to do but silent them in an indiscriminate way just because clean builds are cooler is not the solution. Warnings are there for something... Also, we should work to actually remove <compilerflags> and <linkerflags> elements and express that information in a compiler/linker agnostic language now that we want to support at least an additional compiler and linker(MSVC) Regards, /Marc > -----Original Message----- > From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] > On Behalf Of cwittich(a)svn.reactos.org > Sent: Saturday, January 26, 2008 7:28 PM > To: ros-diffs(a)reactos.org > Subject: [ros-diffs] [cwittich] 32018: compilerflags can be set for > compiler {ALL|CC|CPP} now (ALL is default) > > Author: cwittich > Date: Sat Jan 26 21:27:37 2008 > New Revision: 32018 > > URL: http://svn.reactos.org/svn/reactos?rev=32018&view=rev > Log: > compilerflags can be set for compiler {ALL|CC|CPP} now (ALL is default) > > Modified: > trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp > trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp > trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h > trunk/reactos/tools/rbuild/compilerflag.cpp > trunk/reactos/tools/rbuild/rbuild.h > > Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/mingw.cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Sat Jan 26 21:27:37 > 2008 > @@ -448,10 +448,13 @@ > > for ( i = 0; i < data.compilerFlags.size(); i++ ) > { > - fprintf ( > - fMakefile, > - " %s", > - data.compilerFlags[i]->flag.c_str() ); > + if ( data.compilerFlags[i]->compiler == CompilerTypeDontCare ) > + { > + fprintf ( > + fMakefile, > + " %s", > + data.compilerFlags[i]->flag.c_str() ); > + } > } > > fprintf ( fMakefile, "\n" ); > > Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/modulehandler.cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Sat Jan 26 > 21:27:37 2008 > @@ -764,15 +764,18 @@ > } > > string > -MingwModuleHandler::GenerateCompilerParametersFromVector ( const > vector<CompilerFlag*>& compilerFlags ) const > +MingwModuleHandler::GenerateCompilerParametersFromVector ( const > vector<CompilerFlag*>& compilerFlags, const CompilerType type ) const > { > string parameters; > for ( size_t i = 0; i < compilerFlags.size (); i++ ) > { > CompilerFlag& compilerFlag = *compilerFlags[i]; > - if ( parameters.length () > 0 ) > - parameters += " "; > - parameters += compilerFlag.flag; > + if ( compilerFlag.compiler == type ) > + { > + if ( parameters.length () > 0 ) > + parameters += " "; > + parameters += compilerFlag.flag; > + } > } > return parameters; > } > @@ -848,7 +851,7 @@ > > if ( generatingCompilerMacro ) > { > - string compilerParameters = > GenerateCompilerParametersFromVector ( data.compilerFlags ); > + string compilerParameters = > GenerateCompilerParametersFromVector ( data.compilerFlags , > CompilerTypeDontCare ); > if ( compilerParameters.size () > 0 ) > { > fprintf ( > @@ -1719,21 +1722,25 @@ > { > const FileLocation& sourceFile = compilationUnit.GetFilename (); > string extension = GetExtension ( sourceFile ); > + string flags = cflagsMacro; > + flags += " "; > if ( extension == ".c" || extension == ".C" ) > { > + flags += GenerateCompilerParametersFromVector ( > module.non_if_data.compilerFlags , CompilerTypeCC ); > GenerateGccCommand ( &sourceFile, > GetCompilationUnitDependencies ( > compilationUnit ) + extraDependencies, > cc, > - cflagsMacro ); > + flags ); > } > else if ( extension == ".cc" || extension == ".CC" || > extension == ".cpp" || extension == ".CPP" || > extension == ".cxx" || extension == ".CXX" ) > { > + flags += GenerateCompilerParametersFromVector ( > module.non_if_data.compilerFlags , CompilerTypeCPP ); > GenerateGccCommand ( &sourceFile, > GetCompilationUnitDependencies ( > compilationUnit ) + extraDependencies, > cppc, > - cflagsMacro ); > + flags ); > } > else if ( extension == ".s" || extension == ".S" ) > { > > Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/ming > w/modulehandler.h?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h (original) > +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Sat Jan 26 > 21:27:37 2008 > @@ -130,7 +130,7 @@ > std::string ConcatenatePaths ( const std::string& path1, > const std::string& path2 ) const; > std::string GenerateGccDefineParameters () const; > - std::string GenerateCompilerParametersFromVector ( const > std::vector<CompilerFlag*>& compilerFlags ) const; > + std::string GenerateCompilerParametersFromVector ( const > std::vector<CompilerFlag*>& compilerFlags, const CompilerType type ) > const; > std::string GenerateLinkerParametersFromVector ( const > std::vector<LinkerFlag*>& linkerFlags ) const; > std::string GenerateImportLibraryDependenciesFromVector ( const > std::vector<Library*>& libraries ); > std::string GenerateLinkerParameters () const; > > Modified: trunk/reactos/tools/rbuild/compilerflag.cpp > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/compilerflag > .cpp?rev=32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/compilerflag.cpp (original) > +++ trunk/reactos/tools/rbuild/compilerflag.cpp Sat Jan 26 21:27:37 2008 > @@ -55,7 +55,25 @@ > node.location, > "<compilerflag> is empty." ); > } > + > flag = node.value; > + compiler = CompilerTypeDontCare; > + > + const XMLAttribute* att = node.GetAttribute ( "compiler", false ); > + if ( att != NULL) > + { > + if ( att->value == "cpp" ) > + compiler = CompilerTypeCPP; > + else if ( att->value == "cc" ) > + compiler = CompilerTypeCC; > + else > + { > + throw InvalidAttributeValueException ( > + node.location, > + "compiler", > + att->value ); > + } > + } > } > > void > > Modified: trunk/reactos/tools/rbuild/rbuild.h > URL: > http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev > =32018&r1=32017&r2=32018&view=diff > ========================================================================== > ==== > --- trunk/reactos/tools/rbuild/rbuild.h (original) > +++ trunk/reactos/tools/rbuild/rbuild.h Sat Jan 26 21:27:37 2008 > @@ -309,6 +309,13 @@ > HostDefault, > HostTrue, > HostDontCare, > +}; > + > +enum CompilerType > +{ > + CompilerTypeDontCare, > + CompilerTypeCC, > + CompilerTypeCPP, > }; > > class FileLocation > @@ -592,6 +599,7 @@ > const Module* module; > const XMLElement& node; > std::string flag; > + CompilerType compiler; > > CompilerFlag ( const Project& project, > const XMLElement& compilerFlagNode ); >

4 3

Re: [ros-dev] [ros-diffs] [arty] 32007: Fix termination of process under debug.
by Alex Ionescu 26 Jan '08

26 Jan '08

This is incorrect behavior, the terminate should be instant. This will likely cause bugs in the user-mode debugging framework. On 26-Jan-08, at 4:20 AM, arty(a)svn.reactos.org wrote: > Author: arty > Date: Sat Jan 26 12:20:56 2008 > New Revision: 32007 > > URL: http://svn.reactos.org/svn/reactos?rev=32007&view=rev > Log: > Fix termination of process under debug. > > Modified: > trunk/reactos/ntoskrnl/dbgk/dbgkobj.c > > Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c (original) > +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c Sat Jan 26 12:20:56 2008 > @@ -1065,6 +1065,17 @@ > > VOID > NTAPI > +DbgkpDelayedTerminateProcess(PVOID Arg) > +{ > + PWORK_QUEUE_ITEM WorkItem = (PWORK_QUEUE_ITEM)Arg; > + PEPROCESS OwnerProcess = *((PEPROCESS *)&WorkItem[1]); > + ExFreePool(WorkItem); > + /* Terminate the process */ > + PsTerminateProcess(OwnerProcess, STATUS_DEBUGGER_INACTIVE); > +} > + > +VOID > +NTAPI > DbgkpCloseObject(IN PEPROCESS OwnerProcess OPTIONAL, > IN PVOID ObjectBody, > IN ACCESS_MASK GrantedAccess, > @@ -1079,6 +1090,8 @@ > DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", > OwnerProcess, DebugObject); > > + DPRINT("APC DISABLE: %d\n", ((PETHREAD)KeGetCurrentThread())- > >Tcb.CombinedApcDisable); > + > /* If this isn't the last handle, do nothing */ > if (SystemHandleCount > 1) return; > > @@ -1127,8 +1140,16 @@ > /* Check if we terminate on exit */ > if (DebugObject->KillProcessOnExit) > { > - /* Terminate the process */ > - PsTerminateProcess(OwnerProcess, > STATUS_DEBUGGER_INACTIVE); > + PWORK_QUEUE_ITEM WorkItem = > + ExAllocatePool > + (NonPagedPool, > + sizeof(WORK_QUEUE_ITEM) + sizeof(PVOID)); > + ExInitializeWorkItem > + (WorkItem, > + DbgkpDelayedTerminateProcess, > + WorkItem); > + *((PEPROCESS *)&WorkItem[1]) = OwnerProcess; > + ExQueueWorkItem(WorkItem, CriticalWorkQueue); > } > > /* Dereference the debug object */ > > Best regards, Alex Ionescu

1 0

Re: [ros-dev] [ros-diffs] [cwittich] 31978: remove statement with no effect
by Alex Ionescu 25 Jan '08

25 Jan '08

Um, this statement is useful. Try to understand compiler warnings, not just obey them :) On 24-Jan-08, at 3:47 PM, cwittich(a)svn.reactos.org wrote: > Author: cwittich > Date: Thu Jan 24 23:47:56 2008 > New Revision: 31978 > > URL: http://svn.reactos.org/svn/reactos?rev=31978&view=rev > Log: > remove statement with no effect > > Modified: > trunk/reactos/dll/win32/kernel32/mem/local.c > > Modified: trunk/reactos/dll/win32/kernel32/mem/local.c > URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… > = > = > = > = > = > = > = > = > ====================================================================== > --- trunk/reactos/dll/win32/kernel32/mem/local.c (original) > +++ trunk/reactos/dll/win32/kernel32/mem/local.c Thu Jan 24 23:47:56 > 2008 > @@ -254,8 +254,6 @@ > NTAPI > LocalLock(HLOCAL hMem) > { > - /* This is the same as a GlobalLock, assuming these never > change */ > - ASSERT(LMEM_LOCKCOUNT == GMEM_LOCKCOUNT); > return GlobalLock(hMem); > } > > >

2 1

How to get the permission to commit code?
by Xiaoming Gao 20 Jan '08

20 Jan '08

HI guys, Would someone tell me how to get the permission to commit code?

2 2

no need to fix apic ldr configure
by Xiaoming Gao 19 Jan '08

19 Jan '08

> > I think the "fixme" in halx86/mp/apic.c line 583 is no need to fix,i have > > read the linux source code ,which just configure like reactos.So still > > need to fix? > > >

1 0

may it is a problem(about Completion port)
by Yee Jacky 19 Jan '08

19 Jan '08

when we use iocp,first,we should create a port like this --- CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);--- But in the implementation of CreateIoCompletionPort,the beginning of the fuction is : if ( ExistingCompletionPort == NULL && FileHandle == INVALID_HANDLE_VALUE ) { SetLastError(ERROR_INVALID_PARAMETER); return FALSE; } so ,all the application running well on MS Windows will not run correct in ReactOS,Because they will always get the ERROR_INVALID_PARAMETER error code when they call CreateIoCompletionPort like --CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0);-- I think this is a problem,But I'm not sure!

2 2

Re: [ros-dev] Hi, does ReactOS support x86 multiprocessor completely for now?
by Aleksey Bragin 19 Jan '08

19 Jan '08

Hello, it's not really completely supported now. As for the label, it was a typo, and I fixed it in revision 31882. WBR, Aleksey Bragin. On Jan 19, 2008, at 12:48 PM, Xiaoming Gao wrote: > Hello everyone > I'm a new comer,i'm reading the kernel source ,but i found that > "jz NotBusy " in ctxswitch.S (line 351),the NotBusy label is not > defined.I have searched the whole source code,but not found it. So, > would someone tell me some information about this?

2 1

Hi, does ReactOS support x86 multiprocessor completely for now?
by Xiaoming Gao 19 Jan '08

19 Jan '08

Hello everyone I'm a new comer,i'm reading the kernel source ,but i found that "jz NotBusy " in ctxswitch.S (line 351),the NotBusy label is not defined.I have searched the whole source code,but not found it. So, would someone tell me some information about this?

1 0

delay loading dlls
by Timo Kreuzer 17 Jan '08

17 Jan '08

Hi, I have recently played around a little with delay loading stuff. I have written a __delayLoadHelper2 and the neccessary asm stubs to do delay loading of a dll. It works and is implemented as documented on msdn / Under The Hood. The stubs are done by hand, but it shouldn't be too hard to write a tool to autocreate them the same way as dlltool does it. There will be no entry in the pe header, but that is optional anyway. Are there any plans on how to handle that? The best way would probably be, if dlltool could handle that, but ... So I thought about a dlitool.exe that creates the stubs. Any ideas? For the ones interested: I have attached the sources. They allow to delay import StrToIntA from shlwapi.dll Timo #include <windows.h> #include "delayimp.h" inline unsigned IndexFromPImgThunkData(PCImgThunkData pData, PCImgThunkData pBase) { return pData - pBase; } extern const IMAGE_DOS_HEADER _image_base__; inline PVOID PFromRva(RVA rva) { return (PVOID)(((ULONG_PTR)(rva)) + ((ULONG_PTR)&_image_base__)); } /**** load helper ****/ FARPROC WINAPI __delayLoadHelper2(PCImgDelayDescr pidd, PImgThunkData pIATEntry) { DelayLoadInfo dli; int index; PImgThunkData pIAT; PImgThunkData pINT; HMODULE *phMod; FARPROC pProc; pIAT = PFromRva(pidd->rvaIAT); pINT = PFromRva(pidd->rvaINT); phMod = PFromRva(pidd->rvaHmod); index = IndexFromPImgThunkData(pIATEntry, pIAT); dli.cb = sizeof(dli); dli.pidd = pidd; dli.ppfn = (FARPROC*)pIATEntry->u1.Function; dli.szDll = PFromRva(pidd->rvaDLLName); dli.dlp.fImportByName = !(pINT[index].u1.Ordinal & IMAGE_ORDINAL_FLAG); if (dli.dlp.fImportByName) { /* u1.AdressOfData points to a IMAGE_IMPORT_BY_NAME struct */ PIMAGE_IMPORT_BY_NAME piibn = PFromRva((RVA)pINT[index].u1.AddressOfData); dli.dlp.szProcName = (LPCSTR)&piibn->Name; } else { dli.dlp.dwOrdinal = pINT[index].u1.Ordinal & ~IMAGE_ORDINAL_FLAG; } dli.hmodCur = *phMod; dli.pfnCur = (FARPROC)pIAT[index].u1.Function; dli.dwLastError = GetLastError(); pProc = __pfnDliNotifyHook2(dliStartProcessing, &dli); if (pProc) { pIAT[index].u1.Function = (DWORD)pProc; return pProc; } if (dli.hmodCur == NULL) { dli.hmodCur = LoadLibraryA(dli.szDll); if (!dli.hmodCur) { dli.dwLastError = GetLastError(); __pfnDliFailureHook2(dliFailLoadLib, &dli); // if (ret) // { // } // FIXME: raise exception; return NULL; } *phMod = dli.hmodCur; } /* dli.dlp.szProcName might also contain the ordinal */ pProc = GetProcAddress(dli.hmodCur, dli.dlp.szProcName); if (!pProc) { dli.dwLastError = GetLastError(); __pfnDliFailureHook2(dliFailGetProc, &dli); // FIXME: handle return value & raise exception return NULL; } pIAT[index].u1.Function = (DWORD)pProc; return pProc; } /*** The default hooks ***/ FARPROC WINAPI DefaultDliNotifyHook2(unsigned dliNotify, PDelayLoadInfo pdli) { return NULL; } FARPROC WINAPI DefaultDliFailureHook2(unsigned dliNotify, PDelayLoadInfo pdli) { return NULL; } PfnDliHook __pfnDliNotifyHook2 = DefaultDliNotifyHook2; PfnDliHook __pfnDliFailureHook2 = DefaultDliFailureHook2; #ifndef _DELAYIMP_H_ #define _DELAYIMP_H_ typedef void *RVA; typedef IMAGE_THUNK_DATA *PImgThunkData; typedef const IMAGE_THUNK_DATA *PCImgThunkData; enum { dlattrRva }; /* Notification codes */ enum { dliStartProcessing, dliNotePreLoadLibrary, dliNotePreGetProcAddress, dliFailLoadLib, dliFailGetProc, dliNoteEndProcessing, }; typedef struct ImgDelayDescr { DWORD grAttrs; RVA rvaDLLName; RVA rvaHmod; RVA rvaIAT; RVA rvaINT; RVA rvaBoundIAT; RVA rvaUnloadIAT; DWORD dwTimeStamp; } ImgDelayDescr, *PImgDelayDescr; typedef const ImgDelayDescr *PCImgDelayDescr; typedef struct DelayLoadProc { BOOL fImportByName; union { LPCSTR szProcName; DWORD dwOrdinal; }; } DelayLoadProc; typedef struct DelayLoadInfo { DWORD cb; PCImgDelayDescr pidd; FARPROC *ppfn; LPCSTR szDll; DelayLoadProc dlp; HMODULE hmodCur; FARPROC pfnCur; DWORD dwLastError; } DelayLoadInfo, *PDelayLoadInfo; typedef FARPROC (WINAPI *PfnDliHook)(unsigned, PDelayLoadInfo); extern PfnDliHook __pfnDliNotifyHook2; extern PfnDliHook __pfnDliFailureHook2; #endif /* not _DELAYIMP_H_ */ .intel_syntax noprefix .section .text .global __tailMerge__shlwapi __tailMerge__shlwapi: push ecx push edx push eax push offset __DELAY_IMPORT_DESCRIPTOR_SHLWAPI call ___delayLoadHelper2@8 pop edx pop ecx jmp eax # DELAY_IMPORT_DESCRIPTOR .section .text$2 .global __DELAY_IMPORT_DESCRIPTOR_SHLWAPI __DELAY_IMPORT_DESCRIPTOR_SHLWAPI: .long 1 # grAttrs .rva shlwapi_dll_iname # rvaDLLName .rva shlwapi_dll_handle # rvaHmod .rva shlwapi_dll_diat # rvaIAT .rva shlwapi_dll_dint # rvaINT .long 0 # rvaBoundIAT .long 0 # rvaUnloadIAT .long 0 # dwTimeStamp .section .data shlwapi_dll_handle: .long 0 #Stuff for compatibility .section .idata$5 .long 0 shlwapi_dll_diat: .section .idata$4 .long 0 .section .idata$4 shlwapi_dll_dint: .intel_syntax noprefix .section .text .global _StrToIntA@4 _StrToIntA@4: jmp dword ptr [.idata$5] __imp__load_StrToIntA@4: mov eax, offset __imp__StrToIntA@4 jmp __tailMerge__shlwapi # The INT .section .idata$4 .rva .idata$6 # The IAT .section .idata$5 __imp__StrToIntA@4: .long __imp__load_StrToIntA@4 # The name .section .idata$6 .byte 0x00, 0x00 .asciz "StrToIntA" #.section .idata$7 # .rva __DELAY_IMPORT_DESCRIPTOR_SHLWAPI .intel_syntax noprefix # Terminate the INT .section .idata$4 .long 0 # Terminate the IAT .section .idata$5 .long 0 # The dll name .section .idata$7 .global shlwapi_dll_iname shlwapi_dll_iname: .asciz "shlwapi.dll"

1 0

Re: [ros-dev] [ros-diffs] [peterw] 31817: Big polish translation patch by Olaf Siejka (caemyr AT gmail DOT com) See issue #2944 for more details. - Polish translation for 0.3.4 is now complete... almost :) One thing left is kernel32 error codes. As it requires inte
by Marc Piulachs 16 Jan '08

16 Jan '08

> trunk/reactos/dll/win32/kernel32/lang/pl-PL.mc (with props) IMO is not a good idea to use different mc files for every language. MC file format is specially designed to hold all the languages in the same file, also our current WMC implementation does not support splitting translation across multiple mc files. AFAIK Physcious was working on implementing that feature to our WMC but even in that case there is no easy way to support them at rbuild level without introducing a hack, also MS's WMC does not support it so I think we should keep it to the lowest common denominator and avoid future compiler compatibility problems as there isn't any significant advantage on it. /Marc

2 1

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-dev