Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[arty] 25424: Zero other BSS type sections where applicable.

by arty＠svn.reactos.org

Author: arty Date: Thu Jan 11 12:00:30 2007 New Revision: 25424 URL: http://svn.reactos.org/svn/reactos?rev=25424&view=rev Log: Zero other BSS type sections where applicable. Modified: branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp Modified: branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp Thu Jan 11 12:00:30 2007 @@ -429,7 +429,7 @@ seg->winFlags ^= WINF_NEG_FLAGS; seg->datmask.resize(roundup(seg->length,8)/8); seg->data.resize(roundup(seg->length,8)); - if(seg->name == ".bss") + if(elf32shdr[i].sh_type == SHT_NOBITS) { memset(&seg->datmask[0], 0, seg->datmask.size()); memset(&seg->data[0], 0, seg->data.size());

17 years, 11 months

[tkreuzer] 25423: - Make IntSystemParametersInfo send a WM_SETTINGCHANGE message when needed. - Some code cleanup

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 11 02:55:53 2007 New Revision: 25423 URL: http://svn.reactos.org/svn/reactos?rev=25423&view=rev Log: - Make IntSystemParametersInfo send a WM_SETTINGCHANGE message when needed. - Some code cleanup Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Thu Jan 11 02:55:53 2007 @@ -909,6 +909,7 @@ { PWINSTATION_OBJECT WinStaObject; NTSTATUS Status; + BOOL bChanged = FALSE; static BOOL bInitialized = FALSE; static LOGFONTW IconFont; @@ -956,16 +957,18 @@ case SPI_SETDOUBLECLKHEIGHT: case SPI_SETDOUBLECLICKTIME: case SPI_SETDESKWALLPAPER: + case SPI_SETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVETIMEOUT: + case SPI_SETFLATMENU: + /* We will change something, so set the flag here */ + bChanged = TRUE; case SPI_GETDESKWALLPAPER: case SPI_GETWHEELSCROLLLINES: case SPI_GETWHEELSCROLLCHARS: - case SPI_SETSCREENSAVERRUNNING: case SPI_GETSCREENSAVERRUNNING: case SPI_GETSCREENSAVETIMEOUT: - case SPI_SETSCREENSAVETIMEOUT: case SPI_GETSCREENSAVEACTIVE: case SPI_GETFLATMENU: - case SPI_SETFLATMENU: { PSYSTEM_CURSORINFO CurInfo; @@ -982,43 +985,42 @@ switch(uiAction) { case SPI_GETFLATMENU: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->FlatMenu; - return TRUE; + ASSERT(pvParam); + *((UINT*)pvParam) = WinStaObject->FlatMenu; break; - case SPI_SETFLATMENU: - WinStaObject->FlatMenu = uiParam; + case SPI_SETFLATMENU: + WinStaObject->FlatMenu = uiParam; break; case SPI_GETSCREENSAVETIMEOUT: - if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; - return TRUE; - break; - case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; + ASSERT(pvParam); + *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; + break; + case SPI_SETSCREENSAVETIMEOUT: + WinStaObject->ScreenSaverTimeOut = uiParam; break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - return TRUE; break; - case SPI_SETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - WinStaObject->ScreenSaverRunning = uiParam; + WinStaObject->ScreenSaverRunning = uiParam; break; case SPI_GETSCREENSAVEACTIVE: /* FIXME: how to disable the screensaver? */ - if (pvParam != NULL) *((BOOL*)pvParam) = TRUE; - return TRUE; + ASSERT(pvParam); + *((BOOL*)pvParam) = TRUE; break; case SPI_GETWHEELSCROLLLINES: + ASSERT(pvParam); CurInfo = IntGetSysCursorInfo(WinStaObject); - if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroLines; + *((UINT*)pvParam) = CurInfo->WheelScroLines; /* FIXME add this value to scroll list as scroll value ?? */ - return TRUE; break; case SPI_GETWHEELSCROLLCHARS: + ASSERT(pvParam); CurInfo = IntGetSysCursorInfo(WinStaObject); - if (pvParam != NULL) *((UINT*)pvParam) = CurInfo->WheelScroChars; + *((UINT*)pvParam) = CurInfo->WheelScroChars; // FIXME add this value to scroll list as scroll value ?? - return TRUE; break; case SPI_SETDOUBLECLKWIDTH: CurInfo = IntGetSysCursorInfo(WinStaObject); @@ -1125,7 +1127,7 @@ if(!KeyValuePartialInfo) { NtClose(KeyHandle); - return 0; + return FALSE; } Status = ZwQueryValueKey(KeyHandle, &Tile, KeyValuePartialInformation, @@ -1134,7 +1136,7 @@ { ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); - return 0; + return FALSE; } Tile.Length = KeyValuePartialInfo->DataLength; @@ -1160,7 +1162,7 @@ if(!KeyValuePartialInfo) { ZwClose(KeyHandle); - return 0; + return FALSE; } Status = ZwQueryValueKey(KeyHandle, &Style, KeyValuePartialInformation, @@ -1169,7 +1171,7 @@ { ZwClose(KeyHandle); ExFreePool(KeyValuePartialInfo); - return 0; + return FALSE; } Style.Length = KeyValuePartialInfo->DataLength; @@ -1210,7 +1212,7 @@ /* FIXME save the value to the registry */ ObDereferenceObject(WinStaObject); - return TRUE; + break; } case SPI_SETWORKAREA: { @@ -1226,8 +1228,9 @@ ASSERT(pvParam); rc = (RECT*)pvParam; Desktop->WorkArea = *rc; - - return TRUE; + bChanged = TRUE; + + break; } case SPI_GETWORKAREA: { @@ -1242,13 +1245,14 @@ ASSERT(pvParam); IntGetDesktopWorkArea(Desktop, (PRECT)pvParam); - return TRUE; + break; } case SPI_SETGRADIENTCAPTIONS: { GradientCaptions = (pvParam != NULL); /* FIXME - should be checked if the color depth is higher than 8bpp? */ - return TRUE; + bChanged = TRUE; + break; } case SPI_GETGRADIENTCAPTIONS: { @@ -1256,78 +1260,83 @@ BOOL Ret = GradientCaptions; hDC = IntGetScreenDC(); - if(hDC) - { - Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret; - - ASSERT(pvParam); - *((PBOOL)pvParam) = Ret; - return TRUE; - } - return FALSE; + if(!hDC) + { + return FALSE; + } + Ret = (NtGdiGetDeviceCaps(hDC, BITSPIXEL) > 8) && Ret; + + ASSERT(pvParam); + *((PBOOL)pvParam) = Ret; + break; } case SPI_SETFONTSMOOTHING: { IntEnableFontRendering(uiParam != 0); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETFONTSMOOTHING: { ASSERT(pvParam); *((BOOL*)pvParam) = IntIsFontRenderingEnabled(); - return TRUE; + break; } case SPI_GETICONTITLELOGFONT: { ASSERT(pvParam); *((LOGFONTW*)pvParam) = IconFont; - return TRUE; + break; } case SPI_GETNONCLIENTMETRICS: { ASSERT(pvParam); *((NONCLIENTMETRICSW*)pvParam) = pMetrics; - return TRUE; + break; } case SPI_SETNONCLIENTMETRICS: { ASSERT(pvParam); pMetrics = *((NONCLIENTMETRICSW*)pvParam); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETMINIMIZEDMETRICS: { ASSERT(pvParam); *((MINIMIZEDMETRICS*)pvParam) = MinimizedMetrics; - return TRUE; + break; } case SPI_SETMINIMIZEDMETRICS: { ASSERT(pvParam); MinimizedMetrics = *((MINIMIZEDMETRICS*)pvParam); - return TRUE; + bChanged = TRUE; + break; } case SPI_GETFOCUSBORDERHEIGHT: { ASSERT(pvParam); *((UINT*)pvParam) = FocusBorderHeight; - return TRUE; + break; } case SPI_GETFOCUSBORDERWIDTH: { ASSERT(pvParam); *((UINT*)pvParam) = FocusBorderWidth; - return TRUE; + break; } case SPI_SETFOCUSBORDERHEIGHT: { FocusBorderHeight = (UINT)pvParam; - return TRUE; + bChanged = TRUE; + break; } case SPI_SETFOCUSBORDERWIDTH: { FocusBorderWidth = (UINT)pvParam; - return TRUE; + bChanged = TRUE; + break; } default: @@ -1337,7 +1346,18 @@ return FALSE; } } - return FALSE; + /* Did we change something ? */ + if (bChanged) + { + /* Shall we send a WM_SETTINGCHANGE message ? */ + if (fWinIni & (SPIF_UPDATEINIFILE | SPIF_SENDCHANGE)) + { + /* Broadcast WM_SETTINGCHANGE to all toplevel windows */ + /* FIXME: lParam should be pointer to a string containing the reg key */ + UserPostMessage(HWND_BROADCAST, WM_SETTINGCHANGE, (WPARAM)uiAction, 0); + } + } + return TRUE; } /* @@ -1396,14 +1416,14 @@ case SPI_GETGRADIENTCAPTIONS: case SPI_GETFOCUSBORDERHEIGHT: case SPI_GETFOCUSBORDERWIDTH: - case SPI_GETWHEELSCROLLLINES: + case SPI_GETWHEELSCROLLLINES: case SPI_GETWHEELSCROLLCHARS: - case SPI_GETSCREENSAVERRUNNING: - case SPI_SETSCREENSAVERRUNNING: - case SPI_GETSCREENSAVETIMEOUT: - case SPI_SETSCREENSAVETIMEOUT: - case SPI_GETSCREENSAVEACTIVE: - case SPI_GETFLATMENU: + case SPI_GETSCREENSAVERRUNNING: + case SPI_SETSCREENSAVERRUNNING: + case SPI_GETSCREENSAVETIMEOUT: + case SPI_SETSCREENSAVETIMEOUT: + case SPI_GETSCREENSAVEACTIVE: + case SPI_GETFLATMENU: case SPI_SETFLATMENU: { BOOL Ret; @@ -1529,10 +1549,10 @@ return( TRUE); } default : - { - DPRINT1("FIXME: UNIMPLEMENTED SPI Code: %lx \n",uiAction ); - break; - } + { + DPRINT1("FIXME: UNIMPLEMENTED SPI Code: %lx \n",uiAction ); + break; + } } return( FALSE); }

17 years, 11 months

[tkreuzer] 25422: Don't remove keyboard focus from any other window than the one that was disabled.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 11 02:48:02 2007 New Revision: 25422 URL: http://svn.reactos.org/svn/reactos?rev=25422&view=rev Log: Don't remove keyboard focus from any other window than the one that was disabled. Modified: trunk/reactos/dll/win32/user32/windows/input.c Modified: trunk/reactos/dll/win32/user32/windows/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/input.c (original) +++ trunk/reactos/dll/win32/user32/windows/input.c Thu Jan 11 02:48:02 2007 @@ -347,9 +347,12 @@ } else { - /* Remove keyboard focus from that window */ - SetFocus(NULL); Style |= WS_DISABLED; + /* Remove keyboard focus from that window if it had focus */ + if (hWnd == GetFocus()) + { + SetFocus(NULL); + } } NtUserSetWindowLong(hWnd, GWL_STYLE, Style, FALSE);

17 years, 11 months

[weiden] 25421: Fix warnings

by weiden＠svn.reactos.org

Author: weiden Date: Thu Jan 11 01:52:07 2007 New Revision: 25421 URL: http://svn.reactos.org/svn/reactos?rev=25421&view=rev Log: Fix warnings Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c trunk/reactos/ntoskrnl/include/internal/ob_x.h trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/obname.c Modified: trunk/reactos/ntoskrnl/fsrtl/largemcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/largemcb.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/largemcb.c (original) +++ trunk/reactos/ntoskrnl/fsrtl/largemcb.c Thu Jan 11 01:52:07 2007 @@ -58,6 +58,9 @@ OUT PLONGLONG SectorCount) { KEBUGCHECK(0); + *Vbn = 0; + *Lbn = 0; + *SectorCount= 0; return FALSE; } @@ -132,6 +135,8 @@ OUT PULONG Index OPTIONAL) { KEBUGCHECK(0); + *Lbn = 0; + *SectorCountFromLbn = 0; return FALSE; } @@ -146,6 +151,9 @@ OUT PULONG Index) { KEBUGCHECK(0); + *LargeVbn = 0; + *LargeLbn = 0; + *Index = 0; return FALSE; } @@ -172,8 +180,8 @@ OUT PLBN Lbn) { BOOLEAN Return = FALSE; - LONGLONG llVbn; - LONGLONG llLbn; + LONGLONG llVbn = 0; + LONGLONG llLbn = 0; /* Call the Large version */ Return = FsRtlLookupLastLargeMcbEntry( Modified: trunk/reactos/ntoskrnl/include/internal/ob_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ob_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ob_x.h Thu Jan 11 01:52:07 2007 @@ -27,7 +27,7 @@ while ((NewValue != 0) && (References = NewValue)) { /* Increment the number of references */ - if (InterlockedCompareExchange(&ObjectNameInfo->QueryReferences, + if (InterlockedCompareExchange((PLONG)&ObjectNameInfo->QueryReferences, NewValue + 1, NewValue) == References) { @@ -56,7 +56,7 @@ POBJECT_DIRECTORY Directory; /* Remove a query reference and check if it was the last one */ - if (!InterlockedExchangeAdd(&HeaderNameInfo->QueryReferences, -1)) + if (!InterlockedExchangeAdd((PLONG)&HeaderNameInfo->QueryReferences, -1)) { /* Check if we have a name */ if (HeaderNameInfo->Name.Buffer) Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c Thu Jan 11 01:52:07 2007 @@ -801,7 +801,7 @@ if (ObjectType) { /* Increase the number of objects of this type */ - InterlockedIncrement(&ObjectType->TotalNumberOfObjects); + InterlockedIncrement((PLONG)&ObjectType->TotalNumberOfObjects); /* Update the high water */ ObjectType->HighWaterNumberOfObjects = max(ObjectType-> Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c (original) +++ trunk/reactos/ntoskrnl/ob/obname.c Thu Jan 11 01:52:07 2007 @@ -238,7 +238,7 @@ (ObjectNameInfo->QueryReferences & 0x40000000)) { /* Add deletion flag */ - InterlockedExchangeAdd(&ObjectNameInfo->QueryReferences, + InterlockedExchangeAdd((PLONG)&ObjectNameInfo->QueryReferences, 0xC0000000); }

17 years, 11 months

[cwittich] 25420: fix issues with spaces in path

by cwittich＠svn.reactos.org

Author: cwittich Date: Wed Jan 10 23:35:11 2007 New Revision: 25420 URL: http://svn.reactos.org/svn/reactos?rev=25420&view=rev Log: fix issues with spaces in path Modified: trunk/tools/RosBE/Build-Multi.cmd trunk/tools/RosBE/Build.cmd trunk/tools/RosBE/Clean.cmd trunk/tools/RosBE/RosBE.cmd Modified: trunk/tools/RosBE/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build-Multi.cmd?rev=25… ============================================================================== --- trunk/tools/RosBE/Build-Multi.cmd (original) +++ trunk/tools/RosBE/Build-Multi.cmd Wed Jan 10 23:35:11 2007 @@ -15,7 +15,7 @@ :: Get the current date and time for use in :: in our build log's file name. :: -call %ROSBEBASEDIR%\TimeDate.cmd +call "%ROSBEBASEDIR%\TimeDate.cmd" :: :: Get the number of CPUs in the system so we know how @@ -30,8 +30,8 @@ :: Check if config.template.rbuild is newer than config.rbuild, :: if it is then abort the build and inform the user. :: -if exist %_ROSSOURCEDIR%\config.rbuild ( - %ROSBEBASEDIR%\Tools\test.exe %_ROSSOURCEDIR%\config.template.rbuild -nt %_ROSSOURCEDIR%\config.rbuild +if exist "%_ROSSOURCEDIR%\config.rbuild" ( + %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -46,7 +46,7 @@ :: Now use mingw32-make to build ReactOS, passing along options, if any. :: if "%1" == "" ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt + %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt + %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% -j %CPUCOUNT% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) Modified: trunk/tools/RosBE/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Build.cmd?rev=25420&r1… ============================================================================== --- trunk/tools/RosBE/Build.cmd (original) +++ trunk/tools/RosBE/Build.cmd Wed Jan 10 23:35:11 2007 @@ -8,14 +8,14 @@ :: Get the current date and time for use in :: in our build log's file name. :: -call %ROSBEBASEDIR%\TimeDate.cmd +call "%ROSBEBASEDIR%\TimeDate.cmd" :: :: Check if config.template.rbuild is newer than config.rbuild, :: if it is then abort the build and inform the user. :: -if exist %_ROSSOURCEDIR%\config.rbuild ( - %ROSBEBASEDIR%\Tools\test.exe %_ROSSOURCEDIR%\config.template.rbuild -nt %_ROSSOURCEDIR%\config.rbuild +if exist "%_ROSSOURCEDIR%\config.rbuild" ( + %ROSBEBASEDIR%\Tools\test.exe "%_ROSSOURCEDIR%\config.template.rbuild" -nt "%_ROSSOURCEDIR%\config.rbuild" if not errorlevel 1 ( echo. echo *** config.template.rbuild is newer than config.rbuild *** @@ -30,7 +30,7 @@ :: Now use mingw32-make to build ReactOS, passing along options, if any. :: if "%1" == "" ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt + %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( - %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe %_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt -) + %ROSBEBASEDIR%\Tools\buildtime.exe %_MINGWMAKE% %* 2>&1 | %ROSBEBASEDIR%\Tools\tee.exe "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" +) Modified: trunk/tools/RosBE/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/Clean.cmd?rev=25420&r1… ============================================================================== --- trunk/tools/RosBE/Clean.cmd (original) +++ trunk/tools/RosBE/Clean.cmd Wed Jan 10 23:35:11 2007 @@ -7,15 +7,15 @@ :: :: Check if we have something to clean, if so, clean it. :: -if exist %_ROSSOURCEDIR%\obj-i386\. ( +if exist "%_ROSSOURCEDIR%\obj-i386\." ( echo Cleaning ReactOS source directory... :: : Run ReactOS's make clean. :: - if exist %_ROSSOURCEDIR%\makefile.auto ( + if exist "%_ROSSOURCEDIR%\makefile.auto" ( if not "%CD%" == "%_ROSSOURCEDIR%" ( - pushd %_ROSSOURCEDIR% + pushd "%_ROSSOURCEDIR%" %_MINGWMAKE% clean 1> NUL 2> NUL popd ) else ( @@ -26,58 +26,58 @@ :: : Remove directories/makefile.auto created by the build. :: - if exist %_ROSSOURCEDIR%\obj-i386\. ( - rd /s /q %_ROSSOURCEDIR%\obj-i386 1> NUL 2> NUL + if exist "%_ROSSOURCEDIR%\obj-i386\." ( + rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL ) - if exist %_ROSSOURCEDIR%\output-i386\. ( - rd /s /q %_ROSSOURCEDIR%\output-i386 1> NUL 2> NUL + if exist "%_ROSSOURCEDIR%\output-i386\." ( + rd /s /q "%_ROSSOURCEDIR%\output-i386" 1> NUL 2> NUL ) - if exist %_ROSSOURCEDIR%\reactos\. ( - rd /s /q %_ROSSOURCEDIR%\reactos 1> NUL 2> NUL + if exist "%_ROSSOURCEDIR%\reactos\." ( + rd /s /q "%_ROSSOURCEDIR%\reactos" 1> NUL 2> NUL ) - if exist %_ROSSOURCEDIR%\makefile.auto ( - del %_ROSSOURCEDIR%\makefile.auto 1> NUL 2> NUL + if exist "%_ROSSOURCEDIR%\makefile.auto" ( + del "%_ROSSOURCEDIR%\makefile.auto" 1> NUL 2> NUL ) :: : Now delete auto-generated/copied files not removed by make clean. :: - del /f %_ROSSOURCEDIR%\media\inf\syssetup.inf 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\include\roscfg.h 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico 1> NUL 2> NUL - del /f %_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\nodrop.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_move.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_copy.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\ole32\drag_link.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divideropen.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_copy.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_divider.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_view_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_info_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idc_movebutton.cur" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_warn_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_dragarrow.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_hist_large.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idt_check.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idi_tt_error_sm.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comctl32\idb_std_small.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instabsent.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instlocal.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\msi\instadvert.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\network.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\fontpics.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_nocollate.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_collate.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\cdrom.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\floppy.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_landscape.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\folder2.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\800.bmp" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\pd32_portrait.ico" 1> NUL 2> NUL + del /f "%_ROSSOURCEDIR%\dll\win32\comdlg32\hdisk.ico" 1> NUL 2> NUL echo Done cleaning ReactOS source directory. ) else ( Modified: trunk/tools/RosBE/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE.cmd?rev=25420&r1… ============================================================================== --- trunk/tools/RosBE/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE.cmd Wed Jan 10 23:35:11 2007 @@ -38,8 +38,8 @@ :: Check if our log directory exists, if it doesn't :: create it. :: -if not exist %_ROSSOURCEDIR%\RosBE-Logs\. ( - mkdir %_ROSSOURCEDIR%\RosBE-Logs +if not exist "%_ROSSOURCEDIR%\RosBE-Logs\." ( + mkdir "%_ROSSOURCEDIR%\RosBE-Logs" set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs ) else ( set _ROSBELOGDIR=%_ROSSOURCEDIR%\RosBE-Logs

17 years, 11 months

[hpoussin] 25419: Don't rely on stdio.h to define EOF, as native stdio.h can conflict with ROS headers

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 10 23:02:41 2007 New Revision: 25419 URL: http://svn.reactos.org/svn/reactos?rev=25419&view=rev Log: Don't rely on stdio.h to define EOF, as native stdio.h can conflict with ROS headers Modified: trunk/reactos/lib/string/sscanf.c Modified: trunk/reactos/lib/string/sscanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/string/sscanf.c?rev=25… ============================================================================== --- trunk/reactos/lib/string/sscanf.c (original) +++ trunk/reactos/lib/string/sscanf.c Wed Jan 10 23:02:41 2007 @@ -5,7 +5,8 @@ #include <ndk/rtlfuncs.h> #include <stdlib.h> #include <stdarg.h> -#include <stdio.h> + +#define EOF (-1) /* helper function for *scanf. Returns the value of character c in the * given base, or -1 if the given character is not a digit of the base.

17 years, 11 months

[hpoussin] 25418: Move up wpp include, as it is needed by widl

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 10 22:57:52 2007 New Revision: 25418 URL: http://svn.reactos.org/svn/reactos?rev=25418&view=rev Log: Move up wpp include, as it is needed by widl Modified: trunk/reactos/tools/tools.mak Modified: trunk/reactos/tools/tools.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/tools.mak?rev=25418&… ============================================================================== --- trunk/reactos/tools/tools.mak (original) +++ trunk/reactos/tools/tools.mak Wed Jan 10 22:57:52 2007 @@ -56,8 +56,8 @@ include tools/rsym.mak include tools/sysreg/sysreg.mak include tools/unicode/unicode.mak +include tools/wpp/wpp.mak include tools/widl/widl.mak include tools/winebuild/winebuild.mak include tools/wmc/wmc.mak -include tools/wpp/wpp.mak include tools/wrc/wrc.mak

17 years, 11 months

[hpoussin] 25417: Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 10 22:48:35 2007 New Revision: 25417 URL: http://svn.reactos.org/svn/reactos?rev=25417&view=rev Log: Disable some boot options on non-x86 platforms. You can enable them again for specific platforms if needed. Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/custom.c trunk/reactos/boot/freeldr/freeldr/drivemap.c trunk/reactos/boot/freeldr/freeldr/include/drivemap.h trunk/reactos/boot/freeldr/freeldr/include/linux.h trunk/reactos/boot/freeldr/freeldr/include/miscboot.h trunk/reactos/boot/freeldr/freeldr/include/options.h trunk/reactos/boot/freeldr/freeldr/linuxboot.c trunk/reactos/boot/freeldr/freeldr/miscboot.c Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c Wed Jan 10 22:48:35 2007 @@ -119,11 +119,14 @@ } // Install the drive mapper according to this sections drive mappings +#ifdef __i386__ DriveMapMapDrivesInSection(OperatingSystemSectionNames[SelectedOperatingSystem]); +#endif if (_stricmp(SettingValue, "ReactOS") == 0) { LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#ifdef __i386__ else if (_stricmp(SettingValue, "WindowsNT40") == 0) { LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4); @@ -156,6 +159,7 @@ { LoadAndBootDrive(OperatingSystemSectionNames[SelectedOperatingSystem]); } +#endif } Modified: trunk/reactos/boot/freeldr/freeldr/custom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/custo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/custom.c (original) +++ trunk/reactos/boot/freeldr/freeldr/custom.c Wed Jan 10 22:48:35 2007 @@ -33,7 +33,15 @@ VOID OptionMenuCustomBoot(VOID) { - PCSTR CustomBootMenuList[] = { "Disk", "Partition", "Boot Sector File", "ReactOS", "Linux" }; + PCSTR CustomBootMenuList[] = { +#ifdef __i386__ + "Disk", + "Partition", + "Boot Sector File", + "ReactOS", + "Linux" +#endif /* __i386__ */ + }; ULONG CustomBootMenuCount = sizeof(CustomBootMenuList) / sizeof(CustomBootMenuList[0]); ULONG SelectedMenuItem; @@ -45,6 +53,7 @@ switch (SelectedMenuItem) { +#ifdef __i386__ case 0: // Disk OptionMenuCustomBootDisk(); break; @@ -60,9 +69,11 @@ case 4: // Linux OptionMenuCustomBootLinux(); break; - } -} - +#endif /* __i386__ */ + } +} + +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID) { CHAR SectionName[100]; @@ -397,3 +408,4 @@ LoadAndBootLinux(SectionName, "Custom Linux Setup"); } +#endif /* __i386__ */ Modified: trunk/reactos/boot/freeldr/freeldr/drivemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/drive… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/drivemap.c (original) +++ trunk/reactos/boot/freeldr/freeldr/drivemap.c Wed Jan 10 22:48:35 2007 @@ -22,6 +22,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler @@ -222,3 +223,4 @@ DriveMapInstalled = FALSE; } } +#endif /* __i386__ */ Modified: trunk/reactos/boot/freeldr/freeldr/include/drivemap.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/drivemap.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/drivemap.h Wed Jan 10 22:48:35 2007 @@ -20,7 +20,7 @@ #ifndef __DRIVEMAP_H #define __DRIVEMAP_H - +#ifdef __i386__ typedef struct { UCHAR DriveMapCount; // Count of drives currently mapped @@ -39,5 +39,6 @@ extern PVOID DriveMapInt13HandlerEnd; extern ULONG DriveMapOldInt13HandlerAddress; extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; +#endif /* __i386__ */ #endif // #defined __DRIVEMAP_H Modified: trunk/reactos/boot/freeldr/freeldr/include/linux.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/linux.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/linux.h Wed Jan 10 22:48:35 2007 @@ -22,7 +22,7 @@ #ifndef __LINUX_H #define __LINUX_H - +#ifdef __i386__ #define LINUX_LOADER_TYPE_LILO 0x01 #define LINUX_LOADER_TYPE_LOADLIN 0x11 #define LINUX_LOADER_TYPE_BOOTSECT 0x21 @@ -135,5 +135,6 @@ BOOLEAN LinuxReadKernel(PFILE LinuxKernelFile); BOOLEAN LinuxCheckKernelVersion(VOID); BOOLEAN LinuxReadInitrd(PFILE LinuxInitrdFile); +#endif /* __i386__ */ #endif // defined __LINUX_H Modified: trunk/reactos/boot/freeldr/freeldr/include/miscboot.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/miscboot.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/miscboot.h Wed Jan 10 22:48:35 2007 @@ -20,8 +20,10 @@ #ifndef __BOOT_H #define __BOOT_H +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName); VOID LoadAndBootPartition(PCSTR OperatingSystemName); VOID LoadAndBootDrive(PCSTR OperatingSystemName); +#endif /* __i386__ */ #endif // defined __BOOT_H Modified: trunk/reactos/boot/freeldr/freeldr/include/options.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/options.h (original) +++ trunk/reactos/boot/freeldr/freeldr/include/options.h Wed Jan 10 22:48:35 2007 @@ -25,10 +25,12 @@ VOID OptionMenuReboot(VOID); VOID OptionMenuCustomBoot(VOID); +#ifdef __i386__ VOID OptionMenuCustomBootDisk(VOID); VOID OptionMenuCustomBootPartition(VOID); VOID OptionMenuCustomBootBootSectorFile(VOID); VOID OptionMenuCustomBootReactOS(VOID); VOID OptionMenuCustomBootLinux(VOID); +#endif /* __i386__ */ #endif // #defined __OPTIONS_H Modified: trunk/reactos/boot/freeldr/freeldr/linuxboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/linux… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/linuxboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/linuxboot.c Wed Jan 10 22:48:35 2007 @@ -23,6 +23,7 @@ #define NDEBUG #include <debug.h> +#ifdef __i386__ #define LINUX_READ_CHUNK_SIZE 0x20000 // Read 128k at a time @@ -491,3 +492,4 @@ return TRUE; } +#endif /* __i386__ */ Modified: trunk/reactos/boot/freeldr/freeldr/miscboot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/miscb… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/miscboot.c (original) +++ trunk/reactos/boot/freeldr/freeldr/miscboot.c Wed Jan 10 22:48:35 2007 @@ -19,6 +19,7 @@ #include <freeldr.h> +#ifdef __i386__ VOID LoadAndBootBootSector(PCSTR OperatingSystemName) { PFILE FilePointer; @@ -213,3 +214,4 @@ //DisableA20(); ChainLoadBiosBootSectorCode(); } +#endif /* __i386__ */

17 years, 11 months

[hpoussin] 25416: Allow use of ROS_PREFIX on MS Windows platforms (needed for cross-compiling)

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 10 22:39:52 2007 New Revision: 25416 URL: http://svn.reactos.org/svn/reactos?rev=25416&view=rev Log: Allow use of ROS_PREFIX on MS Windows platforms (needed for cross-compiling) Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=25416&r1=2541… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Wed Jan 10 22:39:52 2007 @@ -274,45 +274,48 @@ cp = $(Q)cp NUL = /dev/null else # mingw32-windows - ifeq ($(OSTYPE),msys) - HOST=mingw32-linux - export EXEPREFIX = ./ - export EXEPOSTFIX = .exe - export SEP = / - mkdir = -$(Q)mkdir -p - gcc = $(Q)gcc - gpp = $(Q)g++ - ld = $(Q)ld - nm = $(Q)nm - objdump = $(Q)objdump - ar = $(Q)ar - objcopy = $(Q)objcopy - dlltool = $(Q)dlltool - strip = $(Q)strip - windres = $(Q)windres - rm = $(Q)rm -f - cp = $(Q)cp - NUL = /dev/null - else - export EXEPREFIX = - export EXEPOSTFIX = .exe - ROS_EMPTY = - export SEP = \$(ROS_EMPTY) - mkdir = -$(Q)mkdir - gcc = $(Q)gcc - gpp = $(Q)g++ - ld = $(Q)ld - nm = $(Q)nm - objdump = $(Q)objdump - ar = $(Q)ar - objcopy = $(Q)objcopy - dlltool = $(Q)dlltool - strip = $(Q)strip - windres = $(Q)windres - rm = $(Q)del /f /q - cp = $(Q)copy /y - NUL = NUL - endif + ifeq ($(OSTYPE),msys) + HOST=mingw32-linux + export EXEPREFIX = ./ + export EXEPOSTFIX = .exe + export SEP = / + mkdir = -$(Q)mkdir -p + rm = $(Q)rm -f + cp = $(Q)cp + NUL = /dev/null + else + export EXEPREFIX = + export EXEPOSTFIX = .exe + ROS_EMPTY = + export SEP = \$(ROS_EMPTY) + mkdir = -$(Q)mkdir + rm = $(Q)del /f /q + cp = $(Q)copy /y + NUL = NUL + endif + ifeq ($(ROS_PREFIX),) + gcc = $(Q)gcc + gpp = $(Q)g++ + ld = $(Q)ld + nm = $(Q)nm + objdump = $(Q)objdump + ar = $(Q)ar + objcopy = $(Q)objcopy + dlltool = $(Q)dlltool + strip = $(Q)strip + windres = $(Q)windres + else + gcc = $(ROS_PREFIX)-gcc + gpp = $(Q)$(ROS_PREFIX)-g++ + ld = $(Q)$(ROS_PREFIX)-ld + nm = $(Q)$(ROS_PREFIX)-nm + objdump = $(Q)$(ROS_PREFIX)-objdump + ar = $(Q)$(ROS_PREFIX)-ar + objcopy = $(Q)$(ROS_PREFIX)-objcopy + dlltool = $(Q)$(ROS_PREFIX)-dlltool + strip = $(Q)$(ROS_PREFIX)-strip + windres = $(Q)$(ROS_PREFIX)-windres + endif endif ifneq ($(ROS_INTERMEDIATE),)

17 years, 11 months

[hpoussin] 25415: Move x86 specific part to i386/ directory. Fix a few warnings

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Wed Jan 10 22:39:01 2007 New Revision: 25415 URL: http://svn.reactos.org/svn/reactos?rev=25415&view=rev Log: Move x86 specific part to i386/ directory. Fix a few warnings Added: trunk/reactos/lib/rtl/i386/thread.c - copied, changed from r25414, trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/austin/udict.h trunk/reactos/lib/rtl/nls.c trunk/reactos/lib/rtl/rtl.rbuild trunk/reactos/lib/rtl/thread.c Modified: trunk/reactos/lib/rtl/austin/udict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/austin/udict.h?rev… ============================================================================== --- trunk/reactos/lib/rtl/austin/udict.h (original) +++ trunk/reactos/lib/rtl/austin/udict.h Wed Jan 10 22:39:01 2007 @@ -57,8 +57,8 @@ typedef enum { udict_balanced = 0, - udict_leftheavy = -1, - udict_rightheavy = 1 + udict_leftheavy = 1, + udict_rightheavy = 2 } udict_avl_balance_t; typedef union { Copied: trunk/reactos/lib/rtl/i386/thread.c (from r25414, trunk/reactos/lib/rtl/thread.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/thread.c?p2=t… ============================================================================== --- trunk/reactos/lib/rtl/thread.c (original) +++ trunk/reactos/lib/rtl/i386/thread.c Wed Jan 10 22:39:01 2007 @@ -19,209 +19,9 @@ /* PRIVATE FUNCTIONS *******************************************************/ -NTSTATUS -NTAPI -RtlpCreateUserStack(IN HANDLE hProcess, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN ULONG StackZeroBits OPTIONAL, - OUT PINITIAL_TEB InitialTeb) -{ - NTSTATUS Status; - SYSTEM_BASIC_INFORMATION SystemBasicInfo; - PIMAGE_NT_HEADERS Headers; - ULONG_PTR Stack = 0; - BOOLEAN UseGuard = FALSE; - ULONG Dummy, GuardPageSize; - - /* Get some memory information */ - Status = ZwQuerySystemInformation(SystemBasicInformation, - &SystemBasicInfo, - sizeof(SYSTEM_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status)) 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 */ - if (!StackReserve) StackReserve = Headers->OptionalHeader. - SizeOfStackReserve; - if (!StackCommit) StackCommit = Headers->OptionalHeader. - SizeOfStackCommit; - } - else - { - /* Use the System Settings if needed */ - if (!StackReserve) StackReserve = SystemBasicInfo.AllocationGranularity; - if (!StackCommit) StackCommit = SystemBasicInfo.PageSize; - } - - /* Align everything to Page Size */ - StackReserve = ROUND_UP(StackReserve, SystemBasicInfo.AllocationGranularity); - StackCommit = ROUND_UP(StackCommit, SystemBasicInfo.PageSize); - - // FIXME: Remove once Guard Page support is here - #if 1 - StackCommit = StackReserve; - #endif - - /* Reserve memory for the stack */ - Status = ZwAllocateVirtualMemory(hProcess, - (PVOID*)&Stack, - StackZeroBits, - &StackReserve, - MEM_RESERVE, - PAGE_READWRITE); - if (!NT_SUCCESS(Status)) return Status; - - /* Now set up some basic Initial TEB Parameters */ - InitialTeb->PreviousStackBase = NULL; - InitialTeb->PreviousStackLimit = NULL; - 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) - { - /* Remove a page to set as guard page */ - 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)) return Status; - - /* Now set the current Stack Limit */ - InitialTeb->StackLimit = (PVOID)Stack; - - /* Create a guard page */ - if (UseGuard) - { - /* Attempt maximum space possible */ - GuardPageSize = SystemBasicInfo.PageSize; - Status = ZwProtectVirtualMemory(hProcess, - (PVOID*)&Stack, - &GuardPageSize, - PAGE_GUARD | PAGE_READWRITE, - &Dummy); - if (!NT_SUCCESS(Status)) 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; -} - -NTSTATUS -NTAPI -RtlpFreeUserStack(IN HANDLE Process, - IN PINITIAL_TEB InitialTeb) -{ - ULONG Dummy = 0; - NTSTATUS Status; - - /* Free the Stack */ - Status = ZwFreeVirtualMemory(Process, - &InitialTeb->AllocatedStackBase, - &Dummy, - MEM_RELEASE); - - /* Clear the initial TEB */ - RtlZeroMemory(InitialTeb, sizeof(INITIAL_TEB)); - return Status; -} - -/* FUNCTIONS ***************************************************************/ - /* - @implemented -*/ -NTSTATUS -NTAPI -RtlCreateUserThread(IN HANDLE ProcessHandle, - IN PSECURITY_DESCRIPTOR SecurityDescriptor OPTIONAL, - IN BOOLEAN CreateSuspended, - IN ULONG StackZeroBits OPTIONAL, - IN SIZE_T StackReserve OPTIONAL, - IN SIZE_T StackCommit OPTIONAL, - IN PTHREAD_START_ROUTINE StartAddress, - IN PVOID Parameter OPTIONAL, - OUT PHANDLE ThreadHandle OPTIONAL, - OUT PCLIENT_ID ClientId OPTIONAL) -{ - NTSTATUS Status; - HANDLE Handle; - CLIENT_ID ThreadCid; - INITIAL_TEB InitialTeb; - OBJECT_ATTRIBUTES ObjectAttributes; - CONTEXT Context; - - /* First, we'll create the Stack */ - Status = RtlpCreateUserStack(ProcessHandle, - StackReserve, - StackCommit, - StackZeroBits, - &InitialTeb); - if (!NT_SUCCESS(Status)) 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)) - { - /* Free the stack */ - RtlpFreeUserStack(ProcessHandle, &InitialTeb); - } - else - { - /* Return thread data */ - if (ThreadHandle) *ThreadHandle = Handle; - if (ClientId) *ClientId = ThreadCid; - } - - /* Return success or the previous failure */ - return Status; -} - -/* - * FIXME: Should go in /i386 - @implemented -*/ + * @implemented + */ VOID NTAPI RtlInitializeContext(IN HANDLE ProcessHandle, @@ -230,6 +30,9 @@ IN PTHREAD_START_ROUTINE ThreadStartAddress, IN PINITIAL_TEB InitialTeb) { + DPRINT("RtlInitializeContext: (hProcess: %p, 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... @@ -274,61 +77,4 @@ ThreadContext->Esp -= sizeof(PVOID); } -/* - * @implemented - */ -VOID -NTAPI -RtlExitUserThread(NTSTATUS Status) -{ - /* Call the Loader and tell him to notify the DLLs */ - LdrShutdownThread(); - - /* Shut us down */ - NtCurrentTeb()->FreeStackOnTermination = TRUE; - NtTerminateThread(NtCurrentThread(), Status); -} - -/* - @implemented -*/ -VOID -NTAPI -RtlFreeUserThreadStack(HANDLE ProcessHandle, - HANDLE ThreadHandle) -{ - NTSTATUS Status; - THREAD_BASIC_INFORMATION ThreadBasicInfo; - ULONG Dummy, Size = 0; - PVOID StackLocation; - - /* Query the Basic Info */ - Status = NtQueryInformationThread(ThreadHandle, - ThreadBasicInformation, - &ThreadBasicInfo, - sizeof(THREAD_BASIC_INFORMATION), - NULL); - if (!NT_SUCCESS(Status) || !ThreadBasicInfo.TebBaseAddress) return; - - /* Get the deallocation stack */ - Status = NtReadVirtualMemory(ProcessHandle, - &((PTEB)ThreadBasicInfo.TebBaseAddress)-> - DeallocationStack, - &StackLocation, - sizeof(PVOID), - &Dummy); - if (!NT_SUCCESS(Status) || !StackLocation) return; - - /* Free it */ - NtFreeVirtualMemory(ProcessHandle, &StackLocation, &Size, MEM_RELEASE); -} - -PTEB -NTAPI -_NtCurrentTeb(VOID) -{ - /* Return the TEB */ - return NtCurrentTeb(); -} - /* EOF */ Modified: trunk/reactos/lib/rtl/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/nls.c?rev=25415&r1… ============================================================================== --- trunk/reactos/lib/rtl/nls.c (original) +++ trunk/reactos/lib/rtl/nls.c Wed Jan 10 22:39:01 2007 @@ -359,7 +359,7 @@ DPRINT("RtlResetRtlTranslations() called\n"); /* Set ANSI data */ - NlsAnsiToUnicodeTable = NlsTable->AnsiTableInfo.MultiByteTable; + NlsAnsiToUnicodeTable = (PWCHAR)NlsTable->AnsiTableInfo.MultiByteTable; /* Real type is PUSHORT */ NlsUnicodeToAnsiTable = NlsTable->AnsiTableInfo.WideCharTable; NlsDbcsUnicodeToAnsiTable = (PWCHAR)NlsTable->AnsiTableInfo.WideCharTable; NlsMbCodePageTag = (NlsTable->AnsiTableInfo.DBCSCodePage != 0); @@ -368,7 +368,7 @@ DPRINT("Ansi codepage %hu\n", NlsAnsiCodePage); /* Set OEM data */ - NlsOemToUnicodeTable = NlsTable->OemTableInfo.MultiByteTable; + NlsOemToUnicodeTable = (PWCHAR)NlsTable->OemTableInfo.MultiByteTable; /* Real type is PUSHORT */ NlsUnicodeToOemTable = NlsTable->OemTableInfo.WideCharTable; NlsDbcsUnicodeToOemTable = (PWCHAR)NlsTable->OemTableInfo.WideCharTable; NlsMbOemCodePageTag = (NlsTable->OemTableInfo.DBCSCodePage != 0); Modified: trunk/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.rbuild?rev=254… ============================================================================== --- trunk/reactos/lib/rtl/rtl.rbuild (original) +++ trunk/reactos/lib/rtl/rtl.rbuild Wed Jan 10 22:39:01 2007 @@ -39,6 +39,7 @@ <file>sin_asm.s</file> <file>sqrt_asm.s</file> <file>tan_asm.s</file> + <file>thread.c</file> </directory> </if> <directory name="austin"> Modified: trunk/reactos/lib/rtl/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/thread.c?rev=25415… ============================================================================== --- trunk/reactos/lib/rtl/thread.c (original) +++ trunk/reactos/lib/rtl/thread.c Wed Jan 10 22:39:01 2007 @@ -12,7 +12,6 @@ /* INCLUDES *****************************************************************/ #include <rtl.h> -#include "i386/ketypes.h" #define NDEBUG #include <debug.h> @@ -219,62 +218,6 @@ } /* - * FIXME: Should go in /i386 - @implemented -*/ -VOID -NTAPI -RtlInitializeContext(IN HANDLE ProcessHandle, - OUT PCONTEXT ThreadContext, - IN PVOID ThreadStartParam OPTIONAL, - IN PTHREAD_START_ROUTINE ThreadStartAddress, - IN PINITIAL_TEB 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 = KGDT_R3_TEB; - ThreadContext->SegEs = KGDT_R3_DATA; - ThreadContext->SegDs = KGDT_R3_DATA; - ThreadContext->SegSs = KGDT_R3_DATA; - ThreadContext->SegCs = KGDT_R3_CODE; - - /* Enable Interrupts */ - ThreadContext->EFlags = EFLAGS_INTERRUPT_MASK; - - /* 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 */ VOID

17 years, 11 months

← Newer
1
...
22
23
24
25
26
27
28
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007