Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[fireball] 27726: - Revert vis.c and winpos.c changes from 27672, due to a bug 2409. - Fix win32k compiling without compilation units. See issue #2409 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jul 19 16:43:54 2007 New Revision: 27726 URL: http://svn.reactos.org/svn/reactos?rev=27726&view=rev Log: - Revert vis.c and winpos.c changes from 27672, due to a bug 2409. - Fix win32k compiling without compilation units. See issue #2409 for more details. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/painting.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/painting.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/painting.c Thu Jul 19 16:43:54 2007 @@ -229,7 +229,7 @@ * Internal function used by IntRedrawWindow. */ -static VOID FASTCALL +VOID FASTCALL co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags, BOOL Recurse) { HDC hDC; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c Thu Jul 19 16:43:54 2007 @@ -167,7 +167,7 @@ UserRefObjectCo(Parent, &Ref); co_UserRedrawWindow(Parent, NULL, Temp, - RDW_FRAME | RDW_ERASE | RDW_ERASENOW | RDW_INVALIDATE | + RDW_FRAME | RDW_ERASE | RDW_INVALIDATE | RDW_ALLCHILDREN); UserDerefObjectCo(Parent); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Thu Jul 19 16:43:54 2007 @@ -32,6 +32,12 @@ #define NDEBUG #include <debug.h> + +VOID FASTCALL +co_IntPaintWindows(PWINDOW_OBJECT Window, ULONG Flags, BOOL Recurse); + +BOOL FASTCALL +IntValidateParent(PWINDOW_OBJECT Child, HRGN hValidateRgn, BOOL Recurse); /* GLOBALS *******************************************************************/ @@ -969,7 +975,7 @@ } WvrFlags = co_WinPosDoNCCALCSize(Window, &WinPos, &NewWindowRect, &NewClientRect); - + //DPRINT1("co_WinPosDoNCCALCSize"); /* Relink windows. (also take into account shell window in hwndShellWindow) */ @@ -1197,7 +1203,6 @@ CopyRect.left + (OldWindowRect.left - NewWindowRect.left), CopyRect.top + (OldWindowRect.top - NewWindowRect.top), SRCCOPY, 0, 0); UserReleaseDC(Window, Dc, FALSE); - IntValidateParent(Window, CopyRgn, FALSE); NtGdiOffsetRgn(CopyRgn, -NewWindowRect.left, -NewWindowRect.top); } else if(VisRgn) @@ -1224,6 +1229,14 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { + /* old code + NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left, Window->WindowRect.top); + IntInvalidateWindows(Window, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + } + NtGdiDeleteObject(DirtyRgn); + */ + PWINDOW_OBJECT Parent = Window->Parent; NtGdiOffsetRgn(DirtyRgn, @@ -1234,16 +1247,13 @@ !(Parent->Style & WS_CLIPCHILDREN)) { IntInvalidateWindows(Parent, DirtyRgn, - RDW_ERASE | RDW_INVALIDATE | RDW_NOCHILDREN); - co_IntPaintWindows(Parent, RDW_ERASENOW | RDW_NOCHILDREN, FALSE); - IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); + RDW_ERASE | RDW_INVALIDATE); + co_IntPaintWindows(Parent, RDW_ERASENOW, FALSE); } else { - IntInvalidateWindows(Window, DirtyRgn, - RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); - co_IntPaintWindows(Window, RDW_ERASENOW, FALSE); + IntInvalidateWindows(Window, DirtyRgn, + RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } } NtGdiDeleteObject(DirtyRgn); @@ -1294,33 +1304,6 @@ if ((WinPos.flags & SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE) co_IntPostOrSendMessage(WinPos.hwnd, WM_WINDOWPOSCHANGED, 0, (LPARAM) &WinPos); - - if ((Window->Flags & WINDOWOBJECT_NEED_SIZE) && - !(Window->Status & WINDOWSTATUS_DESTROYING)) - { - WPARAM wParam = SIZE_RESTORED; - - Window->Flags &= ~WINDOWOBJECT_NEED_SIZE; - if (Window->Style & WS_MAXIMIZE) - { - wParam = SIZE_MAXIMIZED; - } - else if (Window->Style & WS_MINIMIZE) - { - wParam = SIZE_MINIMIZED; - } - - co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, - MAKELONG(Window->ClientRect.right - - Window->ClientRect.left, - Window->ClientRect.bottom - - Window->ClientRect.top)); - co_IntSendMessage(Window->hSelf, WM_MOVE, 0, - MAKELONG(Window->ClientRect.left, - Window->ClientRect.top)); - IntEngWindowChanged(Window, WOC_RGN_CLIENT); - - } return TRUE; } @@ -1490,6 +1473,33 @@ /* FIXME: Check for window destruction. */ + if ((Window->Flags & WINDOWOBJECT_NEED_SIZE) && + !(Window->Status & WINDOWSTATUS_DESTROYING)) + { + WPARAM wParam = SIZE_RESTORED; + + Window->Flags &= ~WINDOWOBJECT_NEED_SIZE; + if (Window->Style & WS_MAXIMIZE) + { + wParam = SIZE_MAXIMIZED; + } + else if (Window->Style & WS_MINIMIZE) + { + wParam = SIZE_MINIMIZED; + } + + co_IntSendMessage(Window->hSelf, WM_SIZE, wParam, + MAKELONG(Window->ClientRect.right - + Window->ClientRect.left, + Window->ClientRect.bottom - + Window->ClientRect.top)); + co_IntSendMessage(Window->hSelf, WM_MOVE, 0, + MAKELONG(Window->ClientRect.left, + Window->ClientRect.top)); + IntEngWindowChanged(Window, WOC_RGN_CLIENT); + + } + /* Activate the window if activation is not requested and the window is not minimized */ /* if (!(Swp & (SWP_NOACTIVATE | SWP_HIDEWINDOW)) && !(Window->Style & WS_MINIMIZE))

17 years, 5 months

[fireball] 27725: Patch by Dmitry Chapyshev <lentind@yandex.ru>: - Make downloader icon in multiple color depths. - Remove a newline character from winver's window title.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jul 19 16:14:08 2007 New Revision: 27725 URL: http://svn.reactos.org/svn/reactos?rev=27725&view=rev Log: Patch by Dmitry Chapyshev <lentind(a)yandex.ru>: - Make downloader icon in multiple color depths. - Remove a newline character from winver's window title. Modified: trunk/rosapps/downloader/resources/main.ico trunk/rosapps/winver/winver.c Modified: trunk/rosapps/downloader/resources/main.ico URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/downloader/resources/main.… ============================================================================== Binary files - no diff available. Modified: trunk/rosapps/winver/winver.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/winver/winver.c?rev=27725&… ============================================================================== --- trunk/rosapps/winver/winver.c (original) +++ trunk/rosapps/winver/winver.c Thu Jul 19 16:14:08 2007 @@ -2,7 +2,7 @@ #include <tchar.h> int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - static const WCHAR szROS[] = { 'R','e','a','c','t','O','S','\n',0 }; + static const WCHAR szROS[] = { 'R','e','a','c','t','O','S',0 }; UNREFERENCED_PARAMETER(lpCmdLine); UNREFERENCED_PARAMETER(nCmdShow); UNREFERENCED_PARAMETER(hPrevInstance);

17 years, 5 months

[fireball] 27724: - Comment those 2 keyboard layouts so that trunk is installable. Uncommenting them reveals a bug in Config Manager, which is being investigated. - DPRINT -> DPRINT1 for a critical error message.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jul 19 01:49:10 2007 New Revision: 27724 URL: http://svn.reactos.org/svn/reactos?rev=27724&view=rev Log: - Comment those 2 keyboard layouts so that trunk is installable. Uncommenting them reveals a bug in Config Manager, which is being investigated. - DPRINT -> DPRINT1 for a critical error message. Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/ntoskrnl/cm/ntfunc.c Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Thu Jul 19 01:49:10 2007 @@ -88,8 +88,8 @@ HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000422","Layout Text",0x00000000,"Ukrainian" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout File",0x00000000,"kbdbur.dll" HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000455","Layout Text",0x00000000,"Burmese" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" -HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" +;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout File",0x00000000,"kbdno.dll" +;HKLM,"SYSTEM\CurrentControlSet\Control\KeyboardLayouts\00000414","Layout Text",0x00000000,"Norwegian" ; Network HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}",,0x00000000,"Network Adapters" Modified: trunk/reactos/ntoskrnl/cm/ntfunc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/ntfunc.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/ntfunc.c (original) +++ trunk/reactos/ntoskrnl/cm/ntfunc.c Thu Jul 19 01:49:10 2007 @@ -1040,7 +1040,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT("ObReferenceObjectByHandle() failed with Status = 0x%08X\n"); + DPRINT1("ObReferenceObjectByHandle() failed with Status = 0x%08X\n", Status); return Status; }

17 years, 5 months

[cfinck] 27723: Remove the wrong \0 character

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Jul 19 00:00:26 2007 New Revision: 27723 URL: http://svn.reactos.org/svn/reactos?rev=27723&view=rev Log: Remove the wrong \0 character Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c (original) +++ trunk/reactos/base/shell/cmd/internal.c Thu Jul 19 00:00:26 2007 @@ -768,7 +768,7 @@ { LPTSTR NewCommand = malloc((_tcslen(param)+4)*sizeof(TCHAR)); _tcscpy(NewCommand, param); - _tcscat(NewCommand, _T(" /?\0")); + _tcscat(NewCommand, _T(" /?")); DoCommand(NewCommand); free(NewCommand); }

17 years, 5 months

[cfinck] 27722: Add the missing "help <command>" functionality in cmd (patch by Pierre Schweitzer, heis_spiter AT hotmail DOT com) I slightly modified the patch to include a terminating null character See issue #2406 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 18 23:41:25 2007 New Revision: 27722 URL: http://svn.reactos.org/svn/reactos?rev=27722&view=rev Log: Add the missing "help <command>" functionality in cmd (patch by Pierre Schweitzer, heis_spiter AT hotmail DOT com) I slightly modified the patch to include a terminating null character See issue #2406 for more details. Modified: trunk/reactos/base/shell/cmd/internal.c Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/internal.c (original) +++ trunk/reactos/base/shell/cmd/internal.c Wed Jul 18 23:41:25 2007 @@ -127,11 +127,14 @@ * Remove all hard code string so they can be * translate to other langues. * - * 19-jul-2005 (Brandon Turner <turnerb7(a)msu.edu) + * 19-Jul-2005 (Brandon Turner <turnerb7(a)msu.edu>) * Rewrite the CD, it working as Windows 2000 CMD * - * 19-jul-2005 (Magnus Olsen <magnus(a)greatlord.com) - * Add SetRootPath and GetRootPath + * 19-Jul-2005 (Magnus Olsen <magnus(a)greatlord.com>) + * Add SetRootPath and GetRootPath + * + * 14-Jul-2007 (Pierre Schweitzer <heis_spiter(a)hotmail.com>) + * Added commands help display to help command (ex. : "help cmd") */ #include <precomp.h> @@ -760,7 +763,20 @@ INT CommandShowCommandsDetail (LPTSTR cmd, LPTSTR param) { - PrintCommandListDetail (); + /* If a param was send, display help of correspondent command */ + if (_tcslen(param)) + { + LPTSTR NewCommand = malloc((_tcslen(param)+4)*sizeof(TCHAR)); + _tcscpy(NewCommand, param); + _tcscat(NewCommand, _T(" /?\0")); + DoCommand(NewCommand); + free(NewCommand); + } + /* Else, display detailed commands list */ + else + { + PrintCommandListDetail (); + } return 0; }

17 years, 5 months

[cfinck] 27721: - Localize the Usage message of "shutdown" and add a german localization - Also add a version resource Translators, feel free to make translations for this tool :-)

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 18 22:40:07 2007 New Revision: 27721 URL: http://svn.reactos.org/svn/reactos?rev=27721&view=rev Log: - Localize the Usage message of "shutdown" and add a german localization - Also add a version resource Translators, feel free to make translations for this tool :-) Added: trunk/reactos/base/applications/shutdown/lang/ trunk/reactos/base/applications/shutdown/lang/de-DE.rc trunk/reactos/base/applications/shutdown/lang/en-US.rc trunk/reactos/base/applications/shutdown/misc.c trunk/reactos/base/applications/shutdown/precomp.h trunk/reactos/base/applications/shutdown/resource.h trunk/reactos/base/applications/shutdown/rsrc.rc trunk/reactos/base/applications/shutdown/shutdown.rc Modified: trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/base/applications/shutdown/shutdown.rbuild Added: trunk/reactos/base/applications/shutdown/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/de-DE.rc Wed Jul 18 22:40:07 2007 @@ -1,0 +1,19 @@ +/* + * German language file by Colin Finck <2007-07-18> + */ + +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Syntax: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + Keine Argumente\tDiese Meldung anzeigen\n\ + -?\t\t\tDiese Meldung anzeigen\n\ + -l\t\t\tBenutzer abmelden\n\ + -s\t\t\tComputer herunterfahren\n\ + -r\t\t\tComputer herunterfahren und neu starten\n\ + -f\t\t\tLaufende Anwendungen ohne Warnung schlieáen\n\ + \t\t\tWenn Sie keine weiteren Parameter angegeben haben,\n\ + \t\t\tmeldet Sie diese Option auch ab" +} Added: trunk/reactos/base/applications/shutdown/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/lang/en-US.rc (added) +++ trunk/reactos/base/applications/shutdown/lang/en-US.rc Wed Jul 18 22:40:07 2007 @@ -1,0 +1,14 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE DISCARDABLE +{ + +IDS_USAGE, "Usage: shutdown [-?] [-l | -s | -r] [-f]\n\n\ + No arguments or -?\tDisplay this message\n\ + -l\t\t\tLog off\n\ + -s\t\t\tShutdown the computer\n\ + -r\t\t\tShutdown and restart the computer\n\ + -f\t\t\tForces running applications to close without warnings\n\ + \t\t\tIf you did not specify any other parameter, this option\n\ + \t\t\twill also log off" +} Added: trunk/reactos/base/applications/shutdown/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/misc.c (added) +++ trunk/reactos/base/applications/shutdown/misc.c Wed Jul 18 22:40:07 2007 @@ -1,0 +1,63 @@ +#include "precomp.h" + +static INT +LengthOfStrResource(IN HINSTANCE hInst, + IN UINT uID) +{ + HRSRC hrSrc; + HGLOBAL hRes; + LPWSTR lpName, lpStr; + + if (hInst == NULL) + { + return -1; + } + + /* There are always blocks of 16 strings */ + lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); + + /* Find the string table block */ + if ((hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING)) && + (hRes = LoadResource(hInst, hrSrc)) && + (lpStr = (WCHAR*) LockResource(hRes))) + { + UINT x; + + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } + return -1; +} + +INT +AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID) +{ + INT ln; + + ln = LengthOfStrResource(hInst, + uID); + if (ln++ > 0) + { + (*lpTarget) = (LPTSTR)LocalAlloc(LMEM_FIXED, + ln * sizeof(TCHAR)); + if ((*lpTarget) != NULL) + { + INT Ret; + if (!(Ret = LoadString(hInst, uID, *lpTarget, ln))) + { + LocalFree((HLOCAL)(*lpTarget)); + } + return Ret; + } + } + return 0; +} Added: trunk/reactos/base/applications/shutdown/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/precomp.h (added) +++ trunk/reactos/base/applications/shutdown/precomp.h Wed Jul 18 22:40:07 2007 @@ -1,0 +1,16 @@ +#ifndef __SHUTDOWN_PRECOMP_H +#define __SHUTDOWN_PRECOMP_H + +#include <stdio.h> +#include <stdlib.h> +#include <windows.h> +#include <tchar.h> +#include <reason.h> //shutdown codes +#include "resource.h" + +// misc.c +INT AllocAndLoadString(OUT LPTSTR *lpTarget, + IN HINSTANCE hInst, + IN UINT uID); + +#endif Added: trunk/reactos/base/applications/shutdown/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/resource.h (added) +++ trunk/reactos/base/applications/shutdown/resource.h Wed Jul 18 22:40:07 2007 @@ -1,0 +1,1 @@ +#define IDS_USAGE 1000 Added: trunk/reactos/base/applications/shutdown/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/rsrc.rc (added) +++ trunk/reactos/base/applications/shutdown/rsrc.rc Wed Jul 18 22:40:07 2007 @@ -1,0 +1,5 @@ +#include <windows.h> +#include "resource.h" + +#include "lang/de-DE.rc" +#include "lang/en-US.rc" Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.c (original) +++ trunk/reactos/base/applications/shutdown/shutdown.c Wed Jul 18 22:40:07 2007 @@ -5,23 +5,18 @@ * PURPOSE: Initiate logoff, shutdown or reboot of the system */ -#include <stdio.h> -#include <stdlib.h> -#include <windows.h> -#include <tchar.h> -#include <reason.h> //shutdown codes +#include "precomp.h" // Print information about which commandline arguments the program accepts. static void PrintUsage() { - _tprintf(_T("Usage: shutdown [-?] [-l | -s | -r] [-f]\n")); - _tprintf(_T("\n No args or -?\t\tDisplay this message")); - _tprintf(_T("\n -l\t\t\tLog off")); - _tprintf(_T("\n -s\t\t\tShutdown the computer")); - _tprintf(_T("\n -r\t\t\tShutdown and restart the computer")); - _tprintf(_T("\n -f\t\t\tForces running applications to close without warnings")); - _tprintf(_T("\n \t\t\tIf you did not specify any other parameter, this option")); - _tprintf(_T("\n \t\t\twill also log off")); - _tprintf(_T("\n")); + LPTSTR lpUsage = NULL; + + if( AllocAndLoadString( &lpUsage, + GetModuleHandle(NULL), + IDS_USAGE ) ) + { + _putts( lpUsage ); + } } struct CommandLineOptions { Modified: trunk/reactos/base/applications/shutdown/shutdown.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.rbuild (original) +++ trunk/reactos/base/applications/shutdown/shutdown.rbuild Wed Jul 18 22:40:07 2007 @@ -7,5 +7,8 @@ <library>advapi32</library> <library>user32</library> <library>kernel32</library> + <file>misc.c</file> <file>shutdown.c</file> + <file>shutdown.rc</file> + <pch>precomp.h</pch> </module> Added: trunk/reactos/base/applications/shutdown/shutdown.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… ============================================================================== --- trunk/reactos/base/applications/shutdown/shutdown.rc (added) +++ trunk/reactos/base/applications/shutdown/shutdown.rc Wed Jul 18 22:40:07 2007 @@ -1,0 +1,9 @@ +#include <windows.h> +#include "resource.h" + +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Shutdown Utility\0" +#define REACTOS_STR_INTERNAL_NAME "shutdown\0" +#define REACTOS_STR_ORIGINAL_FILENAME "shutdown.exe\0" +#include <reactos/version.rc> + +#include "rsrc.rc"

17 years, 5 months

[cfinck] 27720: Slovak translation for calc by Mario Kacmar (kario AT szm DOT sk) See issue #2405 for more details.

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 18 17:51:37 2007 New Revision: 27720 URL: http://svn.reactos.org/svn/reactos?rev=27720&view=rev Log: Slovak translation for calc by Mario Kacmar (kario AT szm DOT sk) See issue #2405 for more details. Added: trunk/reactos/base/applications/calc/lang/sk-SK.rc Modified: trunk/reactos/base/applications/calc/rsrc.rc Added: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc (added) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc Wed Jul 18 17:51:37 2007 @@ -1,0 +1,149 @@ +/* + * FILE: base/applications/calc/lang/sk-SK.rc + * PURPOSE: Slovak Language File for Calculator + * TRANSLATOR: Kario <kario(a)szm.sk> + * DATE OF TR.: 14-07-2007 + */ + +#include "windows.h" +#include "resource.h" +#include "winecalc.h" + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_APPNAME, "Kalkulaèka" + + IDS_COPYRIGHT1, "Kalkulaèka 5.0. Licencovaná pod LGPL 2" + IDS_COPYRIGHT2 "Copyright 2003, James Briggs" + IDS_COPYRIGHT3 "San Jose, California, USA" + IDS_COPYRIGHT4 "james(a)ActionMessage.com" + IDS_COPYRIGHT5 "http://www.ActionMessage.com/winecalc/" + + IDS_BTN_BACKSPACE, "Spä" + IDS_BTN_CLEAR_ENTRY, "CE" + IDS_BTN_CLEAR_ALL, "C" + IDS_BTN_MEM_CLEAR, "MC" + IDS_BTN_MEM_RECALL, "MR" + IDS_BTN_MEM_STORE, "MS" + IDS_BTN_MEM_PLUS, "M+" + IDS_BTN_MEM_STATUS_M, "M" + IDS_BTN_SQRT, "sqrt" + IDS_BTN_DEGREES, "Stupne" + IDS_BTN_RADIANS, "Radiány" + IDS_BTN_GRADS, "Grady" + IDS_BTN_SHRT_HEX "Hex" + IDS_BTN_SHRT_DEC "Dec" + IDS_BTN_SHRT_OCT "Oct" + IDS_BTN_SHRT_BIN "Bin" + IDS_ERR_INVALID_INPUT, "Neplatný vstup pre funkciu." + IDS_ERR_DIVIDE_BY_ZERO, "Nulou nemono deli." + IDS_ERR_UNDEFINED, "Výsledok funkcie je nedefinovaný." +} + +MAIN_MENU MENU DISCARDABLE +{ + POPUP "Úpr&avy" { + MENUITEM "&Kopírova Ctrl+C", IDM_COPY + MENUITEM "Pri&lepi Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazi" { + MENUITEM "&tandardná", IDM_MODE_STANDARD + MENUITEM "&Vedecká", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "Zoskupov&a èíslice", IDM_DIGIT_GROUPING + } + POPUP "&Pomocník" { + MENUITEM "&Témy Pomocníka", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "È&o je Kalkulaèka", IDM_ABOUT + } +} + +SCIMS_MENU MENU DISCARDABLE +{ + POPUP "Úpr&avy" { + MENUITEM "&Kopírova Ctrl+C", IDM_COPY + MENUITEM "Pri&lepi Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazi" { + MENUITEM "&tandardná", IDM_MODE_STANDARD + MENUITEM "&Vedecká", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "e&stnástková\tF5", ID_CALC_NS_HEX + MENUITEM "D&esiatková\tF6", ID_CALC_NS_DEC + MENUITEM "&Osmièková\tF7", ID_CALC_NS_OCT + MENUITEM "&Dvojková\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "St&upne\tF2", ID_CALC_MS_DEGREES + MENUITEM "&Radiány\tF3", ID_CALC_MS_RADIANS + MENUITEM "&Grady\tF4", ID_CALC_MS_GRADS + MENUITEM SEPARATOR + MENUITEM "Zoskupov&a èíslice", IDM_DIGIT_GROUPING + } + POPUP "&Pomocník" { + MENUITEM "&Témy Pomocníka", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "È&o je Kalkulaèka", IDM_ABOUT + } +} + +SCIWS_MENU MENU DISCARDABLE +{ + POPUP "Úpr&avy" { + MENUITEM "&Kopírova Ctrl+C", IDM_COPY + MENUITEM "Pri&lepi Ctrl+V", IDM_PASTE + } + POPUP "&Zobrazi" { + MENUITEM "&tandardná", IDM_MODE_STANDARD + MENUITEM "&Vedecká", IDM_MODE_SCIENTIFIC + MENUITEM SEPARATOR + MENUITEM "e&stnástková\tF5", ID_CALC_NS_HEX + MENUITEM "D&esiatková\tF6", ID_CALC_NS_DEC + MENUITEM "&Osmièková\tF7", ID_CALC_NS_OCT + MENUITEM "&Dvojková\tF8", ID_CALC_NS_BIN + MENUITEM SEPARATOR + MENUITEM "&Qword\tF12", ID_CALC_WS_QWORD + MENUITEM "Dwo&rd\tF2", ID_CALC_WS_DWORD + MENUITEM "&Word\tF3", ID_CALC_WS_WORD + MENUITEM "&Bajt\tF4", ID_CALC_WS_BYTE + MENUITEM SEPARATOR + MENUITEM "Zoskupov&a èíslice", IDM_DIGIT_GROUPING + } + POPUP "&Pomocník" { + MENUITEM "&Témy Pomocníka", IDM_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "È&o je Kalkulaèka", IDM_ABOUT + } +} + +MAIN_MENU ACCELERATORS +BEGIN + VK_F1, IDV_HELP, VIRTKEY +END + +DLG_ABOUT DIALOG 12,0,120,82 +CAPTION "Èo je Kalkulaèka" +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +BEGIN + DEFPUSHBUTTON "OK", IDOK, 42, 60, 30, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +WHATS_THIS_MENU MENU DISCARDABLE +{ + POPUP "" { + MENUITEM "Èo je toto?", IDM_WHATS_THIS + } +} + +DLG_STATS DIALOG 12,0,125,78 +CAPTION "tatistika" +FONT 9, "Tahoma" +STYLE WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +BEGIN + DEFPUSHBUTTON "&RET", ID_STATS_RET, 4, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&LOAD", ID_STATS_LOAD, 34, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "&CD" ID_STATS_CD, 64, 52, 25, 13, WS_TABSTOP | WS_GROUP + PUSHBUTTON "C&AD", ID_STATS_CAD, 94, 52, 25, 13, WS_TABSTOP | WS_GROUP +END Modified: trunk/reactos/base/applications/calc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rsr… ============================================================================== --- trunk/reactos/base/applications/calc/rsrc.rc (original) +++ trunk/reactos/base/applications/calc/rsrc.rc Wed Jul 18 17:51:37 2007 @@ -21,6 +21,8 @@ #include <windows.h> #include "resource.h" +LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL + IDI_CALCICON ICON "calculator.ico" #include "lang/bg-BG.rc" @@ -40,9 +42,8 @@ #include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" - -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

17 years, 5 months

[cfinck] 27719: Some changes to the RosCMS Installation script: - Add a correct function for importing SQL dumps (taken from MediaWiki 1.10.0 and modified) - Add more status information to step 3 of the installation process - Add the main HTML headers - Put the text boxes from step 2 into a table - Show a message in step 1, when the PHP installation is configured correctly

by cfinck＠svn.reactos.org

Author: cfinck Date: Wed Jul 18 17:39:05 2007 New Revision: 27719 URL: http://svn.reactos.org/svn/reactos?rev=27719&view=rev Log: Some changes to the RosCMS Installation script: - Add a correct function for importing SQL dumps (taken from MediaWiki 1.10.0 and modified) - Add more status information to step 3 of the installation process - Add the main HTML headers - Put the text boxes from step 2 into a table - Show a message in step 1, when the PHP installation is configured correctly Modified: trunk/web/reactos.org/htdocs/roscms/install.php Modified: trunk/web/reactos.org/htdocs/roscms/install.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inst… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/install.php (original) +++ trunk/web/reactos.org/htdocs/roscms/install.php Wed Jul 18 17:39:05 2007 @@ -1,43 +1,94 @@ <?php - /* RosCMS install script */ - /* @TODO: fix this script */ + // This function was taken from the sourceStream() function of "Database.php" of MediaWiki 1.10.0 and modified + function import_sql_dump( $file ) + { + $ret = TRUE; + $fp = fopen( $file, "r" ); + + while( !feof( $fp ) ) + { + $line = trim( fgets( $fp, 1024 ) ); + $sl = strlen( $line ) - 1; + + // Skip empty and comment lines + if( $sl < 0 || ( $line{0} == "-" && $line{1} == "-" ) ) + continue; + + // If this lines ends with a semicolon, it terminates the command + if( $line{$sl} == ";" ) + { + $done = true; + $line = substr( $line, 0, $sl ); + } + + $cmd .= "$line\n"; + + if( $done ) + { + if( !mysql_query( $cmd ) ) + { + $ret = FALSE; + echo "<br>" . mysql_errno() . ": " . mysql_error(); + } + + $done = false; + $cmd = ""; + } + } + + fclose( $fp ); + + if( $ret ) + echo "OK"; + + return $ret; + } $rpm_ready = ""; if (array_key_exists("ready", $_GET)) $rpm_ready=htmlspecialchars($_GET["ready"]); - - +?> +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> +<html> +<head> + <title>RosCMS Install Script</title> +</head> +<body> +<?php if ($rpm_ready == "step2") { ?> <h1>RosCMS - Install Script - Step2</h1> <form id="form1" method="post" action="install.php?ready=step3"> - <h3>Database Information </h3> - <p>Database Host Name: - <input name="dbHost" type="text" id="dbHost" value="localhost" /> - </p> - <p>Database User Name: - <input name="dbUser" type="text" id="dbUser" value="root" /> -</p> - <p>Database User Password: - <input name="dbPass" type="text" id="dbPass" /> -</p> - <p>Database Name: - <input name="dbName" type="text" id="dbName" value="domainname" /> -</p> - <h3>Server Information </h3> - <p>Complete Server Path: - <input name="path_server" type="text" id="path_server" value="http://localhost/domain.com/" size="50" /> - </p> - <p> </p> - <p> - <label> - <input type="submit" name="Submit" value="Install RosCMS ..." /> - </label> - </p> + <h3>Database Information</h3> + + <table> + <tr> + <td>Database Host Name:</td> + <td><input name="dbHost" type="text" id="dbHost" value="localhost" /></td> + </tr> + <tr> + <td>Database User Name:</td> + <td><input name="dbUser" type="text" id="dbUser" value="root" /></td> + </tr> + <tr> + <td>Database User Password:</td> + <td><input name="dbPass" type="text" id="dbPass" /></td> + </tr> + <tr> + <td>Database Name:</td> + <td><input name="dbName" type="text" id="dbName" value="domainname" /></td> + </tr> + </table> + + <h3>Server Information</h3> + <p>Complete Server Path: <input name="path_server" type="text" id="path_server" value="http://localhost/domain.com/" size="50" /></p> + + <p> </p> + + <input type="submit" name="Submit" value="Install RosCMS ..." /> </form> - -<?php +<?php } else if ($rpm_ready == "step3") { echo "<h1>RosCMS - Install Script - Step3</h1>"; @@ -54,19 +105,27 @@ if (array_key_exists("dbName", $_POST)) $dbName=htmlspecialchars($_POST["dbName"]); if (array_key_exists("path_server", $_POST)) $path_server=htmlspecialchars($_POST["path_server"]); - - $connect = @mysql_connect($dbHost, $dbUser, $dbPass) or die("ERROR: Cannot connect to the database!"); - $query_temp1 = mysql_query("CREATE DATABASE `". mysql_real_escape_string($dbName) ."` ;") ; + echo "Connecting to the MySQL Server... "; + $connect = mysql_connect($dbHost, $dbUser, $dbPass) or die("Cannot connect to the MySQL Server!"); + echo "OK<br>"; - $selectDB = @mysql_select_db($dbName, $connect) or die("Cannot find and select <b>". $dbName ."</b>!"); + echo "Creating the Database... "; + mysql_query("CREATE DATABASE `". mysql_real_escape_string($dbName) ."`") or die( mysql_errno() . ": " . mysql_error() ); + echo "OK<br>"; - $query_temp2 = mysql_query(file_get_contents("install_sql.txt")) ; + echo "Selecting the Database... "; + mysql_select_db($dbName, $connect) or die("Cannot find and select <b>$dbName</b>!"); + echo "OK<br>"; - echo "<p>".$query_temp2."</p>"; + echo "Importing the SQL Data... "; + if( !import_sql_dump( "roscms.sql" ) ) + exit; + /* TODO: The complete server path has to be saved somewhere */ - + echo "<p> </p>"; + echo "<p><b>RosCMS was set up successfully!</b></p>"; } else { ?> @@ -77,11 +136,12 @@ if (get_magic_quotes_gpc()) { die("<p>ERROR: Disable 'magic quotes' in php.ini (=Off)</p>"); } - else { ?> - <p><a href="install.php?ready=step2"><b>Next ></b></a></p> - <p> </p> + <p>Your PHP installation is configured correctly. Click <i>Next</i> to continue!</p> + + <p><a href="install.php?ready=step2"><b>Next ></b></a></p> <?php - } } -?> +?> +</body> +</html>

17 years, 5 months

[weiden] 27718: Fix crash due to wrong calling convention

by weiden＠svn.reactos.org

Author: weiden Date: Wed Jul 18 16:23:29 2007 New Revision: 27718 URL: http://svn.reactos.org/svn/reactos?rev=27718&view=rev Log: Fix crash due to wrong calling convention Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Modified: trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c?re… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c (original) +++ trunk/reactos/dll/cpl/hdwwiz/hdwwiz.c Wed Jul 18 16:23:29 2007 @@ -42,7 +42,7 @@ {IDI_CPLICON, IDS_CPLNAME, IDS_CPLDESCRIPTION, Applet} }; -typedef BOOL (*PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); +typedef BOOL (WINAPI *PINSTALL_NEW_DEVICE)(HWND, LPGUID, PDWORD); LONG APIENTRY Applet(HWND hwnd, UINT uMsg, LONG wParam, LONG lParam)

17 years, 5 months

[amunger] 27717: [AUDIT] kdbg is a custom ReactOS component, written and improved upon by numerous developers. It's nearly as old as the codebase itself.

by amunger＠svn.reactos.org

Author: amunger Date: Wed Jul 18 16:18:41 2007 New Revision: 27717 URL: http://svn.reactos.org/svn/reactos?rev=27717&view=rev Log: [AUDIT] kdbg is a custom ReactOS component, written and improved upon by numerous developers. It's nearly as old as the codebase itself. Modified: trunk/reactos/ntoskrnl/kdbg/i386/dis-asm.h (props changed) trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c (props changed) trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S (props changed) trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S (props changed) trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S (props changed) trunk/reactos/ntoskrnl/kdbg/kdb.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb.h (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_cli.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_expr.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_serial.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_string.c (props changed) trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c (props changed) Propchange: trunk/reactos/ntoskrnl/kdbg/i386/dis-asm.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/i386/i386-dis.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/i386/longjmp.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/i386/setjmp.S ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_expr.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_serial.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_string.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/ntoskrnl/kdbg/kdb_symbols.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

17 years, 5 months

← Newer
1
...
31
32
33
34
35
36
37
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007