Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[jimtabor] 16521: Implement MDICascade, MDITile and WIN_ListChildren. This will help Winefile cascade and tile windows. WIN_ListChildren is tmp located here in mdi.c for now.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement MDICascade, MDITile and WIN_ListChildren. This will help Winefile cascade and tile windows. WIN_ListChildren is tmp located here in mdi.c for now. Modified: trunk/reactos/lib/user32/windows/mdi.c _____ Modified: trunk/reactos/lib/user32/windows/mdi.c --- trunk/reactos/lib/user32/windows/mdi.c 2005-07-09 07:50:48 UTC (rev 16520) +++ trunk/reactos/lib/user32/windows/mdi.c 2005-07-09 08:54:43 UTC (rev 16521) @@ -143,6 +143,47 @@ static LRESULT WINAPI MDIClientWndProcA( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); static LRESULT WINAPI MDIClientWndProcW( HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam ); + +static +HWND* WIN_ListChildren (HWND hWndparent) +{ + + DWORD dwCount = 0; + HWND* pHwnd = NULL; + HANDLE hHeap; + + SetLastError(0); + + dwCount = NtUserBuildHwndList ( NULL, hWndparent, FALSE, 0, 0, NULL, 0 ); + + if ( !dwCount || GetLastError() ) + return FALSE; + + /* allocate buffer to receive HWND handles */ + hHeap = GetProcessHeap(); + + pHwnd = HeapAlloc ( hHeap, 0, sizeof(HWND)*(dwCount+1) ); + if ( !pHwnd ) + { + SetLastError ( ERROR_NOT_ENOUGH_MEMORY ); + return FALSE; + } + + /* now call kernel again to fill the buffer this time */ + dwCount = NtUserBuildHwndList (NULL, hWndparent, FALSE, 0, 0, pHwnd, dwCount ); + + if ( !dwCount || GetLastError() ) + { + if ( pHwnd ) + HeapFree ( hHeap, 0, pHwnd ); + return FALSE; + } + + return pHwnd; +} + + + #ifdef __REACTOS__ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam); void WINAPI CalcChildScroll(HWND hwnd, INT scroll); @@ -912,19 +953,20 @@ return hbCopy; } + + + /********************************************************************** * MDICascade */ static LONG MDICascade( HWND client, MDICLIENTINFO *ci ) { -#ifdef __REACTOS__ - /* FIXME */ - return 0; -#else HWND *win_array; BOOL has_icons = FALSE; int i, total; +DbgPrint("MDICascade\n"); + if (ci->hwndChildMaximized) SendMessageA( client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); @@ -968,7 +1010,6 @@ if (has_icons) ArrangeIconicWindows( client ); return 0; -#endif } /********************************************************************** @@ -976,14 +1017,12 @@ */ static void MDITile( HWND client, MDICLIENTINFO *ci, WPARAM wParam ) { -#ifdef __REACTOS__ - /* FIXME */ - return; -#else HWND *win_array; int i, total; BOOL has_icons = FALSE; +DbgPrint("MDITile\n"); + if (ci->hwndChildMaximized) SendMessageA( client, WM_MDIRESTORE, (WPARAM)ci->hwndChildMaximized, 0); @@ -1056,7 +1095,6 @@ } HeapFree( GetProcessHeap(), 0, win_array ); if (has_icons) ArrangeIconicWindows( client ); -#endif } /* ----------------------- Frame window ---------------------------- */

1 0

[chorns] 16520: Don't rebuild the module if a library is changed. Relinking the module is enough.
by chorns＠svn.reactos.com 09 Jul '05

09 Jul '05

Don't rebuild the module if a library is changed. Relinking the module is enough. 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/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-09 05:21:10 UTC (rev 16519) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-09 07:50:48 UTC (rev 16520) @@ -874,7 +874,9 @@ dependencies += " " + GetPrecompiledHeaderFilename (); /* WIDL generated headers may be used */ - dependencies += " " + GetLinkingDependenciesMacro (); + vector<string> rpcDependencies; + GetRpcHeaderDependencies ( rpcDependencies ); + dependencies += " " + v2s ( rpcDependencies, 5 ); dependencies += " " + NormalizeFilename ( module.xmlbuildFile ); string objectFilename = GetObjectFilename ( @@ -1598,7 +1600,7 @@ void MingwModuleHandler::GetRpcHeaderDependencies ( - string_list& dependencies ) const + vector<string>& dependencies ) const { for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) { @@ -1640,7 +1642,7 @@ module.non_if_data, &module.linkerFlags ); - string_list s; + vector<string> s; if ( module.importLibrary ) { const vector<File*>& files = module.non_if_data.files; @@ -1652,7 +1654,6 @@ GetSpecObjectDependencies ( s, file.name ); } } - GetRpcHeaderDependencies ( s ); if ( s.size () > 0 ) { fprintf ( _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-09 05:21:10 UTC (rev 16519) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.h 2005-07-09 07:50:48 UTC (rev 16520) @@ -179,7 +179,7 @@ void GenerateBuildMapCode (); void GenerateBuildNonSymbolStrippedCode (); void CleanupFileVector ( std::vector<File*>& sourceFiles ); - void GetRpcHeaderDependencies ( string_list& dependencies ) const; + void GetRpcHeaderDependencies ( std::vector<std::string>& dependencies ) const; std::string GetRpcServerHeaderFilename ( std::string basename ) const; std::string GetRpcClientHeaderFilename ( std::string basename ) const; public:

1 0

[jimtabor] 16519: Fix masking.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Fix masking. Modified: trunk/reactos/subsys/win32k/ntuser/input.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/input.c --- trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-09 04:54:01 UTC (rev 16518) +++ trunk/reactos/subsys/win32k/ntuser/input.c 2005-07-09 05:21:10 UTC (rev 16519) @@ -1059,14 +1059,14 @@ Msg.message = WM_XBUTTONUP; if(mi->mouseData & XBUTTON1) { - QueueKeyStateTable[VK_XBUTTON1] &= 0x80; + QueueKeyStateTable[VK_XBUTTON1] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON1); CurInfo->ButtonsDown &= ~XBUTTON1; MsqInsertSystemMessage(&Msg); } if(mi->mouseData & XBUTTON2) { - QueueKeyStateTable[VK_XBUTTON2] &= 0x80; + QueueKeyStateTable[VK_XBUTTON2] &= ~0x80; Msg.wParam = MAKEWPARAM(CurInfo->ButtonsDown, XBUTTON2); CurInfo->ButtonsDown &= ~XBUTTON2; MsqInsertSystemMessage(&Msg);

1 0

[jimtabor] 16518: Kill debug print out.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Kill debug print out. Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-09 04:23:34 UTC (rev 16517) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-09 04:54:01 UTC (rev 16518) @@ -653,7 +653,7 @@ case HWNDLOCK_ROUTINE_DRAWMENUBAR: { PMENU_OBJECT MenuObject; - DPRINT1("HWNDLOCK_ROUTINE_DRAWMENUBAR\n"); + DPRINT("HWNDLOCK_ROUTINE_DRAWMENUBAR\n"); Ret = FALSE; if (!((Window->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) break; MenuObject = IntGetMenuObject((HMENU) Window->IDMenu);

1 0

[jimtabor] 16517: Implement ModifyMenu A & W.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement ModifyMenu A & W. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:19:35 UTC (rev 16516) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:23:34 UTC (rev 16517) @@ -4300,7 +4300,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -4311,13 +4311,93 @@ UINT_PTR uIDNewItem, LPCSTR lpNewItem) { + MENUITEMINFOA mii; + mii.cbSize = sizeof(MENUITEMINFOA); + mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; + mii.fType = 0; + mii.fState = MFS_ENABLED; + UNIMPLEMENTED; - return FALSE; + + if(!GetMenuItemInfoA( hMnu, + uPosition, + (BOOL)!(MF_BYPOSITION & uFlags), + &mii)) return FALSE; + + if(uFlags & MF_BITMAP) + { + mii.fType |= MFT_BITMAP; + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = (HBITMAP) lpNewItem; + } + else if(uFlags & MF_OWNERDRAW) + { + mii.fType |= MFT_OWNERDRAW; + mii.fMask |= MIIM_DATA; + mii.dwItemData = (DWORD) lpNewItem; + } + else /* Default action MF_STRING. */ + { + if(mii.dwTypeData != NULL) + { + HeapFree(GetProcessHeap(),0, mii.dwTypeData); + } + /* Item beginning with a backspace is a help item */ + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } + mii.fMask |= MIIM_TYPE; + mii.dwTypeData = (LPSTR)lpNewItem; + mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); + } + + if(uFlags & MF_RIGHTJUSTIFY) + { + mii.fType |= MFT_RIGHTJUSTIFY; + } + if(uFlags & MF_MENUBREAK) + { + mii.fType |= MFT_MENUBREAK; + } + if(uFlags & MF_MENUBARBREAK) + { + mii.fType |= MFT_MENUBARBREAK; + } + if(uFlags & MF_DISABLED) + { + mii.fState |= MFS_DISABLED; + } + if(uFlags & MF_GRAYED) + { + mii.fState |= MFS_GRAYED; + } + + if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( mii.hSubMenu ); /* ModifyMenu() spec */ + + if(uFlags & MF_POPUP) + { + mii.fType |= MF_POPUP; + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = (HMENU)uIDNewItem; + } + else + { + mii.fMask |= MIIM_ID; + mii.wID = (UINT)uIDNewItem; + } + + return SetMenuItemInfoA( hMnu, + uPosition, + (BOOL)!(MF_BYPOSITION & uFlags), + &mii); } /* - * @unimplemented + * @implemented */ BOOL STDCALL @@ -4328,8 +4408,88 @@ UINT_PTR uIDNewItem, LPCWSTR lpNewItem) { + MENUITEMINFOW mii; + mii.cbSize = sizeof(MENUITEMINFOW); + mii.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE; + mii.fType = 0; + mii.fState = MFS_ENABLED; + UNIMPLEMENTED; - return FALSE; + + if(!NtUserMenuItemInfo( hMnu, + uPosition, + (BOOL)!(MF_BYPOSITION & uFlags), + (PROSMENUITEMINFO) &mii, + FALSE)) return FALSE; + + if(uFlags & MF_BITMAP) + { + mii.fType |= MFT_BITMAP; + mii.fMask |= MIIM_BITMAP; + mii.hbmpItem = (HBITMAP) lpNewItem; + } + else if(uFlags & MF_OWNERDRAW) + { + mii.fType |= MFT_OWNERDRAW; + mii.fMask |= MIIM_DATA; + mii.dwItemData = (DWORD) lpNewItem; + } + else + { + if(mii.dwTypeData != NULL) + { + HeapFree(GetProcessHeap(),0, mii.dwTypeData); + } + if (*lpNewItem == '\b') + { + mii.fType |= MF_HELP; + lpNewItem++; + } + mii.fMask |= MIIM_TYPE; + mii.dwTypeData = (LPWSTR)lpNewItem; + mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); + } + + if(uFlags & MF_RIGHTJUSTIFY) + { + mii.fType |= MFT_RIGHTJUSTIFY; + } + if(uFlags & MF_MENUBREAK) + { + mii.fType |= MFT_MENUBREAK; + } + if(uFlags & MF_MENUBARBREAK) + { + mii.fType |= MFT_MENUBARBREAK; + } + if(uFlags & MF_DISABLED) + { + mii.fState |= MFS_DISABLED; + } + if(uFlags & MF_GRAYED) + { + mii.fState |= MFS_GRAYED; + } + + if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem)) + NtUserDestroyMenu( mii.hSubMenu ); + + if(uFlags & MF_POPUP) + { + mii.fType |= MF_POPUP; + mii.fMask |= MIIM_SUBMENU; + mii.hSubMenu = (HMENU)uIDNewItem; + } + else + { + mii.fMask |= MIIM_ID; + mii.wID = (UINT)uIDNewItem; + } + + return SetMenuItemInfoW( hMnu, + uPosition, + (BOOL)!(MF_BYPOSITION & uFlags), + &mii); }

1 0

[jimtabor] 16516: Implement GetMenuString A & W. Not fully tested.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement GetMenuString A & W. Not fully tested. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:15:44 UTC (rev 16515) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:19:35 UTC (rev 16516) @@ -3850,7 +3850,7 @@ /* - * @unimplemented + * @implemented */ int STDCALL @@ -3861,13 +3861,22 @@ int nMaxCount, UINT uFlag) { + MENUITEMINFOA mii; + mii.dwTypeData = lpString; + mii.fMask = MIIM_STRING; + mii.cbSize = sizeof(MENUITEMINFOA); + mii.cch = nMaxCount; + UNIMPLEMENTED; - return 0; + if(!(GetMenuItemInfoA( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&mii))) + return 0; + else + return mii.cch; } /* - * @unimplemented + * @implemented */ int STDCALL @@ -3878,8 +3887,17 @@ int nMaxCount, UINT uFlag) { + MENUITEMINFOW miiW; + miiW.dwTypeData = lpString; + miiW.fMask = MIIM_STRING; + miiW.cbSize = sizeof(MENUITEMINFOW); + miiW.cch = nMaxCount; + UNIMPLEMENTED; - return 0; + if(!(GetMenuItemInfoW( hMenu, uIDItem, (BOOL)!(MF_BYPOSITION & uFlag),&miiW))) + return 0; + else + return miiW.cch; }

1 0

[jimtabor] 16515: Implement CheckMenuRadioItem. Not fully tested.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement CheckMenuRadioItem. Not fully tested. Modified: trunk/reactos/lib/user32/windows/menu.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:11:36 UTC (rev 16514) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:15:44 UTC (rev 16515) @@ -3475,7 +3475,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL CheckMenuRadioItem(HMENU hmenu, @@ -3484,8 +3484,43 @@ UINT idCheck, UINT uFlags) { + ROSMENUINFO mi; + PROSMENUITEMINFO Items; + int i; + BOOL ret = FALSE; + + mi.cbSize = sizeof(MENUINFO); + UNIMPLEMENTED; - return FALSE; + + if(idFirst > idLast) return ret; + + if(!NtUserMenuInfo(hmenu, &mi, FALSE)) return ret; + + if(MenuGetAllRosMenuItemInfo(mi.Self, &Items) <= 0) return ret; + + for (i = 0 ; i < mi.MenuItemCount; i++) + { + if (0 != (Items[i].fType & MF_MENUBARBREAK)) break; + if ( i >= idFirst && i <= idLast ) + { + if ( i == idCheck) + { + Items[i].fType |= MFT_RADIOCHECK; + Items[i].fState |= MFS_CHECKED; + } + else + { + Items[i].fType &= ~MFT_RADIOCHECK; + Items[i].fState &= ~MFS_CHECKED; + } + if(!MenuSetRosMenuItemInfo(mi.Self, i ,&Items[i])) + break; + } + if ( i == mi.MenuItemCount) ret = TRUE; + } + MenuCleanupRosMenuItemInfo(Items); + return ret; }

1 0

[jimtabor] 16514: Implement DrawMenuBar.
by jimtabor＠svn.reactos.com 09 Jul '05

09 Jul '05

Implement DrawMenuBar. Modified: trunk/reactos/lib/user32/windows/menu.c Modified: trunk/reactos/subsys/win32k/ntuser/misc.c _____ Modified: trunk/reactos/lib/user32/windows/menu.c --- trunk/reactos/lib/user32/windows/menu.c 2005-07-08 19:55:30 UTC (rev 16513) +++ trunk/reactos/lib/user32/windows/menu.c 2005-07-09 04:11:36 UTC (rev 16514) @@ -3534,14 +3534,12 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL DrawMenuBar(HWND hWnd) { - UNIMPLEMENTED - /* FIXME - return NtUserCallHwndLock(hWnd, 0x55); */ - return FALSE; + return (BOOL)NtUserCallHwndLock(hWnd, HWNDLOCK_ROUTINE_DRAWMENUBAR); } _____ Modified: trunk/reactos/subsys/win32k/ntuser/misc.c --- trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-08 19:55:30 UTC (rev 16513) +++ trunk/reactos/subsys/win32k/ntuser/misc.c 2005-07-09 04:11:36 UTC (rev 16514) @@ -651,8 +651,21 @@ break; case HWNDLOCK_ROUTINE_DRAWMENUBAR: - /* FIXME */ - break; + { + PMENU_OBJECT MenuObject; + DPRINT1("HWNDLOCK_ROUTINE_DRAWMENUBAR\n"); + Ret = FALSE; + if (!((Window->Style & (WS_CHILD | WS_POPUP)) != WS_CHILD)) break; + MenuObject = IntGetMenuObject((HMENU) Window->IDMenu); + if(MenuObject == NULL) break; + MenuObject->MenuInfo.WndOwner = hWnd; + MenuObject->MenuInfo.Height = 0; + IntReleaseMenuObject(MenuObject); + WinPosSetWindowPos(hWnd, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | + SWP_NOACTIVATE | SWP_NOZORDER | SWP_FRAMECHANGED ); + Ret = TRUE; + break; + } case HWNDLOCK_ROUTINE_REDRAWFRAME: /* FIXME */

1 0

[chorns] 16513: Check automatic dependencies of referenced object library modules on make <module>_depends
by chorns＠svn.reactos.com 08 Jul '05

08 Jul '05

Check automatic dependencies of referenced object library modules on make <module>_depends Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp Modified: trunk/reactos/tools/rbuild/module.cpp Modified: trunk/reactos/tools/rbuild/rbuild.h _____ Modified: trunk/reactos/tools/rbuild/automaticdependency.cpp --- trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-07-08 19:51:37 UTC (rev 16512) +++ trunk/reactos/tools/rbuild/automaticdependency.cpp 2005-07-08 19:55:30 UTC (rev 16513) @@ -11,7 +11,7 @@ using std::map; SourceFile::SourceFile ( AutomaticDependency* automaticDependency, - Module& module, + const Module& module, const string& filename, SourceFile* parent, bool isNonAutomaticDependency ) @@ -294,7 +294,7 @@ } void -AutomaticDependency::GetModuleFiles ( Module& module, +AutomaticDependency::GetModuleFiles ( const Module& module, vector<File*>& files ) const { for ( size_t i = 0; i < module.non_if_data.files.size (); i++ ) @@ -307,7 +307,7 @@ } void -AutomaticDependency::ParseFiles ( Module& module ) +AutomaticDependency::ParseFiles ( const Module& module ) { vector<File*> files; GetModuleFiles ( module, files ); @@ -316,7 +316,7 @@ } void -AutomaticDependency::ParseFile ( Module& module, +AutomaticDependency::ParseFile ( const Module& module, const File& file ) { string normalizedFilename = NormalizeFilename ( file.name ); @@ -355,7 +355,7 @@ void AutomaticDependency::GetIncludeDirectories ( vector<Include*>& includes, - Module& module, + const Module& module, Include& currentDirectory, bool searchCurrentDirectory ) { @@ -369,7 +369,7 @@ bool AutomaticDependency::LocateIncludedFile ( SourceFile* sourceFile, - Module& module, + const Module& module, const string& includedFilename, bool searchCurrentDirectory, bool includeNext, @@ -396,9 +396,9 @@ } SourceFile* -AutomaticDependency::RetrieveFromCacheOrParse ( Module& module, - const string& filename, - SourceFile* parentSourceFile ) +AutomaticDependency::RetrieveFromCacheOrParse ( const Module& module, + const string& filename, + SourceFile* parentSourceFile ) { SourceFile* sourceFile = sourcefile_map[filename]; if ( sourceFile == NULL ) @@ -429,25 +429,41 @@ for ( size_t mi = 0; mi < project.modules.size (); mi++ ) { Module& module = *project.modules[mi]; - CheckAutomaticDependencies ( module, verbose, false ); + CheckAutomaticDependencies ( module, verbose ); } } void -AutomaticDependency::CheckAutomaticDependencies ( Module& module, - bool verbose ) +AutomaticDependency::GetModulesToCheck ( Module& module, vector<const Module*>& modules ) { - CheckAutomaticDependencies ( module, verbose, true ); + modules.push_back ( &module ); + for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) + { + Library& library = *module.non_if_data.libraries[i]; + if ( library.importedModule->type != ObjectLibrary ) + break; + modules.push_back ( library.importedModule ); + } + + /* FIXME: Collect libraries in IFs here */ } void -AutomaticDependency::CheckAutomaticDependencies ( Module& module, - bool verbose, - bool parseFiles ) +AutomaticDependency::CheckAutomaticDependenciesForModule ( Module& module, + bool verbose ) { - if ( parseFiles ) - ParseFiles ( module ); + vector<const Module*> modules; + GetModulesToCheck ( module, modules ); + for ( size_t mi = 0; mi < modules.size (); mi++ ) + ParseFiles ( *modules[mi] ); + for ( size_t mi = 0; mi < modules.size (); mi++ ) + CheckAutomaticDependencies ( *modules[mi], verbose ); +} +void +AutomaticDependency::CheckAutomaticDependencies ( const Module& module, + bool verbose ) +{ struct utimbuf timebuf; vector<File*> files; GetModuleFiles ( module, files ); _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-08 19:51:37 UTC (rev 16512) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp 2005-07-08 19:55:30 UTC (rev 16513) @@ -325,8 +325,8 @@ printf ( "Checking automatic dependencies for module '%s'...", module->name.c_str () ); AutomaticDependency automaticDependency ( ProjectNode ); - automaticDependency.CheckAutomaticDependencies ( *module, - configuration.Verbose ); + automaticDependency.CheckAutomaticDependenciesForModule ( *module, + configuration.Verbose ); printf ( "done\n" ); } } _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-08 19:51:37 UTC (rev 16512) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp 2005-07-08 19:55:30 UTC (rev 16513) @@ -615,7 +615,7 @@ dependencies += " \\\n\t\t", wrap_count = 0; else if ( dependencies.size () > 0 ) dependencies += " "; - dependencies += GetImportLibraryDependency ( *libraries[i]->imported_module ); + dependencies += GetImportLibraryDependency ( *libraries[i]->importedModule ); } return dependencies; } @@ -1274,7 +1274,7 @@ void MergeStringVector ( const vector<string>& input, - vector<string>& output ) + vector<string>& output ) { int wrap_at = 25; string s; @@ -1603,20 +1603,20 @@ for ( size_t i = 0; i < module.non_if_data.libraries.size (); i++ ) { Library& library = *module.non_if_data.libraries[i]; - if ( library.imported_module->type == RpcServer || - library.imported_module->type == RpcClient ) + if ( library.importedModule->type == RpcServer || + library.importedModule->type == RpcClient ) { - for ( size_t j = 0; j < library.imported_module->non_if_data.files.size (); j++ ) + for ( size_t j = 0; j < library.importedModule->non_if_data.files.size (); j++ ) { - File& file = *library.imported_module->non_if_data.files[j]; + File& file = *library.importedModule->non_if_data.files[j]; string extension = GetExtension ( file.name ); if ( extension == ".idl" || extension == ".IDL" ) { string basename = GetBasename ( file.name ); - if ( library.imported_module->type == RpcServer ) + if ( library.importedModule->type == RpcServer ) dependencies.push_back ( GetRpcServerHeaderFilename ( basename ) ); - if ( library.imported_module->type == RpcClient ) + if ( library.importedModule->type == RpcClient ) dependencies.push_back ( GetRpcClientHeaderFilename ( basename ) ); } } _____ Modified: trunk/reactos/tools/rbuild/module.cpp --- trunk/reactos/tools/rbuild/module.cpp 2005-07-08 19:51:37 UTC (rev 16512) +++ trunk/reactos/tools/rbuild/module.cpp 2005-07-08 19:55:30 UTC (rev 16513) @@ -817,14 +817,14 @@ : node(_node), module(_module), name(_name), - imported_module(_module.project.LocateModule(_name)) + importedModule(_module.project.LocateModule(_name)) { if ( module.name == name ) throw InvalidBuildFileException ( node.location, "module '%s' cannot link against itself", name.c_str() ); - if ( !imported_module ) + if ( !importedModule ) throw InvalidBuildFileException ( node.location, "module '%s' trying to import non-existant module '%s'", _____ Modified: trunk/reactos/tools/rbuild/rbuild.h --- trunk/reactos/tools/rbuild/rbuild.h 2005-07-08 19:51:37 UTC (rev 16512) +++ trunk/reactos/tools/rbuild/rbuild.h 2005-07-08 19:55:30 UTC (rev 16513) @@ -316,7 +316,7 @@ const XMLElement& node; const Module& module; std::string name; - const Module* imported_module; + const Module* importedModule; Library ( const XMLElement& _node, const Module& _module, @@ -533,7 +533,7 @@ { public: SourceFile ( AutomaticDependency* automaticDependency, - Module& module, + const Module& module, const std::string& filename, SourceFile* parent, bool isNonAutomaticDependency ); @@ -542,7 +542,7 @@ std::string Location () const; std::vector<SourceFile*> files; AutomaticDependency* automaticDependency; - Module& module; + const Module& module; std::string filename; std::string filenamePart; std::string directoryPart; @@ -584,32 +584,32 @@ const std::string& includedFilename, std::string& resolvedFilename ); bool LocateIncludedFile ( SourceFile* sourceFile, - Module& module, + const Module& module, const std::string& includedFilename, bool searchCurrentDirectory, bool includeNext, std::string& resolvedFilename ); - SourceFile* RetrieveFromCacheOrParse ( Module& module, + SourceFile* RetrieveFromCacheOrParse ( const Module& module, const std::string& filename, SourceFile* parentSourceFile ); SourceFile* RetrieveFromCache ( const std::string& filename ); void CheckAutomaticDependencies ( bool verbose ); - void CheckAutomaticDependencies ( Module& module, - bool verbose ); - void CheckAutomaticDependencies ( Module& module, - bool verbose, - bool parseFiles ); + void CheckAutomaticDependenciesForModule ( Module& module, + bool verbose ); +private: + void GetModulesToCheck ( Module& module, std::vector<const Module*>& modules ); + void CheckAutomaticDependencies ( const Module& module, + bool verbose ); void CheckAutomaticDependenciesForFile ( SourceFile* sourceFile ); -private: void GetIncludeDirectories ( std::vector<Include*>& includes, - Module& module, + const Module& module, Include& currentDirectory, bool searchCurrentDirectory ); - void GetModuleFiles ( Module& module, + void GetModuleFiles ( const Module& module, std::vector<File*>& files ) const; void ParseFiles (); - void ParseFiles ( Module& module ); - void ParseFile ( Module& module, + void ParseFiles ( const Module& module ); + void ParseFile ( const Module& module, const File& file ); std::map<std::string, SourceFile*> sourcefile_map; };

1 0

[weiden] 16512: Fixed enumerating the drive strings in SetupCreateDiskSpaceListW
by weiden＠svn.reactos.com 08 Jul '05

08 Jul '05

Fixed enumerating the drive strings in SetupCreateDiskSpaceListW Modified: trunk/reactos/lib/setupapi/diskspace.c _____ Modified: trunk/reactos/lib/setupapi/diskspace.c --- trunk/reactos/lib/setupapi/diskspace.c 2005-07-08 19:21:28 UTC (rev 16511) +++ trunk/reactos/lib/setupapi/diskspace.c 2005-07-08 19:51:37 UTC (rev 16512) @@ -67,7 +67,6 @@ while (*ptr) { DWORD type = GetDriveTypeW(ptr); - DWORD len; if (type == DRIVE_FIXED) { DWORD clusters; @@ -81,9 +80,7 @@ list->Drives[list->dwDriveCount].dwWantedSpace = 0; list->dwDriveCount++; } - len = lstrlenW(ptr); - len++; - ptr+=sizeof(WCHAR)*len; + ptr += lstrlenW(ptr) + 1; } return (HANDLE)list; }

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
57
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2005