Ros-diffs May 2008

ros-diffs@reactos.org

25 participants
586 discussions

[fireball] 33609: Stefan Ginsberg <stefan__100__@hotmail.com> - Fix the commented out export in win32k.def and fix the definition for EngGetCurrentCodePage. - Add RtlGetDefaultCodePage to NDK headers.

by fireball＠svn.reactos.org

Author: fireball Date: Tue May 20 08:21:21 2008 New Revision: 33609 URL: http://svn.reactos.org/svn/reactos?rev=33609&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Fix the commented out export in win32k.def and fix the definition for EngGetCurrentCodePage. - Add RtlGetDefaultCodePage to NDK headers. Modified: trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/subsystems/win32/win32k/eng/engmisc.c trunk/reactos/subsystems/win32/win32k/win32k.def Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Tue May 20 08:21:21 2008 @@ -2886,6 +2886,14 @@ NTSYSAPI VOID NTAPI +RtlGetDefaultCodePage( + OUT PUSHORT AnsiCodePage, + OUT PUSHORT OemCodePage +); + +NTSYSAPI +VOID +NTAPI RtlInitNlsTables( IN PUSHORT AnsiTableBase, IN PUSHORT OemTableBase, Modified: trunk/reactos/subsystems/win32/win32k/eng/engmisc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/engmisc.c [iso-8859-1] Tue May 20 08:21:21 2008 @@ -243,4 +243,13 @@ return NULL; } +VOID +APIENTRY +EngGetCurrentCodePage(OUT PUSHORT OemCodePage, + OUT PUSHORT AnsiCodePage) +{ + /* Forward to kernel */ + return RtlGetDefaultCodePage(AnsiCodePage, OemCodePage); +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] Tue May 20 08:21:21 2008 @@ -67,7 +67,7 @@ EngFreePrivateUserMem@8 EngFreeSectionMem@8 EngFreeUserMem@4 -EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage +EngGetCurrentCodePage@8 EngGetCurrentProcessId@0 EngGetCurrentThreadId@0 EngGetDriverName@4 @@ -104,7 +104,7 @@ EngModifySurface@32 EngMovePointer@16 EngMulDiv@12 -EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN +EngMultiByteToUnicodeN(a)20=NTOSKRNL.RtlMultiByteToUnicodeN EngMultiByteToWideChar@20 EngNineGrid@36 EngPaint@20 @@ -133,7 +133,7 @@ EngStrokePath@32 EngTextOut@40 EngTransparentBlt@32 -EngUnicodeToMultiByteN(a)20=ntoskrnl.RtlUnicodeToMultiByteN +EngUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUnicodeToMultiByteN EngUnloadImage@4 EngUnlockDirectDrawSurface@4 EngUnlockDriverObj@4 @@ -176,7 +176,7 @@ FONTOBJ_pifi@4 FONTOBJ_pjOpenTypeTablePointer@12 FONTOBJ_pvTrueTypeFontFile@8 -;FONTOBJ_pwszFontFilePaths@4 +FONTOBJ_pwszFontFilePaths@8 FONTOBJ_pxoGetXform@4 FONTOBJ_vGetInfo@12 HT_ComputeRGBGammaTable@24

16 years, 4 months

[dchapyshev] 33608: - Add kbsdll to bootcd

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue May 20 07:54:36 2008 New Revision: 33608 URL: http://svn.reactos.org/svn/reactos?rev=33608&view=rev Log: - Add kbsdll to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Tue May 20 07:54:36 2008 @@ -46,6 +46,7 @@ base\applications\games\winemine\winemine.exe 1 base\applications\hh\hh.exe 1 base\applications\kbswitch\kbswitch.exe 1 +base\applications\kbswitch\kbsdll\kbsdll.dll 1 base\applications\logoff\logoff.exe 1 base\applications\msconfig\msconfig.exe 1 base\applications\mstsc\mstsc.exe 1

16 years, 4 months

[dchapyshev] 33607: - Added kbsdll to install hooks (does not work on ReactOS). To switch layouts temporarily used keys Left Alt + F10

by dchapyshev＠svn.reactos.org

Author: dchapyshev Date: Tue May 20 07:53:31 2008 New Revision: 33607 URL: http://svn.reactos.org/svn/reactos?rev=33607&view=rev Log: - Added kbsdll to install hooks (does not work on ReactOS). To switch layouts temporarily used keys Left Alt + F10 Added: trunk/reactos/base/applications/kbswitch/kbsdll/ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c (with props) trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def (with props) trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild (with props) trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rc (with props) Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/kbswitch/kbswitch.h trunk/reactos/base/applications/kbswitch/kbswitch.rbuild Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c (added) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c [iso-8859-1] Tue May 20 07:53:31 2008 @@ -1,0 +1,127 @@ +/* + * PROJECT: ReactOS Keyboard Layout Switcher + * FILE: kbswitch/kbsdll/kbsdll.c + * PROGRAMMER: Dmitry Chapyshev <dmitry(a)reactos.org> + * + */ + +#include "../kbswitch.h" + +HHOOK hKeyboardHook, hLangHook, hWinHook; +HINSTANCE hInstance; +HWND hKbSwitchWnd; + +static VOID +SendMessageToMainWnd(UINT Msg, WPARAM wParam, LPARAM lParam) +{ + PostMessage(hKbSwitchWnd, Msg, wParam, lParam); +} + +/* Not used yet */ +LRESULT CALLBACK +KeyboardHookProc(int code, WPARAM wParam, LPARAM lParam) +{ + return CallNextHookEx(hKeyboardHook, code, wParam, lParam); +} + +LRESULT CALLBACK +LangHookProc(int code, WPARAM wParam, LPARAM lParam) +{ + PMSG msg; + msg = (PMSG) lParam; + + switch (msg->message) + { + case WM_INPUTLANGCHANGEREQUEST: + { + SendMessageToMainWnd(WM_LANG_CHANGED, wParam, msg->lParam); + } + break; + + case WM_HOTKEY: + { + if (msg->hwnd) + { + SendMessageToMainWnd(WM_LOAD_LAYOUT, (WPARAM)msg->hwnd, msg->lParam); + } + } + break; + } + + return CallNextHookEx(hLangHook, code, wParam, lParam); +} + +LRESULT CALLBACK +WinHookProc(int code, WPARAM wParam, LPARAM lParam) +{ + int id = GlobalAddAtom(_T("KBSWITCH")); + + switch (code) + { + case HCBT_SETFOCUS: + { + if ((HWND)wParam != NULL) + { + if ((HWND)wParam != hKbSwitchWnd) + { + SendMessageToMainWnd(WM_WINDOW_ACTIVATE, wParam, lParam); + } + } + } + break; + + case HCBT_CREATEWND: + { + RegisterHotKey((HWND)wParam, id, MOD_ALT, VK_F10); + } + break; + + case HCBT_DESTROYWND: + { + UnregisterHotKey((HWND)wParam, id); + } + break; + } + + GlobalDeleteAtom(id); + + return CallNextHookEx(hWinHook, code, wParam, lParam); +} + +BOOL +KbSwitchSetHooks() +{ + hKeyboardHook = SetWindowsHookEx(WH_KEYBOARD, KeyboardHookProc, hInstance, 0); + hLangHook = SetWindowsHookEx(WH_GETMESSAGE, LangHookProc, hInstance, 0); + hWinHook = SetWindowsHookEx(WH_CBT, WinHookProc, hInstance, 0); + + if ((hKeyboardHook)&&(hLangHook)&&(hWinHook)) + return TRUE; + else + return FALSE; +} + +VOID +KbSwitchDeleteHooks() +{ + if (hKeyboardHook) UnhookWindowsHookEx(hKeyboardHook); + if (hLangHook) UnhookWindowsHookEx(hLangHook); + if (hWinHook) UnhookWindowsHookEx(hWinHook); +} + +BOOL WINAPI +DllMain(IN HINSTANCE hinstDLL, + IN DWORD dwReason, + IN LPVOID lpvReserved) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + hInstance = hinstDLL; + hKbSwitchWnd = FindWindow(szKbSwitcherName, NULL); + if (!hKbSwitchWnd) return FALSE; + break; + } + + return TRUE; +} Propchange: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def (added) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def [iso-8859-1] Tue May 20 07:53:31 2008 @@ -1,0 +1,7 @@ +LIBRARY kbsdll.dll + +EXPORTS +KbSwitchSetHooks +KbSwitchDeleteHooks + +; EOF Propchange: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.def ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild (added) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild [iso-8859-1] Tue May 20 07:53:31 2008 @@ -1,0 +1,15 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="kbsdll" type="win32dll" baseaddress="0x74720000" installbase="system32" installname="kbsdll.dll" unicode="yes"> + <importlibrary definition="kbsdll.def" /> + <include base="kbsdll">.</include> + <define name="_WIN32_IE">0x0500</define> + <define name="_WIN32_WINNT">0x0600</define> + <define name="WINVER">0x0600</define> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>comctl32</library> + <file>kbsdll.c</file> + <file>kbsdll.rc</file> +</module> Propchange: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rc (added) +++ trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rc [iso-8859-1] Tue May 20 07:53:31 2008 @@ -1,0 +1,8 @@ +#include <windows.h> + +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Keyboard Layout Switcher\0" +#define REACTOS_STR_INTERNAL_NAME "kbsdll\0" +#define REACTOS_STR_ORIGINAL_FILENAME "kbsdll.dll\0" +#include <reactos/version.rc> + Propchange: trunk/reactos/base/applications/kbswitch/kbsdll/kbsdll.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.c [iso-8859-1] Tue May 20 07:53:31 2008 @@ -10,7 +10,8 @@ #define WM_NOTIFYICONMSG (WM_USER + 248) -TCHAR szKbSwitcherName[] = _T("kbswitcher"); +PROC KbSwitchSetHooks = NULL; +PROC KbSwitchDeleteHooks = NULL; static BOOL @@ -21,6 +22,8 @@ HINSTANCE hInst; HANDLE hProcessHeap; +HMODULE hDllLib; +ULONG ulCurrentLayoutNum = 1; static HICON CreateTrayIcon(LPTSTR szLCID) @@ -135,7 +138,7 @@ tnid.cbSize = sizeof(NOTIFYICONDATA); tnid.hWnd = hwnd; tnid.uID = 1; - tnid.uFlags = NIF_ICON | NIF_MESSAGE |NIF_TIP; + tnid.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP; tnid.uCallbackMessage = WM_NOTIFYICONMSG; tnid.hIcon = CreateTrayIcon(szLCID); @@ -187,6 +190,16 @@ } return TRUE; +} + +VOID +GetLayoutIDByHkl(HKL hKl, LPTSTR szLayoutID) +{ + /* + FIXME!!! This way of getting layout ID incorrect! + This will not work correctly for 0001040a, 00010410, etc + */ + wsprintf(szLayoutID, _T("00000%x"), LOWORD(hKl)); } static BOOL @@ -258,7 +271,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hwnd, LPARAM lParam) { - SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); + PostMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); return TRUE; } @@ -278,8 +291,10 @@ // Switch to the new keyboard layout UpdateTrayIcon(hwnd, szLCID, szName); hKl = LoadKeyboardLayout(szLCID, KLF_ACTIVATE); - SystemParametersInfo(SPI_SETDEFAULTINPUTLANG, 0, &hKl, SPIF_SENDWININICHANGE); + EnumWindows(EnumWindowsProc, (LPARAM) hKl); + + ulCurrentLayoutNum = uLayoutNum; } static HMENU @@ -360,18 +375,101 @@ return hMenu; } +BOOL +SetHooks() +{ + hDllLib = LoadLibrary(_T("kbsdll.dll")); + if (!hDllLib) return FALSE; + + KbSwitchSetHooks = (PROC) GetProcAddress(hDllLib, MAKEINTRESOURCEA(1)); + KbSwitchDeleteHooks = (PROC) GetProcAddress(hDllLib, MAKEINTRESOURCEA(2)); + + if ((KbSwitchSetHooks == NULL)||(KbSwitchDeleteHooks == NULL)) + return FALSE; + + return KbSwitchSetHooks(); +} + +VOID +DeleteHooks() +{ + if (KbSwitchDeleteHooks) KbSwitchDeleteHooks(); + if (hDllLib) FreeLibrary(hDllLib); +} + +BOOL CALLBACK +EnumChildProc(HWND hwnd, LPARAM lParam) +{ + SendMessage(hwnd, WM_INPUTLANGCHANGEREQUEST, 0, lParam); + return TRUE; +} + +ULONG +GetNextLayout() +{ + TCHAR szLayoutNum[3 + 1], szLayoutID[CCH_LAYOUT_ID + 1]; + ULONG Ret = ulCurrentLayoutNum; + + _ultot(ulCurrentLayoutNum, szLayoutNum, 10); + if (!GetLayoutID(szLayoutNum, szLayoutID)) + { + return -1; + } + + _ultot(Ret + 1, szLayoutNum, 10); + + if (GetLayoutID(szLayoutNum, szLayoutID)) + { + return (Ret + 1); + } + else + { + _ultot(Ret - 1, szLayoutNum, 10); + if (GetLayoutID(szLayoutNum, szLayoutID)) + return (Ret - 1); + else + return -1; + } + + return -1; +} + LRESULT CALLBACK WndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { static HMENU hLeftPopupMenu, hRightPopupMenu; + static TCHAR szLCID[MAX_PATH]; switch (Message) { case WM_CREATE: + { + SetHooks(); AddTrayIcon(hwnd); hLeftPopupMenu = BuildLeftPopupMenu(hwnd); hRightPopupMenu = BuildRightPopupMenu(hwnd); - break; + } + break; + + case WM_LANG_CHANGED: + { + GetLayoutIDByHkl((HKL)lParam, szLCID); + UpdateTrayIcon(hwnd, szLCID, _T("")); + } + break; + + case WM_LOAD_LAYOUT: + { + ActivateLayout(hwnd, GetNextLayout()); + } + break; + + case WM_WINDOW_ACTIVATE: + { + GetLayoutIDByHkl(GetKeyboardLayout(GetWindowThreadProcessId((HWND)wParam, 0)), szLCID); + UpdateTrayIcon(hwnd, szLCID, _T("")); + } + break; case WM_NOTIFYICONMSG: switch (lParam) @@ -388,8 +486,8 @@ else TrackPopupMenu(hRightPopupMenu, 0, pt.x, pt.y, 0, hwnd, NULL); PostMessage(hwnd, WM_NULL, 0, 0); - break; } + break; } break; @@ -412,9 +510,8 @@ if (!ShellExecuteEx(&shInputDll)) MessageBox(hwnd, _T("Can't start input.dll"), NULL, MB_OK | MB_ICONERROR); - - break; } + break; default: ActivateLayout(hwnd, LOWORD(wParam)); @@ -428,15 +525,18 @@ { //FIXME: Should detect default language changes by CPL applet or by other tools and update UI } - } - break; + } + break; case WM_DESTROY: + { + DeleteHooks(); DestroyMenu(hLeftPopupMenu); DestroyMenu(hRightPopupMenu); DelTrayIcon(hwnd); PostQuitMessage(0); - break; + } + break; } return DefWindowProc(hwnd, Message, wParam, lParam); Modified: trunk/reactos/base/applications/kbswitch/kbswitch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.h [iso-8859-1] Tue May 20 07:53:31 2008 @@ -11,3 +11,10 @@ // Maximum Character Count of a ULONG in decimal #define CCH_ULONG_DEC 10 + +#define WM_KEY_PRESSED (WM_USER + 10100) +#define WM_LANG_CHANGED (WM_USER + 10200) +#define WM_WINDOW_ACTIVATE (WM_USER + 10300) +#define WM_LOAD_LAYOUT (WM_USER + 10400) + +TCHAR szKbSwitcherName[] = _T("kbswitcher"); Modified: trunk/reactos/base/applications/kbswitch/kbswitch.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… ============================================================================== --- trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] (original) +++ trunk/reactos/base/applications/kbswitch/kbswitch.rbuild [iso-8859-1] Tue May 20 07:53:31 2008 @@ -1,13 +1,16 @@ <?xml version="1.0"?> <group xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes"> - <include base="kbswitch">.</include> - <library>kernel32</library> - <library>advapi32</library> - <library>user32</library> - <library>shell32</library> - <library>gdi32</library> - <file>kbswitch.c</file> - <file>kbswitch.rc</file> - </module> +<module name="kbswitch" type="win32gui" installbase="system32" installname="kbswitch.exe" unicode="yes"> + <include base="kbswitch">.</include> + <library>kernel32</library> + <library>advapi32</library> + <library>user32</library> + <library>shell32</library> + <library>gdi32</library> + <file>kbswitch.c</file> + <file>kbswitch.rc</file> +</module> +<directory name="kbsdll"> + <xi:include href="kbsdll/kbsdll.rbuild" /> +</directory> </group>

16 years, 4 months

[dreimer] 33606: Bug 3256: Greek translation update for usetup by Apostulos Alexandris (djapal@gmail.com) Bug 3261: Korean translation of mstsc by Seungju Kim (admin@manateeshome.com)

by dreimer＠svn.reactos.org

Author: dreimer Date: Tue May 20 03:49:40 2008 New Revision: 33606 URL: http://svn.reactos.org/svn/reactos?rev=33606&view=rev Log: Bug 3256: Greek translation update for usetup by Apostulos Alexandris (djapal(a)gmail.com) Bug 3261: Korean translation of mstsc by Seungju Kim (admin(a)manateeshome.com) Added: trunk/reactos/base/applications/mstsc/lang/ko-KO.rc (with props) Modified: trunk/reactos/base/applications/mstsc/rsrc.rc trunk/reactos/base/setup/usetup/lang/el-GR.h Added: trunk/reactos/base/applications/mstsc/lang/ko-KO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… ============================================================================== --- trunk/reactos/base/applications/mstsc/lang/ko-KO.rc (added) +++ trunk/reactos/base/applications/mstsc/lang/ko-KO.rc [iso-8859-1] Tue May 20 03:49:40 2008 @@ -1,0 +1,66 @@ +/* + *Korean translation by manatails007(www.manatails007.org) Seungju Kim +*/ +LANGUAGE LANG_KOREAN, SUBLANG_NEUTRAL + +IDD_GENERAL DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "·Î±×¿Â ¼³Á¤",IDC_STATIC,7,7,228,89 + GROUPBOX "¿¬°á ¼³Á¤",IDC_STATIC,7,103,228,65 + ICON "", IDC_LOGONICON, 15,19,20,20 + LTEXT "¼¹ö ÁÖ¼Ò¸¦ ÀÔ·ÂÇØ ÁÖ¼¼¿ä.",IDC_STATIC,47,24,81,8 + LTEXT "¼¹ö ÁÖ¼Ò:",IDC_STATIC,47,41,25,8 + LTEXT "»ç¿ëÀÚ ÀÌ¸§:",IDC_STATIC,47,58,38,8 + COMBOBOX IDC_SERVERCOMBO,79,39,141,150,CBS_DROPDOWN | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "ÀúÀå",IDC_SAVE,67,139,50,14 + PUSHBUTTON "´Ù¸¥ ÀÌ¸§À¸·Î ÀúÀå...",IDC_SAVEAS,123,139,50,14 + PUSHBUTTON "¿±â...",IDC_OPEN,177,139,50,14 + ICON "", IDC_CONNICON, 16,114,20,20 + LTEXT "ÇöÀç ¿¬°á ¼³Á¤À» ÀúÀåÇÏ°Å³ª ´Ù¸¥ ¼³Á¤ ÆÄÀÏÀ» ¿±´Ï´Ù",IDC_STATIC,50,115,172,20 +END + +IDD_DISPLAY DIALOGEX 0, 0, 242, 175 +STYLE DS_SHELLFONT | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + GROUPBOX "¿ø°Ý µ¥½ºÅ©Å¾ Å©±â",IDC_STATIC,7,7,228,68 + GROUPBOX "»ö±ò",IDC_STATIC,7,83,228,85 + ICON "", IDC_REMICON, 15,19,20,20 + ICON "", IDC_COLORSICON, 15,98,20,20 + LTEXT "¿ø°Ý µ¥½ºÅ©Å¾ÀÇ È¸é Å©±â¸¦ ¼³Á¤ÇÕ´Ï´Ù. ½½¶óÀÌ´õ¸¦ ³¡±îÁö ´ç±â¸é ÃÖ´ë È¸éÀÌ µË´Ï´Ù",IDC_STATIC,53,22,175,21 + CONTROL "", IDC_GEOSLIDER, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 56, 42, 124, 17 + COMBOBOX IDC_BPPCOMBO,56,102,128,80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "",IDC_COLORIMAGE,"Static",SS_OWNERDRAW | SS_SUNKEN, 56,121,127,10 + LTEXT "Âü°í: ¿ø°Ý ÄÄÇ»ÅÍÀÇ ¼³Á¤ÀÌ ÇöÀç ¼³Á¤À» µ¤¾î¾µ °ÍÀÔ´Ï´Ù.",IDC_STATIC,56,143,165,18 + LTEXT "Àû°Ô",IDC_STATIC,35,42,15,8 + LTEXT "¸¹ÀÌ",IDC_STATIC,189,42,17,8 + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 56, 62, 120, 10, SS_CENTER +END + +IDD_CONNECTDIALOG DIALOGEX 0, 0, 260, 262 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "¿ø°Ý µ¥½ºÅ©Å¾ ¿¬°á" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "¿¬°á",IDOK,147,245,50,14 + PUSHBUTTON "Ãë¼Ò",IDCANCEL,203,245,50,14 + CONTROL "",IDC_TAB,"SysTabControl32",0x0,7,50,246,190 +END + + +STRINGTABLE +BEGIN + IDS_TAB_GENERAL "ÀÏ¹Ý" + IDS_TAB_DISPLAY "µð½ºÇÃ·¹ÀÌ" + IDS_256COLORS "256 »ö" + IDS_HIGHCOLOR15 "32,768 »ö (15 ºñÆ®)" + IDS_HIGHCOLOR16 "65,536 »ö (16 ºñÆ®)" + IDS_HIGHCOLOR24 "16,777,216 »ö (24 ºñÆ®)" + IDS_PIXEL "%lux%lu ÇÈ¼¿" + IDS_FULLSCREEN "ÃÖ´ë È¸é" + IDS_BROWSESERVER "<´õ ¸¹ÀÌ...>" + IDS_HEADERTEXT1 "¿ø°Ý µ¥½ºÅ©Å¾" + IDS_HEADERTEXT2 "¿¬°á" +END Propchange: trunk/reactos/base/applications/mstsc/lang/ko-KO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/mstsc/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rs… ============================================================================== --- trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/rsrc.rc [iso-8859-1] Tue May 20 03:49:40 2008 @@ -20,6 +20,7 @@ #include "lang/es-ES.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/ko-KO.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" #include "lang/ru-RU.rc" Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Tue May 20 03:49:40 2008 @@ -6,37 +6,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Language Selection.", - TEXT_STYLE_NORMAL - }, - { - 8, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "§ ¢¦ã ¢é©©ª.", + TEXT_STYLE_NORMAL + }, + { + 7, 10, - "\x07 Please choose the language used for the installation process.", - TEXT_STYLE_NORMAL - }, - { - 8, + "\x07 ¨¡¢é § ¢â¥« « ¢é©© §¦¬ ®¨© £¦§¦ å ¡«á «¤ ¡«á©«©.", + TEXT_STYLE_NORMAL + }, + { + 7, 11, - " Then press ENTER.", - TEXT_STYLE_NORMAL - }, - { - 8, + " «á §«ã©« ENTER.", + TEXT_STYLE_NORMAL + }, + { + 7, 13, - "\x07 This Language will be the default language for the final system.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "\x07 ¬«ã ¢é©© å¤ §¨¦§ ¢£â¤ «¦ «¢ ¡æ ©ç©«£.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -52,59 +52,59 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 5, 8, "¢éª ¨å©« ©«¤ ¡«á©«© «¦¬ ReactOS", TEXT_STYLE_HIGHLIGHT }, { - 6, + 5, 11, - "¬«æ «¦ £â¨¦ª «ª ¡«á©«©ª ¤« ¨á «¦ ¢ «¦¬¨ ¡æ ©ç©«£ ReactOS ©«¦¤", - TEXT_STYLE_NORMAL - }, - { - 6, + "¬«æ «¦ £â¨¦ª «ª ¡«á©«©ª ¤« ¨á «¦ ¢ «¦¬¨ ¡æ ©ç©«£ ReactOS", + TEXT_STYLE_NORMAL + }, + { + 5, 12, - "¬§¦¢¦ ©«ã ©ª ¡ §¨¦«¦ £á «¦ ç«¨¦ £â¨¦ª «ª ¡«á©«©ª.", - TEXT_STYLE_NORMAL - }, - { - 8, + "©«¦¤ ¬§¦¢¦ ©«ã ©ª ¡ §¨¦«¦ £á «¦ ç«¨¦ £â¨¦ª «ª ¡«á©«©ª.", + TEXT_STYLE_NORMAL + }, + { + 7, 15, "\x07 «ã©« ENTER ¤ ¡«©«ã©« «¦ ReactOS.", TEXT_STYLE_NORMAL }, { - 8, + 7, 17, "\x07 «ã©« R ¤ § ¦¨é©« «¦ ReactOS.", TEXT_STYLE_NORMAL }, { - 8, + 7, 19, - "\x07 «ã©« L ¤ å« «¦¬ª æ¨¦¬ª ¦æ«©ª ¡ « ª §¨¦è§¦â© ª «¦ ReactOS", - TEXT_STYLE_NORMAL - }, - { - 8, + "\x07 «ã©« L ¤ å« «¦¬ª æ¨¦¬ª ¦æ«©ª «¦¬ ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 7, 21, "\x07 «ã©« F3 ¤ §¦®à¨ã©« ®à¨åª ¤ ¡«©«ã©« «¦ ReactOS.", TEXT_STYLE_NORMAL }, { - 6, + 5, 23, " §¨ ©©æ«¨ª §¢¨¦¦¨åª «¦ ReactOS, §¨¡¢¦ç£ § ©¡å« «¦:", TEXT_STYLE_NORMAL }, { - 6, + 5, 24, "http://www.reactos.org", TEXT_STYLE_HIGHLIGHT @@ -128,55 +128,61 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - " ¡«á©«© «¦¬ ReactOS å¤ © ¨® ¡ã á© §¨¦¨££« ©£¦ç. ¤ ¬§¦©«¨å ¡æ£", - TEXT_STYLE_NORMAL - }, - { - 6, - 9, - "æ¢ª « ª ¢ «¦¬¨ ¡æ««ª £ ª §¢ã¨¦¬ª ¡«á©«©ª ¢ «¦¬¨ ¡¦ç.", - TEXT_STYLE_NORMAL - }, - { - 6, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 7, + " ¡«á©«© «¦¬ ReactOS ¨å©¡« © §¨é £¦ ©«á ¦ ¤á§«¬¥ª ¡ ", + TEXT_STYLE_NORMAL + }, + { + 6, + 8, + "¤ ¬§¦©«¨å ¡æ£ æ¢ª « ª ¬¤«æ««ª £ ª §¢ã¨¦¬ª ¡«á©«©ª", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "©®ç¦¬¤ ¦ §¨¡á«à §¨ ¦¨ ©£¦å :", + TEXT_STYLE_NORMAL + }, + { + 8, 12, - " §æ£¤¦ §¨ ¦¨ ©£¦å ©®ç¦¬¤:", + "- ¡«á©«© £§¦¨å ¤ ® ¨ ©«å §á¤à §æ â¤ §¨à«ç¦¤", TEXT_STYLE_NORMAL }, { 8, 13, - "- ¡«á©«© £§¦¨å ¤ ¤«§¥â¢ £ §á¤à §æ â¤ primary partition ¤á å©¡¦.", + " £â¨ ©£ ¤á å©¡¦.", TEXT_STYLE_NORMAL }, { 8, 14, - "- ¡«á©«© £§¦¨å ¤ ¨á¯ â¤ primary partition §æ â¤ å©¡¦", + "- ¡«á©«© £§¦¨å ¤ ¨á¯ â¤ §¨à«ç¦¤ £â¨ ©£ ", TEXT_STYLE_NORMAL }, { 8, 15, - " æ©¦¤ ¬§á¨®¦¬¤ extended partitions ©«¦ å©¡¦ ¬«æ.", + " §æ â¤ å©¡¦ æ©¦¤ ¬§á¨®¦¬¤ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", TEXT_STYLE_NORMAL }, { 8, 16, - "- ¡«á©© £§¦¨å ¤ ¨á¯ «¦ §¨é«¦ extended partition ¤æª å©¡¦¬", + "- ¡«á©© £§¦¨å ¤ ¨á¯ «¦ §¨é«¦ ¡««£â¤¦ £â¨ ©£ ¤æª ", TEXT_STYLE_NORMAL }, { 8, 17, - " æ©¦¤ ¬§á¨®¦¬¤ ¡ á¢¢ extended partitions ©«¦ å©¡¦ ¬«æ.", + " å©¡¦¬ æ©¦¤ ¬§á¨®¦¬¤ ¡ á¢¢ ¡««£â¤ £¨å©£« ©«¦ å©¡¦ ¬«æ.", TEXT_STYLE_NORMAL }, { @@ -188,7 +194,7 @@ { 8, 19, - "- File system checks are not implemented yet.", + "- ¤ ¬§¦©«¨å« ¡æ£ â¢®¦ª ©¢£á«à¤ ©« ©¬«ã£« ¨®åà¤.", TEXT_STYLE_NORMAL }, { @@ -222,13 +228,13 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 6, - "Licensing:", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 6, + " ¦æ«©:", TEXT_STYLE_HIGHLIGHT }, { @@ -346,7 +352,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -358,23 +364,23 @@ { 8, 11, - " §¦¢¦ ©«ãª:", + " §¦¢¦ ©«ãª:", TEXT_STYLE_NORMAL }, { 8, 12, - " £á¤ ©:", + " £á¤ ©:", TEXT_STYLE_NORMAL, }, { 8, 13, - " ¢¡«¨¦¢æ ¦:", - TEXT_STYLE_NORMAL - }, - { - 8, + " ¢¡«¨¦¢æ ¦:", + TEXT_STYLE_NORMAL + }, + { + 2, 14, " á«¥ §¢¡«¨¦¢¦å¦¬:", TEXT_STYLE_NORMAL @@ -382,42 +388,42 @@ { 8, 16, - " §¦¦®ã:", + " §¦¦®ã:", TEXT_STYLE_NORMAL }, { 25, - 16, "§¦¦®ã ¬«é¤ «à¤ ¨¬£å©à¤ ©¬©¡¬é¤", + 16, "§¦¦®ã ¬«é¤ «à¤ ¨¬£å©à¤", TEXT_STYLE_NORMAL }, { 6, 19, - "§¦¨å« ¤ ¢¢á¥« « ª ¨¬£å© ª ¬¢ ¡¦ç §«é¤«ª « §¢ã¡«¨ UP ã DOWN", + "§¦¨å« ¤ ¢¢á¥« « ª ¨¬£å© ª ¬¢ ¡¦ç §«é¤«ª « §¢ã¡«¨ ", TEXT_STYLE_NORMAL }, { 6, 20, - " ¤ § ¢â¥« £ ¨ç£ ©. «á §«ã©« «¦ §¢ã¡«¨¦ ENTER ¤ § ¢â¥« á¢¢ª", + "ã ¤ § ¢â¥« £ ¨ç£ ©. ", TEXT_STYLE_NORMAL }, { 6, 21, - "¨¬£å© ª.", + "«á §«ã©« «¦ §¢ã¡«¨¦ ENTER ¤ § ¢â¥« á¢¢ª ¨¬£å© ª.", TEXT_STYLE_NORMAL }, { 6, 23, - "î«¤ æ¢ª ¦ ¨¬£å© ª å¤ ©à©«âª, § ¢â¥« \"§¦¦®ã ¬«é¤ «à¤ ¨¬£å©à¤ ©¬©¡¬é¤\"", + "î«¤ æ¢ª ¦ ¨¬£å© ª å¤ ©à©«âª, § ¢â¥« ", TEXT_STYLE_NORMAL }, { 6, 24, - "¡ §«ã©« ENTER.", + "\"§¦¦®ã ¬«é¤ «à¤ ¨¬£å©à¤ ©¬©¡¬é¤\" ¡ §«ã©« ENTER.", TEXT_STYLE_NORMAL }, { @@ -439,37 +445,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - " ¡«á©«© «¦¬ ReactOS ¨å©¡« © §¨é £¦ ©«á ¦ ¤á§«¬¥ª. ¤ ¬§¦©«¨å ¡æ£", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© «¦¬ ReactOS ¨å©¡« © §¨é £¦ ©«á ¦ ¤á§«¬¥ª ¡ ", TEXT_STYLE_NORMAL }, { 6, 9, - "æ¢ª « ª ¢ «¦¬¨ ¡æ««ª £ ª §¢ã¨¦¬ª ¡«á©«©ª ¢ «¦¬¨ ¡¦ç.", + "¤ ¬§¦©«¨å ¡æ£ æ¢ª « ª ¬¤«æ««ª £ ª §¢ã¨¦¬ª ¡«á©«©ª.", TEXT_STYLE_NORMAL }, { 6, 12, - " ¢ «¦¬¨åª § æ¨à©ª ¤ â®¦¬¤ ¬¢¦§¦ å ¡æ£.", + " ¢ «¦¬¨åª § æ¨à©ª ¤ â®¦¬¤ ¬¢¦§¦ å ¡æ£.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 «ã©« U ¤¤âà© «¦¬ OS.", + "\x07 «ã©« U ¤¤âà© «¦¬ ¢ «¨¦¬¨ ¡¦ç.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 «ã©« R « Recovery Console.", + "\x07 «ã©« R ¤ ¡«¢â©« «¤ ¡¦¤©æ¢ § æ¨à©ª.", TEXT_STYLE_NORMAL }, { @@ -502,7 +508,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -514,25 +520,31 @@ { 8, 10, - "\x07 «ã©« « §¢ã¡«¨ UP ã DOWN ¤ § ¢â¥« «¦¤ § ¬£«æ «ç§¦ ¬§¦¢¦ ©«ã.", + "\x07 «ã©« « §¢ã¡«¨ ã ¤ § ¢â¥« «¦¤ § ¬£«æ", TEXT_STYLE_NORMAL }, { 8, 11, + " «ç§¦ ¬§¦¢¦ ©«ã.", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, " «á §«ã©« ENTER.", TEXT_STYLE_NORMAL }, { 8, - 13, - "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤ ©¢å ®à¨åª ¤ ¢¢á¥«", - TEXT_STYLE_NORMAL - }, - { - 8, 14, - " «¦¤ «ç§¦ ¬§¦¢¦ ©«ã.", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " ©¢å ®à¨åª ¤ ¢¢á¥« «¦¤ «ç§¦ ¬§¦¢¦ ©«ã.", TEXT_STYLE_NORMAL }, { @@ -554,13 +566,13 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { 10, 6, - "¦ ©ç©«£ § é¤ «é¨ æ« æ¢ « ¦£â¤ §¦¡ç«¡¤ ©«¦ å©¡¦", + "¦ ©ç©«£ § é¤ «é¨ æ« æ¢ « ¦£â¤ â®¦¬¤ §¦¡¬«å", TEXT_STYLE_NORMAL }, { @@ -578,7 +590,7 @@ { 0, 0, - " Flushing cache", + " ¡¡á¨© §¨¦©à¨ ¤é¤ ¨®åà¤...", TEXT_TYPE_STATUS }, { @@ -594,7 +606,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -640,7 +652,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -651,25 +663,30 @@ }, { 8, 10, - "\x07 «ã©« «¦ §¢ã¡«¨¦ UP ã DOWN ¤ § ¢â¥« «¦¤ § ¬£«æ «ç§¦ £á¤ ©ª.", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ã ¤ § ¢â¥« «¦¤ § ¬£«æ.", TEXT_STYLE_NORMAL }, - { - 8, + { 8, 11, + " «ç§¦ £á¤ ©ª.", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, " «á §«ã©« ENTER.", TEXT_STYLE_NORMAL }, { 8, - 13, - "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¨¦¦ç£¤ ©¢å ®à¨åª ¤ ¢¢á¥«", - TEXT_STYLE_NORMAL - }, - { - 8, 14, - " «¦¤ «ç§¦ £á¤ ©ª.", + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¨¦¦ç£¤ ", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " ©¢å ®à¨åª ¤ ¢¢á¥« «¦¤ «ç§¦ £á¤ ©ª.", TEXT_STYLE_NORMAL }, { @@ -691,7 +708,7 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { @@ -737,19 +754,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - " ¡«á©«© £§¦¨å ¤ ¡«©«ã© «¦¤ bootloader ©«¦ ©¡¢¨æ å©¡¦", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© £§¦¨å ¤ ¡«©«ã© «¦¤ bootloader", TEXT_STYLE_NORMAL }, { 6, 9, - "«¦¬ ¬§¦¢¦ ©«ã ©ª", + "©«¦ ©¡¢¨æ å©¡¦ «¦¬ ¬§¦¢¦ ©«ã ©ª", TEXT_STYLE_NORMAL }, { @@ -784,49 +801,49 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "The list below shows existing partitions and unused disk", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " §¨¡«à ¢å©« £¤å « ¬§á¨®¦¤« £¨å©£« ¡ ", TEXT_STYLE_NORMAL }, { 6, 9, - "space for new partitions.", + "¡ «¦¤ ¢â¬¨¦ ®é¨¦ ¤â £¨å©£«.", TEXT_STYLE_NORMAL }, { 8, 11, - "\x07 Press UP or DOWN to select a list entry.", + "\x07 «ã©« ã ¤ § ¢â¥« â¤ ©«¦ ®â ¦ «ª ¢å©«ª.", TEXT_STYLE_NORMAL }, { 8, 13, - "\x07 Press ENTER to install ReactOS onto the selected partition.", + "\x07 «ã©« ENTER ¤ ¡«©«ã©« «¦ ReactOS ©«¦ § ¢£â¤¦ £â¨ ©£.", TEXT_STYLE_NORMAL }, { 8, 15, - "\x07 Press C to create a new partition.", + "\x07 «ã©« C ¤ £ ¦¬¨ã©« â¤ ¤â¦ £â¨ ©£.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press D to delete an existing partition.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Please wait...", + "\x07 «ã©« D ¤ ¨á¯« â¤ ¬§á¨®¦¤ £â¨ ©£.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ¨¡¢é §¨ £â¤«...", TEXT_TYPE_STATUS }, { @@ -842,25 +859,31 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Format partition", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " £æ¨à© £¨å©£«¦ª", TEXT_STYLE_NORMAL }, { 6, 10, - "Setup will now format the partition. Press ENTER to continue.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + " ¡«á©«© «é¨ £¦¨é© «¦ £â¨ ©£", + TEXT_STYLE_NORMAL + }, + { + 6, + 11, + "«ã©« ENTER ¤ ©¬¤®å©«.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -876,43 +899,43 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup installs ReactOS files onto the selected partition. Choose a", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© ¤« ¨á « ¨®å «¦¬ ReactOS ©«¦ § ¢£â¤¦ £â¨ ©£.", TEXT_STYLE_NORMAL }, { 6, 9, - "directory where you want ReactOS to be installed:", + "§ ¢â¥« «¦¤ ©«¦¤ á¡¢¦ §¦¬ â¢« ¤ ¡«©«å «¦ ReactOS:", TEXT_STYLE_NORMAL }, { 6, 14, - "To change the suggested directory, press BACKSPACE to delete", + " ¤ ¢¢á¥« «¦¤ §¨¦« ¤æ£¤¦ á¡¢¦ §«ã©« BACKSPACE ¤", TEXT_STYLE_NORMAL }, { 6, 15, - "characters and then type the directory where you want ReactOS to", + " ¨á¯« ®¨¡«ã¨ª ¡ £«á §¢¡«¨¦¢¦å©« «¦¤ á¡¢¦ ©«¦¤ ¦§¦å¦", TEXT_STYLE_NORMAL }, { 6, 16, - "be installed.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", + "â¢« ¤ ¡©«å «¦ ReactOS.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -928,181 +951,187 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 0, + 12, + "¨¡¢é §¨ £â¤« æ©¦ ¡«á©«© «¦¬ ReactOS ¤« ¨á ", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 13, + "« ¨®å ©«¦¤ á¡¢¦ ¡«á©«©ª", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 14, + "¬«ã ¡©å £§¦¨å ¤ ¡¨«ã© ¨¡«á ¢§«á.", + TEXT_STYLE_NORMAL | TEXT_ALIGN_CENTER + }, + { + 0, + 0, + " \xB3 ¨¡¢é §¨ £â¤«... ", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY elGRBootLoaderEntries[] = +{ + { + 4, + 3, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© ¨á «¦¤ boot loader", + TEXT_STYLE_NORMAL + }, + { + 8, + 12, + "¡«á©«© «¦¬ bootloader ©«¦ ©¡¢¨æ å©¡¦ (MBR).", + TEXT_STYLE_NORMAL + }, + { + 8, + 13, + "¡«á©«© «¦¬ bootloader © £ ©¡â«.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + " £ å¤ ¡«á©«© «¦¬ bootloader.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® F3 = §¦®é¨©", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY elGRKeyboardSettingsEntries[] = +{ + { + 4, + 3, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "â¢« ¤ ¢¢á¥« «¦¤ «ç§¦ «¦¬ §¢¡«¨¦¢¦å¦¬ §¦¬ ¡«©«å.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 «ã©« « §¢ã¡«¨ ã ¤ § ¢â¥« «¦¤ § ¬£«æ", + TEXT_STYLE_NORMAL + }, + { + 8, 11, + " «ç§¦ §¢¡«¨¦¢¦å¦¬.", + TEXT_STYLE_NORMAL + }, + { + 8, 12, - "Please wait while ReactOS Setup copies files to your ReactOS", - TEXT_STYLE_NORMAL - }, - { - 30, + " «á §«ã©« ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, + 14, + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + TEXT_STYLE_NORMAL + }, + { + 8, + 15, + " ©¢å ®à¨åª ¤ ¢¢á¥« «¦¤ «ç§¦ «¦¬ §¢¡«¨¦¢¦å¦¬.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® ESC = ¡ç¨à© F3 = §¦®é¨©", + TEXT_TYPE_STATUS + }, + { + 0, + 0, + NULL, + 0 + } +}; + +static MUI_ENTRY elGRLayoutSettingsEntries[] = +{ + { + 4, + 3, + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "â¢« ¤ ¢¢á¥« «¤ á«¥ «¦¬ §¢¡«¨¦¢¦å¦¬ §¦¬ ¡«©«å.", + TEXT_STYLE_NORMAL + }, + { + 8, + 10, + "\x07 «ã©« « §¢ã¡«¨ ã ¤ § ¢â¥« «¤ § ¬£«ã", + TEXT_STYLE_NORMAL + }, + { + 8, + 11, + " á«¥ §¢¡«¨¦¢¦å¦¬. «á §«ã©« ENTER.", + TEXT_STYLE_NORMAL + }, + { + 8, 13, - "installation folder.", - TEXT_STYLE_NORMAL - }, - { - 20, + "\x07 «ã©« «¦ §¢ã¡«¨¦ ESC ¤ § ©«¨â¯« ©«¤ §¦¨¦ç£¤", + TEXT_STYLE_NORMAL + }, + { + 8, 14, - "This may take several minutes to complete.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " \xB3 Please wait... ", - TEXT_TYPE_STATUS - }, - { - 0, - 0, - NULL, - 0 - } -}; - -static MUI_ENTRY elGRBootLoaderEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup is installing the boot loader", - TEXT_STYLE_NORMAL - }, - { - 8, - 12, - "Install bootloader on the harddisk (MBR).", - TEXT_STYLE_NORMAL - }, - { - 8, - 13, - "Install bootloader on a floppy disk.", - TEXT_STYLE_NORMAL - }, - { - 8, - 14, - "Skip install bootloader.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue F3 = Quit", - TEXT_TYPE_STATUS - }, - { - 0, - 0, - NULL, - 0 - } -}; - -static MUI_ENTRY elGRKeyboardSettingsEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You want to change the type of keyboard to be installed.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard type.", - TEXT_STYLE_NORMAL - }, - { - 8, - 11, - " Then press ENTER.", - TEXT_STYLE_NORMAL - }, - { - 8, - 13, - "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL - }, - { - 8, - 14, - " the keyboard type.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", - TEXT_TYPE_STATUS - }, - { - 0, - 0, - NULL, - 0 - } -}; - -static MUI_ENTRY elGRLayoutSettingsEntries[] = -{ - { - 4, - 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You want to change the keyboard layout to be installed.", - TEXT_STYLE_NORMAL - }, - { - 8, - 10, - "\x07 Press the UP or DOWN key to select the desired keyboard", - TEXT_STYLE_NORMAL - }, - { - 8, - 11, - " layout. Then press ENTER.", - TEXT_STYLE_NORMAL - }, - { - 8, - 13, - "\x07 Press the ESC key to return to the previous page without changing", - TEXT_STYLE_NORMAL - }, - { - 8, - 14, - " the keyboard layout.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + " ©¢å ®à¨åª ¤ ¢¢á¥« «¤ á«¥ «¦¬ §¢¡«¨¦¢¦å¦¬.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " ENTER = ¬¤â® ESC = ¡ç¨à© F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -1119,19 +1148,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup prepares your computer for copying the ReactOS files. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Building the file copy list...", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© §¨¦«¦ £á «¦¤ ¬§¦¢¦ ©«ã ©ª «¤ ¤« ¨ã «à¤ ¨®åà¤ «¦¬ ReactOS. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " «å« ¢å©« «à¤ ¨®åà¤ §¨¦ª ¤« ¨ã...", TEXT_TYPE_STATUS }, { @@ -1148,37 +1177,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, TEXT_STYLE_UNDERLINE }, { 6, 17, - "Select a file system from the list below.", + "§ ¢â¥« â¤ ©ç©«£ ¨®åà¤ §æ «¤ §¨¡á«à ¢å©«.", 0 }, { 8, 19, - "\x07 Press UP or DOWN to select a file system.", + "\x07 «ã©« « §¢ã¡«¨ ã ¤ § ¢â¥« «¦ ©ç©«£ ¨®åà¤.", 0 }, { 8, 21, - "\x07 Press ENTER to format the partition.", + "\x07 «ã©« ENTER ¤ £¦¨é©« «¦ parition.", 0 }, { 8, 23, - "\x07 Press ESC to select another partition.", - 0 - }, - { - 0, - 0, - " ENTER = Continue ESC = Cancel F3 = Quit", + "\x07 «ã©« ESC ¤ § ¢â¥« á¢¢¦ partition.", + 0 + }, + { + 0, + 0, + " ENTER = ¬¤â® ESC = ¡ç¨à© F3 = §¦®é¨©", TEXT_TYPE_STATUS }, @@ -1195,37 +1224,37 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "You have chosen to delete the partition", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + "§ ¢â¥« ¤ ¨á¯« ¬«æ «¦ partition", TEXT_STYLE_NORMAL }, { 8, 18, - "\x07 Press D to delete the partition.", + "\x07 «ã©« D ¤ ¨á¯« «¦ partition.", TEXT_STYLE_NORMAL }, { 11, 19, - "WARNING: All data on this partition will be lost!", + ": î¢ « ¦£â¤ © ¬«æ «¦ partition ®¦ç¤!", TEXT_STYLE_NORMAL }, { 8, 21, - "\x07 Press ESC to cancel.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " D = Delete Partition ESC = Cancel F3 = Quit", + "\x07 «ã©« ESC ¡ç¨à©.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " D = ¨ã Partition ESC = ¡ç¨à© F3 = §¦®é¨©", TEXT_TYPE_STATUS }, { @@ -1241,19 +1270,19 @@ { 4, 3, - " ReactOS " KERNEL_VERSION_STR " Setup ", - TEXT_STYLE_UNDERLINE - }, - { - 6, - 8, - "Setup is updating the system configuration. ", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - " Creating registry hives...", + " ¡«á©«© «¦¬ ReactOS " KERNEL_VERSION_STR, + TEXT_STYLE_UNDERLINE + }, + { + 6, + 8, + " ¡«á©«© ¤¤é¤ « ¦£ã «¦¬ ©¬©«ã£«¦ª. ", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + " £ ¦¬¨¦ç¤« « registry hives...", TEXT_TYPE_STATUS }, { @@ -1279,7 +1308,7 @@ }, { //ERROR_NO_HDD - " ¡«á©«© £§æ¨© ¤ ¨ ¡á§¦ ¦¤ ©¡¢¨æ å©¡¦.\n", + " ¡«á©«© £§æ¨© ¤ ¨ ¡á§¦ ¦¤ ©¡¢¨æ å©¡¦.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1289,12 +1318,12 @@ }, { //ERROR_LOAD_TXTSETUPSIF - " ¡«á©«© £§æ¨© ¤ ¦¨«é© «¦ ¨®å¦ TXTSETUP.SIF.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© «¦ ¨®å¦ TXTSETUP.SIF.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_CORRUPT_TXTSETUPSIF - " ¡«á©«© ¨ã¡ â¤ ¡«©«¨£â¤¦ ¨®å¦ TXTSETUP.SIF.\n", + " ¡«á©«© ¨ã¡ â¤ ¡«©«¨£â¤¦ ¨®å¦ TXTSETUP.SIF.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1304,7 +1333,7 @@ }, { //ERROR_DRIVE_INFORMATION - " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ª §¢¨¦¦¨åª «¦¬ å©¡¦¬ ©¬©«ã£«¦ª.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ª §¢¨¦¦¨åª «¦¬ å©¡¦¬ ©¬©«ã£«¦ª.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1314,27 +1343,27 @@ }, { //ERROR_LOAD_COMPUTER, - " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ ¬§¦¢¦ ©«ã.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ ¬§¦¢¦ ©«ã.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_LOAD_DISPLAY, - " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ £á¤ ©ª.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ £á¤ ©ª.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_LOAD_KEYBOARD, - " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ §¢¡«¨¦¢¦å¦¬.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «ç§à¤ §¢¡«¨¦¢¦å¦¬.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_LOAD_KBLAYOUT, - " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «á¥à¤ §¢¡«¨¦¢¦å¦¬.\n", + " ¡«á©«© £§æ¨© ¤ ¦¨«é© « ¢å©« «á¥à¤ §¢¡«¨¦¢¦å¦¬.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_WARN_PARTITION, - " ¡«á©«© ¨ã¡ æ« «¦¬¢á® ©«¦¤ â¤ª ©¡¢¨æª å©¡¦ª §¨ â® â¤ £ ©¬£«æ\n" + " ¡«á©«© ¨ã¡ æ« «¦¬¢á® ©«¦¤ â¤ª ©¡¢¨æª å©¡¦ª §¨ â® â¤ £ ©¬£«æ\n" "partition table §¦¬ £§¦¨å ¤ ¢®å ©à©«á!\n" "\n" " £ ¦¬¨å ã ¨ã partitions £§¦¨å ¤ ¡«©«¨â¯ «¦ partiton table.\n" @@ -1375,22 +1404,22 @@ }, { //ERROR_UPDATE_DISPLAY_SETTINGS, - " ¡«á©«© §â«¬® ¤ ¤¤é© « ª ¨¬£å© ª £«¨é¦¬ «¤ £á¤ ©.", + " ¡«á©«© §â«¬® ¤ ¤¤é© « ª ¨¬£å© ª £«¨é¦¬ «¤ £á¤ ©.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_IMPORT_HIVE, - " ¡«á©«© §â«¬® ¤ ¦¨«é© â¤ hive ¨®å¦.", + " ¡«á©«© §â«¬® ¤ ¦¨«é© â¤ hive ¨®å¦.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_FIND_REGISTRY - " ¡«á©© §â«¬® ¤ ¨ « ¨®å ¦£â¤à¤ «¦¬ £«¨é¦¬.", + " ¡«á©© §â«¬® ¤ ¨ « ¨®å ¦£â¤à¤ «¦¬ £«¨é¦¬.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_CREATE_HIVE, - " ¡«á©«© §â«¬® ¤ £ ¦¬¨ã© « registry hives.", + " ¡«á©«© §â«¬® ¤ £ ¦¬¨ã© « registry hives.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { @@ -1415,56 +1444,56 @@ }, { //ERROR_COPY_QUEUE, - " ¡«á©«© §â«¬® ¤ ¤¦å¥ «¤ ¦¬¨á ¨®åà¤ §¨¦ª ¤« ¨ã.\n", + " ¡«á©«© §â«¬® ¤ ¤¦å¥ «¤ ¦¬¨á ¨®åà¤ §¨¦ª ¤« ¨ã.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_CREATE_DIR, - " ¡«á©«© £§æ¨© ¤ £ ¦¬¨ã© «¦¬ª ¡«¢æ¦¬ª ¡«á©«©ª.", + " ¡«á©«© £§æ¨© ¤ £ ¦¬¨ã© «¦¬ª ¡«¢æ¦¬ª ¡«á©«©ª.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_TXTSETUP_SECTION, - " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'Directories'\n" + " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'Directories'\n" "©«¦ TXTSETUP.SIF.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_CABINET_SECTION, - " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'Directories'\n" + " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'Directories'\n" "©«¦ cabinet.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_CREATE_INSTALL_DIR - " ¡«á©«© £§æ¨© ¤ £ ¦¬¨ã© «¦¤ ¡«á¢¦¦ ¡«á©«©ª.", + " ¡«á©«© £§æ¨© ¤ £ ¦¬¨ã© «¦¤ ¡«á¢¦¦ ¡«á©«©ª.", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_FIND_SETUPDATA, - " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'SetupData'\n" + " ¡«á©«© §â«¬® ¤ ¨ «¦¤ «¦£â 'SetupData'\n" "©«¦ TXTSETUP.SIF.\n", "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_WRITE_PTABLE, - " ¡«á©«© §â«¬® ¤ ¨á¯ « partition tables.\n" + " ¡«á©«© §â«¬® ¤ ¨á¯ « partition tables.\n" "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_ADDING_CODEPAGE, "Setup failed to add codepage to registry.\n" - "ENTER = Reboot computer" + "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_UPDATE_LOCALESETTINGS, "Setup could not set the system locale.\n" - "ENTER = Reboot computer" + "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { //ERROR_ADDING_KBLAYOUTS, - "Setup failed to add keyboard layouts to registry.\n" - "ENTER = Reboot computer" + " ¡«á©¬© §â«¬® ¤ §¨¦©â© « ª «á¥ ª §¢¡«¨¦¢¦åà¤ ©«¦ £«¨é¦.\n" + "ENTER = §¤¡¡å¤© ¬§¦¢¦ ©«ã" }, { NULL,

16 years, 4 months

[jimtabor] 33605: Win32k: - GDI_TABLE_ENTRY ProcessId is a dword or int not a short. - Notice also the pid for f5e, it's set GDI_OBJ_HMGR_NONE with pUser 0. Our DCE code handling pUser is right with that respect. - Tested wine gdi32: dc gdiobj and user32: dce, all result same as before. object list for DC type objects owned by ALL PIDs I, handle, Lock, sCount, pid, pv, objt, unique, Flags, pUser, Tlock -------------------------------------------------------------------------------------------- f

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 19 21:54:33 2008 New Revision: 33605 URL: http://svn.reactos.org/svn/reactos?rev=33605&view=rev Log: Win32k: - GDI_TABLE_ENTRY ProcessId is a dword or int not a short. - Notice also the pid for f5e, it's set GDI_OBJ_HMGR_NONE with pUser 0. Our DCE code handling pUser is right with that respect. - Tested wine gdi32: dc gdiobj and user32: dce, all result same as before. object list for DC type objects owned by ALL PIDs I, handle, Lock, sCount, pid, pv, objt, unique, Flags, pUser, Tlock -------------------------------------------------------------------------------------------- f4c, ca010f4c, 0, 0, d60, e2ebc2a0, DC, ca01, 0, 00f80570, 00f80570 f5e, 60010f5e, 0, 0, 80000012, e28ce008, DC, 6001, 4, 00000000, 00000000 f9d, b4010f9d, 0, 0, d60, e2ee6008, DC, b401, 0, 00350000, 00350000 Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h Modified: trunk/reactos/include/reactos/win32k/ntgdihdl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntg… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntgdihdl.h [iso-8859-1] Mon May 19 21:54:33 2008 @@ -200,16 +200,15 @@ typedef struct _GDI_TABLE_ENTRY { PVOID KernelData; /* Points to the kernel mode structure */ - SHORT ProcessId; /* process id that created the object, 0 for stock objects */ - SHORT nCount; /* usage count of object handles */ + DWORD ProcessId; /* process id that created the object, 0 for stock objects */ union{ // temp union structure. LONG Type; /* the first 16 bit is the object type including the stock obj flag, the last 16 bits is just the object type */ struct{ - SHORT FullUnique; - CHAR ObjectType; - CHAR Flags; + SHORT FullUnique; // unique + CHAR ObjectType; // objt + CHAR Flags; // Flags };}; - PVOID UserData; /* Points to the user mode structure, usually NULL though */ + PVOID UserData; /* pUser Points to the user mode structure, usually NULL though */ } GDI_TABLE_ENTRY, *PGDI_TABLE_ENTRY; //

16 years, 4 months

[fireball] 33604: Stefan Ginsberg <stefan__100__@hotmail.com> - Export undocumented Win32k functions and add stubs for them (information about prototypes if from Alex). Also implement and export a couple of documented APIs, and a bunch of APIs we implement but did not export.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 19 15:47:31 2008 New Revision: 33604 URL: http://svn.reactos.org/svn/reactos?rev=33604&view=rev Log: Stefan Ginsberg <stefan__100__(a)hotmail.com> - Export undocumented Win32k functions and add stubs for them (information about prototypes if from Alex). Also implement and export a couple of documented APIs, and a bunch of APIs we implement but did not export. Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c trunk/reactos/subsystems/win32/win32k/stubs/stubs.c trunk/reactos/subsystems/win32/win32k/win32k.def Modified: trunk/reactos/subsystems/win32/win32k/eng/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/event.c [iso-8859-1] Mon May 19 15:47:31 2008 @@ -1,23 +1,4 @@ /* - * ReactOS W32 Subsystem - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 ReactOS Team - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ -/* $Id$ - * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Win32k event functions Modified: trunk/reactos/subsystems/win32/win32k/stubs/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/st… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/stubs/stubs.c [iso-8859-1] Mon May 19 15:47:31 2008 @@ -4,7 +4,6 @@ #include <w32k.h> -#define STUB(x) void x(void) { DbgPrint("WIN32K: Stub for %s\n", #x); } #define UNIMPLEMENTED DbgPrint("(%s:%i) WIN32K: %s UNIMPLEMENTED\n", __FILE__, __LINE__, __FUNCTION__ ) @@ -776,13 +775,6 @@ return 0; } -// below here aren't in DDK!!! - -STUB(FLOATOBJ_AddFloatObj) -STUB(FLOATOBJ_DivFloatObj) -STUB(FLOATOBJ_MulFloatObj) -STUB(FLOATOBJ_SubFloatObj) - /* * @unimplemented */ @@ -841,7 +833,8 @@ EngClearEvent( IN PEVENT Event) { - UNIMPLEMENTED; + /* Forward to the kernel */ + KeClearEvent((PKEVENT)Event); } /* @@ -2934,3 +2927,140 @@ UNIMPLEMENTED; return FALSE; } + +PVOID +APIENTRY +EngFntCacheAlloc(IN ULONG FastCheckSum, + IN ULONG ulSize) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +EngFntCacheFault(IN ULONG ulFastCheckSum, + IN ULONG iFaultMode) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngFntCacheLookUp(IN ULONG FastCheckSum, + OUT PULONG pulSize) +{ + UNIMPLEMENTED; + return NULL; +} + +VOID +APIENTRY +FLOATOBJ_AddFloatObj(PFLOATOBJ pFloatObj1, + PFLOATOBJ pFloatObj2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_DivFloatObj(PFLOATOBJ pFloatObj1, + PFLOATOBJ pFloatObj2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_MulFloatObj(PFLOATOBJ pFloatObj1, + PFLOATOBJ pFloatObj2) +{ + UNIMPLEMENTED; +} + +VOID +APIENTRY +FLOATOBJ_SubFloatObj(PFLOATOBJ pFloatObj1, + PFLOATOBJ pFloatObj2) +{ + UNIMPLEMENTED; +} + +PVOID +APIENTRY +EngAllocSectionMem(IN PVOID SectionObject, + IN ULONG Flags, + IN SIZE_T MemSize, + IN ULONG Tag) +{ + UNIMPLEMENTED; + return NULL; +} + +NTSTATUS +APIENTRY +EngFileIoControl(IN PFILE_OBJECT FileObject, + IN ULONG IoControlCode, + IN PVOID InputBuffer, + IN SIZE_T InputBufferLength, + OUT PVOID OutputBuffer, + IN SIZE_T OutputBufferLength, + OUT PULONG Information) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +VOID +APIENTRY +EngFileWrite(IN PFILE_OBJECT FileObject, + IN PVOID Buffer, + IN SIZE_T Length, + IN PSIZE_T BytesWritten) +{ + UNIMPLEMENTED; +} + +BOOLEAN +APIENTRY +EngFreeSectionMem(IN PVOID SectionObject OPTIONAL, + IN PVOID MappedBase) +{ + UNIMPLEMENTED; + return FALSE; +} + +ULONGLONG +APIENTRY +EngGetTickCount(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +BOOLEAN +APIENTRY +EngMapSection(IN PVOID Section, + IN BOOLEAN Map, + IN HANDLE Process, + IN PVOID* BaseAddress) +{ + UNIMPLEMENTED; + return FALSE; +} + +BOOLEAN +APIENTRY +EngNineGrid(IN SURFOBJ* pDestSurfaceObj, + IN SURFOBJ* pSourceSurfaceObj, + IN CLIPOBJ* pClipObj, + IN XLATEOBJ* pXlateObj, + IN RECTL* prclSource, + IN RECTL* prclDest, + PVOID pvUnknown1, + PVOID pvUnknown2, + DWORD dwReserved) +{ + UNIMPLEMENTED; + return FALSE; +} Modified: trunk/reactos/subsystems/win32/win32k/win32k.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/wi… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/win32k.def [iso-8859-1] Mon May 19 15:47:31 2008 @@ -1,14 +1,12 @@ -; $Id$ -; -; win32k.def -; ; ReactOS win32k.sys exports -; -; Currently all exports from windows xp are listed, sorted by name -; +; Currently all exports from Windows XP/2003 are listed, sorted by ordinal. LIBRARY win32k EXPORTS -;BRUSHOBJ_hGetColorTransform@4 +FLOATOBJ_AddFloatObj@8 +FLOATOBJ_DivFloatObj@8 +FLOATOBJ_MulFloatObj@8 +FLOATOBJ_SubFloatObj@8 +BRUSHOBJ_hGetColorTransform@4 BRUSHOBJ_pvAllocRbrush@8 BRUSHOBJ_pvGetRbrush@4 BRUSHOBJ_ulGetBrushColor@4 @@ -18,14 +16,14 @@ EngAcquireSemaphore@4 EngAllocMem@12 EngAllocPrivateUserMem@12 -;EngAllocSectionMem +EngAllocSectionMem@16 EngAllocUserMem@8 EngAlphaBlend@28 EngAssociateSurface@12 EngBitBlt@44 -;EngBugCheckEx@20 +EngBugCheckEx(a)20=NTOSKRNL.KeBugCheckEx EngCheckAbort@4 -;EngClearEvent@4 +EngClearEvent@4 EngComputeGlyphSet@12 EngControlSprites@8 EngCopyBits@24 @@ -44,7 +42,7 @@ EngDeleteClip@4 EngDeleteDriverObj@12 EngDeleteEvent@4 -;EngDeleteFile@4 +EngDeleteFile@4 EngDeletePalette@4 EngDeletePath@4 EngDeleteSafeSemaphore@4 @@ -56,18 +54,18 @@ EngDxIoctl@12 EngEnumForms@24 EngEraseSurface@12 -;EngFileIoControl -;EngFileWrite +EngFileIoControl@28 +EngFileWrite@16 EngFillPath@28 EngFindImageProcAddress@8 EngFindResource@16 -;EngFntCacheAlloc@8 -;EngFntCacheFault@8 -;EngFntCacheLookUp@8 +EngFntCacheAlloc@8 +EngFntCacheFault@8 +EngFntCacheLookUp@8 EngFreeMem@4 EngFreeModule@4 EngFreePrivateUserMem@8 -;EngFreeSectionMem +EngFreeSectionMem@8 EngFreeUserMem@4 EngGetCurrentCodePage(a)8=ntoskrnl.RtlGetCurrentCodePage EngGetCurrentProcessId@0 @@ -80,15 +78,15 @@ EngGetPrinter@20 EngGetPrinterData@24 EngGetPrinterDataFileName@4 -;EngGetPrinterDriver@24 +EngGetPrinterDriver@24 EngGetProcessHandle@0 -;EngGetTickCount +EngGetTickCount@0 EngGetType1FontList@24 EngGradientFill@40 -;EngHangNotification@8 +EngHangNotification@8 EngInitializeSafeSemaphore@4 -;EngIsSemaphoreOwned@4 -;EngIsSemaphoreOwnedByCurrentThread@4 +EngIsSemaphoreOwned@4 +EngIsSemaphoreOwnedByCurrentThread@4 EngLineTo@36 EngLoadImage@4 EngLoadModule@4 @@ -96,29 +94,29 @@ EngLockDirectDrawSurface@4 EngLockDriverObj@4 EngLockSurface@4 -;EngLpkInstalled@0 +EngLpkInstalled@0 EngMapEvent@20 EngMapFontFile@12 -;EngMapFontFileFD@12 +EngMapFontFileFD@12 EngMapModule@8 -;EngMapSection +EngMapSection@16 EngMarkBandingSurface@4 EngModifySurface@32 EngMovePointer@16 EngMulDiv@12 EngMultiByteToUnicodeN(a)20=ntoskrnl.RtlMultiByteToUnicodeN EngMultiByteToWideChar@20 -;EngNineGrid +EngNineGrid@36 EngPaint@20 EngProbeForRead(a)12=NTOSKRNL.ProbeForRead EngProbeForReadAndWrite(a)12=NTOSKRNL.ProbeForWrite -;EngQueryDeviceAttribute@24 +EngQueryDeviceAttribute@24 EngQueryLocalTime@4 EngQueryPalette@16 EngQueryPerformanceCounter@4 EngQueryPerformanceFrequency@4 EngQuerySystemAttribute@8 -;EngReadStateEvent@4 +EngReadStateEvent@4 EngReleaseSemaphore@4 EngRestoreFloatingPointState@4 EngSaveFloatingPointState@8 @@ -130,7 +128,7 @@ EngSetPrinterData@20 EngSort@16 EngStretchBlt@44 -;EngStretchBltROP@52 +EngStretchBltROP@52 EngStrokeAndFillPath@40 EngStrokePath@32 EngTextOut@40 @@ -140,20 +138,19 @@ EngUnlockDirectDrawSurface@4 EngUnlockDriverObj@4 EngUnlockSurface@4 +EngUnmapFile@4 EngUnmapEvent@4 EngUnmapFontFile@4 -;EngUnmapFontFileFD@4 +EngUnmapFontFileFD@4 EngUnsecureMem@4 EngWaitForSingleObject@8 EngWideCharToMultiByte@20 EngWritePrinter@16 FLOATOBJ_Add@8 FLOATOBJ_AddFloat@8 -FLOATOBJ_AddFloatObj FLOATOBJ_AddLong@8 FLOATOBJ_Div@8 FLOATOBJ_DivFloat@8 -FLOATOBJ_DivFloatObj FLOATOBJ_DivLong@8 FLOATOBJ_Equal@8 FLOATOBJ_EqualLong@8 @@ -165,29 +162,27 @@ FLOATOBJ_LessThanLong@8 FLOATOBJ_Mul@8 FLOATOBJ_MulFloat@8 -FLOATOBJ_MulFloatObj FLOATOBJ_MulLong@8 FLOATOBJ_Neg@4 FLOATOBJ_SetFloat@8 FLOATOBJ_SetLong@8 FLOATOBJ_Sub@8 FLOATOBJ_SubFloat@8 -FLOATOBJ_SubFloatObj FLOATOBJ_SubLong@8 FONTOBJ_cGetAllGlyphHandles@8 FONTOBJ_cGetGlyphs@20 -;FONTOBJ_pQueryGlyphAttrs@8 -;FONTOBJ_pfdg@4 +FONTOBJ_pQueryGlyphAttrs@8 +FONTOBJ_pfdg@4 FONTOBJ_pifi@4 -;FONTOBJ_pjOpenTypeTablePointer@12 +FONTOBJ_pjOpenTypeTablePointer@12 FONTOBJ_pvTrueTypeFontFile@8 ;FONTOBJ_pwszFontFilePaths@4 FONTOBJ_pxoGetXform@4 FONTOBJ_vGetInfo@12 -HeapVidMemAllocAligned@20 HT_ComputeRGBGammaTable@24 HT_Get8BPPFormatPalette@16 -;HT_Get8BPPMaskPalette@24 +HT_Get8BPPMaskPalette@24 +HeapVidMemAllocAligned@20 PALOBJ_cGetColors@16 PATHOBJ_bCloseFigure@4 PATHOBJ_bEnum@8 @@ -207,11 +202,11 @@ RtlUpcaseUnicodeChar(a)4=NTOSKRNL.RtlUpcaseUnicodeChar RtlUpcaseUnicodeToMultiByteN(a)20=NTOSKRNL.RtlUpcaseUnicodeToMultiByteN STROBJ_bEnum@12 -;STROBJ_bEnumPositionsOnly@12 -;STROBJ_bGetAdvanceWidths@16 +STROBJ_bEnumPositionsOnly@12 +STROBJ_bGetAdvanceWidths@16 STROBJ_dwGetCodePage@4 -;STROBJ_fxBreakExtra@4 -;STROBJ_fxCharacterExtra@4 +STROBJ_fxBreakExtra@4 +STROBJ_fxCharacterExtra@4 STROBJ_vEnumStart@4 VidMemFree@8 WNDOBJ_bEnum@12 @@ -221,14 +216,13 @@ XFORMOBJ_iGetFloatObjXform@8 XFORMOBJ_iGetXform@8 XLATEOBJ_cGetPalette@16 -;XLATEOBJ_hGetColorTransform@4 +XLATEOBJ_hGetColorTransform@4 XLATEOBJ_iXlate@8 XLATEOBJ_piVector@4 _abnormal_termination=NTOSKRNL._abnormal_termination _except_handler2=NTOSKRNL._except_handler2 _global_unwind2=NTOSKRNL._global_unwind2 -;_itoa@12 -;_itow@12 +_itoa(a)12=NTOSKRNL._itoa +_itow(a)12=NTOSKRNL._itow _local_unwind2=NTOSKRNL._local_unwind2 - ;EOF

16 years, 4 months

[mpiulachs] 33603: - Removed hard coded bootsector from *Iso module types and express it with rbuild syntax. - Enabled installname attribute and removed hard coded output file name from *Iso module types. We can now use properties : ReactOS_$(arch).iso > ReactOS_i386.iso

by mpiulachs＠svn.reactos.org

Author: mpiulachs Date: Mon May 19 15:46:46 2008 New Revision: 33603 URL: http://svn.reactos.org/svn/reactos?rev=33603&view=rev Log: - Removed hard coded bootsector from *Iso module types and express it with rbuild syntax. - Enabled installname attribute and removed hard coded output file name from *Iso module types. We can now use properties : ReactOS_$(arch).iso > ReactOS_i386.iso Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild trunk/reactos/boot/bootdata/livecd/livecd.rbuild trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp trunk/reactos/tools/rbuild/module.cpp trunk/reactos/tools/rbuild/rbuild.h Modified: trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd/bootc… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd/bootcd.rbuild [iso-8859-1] Mon May 19 15:46:46 2008 @@ -1,4 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bootcd" type="iso"> +<module name="bootcd" type="iso" output="ReactOS.iso"> + <bootsector>isoboot</bootsector> </module> Modified: trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcdregtest/bootcdregtest.rbuild [iso-8859-1] Mon May 19 15:46:46 2008 @@ -1,4 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="bootcdregtest" type="isoregtest"> +<module name="bootcdregtest" type="isoregtest" output="ReactOS-RegTest.iso"> + <bootsector>isobtrt</bootsector> </module> Modified: trunk/reactos/boot/bootdata/livecd/livecd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecd/livec… ============================================================================== --- trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecd/livecd.rbuild [iso-8859-1] Mon May 19 15:46:46 2008 @@ -1,4 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="livecd" type="liveiso"> +<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso"> + <bootsector>isoboot</bootsector> </module> Modified: trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/livecdregtes… ============================================================================== --- trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/livecdregtest/livecdregtest.rbuild [iso-8859-1] Mon May 19 15:46:46 2008 @@ -1,4 +1,5 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="livecdregtest" type="liveisoregtest"> -</module> +<module name="livecdregtest" type="liveisoregtest" output="ReactOS-LiveCD-RegTest.iso"> + <bootsector>isobtrt</bootsector> +</module> Modified: trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Mon May 19 15:46:46 2008 @@ -3480,10 +3480,16 @@ vSourceFiles.push_back ( srcunattend ); // bootsector - const Module* bootModule; - bootModule = module.project.LocateModule ( module.type == IsoRegTest - ? "isobtrt" - : "isoboot" ); + const Module* bootModule = module.bootSector->bootSectorModule; + + if (!bootModule) + { + throw InvalidOperationException ( module.node.location.c_str(), + 0, + "Invalid bootsector. module '%s' requires <bootsector>", + module.name.c_str ()); + } + const FileLocation *isoboot = bootModule->output; vSourceFiles.push_back ( *isoboot ); @@ -3497,13 +3503,11 @@ vSourceFiles.push_back ( reactosDff ); - string IsoName; - - if (module.type == IsoRegTest) - IsoName = "ReactOS-RegTest.iso"; - else - IsoName = "ReactOS.iso"; - + /* + We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. + Iso/LiveIso outputs are generated in code base root + */ + string IsoName = module.output->name; string sourceFiles = v2s ( backend, vSourceFiles, 5 ); @@ -3667,15 +3671,24 @@ string IsoName; - const Module* bootModule; - bootModule = module.project.LocateModule ( module.name == "livecdregtest" - ? "isobtrt" - : "isoboot" ); + // bootsector + const Module* bootModule = module.bootSector->bootSectorModule; + + if (!bootModule) + { + throw InvalidOperationException ( module.node.location.c_str(), + 0, + "Invalid bootsector. module '%s' requires <bootsector>", + module.name.c_str ()); + } + const FileLocation *isoboot = bootModule->output; - if (module.name == "livecdregtest") - IsoName = "ReactOS-LiveCD-RegTest.iso"; - else - IsoName = "ReactOS-LiveCD.iso"; + + /* + We use only the name and not full FileLocation(ouput) because Iso/LiveIso are an exception to the general rule. + Iso/LiveIso outputs are generated in code base root + */ + IsoName = module.output->name; string reactosDirectory = "reactos"; string livecdReactosNoFixup = livecdDirectory + sSep + reactosDirectory; Modified: trunk/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/module.cpp?re… ============================================================================== --- trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/module.cpp [iso-8859-1] Mon May 19 15:46:46 2008 @@ -242,12 +242,15 @@ node (moduleNode), importLibrary (NULL), metadata (NULL), + bootSector (NULL), bootstrap (NULL), autoRegister(NULL), linkerScript (NULL), pch (NULL), cplusplus (false), - host (HostDefault) + host (HostDefault), + output (NULL), + install (NULL) { if ( node.name != "module" ) throw InvalidOperationException ( __FILE__, @@ -417,13 +420,31 @@ att->value, &moduleNode ); } - else - { - install = NULL; + + att = moduleNode.GetAttribute ( "output", false ); + if ( att != NULL ) + { + if (output != NULL) + { + printf ( "%s: WARNING: 'installname' overrides 'output' also defined for this module.\n", + moduleNode.location.c_str() ); + } + else + { + output = new FileLocation ( GetTargetDirectoryTree (), + modulePath, + att->value, + &moduleNode ); + } + } + + /* If no one has set the output file for this module set it automatically */ + if (output == NULL) + { output = new FileLocation ( GetTargetDirectoryTree (), - modulePath, - name + extension, - &moduleNode ); + modulePath, + name + extension, + &moduleNode ); } att = moduleNode.GetAttribute ( "allowwarnings", false ); @@ -520,6 +541,8 @@ delete bootstrap; if ( importLibrary ) delete importLibrary; + if ( bootSector ) + delete bootSector; if ( dependency ) delete dependency; if ( autoRegister ) @@ -741,6 +764,17 @@ "<dependency> is not a valid sub-element of <if>" ); } dependencies.push_back ( new Dependency ( e, *this ) ); + subs_invalid = true; + } + else if ( e.name == "bootsector" ) + { + if ( parseContext.ifData ) + { + throw XMLInvalidBuildFileException ( + e.location, + "<bootsector> is not a valid sub-element of <if>" ); + } + bootSector = new Bootsector ( e, this ); subs_invalid = true; } else if ( e.name == "importlibrary" ) @@ -1592,6 +1626,57 @@ } } +Bootsector::Bootsector ( const XMLElement& _node, + const Module* _module ) + : node (_node), + module (_module), + bootSectorModule (NULL) +{ + if ( !IsSupportedModuleType ( module->type ) ) + { + throw XMLInvalidBuildFileException ( + node.location, + "<bootsector> is not applicable for this module type." ); + } + + bootSectorModule = module->project.LocateModule ( node.value ); + if ( bootSectorModule == NULL ) + { + throw XMLInvalidBuildFileException ( + node.location, + "module '%s' depend on non-existant module '%s'", + module->name.c_str(), + node.value.c_str() ); + } + + if (bootSectorModule->type != BootSector) + { + throw XMLInvalidBuildFileException ( + node.location, + "module '%s' is referencing non BootSector module '%s'", + module->name.c_str(), + node.value.c_str() ); + } +} + +void +Bootsector::ProcessXML() +{ +} + +bool +Bootsector::IsSupportedModuleType ( ModuleType type ) +{ + if ( type == Iso || + type == LiveIso || + type == IsoRegTest || + type == LiveIsoRegTest ) + { + return true; + } + + return false; +} Metadata::Metadata ( const XMLElement& _node, const Module& _module ) Modified: trunk/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.h?rev=… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/rbuild.h [iso-8859-1] Mon May 19 15:46:46 2008 @@ -102,6 +102,7 @@ class SourceFileTest; class Metadata; +class Bootsector; typedef std::map<std::string,Directory*> directory_map; @@ -352,6 +353,7 @@ ModuleType type; ImportLibrary* importLibrary; Metadata* metadata; + Bootsector* bootSector; bool mangledSymbols; bool underscoreSymbols; bool isUnicode; @@ -546,6 +548,21 @@ const Module& _module ); void ProcessXML(); +}; + +class Bootsector +{ +public: + const XMLElement& node; + const Module* module; + const Module* bootSectorModule; + + Bootsector ( const XMLElement& _node, + const Module* _module ); + + void ProcessXML(); +private: + bool IsSupportedModuleType ( ModuleType type ); }; class Metadata

16 years, 4 months

[hpoussin] 33602: Use dynamic traces

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Mon May 19 15:34:04 2008 New Revision: 33602 URL: http://svn.reactos.org/svn/reactos?rev=33602&view=rev Log: Use dynamic traces Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/hardware.c trunk/reactos/drivers/storage/floppy/ioctl.c trunk/reactos/drivers/storage/floppy/readwrite.c Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Mon May 19 15:34:04 2008 @@ -39,7 +39,6 @@ */ #include <ntddk.h> -#define NDEBUG #include <debug.h> #include "floppy.h" @@ -70,7 +69,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT("CSQ: Removing IRP 0x%p\n", Irp); + TRACE_(FLOPPY, "CSQ: Removing IRP 0x%p\n", Irp); RemoveEntryList(&Irp->Tail.Overlay.ListEntry); } @@ -93,7 +92,7 @@ { UNREFERENCED_PARAMETER(UnusedCsq); UNREFERENCED_PARAMETER(PeekContext); - DPRINT(("CSQ: Peeking for next IRP\n")); + TRACE_(FLOPPY, "CSQ: Peeking for next IRP\n"); if(Irp) return CONTAINING_RECORD(&Irp->Tail.Overlay.ListEntry.Flink, IRP, Tail.Overlay.ListEntry); @@ -115,7 +114,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT(("CSQ: Acquiring spin lock\n")); + INFO_(FLOPPY, "CSQ: Acquiring spin lock\n"); KeAcquireSpinLock(&IrpQueueLock, Irql); } @@ -130,7 +129,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT(("CSQ: Releasing spin lock\n")); + INFO_(FLOPPY, "CSQ: Releasing spin lock\n"); KeReleaseSpinLock(&IrpQueueLock, Irql); } @@ -148,7 +147,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT("CSQ: Canceling irp 0x%p\n", Irp); + TRACE_(FLOPPY, "CSQ: Canceling irp 0x%p\n", Irp); Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -173,7 +172,7 @@ */ { UNREFERENCED_PARAMETER(UnusedCsq); - DPRINT("CSQ: Inserting IRP 0x%p\n", Irp); + TRACE_(FLOPPY, "CSQ: Inserting IRP 0x%p\n", Irp); InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); } Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Mon May 19 15:34:04 2008 @@ -41,7 +41,6 @@ */ #include <ntddk.h> -#define NDEBUG #include <debug.h> #include "floppy.h" @@ -88,7 +87,7 @@ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(ControllerInfo); - DPRINT("floppy: MotorStopDpcFunc called\n"); + TRACE_(FLOPPY, "MotorStopDpcFunc called\n"); HwTurnOffMotor(ControllerInfo); ControllerInfo->StopDpcQueued = FALSE; @@ -115,21 +114,21 @@ PAGED_CODE(); ASSERT(DriveInfo); - DPRINT("floppy: StartMotor called\n"); + TRACE_(FLOPPY, "StartMotor called\n"); if(DriveInfo->ControllerInfo->StopDpcQueued && !KeCancelTimer(&DriveInfo->ControllerInfo->MotorTimer)) { /* Motor turner-offer is already running; wait for it to finish */ - DPRINT("floppy: StartMotor: motor turner-offer is already running; waiting for it\n"); + INFO_(FLOPPY, "StartMotor: motor turner-offer is already running; waiting for it\n"); KeWaitForSingleObject(&DriveInfo->ControllerInfo->MotorStoppedEvent, Executive, KernelMode, FALSE, NULL); - DPRINT("floppy: StartMotor: wait satisfied\n"); + INFO_(FLOPPY, "StartMotor: wait satisfied\n"); } DriveInfo->ControllerInfo->StopDpcQueued = FALSE; if(HwTurnOnMotor(DriveInfo) != STATUS_SUCCESS) { - DPRINT("floppy: StartMotor(): warning: HwTurnOnMotor failed\n"); + WARN_(FLOPPY, "StartMotor(): warning: HwTurnOnMotor failed\n"); } } @@ -149,7 +148,7 @@ ASSERT(ControllerInfo); - DPRINT("floppy: StopMotor called\n"); + TRACE_(FLOPPY, "StopMotor called\n"); /* one relative second, in 100-ns units */ StopTime.QuadPart = 10000000; @@ -202,7 +201,7 @@ { UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("floppy: CreateClose called\n"); + TRACE_(FLOPPY, "CreateClose called\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = FILE_OPENED; @@ -237,10 +236,10 @@ StartMotor(DriveInfo); /* set the data rate */ - DPRINT("floppy: FIXME: UN-HARDCODE DATA RATE\n"); + WARN_(FLOPPY, "FIXME: UN-HARDCODE DATA RATE\n"); if(HwSetDataRate(DriveInfo->ControllerInfo, 0) != STATUS_SUCCESS) { - DPRINT("floppy: Recalibrate: HwSetDataRate failed\n"); + WARN_(FLOPPY, "Recalibrate: HwSetDataRate failed\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -258,7 +257,7 @@ Status = HwRecalibrate(DriveInfo); if(Status != STATUS_SUCCESS) { - DPRINT("floppy: Recalibrate: HwRecalibrate returned error\n"); + WARN_(FLOPPY, "Recalibrate: HwRecalibrate returned error\n"); continue; } @@ -268,7 +267,7 @@ Status = HwRecalibrateResult(DriveInfo->ControllerInfo); if(Status != STATUS_SUCCESS) { - DPRINT("floppy: Recalibrate: HwRecalibrateResult returned error\n"); + WARN_(FLOPPY, "Recalibrate: HwRecalibrateResult returned error\n"); break; } } @@ -303,7 +302,7 @@ PAGED_CODE(); ASSERT(DriveInfo); - DPRINT("floppy: ResetChangeFlag called\n"); + TRACE_(FLOPPY, "ResetChangeFlag called\n"); /* Try to recalibrate. We don't care if it works. */ Recalibrate(DriveInfo); @@ -317,7 +316,7 @@ /* Seek to 1 */ if(HwSeek(DriveInfo, 1) != STATUS_SUCCESS) { - DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); + WARN_(FLOPPY, "ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -326,7 +325,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n"); + WARN_(FLOPPY, "ResetChangeFlag(): HwSenseInterruptStatus failed; bailing out\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -334,7 +333,7 @@ /* Seek back to 0 */ if(HwSeek(DriveInfo, 0) != STATUS_SUCCESS) { - DPRINT("floppy: ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); + WARN_(FLOPPY, "ResetChangeFlag(): HwSeek failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -343,7 +342,7 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n"); + WARN_(FLOPPY, "ResetChangeFlag(): HwSenseInterruptStatus #2 failed; bailing\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -351,7 +350,7 @@ /* Check the change bit */ if(HwDiskChanged(DriveInfo, &DiskChanged) != STATUS_SUCCESS) { - DPRINT("floppy: ResetChangeFlag(): HwDiskChagned failed; returning STATUS_IO_DEVICE_ERROR\n"); + WARN_(FLOPPY, "ResetChangeFlag(): HwDiskChanged failed; returning STATUS_IO_DEVICE_ERROR\n"); StopMotor(DriveInfo->ControllerInfo); return STATUS_IO_DEVICE_ERROR; } @@ -379,7 +378,7 @@ PAGED_CODE(); UNREFERENCED_PARAMETER(DriverObject); - DPRINT("floppy: unloading\n"); + TRACE_(FLOPPY, "unloading\n"); KeSetEvent(&QueueThreadTerminate, 0, FALSE); KeWaitForSingleObject(QueueThreadObject, Executive, KernelMode, FALSE, 0); @@ -414,7 +413,7 @@ /* Power down the controller */ if(HwPowerOff(&gControllerInfo[i]) != STATUS_SUCCESS) { - DPRINT("floppy: unload: warning: HwPowerOff failed\n"); + WARN_(FLOPPY, "unload: warning: HwPowerOff failed\n"); } } } @@ -483,7 +482,7 @@ UNREFERENCED_PARAMETER(PathName); - DPRINT("floppy: ConfigCallback called with ControllerNumber %d\n", ControllerNumber); + TRACE_(FLOPPY, "ConfigCallback called with ControllerNumber %d\n", ControllerNumber); gControllerInfo[gNumberOfControllers].ControllerNumber = ControllerNumber; gControllerInfo[gNumberOfControllers].InterfaceType = BusType; @@ -514,7 +513,7 @@ if(!HalTranslateBusAddress(BusType, BusNumber, PartialDescriptor->u.Port.Start, &AddressSpace, &TranslatedAddress)) { - DPRINT("floppy: HalTranslateBusAddress failed; returning\n"); + WARN_(FLOPPY, "HalTranslateBusAddress failed; returning\n"); return STATUS_IO_DEVICE_ERROR; } @@ -606,7 +605,7 @@ ASSERT(ControllerInfo); - DPRINT("floppy: ISR called\n"); + TRACE_(FLOPPY, "ISR called\n"); /* * Due to the stupidity of the drive/controller relationship on the floppy drive, only one device object @@ -650,7 +649,7 @@ ASSERT(ControllerInfo); - DPRINT("floppy: DpcForIsr called\n"); + TRACE_(FLOPPY, "DpcForIsr called\n"); KeSetEvent(&ControllerInfo->SynchEvent, EVENT_INCREMENT, FALSE); } @@ -674,45 +673,45 @@ PAGED_CODE(); ASSERT(ControllerInfo); - DPRINT("floppy: InitController called with Controller 0x%p\n", ControllerInfo); + TRACE_(FLOPPY, "InitController called with Controller 0x%p\n", ControllerInfo); KeClearEvent(&ControllerInfo->SynchEvent); - DPRINT("floppy: InitController: resetting the controller\n"); + INFO_(FLOPPY, "InitController: resetting the controller\n"); /* Reset the controller */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: unable to reset controller\n"); + WARN_(FLOPPY, "InitController: unable to reset controller\n"); return STATUS_IO_DEVICE_ERROR; } /* Check if floppy drive exists */ if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); + WARN_(FLOPPY, "Floppy drive not detected! Returning STATUS_IO_DEVICE_ERROR\n"); return STATUS_IO_DEVICE_ERROR; } -DPRINT("floppy: InitController: resetting the controller after floppy detection\n"); + INFO_(FLOPPY, "InitController: resetting the controller after floppy detection\n"); /* Reset the controller */ if(HwReset(ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: unable to reset controller\n"); + WARN_(FLOPPY, "InitController: unable to reset controller\n"); return STATUS_IO_DEVICE_ERROR; } - DPRINT("floppy: InitController: setting data rate\n"); + INFO_(FLOPPY, "InitController: setting data rate\n"); /* Set data rate */ if(HwSetDataRate(ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: unable to set data rate\n"); + WARN_(FLOPPY, "InitController: unable to set data rate\n"); return STATUS_IO_DEVICE_ERROR; } - DPRINT("floppy: InitController: waiting for initial interrupt\n"); + INFO_(FLOPPY, "InitController: waiting for initial interrupt\n"); /* Wait for an interrupt */ WaitForControllerInterrupt(ControllerInfo); @@ -720,16 +719,16 @@ /* Reset means you have to clear each of the four interrupts (one per drive) */ for(i = 0; i < MAX_DRIVES_PER_CONTROLLER; i++) { - DPRINT("floppy: InitController: Sensing interrupt %d\n", i); + INFO_(FLOPPY, "InitController: Sensing interrupt %d\n", i); if(HwSenseInterruptStatus(ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: Unable to clear interrupt 0x%x\n", i); + WARN_(FLOPPY, "InitController: Unable to clear interrupt 0x%x\n", i); return STATUS_IO_DEVICE_ERROR; } } - DPRINT("floppy: InitController: done sensing interrupts\n"); + INFO_(FLOPPY, "InitController: done sensing interrupts\n"); /* Next, see if we have the right version to do implied seek */ if(HwGetVersion(ControllerInfo) == VERSION_ENHANCED) @@ -737,12 +736,12 @@ /* If so, set that up -- all defaults below except first TRUE for EIS */ if(HwConfigure(ControllerInfo, TRUE, TRUE, FALSE, 0, 0) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: unable to set up implied seek\n"); + WARN_(FLOPPY, "InitController: unable to set up implied seek\n"); ControllerInfo->ImpliedSeeks = FALSE; } else { - DPRINT("floppy: InitController: implied seeks set!\n"); + INFO_(FLOPPY, "InitController: implied seeks set!\n"); ControllerInfo->ImpliedSeeks = TRUE; } @@ -769,23 +768,23 @@ } else { - DPRINT("floppy: InitController: enhanced version not supported; disabling implied seeks\n"); + INFO_(FLOPPY, "InitController: enhanced version not supported; disabling implied seeks\n"); ControllerInfo->ImpliedSeeks = FALSE; ControllerInfo->Model30 = FALSE; } /* Specify */ - DPRINT("FLOPPY: FIXME: Figure out speed\n"); + WARN_(FLOPPY, "FIXME: Figure out speed\n"); HeadLoadTime = SPECIFY_HLT_500K; HeadUnloadTime = SPECIFY_HUT_500K; StepRateTime = SPECIFY_SRT_500K; - DPRINT("floppy: InitController: issuing specify command to controller\n"); + INFO_(FLOPPY, "InitController: issuing specify command to controller\n"); /* Don't disable DMA --> enable dma (dumb & confusing) */ if(HwSpecify(ControllerInfo, HeadLoadTime, HeadUnloadTime, StepRateTime, FALSE) != STATUS_SUCCESS) { - DPRINT("floppy: InitController: unable to specify options\n"); + WARN_(FLOPPY, "InitController: unable to specify options\n"); return STATUS_IO_DEVICE_ERROR; } @@ -801,11 +800,11 @@ */ for(i = 0; i < ControllerInfo->NumberOfDrives; i++) { - DPRINT("floppy: InitController: recalibrating drive 0x%x on controller 0x%p\n", i, ControllerInfo); + INFO_(FLOPPY, "InitController: recalibrating drive 0x%x on controller 0x%p\n", i, ControllerInfo); Recalibrate(&ControllerInfo->DriveInfo[i]); } - DPRINT("floppy: InitController: done initializing; returning STATUS_SUCCESS\n"); + INFO_(FLOPPY, "InitController: done initializing; returning STATUS_SUCCESS\n"); return STATUS_SUCCESS; } @@ -847,7 +846,7 @@ */ if(!gControllerInfo[0].Populated) { - DPRINT("floppy: AddControllers: failed to get controller info from registry\n"); + WARN_(FLOPPY, "AddControllers: failed to get controller info from registry\n"); return FALSE; } @@ -865,7 +864,7 @@ /* Must set up the DPC before we connect the interrupt */ KeInitializeDpc(&gControllerInfo[i].Dpc, DpcForIsr, &gControllerInfo[i]); - DPRINT("floppy: Connecting interrupt %d to controller%d (object 0x%p)\n", gControllerInfo[i].MappedVector, + INFO_(FLOPPY, "Connecting interrupt %d to controller%d (object 0x%p)\n", gControllerInfo[i].MappedVector, i, &gControllerInfo[i]); /* NOTE: We cannot share our interrupt, even on level-triggered buses. See Isr() for details. */ @@ -873,7 +872,7 @@ gControllerInfo[i].MappedLevel, gControllerInfo[i].MappedLevel, gControllerInfo[i].InterruptMode, FALSE, Affinity, 0) != STATUS_SUCCESS) { - DPRINT("floppy: AddControllers: unable to connect interrupt\n"); + WARN_(FLOPPY, "AddControllers: unable to connect interrupt\n"); continue; } @@ -892,7 +891,7 @@ if(!gControllerInfo[i].AdapterObject) { - DPRINT("floppy: AddControllers: unable to allocate an adapter object\n"); + WARN_(FLOPPY, "AddControllers: unable to allocate an adapter object\n"); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -900,7 +899,7 @@ /* 2b: Initialize the new controller */ if(InitController(&gControllerInfo[i]) != STATUS_SUCCESS) { - DPRINT("floppy: AddControllers():Unable to set up controller %d - initialization failed\n", i); + WARN_(FLOPPY, "AddControllers(): Unable to set up controller %d - initialization failed\n", i); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; } @@ -917,7 +916,7 @@ UNICODE_STRING ArcPath; UCHAR DriveNumber; - DPRINT("floppy: AddControllers(): Configuring drive %d on controller %d\n", i, j); + INFO_(FLOPPY, "AddControllers(): Configuring drive %d on controller %d\n", i, j); /* * 3a: create a device object for the drive @@ -943,12 +942,12 @@ FILE_DEVICE_DISK, FILE_REMOVABLE_MEDIA | FILE_FLOPPY_DISKETTE, FALSE, &gControllerInfo[i].DriveInfo[j].DeviceObject) != STATUS_SUCCESS) { - DPRINT("floppy: AddControllers: unable to register a Device object\n"); + WARN_(FLOPPY, "AddControllers: unable to register a Device object\n"); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); continue; /* continue on to next drive */ } - DPRINT("floppy: AddControllers: New device: %S (0x%p)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject); + INFO_(FLOPPY, "AddControllers: New device: %S (0x%p)\n", DeviceNameBuf, gControllerInfo[i].DriveInfo[j].DeviceObject); /* 3b.5: Create an ARC path in case we're booting from this drive */ swprintf(gControllerInfo[i].DriveInfo[j].ArcPathBuffer, @@ -965,7 +964,7 @@ RtlInitUnicodeString(&LinkName, gControllerInfo[i].DriveInfo[j].SymLinkBuffer); if(IoCreateSymbolicLink(&LinkName, &DeviceName) != STATUS_SUCCESS) { - DPRINT("floppy: AddControllers: Unable to create a symlink for drive %d\n", DriveNumber); + WARN_(FLOPPY, "AddControllers: Unable to create a symlink for drive %d\n", DriveNumber); IoDisconnectInterrupt(gControllerInfo[i].InterruptObject); IoDeassignArcName(&ArcPath); continue; /* continue to next drive */ @@ -988,7 +987,7 @@ } } - DPRINT("floppy: AddControllers: --------------------------------------------> finished adding controllers\n"); + INFO_(FLOPPY, "AddControllers: --------------------------------------------> finished adding controllers\n"); return TRUE; } @@ -1009,7 +1008,7 @@ { PDRIVE_INFO DriveInfo = DeviceObject->DeviceExtension; - DPRINT("floppy: SignalMediaChanged called\n"); + TRACE_(FLOPPY, "SignalMediaChanged called\n"); DriveInfo->DiskChangeCount++; @@ -1062,18 +1061,18 @@ if(KeReadStateEvent(&QueueThreadTerminate)) { - DPRINT("floppy: QueueThread terminating\n"); + INFO_(FLOPPY, "QueueThread terminating\n"); return; } - DPRINT("floppy: QueueThread: servicing an IRP\n"); + INFO_(FLOPPY, "QueueThread: servicing an IRP\n"); Irp = IoCsqRemoveNextIrp(&Csq, 0); /* we won't get an irp if it was canceled */ if(!Irp) { - DPRINT("floppy: QueueThread: IRP queue empty\n"); + INFO_(FLOPPY, "QueueThread: IRP queue empty\n"); continue; } @@ -1096,7 +1095,7 @@ break; default: - DPRINT("floppy: QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction); + WARN_(FLOPPY, "QueueThread(): Unrecognized irp: mj: 0x%x\n", Stack->MajorFunction); Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -1173,13 +1172,13 @@ */ if(PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, QueueThread, 0) != STATUS_SUCCESS) { - DPRINT("floppy: Unable to create system thread; failing init\n"); + WARN_(FLOPPY, "Unable to create system thread; failing init\n"); return STATUS_INSUFFICIENT_RESOURCES; } if(ObReferenceObjectByHandle(ThreadHandle, STANDARD_RIGHTS_ALL, NULL, KernelMode, &QueueThreadObject, NULL) != STATUS_SUCCESS) { - DPRINT("floppy: Unable to reference returned thread handle; failing init\n"); + WARN_(FLOPPY, "Unable to reference returned thread handle; failing init\n"); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/storage/floppy/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] Mon May 19 15:34:04 2008 @@ -49,7 +49,6 @@ */ #include <ntddk.h> -#define NDEBUG #include <debug.h> #include "floppy.h" @@ -183,7 +182,7 @@ return STATUS_SUCCESS; } - DPRINT("floppy: Send_Byte: timed out trying to write\n"); + INFO_(FLOPPY, "Send_Byte: timed out trying to write\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -252,7 +251,7 @@ return STATUS_SUCCESS; } - DPRINT("floppy: Get_Byte: timed out trying to read\n"); + WARN_(FLOPPY, "Get_Byte: timed out trying to read\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -269,7 +268,7 @@ * STATUS_SUCCESS */ { - DPRINT("floppy: HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER); + TRACE_(FLOPPY, "HwSetDataRate called; writing rate code 0x%x to offset 0x%x\n", DataRate, DATA_RATE_SELECT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DataRate); @@ -290,7 +289,7 @@ * - Called at DISPATCH_LEVEL */ { - DPRINT("floppy: HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER); + TRACE_(FLOPPY, "HwTurnOffMotor: writing byte 0x%x to offset 0x%x\n", DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE, DIGITAL_OUTPUT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_FDC_ENABLE|DOR_DMA_IO_INTERFACE_ENABLE); @@ -332,7 +331,7 @@ else if (Unit == 3) Buffer |= DOR_FLOPPY_MOTOR_ON_D; - DPRINT("floppy: HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER); + TRACE_(FLOPPY, "HwTurnOnMotor: writing byte 0x%x to offset 0x%x\n", Buffer, DIGITAL_OUTPUT_REGISTER); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, Buffer); return STATUS_SUCCESS; @@ -357,7 +356,7 @@ PAGED_CODE(); - DPRINT("floppy: HwSenseDriveStatus called\n"); + TRACE_(FLOPPY, "HwSenseDriveStatus called\n"); Buffer[0] = COMMAND_SENSE_DRIVE_STATUS; Buffer[1] = DriveInfo->UnitNumber; /* hard-wired to head 0 for now */ @@ -365,7 +364,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwSenseDriveStatus: failed to write FIFO\n"); + WARN_(FLOPPY, "HwSenseDriveStatus: failed to write FIFO\n"); return STATUS_UNSUCCESSFUL; } @@ -431,11 +430,11 @@ /* Send the command */ for(i = 0; i < 9; i++) { - DPRINT("floppy: HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i]); + INFO_(FLOPPY, "HwReadWriteData: Sending a command byte to the FIFO: 0x%x\n", Buffer[i]); if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("HwReadWriteData: Unable to write to the FIFO\n"); + WARN_(FLOPPY, "HwReadWriteData: Unable to write to the FIFO\n"); return STATUS_UNSUCCESSFUL; } } @@ -467,19 +466,19 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - DPRINT("floppy: HwRecalibrateResult: Unable to write the controller\n"); + WARN_(FLOPPY, "HwRecalibrateResult: Unable to write the controller\n"); return STATUS_UNSUCCESSFUL; } for(i = 0; i < 2; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwRecalibrateResult: unable to read FIFO\n"); + WARN_(FLOPPY, "HwRecalibrateResult: unable to read FIFO\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT("floppy: HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1]); + INFO_(FLOPPY, "HwRecalibrateResult results: ST0: 0x%x PCN: 0x%x\n", Buffer[0], Buffer[1]); /* * Buffer[0] = ST0 @@ -489,20 +488,20 @@ /* Is the PCN 0? */ if(Buffer[1] != 0) { - DPRINT("floppy: HwRecalibrateResult: PCN not 0\n"); + WARN_(FLOPPY, "HwRecalibrateResult: PCN not 0\n"); return STATUS_UNSUCCESSFUL; } /* test seek complete */ if((Buffer[0] & SR0_SEEK_COMPLETE) != SR0_SEEK_COMPLETE) { - DPRINT("floppy: HwRecalibrateResult: Failed to complete the seek\n"); + WARN_(FLOPPY, "HwRecalibrateResult: Failed to complete the seek\n"); return STATUS_UNSUCCESSFUL; } /* Is the equipment check flag set? Could be no disk in drive... */ if((Buffer[0] & SR0_EQUIPMENT_CHECK) == SR0_EQUIPMENT_CHECK) - DPRINT("floppy: HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"); + INFO_(FLOPPY, "HwRecalibrateResult: Seeked to track 0 successfully, but EC is set; returning STATUS_SUCCESS anyway\n"); return STATUS_SUCCESS; } @@ -532,12 +531,12 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwReadWriteResult: unable to read fifo\n"); + WARN_(FLOPPY, "HwReadWriteResult: unable to read fifo\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT("floppy: HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + INFO_(FLOPPY, "HwReadWriteResult results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], Buffer[4], Buffer[5], Buffer[6]); /* Last command successful? */ @@ -565,7 +564,7 @@ UCHAR Buffer[2]; int i; - DPRINT("floppy: HwRecalibrate called\n"); + TRACE_(FLOPPY, "HwRecalibrate called\n"); PAGED_CODE(); @@ -575,7 +574,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwRecalibrate: unable to write FIFO\n"); + WARN_(FLOPPY, "HwRecalibrate: unable to write FIFO\n"); return STATUS_UNSUCCESSFUL; } @@ -600,7 +599,7 @@ if(Send_Byte(ControllerInfo, COMMAND_SENSE_INTERRUPT_STATUS) != STATUS_SUCCESS) { - DPRINT("floppy: HwSenseInterruptStatus: failed to write controller\n"); + WARN_(FLOPPY, "HwSenseInterruptStatus: failed to write controller\n"); return STATUS_UNSUCCESSFUL; } @@ -608,12 +607,12 @@ { if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwSenseInterruptStatus: failed to read controller\n"); + WARN_(FLOPPY, "HwSenseInterruptStatus: failed to read controller\n"); return STATUS_UNSUCCESSFUL; } } - DPRINT("floppy: HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1]); + INFO_(FLOPPY, "HwSenseInterruptStatus returned 0x%x 0x%x\n", Buffer[0], Buffer[1]); return STATUS_SUCCESS; } @@ -635,7 +634,7 @@ UCHAR Buffer[2]; int i; - DPRINT("floppy: HwReadId called\n"); + TRACE_(FLOPPY, "HwReadId called\n"); PAGED_CODE(); @@ -645,7 +644,7 @@ for(i = 0; i < 2; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwReadId: unable to send bytes to fifo\n"); + WARN_(FLOPPY, "HwReadId: unable to send bytes to fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -678,7 +677,7 @@ UCHAR Buffer[6]; int i; - DPRINT("floppy: HwFormatTrack called\n"); + TRACE_(FLOPPY, "HwFormatTrack called\n"); PAGED_CODE(); @@ -692,7 +691,7 @@ for(i = 0; i < 6; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwFormatTrack: unable to send bytes to floppy\n"); + WARN_(FLOPPY, "HwFormatTrack: unable to send bytes to floppy\n"); return STATUS_UNSUCCESSFUL; } @@ -718,7 +717,7 @@ UCHAR Buffer[3]; int i; - DPRINT("floppy: HwSeek called for cyl 0x%x\n", Cylinder); + TRACE_(FLOPPY, "HwSeek called for cyl 0x%x\n", Cylinder); PAGED_CODE(); @@ -729,7 +728,7 @@ for(i = 0; i < 3; i++) if(Send_Byte(DriveInfo->ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwSeek: failed to write fifo\n"); + WARN_(FLOPPY, "HwSeek: failed to write fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -769,7 +768,7 @@ UCHAR Buffer[4]; int i; - DPRINT("floppy: HwConfigure called\n"); + TRACE_(FLOPPY, "HwConfigure called\n"); PAGED_CODE(); @@ -781,7 +780,7 @@ for(i = 0; i < 4; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwConfigure: failed to write the fifo\n"); + WARN_(FLOPPY, "HwConfigure: failed to write the fifo\n"); return STATUS_UNSUCCESSFUL; } @@ -809,17 +808,17 @@ if(Send_Byte(ControllerInfo, COMMAND_VERSION) != STATUS_SUCCESS) { - DPRINT("floppy: HwGetVersion: unable to write fifo\n"); + WARN_(FLOPPY, "HwGetVersion: unable to write fifo\n"); return STATUS_UNSUCCESSFUL; } if(Get_Byte(ControllerInfo, &Buffer) != STATUS_SUCCESS) { - DPRINT("floppy: HwGetVersion: unable to write fifo\n"); + WARN_(FLOPPY, "HwGetVersion: unable to write fifo\n"); return STATUS_UNSUCCESSFUL; } - DPRINT("floppy: HwGetVersion returning version 0x%x\n", Buffer); + INFO_(FLOPPY, "HwGetVersion returning version 0x%x\n", Buffer); return Buffer; } @@ -843,18 +842,18 @@ Buffer = READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER); - DPRINT("floppy: HwDiskChanged: read 0x%x from DIR\n", Buffer); + TRACE_(FLOPPY, "HwDiskChanged: read 0x%x from DIR\n", Buffer); if(ControllerInfo->Model30) { if(!(Buffer & DIR_DISKETTE_CHANGE)) { - DPRINT("floppy: HdDiskChanged - Model30 - returning TRUE\n"); + INFO_(FLOPPY, "HdDiskChanged - Model30 - returning TRUE\n"); *DiskChanged = TRUE; } else { - DPRINT("floppy: HdDiskChanged - Model30 - returning FALSE\n"); + INFO_(FLOPPY, "HdDiskChanged - Model30 - returning FALSE\n"); *DiskChanged = FALSE; } } @@ -862,12 +861,12 @@ { if(Buffer & DIR_DISKETTE_CHANGE) { - DPRINT("floppy: HdDiskChanged - PS2 - returning TRUE\n"); + INFO_(FLOPPY, "HdDiskChanged - PS2 - returning TRUE\n"); *DiskChanged = TRUE; } else { - DPRINT("floppy: HdDiskChanged - PS2 - returning FALSE\n"); + INFO_(FLOPPY, "HdDiskChanged - PS2 - returning FALSE\n"); *DiskChanged = FALSE; } } @@ -893,11 +892,11 @@ if(Get_Byte(ControllerInfo, Status) != STATUS_SUCCESS) { - DPRINT("floppy: HwSenseDriveStatus: unable to read fifo\n"); + WARN_(FLOPPY, "HwSenseDriveStatus: unable to read fifo\n"); return STATUS_UNSUCCESSFUL; } - DPRINT("floppy: HwSenseDriveStatusResult: ST3: 0x%x\n", *Status); + TRACE_(FLOPPY, "HwSenseDriveStatusResult: ST3: 0x%x\n", *Status); return STATUS_SUCCESS; } @@ -931,25 +930,25 @@ for(i = 0; i < 7; i++) if(Get_Byte(ControllerInfo, &Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: ReadIdResult(): can't read from the controller\n"); + WARN_(FLOPPY, "ReadIdResult(): can't read from the controller\n"); return STATUS_UNSUCCESSFUL; } /* Validate that it did what we told it to */ - DPRINT("floppy: ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], + INFO_(FLOPPY, "ReadId results: 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x 0x%x\n", Buffer[0], Buffer[1], Buffer[2], Buffer[3], Buffer[4], Buffer[5], Buffer[6]); /* Last command successful? */ if((Buffer[0] & SR0_LAST_COMMAND_STATUS) != SR0_LCS_SUCCESS) { - DPRINT("floppy: ReadId didn't return last command success\n"); + WARN_(FLOPPY, "ReadId didn't return last command success\n"); return STATUS_UNSUCCESSFUL; } /* ID mark found? */ if(Buffer[1] & SR1_CANNOT_FIND_ID_ADDRESS) { - DPRINT("floppy: ReadId didn't find an address mark\n"); + WARN_(FLOPPY, "ReadId didn't find an address mark\n"); return STATUS_UNSUCCESSFUL; } @@ -996,13 +995,13 @@ Buffer[1] = 0xdf; Buffer[2] = 0x2; - //DPRINT("HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]); - DPRINT("FLOPPY: HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n"); + //INFO_(FLOPPY, "HwSpecify: sending 0x%x 0x%x 0x%x to FIFO\n", Buffer[0], Buffer[1], Buffer[2]); + WARN_(FLOPPY, "HWSPECIFY: FIXME - sending 0x3 0xd1 0x2 to FIFO\n"); for(i = 0; i < 3; i++) if(Send_Byte(ControllerInfo, Buffer[i]) != STATUS_SUCCESS) { - DPRINT("floppy: HwSpecify: unable to write to controller\n"); + WARN_(FLOPPY, "HwSpecify: unable to write to controller\n"); return STATUS_UNSUCCESSFUL; } @@ -1021,7 +1020,7 @@ * - Generates an interrupt that must be serviced four times (one per drive) */ { - DPRINT("floppy: HwReset called\n"); + TRACE_(FLOPPY, "HwReset called\n"); /* Write the reset bit in the DRSR */ WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_SW_RESET); @@ -1030,13 +1029,13 @@ if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { HwDumpRegisters(ControllerInfo); - DPRINT("floppy: HwReset: Setting Enable bit\n"); + INFO_(FLOPPY, "HwReset: Setting Enable bit\n"); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER, DOR_DMA_IO_INTERFACE_ENABLE|DOR_RESET); HwDumpRegisters(ControllerInfo); if(!(READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER) & DOR_RESET)) { - DPRINT("floppy: HwReset: failed to set the DOR enable bit!\n"); + WARN_(FLOPPY, "HwReset: failed to set the DOR enable bit!\n"); HwDumpRegisters(ControllerInfo); return STATUS_UNSUCCESSFUL; } @@ -1057,7 +1056,7 @@ * - Wake up with a hardware reset */ { - DPRINT("floppy: HwPowerOff called on controller 0x%p\n", ControllerInfo); + TRACE_(FLOPPY, "HwPowerOff called on controller 0x%p\n", ControllerInfo); WRITE_PORT_UCHAR(ControllerInfo->BaseAddress + DATA_RATE_SELECT_REGISTER, DRSR_POWER_DOWN); @@ -1073,11 +1072,11 @@ { UNREFERENCED_PARAMETER(ControllerInfo); - DPRINT("floppy: STATUS: "); - DPRINT("STATUS_REGISTER_A = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_A)); - DPRINT("STATUS_REGISTER_B = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_B)); - DPRINT("DIGITAL_OUTPUT_REGISTER = 0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER)); - DPRINT("MAIN_STATUS_REGISTER =0x%x ", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER)); - DPRINT("DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER)); -} - + INFO_(FLOPPY, "STATUS:\n"); + INFO_(FLOPPY, "STATUS_REGISTER_A = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_A)); + INFO_(FLOPPY, "STATUS_REGISTER_B = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + STATUS_REGISTER_B)); + INFO_(FLOPPY, "DIGITAL_OUTPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_OUTPUT_REGISTER)); + INFO_(FLOPPY, "MAIN_STATUS_REGISTER =0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER)); + INFO_(FLOPPY, "DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER)); +} + Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Mon May 19 15:34:04 2008 @@ -32,7 +32,6 @@ */ #include <ntddk.h> -#define NDEBUG #include <debug.h> #include "floppy.h" @@ -81,7 +80,7 @@ ULONG Code = Stack->Parameters.DeviceIoControl.IoControlCode; BOOLEAN DiskChanged; - DPRINT("floppy: DeviceIoctl called\n"); + TRACE_(FLOPPY, "DeviceIoctl called\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; @@ -91,11 +90,11 @@ if(Code == IOCTL_DISK_GET_MEDIA_TYPES) { PDISK_GEOMETRY Geometry = OutputBuffer; - DPRINT("floppy: IOCTL_DISK_GET_MEDIA_TYPES Called\n"); + INFO_(FLOPPY, "IOCTL_DISK_GET_MEDIA_TYPES Called\n"); if(OutputLength < sizeof(DISK_GEOMETRY)) { - DPRINT("floppy: IOCTL_DISK_GET_MEDIA_TYPES: insufficient buffer; returning STATUS_INVALID_PARAMETER\n"); + INFO_(FLOPPY, "IOCTL_DISK_GET_MEDIA_TYPES: insufficient buffer; returning STATUS_INVALID_PARAMETER\n"); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; IoCompleteRequest(Irp, IO_NO_INCREMENT); return; @@ -112,7 +111,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(DISK_GEOMETRY); - DPRINT("floppy: Ioctl: completing with STATUS_SUCCESS\n"); + INFO_(FLOPPY, "Ioctl: completing with STATUS_SUCCESS\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); return; @@ -129,7 +128,7 @@ */ if(DriveInfo->DeviceObject->Flags & DO_VERIFY_VOLUME && !(DriveInfo->DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { - DPRINT("floppy: DeviceIoctl(): completing with STATUS_VERIFY_REQUIRED\n"); + INFO_(FLOPPY, "DeviceIoctl(): completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -146,7 +145,7 @@ */ if(HwDiskChanged(DriveInfo, &DiskChanged) != STATUS_SUCCESS) { - DPRINT("floppy: DeviceIoctl(): unable to sense disk change; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "DeviceIoctl(): unable to sense disk change; completing with STATUS_UNSUCCESSFUL\n"); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -156,7 +155,7 @@ if(DiskChanged) { - DPRINT("floppy: DeviceIoctl(): detected disk changed; signalling media change and completing\n"); + INFO_(FLOPPY, "DeviceIoctl(): detected disk changed; signalling media change and completing\n"); SignalMediaChanged(DriveInfo->DeviceObject, Irp); /* @@ -179,14 +178,14 @@ { UCHAR Status; - DPRINT("floppy: IOCTL_DISK_IS_WRITABLE Called\n"); + INFO_(FLOPPY, "IOCTL_DISK_IS_WRITABLE Called\n"); /* This IRP always has 0 information */ Irp->IoStatus.Information = 0; if(HwSenseDriveStatus(DriveInfo) != STATUS_SUCCESS) { - DPRINT("floppy: IoctlDiskIsWritable(): unable to sense drive status\n"); + WARN_(FLOPPY, "IoctlDiskIsWritable(): unable to sense drive status\n"); Irp->IoStatus.Status = STATUS_IO_DEVICE_ERROR; break; } @@ -194,7 +193,7 @@ /* Now, read the drive's status back */ if(HwSenseDriveStatusResult(DriveInfo->ControllerInfo, &Status) != STATUS_SUCCESS) { - DPRINT("floppy: IoctlDiskIsWritable(): unable to read drive status result\n"); + WARN_(FLOPPY, "IoctlDiskIsWritable(): unable to read drive status result\n"); Irp->IoStatus.Status = STATUS_IO_DEVICE_ERROR; break; } @@ -202,7 +201,7 @@ /* Check to see if the write flag is set. */ if(Status & SR3_WRITE_PROTECT_STATUS_SIGNAL) { - DPRINT("floppy: IOCTL_DISK_IS_WRITABLE: disk is write protected\n"); + INFO_(FLOPPY, "IOCTL_DISK_IS_WRITABLE: disk is write protected\n"); Irp->IoStatus.Status = STATUS_MEDIA_WRITE_PROTECTED; } else @@ -211,7 +210,7 @@ break; case IOCTL_DISK_CHECK_VERIFY: - DPRINT("floppy: IOCTL_DISK_CHECK_VERIFY called\n"); + INFO_(FLOPPY, "IOCTL_DISK_CHECK_VERIFY called\n"); if (OutputLength != 0) { if (OutputLength < sizeof(ULONG)) @@ -235,7 +234,7 @@ case IOCTL_DISK_GET_DRIVE_GEOMETRY: { - DPRINT("floppy: IOCTL_DISK_GET_DRIVE_GEOMETRY Called\n"); + INFO_(FLOPPY, "IOCTL_DISK_GET_DRIVE_GEOMETRY Called\n"); if(OutputLength < sizeof(DISK_GEOMETRY)) { Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; @@ -250,23 +249,23 @@ case IOCTL_DISK_FORMAT_TRACKS: case IOCTL_DISK_FORMAT_TRACKS_EX: - DPRINT("floppy: Format called; not supported yet\n"); + ERR_(FLOPPY, "Format called; not supported yet\n"); break; case IOCTL_DISK_GET_PARTITION_INFO: - DPRINT("floppy: IOCTL_DISK_GET_PARTITION_INFO Called; not supported\n"); + INFO_(FLOPPY, "IOCTL_DISK_GET_PARTITION_INFO Called; not supported\n"); Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; break; default: - DPRINT("floppy: UNKNOWN IOCTL CODE: 0x%x\n", Code); + ERR_(FLOPPY, "UNKNOWN IOCTL CODE: 0x%x\n", Code); Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; break; } - DPRINT("floppy: ioctl: completing with status 0x%x\n", Irp->IoStatus.Status); + INFO_(FLOPPY, "ioctl: completing with status 0x%x\n", Irp->IoStatus.Status); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Mon May 19 15:34:04 2008 @@ -53,7 +53,6 @@ */ #include <ntddk.h> -#define NDEBUG #include <debug.h> #include "floppy.h" @@ -82,7 +81,7 @@ UNREFERENCED_PARAMETER(DeviceObject); UNREFERENCED_PARAMETER(Irp); - DPRINT("floppy: MapRegisterCallback Called\n"); + TRACE_(FLOPPY, "MapRegisterCallback Called\n"); ControllerInfo->MapRegisterBase = MapRegisterBase; KeSetEvent(&ControllerInfo->SynchEvent, 0, FALSE); @@ -108,14 +107,14 @@ * it onto the irp queue */ { - DPRINT("floppy: ReadWrite called\n"); + TRACE_(FLOPPY, "ReadWrite called\n"); ASSERT(DeviceObject); ASSERT(Irp); if(!Irp->MdlAddress) { - DPRINT("floppy: ReadWrite(): MDL not found in IRP - Completing with STATUS_INVALID_PARAMETER\n"); + WARN_(FLOPPY, "ReadWrite(): MDL not found in IRP - Completing with STATUS_INVALID_PARAMETER\n"); Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -176,7 +175,7 @@ PAGED_CODE(); - DPRINT("floppy: RWDetermineMediaType called\n"); + TRACE_(FLOPPY, "RWDetermineMediaType called\n"); /* * This algorithm assumes that a 1.44MB floppy is in the drive. If it's not, @@ -191,7 +190,7 @@ /* Program data rate */ if(HwSetDataRate(DriveInfo->ControllerInfo, DRSR_DSEL_500KBPS) != STATUS_SUCCESS) { - DPRINT("floppy: RWDetermineMediaType(): unable to set data rate\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): unable to set data rate\n"); return STATUS_UNSUCCESSFUL; } @@ -203,7 +202,7 @@ /* Don't disable DMA --> enable dma (dumb & confusing) */ if(HwSpecify(DriveInfo->ControllerInfo, HeadLoadTime, HeadUnloadTime, StepRateTime, FALSE) != STATUS_SUCCESS) { - DPRINT("floppy: RWDetermineMediaType(): specify failed\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): specify failed\n"); return STATUS_UNSUCCESSFUL; } @@ -217,7 +216,7 @@ if(HwRecalibrate(DriveInfo) != STATUS_SUCCESS) { - DPRINT("floppy: RWDetermineMediaType(): Recalibrate failed\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): Recalibrate failed\n"); return STATUS_UNSUCCESSFUL; } @@ -231,7 +230,7 @@ if(i == 1) /* failed for 2nd time */ { - DPRINT("floppy: RWDetermineMediaType(): RecalibrateResult failed\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): RecalibrateResult failed\n"); return STATUS_UNSUCCESSFUL; } } @@ -242,7 +241,7 @@ /* Try to read an ID */ if(HwReadId(DriveInfo, 0) != STATUS_SUCCESS) /* read the first ID we find, from head 0 */ { - DPRINT("floppy: RWDetermineMediaType(): ReadId failed\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): ReadId failed\n"); return STATUS_UNSUCCESSFUL; /* if we can't even write to the controller, it's hopeless */ } @@ -251,13 +250,13 @@ if(HwReadIdResult(DriveInfo->ControllerInfo, NULL, NULL) != STATUS_SUCCESS) { - DPRINT("floppy: RWDetermineMediaType(): ReadIdResult failed; continuing\n"); + WARN_(FLOPPY, "RWDetermineMediaType(): ReadIdResult failed; continuing\n"); continue; } /* Found the media; populate the geometry now */ - DPRINT("FIXME: Hardcoded media type!\n"); - DPRINT("floppy: RWDetermineMediaType(): Found 1.44 media; returning success\n"); + WARN_(FLOPPY, "Hardcoded media type!\n"); + INFO_(FLOPPY, "RWDetermineMediaType(): Found 1.44 media; returning success\n"); DriveInfo->DiskGeometry.MediaType = GEOMETRY_144_MEDIATYPE; DriveInfo->DiskGeometry.Cylinders.QuadPart = GEOMETRY_144_CYLINDERS; DriveInfo->DiskGeometry.TracksPerCylinder = GEOMETRY_144_TRACKSPERCYLINDER; @@ -268,7 +267,7 @@ } while(FALSE); - DPRINT("floppy: RWDetermineMediaType(): failed to find media\n"); + TRACE_(FLOPPY, "RWDetermineMediaType(): failed to find media\n"); return STATUS_UNRECOGNIZED_MEDIA; } @@ -291,7 +290,7 @@ PAGED_CODE(); - DPRINT("floppy: RWSeekToCylinder called drive 0x%p cylinder %d\n", DriveInfo, Cylinder); + TRACE_(FLOPPY, "RWSeekToCylinder called drive 0x%p cylinder %d\n", DriveInfo, Cylinder); /* Clear any spurious interrupts */ KeClearEvent(&DriveInfo->ControllerInfo->SynchEvent); @@ -299,7 +298,7 @@ /* queue seek command */ if(HwSeek(DriveInfo, Cylinder) != STATUS_SUCCESS) { - DPRINT("floppy: RWSeekToTrack(): unable to seek\n"); + WARN_(FLOPPY, "RWSeekToTrack(): unable to seek\n"); return STATUS_UNSUCCESSFUL; } @@ -307,14 +306,14 @@ if(HwSenseInterruptStatus(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: RWSeekToTrack(): unable to get seek results\n"); + WARN_(FLOPPY, "RWSeekToTrack(): unable to get seek results\n"); return STATUS_UNSUCCESSFUL; } /* read ID mark from head 0 to verify */ if(HwReadId(DriveInfo, 0) != STATUS_SUCCESS) { - DPRINT("floppy: RWSeekToTrack(): unable to queue ReadId\n"); + WARN_(FLOPPY, "RWSeekToTrack(): unable to queue ReadId\n"); return STATUS_UNSUCCESSFUL; } @@ -322,17 +321,17 @@ if(HwReadIdResult(DriveInfo->ControllerInfo, &CurCylinder, NULL) != STATUS_SUCCESS) { - DPRINT("floppy: RWSeekToTrack(): unable to get ReadId result\n"); + WARN_(FLOPPY, "RWSeekToTrack(): unable to get ReadId result\n"); return STATUS_UNSUCCESSFUL; } if(CurCylinder != Cylinder) { - DPRINT("floppy: RWSeekToTrack(): Seeek to track failed; current cylinder is 0x%x\n", CurCylinder); + WARN_(FLOPPY, "RWSeekToTrack(): Seeek to track failed; current cylinder is 0x%x\n", CurCylinder); return STATUS_UNSUCCESSFUL; } - DPRINT("floppy: RWSeekToCylinder: returning successfully, now on cyl %d\n", Cylinder); + INFO_(FLOPPY, "RWSeekToCylinder: returning successfully, now on cyl %d\n", Cylinder); return STATUS_SUCCESS; } @@ -363,7 +362,7 @@ ULONG AbsoluteSector; UCHAR SectorsPerCylinder = (UCHAR)DriveInfo->DiskGeometry.SectorsPerTrack * (UCHAR)DriveInfo->DiskGeometry.TracksPerCylinder; - DPRINT("floppy: RWComputeCHS: Called with offset 0x%x\n", DiskByteOffset); + TRACE_(FLOPPY, "RWComputeCHS: Called with offset 0x%x\n", DiskByteOffset); /* First calculate the 1-based "absolute sector" based on the byte offset */ ASSERT(!(DiskByteOffset % DriveInfo->DiskGeometry.BytesPerSector)); /* FIXME: Only handle full sector transfers atm */ @@ -383,7 +382,7 @@ */ *Sector = ((UCHAR)(AbsoluteSector % SectorsPerCylinder) + 1) - ((*Head) * (UCHAR)DriveInfo->DiskGeometry.SectorsPerTrack); - DPRINT("floppy: RWComputeCHS: offset 0x%x is c:0x%x h:0x%x s:0x%x\n", DiskByteOffset, *Cylinder, *Head, *Sector); + INFO_(FLOPPY, "RWComputeCHS: offset 0x%x is c:0x%x h:0x%x s:0x%x\n", DiskByteOffset, *Cylinder, *Head, *Sector); /* Sanity checking */ ASSERT(*Cylinder <= DriveInfo->DiskGeometry.Cylinders.QuadPart); @@ -437,7 +436,7 @@ PAGED_CODE(); - DPRINT("floppy: ReadWritePassive called to %s 0x%x bytes from offset 0x%x\n", + TRACE_(FLOPPY, "ReadWritePassive called to %s 0x%x bytes from offset 0x%x\n", (Stack->MajorFunction == IRP_MJ_READ ? "read" : "write"), (Stack->MajorFunction == IRP_MJ_READ ? Stack->Parameters.Read.Length : Stack->Parameters.Write.Length), (Stack->MajorFunction == IRP_MJ_READ ? Stack->Parameters.Read.ByteOffset.u.LowPart : @@ -453,7 +452,7 @@ */ if(DeviceObject->Flags & DO_VERIFY_VOLUME && !(DeviceObject->Flags & SL_OVERRIDE_VERIFY_VOLUME)) { - DPRINT("floppy: ReadWritePassive(): DO_VERIFY_VOLUME set; Completing with STATUS_VERIFY_REQUIRED\n"); + INFO_(FLOPPY, "ReadWritePassive(): DO_VERIFY_VOLUME set; Completing with STATUS_VERIFY_REQUIRED\n"); Irp->IoStatus.Status = STATUS_VERIFY_REQUIRED; IoCompleteRequest(Irp, IO_NO_INCREMENT); return; @@ -465,7 +464,7 @@ StartMotor(DriveInfo); if(HwDiskChanged(DeviceObject->DeviceExtension, &DiskChanged) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): unable to detect disk change; Completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): unable to detect disk change; Completing with STATUS_UNSUCCESSFUL\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); return; @@ -473,7 +472,7 @@ if(DiskChanged) { - DPRINT("floppy: ReadWritePhase1(): signalling media changed; Completing with STATUS_MEDIA_CHANGED\n"); + INFO_(FLOPPY, "ReadWritePhase1(): signalling media changed; Completing with STATUS_MEDIA_CHANGED\n"); /* The following call sets IoStatus.Status and IoStatus.Information */ SignalMediaChanged(DeviceObject, Irp); @@ -496,7 +495,7 @@ { if(RWDetermineMediaType(DriveInfo) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): unable to determine media type; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): unable to determine media type; completing with STATUS_UNSUCCESSFUL\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); return; @@ -504,7 +503,7 @@ if(DriveInfo->DiskGeometry.MediaType == Unknown) { - DPRINT("floppy: ReadWritePassive(): Unknown media in drive; completing with STATUS_UNRECOGNIZED_MEDIA\n"); + WARN_(FLOPPY, "ReadWritePassive(): Unknown media in drive; completing with STATUS_UNRECOGNIZED_MEDIA\n"); Irp->IoStatus.Status = STATUS_UNRECOGNIZED_MEDIA; IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); @@ -604,7 +603,7 @@ if(Status != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): unable allocate an adapter channel; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): unable allocate an adapter channel; completing with STATUS_UNSUCCESSFUL\n"); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); return ; @@ -626,7 +625,7 @@ ULONG CurrentTransferBytes; UCHAR CurrentTransferSectors; - DPRINT("floppy: ReadWritePassive(): iterating in while (TransferByteOffset = 0x%x of 0x%x total) - allocating %d registers\n", + INFO_(FLOPPY, "ReadWritePassive(): iterating in while (TransferByteOffset = 0x%x of 0x%x total) - allocating %d registers\n", TransferByteOffset, Length, DriveInfo->ControllerInfo->MapRegisters); KeClearEvent(&DriveInfo->ControllerInfo->SynchEvent); @@ -636,7 +635,7 @@ */ if(RWComputeCHS(DriveInfo, DiskByteOffset+TransferByteOffset, &Cylinder, &Head, &StartSector) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): unable to compute CHS; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): unable to compute CHS; completing with STATUS_UNSUCCESSFUL\n"); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); @@ -650,7 +649,7 @@ { if(RWSeekToCylinder(DriveInfo, Cylinder) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): unable to seek; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): unable to seek; completing with STATUS_UNSUCCESSFUL\n"); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); @@ -664,7 +663,7 @@ * We can only ask for a transfer up to the end of the track. Then we have to re-seek and do more. * TODO: Support the MT bit */ - DPRINT("floppy: ReadWritePassive(): computing number of sectors to transfer (StartSector 0x%x): ", StartSector); + INFO_(FLOPPY, "ReadWritePassive(): computing number of sectors to transfer (StartSector 0x%x): ", StartSector); /* 1-based sector number */ if( (((DriveInfo->DiskGeometry.TracksPerCylinder - Head) * DriveInfo->DiskGeometry.SectorsPerTrack - StartSector) + 1 ) < @@ -677,7 +676,7 @@ CurrentTransferSectors = (UCHAR)((Length - TransferByteOffset) / DriveInfo->DiskGeometry.BytesPerSector); } - DPRINT("0x%x\n", CurrentTransferSectors); + INFO_(FLOPPY, "0x%x\n", CurrentTransferSectors); CurrentTransferBytes = CurrentTransferSectors * DriveInfo->DiskGeometry.BytesPerSector; @@ -685,7 +684,7 @@ * Adjust to map registers * BUG: Does this take into account page crossings? */ - DPRINT("floppy: ReadWritePassive(): Trying to transfer 0x%x bytes\n", CurrentTransferBytes); + INFO_(FLOPPY, "ReadWritePassive(): Trying to transfer 0x%x bytes\n", CurrentTransferBytes); ASSERT(CurrentTransferBytes); @@ -696,7 +695,7 @@ CurrentTransferBytes = CurrentTransferSectors * DriveInfo->DiskGeometry.BytesPerSector; - DPRINT("floppy: ReadWritePassive: limiting transfer to 0x%x bytes (0x%x sectors) due to map registers\n", + INFO_(FLOPPY, "ReadWritePassive: limiting transfer to 0x%x bytes (0x%x sectors) due to map registers\n", CurrentTransferBytes, CurrentTransferSectors); } @@ -718,14 +717,14 @@ if(HwReadWriteData(DriveInfo->ControllerInfo, !WriteToDevice, DriveInfo->UnitNumber, Cylinder, Head, StartSector, DriveInfo->BytesPerSectorCode, DriveInfo->DiskGeometry.SectorsPerTrack, Gap, 0xff) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): HwReadWriteData returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): HwReadWriteData returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n"); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject); IoCompleteRequest(Irp, IO_NO_INCREMENT); StopMotor(DriveInfo->ControllerInfo); return ; } - DPRINT("floppy: ReadWritePassive(): HwReadWriteData returned -- waiting on event\n"); + INFO_(FLOPPY, "ReadWritePassive(): HwReadWriteData returned -- waiting on event\n"); /* * At this point, we block and wait for an interrupt @@ -742,7 +741,7 @@ /* Read the results from the drive */ if(HwReadWriteResult(DriveInfo->ControllerInfo) != STATUS_SUCCESS) { - DPRINT("floppy: ReadWritePassive(): HwReadWriteResult returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n"); + WARN_(FLOPPY, "ReadWritePassive(): HwReadWriteResult returned failure; unable to read; completing with STATUS_UNSUCCESSFUL\n"); HwDumpRegisters(DriveInfo->ControllerInfo); RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject); IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -756,7 +755,7 @@ RWFreeAdapterChannel(DriveInfo->ControllerInfo->AdapterObject); /* That's all folks! */ - DPRINT("floppy: ReadWritePassive(): success; Completing with STATUS_SUCCESS\n"); + INFO_(FLOPPY, "ReadWritePassive(): success; Completing with STATUS_SUCCESS\n"); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = Length; IoCompleteRequest(Irp, IO_NO_INCREMENT);

16 years, 4 months

[fireball] 33601: - Ugly hack about corrupted KernelData pointer, which is being accessed. Hacks around bugs like bug 2954. See issue #2954 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Mon May 19 15:27:48 2008 New Revision: 33601 URL: http://svn.reactos.org/svn/reactos?rev=33601&view=rev Log: - Ugly hack about corrupted KernelData pointer, which is being accessed. Hacks around bugs like bug 2954. See issue #2954 for more details. Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c [iso-8859-1] Mon May 19 15:27:48 2008 @@ -720,6 +720,16 @@ { DPRINT1("Attempted to free global gdi handle 0x%x, caller needs to get ownership first!!!\n", hObj); DPRINT1("Type = 0x%lx, KernelData = 0x%p, ProcessId = 0x%p\n", Entry->Type, Entry->KernelData, Entry->ProcessId); + + /* HACK: Ugly and nasty */ + if ((ULONG_PTR)Entry->KernelData < 0x1000) + { + /* It's a memory-corruption bug (probably?), + overcome it by just saying "yes, object destroyed" */ + DPRINT1("Bad kerneldata!!! Blame Win32k developers!\n"); + return TRUE; + } + } else {

16 years, 4 months

[jimtabor] 33600: Add correction for GetClassName.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon May 19 14:23:02 2008 New Revision: 33600 URL: http://svn.reactos.org/svn/reactos?rev=33600&view=rev Log: Add correction for GetClassName. Modified: trunk/reactos/include/reactos/win32k/ntuser.h 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 [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Mon May 19 14:23:02 2008 @@ -1165,6 +1165,13 @@ NtUserGetClassName(HWND hWnd, PUNICODE_STRING ClassName, BOOL Ansi); +#if 0 // Real NtUserGetClassName +INT +NTAPI +NtUserGetClassName(HWND hWnd, + BOOL Unknown, // 0 GetClassNameW, 1 RealGetWindowClassA/W + PUNICODE_STRING ClassName); +#endif HANDLE NTAPI

16 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
59
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 May 2008