Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cfinck] 28200: Expand environment strings in the szWallpaper variable. (patch by Marc Piulachs, marc DOT piulachs AT codexchange DOT net) This is the same way how Windows XP does it (allowing environment variables in the "Wallpaper" registry value, but not as an argument for SystemParametersInfo, SPI_SETDESKWALLPAPER) See issue #2536 for more details.
by cfinck＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: cfinck Date: Mon Aug 6 23:07:34 2007 New Revision: 28200 URL: http://svn.reactos.org/svn/reactos?rev=28200&view=rev Log: Expand environment strings in the szWallpaper variable. (patch by Marc Piulachs, marc DOT piulachs AT codexchange DOT net) This is the same way how Windows XP does it (allowing environment variables in the "Wallpaper" registry value, but not as an argument for SystemParametersInfo, SPI_SETDESKWALLPAPER) See issue #2536 for more details. Modified: trunk/reactos/base/system/userinit/userinit.c Modified: trunk/reactos/base/system/userinit/userinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/useri… ============================================================================== --- trunk/reactos/base/system/userinit/userinit.c (original) +++ trunk/reactos/base/system/userinit/userinit.c Mon Aug 6 23:07:34 2007 @@ -434,6 +434,8 @@ &Size) == ERROR_SUCCESS && Type == REG_SZ) { + ExpandEnvironmentStrings(szWallpaper, szWallpaper, MAX_PATH); + /* Load and change the wallpaper */ SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, szWallpaper, SPIF_SENDCHANGE); }

1 0

[hpoussin] 28199: Add more uuids in uuid lib
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: hpoussin Date: Mon Aug 6 20:17:55 2007 New Revision: 28199 URL: http://svn.reactos.org/svn/reactos?rev=28199&view=rev Log: Add more uuids in uuid lib Modified: trunk/reactos/lib/sdk/uuid/uuid.c Modified: trunk/reactos/lib/sdk/uuid/uuid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/uuid/uuid.c?rev=28… ============================================================================== --- trunk/reactos/lib/sdk/uuid/uuid.c (original) +++ trunk/reactos/lib/sdk/uuid/uuid.c Mon Aug 6 20:17:55 2007 @@ -42,8 +42,11 @@ #include "mshtmhst.h" #include "docobj.h" #include "exdisp.h" +#include "htiframe.h" +#include "urlhist.h" #include "hlink.h" +#include "mlang.h" #include "shlguid.h" #include "shlobj.h" #include "shldisp.h"

1 0

[hpoussin] 28198: Generate as much headers as possible from idl
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

Author: hpoussin Date: Mon Aug 6 20:16:57 2007 New Revision: 28198 URL: http://svn.reactos.org/svn/reactos?rev=28198&view=rev Log: Generate as much headers as possible from idl Removed: trunk/reactos/include/psdk/activscp.h trunk/reactos/include/psdk/control.h trunk/reactos/include/psdk/dispex.h trunk/reactos/include/psdk/downloadmgr.h trunk/reactos/include/psdk/hlink.h trunk/reactos/include/psdk/htiframe.h trunk/reactos/include/psdk/iads.h trunk/reactos/include/psdk/indexsrv.h trunk/reactos/include/psdk/mimeinfo.h trunk/reactos/include/psdk/mlang.h trunk/reactos/include/psdk/mshtml.h trunk/reactos/include/psdk/msxml.h Modified: trunk/reactos/include/psdk/psdk.rbuild [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/psdk/activscp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activscp.h?re… Removed: trunk/reactos/include/psdk/control.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/control.h?rev… Removed: trunk/reactos/include/psdk/dispex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dispex.h?rev=… Removed: trunk/reactos/include/psdk/downloadmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/downloadmgr.h… Removed: trunk/reactos/include/psdk/hlink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/hlink.h?rev=2… Removed: trunk/reactos/include/psdk/htiframe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/htiframe.h?re… Removed: trunk/reactos/include/psdk/iads.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/iads.h?rev=28… Removed: trunk/reactos/include/psdk/indexsrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/indexsrv.h?re… Removed: trunk/reactos/include/psdk/mimeinfo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mimeinfo.h?re… Removed: trunk/reactos/include/psdk/mlang.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mlang.h?rev=2… Removed: trunk/reactos/include/psdk/mshtml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mshtml.h?rev=… Removed: trunk/reactos/include/psdk/msxml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/msxml.h?rev=2… Modified: trunk/reactos/include/psdk/psdk.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/psdk.rbuild?r…

1 0

[hpoussin] 28197: Add some prototypes
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

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

1 0

[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 06 Aug '07

06 Aug '07

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.

1 0

[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 06 Aug '07

06 Aug '07

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

1 0

[hpoussin] 28194: Set setup type to 0 before the end of 2nd stage in syssetup instead of winlogon
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

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();

1 0

[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 06 Aug '07

06 Aug '07

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)

1 0

[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 06 Aug '07

06 Aug '07

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.

1 0

[hpoussin] 28191: Enable shutdown privilege before trying to reboot
by hpoussin＠svn.reactos.org 06 Aug '07

06 Aug '07

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");

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs