Ros-diffs August 2007

ros-diffs@reactos.org

21 participants
666 discussions

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 6 20:05:08 2007 New Revision: 28197 URL: http://svn.reactos.org/svn/reactos?rev=28197&view=rev Log: Add some prototypes Modified: trunk/reactos/include/psdk/shellapi.h trunk/reactos/include/psdk/shlwapi.h trunk/reactos/include/psdk/winnetwk.h Modified: trunk/reactos/include/psdk/shellapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shellapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/shellapi.h (original) +++ trunk/reactos/include/psdk/shellapi.h Mon Aug 6 20:05:08 2007 @@ -302,6 +302,8 @@ void WINAPI SHFreeNameMappings(HANDLE); DWORD WINAPI SHGetFileInfoA(LPCSTR,DWORD,SHFILEINFOA*,UINT,UINT); DWORD WINAPI SHGetFileInfoW(LPCWSTR,DWORD,SHFILEINFOW*,UINT,UINT); +BOOL WINAPI SHGetNewLinkInfoA(LPCSTR,LPCSTR,LPSTR,BOOL*,UINT); +BOOL WINAPI SHGetNewLinkInfoW(LPCWSTR,LPCWSTR,LPWSTR,BOOL*,UINT); HRESULT WINAPI SHQueryRecycleBinA(LPCSTR, LPSHQUERYRBINFO); HRESULT WINAPI SHQueryRecycleBinW(LPCWSTR, LPSHQUERYRBINFO); HRESULT WINAPI SHEmptyRecycleBinA(HWND,LPCSTR,DWORD); @@ -325,6 +327,7 @@ #define ShellExecuteEx ShellExecuteExW #define SHFileOperation SHFileOperationW #define SHGetFileInfo SHGetFileInfoW +#define SHGetNewLinkInfo SHGetNewLinkInfoW #define SHQueryRecycleBin SHQueryRecycleBinW #define SHEmptyRecycleBin SHEmptyRecycleBinW @@ -346,6 +349,7 @@ #define ShellExecuteEx ShellExecuteExA #define SHFileOperation SHFileOperationA #define SHGetFileInfo SHGetFileInfoA +#define SHGetNewLinkInfo SHGetNewLinkInfoA #define SHQueryRecycleBin SHQueryRecycleBinA #define SHEmptyRecycleBin SHEmptyRecycleBinA #endif Modified: trunk/reactos/include/psdk/shlwapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shlwapi.h?rev… ============================================================================== --- trunk/reactos/include/psdk/shlwapi.h (original) +++ trunk/reactos/include/psdk/shlwapi.h Mon Aug 6 20:05:08 2007 @@ -1041,6 +1041,10 @@ BOOL WINAPI IsOS(DWORD); +/* SHSetTimerQueueTimer definitions */ +#define TPS_EXECUTEIO 0x00000001 +#define TPS_LONGEXECTIME 0x00000008 + #include <poppack.h> #ifdef __cplusplus Modified: trunk/reactos/include/psdk/winnetwk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnetwk.h?re… ============================================================================== --- trunk/reactos/include/psdk/winnetwk.h (original) +++ trunk/reactos/include/psdk/winnetwk.h Mon Aug 6 20:05:08 2007 @@ -282,6 +282,8 @@ DWORD APIENTRY WNetGetResourceInformationW(LPNETRESOURCEW,LPVOID,LPDWORD,LPWSTR*); DWORD APIENTRY WNetGetLastErrorA(PDWORD,LPSTR,DWORD,LPSTR,DWORD); DWORD APIENTRY WNetGetLastErrorW(PDWORD,LPWSTR,DWORD,LPWSTR,DWORD); +DWORD WINAPI WNetRestoreConnectionA(HWND,LPCSTR); +DWORD WINAPI WNetRestoreConnectionW(HWND,LPCWSTR); DWORD APIENTRY MultinetGetConnectionPerformanceA(LPNETRESOURCEA,LPNETCONNECTINFOSTRUCT); DWORD APIENTRY MultinetGetConnectionPerformanceW(LPNETRESOURCEW,LPNETCONNECTINFOSTRUCT); #ifdef UNICODE

17 years, 4 months

[dreimer] 28196: - Resize wrong sized Backgrounds. - Add the one from Bug 2535 (thx to Rhy Thornton (rhy <AT> leperkhanz <DOT> com) for it.) and replace the ugly Bird in Background 9. Right now only a resized one, but it still looks nice.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 6 19:23:11 2007 New Revision: 28196 URL: http://svn.reactos.org/svn/reactos?rev=28196&view=rev Log: - Resize wrong sized Backgrounds. - Add the one from Bug 2535 (thx to Rhy Thornton (rhy <AT> leperkhanz <DOT> com) for it.) and replace the ugly Bird in Background 9. Right now only a resized one, but it still looks nice. Modified: trunk/reactos/dll/win32/cards/res/Background_1.bmp trunk/reactos/dll/win32/cards/res/Background_10.bmp trunk/reactos/dll/win32/cards/res/Background_11.bmp trunk/reactos/dll/win32/cards/res/Background_12.bmp trunk/reactos/dll/win32/cards/res/Background_2.bmp trunk/reactos/dll/win32/cards/res/Background_3.bmp trunk/reactos/dll/win32/cards/res/Background_4.bmp trunk/reactos/dll/win32/cards/res/Background_6.bmp trunk/reactos/dll/win32/cards/res/Background_7.bmp trunk/reactos/dll/win32/cards/res/Background_9.bmp Modified: trunk/reactos/dll/win32/cards/res/Background_1.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_11.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_12.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/win32/cards/res/Background_9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cards/res/Backgr… ============================================================================== Binary files - no diff available.

17 years, 4 months

[cfinck] 28195: Starfield Screensaver by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) I committed the latest attachment (the C version) from bug #2510 See issue #2510 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Mon Aug 6 18:56:17 2007 New Revision: 28195 URL: http://svn.reactos.org/svn/reactos?rev=28195&view=rev Log: Starfield Screensaver by Marc Piulachs (marc DOT piulachs AT codexchange DOT net) I committed the latest attachment (the C version) from bug #2510 See issue #2510 for more details. Added: trunk/reactos/base/applications/screensavers/starfield/ trunk/reactos/base/applications/screensavers/starfield/resource.h trunk/reactos/base/applications/screensavers/starfield/screensaver.c trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild trunk/reactos/base/applications/screensavers/starfield/starfield.rc Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/base/applications/screensavers/screensavers.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/screensavers.rbuild (original) +++ trunk/reactos/base/applications/screensavers/screensavers.rbuild Mon Aug 6 18:56:17 2007 @@ -18,4 +18,8 @@ <xi:include href="scrnsave/scrnsave.rbuild" /> </directory> +<directory name="starfield"> + <xi:include href="starfield/starfield.rbuild" /> +</directory> + </group> Added: trunk/reactos/base/applications/screensavers/starfield/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/resource.h (added) +++ trunk/reactos/base/applications/screensavers/starfield/resource.h Mon Aug 6 18:56:17 2007 @@ -1,0 +1,1 @@ +#define IDS_DESCRIPTION 1 Added: trunk/reactos/base/applications/screensavers/starfield/screensaver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/screensaver.c (added) +++ trunk/reactos/base/applications/screensavers/starfield/screensaver.c Mon Aug 6 18:56:17 2007 @@ -1,0 +1,352 @@ +/* + * Copyright 2003 J Brown + * Copyright 2006 Eric Kohl + * Copyright 2007 Marc Piulachs (marc.piulachs(a)codexchange.net) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ + +#include <windows.h> +#include <tchar.h> +#include "resource.h" + +#define RANDOM( min, max ) ((rand() % (int)(((max)+1) - (min))) + (min)) + +#define MAX_LOADSTRING 100 +#define MAX_STARS 1000 + +#define APPNAME _T("Starfield") +#define APP_TIMER 1 +#define APP_TIMER_INTERVAL 20 + +#define MAX_STARS 1000 + +// Details of each individual star +typedef struct star +{ + int m_nXPos, m_nYPos, m_nZPos; + int m_nOldX, m_nOldY; +} STAR; + +HINSTANCE hInstance; +BOOL fullscreen = FALSE; + +STAR *stars; + +int m_nTotStars; +int m_nCenterX, m_nCenterY; + +void DrawStarField (HDC pDC) +{ + int nX, nY; + int i; + for (i = 0; i < m_nTotStars; i++) + { + // Clear last position of this star + SetPixel ( + pDC, + stars[i].m_nOldX, + stars[i].m_nOldY, + RGB (0, 0, 0)); + + nX = (int)((((long)stars[i].m_nXPos << 7) / (long)stars[i].m_nZPos) + m_nCenterX); + nY = (int)((((long)stars[i].m_nYPos << 7) / (long)stars[i].m_nZPos) + m_nCenterY); + + // Draw star + SetPixel ( + pDC, + nX, + nY, + RGB (255, 255, 255)); + + // Remember current position for clearing later + stars[i].m_nOldX = nX; + stars[i].m_nOldY = nY; + } +} + +BOOL SetUpStars (int nNumStars) +{ + int i; + if (nNumStars > MAX_STARS) + { + MessageBox (0, + _T("Too many stars! Aborting!"), + _T("Error"), + MB_OK | MB_ICONWARNING); + return FALSE; + } + + if (stars) + free (stars); + + m_nTotStars = nNumStars; + + stars = (STAR*)malloc(nNumStars * sizeof(STAR)); + + if (!stars) + { + MessageBox (0, + _T("Unable to allocate memory! Aborting!"), + _T("Error"), + MB_OK | MB_ICONWARNING); + return FALSE; + } + + for (i = 0; i < m_nTotStars; i++) + { + do + { + stars[i].m_nXPos = RANDOM (-320, 320); + stars[i].m_nYPos = RANDOM (-200, 200); + stars[i].m_nZPos = i+1; + stars[i].m_nOldX = -1; + stars[i].m_nOldY = -1; + } while ((stars[i].m_nXPos == 0) || (stars[i].m_nYPos == 0)); + } + + return TRUE; +} + +void MoveStarField (int nXofs, int nYofs, int nZofs) +{ + int i; + for (i = 0; i < m_nTotStars; i++) + { + stars[i].m_nXPos += nXofs; + stars[i].m_nYPos += nYofs; + stars[i].m_nZPos += nZofs; + + if (stars[i].m_nZPos > m_nTotStars) + stars[i].m_nZPos -= m_nTotStars; + if (stars[i].m_nZPos < 1) + stars[i].m_nZPos += m_nTotStars; + } +} + +void SetDimensions (int nWidth, int nHeight) +{ + m_nCenterX = nWidth / 2; + m_nCenterY = nHeight / 2; +} + +LRESULT WINAPI WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + static POINT ptLast; + static POINT ptCursor; + static BOOL fFirstTime = TRUE; + static HDC pDC; + + switch (msg) + { + case WM_CREATE : + { + SetTimer ( + hwnd, + APP_TIMER, + APP_TIMER_INTERVAL, + NULL); + } + break; + case WM_PAINT : + { + PAINTSTRUCT PtStr; + HDC pDC = BeginPaint (hwnd, &PtStr); + DrawStarField (pDC); + EndPaint (hwnd, &PtStr); + return (0); + } + break; + case WM_TIMER : + { + if (wParam == APP_TIMER) + { + MoveStarField (0, 0, -3); + pDC = GetDC(hwnd); + DrawStarField (pDC); + ReleaseDC(hwnd, pDC); + } + } + break; + case WM_SIZE : + { + // Change the center point of the starfield + SetDimensions ( + LOWORD(lParam), + HIWORD(lParam)); + } + break; + case WM_DESTROY : + { + KillTimer (hwnd, APP_TIMER); + free(stars); + PostQuitMessage (0); + return 0; + } + break; + // break out of screen-saver if any keyboard activity + case WM_NOTIFY: + case WM_SYSKEYDOWN: + { + PostMessage(hwnd, WM_CLOSE, 0, 0); + break; + } + // break out of screen-saver if any mouse activity + case WM_LBUTTONDOWN: + case WM_LBUTTONUP: + case WM_RBUTTONDOWN: + case WM_RBUTTONUP: + case WM_MBUTTONDOWN: + case WM_MBUTTONUP: + case WM_MOUSEMOVE: + { + // If we've got a parent then we must be a preview + if(GetParent(hwnd) != 0) + return 0; + + if(fFirstTime) + { + GetCursorPos(&ptLast); + fFirstTime = FALSE; + } + + GetCursorPos(&ptCursor); + + // if the mouse has moved more than 3 pixels then exit + if( (abs(ptCursor.x - ptLast.x) >= 3) || + (abs(ptCursor.y - ptLast.y) >= 3)) + { + PostMessage(hwnd, WM_CLOSE, 0, 0); + } + + ptLast = ptCursor; + return 0; + } + } + + return DefWindowProc(hwnd, msg, wParam, lParam); +} + + +void InitSaver(HWND hwndParent) +{ + WNDCLASS wc; + ZeroMemory(&wc, sizeof(wc)); + wc.style = CS_HREDRAW | CS_VREDRAW; + wc.lpfnWndProc = WndProc; + wc.lpszClassName = APPNAME; + wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); + RegisterClass(&wc); + + if (hwndParent != 0) + { + RECT rect; + GetClientRect(hwndParent, &rect); + CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_CHILD, + 0, 0, + rect.right, + rect.bottom, + hwndParent, 0, + hInstance, NULL); + fullscreen = FALSE; + } + else + { + HWND hwnd; + hwnd = CreateWindow(APPNAME, APPNAME, + WS_VISIBLE | WS_POPUP | WS_EX_TOPMOST, + 0, 0, + GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN), + HWND_DESKTOP, 0, + hInstance, NULL); + ShowWindow(hwnd, SW_SHOWMAXIMIZED); + ShowCursor(FALSE); + fullscreen = TRUE; + } + + SetUpStars(250); +} + +void ParseCommandLine(PSTR szCmdLine, int *chOption, HWND *hwndParent) +{ + int ch = *szCmdLine++; + + if(ch == '-' || ch == '/') + ch = *szCmdLine++; + + if(ch >= 'A' && ch <= 'Z') + ch += 'a' - 'A'; + + *chOption = ch; + ch = *szCmdLine++; + + if(ch == ':') + ch = *szCmdLine++; + + while(ch == ' ' || ch == '\t') + ch = *szCmdLine++; + + if(isdigit(ch)) + { + unsigned int i = atoi(szCmdLine - 1); + *hwndParent = (HWND)i; + } + else + *hwndParent = 0; +} + +int WINAPI WinMain (HINSTANCE hInst, + HINSTANCE hPrev, + LPSTR lpCmdLine, + int iCmdShow) +{ + HWND hwndParent; + UINT nPreviousState; + int chOption; + MSG Message; + + hInstance = hInst; + + ParseCommandLine(lpCmdLine, &chOption, &hwndParent); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + + switch (chOption) + { + case 's': + InitSaver(0); + break; + + case 'p': + InitSaver(hwndParent); + break; + + case 'c': + default: + MessageBox(0, + _T("No options need to be set."), + _T("About"), + MB_OK | MB_ICONWARNING); + return 0; + } + + while (GetMessage(&Message, 0, 0, 0)) + DispatchMessage(&Message); + + SystemParametersInfo(SPI_SETSCREENSAVERRUNNING, FALSE, &nPreviousState, 0); + + return Message.wParam; +} Added: trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild (added) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rbuild Mon Aug 6 18:56:17 2007 @@ -1,0 +1,13 @@ +<module name="starfield" type="win32scr" installbase="system32" installname="starfield.scr"> + <define name="__USE_W32API" /> + <define name="__REACTOS__" /> + <define name="UNICODE" /> + <define name="_UNICODE" /> + + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + + <file>screensaver.c</file> + <file>starfield.rc</file> +</module> Added: trunk/reactos/base/applications/screensavers/starfield/starfield.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/starfield/starfield.rc (added) +++ trunk/reactos/base/applications/screensavers/starfield/starfield.rc Mon Aug 6 18:56:17 2007 @@ -1,0 +1,19 @@ +#include <windows.h> +#include "resource.h" + +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Starfield ScreenSaver\0" +#define REACTOS_STR_INTERNAL_NAME "starfield\0" +#define REACTOS_STR_ORIGINAL_FILENAME "starfield.scr\0" + +#include <reactos/version.rc> + + +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Starfield ScreenSaver" +END Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Mon Aug 6 18:56:17 2007 @@ -30,42 +30,43 @@ ; Base files -base\applications\cacls\cacls.exe 1 -base\applications\calc\calc.exe 1 -base\applications\charmap\charmap.exe 1 -base\applications\cmdutils\find\find.exe 1 -base\applications\cmdutils\more\more.exe 1 -base\applications\control\control.exe 1 -base\applications\mscutils\devmgmt\devmgmt.exe 1 -base\applications\games\solitaire\sol.exe 1 -base\applications\games\winemine\winemine.exe 1 -base\applications\hh\hh.exe 1 -base\applications\hostname\hostname.exe 1 -base\applications\logoff\logoff.exe 1 -base\applications\msconfig\msconfig.exe 1 -base\applications\network\arp\arp.exe 1 -base\applications\network\route\route.exe 1 -base\applications\network\finger\finger.exe 1 -base\applications\network\ftp\ftp.exe 1 -base\applications\network\ipconfig\ipconfig.exe 1 -base\applications\network\netstat\netstat.exe 1 -base\applications\network\ping\ping.exe 1 -base\applications\network\telnet\telnet.exe 1 -base\applications\network\tracert\tracert.exe 1 -base\applications\network\whois\whois.exe 1 -base\applications\notepad\notepad.exe 1 -base\applications\regedit\regedit.exe 4 -base\applications\regedit\clb\clb.dll 1 -base\applications\sc\sc.exe 1 -base\applications\screensavers\cylfrac\cylfrac.scr 1 -base\applications\screensavers\logon\logon.scr 1 -base\applications\screensavers\matrix\matrix.scr 1 -base\applications\screensavers\scrnsave\scrnsave.scr 1 -base\applications\mscutils\servman\servman.exe 1 -base\applications\shutdown\shutdown.exe 1 -base\applications\sndvol32\sndvol32.exe 1 -base\applications\taskmgr\taskmgr.exe 1 -base\applications\wordpad\wordpad.exe 1 +base\applications\cacls\cacls.exe 1 +base\applications\calc\calc.exe 1 +base\applications\charmap\charmap.exe 1 +base\applications\cmdutils\find\find.exe 1 +base\applications\cmdutils\more\more.exe 1 +base\applications\control\control.exe 1 +base\applications\mscutils\devmgmt\devmgmt.exe 1 +base\applications\games\solitaire\sol.exe 1 +base\applications\games\winemine\winemine.exe 1 +base\applications\hh\hh.exe 1 +base\applications\hostname\hostname.exe 1 +base\applications\logoff\logoff.exe 1 +base\applications\msconfig\msconfig.exe 1 +base\applications\network\arp\arp.exe 1 +base\applications\network\route\route.exe 1 +base\applications\network\finger\finger.exe 1 +base\applications\network\ftp\ftp.exe 1 +base\applications\network\ipconfig\ipconfig.exe 1 +base\applications\network\netstat\netstat.exe 1 +base\applications\network\ping\ping.exe 1 +base\applications\network\telnet\telnet.exe 1 +base\applications\network\tracert\tracert.exe 1 +base\applications\network\whois\whois.exe 1 +base\applications\notepad\notepad.exe 1 +base\applications\regedit\regedit.exe 4 +base\applications\regedit\clb\clb.dll 1 +base\applications\sc\sc.exe 1 +base\applications\screensavers\cylfrac\cylfrac.scr 1 +base\applications\screensavers\logon\logon.scr 1 +base\applications\screensavers\matrix\matrix.scr 1 +base\applications\screensavers\scrnsave\scrnsave.scr 1 +base\applications\screensavers\starfield\starfield.scr 1 +base\applications\mscutils\servman\servman.exe 1 +base\applications\shutdown\shutdown.exe 1 +base\applications\sndvol32\sndvol32.exe 1 +base\applications\taskmgr\taskmgr.exe 1 +base\applications\wordpad\wordpad.exe 1 base\services\dhcp\dhcp.exe 1 base\services\eventlog\eventlog.exe 1

17 years, 4 months

[hpoussin] 28194: Set setup type to 0 before the end of 2nd stage in syssetup instead of winlogon

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 6 18:41:05 2007 New Revision: 28194 URL: http://svn.reactos.org/svn/reactos?rev=28194&view=rev Log: Set setup type to 0 before the end of 2nd stage in syssetup instead of winlogon Modified: trunk/reactos/base/system/winlogon/setup.c trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/base/system/winlogon/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/setup… ============================================================================== --- trunk/reactos/base/system/winlogon/setup.c (original) +++ trunk/reactos/base/system/winlogon/setup.c Mon Aug 6 18:41:05 2007 @@ -50,38 +50,6 @@ } return dwSetupType; -} - - -static BOOL -SetSetupType (DWORD dwSetupType) -{ - DWORD dwError; - HKEY hKey; - - dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE, - L"SYSTEM\\Setup", //TEXT("SYSTEM\\Setup"), - 0, - KEY_SET_VALUE, - &hKey); - if (dwError != ERROR_SUCCESS) - { - return FALSE; - } - - dwError = RegSetValueExW (hKey, - L"SetupType", //TEXT("SetupType"), - 0, - REG_DWORD, - (LPBYTE)&dwSetupType, - sizeof(DWORD)); - RegCloseKey (hKey); - if (dwError != ERROR_SUCCESS) - { - return FALSE; - } - - return TRUE; } @@ -173,11 +141,6 @@ CloseHandle (ProcessInformation.hThread); CloseHandle (ProcessInformation.hProcess); - if (dwExitCode == 0) - { - SetSetupType (0); - } - TRACE ("RunSetup() done.\n"); return TRUE; Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Mon Aug 6 18:41:05 2007 @@ -623,6 +623,35 @@ return TRUE; } +static BOOL +SetSetupType(DWORD dwSetupType) +{ + DWORD dwError; + HKEY hKey; + + dwError = RegOpenKeyExW( + HKEY_LOCAL_MACHINE, + L"SYSTEM\\Setup", + 0, + KEY_SET_VALUE, + &hKey); + if (dwError != ERROR_SUCCESS) + return FALSE; + + dwError = RegSetValueExW( + hKey, + L"SetupType", + 0, + REG_DWORD, + (LPBYTE)&dwSetupType, + sizeof(DWORD)); + RegCloseKey(hKey); + if (dwError != ERROR_SUCCESS) + return FALSE; + + return TRUE; +} + DWORD WINAPI InstallReactOS(HINSTANCE hInstance) { @@ -721,6 +750,7 @@ InstallWizard(); SetupCloseInfFile(hSysSetupInf); + SetSetupType(0); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); TerminateSetupActionLog();

17 years, 4 months

[greatlrd] 28193: fix a smaller issue with win32ksys, when u did delete win32k.s or type make win32ksys_clean this file was not being rebuild or remove.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Mon Aug 6 17:20:31 2007 New Revision: 28193 URL: http://svn.reactos.org/svn/reactos?rev=28193&view=rev Log: fix a smaller issue with win32ksys, when u did delete win32k.s or type make win32ksys_clean this file was not being rebuild or remove. Modified: trunk/reactos/tools/nci/nci.mak Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2819… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Mon Aug 6 17:20:31 2007 @@ -59,8 +59,7 @@ $(WIN32K_SERVICE_TABLE) \ $(NTDLL_STUBS) \ $(KERNEL_STUBS) \ - $(WIN32K_GDI_STUBS) \ - $(WIN32K_USER_STUBS) + $(WIN32K_STUBS) $(NCI_SERVICE_FILES): $(NCI_TARGET) $(KERNEL_SVC_DB) $(WIN32K_SVC_DB) $(ECHO_NCI)

17 years, 4 months

[dreimer] 28192: Reduce from 24 Bit Colors to 8 Bit. No real difference in Quality, but waaay smaller. 3 MB reduced size.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 6 17:12:01 2007 New Revision: 28192 URL: http://svn.reactos.org/svn/reactos?rev=28192&view=rev Log: Reduce from 24 Bit Colors to 8 Bit. No real difference in Quality, but waaay smaller. 3 MB reduced size. Modified: trunk/rosapps/cardsbav/res/Eichel10.bmp trunk/rosapps/cardsbav/res/Eichel2.bmp trunk/rosapps/cardsbav/res/Eichel3.bmp trunk/rosapps/cardsbav/res/Eichel4.bmp trunk/rosapps/cardsbav/res/Eichel5.bmp trunk/rosapps/cardsbav/res/Eichel6.bmp trunk/rosapps/cardsbav/res/Eichel7.bmp trunk/rosapps/cardsbav/res/Eichel8.bmp trunk/rosapps/cardsbav/res/Eichel9.bmp trunk/rosapps/cardsbav/res/EichelAs.bmp trunk/rosapps/cardsbav/res/EichelKoenig.bmp trunk/rosapps/cardsbav/res/EichelOber.bmp trunk/rosapps/cardsbav/res/EichelUnter.bmp trunk/rosapps/cardsbav/res/FreeCard.bmp trunk/rosapps/cardsbav/res/Gras10.bmp trunk/rosapps/cardsbav/res/Gras2.bmp trunk/rosapps/cardsbav/res/Gras3.bmp trunk/rosapps/cardsbav/res/Gras4.bmp trunk/rosapps/cardsbav/res/Gras5.bmp trunk/rosapps/cardsbav/res/Gras6.bmp trunk/rosapps/cardsbav/res/Gras7.bmp trunk/rosapps/cardsbav/res/Gras8.bmp trunk/rosapps/cardsbav/res/Gras9.bmp trunk/rosapps/cardsbav/res/GrasAs.bmp trunk/rosapps/cardsbav/res/GrasKoenig.bmp trunk/rosapps/cardsbav/res/GrasOber.bmp trunk/rosapps/cardsbav/res/GrasUnter.bmp trunk/rosapps/cardsbav/res/Herz10.bmp trunk/rosapps/cardsbav/res/Herz2.bmp trunk/rosapps/cardsbav/res/Herz3.bmp trunk/rosapps/cardsbav/res/Herz4.bmp trunk/rosapps/cardsbav/res/Herz5.bmp trunk/rosapps/cardsbav/res/Herz6.bmp trunk/rosapps/cardsbav/res/Herz7.bmp trunk/rosapps/cardsbav/res/Herz8.bmp trunk/rosapps/cardsbav/res/Herz9.bmp trunk/rosapps/cardsbav/res/HerzAs.bmp trunk/rosapps/cardsbav/res/HerzKoenig.bmp trunk/rosapps/cardsbav/res/HerzOber.bmp trunk/rosapps/cardsbav/res/HerzUnter.bmp trunk/rosapps/cardsbav/res/Joker.bmp trunk/rosapps/cardsbav/res/OSign.bmp trunk/rosapps/cardsbav/res/Ruecken.bmp trunk/rosapps/cardsbav/res/Schellen10.bmp trunk/rosapps/cardsbav/res/Schellen2.bmp trunk/rosapps/cardsbav/res/Schellen3.bmp trunk/rosapps/cardsbav/res/Schellen4.bmp trunk/rosapps/cardsbav/res/Schellen5.bmp trunk/rosapps/cardsbav/res/Schellen6.bmp trunk/rosapps/cardsbav/res/Schellen7.bmp trunk/rosapps/cardsbav/res/Schellen8.bmp trunk/rosapps/cardsbav/res/Schellen9.bmp trunk/rosapps/cardsbav/res/SchellenAs.bmp trunk/rosapps/cardsbav/res/SchellenKoenig.bmp trunk/rosapps/cardsbav/res/SchellenOber.bmp trunk/rosapps/cardsbav/res/SchellenUnter.bmp trunk/rosapps/cardsbav/res/XSign.bmp Modified: trunk/rosapps/cardsbav/res/Eichel10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel10.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel2.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel3.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel4.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel5.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel6.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel7.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel8.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Eichel9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Eichel9.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/EichelAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelAs.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/EichelKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelKoenig.… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/EichelOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelOber.bm… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/EichelUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/EichelUnter.b… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/FreeCard.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/FreeCard.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras10.bmp?re… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras2.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras3.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras4.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras5.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras6.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras7.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras8.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Gras9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Gras9.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/GrasAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasAs.bmp?re… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/GrasKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasKoenig.bm… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/GrasOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasOber.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/GrasUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/GrasUnter.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz10.bmp?re… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz2.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz3.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz4.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz5.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz6.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz7.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz8.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Herz9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Herz9.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/HerzAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzAs.bmp?re… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/HerzKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzKoenig.bm… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/HerzOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzOber.bmp?… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/HerzUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/HerzUnter.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Joker.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Joker.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/OSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/OSign.bmp?rev… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Ruecken.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Ruecken.bmp?r… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen10.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen10.bm… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen2.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen2.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen3.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen3.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen4.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen4.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen5.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen5.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen6.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen6.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen7.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen7.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen8.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen8.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/Schellen9.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/Schellen9.bmp… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/SchellenAs.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenAs.bm… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/SchellenKoenig.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenKoeni… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/SchellenOber.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenOber.… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/SchellenUnter.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/SchellenUnter… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/cardsbav/res/XSign.bmp URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/cardsbav/res/XSign.bmp?rev… ============================================================================== Binary files - no diff available.

17 years, 4 months

[hpoussin] 28191: Enable shutdown privilege before trying to reboot

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 6 15:57:15 2007 New Revision: 28191 URL: http://svn.reactos.org/svn/reactos?rev=28191&view=rev Log: Enable shutdown privilege before trying to reboot Modified: trunk/reactos/dll/win32/syssetup/install.c Modified: trunk/reactos/dll/win32/syssetup/install.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/install… ============================================================================== --- trunk/reactos/dll/win32/syssetup/install.c (original) +++ trunk/reactos/dll/win32/syssetup/install.c Mon Aug 6 15:57:15 2007 @@ -628,6 +628,8 @@ { TCHAR szBuffer[MAX_PATH]; DWORD LastError; + HANDLE token; + TOKEN_PRIVILEGES privs; InitializeSetupActionLog(FALSE); LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS"); @@ -723,6 +725,34 @@ LogItem(SYSSETUP_SEVERITY_INFORMATION, L"Installing ReactOS done"); TerminateSetupActionLog(); + /* Get shutdown privilege */ + if (! OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &token)) + { + DebugPrint("OpenProcessToken() failed!"); + return 0; + } + if (!LookupPrivilegeValue( + NULL, + SE_SHUTDOWN_NAME, + &privs.Privileges[0].Luid)) + { + DebugPrint("LookupPrivilegeValue() failed!"); + return 0; + } + privs.PrivilegeCount = 1; + privs.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED; + if (AdjustTokenPrivileges( + token, + FALSE, + &privs, + 0, + (PTOKEN_PRIVILEGES)NULL, + NULL) == 0) + { + DebugPrint("AdjustTokenPrivileges() failed!"); + return 0; + } + /// THE FOLLOWING DPRINT IS FOR THE SYSTEM REGRESSION TOOL /// DO NOT REMOVE!!! DbgPrint("SYSREG_CHECKPOINT:SYSSETUP_COMPLETE\n");

17 years, 4 months

[dreimer] 28190: - Make a Subfolder for Patches. - Add w3seek's MinGW GCC 4.1.X Branch Patch.

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Aug 6 15:53:48 2007 New Revision: 28190 URL: http://svn.reactos.org/svn/reactos?rev=28190&view=rev Log: - Make a Subfolder for Patches. - Add w3seek's MinGW GCC 4.1.X Branch Patch. Added: trunk/tools/RosBE-Windows/Patches/ trunk/tools/RosBE-Windows/Patches/ld.patch trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Removed: trunk/tools/RosBE-Windows/Root/ld.patch Added: trunk/tools/RosBE-Windows/Patches/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/ld.pat… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/ld.patch (added) +++ trunk/tools/RosBE-Windows/Patches/ld.patch Mon Aug 6 15:53:48 2007 @@ -1,0 +1,15 @@ +--- ld/pe-dll.c Thu Jul 19 13:12:24 2007 ++++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 +@@ -524,10 +524,9 @@ + } + } + +- /* If we are not building a DLL, when there are no exports ++ /* If there are no exports + we do not build an export table at all. */ +- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 +- && info->executable) ++ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) + return; + + /* Now, maybe export everything else the default way. */ Added: trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Patches/mingw-… ============================================================================== --- trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch (added) +++ trunk/tools/RosBE-Windows/Patches/mingw-lazy-port-gcc-4_1-branch.patch Mon Aug 6 15:53:48 2007 @@ -1,0 +1,278 @@ +Index: gcc/config/i386/cygming.h +=================================================================== +--- gcc/config/i386/cygming.h (revision 125623) ++++ gcc/config/i386/cygming.h (working copy) +@@ -335,6 +335,7 @@ + extern void i386_pe_file_end (void); + extern int i386_pe_dllexport_name_p (const char *); + extern int i386_pe_dllimport_name_p (const char *); ++extern void i386_pe_decorate_assembler_name (tree); + + /* For Win32 ABI compatibility */ + #undef DEFAULT_PCC_STRUCT_RETURN +@@ -412,6 +413,7 @@ + + #define TARGET_VALID_DLLIMPORT_ATTRIBUTE_P i386_pe_valid_dllimport_attribute_p + #define TARGET_CXX_ADJUST_CLASS_AT_DEFINITION i386_pe_adjust_class_at_definition ++#define TARGET_ASM_CHANGE_EXTERN_NAME i386_pe_decorate_assembler_name + + #undef TREE + +Index: gcc/config/i386/host-mingw32.c +=================================================================== +--- gcc/config/i386/host-mingw32.c (revision 125623) ++++ gcc/config/i386/host-mingw32.c (working copy) +@@ -28,6 +28,8 @@ + + + #define WIN32_LEAN_AND_MEAN /* Not so important if we have windows.h.gch. */ ++#include <tchar.h> ++#include <stdlib.h> + #include <windows.h> + + static void * mingw32_gt_pch_get_address (size_t, int); +@@ -47,7 +49,7 @@ + static const size_t pch_VA_max_size = 128 * 1024 * 1024; + + /* Granularity for reserving address space. */ +-static const size_t va_granularity = 0x10000; ++static size_t va_granularity = 0x10000; + + /* Print out the GetLastError() translation. */ + static inline void +@@ -70,7 +72,9 @@ + /* Granularity for reserving address space. */ + static size_t mingw32_gt_pch_alloc_granularity (void) + { +- return va_granularity; ++ SYSTEM_INFO SysInfo; ++ GetSystemInfo(&SysInfo); ++ return (va_granularity = (size_t)SysInfo.dwAllocationGranularity); + } + + /* Identify an address that's likely to be free in a subsequent invocation +@@ -125,9 +129,23 @@ + if ((offset & (va_granularity - 1)) != 0 || size > pch_VA_max_size) + return -1; + +- mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), +- NULL, PAGE_WRITECOPY | SEC_COMMIT, +- 0, 0, NULL); ++ srand(1); ++ while (1) ++ { ++ TCHAR szMappingName[26]; ++ ++ /* Generate a unique mapping name. This is neccessary to avoid ++ needing the SeCreateGlobalPrivilege privilege in certain cases */ ++ _stprintf(szMappingName, _T("Local\\MinGWGCCPCH%08X"), rand()); ++ mmap_handle = CreateFileMapping ((HANDLE) _get_osfhandle (fd), ++ NULL, PAGE_WRITECOPY | SEC_COMMIT, ++ 0, 0, szMappingName); ++ if (mmap_handle != NULL && GetLastError() == ERROR_ALREADY_EXISTS) ++ CloseHandle(mmap_handle); ++ else ++ break; ++ } ++ + if (mmap_handle == NULL) + { + w32_error (__FUNCTION__, __FILE__, __LINE__, "CreateFileMapping"); +Index: gcc/config/i386/winnt.c +=================================================================== +--- gcc/config/i386/winnt.c (revision 125623) ++++ gcc/config/i386/winnt.c (working copy) +@@ -335,33 +335,38 @@ + } + + void +-i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++i386_pe_decorate_assembler_name (tree decl) + { +- default_encode_section_info (decl, rtl, first); ++ tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); ++ tree newid = NULL_TREE; + +- if (first && TREE_CODE (decl) == FUNCTION_DECL) +- { +- tree type_attributes = TYPE_ATTRIBUTES (TREE_TYPE (decl)); +- tree newid = NULL_TREE; ++ if (lookup_attribute ("stdcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, false); ++ else if (lookup_attribute ("fastcall", type_attributes)) ++ newid = gen_stdcall_or_fastcall_suffix (decl, true); ++ if (newid != NULL_TREE) ++ { ++ rtx rtlname = XEXP (DECL_RTL (decl), 0); ++ if (GET_CODE (rtlname) == MEM) ++ rtlname = XEXP (rtlname, 0); ++ XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); + +- if (lookup_attribute ("stdcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, false); +- else if (lookup_attribute ("fastcall", type_attributes)) +- newid = gen_stdcall_or_fastcall_suffix (decl, true); +- if (newid != NULL_TREE) +- { +- rtx rtlname = XEXP (rtl, 0); +- if (GET_CODE (rtlname) == MEM) +- rtlname = XEXP (rtlname, 0); +- XSTR (rtlname, 0) = IDENTIFIER_POINTER (newid); +- /* These attributes must be present on first declaration, ++ /* These attributes must be present on first declaration, + change_decl_assembler_name will warn if they are added + later and the decl has been referenced, but duplicate_decls + should catch the mismatch before this is called. */ + change_decl_assembler_name (decl, newid); +- } + } ++ } + ++void ++i386_pe_encode_section_info (tree decl, rtx rtl, int first) ++{ ++ default_encode_section_info (decl, rtl, first); ++ ++ if (first && TREE_CODE (decl) == FUNCTION_DECL) ++ i386_pe_decorate_assembler_name (decl); ++ + /* Mark the decl so we can tell from the rtl whether the object is + dllexport'd or dllimport'd. tree.c: merge_dllimport_decl_attributes + handles dllexport/dllimport override semantics. */ +Index: gcc/cp/method.c +=================================================================== +--- gcc/cp/method.c (revision 125623) ++++ gcc/cp/method.c (working copy) +@@ -350,6 +350,8 @@ + this translation unit. */ + TREE_ADDRESSABLE (function) = 1; + mark_used (function); ++ /* The DECL_ASSEMBLER_NAME of the thunked function may need modification. */ ++ targetm.asm_out.change_extern_name (function); + if (!emit_p) + return; + +Index: gcc/target-def.h +=================================================================== +--- gcc/target-def.h (revision 125623) ++++ gcc/target-def.h (working copy) +@@ -205,6 +205,10 @@ + #define TARGET_ASM_OUTPUT_DWARF_DTPREL NULL + #endif + ++#ifndef TARGET_ASM_CHANGE_EXTERN_NAME ++#define TARGET_ASM_CHANGE_EXTERN_NAME hook_void_tree ++#endif ++ + #define TARGET_ASM_ALIGNED_INT_OP \ + {TARGET_ASM_ALIGNED_HI_OP, \ + TARGET_ASM_ALIGNED_SI_OP, \ +@@ -248,7 +252,8 @@ + TARGET_ASM_FILE_END, \ + TARGET_ASM_EXTERNAL_LIBCALL, \ + TARGET_ASM_MARK_DECL_PRESERVED, \ +- TARGET_ASM_OUTPUT_DWARF_DTPREL} ++ TARGET_ASM_OUTPUT_DWARF_DTPREL, \ ++ TARGET_ASM_CHANGE_EXTERN_NAME} + + /* Scheduler hooks. All of these default to null pointers, which + haifa-sched.c looks for and handles. */ +Index: gcc/target.h +=================================================================== +--- gcc/target.h (revision 125623) ++++ gcc/target.h (working copy) +@@ -186,6 +186,13 @@ + /* Output a DTP-relative reference to a TLS symbol. */ + void (*output_dwarf_dtprel) (FILE *file, int size, rtx x); + ++/* This target hook allows the operating system to modify the extern ++ assembler name ++ of a DECL. For example, windows targets use this to decorate stdcall and ++ fastcall functions ++ with a a trailing '@n'. */ ++ void (*change_extern_name) (tree decl); ++ + } asm_out; + + /* Functions relating to instruction scheduling. */ +Index: libstdc++-v3/config/os/mingw32/os_defines.h +=================================================================== +--- libstdc++-v3/config/os/mingw32/os_defines.h (revision 125623) ++++ libstdc++-v3/config/os/mingw32/os_defines.h (working copy) +@@ -45,6 +45,13 @@ + #undef NOMINMAX + #define NOMINMAX 1 + ++// mingw32 local hack: Override _GLIBCXX_USE_WCHAR_T for wstring ++#define _GLIBCXX_USE_WSTRING 1 ++ ++// mingw32 local hack: Cast long double to doubles to workaround ++// printf bug. ++#define _GLIBCXX_NO_LONG_DOUBLE_IO 0 ++ + // See libstdc++/20806. + #define _GLIBCXX_HAVE_DOS_BASED_FILESYSTEM 1 + +Index: libstdc++-v3/include/bits/char_traits.h +=================================================================== +--- libstdc++-v3/include/bits/char_traits.h (revision 125623) ++++ libstdc++-v3/include/bits/char_traits.h (working copy) +@@ -295,7 +295,7 @@ + }; + + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + /// @brief 21.1.3.2 char_traits specializations + template<> + struct char_traits<wchar_t> +@@ -303,8 +303,10 @@ + typedef wchar_t char_type; + typedef wint_t int_type; + typedef streamoff off_type; ++#if defined (_GLIBCXX_USE_WCHAR_T) + typedef wstreampos pos_type; + typedef mbstate_t state_type; ++#endif + + static void + assign(char_type& __c1, const char_type& __c2) +Index: libstdc++-v3/include/bits/stringfwd.h +=================================================================== +--- libstdc++-v3/include/bits/stringfwd.h (revision 125623) ++++ libstdc++-v3/include/bits/stringfwd.h (working copy) +@@ -59,7 +59,7 @@ + + typedef basic_string<char> string; + +-#ifdef _GLIBCXX_USE_WCHAR_T ++#if defined (_GLIBCXX_USE_WCHAR_T) || defined (_GLIBCXX_USE_WSTRING) + template<> struct char_traits<wchar_t>; + + typedef basic_string<wchar_t> wstring; +Index: libstdc++-v3/include/c_std/std_cwchar.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwchar.h (revision 125623) ++++ libstdc++-v3/include/c_std/std_cwchar.h (working copy) +@@ -138,7 +138,7 @@ + #undef wprintf + #undef wscanf + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; +Index: libstdc++-v3/include/c_std/std_cwctype.h +=================================================================== +--- libstdc++-v3/include/c_std/std_cwctype.h (revision 125623) ++++ libstdc++-v3/include/c_std/std_cwctype.h (working copy) +@@ -75,7 +75,7 @@ + #undef wctrans + #undef wctype + +-#if _GLIBCXX_USE_WCHAR_T ++#if _GLIBCXX_USE_WCHAR_T || _GLIBCXX_USE_WSTRING + namespace std + { + using ::wint_t; // cwchar Removed: trunk/tools/RosBE-Windows/Root/ld.patch URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/ld.patch?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/ld.patch (original) +++ trunk/tools/RosBE-Windows/Root/ld.patch (removed) @@ -1,15 +1,0 @@ ---- ld/pe-dll.c Thu Jul 19 13:12:24 2007 -+++ ld/pe-dll.c Fri Aug 3 09:53:58 2007 -@@ -524,10 +524,9 @@ - } - } - -- /* If we are not building a DLL, when there are no exports -+ /* If there are no exports - we do not build an export table at all. */ -- if (!pe_dll_export_everything && pe_def_file->num_exports == 0 -- && info->executable) -+ if (!pe_dll_export_everything && pe_def_file->num_exports == 0) - return; - - /* Now, maybe export everything else the default way. */

17 years, 4 months

[hpoussin] 28189: Remove ARCH define in config.template.rbuild. It is a duplicate of the ROS_ARCH environment variable.

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 6 13:25:03 2007 New Revision: 28189 URL: http://svn.reactos.org/svn/reactos?rev=28189&view=rev Log: Remove ARCH define in config.template.rbuild. It is a duplicate of the ROS_ARCH environment variable. Modified: trunk/reactos/Makefile trunk/reactos/config-ppc.template.rbuild trunk/reactos/config.template.rbuild Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=28189&r1=2818… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Mon Aug 6 13:25:03 2007 @@ -380,7 +380,7 @@ endif INSTALL_ := $(INSTALL)$(SEP) -RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild +RBUILD_FLAGS := -rReactOS-$(ARCH).rbuild -DARCH=$(ARCH) $(INTERMEDIATE): ${mkdir} $@ Modified: trunk/reactos/config-ppc.template.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/config-ppc.template.rbuild… ============================================================================== --- trunk/reactos/config-ppc.template.rbuild (original) +++ trunk/reactos/config-ppc.template.rbuild Mon Aug 6 13:25:03 2007 @@ -11,12 +11,6 @@ options can obtain any value specified in the comment before it. --> - - -<property name="ARCH" value="powerpc" />  - - -<property name="ARCH" value="i386" /> <!-- Sub-architecture to build for. Specify one of:

17 years, 4 months

[hpoussin] 28188: Add -D option to add variables in generated file

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon Aug 6 13:19:25 2007 New Revision: 28188 URL: http://svn.reactos.org/svn/reactos?rev=28188&view=rev Log: Add -D option to add variables in generated file Modified: trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/project.cpp trunk/reactos/tools/rbuild/rbuild.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp (original) +++ trunk/reactos/tools/rbuild/module.cpp Mon Aug 6 13:19:25 2007 @@ -1509,17 +1509,25 @@ Property::Property ( const XMLElement& node_, const Project& project_, const Module* module_ ) - : node(node_), project(project_), module(module_) + : project(project_), module(module_) { const XMLAttribute* att; - att = node.GetAttribute ( "name", true ); + att = node_.GetAttribute ( "name", true ); assert(att); name = att->value; - att = node.GetAttribute ( "value", true ); + att = node_.GetAttribute ( "value", true ); assert(att); value = att->value; +} + +Property::Property ( const Project& project_, + const Module* module_, + const std::string& name_, + const std::string& value_ ) + : project(project_), module(module_), name(name_), value(value_) +{ } void Modified: trunk/reactos/tools/rbuild/project.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/project.cpp?r… ============================================================================== --- trunk/reactos/tools/rbuild/project.cpp (original) +++ trunk/reactos/tools/rbuild/project.cpp Mon Aug 6 13:19:25 2007 @@ -103,13 +103,29 @@ Project::Project ( const Configuration& configuration, - const string& filename ) + const string& filename, + const std::map<std::string, std::string>* properties ) : xmlfile (filename), node (NULL), head (NULL), configuration (configuration) { _backend = NULL; + + if ( properties ) + { + std::map<string, string>::const_iterator it; + for (it = properties->begin (); it != properties->end (); it++) + { + const Property *existing = LookupProperty( it->first ); + if ( !existing ) + { + Property* property = new Property ( *this, NULL, it->first, it->second ); + non_if_data.properties.push_back (property ); + } + } + } + ReadXml(); } Modified: trunk/reactos/tools/rbuild/rbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.cpp (original) +++ trunk/reactos/tools/rbuild/rbuild.cpp Mon Aug 6 13:19:25 2007 @@ -35,6 +35,7 @@ static string BuildSystem; static string RootXmlFile; static Configuration configuration; +static std::map<string, string> properties; bool ParseAutomaticDependencySwitch ( @@ -164,6 +165,28 @@ switchChar2 ); return false; } + return true; +} + +bool +ParseDefineSwitch ( char* switchStart ) +{ + string s = string ( switchStart + 2 ); + string::size_type separator = s.find ( '=' ); + if ( separator == string::npos || separator == 0 ) + { + printf ( "Invalid define switch: '%s'\n", switchStart ); + return false; + } + if ( s.find ( '=', separator + 1 ) != string::npos ) + { + printf ( "Invalid define switch: '%s'\n", switchStart ); + return false; + } + + string var = s.substr ( 0, separator ); + string val = s.substr ( separator + 1 ); + properties.insert ( std::pair<string, string> ( var, val ) ); return true; } @@ -202,6 +225,8 @@ return ParseMakeSwitch ( switchChar2 ); case 'p': return ParseProxyMakefileSwitch ( switchChar2 ); + case 'D': + return ParseDefineSwitch ( argv[index] ); default: printf ( "Unknown switch -%c\n", @@ -253,6 +278,7 @@ printf ( " tree.\n" ); printf ( " -vs{version} Version of MS VS project files. Default is %s.\n", MS_VS_DEF_VERSION ); printf ( " -vo{version|configuration} Adds subdirectory path to the default Intermediate-Outputdirectory.\n" ); + printf ( " -Dvar=val Set the value of 'var' variable to 'val'.\n" ); printf ( "\n" ); printf ( " buildsystem Target build system. Can be one of:\n" ); @@ -272,7 +298,7 @@ string projectFilename ( RootXmlFile ); printf ( "Reading build files..." ); - Project project ( configuration, projectFilename ); + Project project ( configuration, projectFilename, &properties ); printf ( "done\n" ); project.SetBackend ( Backend::Factory::Create ( Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h (original) +++ trunk/reactos/tools/rbuild/rbuild.h Mon Aug 6 13:19:25 2007 @@ -215,7 +215,8 @@ IfableData non_if_data; Project ( const Configuration& configuration, - const std::string& filename ); + const std::string& filename, + const std::map<std::string, std::string>* properties = NULL ); ~Project (); void SetBackend ( Backend* backend ) { _backend = backend; } Backend& GetBackend() { return *_backend; } @@ -590,7 +591,6 @@ class Property { public: - const XMLElement& node; const Project& project; const Module* module; std::string name, value; @@ -598,6 +598,11 @@ Property ( const XMLElement& node_, const Project& project_, const Module* module_ ); + + Property ( const Project& project_, + const Module* module_, + const std::string& name_, + const std::string& value_ ); void ProcessXML(); };

17 years, 4 months

← Newer
1
...
51
52
53
54
55
56
57
...
67
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 August 2007