Ros-diffs

ros-diffs@reactos.org

81390 discussions

[chorns] 19486: Disable pre-compiled headers when using compilation units
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

Disable pre-compiled headers when using compilation units 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/compilationunitsupportcode.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -89,6 +89,42 @@ return directoryTree->name; } +bool +MingwBackend::CanEnablePreCompiledHeaderSupportForModule ( const Module& module ) +{ + if ( !configuration.CompilationUnitsEnabled ) + return true; + + const vector<CompilationUnit*>& compilationUnits = module.non_if_data.compilationUnits; + size_t i; + for ( i = 0; i < compilationUnits.size (); i++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[i]; + if ( compilationUnit.files.size () != 1 ) + return false; + } + // intentionally make a copy so that we can append more work in + // the middle of processing without having to go recursive + vector<If*> v = module.non_if_data.ifs; + for ( i = 0; i < v.size (); i++ ) + { + size_t j; + If& rIf = *v[i]; + // check for sub-ifs to add to list + const vector<If*>& ifs = rIf.data.ifs; + for ( j = 0; j < ifs.size (); j++ ) + v.push_back ( ifs[j] ); + const vector<CompilationUnit*>& compilationUnits = rIf.data.compilationUnits; + for ( j = 0; j < compilationUnits.size (); j++ ) + { + CompilationUnit& compilationUnit = *compilationUnits[j]; + if ( compilationUnit.files.size () != 1 ) + return false; + } + } + return true; +} + void MingwBackend::ProcessModules () { @@ -104,6 +140,8 @@ MingwModuleHandler* h = MingwModuleHandler::InstanciateHandler ( module, this ); + if ( use_pch && CanEnablePreCompiledHeaderSupportForModule ( module ) ) + h->EnablePreCompiledHeaderSupport (); if ( module.host == HostDefault ) { module.host = h->DefaultHost(); @@ -207,7 +245,6 @@ throw AccessDeniedException ( ProjectNode.makefile ); MingwModuleHandler::SetBackend ( this ); MingwModuleHandler::SetMakefile ( fMakefile ); - MingwModuleHandler::SetUsePch ( use_pch ); } void _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.h --- trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.h 2005-11-23 15:05:53 UTC (rev 19486) @@ -92,6 +92,7 @@ void DetectNetwideAssembler (); void DetectPipeSupport (); void DetectPCHSupport (); + bool CanEnablePreCompiledHeaderSupportForModule ( const Module& module ); void ProcessModules (); void CheckAutomaticDependenciesForModuleOnly (); void ProcessNormal (); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -32,8 +32,6 @@ MingwModuleHandler::backend = NULL; FILE* MingwModuleHandler::fMakefile = NULL; -bool -MingwModuleHandler::use_pch = false; string PrefixFilename ( @@ -73,6 +71,7 @@ : module(module_) { + use_pch = false; } MingwModuleHandler::~MingwModuleHandler() @@ -91,10 +90,10 @@ fMakefile = f; } -/*static*/ void -MingwModuleHandler::SetUsePch ( bool b ) +void +MingwModuleHandler::EnablePreCompiledHeaderSupport () { - use_pch = b; + use_pch = true; } /* static*/ string _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-11-23 15:05:53 UTC (rev 19486) @@ -39,7 +39,7 @@ static void SetBackend ( MingwBackend* backend_ ); static void SetMakefile ( FILE* f ); - static void SetUsePch ( bool use_pch ); + void EnablePreCompiledHeaderSupport (); static std::string PassThruCacheDirectory ( const std::string &f, @@ -125,7 +125,7 @@ std::string GetLinkingDependencies () const; static MingwBackend* backend; static FILE* fMakefile; - static bool use_pch; + bool use_pch; private: std::string ConcatenatePaths ( const std::string& path1, const std::string& path2 ) const; _____ Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 13:45:34 UTC (rev 19485) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 15:05:53 UTC (rev 19486) @@ -82,8 +82,6 @@ s = buf; s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); - if ( module.pch ) - s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( module.pch->file.name, '\\', '/' ).c_str () ); for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) {

1 0

[hpoussin] 19485: In NtUserInsertMenuItem, try to copy the whole MENUITEMINFOW structure from caller. If it fails, try without the last field
by hpoussin＠svn.reactos.com 23 Nov '05

23 Nov '05

In NtUserInsertMenuItem, try to copy the whole MENUITEMINFOW structure from caller. If it fails, try without the last field Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:13:09 UTC (rev 19484) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:45:34 UTC (rev 19485) @@ -907,7 +907,7 @@ pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); - DPRINT("IntInsertMenuItemToList = %i\n", pos); + DPRINT("IntInsertMenuItemToList = %i\n", pos); return (pos >= 0); } @@ -1554,24 +1554,37 @@ if(!(Menu = UserGetMenuObject(hMenu))) { - RETURN(0); + RETURN( FALSE); } + /* Try to copy the whole MENUITEMINFOW structure */ Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, sizeof(MENUITEMINFOW)); - if (! NT_SUCCESS(Status)) + if (NT_SUCCESS(Status)) { - SetLastNtError(Status); - RETURN( FALSE); + if (sizeof(MENUITEMINFOW) != ItemInfo.cbSize + && FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != ItemInfo.cbSize) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( FALSE); + } + RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); } - /* structure can be 44 bytes or 48 bytes in size - if (ItemInfo.cbSize != sizeof(MENUITEMINFOW)) + + /* Try to copy without last field (not present in older versions) */ + Status = MmCopyFromCaller(&ItemInfo, UnsafeItemInfo, FIELD_OFFSET(MENUITEMINFOW, hbmpItem)); + if (NT_SUCCESS(Status)) { - SetLastWin32Error(ERROR_INVALID_PARAMETER); - RETURN( FALSE); + if (FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != ItemInfo.cbSize) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN( FALSE); + } + ItemInfo.hbmpItem = (HBITMAP)0; + RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); } - */ - RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo)); + SetLastNtError(Status); + RETURN( FALSE); CLEANUP: DPRINT("Leave NtUserInsertMenuItem, ret=%i\n",_ret_); @@ -1955,7 +1968,7 @@ return( FALSE); } if (sizeof(MENUITEMINFOW) != Size - && sizeof(MENUITEMINFOW) - sizeof(HBITMAP) != Size + && FIELD_OFFSET(MENUITEMINFOW, hbmpItem) != Size && sizeof(ROSMENUITEMINFO) != Size) { SetLastWin32Error(ERROR_INVALID_PARAMETER); @@ -1969,7 +1982,7 @@ } /* If this is a pre-0x0500 _WIN32_WINNT MENUITEMINFOW, you can't set/get hbmpItem */ - if (sizeof(MENUITEMINFOW) - sizeof(HBITMAP) == Size + if (FIELD_OFFSET(MENUITEMINFOW, hbmpItem) == Size && 0 != (ItemInfo.fMask & MIIM_BITMAP)) { SetLastWin32Error(ERROR_INVALID_PARAMETER);

1 0

[cwittich] 19484: fixed bug 888 (menus created by application itself may not appear)
by cwittich＠svn.reactos.com 23 Nov '05

23 Nov '05

fixed bug 888 (menus created by application itself may not appear) Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 07:07:40 UTC (rev 19483) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2005-11-23 13:13:09 UTC (rev 19484) @@ -907,7 +907,9 @@ pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); - return pos >= 0; + DPRINT("IntInsertMenuItemToList = %i\n", pos); + + return (pos >= 0); } UINT FASTCALL @@ -1561,11 +1563,13 @@ SetLastNtError(Status); RETURN( FALSE); } + /* structure can be 44 bytes or 48 bytes in size if (ItemInfo.cbSize != sizeof(MENUITEMINFOW)) { SetLastWin32Error(ERROR_INVALID_PARAMETER); RETURN( FALSE); } + */ RETURN( IntInsertMenuItem(Menu, uItem, fByPosition, &ItemInfo));

1 0

[navaraf] 19483: Update GPL and LGPL licenses.
by navaraf＠svn.reactos.com 23 Nov '05

23 Nov '05

Update GPL and LGPL licenses. Modified: trunk/reactos/COPYING Modified: trunk/reactos/LGPL.txt _____ Modified: trunk/reactos/COPYING --- trunk/reactos/COPYING 2005-11-23 06:33:19 UTC (rev 19482) +++ trunk/reactos/COPYING 2005-11-23 07:07:40 UTC (rev 19483) @@ -3,7 +3,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -280,7 +280,7 @@ END OF TERMS AND CONDITIONS - Appendix: How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it @@ -292,7 +292,7 @@ the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> + Copyright (C) <year> <name of author> 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 @@ -306,14 +306,15 @@ 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. + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. _____ Modified: trunk/reactos/LGPL.txt --- trunk/reactos/LGPL.txt 2005-11-23 06:33:19 UTC (rev 19482) +++ trunk/reactos/LGPL.txt 2005-11-23 07:07:40 UTC (rev 19483) @@ -2,7 +2,7 @@ Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -485,7 +485,7 @@ 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 + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail.

1 0

[sedwards] 19482: porting fixes
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

porting fixes Modified: trunk/reactos/apps/utils/net/tracert/tracert.c _____ Modified: trunk/reactos/apps/utils/net/tracert/tracert.c --- trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 06:02:15 UTC (rev 19481) +++ trunk/reactos/apps/utils/net/tracert/tracert.c 2005-11-23 06:33:19 UTC (rev 19482) @@ -28,7 +28,7 @@ */ -#include <windows.h> +//#include <windows.h> #include <winsock2.h> #include <tchar.h> #include <stdio.h> @@ -726,7 +726,7 @@ */ int main(int argc, char* argv[]) { - if (!ParseCmdline(argc, _argv)) return -1; + if (!ParseCmdline(argc, argv)) return -1; Driver();

1 0

[sedwards] 19481: porting fixes
by sedwards＠svn.reactos.com 23 Nov '05

23 Nov '05

porting fixes Modified: trunk/reactos/apps/utils/net/ftp/cmds.c Modified: trunk/reactos/apps/utils/net/ftp/ftp.c Modified: trunk/reactos/apps/utils/net/ftp/main.c Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ftp/cmds.c --- trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/cmds.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -25,7 +25,7 @@ //#include <sys/param.h> //#include <sys/wait.h> #include <sys/stat.h> -#if !defined(WIN32) +#ifndef _WIN32 #include <sys/socket.h> #include <arpa/ftp.h> #include <netinet/in.h> _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -25,7 +25,7 @@ #include <sys/stat.h> -#if !defined(WIN32) +#ifndef _WIN32 #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> _____ Modified: trunk/reactos/apps/utils/net/ftp/main.c --- trunk/reactos/apps/utils/net/ftp/main.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ftp/main.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -28,7 +28,7 @@ /* * FTP User Program -- Command Interface. */ -#if !defined(WIN32) +#ifndef _WIN32 #include <netdb.h> #include <sys/socket.h> #include <sys/ioctl.h> _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-23 06:00:41 UTC (rev 19480) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2005-11-23 06:02:15 UTC (rev 19481) @@ -236,8 +236,9 @@ if (Index == (TCHAR)NULL) { PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ULONG ulOutBufLen = 0; + ulOutBufLen = 0; /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ @@ -290,8 +291,9 @@ if (Index == (TCHAR)NULL) { PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; pInfo = (IP_INTERFACE_INFO *) malloc(sizeof(IP_INTERFACE_INFO)); - ULONG ulOutBufLen = 0; + ulOutBufLen = 0; /* Make an initial call to GetInterfaceInfo to get * the necessary size into the ulOutBufLen variable */ @@ -335,9 +337,12 @@ { // Declare and initialize variables PIP_INTERFACE_INFO pInfo; + ULONG ulOutBufLen; + DWORD dwRetVal; + pInfo = (IP_INTERFACE_INFO *) malloc( sizeof(IP_INTERFACE_INFO) ); - ULONG ulOutBufLen = sizeof(IP_INTERFACE_INFO); - DWORD dwRetVal = 0; + ulOutBufLen = sizeof(IP_INTERFACE_INFO); + dwRetVal = 0; // Make an initial call to GetInterfaceInfo to get

1 0

[cwittich] 19480: fix bug 838 (Sol.exe is missing it's menubar)
by cwittich＠svn.reactos.com 23 Nov '05

23 Nov '05

fix bug 838 (Sol.exe is missing it's menubar) Modified: trunk/reactos/include/win32k/ntuser.h Modified: trunk/reactos/lib/user32/controls/regcontrol.c Modified: trunk/reactos/lib/user32/windows/class.c Modified: trunk/reactos/subsys/win32k/include/class.h Modified: trunk/reactos/subsys/win32k/ntuser/class.c Modified: trunk/reactos/subsys/win32k/ntuser/window.c Modified: trunk/reactos/tools/nci/w32ksvc.db _____ Modified: trunk/reactos/include/win32k/ntuser.h --- trunk/reactos/include/win32k/ntuser.h 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/include/win32k/ntuser.h 2005-11-23 06:00:41 UTC (rev 19480) @@ -1170,7 +1170,8 @@ PUNICODE_STRING MenuName, WNDPROC wpExtra, DWORD Flags, - DWORD Unknown7); + DWORD Unknown7, + HMENU hMenu); BOOL STDCALL _____ Modified: trunk/reactos/lib/user32/controls/regcontrol.c --- trunk/reactos/lib/user32/controls/regcontrol.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/lib/user32/controls/regcontrol.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -51,6 +51,7 @@ &MenuName, Descr->procA, REGISTERCLASS_SYSTEM, + 0, 0); } _____ Modified: trunk/reactos/lib/user32/windows/class.c --- trunk/reactos/lib/user32/windows/class.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/lib/user32/windows/class.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -574,8 +574,9 @@ WNDCLASSEXA WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName; + HMENU hMenu; - if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || + if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXA) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || lpwcx->lpszClassName == NULL) { @@ -601,31 +602,34 @@ if (lpwcx->hInstance == NULL) ((WNDCLASSEXA*)lpwcx)->hInstance = GetModuleHandleW(NULL); - RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); + RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXA)); if (NULL == WndClass.hIconSm) { WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } - if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0) + if HIWORD(lpwcx->lpszMenuName) { + hMenu = 0; + RtlCreateUnicodeStringFromAsciiz(&MenuName, WndClass.lpszMenuName); + } + else + { MenuName.Length = MenuName.MaximumLength = 0; - MenuName.Buffer = (LPWSTR)lpwcx->lpszMenuName; - } else - { - RtlCreateUnicodeStringFromAsciiz(&MenuName, lpwcx->lpszMenuName); + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + hMenu = LoadMenuA(WndClass.hInstance, lpwcx->lpszMenuName); } - - if (IS_ATOM(lpwcx->lpszClassName)) + + if (IS_ATOM(WndClass.lpszClassName)) { ClassName.Length = ClassName.MaximumLength = 0; - ClassName.Buffer = (LPWSTR)lpwcx->lpszClassName; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; } else { - RtlCreateUnicodeStringFromAsciiz(&ClassName, lpwcx->lpszClassName); + RtlCreateUnicodeStringFromAsciiz(&ClassName, WndClass.lpszClassName); } Atom = NtUserRegisterClassExWOW( @@ -635,11 +639,12 @@ &MenuName, NULL, REGISTERCLASS_ANSI, - 0); + 0, + hMenu); - if (!IS_ATOM(lpwcx->lpszMenuName)) + if (!IS_ATOM(WndClass.lpszMenuName)) RtlFreeUnicodeString(&MenuName); - if (!IS_ATOM(lpwcx->lpszClassName)) + if (!IS_ATOM(WndClass.lpszClassName)) RtlFreeUnicodeString(&ClassName); return (ATOM)Atom; @@ -654,6 +659,7 @@ WNDCLASSEXW WndClass; UNICODE_STRING ClassName; UNICODE_STRING MenuName; + HMENU hMenu; if (lpwcx == NULL || lpwcx->cbSize != sizeof(WNDCLASSEXW) || lpwcx->cbClsExtra < 0 || lpwcx->cbWndExtra < 0 || @@ -688,24 +694,27 @@ WndClass.hIconSm = CreateSmallIcon(WndClass.hIcon); } - if (IS_ATOM(lpwcx->lpszMenuName)) + if HIWORD(lpwcx->lpszMenuName) { + hMenu = 0; + RtlInitUnicodeString(&MenuName, WndClass.lpszMenuName); + } + else + { MenuName.Length = MenuName.MaximumLength = 0; - MenuName.Buffer = (LPWSTR)lpwcx->lpszMenuName; - } else - { - RtlInitUnicodeString(&MenuName, lpwcx->lpszMenuName); + MenuName.Buffer = (LPWSTR)WndClass.lpszMenuName; + hMenu = LoadMenuW(WndClass.hInstance, lpwcx->lpszMenuName); } - if (IS_ATOM(lpwcx->lpszClassName)) + if (IS_ATOM(WndClass.lpszClassName)) { ClassName.Length = ClassName.MaximumLength = 0; - ClassName.Buffer = (LPWSTR)lpwcx->lpszClassName; + ClassName.Buffer = (LPWSTR)WndClass.lpszClassName; } else { - RtlInitUnicodeString(&ClassName, lpwcx->lpszClassName); + RtlInitUnicodeString(&ClassName, WndClass.lpszClassName); } return (ATOM)NtUserRegisterClassExWOW( @@ -715,7 +724,8 @@ &MenuName, NULL, 0, - 0); + 0, + hMenu); } /* _____ Modified: trunk/reactos/subsys/win32k/include/class.h --- trunk/reactos/subsys/win32k/include/class.h 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/include/class.h 2005-11-23 06:00:41 UTC (rev 19480) @@ -17,6 +17,7 @@ HICON hIcon; HCURSOR hCursor; HBRUSH hbrBackground; + HMENU hMenu; UNICODE_STRING lpszMenuName; RTL_ATOM Atom; HICON hIconSm; _____ Modified: trunk/reactos/subsys/win32k/ntuser/class.c --- trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/ntuser/class.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -69,6 +69,8 @@ ASSERT(Class->refs == 0); RemoveEntryList(&Class->ListEntry); + if (Class->hMenu) + UserDestroyMenu(Class->hMenu); RtlDeleteAtomFromAtomTable(gAtomTable, Class->Atom); ExFreePool(Class); } @@ -149,7 +151,8 @@ DWORD Flags, WNDPROC wpExtra, PUNICODE_STRING MenuName, - RTL_ATOM Atom) + RTL_ATOM Atom, + HMENU hMenu) { PWNDCLASS_OBJECT Class; ULONG objectSize; @@ -188,6 +191,7 @@ Class->hInstance = lpwcx->hInstance; Class->hIcon = lpwcx->hIcon; Class->hCursor = lpwcx->hCursor; + Class->hMenu = hMenu; Class->hbrBackground = lpwcx->hbrBackground; Class->Unicode = !(Flags & REGISTERCLASS_ANSI); Class->Global = Global; @@ -414,7 +418,8 @@ PUNICODE_STRING MenuName, WNDPROC wpExtra, DWORD Flags, - DWORD Unknown7) + DWORD Unknown7, + HMENU hMenu) /* * FUNCTION: @@ -495,7 +500,7 @@ RETURN(0); } - if (!IntRegisterClass(&SafeClass, Flags, wpExtra, MenuName, Atom)) + if (!IntRegisterClass(&SafeClass, Flags, wpExtra, MenuName, Atom, hMenu)) { if (ClassName->Length) { _____ Modified: trunk/reactos/subsys/win32k/ntuser/window.c --- trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/subsys/win32k/ntuser/window.c 2005-11-23 06:00:41 UTC (rev 19480) @@ -1462,6 +1462,10 @@ Window->IDMenu = 0; Window->Instance = hInstance; Window->hSelf = hWnd; + + if (!hMenu) + hMenu = Class->hMenu; + if (0 != (dwStyle & WS_CHILD)) { Window->IDMenu = (UINT) hMenu; _____ Modified: trunk/reactos/tools/nci/w32ksvc.db --- trunk/reactos/tools/nci/w32ksvc.db 2005-11-23 04:31:58 UTC (rev 19479) +++ trunk/reactos/tools/nci/w32ksvc.db 2005-11-23 06:00:41 UTC (rev 19480) @@ -458,7 +458,7 @@ NtUserReleaseDC 2 NtUserRealChildWindowFromPoint 3 NtUserRedrawWindow 4 -NtUserRegisterClassExWOW 7 +NtUserRegisterClassExWOW 8 NtUserRegisterHotKey 4 NtUserRegisterTasklist 1 NtUserRegisterWindowMessage 1

1 0

[ion] 19479: Fix msvc/gcc NDK problem
by ion＠svn.reactos.com 23 Nov '05

23 Nov '05

Fix msvc/gcc NDK problem Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/lib/rtl/rtlp.h Modified: trunk/reactos/w32api/include/ddk/winddk.h _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/include/ndk/rtltypes.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -112,7 +112,6 @@ #define TIME_ZONE_ID_UNKNOWN 0 #define TIME_ZONE_ID_STANDARD 1 #define TIME_ZONE_ID_DAYLIGHT 2 -#define TIME_ZONE_ID_INVALID 0xFFFFFFFF // // RTL Lock Type (Critical Section or Resource) @@ -669,7 +668,7 @@ typedef struct _EXCEPTION_REGISTRATION_RECORD { struct _EXCEPTION_REGISTRATION_RECORD *Next; - PEXCEPTION_HANDLER Handler; + PEXCEPTION_ROUTINE Handler; } EXCEPTION_REGISTRATION_RECORD, *PEXCEPTION_REGISTRATION_RECORD; // _____ Modified: trunk/reactos/lib/rtl/rtlp.h --- trunk/reactos/lib/rtl/rtlp.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/lib/rtl/rtlp.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -75,7 +75,7 @@ PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); EXCEPTION_DISPOSITION NTAPI @@ -83,7 +83,7 @@ PEXCEPTION_REGISTRATION_RECORD RegistrationFrame, PCONTEXT Context, PVOID DispatcherContext, - PEXCEPTION_HANDLER ExceptionHandler); + PEXCEPTION_ROUTINE ExceptionHandler); VOID NTAPI _____ Modified: trunk/reactos/w32api/include/ddk/winddk.h --- trunk/reactos/w32api/include/ddk/winddk.h 2005-11-23 03:54:11 UTC (rev 19478) +++ trunk/reactos/w32api/include/ddk/winddk.h 2005-11-23 04:31:58 UTC (rev 19479) @@ -553,6 +553,13 @@ IN PVOID MapRegisterBase, IN PVOID Context); +typedef EXCEPTION_DISPOSITION +(DDKAPI *PEXCEPTION_ROUTINE)( + IN struct _EXCEPTION_RECORD *ExceptionRecord, + IN PVOID EstablisherFrame, + IN OUT struct _CONTEXT *ContextRecord, + IN OUT PVOID DispatcherContext); + typedef VOID (DDKAPI *PDRIVER_LIST_CONTROL)( IN struct _DEVICE_OBJECT *DeviceObject,

1 0

[ion] 19478: move devices.h to a more appropriate location (approximately where it's located in the nt4 ddk)
by ion＠svn.reactos.com 23 Nov '05

23 Nov '05

move devices.h to a more appropriate location (approximately where it's located in the nt4 ddk) Added: trunk/reactos/drivers/dd/sound/include/ Added: trunk/reactos/drivers/dd/sound/include/devices.h Modified: trunk/reactos/drivers/dd/sound/sound.xml Deleted: trunk/reactos/include/devices.h _____ Copied: trunk/reactos/drivers/dd/sound/include/devices.h (from rev 19476, trunk/reactos/include/devices.h) _____ Modified: trunk/reactos/drivers/dd/sound/sound.xml --- trunk/reactos/drivers/dd/sound/sound.xml 2005-11-23 03:12:52 UTC (rev 19477) +++ trunk/reactos/drivers/dd/sound/sound.xml 2005-11-23 03:54:11 UTC (rev 19478) @@ -2,6 +2,7 @@ <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> + <include base="sound">.\include</include> <file>dsp.c</file> <file>mixer.c</file> <file>sb16.c</file> _____ Deleted: trunk/reactos/include/devices.h --- trunk/reactos/include/devices.h 2005-11-23 03:12:52 UTC (rev 19477) +++ trunk/reactos/include/devices.h 2005-11-23 03:54:11 UTC (rev 19478) @@ -1,16 +0,0 @@ -typedef struct -{ - LPSTR LeftVolumeName; - LPSTR RightVolumeName; - ULONG DefaultVolume; - ULONG Type; - ULONG DeviceType; - char Key[4]; - LPSTR PrototypeName; - PVOID DeferredRoutine; - PVOID ExclusionRoutine; - PVOID DispatchRoutine; - PVOID DevCapsRoutine; - PVOID HwSetVolume; - ULONG IoMethod; -}SOUND_DEVICE_INIT;

1 0

[chorns] 19477: Option to disable compilation units
by chorns＠svn.reactos.com 23 Nov '05

23 Nov '05

Option to disable compilation units Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp Modified: trunk/reactos/tools/rbuild/configuration.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/project.cpp Modified: trunk/reactos/tools/rbuild/rbuild.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -527,10 +527,13 @@ void MingwBackend::GenerateCompilationUnitSupportCode () { - printf ( "Generating compilation unit support code..." ); - CompilationUnitSupportCode compilationUnitSupportCode ( ProjectNode ); - compilationUnitSupportCode.Generate ( configuration.Verbose ); - printf ( "done\n" ); + if ( configuration.CompilationUnitsEnabled ) + { + printf ( "Generating compilation unit support code..." ); + CompilationUnitSupportCode compilationUnitSupportCode ( ProjectNode ); + compilationUnitSupportCode.Generate ( configuration.Verbose ); + printf ( "done\n" ); + } } string _____ Modified: trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp --- trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/compilationunitsupportcode.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -83,12 +83,12 @@ s = s + sprintf ( s, "/* This file is automatically generated. */\n" ); s = s + sprintf ( s, "#define ONE_COMPILATION_UNIT\n" ); if ( module.pch ) - s = s + sprintf ( s, "#include <%s>\n", NormalizeFilename ( module.pch->file.name ).c_str () ); + s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( module.pch->file.name, '\\', '/' ).c_str () ); for ( size_t i = 0; i < compilationUnit.files.size () ; i++ ) { File& file = *compilationUnit.files[i]; - s = s + sprintf ( s, "#include \"%s\"\n", file.name.c_str () ); + s = s + sprintf ( s, "#include <%s>\n", ChangeSeparator ( file.name, '\\', '/' ).c_str () ); } s = s + sprintf ( s, "\n" ); _____ Modified: trunk/reactos/tools/rbuild/configuration.cpp --- trunk/reactos/tools/rbuild/configuration.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/configuration.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -26,6 +26,7 @@ CleanAsYouGo = false; AutomaticDependencies = true; CheckDependenciesForModuleOnly = false; + CompilationUnitsEnabled = true; MakeHandlesInstallDirectories = false; GenerateProxyMakefilesInSourceTree = false; } _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/module.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -52,19 +52,27 @@ } string -FixSeparator ( const string& s ) +ChangeSeparator ( const string& s, + const char fromSeparator, + const char toSeparator ) { string s2(s); - char* p = strchr ( &s2[0], cBadSep ); + char* p = strchr ( &s2[0], fromSeparator ); while ( p ) { - *p++ = cSep; - p = strchr ( p, cBadSep ); + *p++ = toSeparator; + p = strchr ( p, fromSeparator ); } return s2; } string +FixSeparator ( const string& s ) +{ + return ChangeSeparator ( s, cBadSep, cSep ); +} + +string FixSeparatorForSystemCommand ( const string& s ) { string s2(s); @@ -627,12 +635,15 @@ } else if ( e.name == "compilationunit" ) { - CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); - if ( parseContext.ifData ) - parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); - else - non_if_data.compilationUnits.push_back ( pCompilationUnit ); - parseContext.compilationUnit = pCompilationUnit; + if ( project.configuration.CompilationUnitsEnabled ) + { + CompilationUnit* pCompilationUnit = new CompilationUnit ( &project, this, &e ); + if ( parseContext.ifData ) + parseContext.ifData->data.compilationUnits.push_back ( pCompilationUnit ); + else + non_if_data.compilationUnits.push_back ( pCompilationUnit ); + parseContext.compilationUnit = pCompilationUnit; + } subs_invalid = false; } if ( subs_invalid && e.subElements.size() > 0 ) _____ Modified: trunk/reactos/tools/rbuild/project.cpp --- trunk/reactos/tools/rbuild/project.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/project.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -81,11 +81,13 @@ } -Project::Project ( const string& filename ) +Project::Project ( const Configuration& configuration, + const string& filename ) : xmlfile (filename), node (NULL), - head (NULL) -{ + head (NULL), + configuration (configuration) +{ ReadXml(); } _____ Modified: trunk/reactos/tools/rbuild/rbuild.cpp --- trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/rbuild.cpp 2005-11-23 03:12:52 UTC (rev 19477) @@ -61,6 +61,22 @@ return true; } +bool +ParseCompilationUnitSwitch ( char switchChar2, + char* switchStart ) +{ + switch ( switchChar2 ) + { + case 'd': + configuration.CompilationUnitsEnabled = false; + break; + default: + printf ( "Unknown switch -u%c\n", + switchChar2 ); + return false; + } + return true; +} bool ParseVCProjectSwitch ( char switchChar2, @@ -148,6 +164,9 @@ case 'd': return ParseAutomaticDependencySwitch ( switchChar2, argv[index] ); + case 'u': + return ParseCompilationUnitSwitch ( switchChar2, + argv[index] ); case 'r': RootXmlFile = string(&argv[index][2]); break; @@ -196,9 +215,10 @@ printf ( " -v Be verbose.\n" ); printf ( " -c Clean as you go. Delete generated files as soon as they are not\n" ); printf ( " needed anymore.\n" ); + printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); printf ( " -dd Disable automatic dependencies.\n" ); printf ( " -dm{module} Check only automatic dependencies for this module.\n" ); - printf ( " -r{file.xml} Name of the root xml file. Default is ReactOS.xml.\n" ); + printf ( " -ud Disable multiple source files per compilation unit.\n" ); printf ( " -mi Let make handle creation of install directories. Rbuild will\n" ); printf ( " not generate the directories.\n" ); printf ( " -ps Generate proxy makefiles in source tree instead of the output.\n" ); @@ -215,7 +235,7 @@ { string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); - Project project ( projectFilename ); + Project project ( configuration, projectFilename ); printf ( "done\n" ); project.WriteConfigurationFile (); project.ExecuteInvocations (); _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-11-23 01:40:19 UTC (rev 19476) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-11-23 03:12:52 UTC (rev 19477) @@ -133,6 +133,7 @@ bool CleanAsYouGo; bool AutomaticDependencies; bool CheckDependenciesForModuleOnly; + bool CompilationUnitsEnabled; std::string CheckDependenciesForModuleOnlyModule; std::string VSProjectVersion; bool MakeHandlesInstallDirectories; @@ -189,6 +190,7 @@ std::string xmlfile; XMLElement *node, *head; public: + const Configuration& configuration; std::string name; std::string makefile; XMLIncludes xmlbuildfiles; @@ -198,7 +200,8 @@ std::vector<InstallFile*> installfiles; IfableData non_if_data; - Project ( const std::string& filename ); + Project ( const Configuration& configuration, + const std::string& filename ); ~Project (); void WriteConfigurationFile (); void ExecuteInvocations (); @@ -873,6 +876,11 @@ Replace ( const std::string& s, const std::string& find, const std::string& with ); extern std::string +ChangeSeparator ( const std::string& s, + const char fromSeparator, + const char toSeparator ); + +extern std::string FixSeparator ( const std::string& s ); extern std::string

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