Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 16548: Fix executing applications. Sorry for the delay, this was like finding a needle in a hay stack. Gotta love splitting patches..
by ion＠svn.reactos.com 13 Jul '05

13 Jul '05

Fix executing applications. Sorry for the delay, this was like finding a needle in a hay stack. Gotta love splitting patches.. Modified: trunk/reactos/lib/kernel32/process/create.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-12 16:47:34 UTC (rev 16547) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-13 00:11:11 UTC (rev 16548) @@ -1345,8 +1345,8 @@ */ if (lpStartupInfo) { - Ppb->Flags = lpStartupInfo->dwFlags; - if (Ppb->Flags & STARTF_USESHOWWINDOW) + Ppb->WindowFlags = lpStartupInfo->dwFlags; + if (Ppb->WindowFlags & STARTF_USESHOWWINDOW) { Ppb->ShowWindowFlags = lpStartupInfo->wShowWindow; }

1 0

[chorns] 16547: Add copyright notices and GPL headers to rbuild
by chorns＠svn.reactos.com 12 Jul '05

12 Jul '05

Add copyright notices and GPL headers to rbuild Modified: trunk/reactos/tools/rbuild/XML.cpp Modified: trunk/reactos/tools/rbuild/XML.h Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp Modified: trunk/reactos/tools/rbuild/backend/backend.cpp Modified: trunk/reactos/tools/rbuild/backend/backend.h Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h Modified: trunk/reactos/tools/rbuild/backend/mingw/pch_detection.h Modified: trunk/reactos/tools/rbuild/backend/mingw/pipe_detection.c Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp Modified: trunk/reactos/tools/rbuild/bootstrap.cpp Modified: trunk/reactos/tools/rbuild/cdfile.cpp Modified: trunk/reactos/tools/rbuild/compilerflag.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/define.cpp Modified: trunk/reactos/tools/rbuild/exception.cpp Modified: trunk/reactos/tools/rbuild/exception.h Modified: trunk/reactos/tools/rbuild/filesupportcode.cpp Modified: trunk/reactos/tools/rbuild/include.cpp Modified: trunk/reactos/tools/rbuild/installfile.cpp Modified: trunk/reactos/tools/rbuild/linkerflag.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/pch.h 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/rbuild.mak Modified: trunk/reactos/tools/rbuild/ssprintf.cpp Modified: trunk/reactos/tools/rbuild/ssprintf.h Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp Modified: trunk/reactos/tools/rbuild/test.h Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp Modified: trunk/reactos/tools/rbuild/tests/functiontest.cpp Modified: trunk/reactos/tools/rbuild/tests/iftest.cpp Modified: trunk/reactos/tools/rbuild/tests/includetest.cpp Modified: trunk/reactos/tools/rbuild/tests/invoketest.cpp Modified: trunk/reactos/tools/rbuild/tests/linkerflagtest.cpp Modified: trunk/reactos/tools/rbuild/tests/moduletest.cpp Modified: trunk/reactos/tools/rbuild/tests/projecttest.cpp Modified: trunk/reactos/tools/rbuild/tests/sourcefiletest.cpp Modified: trunk/reactos/tools/rbuild/tests/symboltest.cpp Modified: trunk/reactos/tools/rbuild/testsupportcode.cpp Modified: trunk/reactos/tools/rbuild/wineresource.cpp _____ Modified: trunk/reactos/tools/rbuild/XML.cpp --- trunk/reactos/tools/rbuild/XML.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/XML.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,5 +1,20 @@ -// XML.cpp - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #ifdef _MSC_VER _____ Modified: trunk/reactos/tools/rbuild/XML.h --- trunk/reactos/tools/rbuild/XML.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/XML.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef XML_H #define XML_H _____ Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp --- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/backend/backend.cpp --- trunk/reactos/tools/rbuild/backend/backend.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/backend.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,4 +1,20 @@ - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "../pch.h" #include "../rbuild.h" _____ Modified: trunk/reactos/tools/rbuild/backend/backend.h --- trunk/reactos/tools/rbuild/backend/backend.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/backend.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef __BACKEND_H #define __BACKEND_H _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,11 +1,11 @@ /* - * Dev-C++ Backend - * Copyright (C) 2005 Trevor McCort + * Copyright (C) 2005 Trevor McCort + * Copyright (C) 2005 Casper S. Hornstrup * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -14,9 +14,8 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifdef _MSC_VER #pragma warning ( disable : 4786 ) #endif//_MSC_VER _____ Modified: trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h --- trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/devcpp/devcpp.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,4 +1,21 @@ - +/* + * Copyright (C) 2005 Trevor McCort + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef __DEVCPP_H__ #define __DEVCPP_H__ _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,4 +1,20 @@ - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "../../pch.h" #include "mingw.h" _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef MINGW_H #define MINGW_H _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "../../pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef MINGW_MODULEHANDLER_H #define MINGW_MODULEHANDLER_H _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/pch_detection.h --- trunk/reactos/tools/rbuild/backend/mingw/pch_detection.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/pch_detection.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1 +1,17 @@ -// this file is intentionally left empty +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* This file is intentionally left empty */ _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/pipe_detection.c --- trunk/reactos/tools/rbuild/backend/mingw/pipe_detection.c 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/pipe_detection.c 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,21 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + int main ( int argc, char** argv ) { _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "../../pch.h" #include "mingw.h" _____ Modified: trunk/reactos/tools/rbuild/bootstrap.cpp --- trunk/reactos/tools/rbuild/bootstrap.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/bootstrap.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/cdfile.cpp --- trunk/reactos/tools/rbuild/cdfile.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/cdfile.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/compilerflag.cpp --- trunk/reactos/tools/rbuild/compilerflag.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/compilerflag.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/define.cpp --- trunk/reactos/tools/rbuild/define.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/define.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/exception.cpp --- trunk/reactos/tools/rbuild/exception.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/exception.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,6 +1,21 @@ - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" - #include "rbuild.h" using std::string; _____ Modified: trunk/reactos/tools/rbuild/exception.h --- trunk/reactos/tools/rbuild/exception.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/exception.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef __EXCEPTION_H #define __EXCEPTION_H _____ Modified: trunk/reactos/tools/rbuild/filesupportcode.cpp --- trunk/reactos/tools/rbuild/filesupportcode.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/filesupportcode.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/include.cpp --- trunk/reactos/tools/rbuild/include.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/include.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/installfile.cpp --- trunk/reactos/tools/rbuild/installfile.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/installfile.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/linkerflag.cpp --- trunk/reactos/tools/rbuild/linkerflag.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/linkerflag.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/module.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/pch.h --- trunk/reactos/tools/rbuild/pch.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/pch.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,5 +1,20 @@ -// pre-compiled header stuff - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef PCH_H #define PCH_H _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/project.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,4 +1,20 @@ - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <typeinfo> _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef __RBUILD_H #define __RBUILD_H _____ Modified: trunk/reactos/tools/rbuild/rbuild.mak --- trunk/reactos/tools/rbuild/rbuild.mak 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/rbuild.mak 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,19 @@ +# Copyright (C) 2005 Casper S. Hornstrup +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + RBUILD_BASE = $(TOOLS_BASE_)rbuild RBUILD_BASE_ = $(RBUILD_BASE)$(SEP) RBUILD_INT = $(INTERMEDIATE_)$(RBUILD_BASE) _____ Modified: trunk/reactos/tools/rbuild/ssprintf.cpp --- trunk/reactos/tools/rbuild/ssprintf.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/ssprintf.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,5 +1,18 @@ -// ssprintf.cpp - +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <malloc.h> _____ Modified: trunk/reactos/tools/rbuild/ssprintf.h --- trunk/reactos/tools/rbuild/ssprintf.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/ssprintf.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,5 +1,18 @@ -// ssprintf.h - +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef SSPRINTF_H #define SSPRINTF_H @@ -20,4 +33,4 @@ #define sstvprintf ssvprintf #endif -#endif//SSPRINTF_H +#endif _____ Modified: trunk/reactos/tools/rbuild/stubbedcomponent.cpp --- trunk/reactos/tools/rbuild/stubbedcomponent.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/stubbedcomponent.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include <assert.h> _____ Modified: trunk/reactos/tools/rbuild/test.h --- trunk/reactos/tools/rbuild/test.h 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/test.h 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #ifndef __TEST_H #define __TEST_H _____ Modified: trunk/reactos/tools/rbuild/tests/alltests.cpp --- trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/tests/alltests.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,4 +1,20 @@ - +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "pch.h" #include "rbuild.h" _____ Modified: trunk/reactos/tools/rbuild/tests/cdfiletest.cpp --- trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/tests/cdfiletest.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "test.h" using std::string; _____ Modified: trunk/reactos/tools/rbuild/tests/definetest.cpp --- trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/tests/definetest.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "test.h" using std::string; _____ Modified: trunk/reactos/tools/rbuild/tests/functiontest.cpp --- trunk/reactos/tools/rbuild/tests/functiontest.cpp 2005-07-12 16:11:30 UTC (rev 16546) +++ trunk/reactos/tools/rbuild/tests/functiontest.cpp 2005-07-12 16:47:34 UTC (rev 16547) @@ -1,3 +1,20 @@ +/* + * Copyright (C) 2005 Casper S. Hornstrup + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ #include "test.h" using std::string; [truncated at 1000 lines; 250 more skipped]

1 0

[chorns] 16546: Have nci output files depend on input files
by chorns＠svn.reactos.com 12 Jul '05

12 Jul '05

Have nci output files depend on input files Modified: trunk/reactos/tools/nci/nci.mak _____ Modified: trunk/reactos/tools/nci/nci.mak --- trunk/reactos/tools/nci/nci.mak 2005-07-12 15:04:17 UTC (rev 16545) +++ trunk/reactos/tools/nci/nci.mak 2005-07-12 16:11:30 UTC (rev 16546) @@ -61,7 +61,7 @@ $(WIN32K_GDI_STUBS) \ $(WIN32K_USER_STUBS) -$(NCI_SERVICE_FILES): $(NCI_TARGET) +$(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI) $(Q)$(NCI_TARGET) \ $(KERNEL_SVC_DB) \

1 0

[chorns] 16545: Install freeloader installer.
by chorns＠svn.reactos.com 12 Jul '05

12 Jul '05

Install freeloader installer. Modified: trunk/reactos/Makefile Added: trunk/reactos/boot/freeldr/bootsect/bootsect.mak Added: trunk/reactos/boot/freeldr/bootsect/fat.h Added: trunk/reactos/boot/freeldr/bootsect/fat32.h Modified: trunk/reactos/boot/freeldr/freeldr.xml Added: trunk/reactos/boot/freeldr/install/installfreeldr.xml Deleted: trunk/reactos/boot/freeldr/tools/bin2c.c Added: trunk/reactos/tools/bin2c.c Added: trunk/reactos/tools/bin2c.mak Modified: trunk/reactos/tools/tools.mak _____ Modified: trunk/reactos/Makefile --- trunk/reactos/Makefile 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/Makefile 2005-07-12 15:04:17 UTC (rev 16545) @@ -290,9 +290,11 @@ include lib/lib.mak include tools/tools.mak +include boot/freeldr/bootsect/bootsect.mak -include makefile.auto PREAUTO := \ + $(BIN2C_TARGET) \ $(BIN2RES_TARGET) \ $(BUILDNO_H) \ $(BUGCODES_H) \ Property changes on: trunk/reactos/boot/freeldr/bootsect ___________________________________________________________________ Name: svn:ignore - *.exe *.bin *.h makefile + *.exe _____ Added: trunk/reactos/boot/freeldr/bootsect/bootsect.mak --- trunk/reactos/boot/freeldr/bootsect/bootsect.mak 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/bootsect/bootsect.mak 2005-07-12 15:04:17 UTC (rev 16545) @@ -0,0 +1,7 @@ +boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat.h: $(OUTPUT_)boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat.o $(OUTPUT_)boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat32.o + $(BIN2C_TARGET) $(OUTPUT_)boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat.o boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat.h fat_data + +boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat32.h: + $(BIN2C_TARGET) $(OUTPUT_)boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat32.o boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat32.h fat32_data + +bootsector_headers: boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat.h boot$(SEP)freeldr$(SEP)bootsect$(SEP)fat32.h Property changes on: trunk/reactos/boot/freeldr/bootsect/bootsect.mak ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/boot/freeldr/bootsect/fat.h --- trunk/reactos/boot/freeldr/bootsect/fat.h 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/bootsect/fat.h 2005-07-12 15:04:17 UTC (rev 16545) @@ -0,0 +1,35 @@ +unsigned char fat_data[] = { + +0xeb, 0x3c, 0x90, 0x46, 0x72, 0x4c, 0x64, 0x72, 0x31, 0x2e, 0x30, 0x00, 0x02, 0x01, 0x01, 0x00, +0x02, 0xe0, 0x00, 0x40, 0x0b, 0xf0, 0x09, 0x00, 0x12, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x4f, 0x20, 0x4e, 0x41, +0x4d, 0x45, 0x20, 0x20, 0x20, 0x20, 0x46, 0x41, 0x54, 0x31, 0x32, 0x20, 0x20, 0x20, 0x31, 0xc0, +0x8e, 0xd0, 0xbd, 0x00, 0x7c, 0xbc, 0xf2, 0x7b, 0x8e, 0xd8, 0x8e, 0xc0, 0x80, 0x7e, 0x24, 0xff, +0x75, 0x03, 0x88, 0x56, 0x24, 0xb4, 0x08, 0x8a, 0x56, 0x24, 0xcd, 0x13, 0x73, 0x05, 0xb9, 0xff, +0xff, 0x88, 0xce, 0x88, 0xeb, 0x88, 0xcf, 0xc0, 0xef, 0x06, 0x80, 0xe1, 0x3f, 0x66, 0x0f, 0xb6, +0xc6, 0x66, 0x0f, 0xb7, 0xdb, 0x66, 0x0f, 0xb6, 0xc9, 0x66, 0x40, 0x66, 0x43, 0x66, 0xf7, 0xe1, +0x66, 0xf7, 0xe3, 0x66, 0x89, 0x46, 0xf8, 0x31, 0xc0, 0x31, 0xc9, 0x8a, 0x46, 0x10, 0xf7, 0x66, +0x16, 0x03, 0x46, 0x1c, 0x13, 0x56, 0x1e, 0x03, 0x46, 0x0e, 0x11, 0xca, 0x89, 0x46, 0xfc, 0x89, +0x56, 0xfe, 0x8b, 0x76, 0x11, 0x60, 0x31, 0xd2, 0xb8, 0x20, 0x00, 0xf7, 0xe6, 0x8b, 0x5e, 0x0b, +0x01, 0xd8, 0x48, 0xf7, 0xf3, 0x01, 0x46, 0xfc, 0x11, 0x4e, 0xfe, 0x61, 0xbb, 0xe0, 0x07, 0x8e, +0xc3, 0x31, 0xdb, 0x31, 0xc9, 0x41, 0x31, 0xff, 0x06, 0xe8, 0x78, 0x00, 0x07, 0x26, 0x38, 0x2d, +0x74, 0x38, 0x60, 0xb1, 0x0b, 0xbe, 0xef, 0x7d, 0xf3, 0xa6, 0x61, 0x74, 0x0e, 0x4e, 0x74, 0x2a, +0x83, 0xc7, 0x20, 0x81, 0xff, 0x00, 0x02, 0x72, 0xe4, 0xeb, 0xd1, 0x26, 0x8b, 0x45, 0x1a, 0x50, +0x68, 0x00, 0x08, 0x07, 0xe8, 0x3c, 0x00, 0x58, 0xc7, 0x46, 0xf6, 0x44, 0x7d, 0xc7, 0x46, 0xf4, +0x33, 0x7d, 0xc7, 0x46, 0xf2, 0x1c, 0x7d, 0xe9, 0xf9, 0x02, 0xbe, 0xc7, 0x7d, 0xe8, 0x0c, 0x00, +0xbe, 0xdf, 0x7d, 0xe8, 0x06, 0x00, 0x31, 0xc0, 0xcd, 0x16, 0xcd, 0x19, 0xac, 0x08, 0xc0, 0x74, +0x09, 0xb4, 0x0e, 0xbb, 0x07, 0x00, 0xcd, 0x10, 0xeb, 0xf2, 0xc3, 0xbe, 0xba, 0x7d, 0xe8, 0xeb, +0xff, 0xeb, 0xdd, 0x48, 0x48, 0x30, 0xed, 0x8a, 0x4e, 0x0d, 0xf7, 0xe1, 0x03, 0x46, 0xfc, 0x13, +0x56, 0xfe, 0x31, 0xdb, 0x60, 0x49, 0x01, 0xc8, 0x83, 0xd2, 0x00, 0x3b, 0x56, 0xfa, 0x77, 0x07, +0x72, 0x31, 0x3b, 0x46, 0xf8, 0x76, 0x2c, 0x61, 0x60, 0x66, 0x6a, 0x00, 0x52, 0x50, 0x06, 0x53, +0x6a, 0x01, 0x6a, 0x10, 0x89, 0xe6, 0x8a, 0x56, 0x24, 0xb4, 0x42, 0xcd, 0x13, 0x72, 0xbc, 0x83, +0xc4, 0x10, 0x61, 0x40, 0x83, 0xd2, 0x00, 0x53, 0x8c, 0xc3, 0x83, 0xc3, 0x20, 0x8e, 0xc3, 0x5b, +0xe2, 0xd6, 0xc3, 0x61, 0x60, 0x91, 0x92, 0x31, 0xd2, 0xf7, 0x76, 0x18, 0x91, 0xf7, 0x76, 0x18, +0x42, 0x87, 0xca, 0xf7, 0x76, 0x1a, 0x88, 0xd6, 0x8a, 0x56, 0x24, 0x88, 0xc5, 0xc0, 0xcc, 0x02, +0x08, 0xe1, 0xb8, 0x01, 0x02, 0xcd, 0x13, 0x72, 0x82, 0x61, 0x40, 0x75, 0x01, 0x42, 0x53, 0x8c, +0xc3, 0x83, 0xc3, 0x20, 0x8e, 0xc3, 0x5b, 0xe2, 0xcb, 0xc3, 0x44, 0x69, 0x73, 0x6b, 0x20, 0x65, +0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x66, 0x72, 0x65, 0x65, 0x6c, 0x64, 0x72, 0x2e, 0x73, +0x79, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x00, 0x50, +0x72, 0x65, 0x73, 0x73, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6b, 0x65, 0x79, 0x0d, 0x0a, 0x00, 0x46, +0x52, 0x45, 0x45, 0x4c, 0x44, 0x52, 0x20, 0x53, 0x59, 0x53, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa +}; Property changes on: trunk/reactos/boot/freeldr/bootsect/fat.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/boot/freeldr/bootsect/fat32.h --- trunk/reactos/boot/freeldr/bootsect/fat32.h 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/bootsect/fat32.h 2005-07-12 15:04:17 UTC (rev 16545) @@ -0,0 +1,67 @@ +unsigned char fat32_data[] = { + +0xeb, 0x58, 0x90, 0x46, 0x72, 0x4c, 0x64, 0x72, 0x31, 0x2e, 0x30, 0x00, 0x02, 0x00, 0x20, 0x00, +0x02, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x29, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x4f, 0x20, 0x4e, 0x41, 0x4d, 0x45, 0x20, 0x20, +0x20, 0x20, 0x46, 0x41, 0x54, 0x33, 0x32, 0x20, 0x20, 0x20, 0x31, 0xc0, 0x8e, 0xd8, 0x8e, 0xc0, +0x8e, 0xd0, 0xbd, 0x00, 0x7c, 0xbc, 0x00, 0x7c, 0x80, 0x7e, 0x40, 0xff, 0x75, 0x03, 0x88, 0x56, +0x40, 0x83, 0x7e, 0x16, 0x00, 0x75, 0x0d, 0x66, 0x83, 0x7e, 0x11, 0x00, 0x75, 0x06, 0x83, 0x7e, +0x2a, 0x00, 0x76, 0x03, 0xe9, 0xff, 0x00, 0xb8, 0x00, 0x08, 0x8a, 0x56, 0x40, 0xcd, 0x13, 0x73, +0x05, 0xb9, 0xff, 0xff, 0x88, 0xce, 0x88, 0xeb, 0x88, 0xcf, 0xc0, 0xef, 0x06, 0x80, 0xe1, 0x3f, +0x66, 0x0f, 0xb6, 0xc6, 0x66, 0x0f, 0xb7, 0xdb, 0x66, 0x0f, 0xb6, 0xc9, 0x66, 0x40, 0x66, 0x43, +0x66, 0xf7, 0xe1, 0x66, 0xf7, 0xe3, 0x66, 0xa3, 0xa7, 0x7d, 0x66, 0xb8, 0x0e, 0x00, 0x00, 0x00, +0x66, 0x03, 0x46, 0x1c, 0xb9, 0x01, 0x00, 0x31, 0xdb, 0x8e, 0xc3, 0xbb, 0x00, 0x7e, 0xe8, 0x03, +0x00, 0xe9, 0x2c, 0x01, 0x66, 0x3b, 0x06, 0xa7, 0x7d, 0x73, 0x1b, 0x66, 0x60, 0xb4, 0x41, 0xbb, +0xaa, 0x55, 0x8a, 0x56, 0x40, 0xcd, 0x13, 0x72, 0x55, 0x81, 0xfb, 0x55, 0xaa, 0x75, 0x4f, 0xf6, +0xc1, 0x01, 0x74, 0x4a, 0x66, 0x61, 0x66, 0x60, 0x81, 0xf9, 0x40, 0x00, 0x76, 0x03, 0xb9, 0x40, +0x00, 0x89, 0x0e, 0x3a, 0x7d, 0x66, 0x6a, 0x00, 0x66, 0x50, 0x06, 0x53, 0x51, 0x6a, 0x10, 0x89, +0xe6, 0x8a, 0x56, 0x40, 0xb4, 0x42, 0xcd, 0x13, 0x72, 0x63, 0x83, 0xc4, 0x10, 0x66, 0x61, 0x53, +0x66, 0x8b, 0x1e, 0x3a, 0x7d, 0x66, 0x01, 0xd8, 0x66, 0xc1, 0xe3, 0x05, 0x8c, 0xc2, 0x01, 0xda, +0x8e, 0xc2, 0x5b, 0x2b, 0x0e, 0x3a, 0x7d, 0x75, 0xbd, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x66, 0x61, +0x66, 0x60, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb7, 0x4e, 0x18, 0x66, 0xf7, 0xf1, 0xfe, 0xc2, 0x88, +0xd1, 0x66, 0x89, 0xc2, 0x66, 0xc1, 0xea, 0x10, 0xf7, 0x76, 0x1a, 0x88, 0xd6, 0x8a, 0x56, 0x40, +0x88, 0xc5, 0xd0, 0xcc, 0xd0, 0xcc, 0x08, 0xe1, 0xb8, 0x01, 0x02, 0xcd, 0x13, 0x72, 0x0e, 0x66, +0x61, 0x66, 0x40, 0x8c, 0xc2, 0x83, 0xc2, 0x20, 0x8e, 0xc2, 0xe2, 0xc4, 0xc3, 0xbe, 0xab, 0x7d, +0xe8, 0x15, 0x00, 0xe9, 0x06, 0x00, 0xbe, 0xb8, 0x7d, 0xe8, 0x0c, 0x00, 0xbe, 0xcc, 0x7d, 0xe8, +0x06, 0x00, 0x31, 0xc0, 0xcd, 0x16, 0xcd, 0x19, 0xac, 0x08, 0xc0, 0x74, 0x09, 0xb4, 0x0e, 0xbb, +0x07, 0x00, 0xcd, 0x10, 0xeb, 0xf2, 0xc3, 0x00, 0x00, 0x00, 0x00, 0x44, 0x69, 0x73, 0x6b, 0x20, +0x65, 0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x46, 0x69, 0x6c, 0x65, 0x20, 0x73, 0x79, 0x73, +0x74, 0x65, 0x6d, 0x20, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x0d, 0x0a, 0x00, 0x50, 0x72, 0x65, 0x73, +0x73, 0x20, 0x61, 0x6e, 0x79, 0x20, 0x6b, 0x65, 0x79, 0x20, 0x74, 0x6f, 0x20, 0x72, 0x65, 0x73, +0x74, 0x61, 0x72, 0x74, 0x0d, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa, +0x66, 0x8b, 0x46, 0x2c, 0x66, 0x3d, 0xf8, 0xff, 0xff, 0x0f, 0x72, 0x03, 0xe9, 0x67, 0x01, 0xbb, +0x00, 0x20, 0x8e, 0xc3, 0xe8, 0x27, 0x01, 0x31, 0xdb, 0x8a, 0x5e, 0x0d, 0xc1, 0xe3, 0x04, 0xb8, +0x00, 0x20, 0x8e, 0xc0, 0x31, 0xff, 0xbe, 0x9d, 0x7f, 0xb9, 0x0b, 0x00, 0xf3, 0xa6, 0x74, 0x2a, +0x4b, 0x75, 0x03, 0xe9, 0x40, 0x01, 0x8c, 0xc0, 0x05, 0x02, 0x00, 0x8e, 0xc0, 0x31, 0xff, 0xbe, +0x9d, 0x7f, 0xb9, 0x0b, 0x00, 0xf3, 0xa6, 0x74, 0x11, 0x4b, 0x75, 0xea, 0x66, 0x8b, 0x46, 0x2c, +0xe8, 0x6f, 0x00, 0x66, 0x89, 0x46, 0x2c, 0xe9, 0xa6, 0xff, 0xbe, 0xa8, 0x7f, 0xe8, 0x38, 0xff, +0x31, 0xff, 0x31, 0xd2, 0x26, 0x8b, 0x45, 0x14, 0x66, 0xc1, 0xe0, 0x10, 0x26, 0x8b, 0x45, 0x1a, +0x66, 0x3d, 0x02, 0x00, 0x00, 0x00, 0x73, 0x03, 0xe9, 0x0b, 0xff, 0x66, 0x3d, 0xf8, 0xff, 0xff, +0x0f, 0x72, 0x03, 0xe9, 0x00, 0xff, 0xbb, 0x00, 0x08, 0x8e, 0xc3, 0x66, 0x3d, 0xf8, 0xff, 0xff, +0x0f, 0x73, 0x21, 0x66, 0x50, 0x31, 0xdb, 0x06, 0xe8, 0xa3, 0x00, 0x07, 0x31, 0xdb, 0x8a, 0x5e, +0x0d, 0xc1, 0xe3, 0x05, 0x8c, 0xc0, 0x01, 0xd8, 0x8e, 0xc0, 0x66, 0x58, 0x06, 0xe8, 0x12, 0x00, +0x07, 0xe9, 0xd7, 0xff, 0x8a, 0x56, 0x40, 0x8a, 0x36, 0xfd, 0x7d, 0x31, 0xc0, 0x50, 0x68, 0x00, +0x80, 0xcb, 0x66, 0xc1, 0xe0, 0x02, 0x66, 0x89, 0xc1, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb7, 0x5e, +0x0b, 0x66, 0x53, 0x66, 0xf7, 0xf3, 0x66, 0x0f, 0xb7, 0x5e, 0x0e, 0x66, 0x01, 0xd8, 0x66, 0x8b, +0x5e, 0x1c, 0x66, 0x01, 0xd8, 0x66, 0x5b, 0x66, 0x4b, 0x66, 0x21, 0xd9, 0x66, 0x0f, 0xb7, 0x5e, +0x28, 0x81, 0xe3, 0x0f, 0x00, 0x74, 0x16, 0x3a, 0x5e, 0x10, 0x72, 0x03, 0xe9, 0x87, 0xfe, 0x66, +0x50, 0x66, 0x8b, 0x46, 0x24, 0x66, 0xf7, 0xe3, 0x66, 0x5a, 0x66, 0x01, 0xd0, 0x66, 0x51, 0x66, +0x3b, 0x06, 0x3a, 0x7f, 0x74, 0x11, 0x66, 0xa3, 0x3a, 0x7f, 0xbb, 0x00, 0x70, 0x8e, 0xc3, 0x31, +0xdb, 0xb9, 0x01, 0x00, 0xe8, 0xad, 0xfd, 0xbb, 0x00, 0x70, 0x8e, 0xc3, 0x66, 0x59, 0x26, 0x66, +0x67, 0x8b, 0x01, 0x66, 0x25, 0xff, 0xff, 0xff, 0x0f, 0xc3, 0xff, 0xff, 0xff, 0xff, 0x66, 0x48, +0x66, 0x48, 0x66, 0x31, 0xd2, 0x66, 0x0f, 0xb6, 0x5e, 0x0d, 0x66, 0xf7, 0xe3, 0x66, 0x50, 0x66, +0x31, 0xd2, 0x66, 0x0f, 0xb6, 0x46, 0x10, 0x66, 0xf7, 0x66, 0x24, 0x66, 0x0f, 0xb7, 0x5e, 0x0e, +0x66, 0x01, 0xd8, 0x66, 0x03, 0x46, 0x1c, 0x66, 0x5b, 0x66, 0x01, 0xd8, 0x31, 0xdb, 0x0f, 0xb6, +0x4e, 0x0d, 0xe8, 0x5f, 0xfd, 0xc3, 0xbe, 0x85, 0x7f, 0xe8, 0x1c, 0xfe, 0xbe, 0xcc, 0x7d, 0xe8, +0x16, 0xfe, 0xe9, 0x07, 0xfe, 0x66, 0x72, 0x65, 0x65, 0x6c, 0x64, 0x72, 0x2e, 0x73, 0x79, 0x73, +0x20, 0x6e, 0x6f, 0x74, 0x20, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x0d, 0x0a, 0x00, 0x46, 0x52, 0x45, +0x45, 0x4c, 0x44, 0x52, 0x20, 0x53, 0x59, 0x53, 0x4c, 0x6f, 0x61, 0x64, 0x69, 0x6e, 0x67, 0x20, +0x46, 0x72, 0x65, 0x65, 0x4c, 0x6f, 0x61, 0x64, 0x65, 0x72, 0x2e, 0x2e, 0x2e, 0x0d, 0x0a, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x55, 0xaa +}; Property changes on: trunk/reactos/boot/freeldr/bootsect/fat32.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/boot/freeldr/freeldr.xml --- trunk/reactos/boot/freeldr/freeldr.xml 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/freeldr.xml 2005-07-12 15:04:17 UTC (rev 16545) @@ -10,3 +10,6 @@ <xi:include href="freeldr/freeldr.xml" /> <xi:include href="freeldr/setupldr.xml" /> </directory> +<directory name="install"> + <xi:include href="install/installfreeldr.xml" /> +</directory> _____ Added: trunk/reactos/boot/freeldr/install/installfreeldr.xml --- trunk/reactos/boot/freeldr/install/installfreeldr.xml 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/install/installfreeldr.xml 2005-07-12 15:04:17 UTC (rev 16545) @@ -0,0 +1,7 @@ +<module name="installfreeldr" type="win32cui"> + <include base="installfreeldr">.</include> + <define name="__USE_W32API" /> + <library>kernel32</library> + <file>install.c</file> + <file>volume.c</file> +</module> Property changes on: trunk/reactos/boot/freeldr/install/installfreeldr.xml ___________________________________________________________________ Name: svn:eol-style + native _____ Deleted: trunk/reactos/boot/freeldr/tools/bin2c.c --- trunk/reactos/boot/freeldr/tools/bin2c.c 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/boot/freeldr/tools/bin2c.c 2005-07-12 15:04:17 UTC (rev 16545) @@ -1,48 +0,0 @@ -#include <stdio.h> - -FILE *in; -FILE *out; - -int main(int argc, char *argv[]) -{ - unsigned char ch; - int cnt = 0; - - if (argc < 4) - { - printf("usage: bin2c infile.bin outfile.h array_name\n"); - return -1; - } - - if ((in = fopen(argv[1], "rb")) == NULL) - { - printf("Couldn't open data file.\n"); - return -1; - } - if ((out = fopen(argv[2], "wb")) == NULL) - { - printf("Couldn't open output file.\n"); - return -1; - } - - fprintf(out, "unsigned char %s[] = {\n", argv[3]); - - ch = fgetc(in); - while (!feof(in)) - { - if (cnt != 0) - fprintf(out, ", "); - if (!(cnt % 16)) - fprintf(out, "\n"); - fprintf(out, "0x%02x", (int)ch); - cnt++; - ch = fgetc(in); - } - - fprintf(out, "\n};\n"); - - fclose(in); - fclose(out); - - return 0; -} _____ Copied: trunk/reactos/tools/bin2c.c (from rev 16535, trunk/reactos/boot/freeldr/tools/bin2c.c) _____ Added: trunk/reactos/tools/bin2c.mak --- trunk/reactos/tools/bin2c.mak 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/tools/bin2c.mak 2005-07-12 15:04:17 UTC (rev 16545) @@ -0,0 +1,36 @@ +BIN2C_BASE = $(TOOLS_BASE) +BIN2C_BASE_ = $(BIN2C_BASE)$(SEP) + +BIN2C_INT = $(INTERMEDIATE_)$(BIN2C_BASE) +BIN2C_INT_ = $(BIN2C_INT)$(SEP) +BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE) +BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) + +BIN2C_TARGET = \ + $(EXEPREFIX)$(BIN2C_OUT_)bin2c$(EXEPOSTFIX) + +BIN2C_SOURCES = \ + $(BIN2C_BASE_)bin2c.c + +BIN2C_OBJECTS = \ + $(addprefix $(INTERMEDIATE_), $(BIN2C_SOURCES:.c=.o)) + +BIN2C_HOST_CFLAGS = -g -Werror -Wall + +BIN2C_HOST_LFLAGS = -g + +.PHONY: bin2c +bin2c: $(BIN2C_TARGET) + +$(BIN2C_TARGET): $(BIN2C_OBJECTS) | $(BIN2C_OUT) + $(ECHO_LD) + ${host_gcc} $(BIN2C_OBJECTS) $(BIN2C_HOST_LFLAGS) -o $@ + +$(BIN2C_INT_)bin2c.o: $(BIN2C_BASE_)bin2c.c | $(BIN2C_INT) + $(ECHO_CC) + ${host_gcc} $(BIN2C_HOST_CFLAGS) -c $< -o $@ + +.PHONY: bin2c_clean +bin2c_clean: + -@$(rm) $(BIN2C_TARGET) $(BIN2C_OBJECTS) 2>$(NUL) +clean: bin2c_clean Property changes on: trunk/reactos/tools/bin2c.mak ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/tools/tools.mak --- trunk/reactos/tools/tools.mak 2005-07-12 12:29:25 UTC (rev 16544) +++ trunk/reactos/tools/tools.mak 2005-07-12 15:04:17 UTC (rev 16545) @@ -16,6 +16,7 @@ endif +include tools/bin2c.mak include tools/rsym.mak include tools/bin2res/bin2res.mak include tools/buildno/buildno.mak

1 0

[ekohl] 16544: Add CM_Get_Global_State and CM_Get_Global_State_Ex prototypes.
by ekohl＠svn.reactos.com 12 Jul '05

12 Jul '05

Add CM_Get_Global_State and CM_Get_Global_State_Ex prototypes. Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h _____ Modified: trunk/reactos/w32api/include/ddk/cfgmgr32.h --- trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-12 05:00:33 UTC (rev 16543) +++ trunk/reactos/w32api/include/ddk/cfgmgr32.h 2005-07-12 12:29:25 UTC (rev 16544) @@ -256,21 +256,21 @@ } DEVPRIVATE_RESOURCE, *PDEVPRIVATE_RESOURCE; /* DMA_DES.DD_Flags constants and masks */ -#define mDD_Width 0x3 -#define fDD_BYTE 0x0 -#define fDD_WORD 0x1 -#define fDD_DWORD 0x2 -#define fDD_BYTE_AND_WORD 0x3 +#define mDD_Width 0x3 +#define fDD_BYTE 0x0 +#define fDD_WORD 0x1 +#define fDD_DWORD 0x2 +#define fDD_BYTE_AND_WORD 0x3 -#define mDD_BusMaster 0x4 -#define fDD_NoBusMaster 0x0 -#define fDD_BusMaster 0x4 +#define mDD_BusMaster 0x4 +#define fDD_NoBusMaster 0x0 +#define fDD_BusMaster 0x4 -#define mDD_Type 0x18 -#define fDD_TypeStandard 0x00 -#define fDD_TypeA 0x08 -#define fDD_TypeB 0x10 -#define fDD_TypeF 0x18 +#define mDD_Type 0x18 +#define fDD_TypeStandard 0x00 +#define fDD_TypeA 0x08 +#define fDD_TypeB 0x10 +#define fDD_TypeF 0x18 typedef struct DMA_Des_s { DWORD DD_Count; @@ -440,8 +440,8 @@ } MEM_RESOURCE, *PMEM_RESOURCE; /* MFCARD_DES.PMF_Flags constants */ -#define fPMF_AUDIO_ENABLE 0x8 -#define mPMF_AUDIO_ENABLE fPMF_AUDIO_ENABLE +#define fPMF_AUDIO_ENABLE 0x8 +#define mPMF_AUDIO_ENABLE fPMF_AUDIO_ENABLE typedef struct MfCard_Des_s { DWORD PMF_Count; @@ -585,7 +585,7 @@ IN HMACHINE hMachine); /* CM_Add_ID.ulFlags constants */ -#define CM_ADD_ID_HARDWARE 0x00000000 +#define CM_ADD_ID_HARDWARE 0x00000000 #define CM_ADD_ID_COMPATIBLE 0x00000001 #define CM_ADD_ID_BITS 0x00000001 @@ -1068,8 +1068,21 @@ IN ULONG ulFlags, IN HMACHINE hMachine); -/* FIXME: Obsolete CM_Get_Global_State */ -/* FIXME: Obsolete CM_Get_Global_State_Ex */ +CMAPI +CONFIGRET +WINAPI +CM_Get_Global_State( + OUT PULONG pulState, + IN ULONG ulFlags); + +CMAPI +CONFIGRET +WINAPI +CM_Get_Global_State_Ex( + OUT PULONG pulState, + IN ULONG ulFlags, + IN HMACHINE hMachine); + /* FIXME: Obsolete CM_Get_Hardware_Profile_Info */ /* FIXME: Obsolete CM_Get_Hardware_Profile_Info_Ex */ /* FIXME: Obsolete CM_Get_HW_Prof_Flags */

1 0

[ion] 16543: Part three of patch...
by ion＠svn.reactos.com 12 Jul '05

12 Jul '05

Part three of patch... - Created utils.c for the following new functions: * BasepCreateStack - Creates a stack for a Thread or Fiber * BasepInitializeContext - Initializes the Context for a Process, a Thread, or a Fiber * BasepConvertObjectAttributes - Creates a OBJECT_ATTRIBUTES structure based on Win32 lpSecurityAttributes and name. * BasepFreestack - Frees the stack created in case of a failure inside code using it. * BasepMapFile - Converts a Win32 Path to NT Path and maps a file into a section. * Base 8-bit String conversion functions - Use new, more efficient way to select between OEM/ANSI strings, based on MSDN Article by Matt Pietrek. Other code needs to be chand to use them. Also added the new ASM for the startup thunks. All of this is still unused and only being committed to simply the diff output. Credits go to Matt Pietrek and his excellent MSDN article for the 8-bit conversion functions and implementaion details. Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/kernel32.xml Added: trunk/reactos/lib/kernel32/misc/utils.c Added: trunk/reactos/lib/kernel32/thread/i386/thread.S _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-07-12 04:41:41 UTC (rev 16542) +++ trunk/reactos/lib/kernel32/file/file.c 2005-07-12 05:00:33 UTC (rev 16543) @@ -22,7 +22,6 @@ BOOL bIsFileApiAnsi = TRUE; // set the file api to ansi or oem - /* FUNCTIONS ****************************************************************/ @@ -178,20 +177,30 @@ /* * @implemented */ -VOID STDCALL +VOID +STDCALL SetFileApisToOEM(VOID) { - bIsFileApiAnsi = FALSE; + /* Set the correct Base Api */ + Basep8BitStringToUnicodeString = RtlOemStringToUnicodeString; + + /* FIXME: Old, deprecated way */ + bIsFileApiAnsi = FALSE; } /* * @implemented */ -VOID STDCALL +VOID +STDCALL SetFileApisToANSI(VOID) { - bIsFileApiAnsi = TRUE; + /* Set the correct Base Api */ + Basep8BitStringToUnicodeString = RtlAnsiStringToUnicodeString; + + /* FIXME: Old, deprecated way */ + bIsFileApiAnsi = TRUE; } _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-12 04:41:41 UTC (rev 16542) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-12 05:00:33 UTC (rev 16543) @@ -26,6 +26,13 @@ #define IsConsoleHandle(h) \ ((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE +#define HANDLE_DETACHED_PROCESS (HANDLE)-1 +#define HANDLE_CREATE_NEW_CONSOLE (HANDLE)-2 +#define HANDLE_CREATE_NO_WINDOW (HANDLE)-3 + +/* Undocumented CreateProcess flag */ +#define STARTF_SHELLPRIVATE 0x400 + #define SetLastErrorByStatus(__S__) \ ((void)SetLastError(RtlNtStatusToDosError(__S__))) @@ -69,5 +76,86 @@ #define HeapAlloc RtlAllocateHeap #define HeapFree RtlFreeHeap +POBJECT_ATTRIBUTES +STDCALL +BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, + IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL, + IN PUNICODE_STRING ObjectName); + +NTSTATUS +STDCALL +BasepCreateStack(HANDLE hProcess, + ULONG StackReserve, + ULONG StackCommit, + PINITIAL_TEB InitialTeb); + +VOID +STDCALL +BasepInitializeContext(IN PCONTEXT Context, + IN PVOID Parameter, + IN PVOID StartAddress, + IN PVOID StackAddress, + IN ULONG ContextType); + +VOID +STDCALL +BaseThreadStartupThunk(); + +VOID +STDCALL +BaseProcessStartThunk(); + +__declspec(noreturn) +VOID +STDCALL +BaseThreadStartup(LPTHREAD_START_ROUTINE lpStartAddress, + LPVOID lpParameter); + +VOID +STDCALL +BasepFreeStack(HANDLE hProcess, + PINITIAL_TEB InitialTeb); + +__declspec(noreturn) +VOID +WINAPI +BaseFiberStartup(VOID); + +typedef UINT (STDCALL *PPROCESS_START_ROUTINE)(VOID); + +VOID +STDCALL +BaseProcessStartup(PPROCESS_START_ROUTINE lpStartAddress); + +BOOLEAN +STDCALL +BasepCheckRealTimePrivilege(VOID); + +VOID +STDCALL +BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, + IN PVOID UnicodeString); + +PUNICODE_STRING +STDCALL +Basep8BitStringToCachedUnicodeString(IN LPCSTR String); + +NTSTATUS +STDCALL +Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN LPCSTR String); + +typedef NTSTATUS (STDCALL *PRTL_CONVERT_STRING)(IN PUNICODE_STRING UnicodeString, + IN PANSI_STRING AnsiString, + IN BOOLEAN AllocateMemory); + +PRTL_CONVERT_STRING Basep8BitStringToUnicodeString; + +NTSTATUS +STDCALL +BasepMapFile(IN LPCWSTR lpApplicationName, + OUT PHANDLE hSection, + IN PUNICODE_STRING ApplicationName); + #endif /* ndef _KERNEL32_INCLUDE_KERNEL32_H */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-07-12 04:41:41 UTC (rev 16542) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-07-12 05:00:33 UTC (rev 16543) @@ -76,6 +76,7 @@ <file>time.c</file> <file>timerqueue.c</file> <file>toolhelp.c</file> + <file>utils.c</file> <file>version.c</file> </directory> <directory name="process"> @@ -99,6 +100,7 @@ <directory name="thread"> <directory name="i386"> <file>fiber.S</file> + <file>thread.S</file> </directory> <file>fiber.c</file> <file>fls.c</file> _____ Added: trunk/reactos/lib/kernel32/misc/utils.c --- trunk/reactos/lib/kernel32/misc/utils.c 2005-07-12 04:41:41 UTC (rev 16542) +++ trunk/reactos/lib/kernel32/misc/utils.c 2005-07-12 05:00:33 UTC (rev 16543) @@ -0,0 +1,425 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/kernel32/misc/utils.c + * PURPOSE: Utility and Support Functions + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +/* INCLUDES ****************************************************************/ + +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +/* + * Converts an ANSI or OEM String to the specified Unicode String + */ +NTSTATUS +STDCALL +Basep8BitStringToLiveUnicodeString(OUT PUNICODE_STRING UnicodeString, + IN LPCSTR String) +{ + ANSI_STRING AnsiString; + NTSTATUS Status; + + DPRINT("Basep8BitStringToLiveUnicodeString\n"); + + /* Create the ANSI String */ + RtlInitAnsiString(&AnsiString, String); + + /* Convert from OEM or ANSI */ + Status = Basep8BitStringToUnicodeString(UnicodeString, &AnsiString, FALSE); + + /* Return Status */ + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + } + return Status; +} + + +/* + * Converts an ANSI or OEM String to the TEB StaticUnicodeString + */ +PUNICODE_STRING +STDCALL +Basep8BitStringToCachedUnicodeString(IN LPCSTR String) +{ + PUNICODE_STRING StaticString = &NtCurrentTeb()->StaticUnicodeString; + ANSI_STRING AnsiString; + NTSTATUS Status; + + DPRINT("Basep8BitStringToCachedUnicodeString\n"); + + /* Initialize an ANSI String */ + RtlInitAnsiString(&AnsiString, String); + + /* Convert it */ + Status = Basep8BitStringToUnicodeString(StaticString, &AnsiString, FALSE); + + /* Handle failure */ + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return pointer to the string */ + return StaticString; +} + +/* + * Allocates space from the Heap and converts an Ansi String into it + */ +VOID +STDCALL +BasepAnsiStringToHeapUnicodeString(IN LPCSTR AnsiString, + IN PVOID UnicodeString) +{ + ANSI_STRING AnsiTemp; + UNICODE_STRING UnicodeTemp; + + DPRINT("BasepAnsiStringToHeapUnicodeString\n"); + + /* First create the ANSI_STRING */ + RtlInitAnsiString(&AnsiTemp, AnsiString); + + /* Now get the size needed */ + UnicodeTemp.MaximumLength = RtlAnsiStringToUnicodeSize(&AnsiTemp); + + /* Allocate space from the Heap for the string */ + UnicodeString = RtlAllocateHeap(GetProcessHeap(), + 0, + UnicodeTemp.MaximumLength); + + /* Save the buffer and convert */ + UnicodeTemp.Buffer = UnicodeString; + RtlAnsiStringToUnicodeString(&UnicodeTemp, &AnsiTemp, FALSE); +} + +/* + * Converts lpSecurityAttributes + Object Name into ObjectAttributes. + */ +POBJECT_ATTRIBUTES +STDCALL +BasepConvertObjectAttributes(OUT POBJECT_ATTRIBUTES ObjectAttributes, + IN PSECURITY_ATTRIBUTES SecurityAttributes OPTIONAL, + IN PUNICODE_STRING ObjectName) +{ + ULONG Attributes = 0; + HANDLE RootDirectory = 0; + PVOID SecurityDescriptor = NULL; + BOOLEAN NeedOba = FALSE; + + DPRINT("BasepConvertObjectAttributes. Security: %p, Name: %p\n", + SecurityAttributes, ObjectName); + + /* Get the attributes if present */ + if (SecurityAttributes) + { + Attributes = SecurityAttributes->bInheritHandle ? OBJ_INHERIT : 0; + SecurityDescriptor = SecurityAttributes->lpSecurityDescriptor; + NeedOba = TRUE; + } + + if (ObjectName) + { + Attributes |= OBJ_OPENIF; + RootDirectory = hBaseDir; + NeedOba = TRUE; + } + + DPRINT("Attributes: %lx, RootDirectory: %lx, SecurityDescriptor: %p\n", + Attributes, RootDirectory, SecurityDescriptor); + + /* Create the Object Attributes */ + if (NeedOba) + { + InitializeObjectAttributes(ObjectAttributes, + ObjectName, + Attributes, + RootDirectory, + SecurityDescriptor); + return ObjectAttributes; + } + + /* Nothing to return */ + return NULL; +} + +/* + * Creates a stack for a thread or fiber + */ +NTSTATUS +STDCALL +BasepCreateStack(HANDLE hProcess, + ULONG StackReserve, + ULONG StackCommit, + PINITIAL_TEB InitialTeb) +{ + NTSTATUS Status; + SYSTEM_BASIC_INFORMATION SystemBasicInfo; + PIMAGE_NT_HEADERS Headers; + ULONG_PTR Stack = 0; + BOOLEAN UseGuard = FALSE; + + DPRINT("BasepCreateStack (hProcess: %lx, Max: %lx, Current: %lx)\n", + hProcess, StackReserve, StackCommit); + + /* Get some memory information */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &SystemBasicInfo, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to query system info\n"); + return Status; + } + + /* Use the Image Settings if we are dealing with the current Process */ + if (hProcess == NtCurrentProcess()) + { + /* Get the Image Headers */ + Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); + + /* If we didn't get the parameters, find them ourselves */ + StackReserve = (StackReserve) ? + StackReserve : Headers->OptionalHeader.SizeOfStackReserve; + StackCommit = (StackCommit) ? + StackCommit : Headers->OptionalHeader.SizeOfStackCommit; + } + else + { + /* Use the System Settings if needed */ + StackReserve = (StackReserve) ? StackReserve : + SystemBasicInfo.AllocationGranularity; + StackCommit = (StackCommit) ? StackCommit : SystemBasicInfo.PageSize; + } + + /* Align everything to Page Size */ + StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); + StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); + #if 1 // FIXME: Remove once Guard Page support is here + StackCommit = StackReserve; + #endif + DPRINT("StackReserve: %lx, StackCommit: %lx\n", StackReserve, StackCommit); + + /* Reserve memory for the stack */ + Status = ZwAllocateVirtualMemory(hProcess, + (PVOID*)&Stack, + 0, + &StackReserve, + MEM_RESERVE, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to reserve stack\n"); + return Status; + } + + /* Now set up some basic Initial TEB Parameters */ + InitialTeb->AllocatedStackBase = (PVOID)Stack; + InitialTeb->StackBase = (PVOID)(Stack + StackReserve); + + /* Update the Stack Position */ + Stack += StackReserve - StackCommit; + + /* Check if we will need a guard page */ + if (StackReserve > StackCommit) + { + Stack -= SystemBasicInfo.PageSize; + StackCommit += SystemBasicInfo.PageSize; + UseGuard = TRUE; + } + + /* Allocate memory for the stack */ + Status = ZwAllocateVirtualMemory(hProcess, + (PVOID*)&Stack, + 0, + &StackCommit, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to allocate stack\n"); + return Status; + } + + /* Now set the current Stack Limit */ + InitialTeb->StackLimit = (PVOID)Stack; + + /* Create a guard page */ + if (UseGuard) + { + ULONG GuardPageSize = SystemBasicInfo.PageSize; + ULONG Dummy; + + /* Attempt maximum space possible */ + Status = ZwProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to create guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit - GuardPageSize); + } + + /* We are done! */ + return STATUS_SUCCESS; +} + +VOID +STDCALL +BasepFreeStack(HANDLE hProcess, + PINITIAL_TEB InitialTeb) +{ + ULONG Dummy = 0; + + /* Free the Stack */ + NtFreeVirtualMemory(hProcess, + &InitialTeb->AllocatedStackBase, + &Dummy, + MEM_RELEASE); +} + +/* + * Creates the Initial Context for a Thread or Fiber + */ +VOID +STDCALL +BasepInitializeContext(IN PCONTEXT Context, + IN PVOID Parameter, + IN PVOID StartAddress, + IN PVOID StackAddress, + IN ULONG ContextType) +{ + DPRINT("BasepInitializeContext: %p\n", Context); + + /* Setup the Initial Win32 Thread Context */ + Context->Eax = (ULONG)StartAddress; + Context->Ebx = (ULONG)Parameter; + Context->Esp = (ULONG)StackAddress; + /* The other registers are undefined */ + + /* Setup the Segments */ + Context->SegCs = USER_CS; + Context->SegDs = USER_DS; + Context->SegEs = USER_DS; + Context->SegFs = TEB_SELECTOR; + Context->SegSs = USER_DS; + Context->SegGs = 0; + + /* Set the EFLAGS */ + Context->EFlags = 0x3000; /* IOPL 3 */ + + if (ContextType == 1) /* For Threads */ + { + Context->Eip = (ULONG)BaseThreadStartupThunk; + } + else if (ContextType == 2) /* For Fibers */ + { + //Context->Eip = (ULONG)BaseFiberStartup; + } + else /* For first thread in a Process */ + { + Context->Eip = (ULONG)BaseProcessStartThunk; + } + + /* Set the Context Flags */ + Context->ContextFlags = CONTEXT_FULL; + + /* Give it some room for the Parameter */ + Context->Esp -= sizeof(PVOID); +} + +/* + * Checks if the privilege for Real-Time Priority is there + */ +BOOLEAN +STDCALL +BasepCheckRealTimePrivilege(VOID) +{ + return TRUE; +} + +/* + * Maps an image file into a section + */ +NTSTATUS +STDCALL +BasepMapFile(IN LPCWSTR lpApplicationName, + OUT PHANDLE hSection, + IN PUNICODE_STRING ApplicationName) +{ + CURDIR RelativeName; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE hFile = NULL; + IO_STATUS_BLOCK IoStatusBlock; + + DPRINT("BasepMapFile\n"); + + /* Zero out the Relative Directory */ + RelativeName.Handle = NULL; + + /* Find the application name */ + RtlDosPathNameToNtPathName_U((LPWSTR)lpApplicationName, + ApplicationName, + NULL, + &RelativeName); + DPRINT("ApplicationName %wZ\n", ApplicationName); + DPRINT("RelativeName %wZ\n", &RelativeName.DosPath); + + /* Did we get a relative name? */ + if (RelativeName.DosPath.Length) + { + ApplicationName = &RelativeName.DosPath; + } + + /* Initialize the Object Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + ApplicationName, + OBJ_CASE_INSENSITIVE, + RelativeName.Handle, + NULL); + + /* Try to open the executable */ + Status = NtOpenFile(&hFile, + SYNCHRONIZE | FILE_EXECUTE | FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to open file\n"); + SetLastErrorByStatus (Status); + return Status; + } + + /* Create a section for this file */ + Status = NtCreateSection(hSection, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + hFile); + NtClose(hFile); + + /* Return status */ + DPRINT("Section: %lx for file: %lx\n", *hSection, hFile); + return Status; +} _____ Added: trunk/reactos/lib/kernel32/thread/i386/thread.S --- trunk/reactos/lib/kernel32/thread/i386/thread.S 2005-07-12 04:41:41 UTC (rev 16542) +++ trunk/reactos/lib/kernel32/thread/i386/thread.S 2005-07-12 05:00:33 UTC (rev 16543) @@ -0,0 +1,32 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/kernel32/thread/i386/thread.S + * PURPOSE: Thread Start Thunks + * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + */ + +.globl _BaseThreadStartupThunk@0 +.globl _BaseProcessStartThunk@0 +.intel_syntax noprefix + +_BaseThreadStartupThunk@0: + + /* Start out fresh */ + xor ebp, ebp + + push ebx /* lpParameter */ + push eax /* lpStartAddress */ + push 0 /* Return EIP */ + //jmp _BaseThreadStartup@8 + +_BaseProcessStartThunk@0: + + /* Start out fresh */ + xor ebp, ebp + + push eax /* lpStartAddress */ + push 0 /* Return EIP */ + //jmp _BaseProcessStartup@4 + +/* EOF */

1 0

[ion] 16542: Second part of patch, implements the new RTL functions which will be used (not used by kernel yet).
by ion＠svn.reactos.com 12 Jul '05

12 Jul '05

Second part of patch, implements the new RTL functions which will be used (not used by kernel yet). - RtlCreateUserProcess: * Created RtlpInitEnvironment to manage Environment Block creation. Rougly based on old KlInitPeb code but with some optimizations. * Don't ignore Process Security Descriptor if one was specified. * Don't ignore ZeroBits, get correct entrypoint, and don't assume PEB address. * Don't close handle of section before closing process handle on failure. * Support new undocumented flag which pre-allocates 1MB of memory for Native Processes * FIXME: Hande duplication should be done, but wasn't and still isn't. - RtlpCreateUserStack: * New function to create a stack for a Thread, similar to BasepCreateStack but has some differences related to StackCommit/StackReserve. * Also create Guard Page - RtlpFreeUserStack: * Undoes what the function above does, in case of failure in code using it. - RtlCreateUserThread: * Use the new functions instead of rosrtl. - RtlInitializeContext: * New function similar to BasepInitializeContext but; > Uses a single entrypoint, not many possible thunks like Kernel32 (no need) > The starting EFLAGS is Interrupts Enabled, not IOPL 3. > We don't initialize the same Context Flags > The initial context registers are different - RtlFreeUserThreadStack * Don't assume the TEB address - RtlExitUserThread * Remove deprecated stack-switching semantics and use new TEB flag to tell the Kernel to deallocate the stack for us. Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/ntdll/rtl/process.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/ntoskrnl/mm/pe.c _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-12 02:45:33 UTC (rev 16541) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-12 04:41:41 UTC (rev 16542) @@ -16,7 +16,7 @@ /* FIXME */ #include <rosrtl/thread.h> -//#define NDEBUG +#define NDEBUG #include "../include/debug.h" /* FUNCTIONS ****************************************************************/ @@ -1378,11 +1378,11 @@ * Create the thread for the kernel */ DPRINT("Creating thread for process (EntryPoint = 0x%.08x)\n", - (PVOID)((ULONG_PTR)ImageBaseAddress + (ULONG_PTR)Sii.TransferAddress)); + Sii.TransferAddress); hThread = KlCreateFirstThread(hProcess, lpThreadAttributes, &Sii, - (PVOID)((ULONG_PTR)ImageBaseAddress + (ULONG_PTR)Sii.TransferAddress), + Sii.TransferAddress, dwCreationFlags, &lpProcessInformation->dwThreadId); if (hThread == NULL) _____ Modified: trunk/reactos/lib/ntdll/rtl/process.c --- trunk/reactos/lib/ntdll/rtl/process.c 2005-07-12 02:45:33 UTC (rev 16541) +++ trunk/reactos/lib/ntdll/rtl/process.c 2005-07-12 04:41:41 UTC (rev 16542) @@ -90,4 +90,19 @@ return STATUS_INVALID_PARAMETER; } +/* + * @implemented + */ +VOID +STDCALL +RtlExitUserThread(NTSTATUS Status) +{ + /* Call the Loader and tell him to notify the DLLs */ + LdrShutdownThread(); + + /* Shut us down */ + NtCurrentTeb()->FreeStackOnTermination = TRUE; + NtTerminateThread(NtCurrentThread(), Status); +} + /* EOF */ _____ Modified: trunk/reactos/lib/rtl/process.c --- trunk/reactos/lib/rtl/process.c 2005-07-12 02:45:33 UTC (rev 16541) +++ trunk/reactos/lib/rtl/process.c 2005-07-12 04:41:41 UTC (rev 16542) @@ -16,176 +16,161 @@ #define NDEBUG #include <debug.h> -/* FUNCTIONS ****************************************************************/ +/* INTERNAL FUNCTIONS *******************************************************/ - -static NTSTATUS +NTSTATUS +STDCALL RtlpMapFile(PUNICODE_STRING ImageFileName, - PRTL_USER_PROCESS_PARAMETERS Ppb, - ULONG Attributes, - PHANDLE Section) + ULONG Attributes, + PHANDLE Section) { - HANDLE hFile; - IO_STATUS_BLOCK IoStatusBlock; - OBJECT_ATTRIBUTES ObjectAttributes; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + HANDLE hFile = NULL; + IO_STATUS_BLOCK IoStatusBlock; - hFile = NULL; + /* Open the Image File */ + InitializeObjectAttributes(&ObjectAttributes, + ImageFileName, + Attributes & (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), + NULL, + NULL); + Status = ZwOpenFile(&hFile, + SYNCHRONIZE | FILE_EXECUTE | FILE_READ_DATA, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_DELETE | FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT | FILE_NON_DIRECTORY_FILE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to read image file from disk\n"); + return(Status); + } + + /* Now create a section for this image */ + Status = ZwCreateSection(Section, + SECTION_ALL_ACCESS, + NULL, + NULL, + PAGE_EXECUTE, + SEC_IMAGE, + hFile); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to create section for image file\n"); + } - RtlDeNormalizeProcessParams (Ppb); + ZwClose(hFile); + return Status; +} -/* DbgPrint("ImagePathName 0x%p\n", Ppb->ImagePathName.Buffer); */ +/* FUNCTIONS ****************************************************************/ - InitializeObjectAttributes(&ObjectAttributes, - ImageFileName, - Attributes & (OBJ_CASE_INSENSITIVE | OBJ_INHERIT), - NULL, - SecurityDescriptor); - - RtlNormalizeProcessParams (Ppb); - - /* - * Try to open the executable - */ - - Status = ZwOpenFile(&hFile, - SYNCHRONIZE|FILE_EXECUTE|FILE_READ_DATA, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_DELETE|FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - Status = ZwCreateSection(Section, - SECTION_ALL_ACCESS, - NULL, - NULL, - PAGE_EXECUTE, - SEC_IMAGE, - hFile); - ZwClose(hFile); - - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - return(STATUS_SUCCESS); -} - -static NTSTATUS KlInitPeb (HANDLE ProcessHandle, - PRTL_USER_PROCESS_PARAMETERS Ppb, - PVOID* ImageBaseAddress) +NTSTATUS +STDCALL +RtlpInitEnvironment(HANDLE ProcessHandle, + PPEB Peb, + PRTL_USER_PROCESS_PARAMETERS ProcessParameters) { - NTSTATUS Status; - PVOID PpbBase; - ULONG PpbSize; - ULONG BytesWritten; - ULONG Offset; - PVOID EnvPtr = NULL; - ULONG EnvSize = 0; + NTSTATUS Status; + PVOID BaseAddress = NULL; + ULONG EnviroSize; + ULONG Size; + PWCHAR Environment = 0; + + DPRINT("RtlpInitEnvironment (hProcess: %lx, Peb: %p Params: %p)\n", + ProcessHandle, Peb, ProcessParameters); + + /* Give the caller 1MB if he requested it */ + if (ProcessParameters->Flags & PPF_RESERVE_1MB) + { + /* Give 1MB starting at 0x4 */ + BaseAddress = (PVOID)4; + EnviroSize = 1024 * 1024; + Status = ZwAllocateVirtualMemory(ProcessHandle, + &BaseAddress, + 0, + &EnviroSize, + MEM_RESERVE, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reserve 1MB of space \n"); + return(Status); + } + } + + /* Find the end of the Enviroment Block */ + if ((Environment = (PWCHAR)ProcessParameters->Environment)) + { + while (*Environment++) while (*Environment++); - /* create the Environment */ - if (Ppb->Environment != NULL) - { - MEMORY_BASIC_INFORMATION MemInfo; + /* Calculate the size of the block */ + EnviroSize = (ULONG)((ULONG_PTR)Environment - + (ULONG_PTR)ProcessParameters->Environment); + DPRINT("EnvironmentSize %ld\n", EnviroSize); - Status = ZwQueryVirtualMemory (NtCurrentProcess (), - Ppb->Environment, - MemoryBasicInformation, - &MemInfo, - sizeof(MEMORY_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) - { - return Status; - } - EnvSize = MemInfo.RegionSize; - } - DPRINT("EnvironmentSize %ld\n", EnvSize); + /* Allocate and Initialize new Environment Block */ + Size = EnviroSize; + Status = ZwAllocateVirtualMemory(ProcessHandle, + &BaseAddress, + 0, + &Size, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate Environment Block\n"); + return(Status); + } + + /* Write the Environment Block */ + ZwWriteVirtualMemory(ProcessHandle, + BaseAddress, + ProcessParameters->Environment, + EnviroSize, + NULL); + + /* Save pointer */ + ProcessParameters->Environment = BaseAddress; + } + + DPRINT("EnvironmentPointer %p\n", BaseAddress); + DPRINT("Ppb->MaximumLength %x\n", ProcessParameters->MaximumLength); - /* allocate and initialize new environment block */ - if (EnvSize != 0) - { - Status = ZwAllocateVirtualMemory(ProcessHandle, - &EnvPtr, - 0, - &EnvSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } + /* Now allocate space for the Parameter Block */ + BaseAddress = NULL; + Size = ProcessParameters->MaximumLength; + Status = ZwAllocateVirtualMemory(ProcessHandle, + &BaseAddress, + 0, + &Size, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to allocate Parameter Block\n"); + return(Status); + } + + /* Write the Parameter Block */ + ZwWriteVirtualMemory(ProcessHandle, + BaseAddress, + ProcessParameters, + ProcessParameters->Length, + NULL); + + /* Write pointer to Parameter Block */ + ZwWriteVirtualMemory(ProcessHandle, + &Peb->ProcessParameters, + &BaseAddress, + sizeof(BaseAddress), + NULL); - ZwWriteVirtualMemory(ProcessHandle, - EnvPtr, - Ppb->Environment, - EnvSize, - &BytesWritten); - } - DPRINT("EnvironmentPointer %p\n", EnvPtr); - - /* create the PPB */ - PpbBase = NULL; - PpbSize = Ppb->MaximumLength; - - Status = ZwAllocateVirtualMemory(ProcessHandle, - &PpbBase, - 0, - &PpbSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - DPRINT("Ppb->MaximumLength %x\n", Ppb->MaximumLength); - - /* write process parameters block*/ - RtlDeNormalizeProcessParams (Ppb); - ZwWriteVirtualMemory(ProcessHandle, - PpbBase, - Ppb, - Ppb->MaximumLength, - - &BytesWritten); - RtlNormalizeProcessParams (Ppb); - - /* write pointer to environment */ - Offset = FIELD_OFFSET(RTL_USER_PROCESS_PARAMETERS, Environment); - ZwWriteVirtualMemory(ProcessHandle, - (PVOID)((ULONG_PTR)PpbBase + Offset), - &EnvPtr, - sizeof(EnvPtr), - &BytesWritten); - - /* write pointer to process parameter block */ - Offset = FIELD_OFFSET(PEB, ProcessParameters); - ZwWriteVirtualMemory(ProcessHandle, - (PVOID)(PEB_BASE + Offset), - &PpbBase, - sizeof(PpbBase), - &BytesWritten); - - /* Read image base address. */ - Offset = FIELD_OFFSET(PEB, ImageBaseAddress); - ZwReadVirtualMemory(ProcessHandle, - (PVOID)(PEB_BASE + Offset), - ImageBaseAddress, - sizeof(PVOID), - &BytesWritten); - - return(STATUS_SUCCESS); + /* Return */ + return STATUS_SUCCESS; } - /* * @implemented * @@ -200,114 +185,136 @@ * * -Gunnar */ -NTSTATUS STDCALL -RtlCreateUserProcess( - IN PUNICODE_STRING ImageFileName, - IN ULONG Attributes, - IN OUT PRTL_USER_PROCESS_PARAMETERS ProcessParameters, - IN PSECURITY_DESCRIPTOR ProcessSecurityDescriptor OPTIONAL, - IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL, - IN HANDLE ParentProcess OPTIONAL, - IN BOOLEAN InheritHandles, - IN HANDLE DebugPort OPTIONAL, - IN HANDLE ExceptionPort OPTIONAL, - OUT PRTL_USER_PROCESS_INFORMATION ProcessInfo - ) +NTSTATUS +STDCALL +RtlCreateUserProcess(IN PUNICODE_STRING ImageFileName, + IN ULONG Attributes, + IN OUT PRTL_USER_PROCESS_PARAMETERS ProcessParameters, + IN PSECURITY_DESCRIPTOR ProcessSecurityDescriptor OPTIONAL, + IN PSECURITY_DESCRIPTOR ThreadSecurityDescriptor OPTIONAL, + IN HANDLE ParentProcess OPTIONAL, + IN BOOLEAN InheritHandles, + IN HANDLE DebugPort OPTIONAL, + IN HANDLE ExceptionPort OPTIONAL, + OUT PRTL_USER_PROCESS_INFORMATION ProcessInfo) { - HANDLE hSection; - NTSTATUS Status; - PROCESS_BASIC_INFORMATION ProcessBasicInfo; - ULONG retlen; - SECTION_IMAGE_INFORMATION Sii; - ULONG ResultLength; - PVOID ImageBaseAddress; + NTSTATUS Status; + HANDLE hSection; + PROCESS_BASIC_INFORMATION ProcessBasicInfo; + OBJECT_ATTRIBUTES ObjectAttributes; - DPRINT("RtlCreateUserProcess\n"); + DPRINT("RtlCreateUserProcess: %wZ\n", ImageFileName); - Status = RtlpMapFile(ImageFileName, - ProcessParameters, - Attributes, - &hSection); - if( !NT_SUCCESS( Status ) ) - return Status; + /* Map and Load the File */ + Status = RtlpMapFile(ImageFileName, + Attributes, + &hSection); + if(!NT_SUCCESS(Status)) + { + DPRINT1("Could not map process image\n"); + return Status; + } + + /* Clean out the CurDir Handle if we won't use it */ + if (!InheritHandles) ProcessParameters->CurrentDirectory.Handle = NULL; + + /* Use us as parent if none other specified */ + if (!ParentProcess) ParentProcess = NtCurrentProcess(); + + /* Initialize the Object Attributes */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + ProcessSecurityDescriptor); - /* - * Create a new process - */ - if (ParentProcess == NULL) - ParentProcess = NtCurrentProcess(); + /* + * If FLG_ENABLE_CSRDEBUG is used, then CSRSS is created under the + * watch of WindowsSS + */ + if ((RtlGetNtGlobalFlags() & FLG_ENABLE_CSRDEBUG) && + (wcsstr(ImageFileName->Buffer, L"csrss"))) + { + UNICODE_STRING DebugString = RTL_CONSTANT_STRING(L"\\WindowsSS"); + InitializeObjectAttributes(&ObjectAttributes, + &DebugString, + 0, + NULL, + ProcessSecurityDescriptor); + } + + + /* Create Kernel Process Object */ + Status = ZwCreateProcess(&ProcessInfo->ProcessHandle, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + ParentProcess, + InheritHandles, + hSection, + DebugPort, + ExceptionPort); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create Kernel Process Object\n"); + ZwClose(hSection); + return(Status); + } + + /* Get some information on the image */ + Status = ZwQuerySection(hSection, + SectionImageInformation, + &ProcessInfo->ImageInformation, + sizeof(SECTION_IMAGE_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not query Section Info\n"); + ZwClose(ProcessInfo->ProcessHandle); + ZwClose(hSection); + return(Status); + } - Status = ZwCreateProcess(&(ProcessInfo->ProcessHandle), - PROCESS_ALL_ACCESS, - NULL, - ParentProcess, - InheritHandles, - hSection, - DebugPort, - ExceptionPort); - if (!NT_SUCCESS(Status)) - { - ZwClose(hSection); - return(Status); - } + /* Get some information about the process */ + ZwQueryInformationProcess(ProcessInfo->ProcessHandle, + ProcessBasicInformation, + &ProcessBasicInfo, + sizeof(ProcessBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not query Process Info\n"); + ZwClose(ProcessInfo->ProcessHandle); + ZwClose(hSection); + return(Status); + } - /* - * Get some information about the process - */ - ZwQueryInformationProcess(ProcessInfo->ProcessHandle, - ProcessBasicInformation, - &ProcessBasicInfo, - sizeof(ProcessBasicInfo), - &retlen); - DPRINT("ProcessBasicInfo.UniqueProcessId %d\n", - ProcessBasicInfo.UniqueProcessId); - ProcessInfo->ClientId.UniqueProcess = (HANDLE)ProcessBasicInfo.UniqueProcessId; + /* Create Process Environment */ + RtlpInitEnvironment(ProcessInfo->ProcessHandle, + ProcessBasicInfo.PebBaseAddress, + ProcessParameters); - /* - * Create Process Environment Block - */ - DPRINT("Creating peb\n"); - KlInitPeb(ProcessInfo->ProcessHandle, - ProcessParameters, - &ImageBaseAddress); - - Status = ZwQuerySection(hSection, - SectionImageInformation, - &Sii, - sizeof(Sii), - &ResultLength); - if (!NT_SUCCESS(Status) || ResultLength != sizeof(Sii)) - { - DPRINT("Failed to get section image information.\n"); - ZwClose(hSection); - return(Status); - } - - DPRINT("Creating thread for process\n"); - Status = RtlCreateUserThread( - ProcessInfo->ProcessHandle, - NULL, - TRUE, /* CreateSuspended? */ - 0, - Sii.MaximumStackSize, - Sii.CommittedStackSize, - (PVOID)((ULONG_PTR)ImageBaseAddress + (ULONG_PTR)Sii.TransferAddress), - (PVOID)PEB_BASE, - &ProcessInfo->ThreadHandle, - &ProcessInfo->ClientId - ); - - ZwClose(hSection); - - if (!NT_SUCCESS(Status)) - { - DPRINT("Failed to create thread\n"); - return(Status); - } - - return(STATUS_SUCCESS); + /* Create the first Thread */ + Status = RtlCreateUserThread(ProcessInfo->ProcessHandle, + ThreadSecurityDescriptor, + TRUE, + ProcessInfo->ImageInformation.ZeroBits, + ProcessInfo->ImageInformation.MaximumStackSize, + ProcessInfo->ImageInformation.CommittedStackSize, + ProcessInfo->ImageInformation.TransferAddress, + ProcessBasicInfo.PebBaseAddress, + &ProcessInfo->ThreadHandle, + &ProcessInfo->ClientId); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not Create Thread\n"); + ZwClose(ProcessInfo->ProcessHandle); + ZwClose(hSection); /* Don't try to optimize this on top! */ + return Status; + } + + /* Close the Section Handle and return */ + ZwClose(hSection); + return STATUS_SUCCESS; } - - /* EOF */ _____ Modified: trunk/reactos/lib/rtl/thread.c --- trunk/reactos/lib/rtl/thread.c 2005-07-12 02:45:33 UTC (rev 16541) +++ trunk/reactos/lib/rtl/thread.c 2005-07-12 04:41:41 UTC (rev 16542) @@ -3,113 +3,349 @@ * PROJECT: ReactOS kernel * PURPOSE: Rtl user thread functions * FILE: lib/ntdll/rtl/thread.c - * PROGRAMER: Eric Kohl - * REVISION HISTORY: - * 09/07/99: Created - * 09/10/99: Cleanup and full stack support. - * 25/04/03: Near rewrite. Made code more readable, replaced - * INITIAL_TEB with USER_STACK, added support for - * fixed-size stacks - * 28/04/03: Moved all code to a new statically linked - * library (ROSRTL) so it can be shared with - * kernel32.dll without exporting non-standard - * functions from ntdll.dll + * PROGRAMERS: + * Alex Ionescu (alex(a)relsoft.net) + * Eric Kohl + * KJK::Hyperion */ /* INCLUDES *****************************************************************/ #include "rtl.h" -#include <rosrtl/thread.h> #define NDEBUG #include <debug.h> -/* FUNCTIONS ***************************************************************/ +/* PRIVATE FUNCTIONS *******************************************************/ -/* - @implemented -*/ -NTSTATUS STDCALL RtlCreateUserThread -( - HANDLE ProcessHandle, - PSECURITY_DESCRIPTOR SecurityDescriptor, - BOOLEAN CreateSuspended, - LONG StackZeroBits, - ULONG StackReserve, - ULONG StackCommit, - PTHREAD_START_ROUTINE StartAddress, - PVOID Parameter, - PHANDLE ThreadHandle, - PCLIENT_ID ClientId -) +NTSTATUS +STDCALL +RtlpCreateUserStack(HANDLE hProcess, + ULONG StackReserve, + ULONG StackCommit, + ULONG StackZeroBits, + PINITIAL_TEB InitialTeb) { - OBJECT_ATTRIBUTES oaThreadAttribs; + NTSTATUS Status; + SYSTEM_BASIC_INFORMATION SystemBasicInfo; + PIMAGE_NT_HEADERS Headers; + ULONG_PTR Stack = 0; + BOOLEAN UseGuard = FALSE; + + DPRINT("RtlpCreateUserStack\n"); + + /* Get some memory information */ + Status = NtQuerySystemInformation(SystemBasicInformation, + &SystemBasicInfo, + sizeof(SYSTEM_BASIC_INFORMATION), + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to query system info\n"); + return Status; + } + + /* Use the Image Settings if we are dealing with the current Process */ + if (hProcess == NtCurrentProcess()) + { + /* Get the Image Headers */ + Headers = RtlImageNtHeader(NtCurrentPeb()->ImageBaseAddress); + DPRINT("Headers: %p\n", Headers); + + /* If we didn't get the parameters, find them ourselves */ + StackReserve = (StackReserve) ? + StackReserve : Headers->OptionalHeader.SizeOfStackReserve; + StackCommit = (StackCommit) ? + StackCommit : Headers->OptionalHeader.SizeOfStackCommit; + } + else + { + /* Use the System Settings if needed */ + StackReserve = (StackReserve) ? StackReserve : + SystemBasicInfo.AllocationGranularity; + StackCommit = (StackCommit) ? StackCommit : SystemBasicInfo.PageSize; + } + + /* Align everything to Page Size */ + StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); + StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); + #if 1 // FIXME: Remove once Guard Page support is here + StackCommit = StackReserve; + #endif + DPRINT("StackReserve: %lx, StackCommit: %lx\n", StackReserve, StackCommit); + + /* Reserve memory for the stack */ + Status = ZwAllocateVirtualMemory(hProcess, + (PVOID*)&Stack, + StackZeroBits, + &StackReserve, + MEM_RESERVE, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to reserve stack\n"); + return Status; + } + + /* Now set up some basic Initial TEB Parameters */ + InitialTeb->AllocatedStackBase = (PVOID)Stack; + InitialTeb->StackBase = (PVOID)(Stack + StackReserve); + + /* Update the Stack Position */ + Stack += StackReserve - StackCommit; + + /* Check if we will need a guard page */ + if (StackReserve > StackCommit) + { + Stack -= SystemBasicInfo.PageSize; + StackCommit += SystemBasicInfo.PageSize; + UseGuard = TRUE; + } + + DPRINT("AllocatedBase: %p, StackBase: %p, Stack: %p, StackCommit: %lx\n", + InitialTeb->AllocatedStackBase, InitialTeb->StackBase, Stack, + StackCommit); + + /* Allocate memory for the stack */ + Status = ZwAllocateVirtualMemory(hProcess, + (PVOID*)&Stack, + 0, + &StackCommit, + MEM_COMMIT, + PAGE_READWRITE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to allocate stack\n"); + return Status; + } + + /* Now set the current Stack Limit */ + InitialTeb->StackLimit = (PVOID)Stack; + DPRINT("StackLimit: %p\n", Stack); + + /* Create a guard page */ + if (UseGuard) + { + ULONG GuardPageSize = SystemBasicInfo.PageSize; + ULONG Dummy; + + /* Attempt maximum space possible */ + Status = ZwProtectVirtualMemory(hProcess, + (PVOID*)&Stack, + &GuardPageSize, + PAGE_GUARD | PAGE_READWRITE, + &Dummy); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to create guard page\n"); + return Status; + } + + /* Update the Stack Limit keeping in mind the Guard Page */ + InitialTeb->StackLimit = (PVOID)((ULONG_PTR)InitialTeb->StackLimit - + GuardPageSize); + DPRINT1("StackLimit: %p\n", Stack); + } + + /* We are done! */ + return Status; +} - InitializeObjectAttributes - ( - &oaThreadAttribs, - NULL, - 0, - NULL, - SecurityDescriptor - ); - - return RtlRosCreateUserThread - ( - ProcessHandle, - &oaThreadAttribs, - CreateSuspended, - StackZeroBits, - &StackReserve, - &StackCommit, - StartAddress, - ThreadHandle, - ClientId, - 1, - (ULONG_PTR *)&Parameter - ); +NTSTATUS +STDCALL +RtlpFreeUserStack(HANDLE hProcess, + PINITIAL_TEB InitialTeb) +{ + ULONG Dummy = 0; + + /* Free the Stack */ + return ZwFreeVirtualMemory(hProcess, + &InitialTeb->AllocatedStackBase, + &Dummy, + MEM_RELEASE); } + +/* FUNCTIONS ***************************************************************/ /* @implemented */ -VOID STDCALL -RtlInitializeContext( - IN HANDLE ProcessHandle, - OUT PCONTEXT ThreadContext, - IN PVOID ThreadStartParam OPTIONAL, - IN PTHREAD_START_ROUTINE ThreadStartAddress, - IN PINITIAL_TEB InitialTeb) +NTSTATUS +STDCALL +RtlCreateUserThread(HANDLE ProcessHandle, + PSECURITY_DESCRIPTOR SecurityDescriptor, + BOOLEAN CreateSuspended, + LONG StackZeroBits, + ULONG StackReserve, + ULONG StackCommit, + PTHREAD_START_ROUTINE StartAddress, + PVOID Parameter, + PHANDLE ThreadHandle, + PCLIENT_ID ClientId) { - RtlRosInitializeContext - ( - ProcessHandle, - ThreadContext, - ThreadStartAddress, - InitialTeb, - 1, - (ULONG_PTR *)&ThreadStartParam - ); + NTSTATUS Status; + HANDLE Handle; + CLIENT_ID ThreadCid; + INITIAL_TEB InitialTeb; + OBJECT_ATTRIBUTES ObjectAttributes; + CONTEXT Context; + + DPRINT("RtlCreateUserThread: (hProcess: %lx, Suspended: %lx," + "ZeroBits: %lx, StackReserve: %lx, StackCommit: %lx," + "StartAddress: %p, Parameter: %lx)\n", ProcessHandle, + CreateSuspended, StackZeroBits, StackReserve, StackCommit, + StartAddress, Parameter); + + /* First, we'll create the Stack */ + Status = RtlpCreateUserStack(ProcessHandle, + StackReserve, + StackCommit, + StackZeroBits, + &InitialTeb); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to create User Stack\n"); + return Status; + } + + /* Next, we'll set up the Initial Context */ + RtlInitializeContext(ProcessHandle, + &Context, + Parameter, + StartAddress, + InitialTeb.StackBase); + + /* We are now ready to create the Kernel Thread Object */ + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + SecurityDescriptor); + Status = ZwCreateThread(&Handle, + THREAD_ALL_ACCESS, + &ObjectAttributes, + ProcessHandle, + &ThreadCid, + &Context, + &InitialTeb, + CreateSuspended); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failure to create Thread\n"); + + /* Free the stack */ + RtlpFreeUserStack(ProcessHandle, &InitialTeb); + } + else + { + DPRINT("Thread created: %lx\n", Handle); + if (ThreadHandle) *ThreadHandle = Handle; + if (ClientId) *ClientId = ThreadCid; + } + + /* Return success or the previous failure */ + return Status; } /* + * FIXME: Should go in /i386 @implemented */ -NTSTATUS STDCALL RtlFreeUserThreadStack -( - HANDLE ProcessHandle, - HANDLE ThreadHandle -) +VOID +STDCALL +RtlInitializeContext(IN HANDLE ProcessHandle, + OUT PCONTEXT ThreadContext, + IN PVOID ThreadStartParam OPTIONAL, + IN PTHREAD_START_ROUTINE ThreadStartAddress, + IN PINITIAL_TEB InitialTeb) { - return RtlRosFreeUserThreadStack(ProcessHandle, ThreadHandle); + DPRINT("RtlInitializeContext: (hProcess: %lx, ThreadContext: %p, Teb: %p\n", + ProcessHandle, ThreadContext, InitialTeb); + + /* + * Set the Initial Registers + * This is based on NT's default values -- crazy apps might expect this... + */ + ThreadContext->Ebp = 0; + ThreadContext->Eax = 0; + ThreadContext->Ebx = 1; + ThreadContext->Ecx = 2; + ThreadContext->Edx = 3; + ThreadContext->Esi = 4; + ThreadContext->Edi = 5; + + /* Set the Selectors */ + ThreadContext->SegGs = 0; + ThreadContext->SegFs = TEB_SELECTOR; + ThreadContext->SegEs = USER_DS; + ThreadContext->SegDs = USER_DS; + ThreadContext->SegCs = USER_CS; + ThreadContext->SegSs = USER_DS; + + /* Enable Interrupts */ + ThreadContext->EFlags = 0x200; /*X86_EFLAGS_IF */ + + /* Settings passed */ + ThreadContext->Eip = (ULONG)ThreadStartAddress; + ThreadContext->Esp = (ULONG)InitialTeb; + + /* Only the basic Context is initialized */ + ThreadContext->ContextFlags = CONTEXT_CONTROL | + CONTEXT_INTEGER | + CONTEXT_SEGMENTS; + + /* Set up ESP to the right value */ + ThreadContext->Esp -= sizeof(PVOID); + ZwWriteVirtualMemory(ProcessHandle, + (PVOID)ThreadContext->Esp, + (PVOID)&ThreadStartParam, + sizeof(PVOID), + NULL); + + /* Push it down one more notch for RETEIP */ + ThreadContext->Esp -= sizeof(PVOID); } /* @implemented */ [truncated at 1000 lines; 58 more skipped]

1 0

[jimtabor] 16541: Start integrating and implementing key board functions. More Wine porting with ROS.
by jimtabor＠svn.reactos.com 12 Jul '05

12 Jul '05

Start integrating and implementing key board functions. More Wine porting with ROS. Modified: trunk/reactos/include/win32k/ntuser.h _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-07-12 01:56:14 UTC (rev 16540) +++ trunk/reactos/include/win32k/ntuser.h 2005-07-12 02:45:33 UTC (rev 16541) @@ -187,6 +187,8 @@ #define ONEPARAM_ROUTINE_ENABLEPROCWNDGHSTING 0x0d #define ONEPARAM_ROUTINE_GETWINDOWINSTANCE 0x10 #define ONEPARAM_ROUTINE_MSQSETWAKEMASK 0x27 +#define ONEPARAM_ROUTINE_GETKEYBOARDTYPE 0x28 +#define ONEPARAM_ROUTINE_GETKEYBOARDLAYOUT 0x29 DWORD STDCALL NtUserCallOneParam( @@ -741,6 +743,11 @@ DWORD Unknown1, DWORD Unknown2); +HKL +STDCALL +NtUserGetKeyboardLayout( + DWORD dwThreadid); + DWORD STDCALL NtUserGetKeyboardLayoutList( @@ -759,10 +766,15 @@ DWORD STDCALL -NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); +NtUserGetKeyboardType( + DWORD TypeFlag); DWORD STDCALL +NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize ); + +DWORD +STDCALL NtUserGetKeyState( DWORD Unknown0);

1 0

[ion] 16540: Partial patch of larger rosrtl removal patch. This one merely is a structure fix patch, and renames/corrects RTL_USER_PROCESS_INFORMATION (which had the totally wrong names) as well as updates the TEB to the latest version. It also fixes SECTION_IMAGE_INFORMATION to have the right format and names. Also, some callers of CreateProcessW are modified to not send a constant string as lpCommandLine (this was illegal and will crash on Windows/my patch). INITIAL_TEB was also renamed to the
by ion＠svn.reactos.com 12 Jul '05

12 Jul '05

Partial patch of larger rosrtl removal patch. This one merely is a structure fix patch, and renames/corrects RTL_USER_PROCESS_INFORMATION (which had the totally wrong names) as well as updates the TEB to the latest version. It also fixes SECTION_IMAGE_INFORMATION to have the right format and names. Also, some callers of CreateProcessW are modified to not send a constant string as lpCommandLine (this was illegal and will crash on Windows/my patch). INITIAL_TEB was also renamed to the more correct fields, although they won't make sense with the current rosrtl/rtl implementation, the names will only make sense with the next patch. Finally NtTerminateThread was fixed to support sending NULL as handle, and PspExitThread was updated to work with the new FreestackOnExit flag, both of which will be used in the next patch. Modified: trunk/reactos/include/ndk/fixmes.txt Modified: trunk/reactos/include/ndk/pstypes.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/include/ndk/zwtypes.h Modified: trunk/reactos/lib/gdi32/main/dllmain.c Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/include/kernel32.h Modified: trunk/reactos/lib/kernel32/misc/console.c Modified: trunk/reactos/lib/kernel32/misc/handle.c Modified: trunk/reactos/lib/kernel32/misc/ldr.c Modified: trunk/reactos/lib/kernel32/misc/nls.c Modified: trunk/reactos/lib/kernel32/process/create.c Modified: trunk/reactos/lib/kernel32/process/proc.c Modified: trunk/reactos/lib/kernel32/synch/wait.c Modified: trunk/reactos/lib/kernel32/thread/fiber.c Modified: trunk/reactos/lib/kernel32/thread/fls.c Modified: trunk/reactos/lib/ntdll/dbg/debug.c Modified: trunk/reactos/lib/ntdll/rtl/path.c Modified: trunk/reactos/lib/rosrtl/thread/i386/context.c Modified: trunk/reactos/lib/rosrtl/thread/stack.c Modified: trunk/reactos/lib/rtl/env.c Modified: trunk/reactos/lib/rtl/ppb.c Modified: trunk/reactos/lib/rtl/process.c Modified: trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/syssetup/install.c Modified: trunk/reactos/lib/user32/misc/dllmain.c Modified: trunk/reactos/ntoskrnl/io/irq.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ldr/init.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/subsys/csrss/api/wapi.c Modified: trunk/reactos/subsys/csrss/init.c Modified: trunk/reactos/subsys/smss/client.c Modified: trunk/reactos/subsys/smss/debug.c Modified: trunk/reactos/subsys/smss/initss.c Modified: trunk/reactos/subsys/smss/smapi.c Modified: trunk/reactos/subsys/smss/smapiexec.c Modified: trunk/reactos/subsys/smss/smss.h Modified: trunk/reactos/subsys/system/winlogon/winlogon.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/include/ndk/fixmes.txt --- trunk/reactos/include/ndk/fixmes.txt 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/fixmes.txt 2005-07-12 01:56:14 UTC (rev 16540) @@ -26,14 +26,15 @@ - Object Directory + implementation doesn't match NT (Alex) [obtypes.h] Priority 3: + - Some RTL Structures need review (Alex) [rtltypes.h] - Pushlock support is needed to fix EPROCESS (Alex) [pstypes.h] - MADDRESS_SPACE must be converted into the NT Type (Alex) [pstypes.h, mmtypes.h] Priority 4: - FIXED: Kernel and Memory Types are not architecture-specific (Eric) [ketypes.h, mmtypes.h] - - Win32K Builds with windows.h [extypes.h, ketypes.h] + - Win32K Builds with windows.h (Filip, bugzilla id 666) [extypes.h, ketypes.h] Priority 5: - LPC Types are totally wrong. [lpctypes.h] - Missing System Info Classes [zwtypes.h] - - Process Priority Classes are messed up [pstypes.h] \ No newline at end of file + - Process Priority Classes are messed up (Alex) [pstypes.h] _____ Modified: trunk/reactos/include/ndk/pstypes.h --- trunk/reactos/include/ndk/pstypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/pstypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -93,12 +93,6 @@ struct _ETHREAD; -typedef struct _CURDIR -{ - UNICODE_STRING DosPath; - PVOID Handle; -} CURDIR, *PCURDIR; - typedef struct _DESCRIPTOR_TABLE_ENTRY { ULONG Selector; @@ -181,75 +175,101 @@ typedef struct _INITIAL_TEB { + PVOID PreviousStackBase; + PVOID PreviousStackLimit; PVOID StackBase; PVOID StackLimit; - PVOID StackCommit; - PVOID StackCommitMax; - PVOID StackReserved; + PVOID AllocatedStackBase; } INITIAL_TEB, *PINITIAL_TEB; +typedef struct _TEB_ACTIVE_FRAME_CONTEXT +{ + ULONG Flags; + LPSTR FrameName; +} TEB_ACTIVE_FRAME_CONTEXT, *PTEB_ACTIVE_FRAME_CONTEXT; + +typedef struct _TEB_ACTIVE_FRAME +{ + ULONG Flags; + struct _TEB_ACTIVE_FRAME *Previous; + PTEB_ACTIVE_FRAME_CONTEXT Context; +} TEB_ACTIVE_FRAME, *PTEB_ACTIVE_FRAME; + typedef struct _TEB { - NT_TIB Tib; /* 00h */ - PVOID EnvironmentPointer; /* 1Ch */ - CLIENT_ID Cid; /* 20h */ - PVOID ActiveRpcInfo; /* 28h */ - PVOID ThreadLocalStoragePointer; /* 2Ch */ - struct _PEB *Peb; /* 30h */ - ULONG LastErrorValue; /* 34h */ - ULONG CountOfOwnedCriticalSections; /* 38h */ - PVOID CsrClientThread; /* 3Ch */ - struct _W32THREAD* Win32ThreadInfo; /* 40h */ - ULONG Win32ClientInfo[0x1F]; /* 44h */ - PVOID WOW32Reserved; /* C0h */ - LCID CurrentLocale; /* C4h */ - ULONG FpSoftwareStatusRegister; /* C8h */ - PVOID SystemReserved1[0x36]; /* CCh */ - PVOID Spare1; /* 1A4h */ - LONG ExceptionCode; /* 1A8h */ - UCHAR SpareBytes1[0x28]; /* 1ACh */ - PVOID SystemReserved2[0xA]; /* 1D4h */ - GDI_TEB_BATCH GdiTebBatch; /* 1FCh */ - ULONG gdiRgn; /* 6DCh */ - ULONG gdiPen; /* 6E0h */ - ULONG gdiBrush; /* 6E4h */ - CLIENT_ID RealClientId; /* 6E8h */ - PVOID GdiCachedProcessHandle; /* 6F0h */ - ULONG GdiClientPID; /* 6F4h */ - ULONG GdiClientTID; /* 6F8h */ - PVOID GdiThreadLocaleInfo; /* 6FCh */ - PVOID UserReserved[5]; /* 700h */ - PVOID glDispatchTable[0x118]; /* 714h */ - ULONG glReserved1[0x1A]; /* B74h */ - PVOID glReserved2; /* BDCh */ - PVOID glSectionInfo; /* BE0h */ - PVOID glSection; /* BE4h */ - PVOID glTable; /* BE8h */ - PVOID glCurrentRC; /* BECh */ - PVOID glContext; /* BF0h */ - NTSTATUS LastStatusValue; /* BF4h */ - UNICODE_STRING StaticUnicodeString; /* BF8h */ - WCHAR StaticUnicodeBuffer[0x105]; /* C00h */ - PVOID DeallocationStack; /* E0Ch */ - PVOID TlsSlots[0x40]; /* E10h */ - LIST_ENTRY TlsLinks; /* F10h */ - PVOID Vdm; /* F18h */ - PVOID ReservedForNtRpc; /* F1Ch */ - PVOID DbgSsReserved[0x2]; /* F20h */ - ULONG HardErrorDisabled; /* F28h */ - PVOID Instrumentation[0x10]; /* F2Ch */ - PVOID WinSockData; /* F6Ch */ - ULONG GdiBatchCount; /* F70h */ - USHORT _Spare2; /* F74h */ - BOOLEAN IsFiber; /* F76h */ - UCHAR Spare3; /* F77h */ - ULONG _Spare4; /* F78h */ - ULONG _Spare5; /* F7Ch */ - PVOID ReservedForOle; /* F80h */ - ULONG WaitingOnLoaderLock; /* F84h */ - ULONG _Unknown[11]; /* F88h */ - PVOID FlsSlots; /* FB4h */ - PVOID WineDebugInfo; /* Needed for WINE DLL's */ + NT_TIB Tib; /* 00h */ + PVOID EnvironmentPointer; /* 1Ch */ + CLIENT_ID Cid; /* 20h */ + PVOID ActiveRpcHandle; /* 28h */ + PVOID ThreadLocalStoragePointer; /* 2Ch */ + struct _PEB *ProcessEnvironmentBlock; /* 30h */ + ULONG LastErrorValue; /* 34h */ + ULONG CountOfOwnedCriticalSections; /* 38h */ + PVOID CsrClientThread; /* 3Ch */ + struct _W32THREAD* Win32ThreadInfo; /* 40h */ + ULONG User32Reserved[0x1A]; /* 44h */ + ULONG UserReserved[5]; /* ACh */ + PVOID WOW32Reserved; /* C0h */ + LCID CurrentLocale; /* C4h */ + ULONG FpSoftwareStatusRegister; /* C8h */ + PVOID SystemReserved1[0x36]; /* CCh */ + LONG ExceptionCode; /* 1A4h */ + struct _ACTIVATION_CONTEXT_STACK *ActivationContextStackPointer; /* 1A8h */ + UCHAR SpareBytes1[0x28]; /* 1ACh */ + GDI_TEB_BATCH GdiTebBatch; /* 1D4h */ + CLIENT_ID RealClientId; /* 6B4h */ + PVOID GdiCachedProcessHandle; /* 6BCh */ + ULONG GdiClientPID; /* 6C0h */ + ULONG GdiClientTID; /* 6C4h */ + PVOID GdiThreadLocalInfo; /* 6C8h */ + ULONG Win32ClientInfo[62]; /* 6CCh */ + PVOID glDispatchTable[0xE9]; /* 7C4h */ + ULONG glReserved1[0x1D]; /* B68h */ + PVOID glReserved2; /* BDCh */ + PVOID glSectionInfo; /* BE0h */ + PVOID glSection; /* BE4h */ + PVOID glTable; /* BE8h */ + PVOID glCurrentRC; /* BECh */ + PVOID glContext; /* BF0h */ + NTSTATUS LastStatusValue; /* BF4h */ + UNICODE_STRING StaticUnicodeString; /* BF8h */ + WCHAR StaticUnicodeBuffer[0x105]; /* C00h */ + PVOID DeallocationStack; /* E0Ch */ + PVOID TlsSlots[0x40]; /* E10h */ + LIST_ENTRY TlsLinks; /* F10h */ + PVOID Vdm; /* F18h */ + PVOID ReservedForNtRpc; /* F1Ch */ + PVOID DbgSsReserved[0x2]; /* F20h */ + ULONG HardErrorDisabled; /* F28h */ + PVOID Instrumentation[14]; /* F2Ch */ + PVOID SubProcessTag; /* F64h */ + PVOID EtwTraceData; /* F68h */ + PVOID WinSockData; /* F6Ch */ + ULONG GdiBatchCount; /* F70h */ + BOOLEAN InDbgPrint; /* F74h */ + BOOLEAN FreeStackOnTermination; /* F75h */ + BOOLEAN HasFiberData; /* F76h */ + UCHAR IdealProcessor; /* F77h */ + ULONG GuaranteedStackBytes; /* F78h */ + PVOID ReservedForPerf; /* F7Ch */ + PVOID ReservedForOle; /* F80h */ + ULONG WaitingOnLoaderLock; /* F84h */ + ULONG SparePointer1; /* F88h */ + ULONG SoftPatchPtr1; /* F8Ch */ + ULONG SoftPatchPtr2; /* F90h */ + PVOID *TlsExpansionSlots; /* F94h */ + ULONG ImpersionationLocale; /* F98h */ + ULONG IsImpersonating; /* F9Ch */ + PVOID NlsCache; /* FA0h */ + PVOID pShimData; /* FA4h */ + ULONG HeapVirualAffinity; /* FA8h */ + PVOID CurrentTransactionHandle; /* FACh */ + PTEB_ACTIVE_FRAME ActiveFrame; /* FB0h */ + PVOID FlsData; /* FB4h */ + UCHAR SafeThunkCall; /* FB8h */ + UCHAR BooleanSpare[3]; /* FB9h */ + /* FIXME: Needed for WINE DLL's */ + PVOID WineDebugInfo; /* FBCh */ } TEB, *PTEB; /* KERNEL MODE ONLY **********************************************************/ _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -1049,7 +1049,7 @@ IN BOOLEAN CurrentDirectory, IN HANDLE DebugPort OPTIONAL, IN HANDLE ExceptionPort OPTIONAL, - OUT PRTL_PROCESS_INFO ProcessInfo + OUT PRTL_USER_PROCESS_INFORMATION ProcessInfo ); NTSTATUS @@ -1059,8 +1059,8 @@ IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN BOOLEAN CreateSuspended, IN LONG StackZeroBits, - IN OUT PULONG StackReserve, - IN OUT PULONG StackCommit, + IN ULONG StackReserve, + IN ULONG StackCommit, IN PTHREAD_START_ROUTINE StartAddress, IN PVOID Parameter, IN OUT PHANDLE ThreadHandle, @@ -1075,11 +1075,11 @@ STDCALL RtlDestroyProcessParameters(IN PRTL_USER_PROCESS_PARAMETERS ProcessParameters); -NTSTATUS +VOID STDCALL RtlExitUserThread(NTSTATUS Status); -NTSTATUS +VOID STDCALL RtlInitializeContext( IN HANDLE ProcessHandle, _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/rtltypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -17,10 +17,18 @@ /* CONSTANTS *****************************************************************/ #define MAXIMUM_LEADBYTES 12 -#define PPF_NORMALIZED (1) +#define PPF_NORMALIZED 0x01 +#define PPF_PROFILE_USER 0x02 +#define PPF_PROFILE_SERVER 0x04 +#define PPF_PROFILE_KERNEL 0x08 -#define PEB_BASE (0x7FFDF000) +#define PPF_RESERVE_1MB 0x20 +#define PPF_DISABLE_HEAP_CHECKS 0x100 +#define PPF_PROCESS_OR_1 0x200 +#define PPF_PROCESS_OR_2 0x400 +#define PEB_BASE (0x7FFDF000) + #define EXCEPTION_CONTINUE_SEARCH 0 #define EXCEPTION_EXECUTE_HANDLER 1 @@ -218,6 +226,12 @@ ULONG ModuleCount; DEBUG_MODULE_INFORMATION ModuleEntry[1]; } MODULE_INFORMATION, *PMODULE_INFORMATION; + +typedef struct _RTL_HEAP_DEFINITION +{ + ULONG Length; + ULONG Unknown[11]; +} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; /* END REVIEW AREA */ typedef struct _EXCEPTION_REGISTRATION @@ -229,6 +243,12 @@ typedef EXCEPTION_REGISTRATION EXCEPTION_REGISTRATION_RECORD; typedef PEXCEPTION_REGISTRATION PEXCEPTION_REGISTRATION_RECORD; +typedef struct _CURDIR +{ + UNICODE_STRING DosPath; + HANDLE Handle; +} CURDIR, *PCURDIR; + typedef struct RTL_DRIVE_LETTER_CURDIR { USHORT Flags; @@ -237,12 +257,6 @@ UNICODE_STRING DosPath; } RTL_DRIVE_LETTER_CURDIR, *PRTL_DRIVE_LETTER_CURDIR; -typedef struct _RTL_HEAP_DEFINITION -{ - ULONG Length; - ULONG Unknown[11]; -} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; - typedef struct _RTL_RANGE_LIST { LIST_ENTRY ListHead; @@ -323,44 +337,44 @@ typedef struct _RTL_USER_PROCESS_PARAMETERS { - ULONG AllocationSize; - ULONG Size; - ULONG Flags; - ULONG DebugFlags; - HANDLE hConsole; - ULONG ProcessGroup; - HANDLE hStdInput; - HANDLE hStdOutput; - HANDLE hStdError; - UNICODE_STRING CurrentDirectoryName; - HANDLE CurrentDirectoryHandle; - UNICODE_STRING DllPath; - UNICODE_STRING ImagePathName; - UNICODE_STRING CommandLine; - PWSTR Environment; - ULONG dwX; - ULONG dwY; - ULONG dwXSize; - ULONG dwYSize; - ULONG dwXCountChars; - ULONG dwYCountChars; - ULONG dwFillAttribute; - ULONG dwFlags; - ULONG wShowWindow; - UNICODE_STRING WindowTitle; - UNICODE_STRING DesktopInfo; - UNICODE_STRING ShellInfo; - UNICODE_STRING RuntimeInfo; + ULONG MaximumLength; + ULONG Length; + ULONG Flags; + ULONG DebugFlags; + HANDLE ConsoleHandle; + ULONG ConsoleFlags; + HANDLE StandardInput; + HANDLE StandardOutput; + HANDLE StandardError; + CURDIR CurrentDirectory; + UNICODE_STRING DllPath; + UNICODE_STRING ImagePathName; + UNICODE_STRING CommandLine; + PWSTR Environment; + ULONG StartingX; + ULONG StartingY; + ULONG CountX; + ULONG CountY; + ULONG CountCharsX; + ULONG CountCharsY; + ULONG FillAttribute;; + ULONG WindowFlags; + ULONG ShowWindowFlags; + UNICODE_STRING WindowTitle; + UNICODE_STRING DesktopInfo; + UNICODE_STRING ShellInfo; + UNICODE_STRING RuntimeData; + RTL_DRIVE_LETTER_CURDIR CurrentDirectories[32]; } RTL_USER_PROCESS_PARAMETERS, *PRTL_USER_PROCESS_PARAMETERS; -typedef struct _RTL_PROCESS_INFO +typedef struct _RTL_USER_PROCESS_INFORMATION { - ULONG Size; - HANDLE ProcessHandle; - HANDLE ThreadHandle; - CLIENT_ID ClientId; - SECTION_IMAGE_INFORMATION ImageInfo; -} RTL_PROCESS_INFO, *PRTL_PROCESS_INFO; + ULONG Size; + HANDLE ProcessHandle; + HANDLE ThreadHandle; + CLIENT_ID ClientId; + SECTION_IMAGE_INFORMATION ImageInformation; +} RTL_USER_PROCESS_INFORMATION, *PRTL_USER_PROCESS_INFORMATION; typedef struct _RTL_ATOM_TABLE_ENTRY { _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/umfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -122,7 +122,7 @@ ULONG Unknown2 ); -NTSTATUS +VOID STDCALL DbgUiRemoteBreakin(VOID); _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -3693,6 +3693,7 @@ IN HANDLE ThreadHandle, IN NTSTATUS ExitStatus ); + NTSTATUS STDCALL ZwTerminateThread( _____ Modified: trunk/reactos/include/ndk/zwtypes.h --- trunk/reactos/include/ndk/zwtypes.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/include/ndk/zwtypes.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -427,19 +427,22 @@ /* Class 1 */ typedef struct _SECTION_IMAGE_INFORMATION { - ULONG EntryPoint; - ULONG Unknown1; - ULONG_PTR StackReserve; - ULONG_PTR StackCommit; - ULONG Subsystem; - USHORT MinorSubsystemVersion; - USHORT MajorSubsystemVersion; - ULONG Unknown2; - ULONG Characteristics; - USHORT ImageNumber; - BOOLEAN Executable; - UCHAR Unknown3; - ULONG Unknown4[3]; + PVOID TransferAddress; + ULONG ZeroBits; + ULONG MaximumStackSize; + ULONG CommittedStackSize; + ULONG SubsystemType; + USHORT SubSystemMinorVersion; + USHORT SubSystemMajorVersion; + ULONG GpValue; + USHORT ImageCharacteristics; + USHORT DllChracteristics; + USHORT Machine; + UCHAR ImageContainsCode; + UCHAR Spare1; + ULONG LoaderFlags; + ULONG ImageFileSIze; + ULONG Reserved[1]; } SECTION_IMAGE_INFORMATION, *PSECTION_IMAGE_INFORMATION; /* _____ Modified: trunk/reactos/lib/gdi32/main/dllmain.c --- trunk/reactos/lib/gdi32/main/dllmain.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/gdi32/main/dllmain.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -32,7 +32,7 @@ hProcessHeap = GetProcessHeap(); /* map the gdi handle table to user space */ - GdiHandleTable = NtCurrentTeb()->Peb->GdiSharedHandleTable; + GdiHandleTable = NtCurrentTeb()->ProcessEnvironmentBlock->GdiSharedHandleTable; CurrentProcessId = NtCurrentTeb()->Cid.UniqueProcess; } _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/file/file.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -534,15 +534,15 @@ switch ((ULONG)hFile) { case STD_INPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdInput; + hFile = NtCurrentPeb()->ProcessParameters->StandardInput; break; case STD_OUTPUT_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdOutput; + hFile = NtCurrentPeb()->ProcessParameters->StandardOutput; break; case STD_ERROR_HANDLE: - hFile = NtCurrentPeb()->ProcessParameters->hStdError; + hFile = NtCurrentPeb()->ProcessParameters->StandardError; break; } _____ Modified: trunk/reactos/lib/kernel32/include/kernel32.h --- trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/include/kernel32.h 2005-07-12 01:56:14 UTC (rev 16540) @@ -23,6 +23,9 @@ #define FIELD_OFFSET(type,fld) ((LONG)&(((type *)0)->fld)) #endif +#define IsConsoleHandle(h) \ + ((((ULONG)h) & 0x10000003) == 0x3) ? TRUE : FALSE + #define SetLastErrorByStatus(__S__) \ ((void)SetLastError(RtlNtStatusToDosError(__S__))) @@ -47,8 +50,6 @@ /* FUNCTION PROTOTYPES *******************************************************/ -BOOL STDCALL IsConsoleHandle(HANDLE Handle); - BOOL STDCALL VerifyConsoleIoHandle(HANDLE Handle); BOOL STDCALL CloseConsoleHandle(HANDLE Handle); _____ Modified: trunk/reactos/lib/kernel32/misc/console.c --- trunk/reactos/lib/kernel32/misc/console.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/console.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -91,7 +91,7 @@ RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ProcessGroup & 1)) + NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) { for(i = NrCtrlHandlers; i > 0; -- i) if(CtrlHandlers[i - 1](nCode)) break; @@ -110,7 +110,7 @@ RtlEnterCriticalSection(&ConsoleLock); if(!(nCode == CTRL_C_EVENT && - NtCurrentPeb()->ProcessParameters->ProcessGroup & 1)) + NtCurrentPeb()->ProcessParameters->ConsoleFlags & 1)) { i = NrCtrlHandlers; while(i > 0) @@ -1012,22 +1012,7 @@ return TRUE; } - /* - * internal function - */ -BOOL STDCALL -IsConsoleHandle(HANDLE Handle) -{ - if ((((ULONG)Handle) & 0x10000003) == 0x3) - { - return(TRUE); - } - return(FALSE); -} - - -/* * @implemented */ HANDLE STDCALL @@ -1047,13 +1032,13 @@ switch (nStdHandle) { case STD_INPUT_HANDLE: - return Ppb->hStdInput; + return Ppb->StandardInput; case STD_OUTPUT_HANDLE: - return Ppb->hStdOutput; + return Ppb->StandardOutput; case STD_ERROR_HANDLE: - return Ppb->hStdError; + return Ppb->StandardError; } SetLastError (ERROR_INVALID_PARAMETER); @@ -1085,15 +1070,15 @@ switch (nStdHandle) { case STD_INPUT_HANDLE: - Ppb->hStdInput = hHandle; + Ppb->StandardInput = hHandle; return TRUE; case STD_OUTPUT_HANDLE: - Ppb->hStdOutput = hHandle; + Ppb->StandardOutput = hHandle; return TRUE; case STD_ERROR_HANDLE: - Ppb->hStdError = hHandle; + Ppb->StandardError = hHandle; return TRUE; } @@ -1347,7 +1332,7 @@ NTSTATUS Status; HANDLE hStdError; - if(NtCurrentPeb()->ProcessParameters->hConsole) + if(NtCurrentPeb()->ProcessParameters->ConsoleHandle) { DPRINT("AllocConsole: Allocate duplicate console to the same Process\n"); SetLastErrorByStatus (STATUS_OBJECT_NAME_EXISTS); @@ -1363,7 +1348,7 @@ SetLastErrorByStatus ( Status ); return FALSE; } - NtCurrentPeb()->ProcessParameters->hConsole = Request.Data.AllocConsoleRequest.Console; + NtCurrentPeb()->ProcessParameters->ConsoleHandle = Request.Data.AllocConsoleRequest.Console; SetStdHandle( STD_INPUT_HANDLE, Request.Data.AllocConsoleRequest.InputHandle ); SetStdHandle( STD_OUTPUT_HANDLE, Request.Data.AllocConsoleRequest.OutputHandle ); hStdError = DuplicateConsoleHandle(Request.Data.AllocConsoleRequest.OutputHandle, _____ Modified: trunk/reactos/lib/kernel32/misc/handle.c --- trunk/reactos/lib/kernel32/misc/handle.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/handle.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -43,13 +43,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -95,13 +95,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -153,13 +153,13 @@ switch ((ULONG)hObject) { case STD_INPUT_HANDLE: - hObject = Ppb->hStdInput; + hObject = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hObject = Ppb->hStdOutput; + hObject = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hObject = Ppb->hStdError; + hObject = Ppb->StandardError; break; } @@ -198,13 +198,13 @@ switch ((ULONG)hSourceHandle) { case STD_INPUT_HANDLE: - hSourceHandle = Ppb->hStdInput; + hSourceHandle = Ppb->StandardInput; break; case STD_OUTPUT_HANDLE: - hSourceHandle = Ppb->hStdOutput; + hSourceHandle = Ppb->StandardOutput; break; case STD_ERROR_HANDLE: - hSourceHandle = Ppb->hStdError; + hSourceHandle = Ppb->StandardError; break; } _____ Modified: trunk/reactos/lib/kernel32/misc/ldr.c --- trunk/reactos/lib/kernel32/misc/ldr.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/ldr.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -43,7 +43,7 @@ } else { - ModuleName = NtCurrentTeb()->Peb->ProcessParameters->ImagePathName; + ModuleName = NtCurrentTeb()->ProcessEnvironmentBlock->ProcessParameters->ImagePathNam e; lpModule = ModuleName.Buffer; lpModuleEnd = lpModule + (ModuleName.Length / sizeof(WCHAR)); } _____ Modified: trunk/reactos/lib/kernel32/misc/nls.c --- trunk/reactos/lib/kernel32/misc/nls.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/misc/nls.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -101,7 +101,7 @@ /* Setup ANSI code page. */ AnsiCodePage.CodePage = CP_ACP; AnsiCodePage.SectionHandle = NULL; - AnsiCodePage.SectionMapping = NtCurrentTeb()->Peb->AnsiCodePageData; + AnsiCodePage.SectionMapping = NtCurrentTeb()->ProcessEnvironmentBlock->AnsiCodePageData; RtlInitCodePageTable((PUSHORT)AnsiCodePage.SectionMapping, &AnsiCodePage.CodePageTable); InsertTailList(&CodePageListHead, &AnsiCodePage.Entry); @@ -109,7 +109,7 @@ /* Setup OEM code page. */ OemCodePage.CodePage = CP_OEMCP; OemCodePage.SectionHandle = NULL; - OemCodePage.SectionMapping = NtCurrentTeb()->Peb->OemCodePageData; + OemCodePage.SectionMapping = NtCurrentTeb()->ProcessEnvironmentBlock->OemCodePageData; RtlInitCodePageTable((PUSHORT)OemCodePage.SectionMapping, &OemCodePage.CodePageTable); InsertTailList(&CodePageListHead, &OemCodePage.Entry); _____ Modified: trunk/reactos/lib/kernel32/process/create.c --- trunk/reactos/lib/kernel32/process/create.c 2005-07-11 23:32:55 UTC (rev 16539) +++ trunk/reactos/lib/kernel32/process/create.c 2005-07-12 01:56:14 UTC (rev 16540) @@ -16,7 +16,7 @@ /* FIXME */ #include <rosrtl/thread.h> -#define NDEBUG +//#define NDEBUG #include "../include/debug.h" /* FUNCTIONS ****************************************************************/ @@ -339,7 +339,7 @@ RtlRosR32AttribsToNativeAttribs(&oaThreadAttribs, lpThreadAttributes); /* native image */ - if(Sii->Subsystem != IMAGE_SUBSYSTEM_NATIVE) + if(Sii->SubsystemType != IMAGE_SUBSYSTEM_NATIVE) { pTrueStartAddress = (PVOID)BaseProcessStart; } @@ -368,8 +368,8 @@ &oaThreadAttribs, dwCreationFlags & CREATE_SUSPENDED, 0, - Sii->StackReserve, - Sii->StackCommit, + Sii->MaximumStackSize, + Sii->CommittedStackSize, pTrueStartAddress, &hThread, &cidClientId, @@ -382,8 +382,8 @@ &oaThreadAttribs, dwCreationFlags & CREATE_SUSPENDED, 0, - &(Sii->StackReserve), - &(Sii->StackCommit), + &(Sii->MaximumStackSize), + &(Sii->CommittedStackSize), pTrueStartAddress, &hThread, &cidClientId, @@ -401,8 +401,8 @@ "StackCommit %p\n" "ThreadHandle %p\n" "ClientId.UniqueThread %p\n", - Sii->StackReserve, - Sii->StackCommit, + Sii->MaximumStackSize, + Sii->CommittedStackSize, hThread, cidClientId.UniqueThread); @@ -550,7 +550,7 @@ /* create the PPB */ PpbBase = NULL; - PpbSize = Ppb->AllocationSize; + PpbSize = Ppb->MaximumLength; Status = NtAllocateVirtualMemory(ProcessHandle, &PpbBase, 0, @@ -566,7 +566,7 @@ NtWriteVirtualMemory(ProcessHandle, PpbBase, Ppb, - Ppb->AllocationSize, + Ppb->MaximumLength, &BytesWritten); /* write pointer to environment */ @@ -996,7 +996,7 @@ return FALSE; } - if (0 != (Sii.Characteristics & IMAGE_FILE_DLL)) + if (0 != (Sii.ImageCharacteristics & IMAGE_FILE_DLL)) { NtClose(hSection); DPRINT("Can't execute a DLL\n"); @@ -1004,11 +1004,11 @@ return FALSE; } - if (IMAGE_SUBSYSTEM_WINDOWS_GUI != Sii.Subsystem - && IMAGE_SUBSYSTEM_WINDOWS_CUI != Sii.Subsystem) + if (IMAGE_SUBSYSTEM_WINDOWS_GUI != Sii.SubsystemType + && IMAGE_SUBSYSTEM_WINDOWS_CUI != Sii.SubsystemType) { NtClose(hSection); - DPRINT("Invalid subsystem %d\n", Sii.Subsystem); + DPRINT("Invalid subsystem %d\n", Sii.SubsystemType); SetLastError(ERROR_CHILD_NOT_COMPLETE); return FALSE; } @@ -1124,12 +1124,12 @@ /* * Translate some handles for the new process */ - if (Ppb->CurrentDirectoryHandle) + if (Ppb->CurrentDirectory.Handle) { Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->CurrentDirectoryHandle, + Ppb->CurrentDirectory.Handle, hProcess, - &Ppb->CurrentDirectoryHandle, + &Ppb->CurrentDirectory.Handle, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1159,15 +1159,15 @@ Request = CREATE_PROCESS; CsrRequest.Data.CreateProcessRequest.NewProcessId = (HANDLE)ProcessBasicInfo.UniqueProcessId; - if (Sii.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_GUI) + if (Sii.SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_GUI) { /* Do not create a console for GUI applications */ dwCreationFlags &= ~CREATE_NEW_CONSOLE; dwCreationFlags |= DETACHED_PROCESS; } - else if (Sii.Subsystem == IMAGE_SUBSYSTEM_WINDOWS_CUI) + else if (Sii.SubsystemType == IMAGE_SUBSYSTEM_WINDOWS_CUI) { - if (NULL == Ppb->hConsole) + if (NULL == Ppb->ConsoleHandle) { dwCreationFlags |= CREATE_NEW_CONSOLE; } @@ -1183,7 +1183,7 @@ DbgPrint("Failed to tell csrss about new process. Expect trouble.\n"); } - Ppb->hConsole = CsrRequest.Data.CreateProcessRequest.Console; + Ppb->ConsoleHandle = CsrRequest.Data.CreateProcessRequest.Console; InputSet = FALSE; OutputSet = FALSE; @@ -1196,19 +1196,19 @@ { if (lpStartupInfo->hStdInput) { - Ppb->hStdInput = lpStartupInfo->hStdInput; + Ppb->StandardInput = lpStartupInfo->hStdInput; InputSet = TRUE; InputDup = TRUE; } if (lpStartupInfo->hStdOutput) { - Ppb->hStdOutput = lpStartupInfo->hStdOutput; + Ppb->StandardOutput = lpStartupInfo->hStdOutput; OutputSet = TRUE; OutputDup = TRUE; } if (lpStartupInfo->hStdError) { - Ppb->hStdError = lpStartupInfo->hStdError; + Ppb->StandardError = lpStartupInfo->hStdError; ErrorSet = TRUE; ErrorDup = TRUE; } @@ -1221,19 +1221,19 @@ { if (! InputSet) { - Ppb->hStdInput = CsrRequest.Data.CreateProcessRequest.InputHandle; + Ppb->StandardInput = CsrRequest.Data.CreateProcessRequest.InputHandle; InputSet = TRUE; InputDup = FALSE; } if (! OutputSet) { - Ppb->hStdOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; OutputSet = TRUE; OutputDup = FALSE; } if (! ErrorSet) { - Ppb->hStdError = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardError = CsrRequest.Data.CreateProcessRequest.OutputHandle; ErrorSet = TRUE; ErrorDup = FALSE; } @@ -1242,34 +1242,34 @@ /* Use existing handles otherwise */ if (! InputSet) { - Ppb->hStdInput = NtCurrentPeb()->ProcessParameters->hStdInput; + Ppb->StandardInput = NtCurrentPeb()->ProcessParameters->StandardInput; InputDup = TRUE; } if (! OutputSet) { - Ppb->hStdOutput = NtCurrentPeb()->ProcessParameters->hStdOutput; + Ppb->StandardOutput = NtCurrentPeb()->ProcessParameters->StandardOutput; OutputDup = TRUE; } if (! ErrorSet) { - Ppb->hStdError = NtCurrentPeb()->ProcessParameters->hStdError; + Ppb->StandardError = NtCurrentPeb()->ProcessParameters->StandardError; ErrorDup = TRUE; } /* Now duplicate handles if required */ - if (InputDup && Ppb->hStdInput != NULL) + if (InputDup && Ppb->StandardInput != NULL) { - if (IsConsoleHandle(Ppb->hStdInput)) + if (IsConsoleHandle(Ppb->StandardInput)) { - Ppb->hStdInput = CsrRequest.Data.CreateProcessRequest.InputHandle; + Ppb->StandardInput = CsrRequest.Data.CreateProcessRequest.InputHandle; } else { DPRINT("Duplicate input handle\n"); Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->hStdInput, + Ppb->StandardInput, hProcess, - &Ppb->hStdInput, + &Ppb->StandardInput, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1280,19 +1280,19 @@ } } - if (OutputDup && Ppb->hStdOutput != NULL) + if (OutputDup && Ppb->StandardOutput != NULL) { - if (IsConsoleHandle(Ppb->hStdOutput)) + if (IsConsoleHandle(Ppb->StandardOutput)) { - Ppb->hStdOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; + Ppb->StandardOutput = CsrRequest.Data.CreateProcessRequest.OutputHandle; } else { DPRINT("Duplicate output handle\n"); Status = NtDuplicateObject (NtCurrentProcess(), - Ppb->hStdOutput, + Ppb->StandardOutput, hProcess, - &Ppb->hStdOutput, + &Ppb->StandardOutput, 0, TRUE, DUPLICATE_SAME_ACCESS); @@ -1303,9 +1303,9 @@ } } - if (ErrorDup && Ppb->hStdError != NULL) + if (ErrorDup && Ppb->StandardError != NULL) { - if (IsConsoleHandle(Ppb->hStdError)) + if (IsConsoleHandle(Ppb->StandardError)) { Request = DUPLICATE_HANDLE; CsrRequest.Data.DuplicateHandleRequest.ProcessId = (HANDLE)ProcessBasicInfo.UniqueProcessId; @@ -1316,20 +1316,20 @@ sizeof(CSR_API_MESSAGE)); if (!NT_SUCCESS(Status) || !NT_SUCCESS(CsrRequest.Status)) { - Ppb->hStdError = INVALID_HANDLE_VALUE; + Ppb->StandardError = INVALID_HANDLE_VALUE; } else { - Ppb->hStdError = CsrRequest.Data.DuplicateHandleRequest.Handle; + Ppb->StandardError = CsrRequest.Data.DuplicateHandleRequest.Handle; } } else { DPRINT("Duplicate error handle\n"); [truncated at 1000 lines; 1357 more skipped]

1 0

[navaraf] 16539: Move Interlocked* routines from ROSRTL to separate INTRLCK library since ROSRTL is going to be removed.
by navaraf＠svn.reactos.com 11 Jul '05

11 Jul '05

Move Interlocked* routines from ROSRTL to separate INTRLCK library since ROSRTL is going to be removed. Modified: trunk/reactos/lib/directory.xml Added: trunk/reactos/lib/intrlck/ Added: trunk/reactos/lib/intrlck/intrlck.c Added: trunk/reactos/lib/intrlck/intrlck.xml Modified: trunk/reactos/lib/kernel32/kernel32.xml Modified: trunk/reactos/lib/ntdll/ntdll.xml Deleted: trunk/reactos/lib/rosrtl/misc/intrlck.c Modified: trunk/reactos/lib/rosrtl/rosrtl.xml Modified: trunk/reactos/subsys/csrss/csrss.xml _____ Modified: trunk/reactos/lib/directory.xml --- trunk/reactos/lib/directory.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/directory.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -91,6 +91,9 @@ <directory name="imm32"> <xi:include href="imm32/imm32.xml" /> </directory> +<directory name="intrlck"> + <xi:include href="intrlck/intrlck.xml" /> +</directory> <directory name="iphlpapi"> <xi:include href="iphlpapi/iphlpapi.xml" /> </directory> _____ Added: trunk/reactos/lib/intrlck/intrlck.c --- trunk/reactos/lib/intrlck/intrlck.c 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/intrlck/intrlck.c 2005-07-11 23:32:55 UTC (rev 16539) @@ -0,0 +1,209 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: lib/ntdll/rtl/intrlck.c + * PURPOSE: Inter lock increments + * UPDATE HISTORY: + * Created 30/09/99 + */ + +/* + * Win32 kernel functions + * + * Copyright 1995 Martin von Loewis + * Copyright 1997 Onno Hovers + * Copied from kernel32 + */ + +/* PowerPC Functions from gatomic.c in glib + * + * GLIB - Library of useful routines for C programming + * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + * + * g_atomic_*: atomic operations. + * Copyright (C) 2003 Sebastian Wilhelmi + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +/********************************************************************** ** +* InterlockedIncrement * +* * +* InterlockedIncrement adds 1 to a long variable and returns * +* the resulting incremented value. * +* * +*********************************************************************** */ + +#include <windows.h> + +LONG +STDCALL +InterlockedIncrement(PLONG Addend) +{ + long ret; +#ifdef _M_IX86 + __asm__ + ( + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tincl %0\n" + :"=r" (ret) + :"r" (Addend), "0" (1) + : "memory" + ); +#elif defined(_M_PPC) + ret = *Addend; + ret = InterlockedExchangeAdd( Addend, ret + 1 ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** +* InterlockedDecrement * +* * +* InterlockedDecrement adds -1 to a long variable and returns * +* the resulting decremented value. * +* * +*********************************************************************** */ + +LONG +STDCALL +InterlockedDecrement(LPLONG lpAddend) +{ + long ret; +#ifdef _M_IX86 + __asm__ + ( + "\tlock\n" /* for SMP systems */ + "\txaddl %0, (%1)\n" + "\tdecl %0\n" + :"=r" (ret) + :"r" (lpAddend), "0" (-1) + : "memory" + ); +#elif defined(_M_PPC) + ret = *lpAddend; + ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; + + +} + +/********************************************************************** ** + * InterlockedExchange + * + * Atomically exchanges a pair of values. + * + * RETURNS + * Prior value of value pointed to by Target + */ + +LONG +STDCALL +InterlockedExchange(LPLONG target, LONG value ) +{ + long ret; +#ifdef _M_IX86 + __asm__ ( /* lock for SMP systems */ + "lock\n\txchgl %0,(%1)" + :"=r" (ret):"r" (target), "0" (value):"memory" ); +#elif defined(_M_PPC) + do { + ret = *(volatile LONG *)target; + } while( InterlockedCompareExchange( target, value, ret ) != ret ); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** + * InterlockedCompareExchange + * + * Atomically compares Destination and Comperand, and if found equal exchanges + * the value of Destination with Exchange + * + * RETURNS + * Prior value of value pointed to by Destination + */ +LONG +STDCALL +InterlockedCompareExchange( + LPLONG Destination, + LONG Exchange, + LONG Comperand ) +{ + LONG ret; +#ifdef _M_IX86 + __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" + : "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" ); +#elif defined(_M_PPC) + __asm__ __volatile__ ("sync\n" + "1: lwarx %0,0,%1\n" + " subf. %0,%2,%0\n" + " bne 2f\n" + " stwcx. %3,0,%1\n" + " bne- 1b\n" + "2: isync" + : "=&r" (ret) + : "b" (Destination), "r" (Comperand), "r" (Exchange) + : "cr0", "memory"); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} + +/********************************************************************** ** + * InterlockedExchangeAdd + * + * Atomically adds Increment to Addend and returns the previous value of + * Addend + * + * RETURNS + * Prior value of value pointed to by Addend + */ +LONG +STDCALL +InterlockedExchangeAdd( + PLONG Addend, + LONG Increment +) +{ + LONG ret; +#ifdef _M_IX86 + __asm__ ( /* lock for SMP systems */ + "lock\n\t" + "xaddl %0,(%1)" + :"=r" (ret) + :"r" (Addend), "0" (Increment) + :"memory" ); +#elif defined(_M_PPC) + LONG newval; + do { + ret = *(volatile LONG *)Addend; + newval = ret + Increment; + } while (InterlockedCompareExchange(Addend, ret, newval) != ret); +#else +#error Unknown compiler for inline assembler +#endif + return ret; +} _____ Added: trunk/reactos/lib/intrlck/intrlck.xml --- trunk/reactos/lib/intrlck/intrlck.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/intrlck/intrlck.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -0,0 +1,4 @@ +<module name="intrlck" type="staticlibrary"> + <define name="__USE_W32API" /> + <file>intrlck.c</file> +</module> _____ Modified: trunk/reactos/lib/kernel32/kernel32.xml --- trunk/reactos/lib/kernel32/kernel32.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/kernel32/kernel32.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -117,6 +117,7 @@ <library>kernel32_base</library> <library>pseh</library> <library>rosrtl</library> + <library>intrlck</library> <library>ntdll</library> <linkerflag>-lgcc</linkerflag> <linkerflag>-nostartfiles</linkerflag> _____ Modified: trunk/reactos/lib/ntdll/ntdll.xml --- trunk/reactos/lib/ntdll/ntdll.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/ntdll/ntdll.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -9,6 +9,7 @@ <define name="_NTOSKRNL_" /> <library>rtl</library> <library>rosrtl</library> + <library>intrlck</library> <library>string</library> <linkerflag>-lgcc</linkerflag> <directory name="csr"> _____ Deleted: trunk/reactos/lib/rosrtl/misc/intrlck.c --- trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/rosrtl/misc/intrlck.c 2005-07-11 23:32:55 UTC (rev 16539) @@ -1,209 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/ntdll/rtl/intrlck.c - * PURPOSE: Inter lock increments - * UPDATE HISTORY: - * Created 30/09/99 - */ - -/* - * Win32 kernel functions - * - * Copyright 1995 Martin von Loewis - * Copyright 1997 Onno Hovers - * Copied from kernel32 - */ - -/* PowerPC Functions from gatomic.c in glib - * - * GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald - * - * g_atomic_*: atomic operations. - * Copyright (C) 2003 Sebastian Wilhelmi - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -/********************************************************************** ** -* InterlockedIncrement * -* * -* InterlockedIncrement adds 1 to a long variable and returns * -* the resulting incremented value. * -* * -*********************************************************************** */ - -#include <windows.h> - -LONG -STDCALL -InterlockedIncrement(PLONG Addend) -{ - long ret; -#ifdef _M_IX86 - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\txaddl %0, (%1)\n" - "\tincl %0\n" - :"=r" (ret) - :"r" (Addend), "0" (1) - : "memory" - ); -#elif defined(_M_PPC) - ret = *Addend; - ret = InterlockedExchangeAdd( Addend, ret + 1 ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** -* InterlockedDecrement * -* * -* InterlockedDecrement adds -1 to a long variable and returns * -* the resulting decremented value. * -* * -*********************************************************************** */ - -LONG -STDCALL -InterlockedDecrement(LPLONG lpAddend) -{ - long ret; -#ifdef _M_IX86 - __asm__ - ( - "\tlock\n" /* for SMP systems */ - "\txaddl %0, (%1)\n" - "\tdecl %0\n" - :"=r" (ret) - :"r" (lpAddend), "0" (-1) - : "memory" - ); -#elif defined(_M_PPC) - ret = *lpAddend; - ret = InterlockedExchangeAdd( lpAddend, ret - 1 ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; - - -} - -/********************************************************************** ** - * InterlockedExchange - * - * Atomically exchanges a pair of values. - * - * RETURNS - * Prior value of value pointed to by Target - */ - -LONG -STDCALL -InterlockedExchange(LPLONG target, LONG value ) -{ - long ret; -#ifdef _M_IX86 - __asm__ ( /* lock for SMP systems */ - "lock\n\txchgl %0,(%1)" - :"=r" (ret):"r" (target), "0" (value):"memory" ); -#elif defined(_M_PPC) - do { - ret = *(volatile LONG *)target; - } while( InterlockedCompareExchange( target, value, ret ) != ret ); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** - * InterlockedCompareExchange - * - * Atomically compares Destination and Comperand, and if found equal exchanges - * the value of Destination with Exchange - * - * RETURNS - * Prior value of value pointed to by Destination - */ -LONG -STDCALL -InterlockedCompareExchange( - LPLONG Destination, - LONG Exchange, - LONG Comperand ) -{ - LONG ret; -#ifdef _M_IX86 - __asm__ __volatile__( "lock; cmpxchgl %2,(%1)" - : "=a" (ret) : "r" (Destination), "r" (Exchange), "0" (Comperand) : "memory" ); -#elif defined(_M_PPC) - __asm__ __volatile__ ("sync\n" - "1: lwarx %0,0,%1\n" - " subf. %0,%2,%0\n" - " bne 2f\n" - " stwcx. %3,0,%1\n" - " bne- 1b\n" - "2: isync" - : "=&r" (ret) - : "b" (Destination), "r" (Comperand), "r" (Exchange) - : "cr0", "memory"); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} - -/********************************************************************** ** - * InterlockedExchangeAdd - * - * Atomically adds Increment to Addend and returns the previous value of - * Addend - * - * RETURNS - * Prior value of value pointed to by Addend - */ -LONG -STDCALL -InterlockedExchangeAdd( - PLONG Addend, - LONG Increment -) -{ - LONG ret; -#ifdef _M_IX86 - __asm__ ( /* lock for SMP systems */ - "lock\n\t" - "xaddl %0,(%1)" - :"=r" (ret) - :"r" (Addend), "0" (Increment) - :"memory" ); -#elif defined(_M_PPC) - LONG newval; - do { - ret = *(volatile LONG *)Addend; - newval = ret + Increment; - } while (InterlockedCompareExchange(Addend, ret, newval) != ret); -#else -#error Unknown compiler for inline assembler -#endif - return ret; -} _____ Modified: trunk/reactos/lib/rosrtl/rosrtl.xml --- trunk/reactos/lib/rosrtl/rosrtl.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/lib/rosrtl/rosrtl.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -5,7 +5,6 @@ </directory> <directory name="misc"> <file>devmode.c</file> - <file>intrlck.c</file> <file>logfont.c</file> <file>qsort.c</file> </directory> _____ Modified: trunk/reactos/subsys/csrss/csrss.xml --- trunk/reactos/subsys/csrss/csrss.xml 2005-07-11 22:15:47 UTC (rev 16538) +++ trunk/reactos/subsys/csrss/csrss.xml 2005-07-11 23:32:55 UTC (rev 16539) @@ -4,7 +4,7 @@ <define name="__USE_W32API" /> <define name="_WIN32_WINNT">0x0600</define> <define name="WINVER">0x0501</define> - <library>rosrtl</library> + <library>intrlck</library> <library>ntdll</library> <library>smdll</library> <directory name="api">

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs