Ros-diffs February 2008

ros-diffs@reactos.org

21 participants
460 discussions

[tkreuzer] 32203: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): remove obsolete syscalls NtUserGetDesktopWindow and NtUserGetParent

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 8 04:45:54 2008 New Revision: 32203 URL: http://svn.reactos.org/svn/reactos?rev=32203&view=rev Log: patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com): remove obsolete syscalls NtUserGetDesktopWindow and NtUserGetParent Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Feb 8 04:45:54 2008 @@ -475,9 +475,6 @@ BOOL NTAPI NtUserGetClientOrigin(HWND hWnd, LPPOINT Point); - -HWND NTAPI -NtUserGetDesktopWindow(); NTSTATUS NTAPI @@ -2545,9 +2542,6 @@ NtUserGetQueueStatus(BOOL ClearChanges); HWND NTAPI -NtUserGetParent(HWND hWnd); - -HWND NTAPI NtUserGetWindow(HWND hWnd, UINT Relationship); HWND NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Fri Feb 8 04:45:54 2008 @@ -2963,26 +2963,6 @@ /* - * @implemented - */ -HWND STDCALL -NtUserGetDesktopWindow() -{ - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetDesktopWindow\n"); - UserEnterShared(); - - RETURN( IntGetDesktopWindow()); - -CLEANUP: - DPRINT("Leave NtUserGetDesktopWindow, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - -/* * @unimplemented */ DWORD STDCALL @@ -3049,52 +3029,6 @@ UserLeave(); END_CLEANUP; } - - -/* - * NtUserGetParent - * - * The NtUserGetParent function retrieves a handle to the specified window's - * parent or owner. - * - * Remarks - * Note that, despite its name, this function can return an owner window - * instead of a parent window. - * - * Status - * @implemented - */ - -HWND STDCALL -NtUserGetParent(HWND hWnd) -{ - PWINDOW_OBJECT Wnd, WndParent; - HWND hWndParent = NULL; - DECLARE_RETURN(HWND); - - DPRINT("Enter NtUserGetParent\n"); - UserEnterExclusive(); - - if (!(Wnd = UserGetWindowObject(hWnd))) - { - RETURN( NULL); - } - - WndParent = IntGetParent(Wnd); - if (WndParent) - { - hWndParent = WndParent->hSelf; - } - - RETURN( hWndParent); - -CLEANUP: - DPRINT("Leave NtUserGetParent, ret=%i\n",_ret_); - UserLeave(); - END_CLEANUP; -} - - HWND FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w3… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Feb 8 04:45:54 2008 @@ -680,8 +680,10 @@ NtGdiSetWindowExtEx 4 NtGdiSetWindowOrgEx 4 NtGdiStretchDIBits 13 +NtUserAcquireOrReleaseInputOwnership 1 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 +NtUserDereferenceWndProcHandle 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 @@ -689,16 +691,22 @@ NtUserGetClientOrigin 2 NtUserGetClientRect 2 NtUserGetMenuDefaultItem 3 +NtUserGetLastActivePopup 1 NtUserGetLastInputInfo 1 NtUserGetMinMaxInfo 3 NtUserGetMonitorInfo 2 NtUserGetProp 2 +NtUserGetQueueStatus 1 NtUserGetScrollInfo 3 +NtUserGetShellWindow 0 NtUserGetSystemMetrics 1 +NtUserGetWindow 2 NtUserGetWindowLong 3 NtUserGetWindowRect 2 +NtUserGetWindowThreadProcessId 2 NtUserInsertMenuItem 4 NtUserKillSystemTimer 2 +NtUserManualGuiCheck 1 NtUserMenuInfo 3 NtUserMenuItemInfo 5 NtUserMonitorFromPoint 3 @@ -711,21 +719,9 @@ NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 NtUserSetScrollBarInfo 3 -NtUserGetDesktopWindow 0 NtGdiAddFontResource 2 NtGdiCreateDIBitmap 6 NtGdiGetAspectRatioFilterEx 2 NtGdiGetFontFamilyInfo 4 NtGdiOffsetViewportOrgEx 4 NtGdiOffsetWindowOrgEx 4 -# -# ReactOS only system calls -NtUserAcquireOrReleaseInputOwnership 1 -NtUserGetWindowThreadProcessId 2 -NtUserGetQueueStatus 1 -NtUserGetParent 1 -NtUserGetWindow 2 -NtUserGetLastActivePopup 1 -NtUserGetShellWindow 0 -NtUserDereferenceWndProcHandle 2 -NtUserManualGuiCheck 1

16 years, 8 months

[tkreuzer] 32202: fix a typo

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Feb 8 03:18:45 2008 New Revision: 32202 URL: http://svn.reactos.org/svn/reactos?rev=32202&view=rev Log: fix a typo Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.def Modified: trunk/reactos/dll/win32/dbghelp/dbghelp.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dbghelp/dbghelp.… ============================================================================== --- trunk/reactos/dll/win32/dbghelp/dbghelp.def (original) +++ trunk/reactos/dll/win32/dbghelp/dbghelp.def Fri Feb 8 03:18:45 2008 @@ -1,4 +1,4 @@ -; $Id: w32kdll.def 27344 2007-08-01 14:12:10Z tkreuzer $ +; $Id: dbghelp.def 27344 2007-08-01 14:12:10Z tkreuzer $ ; ; ReactOS Operating System ;

16 years, 8 months

[dreimer] 32201: Bug 3033: patch for packmgr (kario@szm.sk) Bug 3039: Ukrainian translation update (temarez@yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr@narod.ru)

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 00:23:46 2008 New Revision: 32201 URL: http://svn.reactos.org/svn/reactos?rev=32201&view=rev Log: Bug 3033: patch for packmgr (kario(a)szm.sk) Bug 3039: Ukrainian translation update (temarez(a)yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr(a)narod.ru) Added: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc (with props) trunk/reactos/base/applications/msconfig/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/access/lang/bg-BG.rc (with props) trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/main/lang/sk-SK.rc (with props) trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc (with props) trunk/reactos/dll/win32/netid/lang/bg-BG.rc (with props) trunk/reactos/dll/win32/rasapi32/lang/bg-BG.rc (with props) trunk/reactos/dll/win32/serialui/lang/bg-BG.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc trunk/reactos/base/applications/control/lang/bg-BG.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/notepad/lang/bg-BG.rc trunk/reactos/base/applications/winhelp/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/system/format/lang/bg-BG.rc trunk/reactos/dll/cpl/access/rsrc.rc trunk/reactos/dll/cpl/desk/lang/sk-SK.rc trunk/reactos/dll/cpl/hdwwiz/rsrc.rc trunk/reactos/dll/cpl/main/rsrc.rc trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc trunk/reactos/dll/cpl/telephon/rsrc.rc trunk/reactos/dll/win32/netid/rsrc.rc trunk/reactos/dll/win32/rasapi32/rsrc.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shdocvw/Bg.rc trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/base/applications/cmdutils/xcopy/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/xcopy/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/control/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/control/… Added: trunk/reactos/base/applications/msconfig/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/notepad/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/winhelp/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/winhelp/… Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… Modified: trunk/reactos/base/system/format/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/bg… Added: trunk/reactos/dll/cpl/access/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/bg-BG.… Modified: trunk/reactos/dll/cpl/access/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/rsrc.rc?rev… Modified: trunk/reactos/dll/cpl/desk/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/sk-SK.rc… Added: trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/sk-SK.… Modified: trunk/reactos/dll/cpl/hdwwiz/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/rsrc.rc?rev… Added: trunk/reactos/dll/cpl/main/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc… Modified: trunk/reactos/dll/cpl/main/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/rsrc.rc?rev=3… Modified: trunk/reactos/dll/cpl/mmsys/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/uk-UA.r… Added: trunk/reactos/dll/cpl/telephon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/lang/sk-S… Modified: trunk/reactos/dll/cpl/telephon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/telephon/rsrc.rc?r… Added: trunk/reactos/dll/win32/netid/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/bg-BG… Modified: trunk/reactos/dll/win32/netid/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/rsrc.rc?re… Added: trunk/reactos/dll/win32/rasapi32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/lang/bg… Modified: trunk/reactos/dll/win32/rasapi32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rasapi32/rsrc.rc… Added: trunk/reactos/dll/win32/serialui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/bg… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Modified: trunk/reactos/dll/win32/shdocvw/Bg.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shdocvw/Bg.rc?re… Modified: trunk/reactos/dll/win32/syssetup/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/bg…

16 years, 8 months

[dreimer] 32200: Bug 3033: patch for packmgr (kario@szm.sk) Bug 3039: Ukrainian translation update (temarez@yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr@narod.ru)

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Feb 8 00:22:04 2008 New Revision: 32200 URL: http://svn.reactos.org/svn/reactos?rev=32200&view=rev Log: Bug 3033: patch for packmgr (kario(a)szm.sk) Bug 3039: Ukrainian translation update (temarez(a)yandex.ru) Bug 3041: Bulgarian translation of ReactOS. (sstpr(a)narod.ru) Added: trunk/rosapps/imagesoft/lang/sk-SK.rc (with props) trunk/rosapps/packmgr/gui/lang/sk-SK.rc (with props) Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/imagesoft/rsrc.rc trunk/rosapps/packmgr/gui/packmgr.rc Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Fri Feb 8 00:22:04 2008 @@ -15,7 +15,7 @@ FONT 8, "MS Shell Dlg" BEGIN ICON IDI_MAIN, IDC_STATIC, 10, 10, 20, 20 - LTEXT "ReactOS VGA Font Editor", IDC_STATIC, 37, 10, 93, 10 + LTEXT "Ðåäàêòîð VGA-øðèôò³â ReactOS", IDC_STATIC, 37, 10, 93, 10 LTEXT "Copyright 2008 Colin Finck", IDC_STATIC, 37, 20, 93, 10 DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END @@ -65,8 +65,8 @@ STRINGTABLE BEGIN - IDS_OPENFILTER, "Âñ³ ï³äòðèìóâàí³ ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Ôàéëè äâ³éêîâèõ øðèôò³â (*.bin)|*.bin|Åêðàíí³ Øðèôòè ÏÊ Âåðñ³¿ 1 (*.psf)|*.psf|" - IDS_SAVEFILTER, "Ôàéëè äâ³éêîâèõ øðèôò³â (*.bin)|*.bin|" + IDS_OPENFILTER, "Âñ³ ï³äòðèìóâàí³ ôîðìàòè (*.bin,*.psf)|*.bin;*.psf|Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|Åêðàíí³ øðèôòè ÏÊ âåðñ³¿ 1 (*.psf)|*.psf|" + IDS_SAVEFILTER, "Äâ³éêîâ³ ôàéëè øðèôò³â (*.bin)|*.bin|" IDS_OPENERROR, "Ïîìèëêà ïðè â³äêðèòò³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" IDS_READERROR, "Ïîìèëêà ïðè ÷èòàíí³ ôàéëó! (Íîìåð ïîìèëêè %1!u!)" IDS_WRITEERROR, "Ïîìèëêà ïðè çàïèñó ôàéëó! (Íîìåð ïîìèëêè %1!u!)" @@ -74,7 +74,7 @@ IDS_UNSUPPORTEDPSF, "Íåï³äòðèìóâàíèé ôîðìàò PSF øðèôòà! Ðåäàêòîð ï³äòðèìóº ò³ëüêè øðèôòè 8x8 áåç ñïåö³àëüíèõ ðåæèì³â." IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" - IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôò³â ReactOS" IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Ñòâîðèòè" Added: trunk/rosapps/imagesoft/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/lang/sk-SK.rc?re… ============================================================================== --- trunk/rosapps/imagesoft/lang/sk-SK.rc (added) +++ trunk/rosapps/imagesoft/lang/sk-SK.rc Fri Feb 8 00:22:04 2008 @@ -1,0 +1,240 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 02-02-2008 + * ______________________________________________ + * NOTE: this file is not fully translated + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APPNAME "ImageSoft" + IDS_VERSION "v0.1" +END + +IDR_MAINMENU MENU +BEGIN + POPUP "&Súbor" + BEGIN + MENUITEM "&Nový...", ID_NEW + MENUITEM "&Otvori...", ID_OPEN + MENUITEM SEPARATOR + MENUITEM "&Zatvori\tCtrl+F4", ID_CLOSE, GRAYED + MENUITEM "Zatvori &vetky", ID_CLOSEALL,GRAYED + MENUITEM SEPARATOR + MENUITEM "&Uloi", ID_SAVE, GRAYED + MENUITEM "Uloi &ako...", ID_SAVEAS, GRAYED + MENUITEM SEPARATOR + MENUITEM "Náh¾a&d pred tlaèou", ID_PRINTPRE,GRAYED + MENUITEM "&Tlaèi...", ID_PRINT, GRAYED + MENUITEM SEPARATOR + MENUITEM "V&lastnosti...", ID_PROP, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Skonèi\tAlt+F4", ID_EXIT + END + POPUP "&Úpravy" + BEGIN + MENUITEM "&Spä", ID_UNDO, GRAYED + MENUITEM "&Znova", ID_REDO, GRAYED + MENUITEM SEPARATOR + MENUITEM "&Vystrihnú", ID_CUT, GRAYED + MENUITEM "&Kopírova", ID_COPY, GRAYED + MENUITEM "&Paste", ID_PASTE, GRAYED + MENUITEM "Paste as new &image", ID_PASTENEWIMAGE, GRAYED + MENUITEM SEPARATOR + MENUITEM "Vy&bra vetko", ID_SELALL, GRAYED + END + POPUP "&Zobrazi" + BEGIN + MENUITEM "&Nástroje", ID_TOOLS + MENUITEM "&Farby", ID_COLOR + MENUITEM "&História", ID_HISTORY + MENUITEM "Stavový &riadok", ID_STATUSBAR + END + POPUP "&Adjust" + BEGIN + MENUITEM "Jas...", ID_BRIGHTNESS + MENUITEM "Kontrast...", ID_CONTRAST + MENUITEM "Odtieò/Nasýtenie...", -1, GRAYED + POPUP "Color" + BEGIN + MENUITEM "Èierna a biela" ID_BLACKANDWHITE + MENUITEM "Invertova farby" ID_INVERTCOLORS + END + MENUITEM SEPARATOR + MENUITEM "Rozmaza", ID_BLUR + MENUITEM "Zaostri", ID_SHARPEN + MENUITEM "Vyhladi hrany", -1, GRAYED + MENUITEM "Prida tieò", -1, GRAYED + MENUITEM SEPARATOR + MENUITEM "Image Size...", -1, GRAYED + MENUITEM "Preklopi", -1, GRAYED + MENUITEM "Zrkadli", -1, GRAYED + MENUITEM "Otoèi", -1, GRAYED + + END + POPUP "&Farby" + BEGIN + MENUITEM "&Upravi farby...", ID_EDITCOLOURS + END + POPUP "&Okná" + BEGIN + MENUITEM "&Cascade", ID_WINDOW_CASCADE + MENUITEM "Tile &Horizontally", ID_WINDOW_TILE_HORZ + MENUITEM "Tile &Vertically", ID_WINDOW_TILE_VERT + MENUITEM "&Arrange Icons", ID_WINDOW_ARRANGE + MENUITEM SEPARATOR + MENUITEM "Nex&t\tCtrl+F6", ID_WINDOW_NEXT + END + POPUP "&Pomocník" + BEGIN + MENUITEM "È&o je...", ID_ABOUT + END +END + +IDR_POPUP MENU +BEGIN + POPUP "popup" + BEGIN + + MENUITEM SEPARATOR + + END +END + + +IDD_BRIGHTNESS DIALOGEX 6, 5, 193, 120 +CAPTION "Jas" +FONT 8,"MS Shell Dlg", 0, 0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "", IDC_PICPREVIEW, 0, 1, 132, 96, SS_OWNERDRAW | SS_SUNKEN + LTEXT "Color form:", IDC_STATIC, 135, 5, 36, 9 + GROUPBOX "", IDC_BRI_GROUP, 138 ,30, 50, 48 + CONTROL "Plné (RGB)", IDC_BRI_FULL, "Button", BS_AUTORADIOBUTTON, 138, 18, 46, 9 + CONTROL "Èervená", IDC_BRI_RED, "Button", BS_AUTORADIOBUTTON, 142, 38, 42, 9 + CONTROL "Zelená", IDC_BRI_GREEN, "Button", BS_AUTORADIOBUTTON, 142, 51, 42, 9 + CONTROL "Modrá", IDC_BRI_BLUE, "Button", BS_AUTORADIOBUTTON, 142, 64, 42, 9 + EDITTEXT IDC_BRI_EDIT, 98, 103, 28, 13 + CONTROL "", IDC_BRI_TRACKBAR, "msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP, 2, 105, 90, 11 + PUSHBUTTON "OK", IDOK, 142, 88, 48, 13 + PUSHBUTTON "Zrui", IDCANCEL, 142, 105, 48, 13 +END + +IDD_ABOUTBOX DIALOGEX 22,16,210,182 +CAPTION "Èo je ImageSoft" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +//EXSTYLE WS_EX_LAYERED +BEGIN + LTEXT "ImageSoft v0.1\nCopyright (C) 2006\nThomas Weidenmueller (w3seek(a)reactos.org)\nGed Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 150, 36 + PUSHBUTTON "Zavrie", IDOK, 75, 162, 44, 15 + ICON IDI_IMAGESOFTICON, IDC_STATIC, 10, 10, 7, 30 + EDITTEXT IDC_LICENSE_EDIT, 8, 44, 194, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE +END + + +IDD_IMAGE_PROP DIALOGEX 6, 5, 156, 163 +CAPTION "Vlastnosti obrázka" +FONT 8,"MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME +BEGIN + LTEXT "Názov:", IDC_STATIC, 12, 5, 38, 9 + EDITTEXT IDC_IMAGE_NAME_EDIT, 58, 3, 94, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP + GROUPBOX "Canvas properties", IDC_STATIC, 4, 22, 148, 98 + LTEXT "Typ obrázka:", IDC_STATIC, 12, 36, 42, 9 + CONTROL "", IDC_IMAGETYPE, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 35, 88, 54 + LTEXT "írka:", IDC_STATIC, 12, 51, 42, 9 + EDITTEXT IDC_WIDTH_EDIT, 58, 49, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_WIDTH_STAT, 94, 51, 40, 9 + LTEXT "Výka:", IDC_STATIC, 12, 68, 42, 9 + EDITTEXT IDC_HEIGHT_EDIT, 58, 66, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_HEIGHT_STAT, 94, 68, 40, 9 + LTEXT "Rozlíenie:", IDC_STATIC, 12, 84, 42, 9 + EDITTEXT IDC_RES_EDIT, 58, 83, 32, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP | ES_NUMBER + LTEXT "", IDC_RES_STAT, 94, 84, 40, 9 + LTEXT "Unit:", IDC_STATIC, 12, 99, 42, 9 + CONTROL "", IDC_UNIT, "ComboBox", WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_DROPDOWNLIST, 58, 99, 54, 50 + LTEXT "Ve¾kos obrázka:", IDC_STATIC, 12, 125, 42, 9 + LTEXT "", IDC_IMAGE_SIZE, 58, 125, 54, 9 + PUSHBUTTON "OK", IDOK, 50, 144, 48, 13 + PUSHBUTTON "Zrui", IDCANCEL, 102, 144, 48, 13 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." + IDS_READY " Hotovo." + IDS_TOOLBAR_STANDARD "Standard" + IDS_TOOLBAR_TEST "Test" + IDS_IMAGE_NAME "Obrázok %1!u!" + IDS_FLT_TOOLS "Nástroje" + IDS_FLT_COLORS "Farby" + IDS_FLT_HISTORY "História" +END + +/* imageprop.c */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_IMAGE_MONOCHROME "Èierno-bielo (1 bit)" + IDS_IMAGE_GREYSCALE "Odtiene edej (8 bitov)" + IDS_IMAGE_PALETTE "Paleta alebo 256 farieb (8 bitov)" + IDS_IMAGE_TRUECOLOR "Pravé farby (24 bitov)" + + IDS_UNIT_PIXELS "Pixels" + IDS_UNIT_CM "Cm" + IDS_UNIT_INCHES "Inches" + IDS_UNIT_DOTSCM "Dots / Cm" + IDS_UNIT_DPI "DPI" + IDS_UNIT_KB "%d KB" + IDS_UNIT_MB "%d MB" +END + +/* Tooltips */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_NEW "Nový" + IDS_TOOLTIP_OPEN "Otvori" + IDS_TOOLTIP_SAVE "Uloi" + IDS_TOOLTIP_PRINTPRE "Náh¾ad pred tlaèou" + IDS_TOOLTIP_PRINT "Tlaèi" + IDS_TOOLTIP_CUT "Vystrihnú" + IDS_TOOLTIP_COPY "Kopírova" + IDS_TOOLTIP_PASTE "Vloi" + IDS_TOOLTIP_UNDO "Spä" + IDS_TOOLTIP_REDO "Znova" +END + + +/* Hints */ +STRINGTABLE DISCARDABLE +BEGIN + IDS_HINT_BLANK " " + IDS_HINT_NEW " Creates a new document." + IDS_HINT_OPEN " Opens an existing document." + IDS_HINT_CLOSE " Closes this window." + IDS_HINT_CLOSEALL " Closes all windows." + IDS_HINT_SAVE " Saves the active document." + IDS_HINT_SAVEAS " Saves the active document with a new name." + IDS_HINT_PRINTPRE " Previews the printed document." + IDS_HINT_PRINT " Prints the active document." + IDS_HINT_PROP " Shows the properties of the active image." + IDS_HINT_EXIT " Exits this application." + + IDS_HINT_TOOLS " Shows or hides the tools floating window." + IDS_HINT_COLORS " Shows or hides the colors floating window." + IDS_HINT_HISTORY " Shows or hides the history floating window." + IDS_HINT_STATUS " Shows or hides the status bar." + + IDS_HINT_CASCADE " Arrange windows so they overlap." + IDS_HINT_TILE_HORZ " Arrange windows as non-overlapping tiles." + IDS_HINT_TILE_VERT " Arrange windows as non-overlapping tiles." + IDS_HINT_ARRANGE " Arrange icons at the bottom of the window." + IDS_HINT_NEXT " Activates the next window." + + IDS_HINT_SYS_RESTORE " Restores this window to normal size." + IDS_HINT_SYS_MOVE " Moves this window." + IDS_HINT_SYS_SIZE " Resizes this window." + IDS_HINT_SYS_MINIMIZE " Collapses this window to an icon." + IDS_HINT_SYS_MAXIMIZE " Expands this window to fill this screen." +END Propchange: trunk/rosapps/imagesoft/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/imagesoft/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/imagesoft/rsrc.rc?rev=3220… ============================================================================== --- trunk/rosapps/imagesoft/rsrc.rc (original) +++ trunk/rosapps/imagesoft/rsrc.rc Fri Feb 8 00:22:04 2008 @@ -15,5 +15,6 @@ #include "lang/nb-NO.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/th-TH.rc" #include "lang/uk-UA.rc" Added: trunk/rosapps/packmgr/gui/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/lang/sk-SK.rc?… ============================================================================== --- trunk/rosapps/packmgr/gui/lang/sk-SK.rc (added) +++ trunk/rosapps/packmgr/gui/lang/sk-SK.rc Fri Feb 8 00:22:04 2008 @@ -1,0 +1,44 @@ +/* TRANSLATOR: Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) + * DATE OF TR: 03-02-2008 + */ + +LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT + +/* Dialogs */ +IDD_OPTIONS DIALOGEX DISCARDABLE 0, 0, 180, 200 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Monosti" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Zatial nie sú iadne monosti.", 0, 50, 95, 80, 8 +END + +IDD_DOIT DIALOGEX DISCARDABLE 0, 0, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Vykonávam operácie" +FONT 8, "MS Shell Dlg" +BEGIN + + CTEXT "{Status}", IDC_TSTATUS, 0, 10, 180, 8 + + CONTROL "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH, 20, 25, 140, 15 + + CONTROL "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH, 20, 45, 140, 15 + + PUSHBUTTON "Zrui", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED +END + +IDR_POPUP MENU DISCARDABLE +BEGIN + POPUP "PopUp", MENUBARBREAK + BEGIN + MENUITEM "iadna akcia", 1, GRAYED + MENUITEM "Intalova (odporúèané)", 2, GRAYED + MENUITEM "Intalova zo zdrojových kódov", 3, GRAYED + MENUITEM "Aktualizova", 4, GRAYED + MENUITEM "Odintalova", 5, GRAYED + MENUITEM SEPARATOR + MENUITEM "Monosti", 8 + MENUITEM SEPARATOR + MENUITEM "Spravi", 6 + END Propchange: trunk/rosapps/packmgr/gui/lang/sk-SK.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/packmgr/gui/packmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/packmgr/gui/packmgr.rc?rev… ============================================================================== --- trunk/rosapps/packmgr/gui/packmgr.rc (original) +++ trunk/rosapps/packmgr/gui/packmgr.rc Fri Feb 8 00:22:04 2008 @@ -20,6 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/sk-SK.rc" #include "lang/uk-UA.rc" /* EOF */

16 years, 8 months

[cfinck] 32199: Yet another attempt to fix build

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 7 23:58:58 2008 New Revision: 32199 URL: http://svn.reactos.org/svn/reactos?rev=32199&view=rev Log: Yet another attempt to fix build Modified: trunk/reactos/include/ndk/i386/ketypes.h Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Thu Feb 7 23:58:58 2008 @@ -29,7 +29,7 @@ #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) #define PCR ((volatile KPCR * const)K0IPCR) #if defined(CONFIG_SMP) || defined(NT_BUILD) -#undef KeGetPcr() +#undef KeGetPcr #define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) #endif

16 years, 8 months

[cfinck] 32198: Revert the winddk.h changes of r32197 to make the hal compilable again without any warnings. Someone (preferably ros-arm-bringup ; -), please fix this correctly. The warning is caused, because after the change in r32197, KeRaiseIrqlToSynchLevel is defined as NTKERNELAPI for all architectures. NTKERNELAPI itself is defined to DECLSPEC_IMPORT if the header is not included from ntoskrnl. This is why hal outputs a warning for its KeRaiseIrqlToSynchLevel implementation. As warnings ar

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 7 23:49:58 2008 New Revision: 32198 URL: http://svn.reactos.org/svn/reactos?rev=32198&view=rev Log: Revert the winddk.h changes of r32197 to make the hal compilable again without any warnings. Someone (preferably ros-arm-bringup ;-), please fix this correctly. The warning is caused, because after the change in r32197, KeRaiseIrqlToSynchLevel is defined as NTKERNELAPI for all architectures. NTKERNELAPI itself is defined to DECLSPEC_IMPORT if the header is not included from ntoskrnl. This is why hal outputs a warning for its KeRaiseIrqlToSynchLevel implementation. As warnings are treated as errors for hal, the build fails. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 23:49:58 2008 @@ -9495,6 +9495,12 @@ KeRaiseIrqlToDpcLevel( VOID); +NTHALAPI +KIRQL +DDKAPI +KeRaiseIrqlToSynchLevel( + VOID); + #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) @@ -9581,15 +9587,14 @@ KeRaiseIrqlToDpcLevel( VOID); -#endif - NTKERNELAPI KIRQL DDKAPI KeRaiseIrqlToSynchLevel( VOID); - +#endif + /** Memory manager routines **/ NTKERNELAPI

16 years, 8 months

[ros-arm-bringup] 32197: We can now build the ARM kernel (but not link it). We now define _disable and _enable for ARM. We shouldn't define KeRaiseIrqlToSynchLevel for each architecture, since the prototype is portable itself. It was a mistake to guard against x86 only system calls -- the system calls should be the same on all archs, just return STATUS_NOT_IMPLEMENTED if they don't make sense. Undo the guards. We now define KeGetPcr() as portable -- it's PCR itself that is a per-arch define. We

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Thu Feb 7 23:04:31 2008 New Revision: 32197 URL: http://svn.reactos.org/svn/reactos?rev=32197&view=rev Log: We can now build the ARM kernel (but not link it). We now define _disable and _enable for ARM. We shouldn't define KeRaiseIrqlToSynchLevel for each architecture, since the prototype is portable itself. It was a mistake to guard against x86 only system calls -- the system calls should be the same on all archs, just return STATUS_NOT_IMPLEMENTED if they don't make sense. Undo the guards. We now define KeGetPcr() as portable -- it's PCR itself that is a per-arch define. We now support ARM in RtlWalkFrameChain. We now support ARM in PspCreateThread. We now define KeArchHaltProcessor for ARM by using Wait-For-Interrupt Mode. We now define KeArmInitThreadWithContext for ARM. KiRestore/SaveProcessorControlState are portable prototypes, we now define them as such. Bochs KD code should use the portable WRITE/READ_PORT_UCHAR defines, we now do so. We now support ARM in SharedUserData->ImageNumberLow/High during ExpInitializeExecutive. NtQuerySytemInformation for SystemProcessorInformation has now been fixed to use the portable KeProcesssorXxx variables instead of reading from the non-portable PRCB values. We now support NtFlushInstructionCache for ARM by flushing the I-Cache. Added: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (with props) Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/include/ndk/arm/ketypes.h trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/include/ndk/kefuncs.h trunk/reactos/include/ndk/ketypes.h trunk/reactos/include/psdk/intrin_arm.h trunk/reactos/include/psdk/winnt.h trunk/reactos/include/reactos/armddk.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/sysinfo.c trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/kd/wrappers/bochs.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=3… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Feb 7 23:04:31 2008 @@ -9495,12 +9495,6 @@ KeRaiseIrqlToDpcLevel( VOID); -NTHALAPI -KIRQL -DDKAPI -KeRaiseIrqlToSynchLevel( - VOID); - #define KeLowerIrql(a) KfLowerIrql(a) #define KeRaiseIrql(a,b) *(b) = KfRaiseIrql(a) @@ -9587,14 +9581,15 @@ KeRaiseIrqlToDpcLevel( VOID); +#endif + NTKERNELAPI KIRQL DDKAPI KeRaiseIrqlToSynchLevel( VOID); -#endif - + /** Memory manager routines **/ NTKERNELAPI Modified: trunk/reactos/include/ndk/arm/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/arm/ketypes.h?… ============================================================================== --- trunk/reactos/include/ndk/arm/ketypes.h (original) +++ trunk/reactos/include/ndk/arm/ketypes.h Thu Feb 7 23:04:31 2008 @@ -38,6 +38,11 @@ #define PRCB_MAJOR_VERSION 1 #define PRCB_BUILD_DEBUG 1 #define PRCB_BUILD_UNIPROCESSOR 2 + +// +// No LDTs on ARM +// +#define LDT_ENTRY ULONG // // HAL Variables Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h (original) +++ trunk/reactos/include/ndk/i386/ketypes.h Thu Feb 7 23:04:31 2008 @@ -28,9 +28,8 @@ // #define K0IPCR ((ULONG_PTR)(KIP0PCRADDRESS)) #define PCR ((volatile KPCR * const)K0IPCR) -#if !defined(CONFIG_SMP) && !defined(NT_BUILD) -#define KeGetPcr() PCR -#else +#if defined(CONFIG_SMP) || defined(NT_BUILD) +#undef KeGetPcr() #define KeGetPcr() ((volatile KPCR * const)__readfsdword(0x1C)) #endif Modified: trunk/reactos/include/ndk/kefuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/kefuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/kefuncs.h (original) +++ trunk/reactos/include/ndk/kefuncs.h Thu Feb 7 23:04:31 2008 @@ -457,7 +457,6 @@ IN KPROFILE_SOURCE ClockSource ); -#ifdef _M_IX86 NTSYSCALLAPI NTSTATUS NTAPI @@ -467,7 +466,6 @@ IN ULONG Selector2, IN LDT_ENTRY LdtEntry2 ); -#endif NTSYSCALLAPI NTSTATUS @@ -665,7 +663,6 @@ IN KPROFILE_SOURCE ClockSource ); -#ifdef _M_IX86 NTSYSAPI NTSTATUS NTAPI @@ -675,7 +672,6 @@ IN ULONG Selector2, IN LDT_ENTRY LdtEntry2 ); -#endif NTSYSAPI NTSTATUS Modified: trunk/reactos/include/ndk/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/ketypes.h (original) +++ trunk/reactos/include/ndk/ketypes.h Thu Feb 7 23:04:31 2008 @@ -111,6 +111,11 @@ #else #define KINTERRUPT_DISPATCH_CODES 106 #endif + +// +// Get KPCR +// +#define KeGetPcr() PCR #ifdef NTOS_MODE_USER Modified: trunk/reactos/include/psdk/intrin_arm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/intrin_arm.h?… ============================================================================== --- trunk/reactos/include/psdk/intrin_arm.h (original) +++ trunk/reactos/include/psdk/intrin_arm.h Thu Feb 7 23:04:31 2008 @@ -148,5 +148,25 @@ return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } +static __inline__ __attribute__((always_inline)) void _disable(void) +{ + __asm__ __volatile__ + ( + "mrs r1, cpsr;" + "orr r1, r1, #0x80;" + "msr cpsr, r1;" + ); +} + +static __inline__ __attribute__((always_inline)) void _enable(void) +{ + __asm__ __volatile__ + ( + "mrs r1, cpsr;" + "bic r1, r1, #0x80;" + "msr cpsr, r1;" + ); +} + #endif /* EOF */ Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h (original) +++ trunk/reactos/include/psdk/winnt.h Thu Feb 7 23:04:31 2008 @@ -4108,6 +4108,7 @@ // // NT-ARM is not documented // +#define KIRQL ULONG // Hack! #include <armddk.h> #else Modified: trunk/reactos/include/reactos/armddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/armddk.h?r… ============================================================================== --- trunk/reactos/include/reactos/armddk.h (original) +++ trunk/reactos/include/reactos/armddk.h Thu Feb 7 23:04:31 2008 @@ -103,16 +103,12 @@ // // IRQL Support on ARM is similar to MIPS/ALPHA // -NTKERNELAPI KIRQL -DDKAPI KeSwapIrql( IN KIRQL NewIrql ); -NTKERNELAPI KIRQL -NTAPI KeRaiseIrqlToDpcLevel( VOID ); Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=321… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Thu Feb 7 23:04:31 2008 @@ -1229,6 +1229,9 @@ #elif defined(_MIPS_) SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000; +#elif defined(_ARM_) + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARM; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARM; #else #error "Unsupported ReactOS Target" #endif Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/sysinfo.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/sysinfo.c (original) +++ trunk/reactos/ntoskrnl/ex/sysinfo.c Thu Feb 7 23:04:31 2008 @@ -531,11 +531,11 @@ return (STATUS_INFO_LENGTH_MISMATCH); } Prcb = KeGetCurrentPrcb(); - Spi->ProcessorArchitecture = 0; /* Intel Processor */ - Spi->ProcessorLevel = Prcb->CpuType; - Spi->ProcessorRevision = Prcb->CpuStep; + Spi->ProcessorArchitecture = KeProcessorArchitecture; + Spi->ProcessorLevel = KeProcessorLevel; + Spi->ProcessorRevision = KeProcessorRevision; Spi->Reserved = 0; - Spi->ProcessorFeatureBits = Prcb->FeatureBits; + Spi->ProcessorFeatureBits = KeFeatureBits; DPRINT("Arch %d Level %d Rev 0x%x\n", Spi->ProcessorArchitecture, Spi->ProcessorLevel, Spi->ProcessorRevision); @@ -1927,6 +1927,8 @@ #elif defined(_M_MIPS) DPRINT1("NtFlushInstructionCache() is not implemented\n"); for (;;); +#elif defined(_M_ARM) + __asm__ __volatile__("mov r1, #0; mcr p15, 0, r1, c7, c5, 0"); #else #error Unknown architecture #endif Modified: trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arch/intrin_i.h Thu Feb 7 23:04:31 2008 @@ -26,9 +26,7 @@ #elif defined(_M_MIPS) #include "../mips/intrin_i.h" #elif defined(_M_ARM) -// -// Not sure we'll need ARM internal intrinsics -// +#include "../arm/intrin_i.h" #else #error "Unknown processor" #endif Added: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h (added) +++ trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h Thu Feb 7 23:04:31 2008 @@ -1,0 +1,18 @@ +#ifndef _INTRIN_INTERNAL_ +#define _INTRIN_INTERNAL_ + +static __inline__ __attribute__((always_inline)) void KeArchHaltProcessor(void) +{ + // + // Enter Wait-For-Interrupt Mode + // + __asm__ __volatile__ + ( + "mov r1, #0;" + "mcr p15, 0, r1, c7, c0, 4;" + ); +} + +#endif + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/include/internal/arm/intrin_i.h ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h Thu Feb 7 23:04:31 2008 @@ -1,1 +1,20 @@ +#ifndef __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H +#define __NTOSKRNL_INCLUDE_INTERNAL_ARM_KE_H +#if __GNUC__ >=3 +#pragma GCC system_header +#endif + +VOID +NTAPI +KeArmInitThreadWithContext( + IN PKTHREAD Thread, + IN PKSYSTEM_ROUTINE SystemRoutine, + IN PKSTART_ROUTINE StartRoutine, + IN PVOID StartContext, + IN PCONTEXT Context +); + +#define KeArchInitThreadWithContext KeArmInitThreadWithContext + +#endif Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h Thu Feb 7 23:04:31 2008 @@ -59,18 +59,6 @@ IN PKTSS Tss, IN PKIDTENTRY Idt, IN PKGDTENTRY Gdt -); - -VOID -NTAPI -KiRestoreProcessorControlState( - IN PKPROCESSOR_STATE ProcessorState -); - -VOID -NTAPI -KiSaveProcessorControlState( - OUT PKPROCESSOR_STATE ProcessorState ); VOID Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Thu Feb 7 23:04:31 2008 @@ -972,6 +972,18 @@ IN OUT PKSPIN_LOCK_QUEUE LockQueue ); +VOID +NTAPI +KiRestoreProcessorControlState( + IN PKPROCESSOR_STATE ProcessorState +); + +VOID +NTAPI +KiSaveProcessorControlState( + OUT PKPROCESSOR_STATE ProcessorState +); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: trunk/reactos/ntoskrnl/kd/wrappers/bochs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/bochs… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/bochs.c (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/bochs.c Thu Feb 7 23:04:31 2008 @@ -12,7 +12,7 @@ #include <internal/debug.h> /* bochs debug output */ -#define BOCHS_LOGGER_PORT (0xe9) +#define BOCHS_LOGGER_PORT ((PVOID)0xe9) /* FUNCTIONS *****************************************************************/ @@ -27,9 +27,9 @@ { if (*Message == '\n') { - __outbyte(BOCHS_LOGGER_PORT, '\r'); + WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, '\r'); } - __outbyte(BOCHS_LOGGER_PORT, *Message); + WRITE_PORT_UCHAR(BOCHS_LOGGER_PORT, *Message); Message++; } } @@ -44,8 +44,8 @@ if (BootPhase == 0) { - Value = __inbyte(BOCHS_LOGGER_PORT); - if (Value != BOCHS_LOGGER_PORT) + Value = READ_PORT_UCHAR(BOCHS_LOGGER_PORT); + if (Value != (ULONG)BOCHS_LOGGER_PORT) { KdpDebugMode.Bochs = FALSE; return; Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c Thu Feb 7 23:04:31 2008 @@ -112,7 +112,7 @@ */ MiInitPageDirectoryMap(); - BaseAddress = (PVOID)KIP0PCRADDRESS; + BaseAddress = (PVOID)PCR; MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c (original) +++ trunk/reactos/ntoskrnl/ps/thread.c Thu Feb 7 23:04:31 2008 @@ -325,10 +325,14 @@ Thread->StartAddress = (PVOID)ThreadContext->Eip; Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; #elif defined(_M_PPC) - Thread->StartAddress = (PVOID)ThreadContext->Dr0; - Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3; + Thread->StartAddress = (PVOID)ThreadContext->Dr0; + Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3; #elif defined(_M_MIPS) - for (;;); + Thread->StartAddress = (PVOID)ThreadContext->Psr; + Thread->Win32StartAddress = (PVOID)ThreadContext->IntA0; +#elif defined(_M_ARM) + Thread->StartAddress = (PVOID)ThreadContext->Pc; + Thread->Win32StartAddress = (PVOID)ThreadContext->R0; #else #error Unknown architecture #endif Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c Thu Feb 7 23:04:31 2008 @@ -284,6 +284,8 @@ __asm__("move $sp, %0" : "=r" (Stack) : ); #elif defined(_M_PPC) __asm__("mr %0,1" : "=r" (Stack) : ); +#elif defined(_M_ARM) + __asm__("mov sp, %0" : "=r"(Stack) : ); #else #error Unknown architecture #endif

16 years, 8 months

[hpoussin] 32196: Fix for the fix

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Thu Feb 7 22:58:31 2008 New Revision: 32196 URL: http://svn.reactos.org/svn/reactos?rev=32196&view=rev Log: Fix for the fix Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Feb 7 22:58:31 2008 @@ -1316,7 +1316,6 @@ } Size = sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - *pRequiredSize = Size; DeviceNode->ResourceList = ExAllocatePool(PagedPool, Size); if (!DeviceNode->ResourceList) { @@ -1454,6 +1453,7 @@ DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources; + *pRequiredSize = Size; return STATUS_SUCCESS; ByeBye: @@ -1462,6 +1462,7 @@ ExFreePool(DeviceNode->ResourceList); DeviceNode->ResourceList = NULL; } + *pRequiredSize = 0; return Status; }

16 years, 8 months

[cfinck] 32194: - Open the Edit windows as modeless dialogs, so the user can edit more than one character at the same time - Simplify the linked-list functions

by cfinck＠svn.reactos.org

Author: cfinck Date: Thu Feb 7 22:14:55 2008 New Revision: 32194 URL: http://svn.reactos.org/svn/reactos?rev=32194&view=rev Log: - Open the Edit windows as modeless dialogs, so the user can edit more than one character at the same time - Simplify the linked-list functions Modified: trunk/rosapps/devutils/vgafontedit/editglyphdlg.c trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c trunk/rosapps/devutils/vgafontedit/fontwnd.c trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc trunk/rosapps/devutils/vgafontedit/lang/en-US.rc trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc trunk/rosapps/devutils/vgafontedit/main.rc trunk/rosapps/devutils/vgafontedit/precomp.h trunk/rosapps/devutils/vgafontedit/resource.h Modified: trunk/rosapps/devutils/vgafontedit/editglyphdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/editg… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/editglyphdlg.c (original) +++ trunk/rosapps/devutils/vgafontedit/editglyphdlg.c Thu Feb 7 22:14:55 2008 @@ -90,8 +90,26 @@ // Fall through } + // This is the equivalent of WM_DESTROY for dialogs case IDCANCEL: EndDialog(Info->hSelf, 0); + + // Remove the window from the linked list + if(Info->PrevEditGlyphWnd) + Info->PrevEditGlyphWnd->NextEditGlyphWnd = Info->NextEditGlyphWnd; + else + Info->FontWndInfo->FirstEditGlyphWnd = Info->NextEditGlyphWnd; + + if(Info->NextEditGlyphWnd) + Info->NextEditGlyphWnd->PrevEditGlyphWnd = Info->PrevEditGlyphWnd; + else + Info->FontWndInfo->LastEditGlyphWnd = Info->PrevEditGlyphWnd; + + SetWindowLongW(Info->hSelf, GWLP_USERDATA, 0); + SetWindowLongW(Info->hEdit, GWLP_USERDATA, 0); + SetWindowLongW(Info->hPreview, GWLP_USERDATA, 0 ); + + HeapFree(hProcessHeap, 0, Info); return TRUE; } @@ -111,14 +129,6 @@ { case WM_COMMAND: return EditGlyphCommand( LOWORD(wParam), Info ); - - case WM_DESTROY: - SetWindowLongW(hwnd, GWLP_USERDATA, 0); - SetWindowLongW(Info->hEdit, GWLP_USERDATA, 0); - SetWindowLongW(Info->hPreview, GWLP_USERDATA, 0 ); - - HeapFree(hProcessHeap, 0, Info); - return TRUE; case WM_INITDIALOG: Info = (PEDIT_GLYPH_INFO) lParam; Modified: trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontb… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontboxeswnd.c Thu Feb 7 22:14:55 2008 @@ -189,12 +189,41 @@ { PEDIT_GLYPH_INFO EditGlyphInfo; + // Has the window for this character already been opened? + EditGlyphInfo = FontWndInfo->FirstEditGlyphWnd; + + while(EditGlyphInfo) + { + if(EditGlyphInfo->uCharacter == FontWndInfo->uSelectedCharacter) + { + // Yes, it has. Bring it to the front. + SetFocus(EditGlyphInfo->hSelf); + return; + } + + EditGlyphInfo = EditGlyphInfo->NextEditGlyphWnd; + } + + // No. Then create a new one EditGlyphInfo = (PEDIT_GLYPH_INFO) HeapAlloc( hProcessHeap, 0, sizeof(EDIT_GLYPH_INFO) ); EditGlyphInfo->FontWndInfo = FontWndInfo; EditGlyphInfo->uCharacter = FontWndInfo->uSelectedCharacter; RtlCopyMemory( EditGlyphInfo->CharacterBits, FontWndInfo->Font->Bits + FontWndInfo->uSelectedCharacter * 8, sizeof(EditGlyphInfo->CharacterBits) ); - DialogBoxParamW(hInstance, MAKEINTRESOURCEW(IDD_EDITGLYPH), FontWndInfo->hSelf, EditGlyphDlgProc, (LPARAM)EditGlyphInfo); + // Add the new window to the linked list + EditGlyphInfo->PrevEditGlyphWnd = FontWndInfo->LastEditGlyphWnd; + EditGlyphInfo->NextEditGlyphWnd = NULL; + + if(FontWndInfo->LastEditGlyphWnd) + FontWndInfo->LastEditGlyphWnd->NextEditGlyphWnd = EditGlyphInfo; + else + FontWndInfo->FirstEditGlyphWnd = EditGlyphInfo; + + FontWndInfo->LastEditGlyphWnd = EditGlyphInfo; + + // Open the window as a modeless dialog, so people can edit several characters at the same time. + EditGlyphInfo->hSelf = CreateDialogParamW(hInstance, MAKEINTRESOURCEW(IDD_EDITGLYPH), FontWndInfo->hSelf, EditGlyphDlgProc, (LPARAM)EditGlyphInfo); + ShowWindow(EditGlyphInfo->hSelf, SW_SHOW); } VOID Modified: trunk/rosapps/devutils/vgafontedit/fontwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/fontw… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/fontwnd.c (original) +++ trunk/rosapps/devutils/vgafontedit/fontwnd.c Thu Feb 7 22:14:55 2008 @@ -122,6 +122,19 @@ case WM_USER_APPCLOSE: case WM_CLOSE: + // The user has to close all open edit dialogs first + if(Info->FirstEditGlyphWnd) + { + PWSTR pszMessage; + + AllocAndLoadString(&pszMessage, IDS_CLOSEEDIT); + MessageBoxW(hwnd, pszMessage, szAppName, MB_OK | MB_ICONEXCLAMATION); + HeapFree(hProcessHeap, 0, pszMessage); + + return 0; + } + + // Prompt if the current file has been modified if(Info->OpenInfo->bModified) { INT nMsgBoxResult; @@ -164,25 +177,15 @@ case WM_DESTROY: // Remove the window from the linked list - if(Info->MainWndInfo->FirstFontWnd == Info) - { + if(Info->PrevFontWnd) + Info->PrevFontWnd->NextFontWnd = Info->NextFontWnd; + else Info->MainWndInfo->FirstFontWnd = Info->NextFontWnd; - if(Info->NextFontWnd) - Info->NextFontWnd->PrevFontWnd = NULL; - } - else - Info->PrevFontWnd->NextFontWnd = Info->NextFontWnd; - - if(Info->MainWndInfo->LastFontWnd == Info) - { + if(Info->NextFontWnd) + Info->NextFontWnd->PrevFontWnd = Info->PrevFontWnd; + else Info->MainWndInfo->LastFontWnd = Info->PrevFontWnd; - - if(Info->PrevFontWnd) - Info->PrevFontWnd->NextFontWnd = NULL; - } - else - Info->NextFontWnd->PrevFontWnd = Info->PrevFontWnd; // Free memory if(Info->Font) @@ -394,17 +397,14 @@ if(hFontWnd) { // Add the new window to the linked list + Info->PrevFontWnd = Info->MainWndInfo->LastFontWnd; + if(Info->MainWndInfo->LastFontWnd) - { - Info->PrevFontWnd = Info->MainWndInfo->LastFontWnd; - Info->PrevFontWnd->NextFontWnd = Info; - Info->MainWndInfo->LastFontWnd = Info; - } - else - { + Info->MainWndInfo->LastFontWnd->NextFontWnd = Info; + else Info->MainWndInfo->FirstFontWnd = Info; - Info->MainWndInfo->LastFontWnd = Info; - } + + Info->MainWndInfo->LastFontWnd = Info; return TRUE; } Modified: trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/de-DE.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Schriftzeichen bearbeiten" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "Die Datei ""%1"" wurde geändert.\n\nMöchten Sie die Änderungen speichern?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Bitte schließen Sie zuerst alle offenen Bearbeitungs-Fenster!" IDS_TOOLTIP_NEW, "Neu" IDS_TOOLTIP_OPEN, "Öffnen" Modified: trunk/rosapps/devutils/vgafontedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/en-US.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/en-US.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit Glyph" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Font %1!u!" IDS_SAVEPROMPT, "The file ""%1"" was modified, but not saved.\n\nDo you want to save it?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "New" IDS_TOOLTIP_OPEN, "Open" Modified: trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/pl-PL.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edycja Glifów" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Czcionka %1!u!" IDS_SAVEPROMPT, "Plik ""%1"" zosta³ zmieniony, ale nie zapisany.\n\nCzy chcesz zapisaæ zmiany?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Nowy" IDS_TOOLTIP_OPEN, "Otwórz" Modified: trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/ru-RU.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ðåäàêòèðîâàíèå ñèìâîëà" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áûë èçìåíåí è èçìåíåíèÿ íå áûëè ñîõðàíåíû.\n\nÑîõðàíèòü?" IDS_APPTITLE, "Ðåäàêòîð VGA-øðèôòîâ ReactOS" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Íîâûé" IDS_TOOLTIP_OPEN, "Îòêðûòü" Modified: trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/lang/… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc (original) +++ trunk/rosapps/devutils/vgafontedit/lang/uk-UA.rc Thu Feb 7 22:14:55 2008 @@ -20,7 +20,7 @@ DEFPUSHBUTTON "OK", IDCANCEL, 40, 44, 55, 15 END -IDD_EDITGLYPH DIALOGEX 10, 10, 246, 197 +IDD_EDITGLYPH DIALOGEX 32768, 32768, 246, 197 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit Glyph" FONT 8, "MS Shell Dlg" @@ -75,6 +75,7 @@ IDS_DOCNAME, "Øðèôò %1!u!" IDS_SAVEPROMPT, "Ôàéë ""%1"" áóâ çì³íåíèé, àëå íå çáåðåæåíèé.\n\nÇáåðåãòè éîãî?" IDS_APPTITLE, "ReactOS VGA Font Editor" + IDS_CLOSEEDIT, "Please close all open Edit windows first!" IDS_TOOLTIP_NEW, "Ñòâîðèòè" IDS_TOOLTIP_OPEN, "Â³äêðèòè" Modified: trunk/rosapps/devutils/vgafontedit/main.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/main.… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/main.rc (original) +++ trunk/rosapps/devutils/vgafontedit/main.rc Thu Feb 7 22:14:55 2008 @@ -29,8 +29,8 @@ IDI_DOC ICON "res/doc.ico" // Languages +#include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/de-DE.rc" -#include "lang/uk-UA.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" +#include "lang/uk-UA.rc" Modified: trunk/rosapps/devutils/vgafontedit/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/preco… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/precomp.h (original) +++ trunk/rosapps/devutils/vgafontedit/precomp.h Thu Feb 7 22:14:55 2008 @@ -17,6 +17,7 @@ // Forward declarations typedef struct _FONT_WND_INFO FONT_WND_INFO, *PFONT_WND_INFO; +typedef struct _EDIT_GLYPH_INFO EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO; // Structure declarations typedef struct _BITMAP_FONT @@ -60,9 +61,12 @@ PFONT_WND_INFO PrevFontWnd; PFONT_WND_INFO NextFontWnd; + + PEDIT_GLYPH_INFO FirstEditGlyphWnd; + PEDIT_GLYPH_INFO LastEditGlyphWnd; }; -typedef struct _EDIT_GLYPH_INFO +struct _EDIT_GLYPH_INFO { PFONT_WND_INFO FontWndInfo; @@ -73,7 +77,10 @@ HWND hEdit; HWND hPreview; LONG lEditSpacing; -} EDIT_GLYPH_INFO, *PEDIT_GLYPH_INFO; + + PEDIT_GLYPH_INFO PrevEditGlyphWnd; + PEDIT_GLYPH_INFO NextEditGlyphWnd; +}; #define ID_MDI_FIRSTCHILD 50000 Modified: trunk/rosapps/devutils/vgafontedit/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/vgafontedit/resou… ============================================================================== --- trunk/rosapps/devutils/vgafontedit/resource.h (original) +++ trunk/rosapps/devutils/vgafontedit/resource.h Thu Feb 7 22:14:55 2008 @@ -65,6 +65,7 @@ #define IDS_DOCNAME 10008 #define IDS_SAVEPROMPT 10009 #define IDS_APPTITLE 10010 +#define IDS_CLOSEEDIT 10011 #define IDS_TOOLTIP_NEW 11001 #define IDS_TOOLTIP_OPEN 11002

16 years, 8 months

[fireball] 32193: - Rename vfatfs.sys to fastfat.sys for compatibility reasons.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Feb 7 21:06:11 2008 New Revision: 32193 URL: http://svn.reactos.org/svn/reactos?rev=32193&view=rev Log: - Rename vfatfs.sys to fastfat.sys for compatibility reasons. Added: trunk/reactos/drivers/filesystems/fastfat/ - copied from r32184, trunk/reactos/drivers/filesystems/vfat/ Removed: trunk/reactos/drivers/filesystems/vfat/ Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/drivers/filesystems/directory.rbuild trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild 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 Feb 7 21:06:11 2008 @@ -733,11 +733,11 @@ HKLM,"SYSTEM\CurrentControlSet\Services\tcpsvcs","Type",0x00010001,0x00000020 ; Virtual FAT filesystem driver -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Group",0x00000000,"Boot File System" -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","ImagePath",0x00020000,"system32\drivers\vfatfs.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Vfatfs","Type",0x00010001,0x00000002 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","ImagePath",0x00020000,"system32\drivers\fastfat.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 ; VBE SVGA driver HKLM,"SYSTEM\CurrentControlSet\Services\VBE","ErrorControl",0x00010001,0x00000000 Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif Thu Feb 7 21:06:11 2008 @@ -32,7 +32,7 @@ pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 -vfatfs.sys=,,,,,,,,,,,,4 +fastfat.sys=,,,,,,,,,,,,4 [HardwareIdsDatabase] *PNP0C08 = acpi Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Thu Feb 7 21:06:11 2008 @@ -400,8 +400,8 @@ return; } - /* Load vfatfs.sys (could be loaded by the setup prog!) */ - if (!LoadDriver(SourcePath, "vfatfs.sys")) + /* Load fastfat.sys (could be loaded by the setup prog!) */ + if (!LoadDriver(SourcePath, "fastfat.sys")) return; /* Load additional files specified in txtsetup.inf */ Modified: trunk/reactos/drivers/filesystems/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/direct… ============================================================================== --- trunk/reactos/drivers/filesystems/directory.rbuild (original) +++ trunk/reactos/drivers/filesystems/directory.rbuild Thu Feb 7 21:06:11 2008 @@ -19,7 +19,7 @@ <directory name="ntfs"> <xi:include href="ntfs/ntfs.rbuild" /> </directory> -<directory name="vfat"> - <xi:include href="vfat/vfatfs.rbuild" /> +<directory name="fastfat"> + <xi:include href="fastfat/vfatfs.rbuild" /> </directory> </group> Modified: trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild (original) +++ trunk/reactos/drivers/filesystems/fastfat/vfatfs.rbuild Thu Feb 7 21:06:11 2008 @@ -1,8 +1,8 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="vfatfs" type="kernelmodedriver" installbase="system32/drivers" installname="vfatfs.sys"> +<module name="fastfat" type="kernelmodedriver" installbase="system32/drivers" installname="fastfat.sys"> <bootstrap installbase="$(CDOUTPUT)" /> - <include base="vfatfs">.</include> + <include base="fastfat">.</include> <linkerflag>-lgcc</linkerflag> <library>ntoskrnl</library> <library>hal</library>

16 years, 8 months

← Newer
1
...
31
32
33
34
35
36
37
...
46
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 February 2008