Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[akhaldi] 60661: [BRANCHES] * arty-stable: it served its purposed.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 14 14:34:16 2013 New Revision: 60661 URL: http://svn.reactos.org/svn/reactos?rev=60661&view=rev Log: [BRANCHES] * arty-stable: it served its purposed. Removed: branches/arty-stable/

11 years, 2 months

[jimtabor] 60660: - Fix build and fix gcc 4.8.x build issues.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 14 06:28:17 2013 New Revision: 60660 URL: http://svn.reactos.org/svn/reactos?rev=60660&view=rev Log: - Fix build and fix gcc 4.8.x build issues. Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:28:17 2013 @@ -75,5 +75,6 @@ ) add_library(mesa_main STATIC ${SOURCE}) - -allow_warnings(mesa_main) +if(NOT MSVC) + allow_warnings(mesa_main) +endif() Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:28:17 2013 @@ -28,5 +28,6 @@ ) add_library(mesa_swrast STATIC ${SOURCE}) - -allow_warnings(mesa_swrast) +if(NOT MSVC) + allow_warnings(mesa_swrast) +endif()

11 years, 2 months

[jimtabor] 60659: [Win32ss] - Fix up hot keys. Finding out that the wine test_hotkey is brain damaged and even breaks XP.

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Mon Oct 14 06:19:48 2013 New Revision: 60659 URL: http://svn.reactos.org/svn/reactos?rev=60659&view=rev Log: [Win32ss] - Fix up hot keys. Finding out that the wine test_hotkey is brain damaged and even breaks XP. Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt trunk/reactos/win32ss/user/ntuser/defwnd.c trunk/reactos/win32ss/user/ntuser/hotkey.c trunk/reactos/win32ss/user/ntuser/hotkey.h trunk/reactos/win32ss/user/ntuser/input.c trunk/reactos/win32ss/user/ntuser/input.h trunk/reactos/win32ss/user/ntuser/keyboard.c trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c trunk/reactos/win32ss/user/ntuser/msgqueue.h trunk/reactos/win32ss/user/user32/windows/defwnd.c Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -74,4 +74,6 @@ vtxfmt.c ) -add_library(mesa_main STATIC ${SOURCE}) +add_library(mesa_main STATIC ${SOURCE}) + +allow_warnings(mesa_main) Modified: trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/CMa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/CMakeLists.txt [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -27,4 +27,6 @@ s_zoom.c ) -add_library(mesa_swrast STATIC ${SOURCE}) +add_library(mesa_swrast STATIC ${SOURCE}) + +allow_warnings(mesa_swrast) Modified: trunk/reactos/win32ss/user/ntuser/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/defwnd… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/defwnd.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -233,7 +233,7 @@ return (LRESULT) DefWndControlColor((HDC)wParam, HIWORD(lParam)); case WM_GETHOTKEY: - return DefWndGetHotKey(UserHMGetHandle(Wnd)); + return DefWndGetHotKey(Wnd); case WM_SETHOTKEY: return DefWndSetHotKey(Wnd, wParam); Modified: trunk/reactos/win32ss/user/ntuser/hotkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Win32k subsystem * PURPOSE: HotKey support - * FILE: subsystems/win32/win32k/ntuser/hotkey.c + * FILE: win32ss/user/ntuser/hotkey.c * PROGRAMER: Eric Kohl */ @@ -30,16 +30,30 @@ * By default the key is VK-F12 on a 101-key keyboard, and is VK_SUBTRACT * (hyphen / substract sign) on a 82-key keyboard. */ -/* thread hwnd modifiers vk id next */ -// HOT_KEY hkF12 = {NULL, NULL, 0, VK_F12, IDHK_F12, NULL}; -// HOT_KEY hkShiftF12 = {NULL, NULL, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12}; -// HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; -HOT_KEY hkWinKey = {NULL, NULL, MOD_WIN, 0, IDHK_WINKEY, NULL}; - -PHOT_KEY gphkFirst = &hkWinKey; +/* pti pwnd modifiers vk id next */ +// HOT_KEY hkF12 = {NULL, 1, 0, VK_F12, IDHK_F12, NULL}; +// HOT_KEY hkShiftF12 = {NULL, 1, MOD_SHIFT, VK_F12, IDHK_SHIFTF12, &hkF12}; +// HOT_KEY hkWinKey = {NULL, 1, MOD_WIN, 0, IDHK_WINKEY, &hkShiftF12}; + +PHOT_KEY gphkFirst = NULL; BOOL bWinHotkeyActive = FALSE; /* FUNCTIONS *****************************************************************/ + +VOID FASTCALL +StartDebugHotKeys(VOID) +{ + UINT vk = VK_F12; + UserUnregisterHotKey(PWND_BOTTOM, IDHK_F12); + UserUnregisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12); + if (!ENHANCED_KEYBOARD(gKeyboardInfo.KeyboardIdentifier)) + { + vk = VK_SUBTRACT; + } + UserRegisterHotKey(PWND_BOTTOM, IDHK_SHIFTF12, MOD_SHIFT, vk); + UserRegisterHotKey(PWND_BOTTOM, IDHK_F12, 0, vk); + ERR("Start up the debugger hotkeys!! Should see this once!\n"); +} /* * IntGetModifiers @@ -77,7 +91,6 @@ UnregisterWindowHotKeys(PWND pWnd) { PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; - HWND hWnd = pWnd->head.h; while (pHotKey) { @@ -85,7 +98,7 @@ phkNext = pHotKey->pNext; /* Should we delete this hotkey? */ - if (pHotKey->hWnd == hWnd) + if (pHotKey->pWnd == pWnd) { /* Update next ptr for previous hotkey and free memory */ *pLink = phkNext; @@ -105,7 +118,7 @@ * Removes hotkeys registered by specified thread on its cleanup */ VOID FASTCALL -UnregisterThreadHotKeys(struct _ETHREAD *pThread) +UnregisterThreadHotKeys(PTHREADINFO pti) { PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; @@ -115,7 +128,7 @@ phkNext = pHotKey->pNext; /* Should we delete this hotkey? */ - if (pHotKey->pThread == pThread) + if (pHotKey->pti == pti) { /* Update next ptr for previous hotkey and free memory */ *pLink = phkNext; @@ -165,6 +178,8 @@ { UINT fModifiers; PHOT_KEY pHotKey; + PWND pWnd; + BOOL DoNotPostMsg = FALSE; if (wVk == VK_SHIFT || wVk == VK_CONTROL || wVk == VK_MENU || wVk == VK_LWIN || wVk == VK_RWIN) @@ -173,59 +188,84 @@ wVk = 0; } + fModifiers = IntGetModifiers(gafAsyncKeyState); + /* Check if it is a hotkey */ - fModifiers = IntGetModifiers(gafAsyncKeyState); pHotKey = IsHotKey(fModifiers, wVk); + if (pHotKey) { + TRACE("Hot key Found\n"); + /* FIXME: See comment about "UserDebuggerHotKey" on top of this file. */ + if (pHotKey->id == IDHK_SHIFTF12 || pHotKey->id == IDHK_F12) + { + if (bIsDown) + { + ERR("Hot key pressed for Debug Activation! ShiftF12 = %d or F12 = %d\n",pHotKey->id == IDHK_SHIFTF12 , pHotKey->id == IDHK_F12); + //DoNotPostMsg = co_ActivateDebugger(); // FIXME + } + return DoNotPostMsg; + } + /* Process hotkey if it is key up event */ if (!bIsDown) { - TRACE("Hot key pressed (hWnd %p, id %d)\n", pHotKey->hWnd, pHotKey->id); - - /* WIN and F12 keys are hardcoded here. See comments on top of this file. */ - if (pHotKey == &hkWinKey) + TRACE("Hot key pressed (pWnd %p, id %d)\n", pHotKey->pWnd, pHotKey->id); + + /* WIN and F12 keys are not hardcoded here. See comments on top of this file. */ + if (pHotKey->id == IDHK_WINKEY && bWinHotkeyActive == TRUE) { - if(bWinHotkeyActive == TRUE) + pWnd = ValidateHwndNoErr(InputWindowStation->ShellWindow); + if (pWnd) { - UserPostMessage(InputWindowStation->ShellWindow, WM_SYSCOMMAND, SC_TASKLIST, 0); - bWinHotkeyActive = FALSE; + TRACE("System Hot key Id %d Key %d\n",pHotKey->id, wVk ); + UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); + //ptiLastInput = pWnd->head.pti; + bWinHotkeyActive = FALSE; + return TRUE; } } -#if 0 /* FIXME: See comment about "UserDebuggerHotKey" on top of this file. */ - else if (pHotKey == &hkF12 || pHotKey == &hkShiftF12) + + if (!pHotKey->pWnd) { - //co_ActivateDebugger(); // FIXME - } -#endif - else if (pHotKey->id == IDHK_REACTOS && !pHotKey->pThread) // FIXME: Those hotkeys doesn't depend on RegisterHotKey - { - UserPostMessage(pHotKey->hWnd, WM_SYSCOMMAND, SC_HOTKEY, (LPARAM)pHotKey->hWnd); + TRACE("UPTM Hot key Id %d Key %d\n",pHotKey->id, wVk ); + UserPostThreadMessage(pHotKey->pti, WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); + //ptiLastInput = pHotKey->pti; } else { - /* If a hotkey with the WIN modifier was activated, do not treat the release of the WIN key as a hotkey*/ - if((pHotKey->fsModifiers & MOD_WIN) != 0) - bWinHotkeyActive = FALSE; - - MsqPostHotKeyMessage(pHotKey->pThread, - pHotKey->hWnd, - (WPARAM)pHotKey->id, - MAKELPARAM((WORD)fModifiers, wVk)); + if (pHotKey->pWnd == PWND_BOTTOM) + { + if (gpqForeground != NULL) + { + pWnd = gpqForeground->spwndFocus; + } + else + return FALSE; + } + else + { + pWnd = pHotKey->pWnd; + } + if (pWnd) + { + if (pWnd == pWnd->head.rpdesk->pDeskInfo->spwndShell && pHotKey->id == SC_TASKLIST) + { + ERR("Sending to shell window w/o IDHK_WINKEY..\n"); + UserPostMessage(UserHMGetHandle(pWnd), WM_SYSCOMMAND, SC_TASKLIST, 0); + } + else + { + UserPostMessage(UserHMGetHandle(pWnd), WM_HOTKEY, pHotKey->id, MAKELONG(fModifiers, wVk)); + } + //ptiLastInput = pWnd->head.pti; + } } - } - else - { - if (pHotKey == &hkWinKey) - { - /* The user pressed the win key */ - bWinHotkeyActive = TRUE; - } - } - - return TRUE; /* Don't send any message */ - } - + return TRUE; /* Don't send any message */ + } + else /* The user pressed the win key */ + if (pHotKey->id == IDHK_WINKEY) bWinHotkeyActive = TRUE; + } return FALSE; } @@ -236,7 +276,7 @@ * GetHotKey message support */ UINT FASTCALL -DefWndGetHotKey(HWND hWnd) +DefWndGetHotKey(PWND pWnd) { PHOT_KEY pHotKey = gphkFirst; @@ -244,7 +284,7 @@ while (pHotKey) { - if (pHotKey->hWnd == hWnd && pHotKey->id == IDHK_REACTOS) + if (pHotKey->pWnd == pWnd && pHotKey->id == IDHK_REACTOS) { /* We have found it */ return MAKELONG(pHotKey->vk, pHotKey->fsModifiers); @@ -267,7 +307,6 @@ { UINT fsModifiers, vk; PHOT_KEY pHotKey, *pLink; - HWND hWnd; INT iRet = 1; WARN("DefWndSetHotKey wParam 0x%x\n", wParam); @@ -286,7 +325,6 @@ vk = LOWORD(wParam); fsModifiers = HIWORD(wParam); - hWnd = UserHMGetHandle(pWnd); if (wParam) { @@ -297,7 +335,7 @@ pHotKey->vk == vk && pHotKey->id == IDHK_REACTOS) { - if (pHotKey->hWnd != hWnd) + if (pHotKey->pWnd != pWnd) iRet = 2; // Another window already has the same hot key. break; } @@ -311,7 +349,7 @@ pLink = &gphkFirst; while (pHotKey) { - if (pHotKey->hWnd == hWnd && + if (pHotKey->pWnd == pWnd && pHotKey->id == IDHK_REACTOS) { /* This window has already hotkey registered */ @@ -332,7 +370,7 @@ if (pHotKey == NULL) return 0; - pHotKey->hWnd = hWnd; + pHotKey->pWnd = pWnd; pHotKey->id = IDHK_REACTOS; // Don't care, these hot keys are unrelated to the hot keys set by RegisterHotKey pHotKey->pNext = gphkFirst; gphkFirst = pHotKey; @@ -340,7 +378,7 @@ /* A window can only have one hot key. If the window already has a hot key associated with it, the new hot key replaces the old one. */ - pHotKey->pThread = NULL; + pHotKey->pti = NULL; pHotKey->fsModifiers = fsModifiers; pHotKey->vk = vk; } @@ -353,6 +391,85 @@ return iRet; } + + +BOOL FASTCALL +UserRegisterHotKey(PWND pWnd, + int id, + UINT fsModifiers, + UINT vk) +{ + PHOT_KEY pHotKey; + PTHREADINFO pHotKeyThread; + + /* Find hotkey thread */ + if (pWnd == NULL || pWnd == PWND_BOTTOM) + { + pHotKeyThread = PsGetCurrentThreadWin32Thread(); + } + else + { + pHotKeyThread = pWnd->head.pti; + } + + /* Check for existing hotkey */ + if (IsHotKey(fsModifiers, vk)) + { + EngSetLastError(ERROR_HOTKEY_ALREADY_REGISTERED); + WARN("Hotkey already exists\n"); + return FALSE; + } + + /* Create new hotkey */ + pHotKey = ExAllocatePoolWithTag(PagedPool, sizeof(HOT_KEY), USERTAG_HOTKEY); + if (pHotKey == NULL) + { + EngSetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + pHotKey->pti = pHotKeyThread; + pHotKey->pWnd = pWnd; + pHotKey->fsModifiers = fsModifiers; + pHotKey->vk = vk; + pHotKey->id = id; + + /* Insert hotkey to the global list */ + pHotKey->pNext = gphkFirst; + gphkFirst = pHotKey; + + return TRUE; +} + +BOOL FASTCALL +UserUnregisterHotKey(PWND pWnd, int id) +{ + PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; + BOOL bRet = FALSE; + + while (pHotKey) + { + /* Save next ptr for later use */ + phkNext = pHotKey->pNext; + + /* Should we delete this hotkey? */ + if (pHotKey->pWnd == pWnd && pHotKey->id == id) + { + /* Update next ptr for previous hotkey and free memory */ + *pLink = phkNext; + ExFreePoolWithTag(pHotKey, USERTAG_HOTKEY); + + bRet = TRUE; + } + else /* This hotkey will stay, use its next ptr */ + pLink = &pHotKey->pNext; + + /* Move to the next entry */ + pHotKey = phkNext; + } + return bRet; +} + /* SYSCALLS *****************************************************************/ @@ -364,8 +481,8 @@ UINT vk) { PHOT_KEY pHotKey; - PWND pWnd; - PETHREAD pHotKeyThread; + PWND pWnd = NULL; + PTHREADINFO pHotKeyThread; BOOL bRet = FALSE; TRACE("Enter NtUserRegisterHotKey\n"); @@ -382,7 +499,7 @@ /* Find hotkey thread */ if (hWnd == NULL) { - pHotKeyThread = PsGetCurrentThread(); + pHotKeyThread = gptiCurrent; } else { @@ -390,7 +507,14 @@ if (!pWnd) goto cleanup; - pHotKeyThread = pWnd->head.pti->pEThread; + pHotKeyThread = pWnd->head.pti; + + /* Fix wine msg "Window on another thread" test_hotkey */ + if (pWnd->head.pti != gptiCurrent) + { + WARN("Must be from the same Thread.\n"); + goto cleanup; + } } /* Check for existing hotkey */ @@ -409,8 +533,8 @@ goto cleanup; } - pHotKey->pThread = pHotKeyThread; - pHotKey->hWnd = hWnd; + pHotKey->pti = pHotKeyThread; + pHotKey->pWnd = pWnd; pHotKey->fsModifiers = fsModifiers; pHotKey->vk = vk; pHotKey->id = id; @@ -433,12 +557,13 @@ { PHOT_KEY pHotKey = gphkFirst, phkNext, *pLink = &gphkFirst; BOOL bRet = FALSE; + PWND pWnd; TRACE("Enter NtUserUnregisterHotKey\n"); UserEnterExclusive(); /* Fail if given window is invalid */ - if (hWnd && !UserGetWindowObject(hWnd)) + if (hWnd && !(pWnd = UserGetWindowObject(hWnd))) goto cleanup; while (pHotKey) @@ -447,7 +572,7 @@ phkNext = pHotKey->pNext; /* Should we delete this hotkey? */ - if (pHotKey->hWnd == hWnd && pHotKey->id == id) + if (pHotKey->pWnd == pWnd && pHotKey->id == id) { /* Update next ptr for previous hotkey and free memory */ *pLink = phkNext; Modified: trunk/reactos/win32ss/user/ntuser/hotkey.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hotkey… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hotkey.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hotkey.h [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -2,8 +2,8 @@ typedef struct _HOT_KEY { - struct _ETHREAD *pThread; - HWND hWnd; + PTHREADINFO pti; + PWND pWnd; UINT fsModifiers; UINT vk; INT id; @@ -17,9 +17,12 @@ #define IDHK_REACTOS -8 VOID FASTCALL UnregisterWindowHotKeys(PWND Window); -VOID FASTCALL UnregisterThreadHotKeys(struct _ETHREAD *pThread); +VOID FASTCALL UnregisterThreadHotKeys(PTHREADINFO pti); BOOL NTAPI co_UserProcessHotKeys(WORD wVk, BOOL bIsDown); -UINT FASTCALL DefWndGetHotKey(HWND hwnd); +UINT FASTCALL DefWndGetHotKey(PWND pWnd); INT FASTCALL DefWndSetHotKey(PWND pWnd, WPARAM wParam); +VOID FASTCALL StartDebugHotKeys(VOID); +BOOL FASTCALL UserRegisterHotKey(PWND pWnd,int id,UINT fsModifiers,UINT vk); +BOOL FASTCALL UserUnregisterHotKey(PWND pWnd, int id); /* EOF */ Modified: trunk/reactos/win32ss/user/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -13,12 +13,10 @@ /* GLOBALS *******************************************************************/ PTHREADINFO ptiRawInput; -PTHREADINFO ptiKeyboard; -PTHREADINFO ptiMouse; PKTIMER MasterTimer = NULL; PATTACHINFO gpai = NULL; INT paiCount = 0; -HANDLE ghKeyboardDevice; +HANDLE ghKeyboardDevice = NULL; static DWORD LastInputTick = 0; static HANDLE ghMouseDevice; @@ -131,7 +129,7 @@ { NTSTATUS MouStatus = STATUS_UNSUCCESSFUL, KbdStatus = STATUS_UNSUCCESSFUL, Status; IO_STATUS_BLOCK MouIosb, KbdIosb; - PFILE_OBJECT pKbdDevice, pMouDevice; + PFILE_OBJECT pKbdDevice = NULL, pMouDevice = NULL; LARGE_INTEGER ByteOffset; //LARGE_INTEGER WaitTimeout; PVOID WaitObjects[3], pSignaledObject = NULL; @@ -175,6 +173,14 @@ { ++cMaxWaitObjects; TRACE("Keyboard connected!\n"); + // Get and load keyboard attributes. + UserInitKeyboard(ghKeyboardDevice); + UserEnterExclusive(); + // Register the Window hotkey. + UserRegisterHotKey(PWND_BOTTOM, IDHK_WINKEY, MOD_WIN, 0); + // Register the debug hotkeys. + StartDebugHotKeys(); + UserLeave(); } } Modified: trunk/reactos/win32ss/user/ntuser/input.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/input.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/input.h [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -99,4 +99,4 @@ extern PKL gspklBaseLayout; - +extern KEYBOARD_ATTRIBUTES gKeyboardInfo; Modified: trunk/reactos/win32ss/user/ntuser/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/keyboa… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/keyboard.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * PURPOSE: Keyboard functions - * FILE: subsystems/win32/win32k/ntuser/keyboard.c + * FILE: win32ss/user/ntuser/keyboard.c * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) * Rafal Harabien (rafalh(a)reactos.org) */ @@ -14,6 +14,7 @@ static BYTE gafAsyncKeyStateRecentDown[256 / 8]; // 1 bit per key static PKEYBOARD_INDICATOR_TRANSLATION gpKeyboardIndicatorTrans = NULL; static KEYBOARD_INDICATOR_PARAMETERS gIndicators = {0, 0}; +KEYBOARD_ATTRIBUTES gKeyboardInfo; /* FUNCTIONS *****************************************************************/ @@ -29,6 +30,10 @@ { RtlZeroMemory(&gafAsyncKeyState, sizeof(gafAsyncKeyState)); RtlZeroMemory(&gafAsyncKeyStateRecentDown, sizeof(gafAsyncKeyStateRecentDown)); + // Clear and set default information. + RtlZeroMemory(&gKeyboardInfo, sizeof(gKeyboardInfo)); + gKeyboardInfo.KeyboardIdentifier.Type = 4; /* AT-101 */ + gKeyboardInfo.NumberOfFunctionKeys = 12; /* We're doing an 101 for now, so return 12 F-keys */ return STATUS_SUCCESS; } @@ -38,7 +43,7 @@ * Asks the keyboard driver to send a small table that shows which * lights should connect with which scancodes */ -static +//static NTSTATUS APIENTRY IntKeyboardGetIndicatorTrans(HANDLE hKeyboardDevice, PKEYBOARD_INDICATOR_TRANSLATION *ppIndicatorTrans) @@ -159,7 +164,7 @@ { NTSTATUS Status; IO_STATUS_BLOCK Block; - +/* IntKeyboardGetIndicatorTrans(hKeyboardDevice, &gpKeyboardIndicatorTrans); Status = NtDeviceIoControlFile(hKeyboardDevice, @@ -175,13 +180,31 @@ { WARN("NtDeviceIoControlFile() failed, ignored\n"); } - SET_KEY_LOCKED(gafAsyncKeyState, VK_CAPITAL, gIndicators.LedFlags & KEYBOARD_CAPS_LOCK_ON); SET_KEY_LOCKED(gafAsyncKeyState, VK_NUMLOCK, gIndicators.LedFlags & KEYBOARD_NUM_LOCK_ON); SET_KEY_LOCKED(gafAsyncKeyState, VK_SCROLL, gIndicators.LedFlags & KEYBOARD_SCROLL_LOCK_ON); +*/ + // FIXME: Need device driver to work! HID support more than one!!!! + Status = NtDeviceIoControlFile(hKeyboardDevice, + NULL, + NULL, + NULL, + &Block, + IOCTL_KEYBOARD_QUERY_ATTRIBUTES, + NULL, 0, + &gKeyboardInfo, sizeof(gKeyboardInfo)); + + if (!NT_SUCCESS(Status)) + { + ERR("NtDeviceIoControlFile() failed, ignored\n"); + } + ERR("Keyboard type %d, subtype %d and number of func keys %d\n", + gKeyboardInfo.KeyboardIdentifier.Type, + gKeyboardInfo.KeyboardIdentifier.Subtype, + gKeyboardInfo.NumberOfFunctionKeys); } /* @@ -798,8 +821,10 @@ /* Check if this is a hotkey */ if (co_UserProcessHotKeys(wSimpleVk, bIsDown)) + { + TRACE("HotKey Processed\n"); bPostMsg = FALSE; - + } wFixedVk = IntFixVk(wSimpleVk, bExt); /* LSHIFT + EXT = RSHIFT */ if (wSimpleVk == VK_SHIFT) /* shift can't be extended */ bExt = FALSE; @@ -1459,11 +1484,11 @@ switch (dwTypeFlag) { case 0: /* Keyboard type */ - return 4; /* AT-101 */ + return (DWORD)gKeyboardInfo.KeyboardIdentifier.Type; case 1: /* Keyboard Subtype */ - return 0; /* There are no defined subtypes */ + return (DWORD)gKeyboardInfo.KeyboardIdentifier.Subtype; case 2: /* Number of F-keys */ - return 12; /* We're doing an 101 for now, so return 12 F-keys */ + return (DWORD)gKeyboardInfo.NumberOfFunctionKeys; default: ERR("Unknown type!\n"); return 0; /* Note: we don't have to set last error here */ Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -544,7 +544,7 @@ EVENT_DestroyThreadEvents(Thread); DestroyTimersForThread(ptiCurrent); KeSetEvent(ptiCurrent->pEventQueueServer, IO_NO_INCREMENT, FALSE); - UnregisterThreadHotKeys(Thread); + UnregisterThreadHotKeys(ptiCurrent); /* if (IsListEmpty(&ptiCurrent->WindowListHead)) { Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -1058,53 +1058,29 @@ } BOOL FASTCALL -UserPostThreadMessage( DWORD idThread, +UserPostThreadMessage( PTHREADINFO pti, UINT Msg, WPARAM wParam, LPARAM lParam ) { MSG Message; - PETHREAD peThread; - PTHREADINFO pThread; LARGE_INTEGER LargeTickCount; - NTSTATUS Status; if (is_pointer_message(Msg)) { EngSetLastError(ERROR_MESSAGE_SYNC_ONLY ); return FALSE; } - - Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); - - if( Status == STATUS_SUCCESS ) - { - pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; - if( !pThread || - !pThread->MessageQueue || - (pThread->TIF_flags & TIF_INCLEANUP)) - { - ObDereferenceObject( peThread ); - return FALSE; - } - - Message.hwnd = NULL; - Message.message = Msg; - Message.wParam = wParam; - Message.lParam = lParam; - Message.pt = gpsi->ptCursor; - - KeQueryTickCount(&LargeTickCount); - Message.time = MsqCalculateMessageTime(&LargeTickCount); - MsqPostMessage(pThread, &Message, FALSE, QS_POSTMESSAGE, 0); - ObDereferenceObject( peThread ); - return TRUE; - } - else - { - SetLastNtError( Status ); - } - return FALSE; + Message.hwnd = NULL; + Message.message = Msg; + Message.wParam = wParam; + Message.lParam = lParam; + Message.pt = gpsi->ptCursor; + + KeQueryTickCount(&LargeTickCount); + Message.time = MsqCalculateMessageTime(&LargeTickCount); + MsqPostMessage(pti, &Message, FALSE, QS_POSTMESSAGE, 0); + return TRUE; } BOOL FASTCALL @@ -1157,7 +1133,8 @@ if (!Wnd) { - return UserPostThreadMessage( PtrToInt(PsGetCurrentThreadId()), + pti = PsGetCurrentThreadWin32Thread(); + return UserPostThreadMessage( pti, Msg, wParam, lParam); @@ -1983,13 +1960,33 @@ LPARAM lParam) { BOOL ret; + PETHREAD peThread; + PTHREADINFO pThread; + NTSTATUS Status; UserEnterExclusive(); - ret = UserPostThreadMessage( idThread, Msg, wParam, lParam); - + Status = PsLookupThreadByThreadId((HANDLE)idThread,&peThread); + + if ( Status == STATUS_SUCCESS ) + { + pThread = (PTHREADINFO)peThread->Tcb.Win32Thread; + if( !pThread || + !pThread->MessageQueue || + (pThread->TIF_flags & TIF_INCLEANUP)) + { + ObDereferenceObject( peThread ); + goto exit; + } + ret = UserPostThreadMessage( pThread, Msg, wParam, lParam); + ObDereferenceObject( peThread ); + } + else + { + SetLastNtError( Status ); + } +exit: UserLeave(); - return ret; } Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -638,54 +638,6 @@ } } -VOID FASTCALL -MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam) -{ - PWND Window; - PTHREADINFO Win32Thread; - MSG Mesg; - LARGE_INTEGER LargeTickCount; - NTSTATUS Status; - INT id; - DWORD Type; - - Status = ObReferenceObjectByPointer (Thread, - THREAD_ALL_ACCESS, - PsThreadType, - KernelMode); - if (!NT_SUCCESS(Status)) - return; - - Win32Thread = ((PETHREAD)Thread)->Tcb.Win32Thread; - if (Win32Thread == NULL || Win32Thread->MessageQueue == NULL) - { - ObDereferenceObject ((PETHREAD)Thread); - return; - } - - Window = IntGetWindowObject(hWnd); - if (!Window) - { - ObDereferenceObject ((PETHREAD)Thread); - return; - } - - id = wParam; // Check for hot keys unrelated to the hot keys set by RegisterHotKey. - - Mesg.hwnd = hWnd; - Mesg.message = id != IDHK_REACTOS ? WM_HOTKEY : WM_SYSCOMMAND; - Mesg.wParam = id != IDHK_REACTOS ? wParam : SC_HOTKEY; - Mesg.lParam = id != IDHK_REACTOS ? lParam : (LPARAM)hWnd; - Type = id != IDHK_REACTOS ? QS_HOTKEY : QS_POSTMESSAGE; - KeQueryTickCount(&LargeTickCount); - Mesg.time = MsqCalculateMessageTime(&LargeTickCount); - Mesg.pt = gpsi->ptCursor; - MsqPostMessage(Window->head.pti, &Mesg, FALSE, Type, 0); - UserDereferenceObject(Window); - ObDereferenceObject (Thread); - -} - PUSER_MESSAGE FASTCALL MsqCreateMessage(LPMSG Msg) { @@ -1251,6 +1203,7 @@ &Message->ListEntry); } + if (Msg->message == WM_HOTKEY) MessageBits |= QS_HOTKEY; // Justin Case, just set it. Message->dwQEvent = dwQEvent; Message->QS_Flags = MessageBits; //Message->pti = pti; Fixed in ATI changes. See CORE-6551 Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.h [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -198,7 +198,6 @@ LRESULT FASTCALL IntDispatchMessage(MSG* Msg); BOOL FASTCALL IntTranslateKbdMessage(LPMSG lpMsg, UINT flags); -VOID FASTCALL MsqPostHotKeyMessage(PVOID Thread, HWND hWnd, WPARAM wParam, LPARAM lParam); VOID FASTCALL co_MsqInsertMouseMessage(MSG* Msg, DWORD flags, ULONG_PTR dwExtraInfo, BOOL Hook); BOOL FASTCALL MsqIsClkLck(LPMSG Msg, BOOL Remove); BOOL FASTCALL MsqIsDblClk(LPMSG Msg, BOOL Remove); @@ -274,5 +273,10 @@ UINT MsgFilterMax, UINT RemoveMsg, BOOL bGMSG ); +BOOL FASTCALL +UserPostThreadMessage( PTHREADINFO pti, + UINT Msg, + WPARAM wParam, + LPARAM lParam ); /* EOF */ Modified: trunk/reactos/win32ss/user/user32/windows/defwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/defwnd.c [iso-8859-1] Mon Oct 14 06:19:48 2013 @@ -804,6 +804,10 @@ } break; + case SC_TASKLIST: + WinExec( "taskman.exe", SW_SHOWNORMAL ); + break; + case SC_SCREENSAVE: NtUserMessageCall( hWnd, WM_SYSCOMMAND, wParam, lParam, (ULONG_PTR)&lResult, FNID_DEFWINDOWPROC, FALSE); break;

11 years, 2 months

[aandrejevic] 60658: [SOFT386] Halfplement REPZ/REPNZ for CMPS and SCAS.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Oct 13 23:59:52 2013 New Revision: 60658 URL: http://svn.reactos.org/svn/reactos?rev=60658&view=rev Log: [SOFT386] Halfplement REPZ/REPNZ for CMPS and SCAS. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Oct 13 23:59:52 2013 @@ -6200,6 +6200,43 @@ } } + // FIXME: This method is slow! + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + BOOLEAN Repeat = TRUE; + + if (OperandSize) + { + if ((--State->GeneralRegs[SOFT386_REG_ECX].Long) == 0) + { + /* ECX is 0 */ + Repeat = FALSE; + } + } + else + { + if ((--State->GeneralRegs[SOFT386_REG_ECX].LowWord) == 0) + { + /* CX is 0 */ + Repeat = FALSE; + } + } + + if (((State->PrefixFlags & SOFT386_PREFIX_REP) && !State->Flags.Zf) + || ((State->PrefixFlags & SOFT386_PREFIX_REPNZ) && State->Flags.Zf)) + { + /* REPZ with ZF = 0 or REPNZ with ZF = 1 */ + Repeat = FALSE; + } + + if (Repeat) + { + /* Repeat the instruction */ + State->InstPtr = State->SavedInstPtr; + } + } + /* Return success */ return TRUE; } @@ -6444,16 +6481,8 @@ AddressSize = !AddressSize; } - if ((State->PrefixFlags & SOFT386_PREFIX_REP) - || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) - { - // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; - } - /* Calculate the size */ - if (Opcode == 0xA6) DataSize = sizeof(UCHAR); + if (Opcode == 0xAE) DataSize = sizeof(UCHAR); else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); /* Calculate the mask and sign flag */ @@ -6497,6 +6526,43 @@ { if (!State->Flags.Df) State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; else State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + + // FIXME: This method is slow! + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + BOOLEAN Repeat = TRUE; + + if (OperandSize) + { + if ((--State->GeneralRegs[SOFT386_REG_ECX].Long) == 0) + { + /* ECX is 0 */ + Repeat = FALSE; + } + } + else + { + if ((--State->GeneralRegs[SOFT386_REG_ECX].LowWord) == 0) + { + /* CX is 0 */ + Repeat = FALSE; + } + } + + if (((State->PrefixFlags & SOFT386_PREFIX_REP) && !State->Flags.Zf) + || ((State->PrefixFlags & SOFT386_PREFIX_REPNZ) && State->Flags.Zf)) + { + /* REPZ with ZF = 0 or REPNZ with ZF = 1 */ + Repeat = FALSE; + } + + if (Repeat) + { + /* Repeat the instruction */ + State->InstPtr = State->SavedInstPtr; + } } /* Return success */

11 years, 2 months

[hbelusca] 60657: [HAL][PCIX]: Finish to put \r\n for Hal\InbvDisplayStrings. Part 3/3.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 13 23:37:11 2013 New Revision: 60657 URL: http://svn.reactos.org/svn/reactos?rev=60657&view=rev Log: [HAL][PCIX]: Finish to put \r\n for Hal\InbvDisplayStrings. Part 3/3. Modified: trunk/reactos/drivers/bus/pcix/init.c trunk/reactos/hal/halppc/generic/misc.c trunk/reactos/hal/halx86/acpi/halacpi.c trunk/reactos/hal/halx86/generic/misc.c Modified: trunk/reactos/drivers/bus/pcix/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/init.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/init.c [iso-8859-1] Sun Oct 13 23:37:11 2013 @@ -240,7 +240,7 @@ (Rsdt->Header.Signature != XSDT_SIGNATURE)) { /* Very bad: crash */ - HalDisplayString("RSDT table contains invalid signature\n"); + HalDisplayString("RSDT table contains invalid signature\r\n"); MmUnmapIoSpace(Rsdt, TableLength); return NULL; } Modified: trunk/reactos/hal/halppc/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/misc.c [iso-8859-1] Sun Oct 13 23:37:11 2013 @@ -58,25 +58,25 @@ ucStatus = READ_PORT_UCHAR((PUCHAR)0x61); /* Display NMI failure string */ - HalDisplayString ("\n*** Hardware Malfunction\n\n"); - HalDisplayString ("Call your hardware vendor for support\n\n"); + HalDisplayString ("\r\n*** Hardware Malfunction\r\n\r\n"); + HalDisplayString ("Call your hardware vendor for support\r\n\r\n"); /* Check for parity error */ if (ucStatus & 0x80) { /* Display message */ - HalDisplayString ("NMI: Parity Check / Memory Parity Error\n"); + HalDisplayString ("NMI: Parity Check / Memory Parity Error\r\n"); } /* Check for I/O failure */ if (ucStatus & 0x40) { /* Display message */ - HalDisplayString ("NMI: Channel Check / IOCHK\n"); + HalDisplayString ("NMI: Channel Check / IOCHK\r\n"); } /* Halt the system */ - HalDisplayString("\n*** The system has halted ***\n"); + HalDisplayString("\r\n*** The system has halted ***\r\n"); //KeEnterKernelDebugger(); } Modified: trunk/reactos/hal/halx86/acpi/halacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/halacpi.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/halacpi.c [iso-8859-1] Sun Oct 13 23:37:11 2013 @@ -688,7 +688,7 @@ (Rsdt->Header.Signature != XSDT_SIGNATURE)) { /* Very bad: crash */ - HalDisplayString("Bad RSDT pointer\n"); + HalDisplayString("Bad RSDT pointer\r\n"); KeBugCheckEx(MISMATCHED_HAL, 4, __LINE__, 0, 0); } Modified: trunk/reactos/hal/halx86/generic/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/misc.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/misc.c [iso-8859-1] Sun Oct 13 23:37:11 2013 @@ -264,8 +264,8 @@ // // Display NMI failure string // - InbvDisplayString("\n*** Hardware Malfunction\n\n"); - InbvDisplayString("Call your hardware vendor for support\n\n"); + InbvDisplayString("\r\n*** Hardware Malfunction\r\n\r\n"); + InbvDisplayString("Call your hardware vendor for support\r\n\r\n"); // // Check for parity error @@ -275,7 +275,7 @@ // // Display message // - InbvDisplayString("NMI: Parity Check / Memory Parity Error\n"); + InbvDisplayString("NMI: Parity Check / Memory Parity Error\r\n"); } // @@ -286,7 +286,7 @@ // // Display message // - InbvDisplayString("NMI: Channel Check / IOCHK\n"); + InbvDisplayString("NMI: Channel Check / IOCHK\r\n"); } // @@ -303,7 +303,7 @@ // // Halt the system // - InbvDisplayString("\n*** The system has halted ***\n"); + InbvDisplayString("\r\n*** The system has halted ***\r\n"); //

11 years, 2 months

[hbelusca] 60656: \r\n for strings being displayed by NtDisplayString. [AUTOCHK]: Fix some DPRINTs

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 13 23:22:03 2013 New Revision: 60656 URL: http://svn.reactos.org/svn/reactos?rev=60656&view=rev Log: \r\n for strings being displayed by NtDisplayString. [AUTOCHK]: Fix some DPRINTs Modified: trunk/reactos/base/system/autochk/autochk.c trunk/reactos/base/system/smss/smss.c Modified: trunk/reactos/base/system/autochk/autochk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch… ============================================================================== --- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original) +++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Sun Oct 13 23:22:03 2013 @@ -167,59 +167,59 @@ switch(Command) { case UNKNOWN2: - DPRINT("UNKNOWN2\r"); + DPRINT("UNKNOWN2\n"); break; case UNKNOWN3: - DPRINT("UNKNOWN3\r"); + DPRINT("UNKNOWN3\n"); break; case UNKNOWN4: - DPRINT("UNKNOWN4\r"); + DPRINT("UNKNOWN4\n"); break; case UNKNOWN5: - DPRINT("UNKNOWN5\r"); + DPRINT("UNKNOWN5\n"); break; case UNKNOWN9: - DPRINT("UNKNOWN9\r"); + DPRINT("UNKNOWN9\n"); break; case UNKNOWNA: - DPRINT("UNKNOWNA\r"); + DPRINT("UNKNOWNA\n"); break; case UNKNOWNC: - DPRINT("UNKNOWNC\r"); + DPRINT("UNKNOWNC\n"); break; case UNKNOWND: - DPRINT("UNKNOWND\r"); + DPRINT("UNKNOWND\n"); break; case INSUFFICIENTRIGHTS: - DPRINT("INSUFFICIENTRIGHTS\r"); + DPRINT("INSUFFICIENTRIGHTS\n"); break; case FSNOTSUPPORTED: - DPRINT("FSNOTSUPPORTED\r"); + DPRINT("FSNOTSUPPORTED\n"); break; case VOLUMEINUSE: - DPRINT("VOLUMEINUSE\r"); + DPRINT("VOLUMEINUSE\n"); break; case STRUCTUREPROGRESS: - DPRINT("STRUCTUREPROGRESS\r"); + DPRINT("STRUCTUREPROGRESS\n"); break; case DONEWITHSTRUCTURE: - DPRINT("DONEWITHSTRUCTURE\r"); + DPRINT("DONEWITHSTRUCTURE\n"); break; case CLUSTERSIZETOOSMALL: - DPRINT("CLUSTERSIZETOOSMALL\r"); + DPRINT("CLUSTERSIZETOOSMALL\n"); break; case PROGRESS: @@ -236,8 +236,8 @@ Status = (PBOOLEAN)Argument; if (*Status == TRUE) { - PrintString("Autochk was unable to complete successfully.\n\n"); - //Error = TRUE; + PrintString("Autochk was unable to complete successfully.\r\n\r\n"); + // Error = TRUE; } break; } @@ -294,7 +294,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("GetFileSystem() failed with status 0x%08lx\n", Status); - PrintString(" Unable to get file system of %S\n", DrivePath); + PrintString(" Unable to get file system of %S\r\n", DrivePath); return Status; } @@ -303,7 +303,7 @@ if (Provider == NULL) { DPRINT1("LoadProvider() failed\n"); - PrintString(" Unable to verify a %S volume\n", FileSystem); + PrintString(" Unable to verify a %S volume\r\n", FileSystem); return STATUS_DLL_NOT_FOUND; } @@ -315,13 +315,13 @@ if (!NT_SUCCESS(Status)) { DPRINT1("LdrGetProcedureAddress() failed with status 0x%08lx\n", Status); - PrintString(" Unable to verify a %S volume\n", FileSystem); + PrintString(" Unable to verify a %S volume\r\n", FileSystem); LdrUnloadDll(Provider); return Status; } /* Call provider */ - //PrintString(" Verifying volume %S\n", DrivePath); + // PrintString(" Verifying volume %S\r\n", DrivePath); swprintf(NtDrivePath, L"\\??\\"); wcscat(NtDrivePath, DrivePath); NtDrivePath[wcslen(NtDrivePath)-1] = 0; @@ -384,7 +384,7 @@ CheckVolume(DrivePath); } } - //PrintString(" Done\n\n"); + // PrintString(" Done\r\n\r\n"); return 0; } Modified: trunk/reactos/base/system/smss/smss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smss.c?re… ============================================================================== --- trunk/reactos/base/system/smss/smss.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smss.c [iso-8859-1] Sun Oct 13 23:22:03 2013 @@ -174,7 +174,7 @@ { /* It wasn't, so create an error message to print on the screen */ sprintf_nt(MessageBuffer, - "%wZ program not found - skipping AUTOCHECK\n", + "%wZ program not found - skipping AUTOCHECK\r\n", FileName); RtlInitAnsiString(&MessageString, MessageBuffer); if (NT_SUCCESS(RtlAnsiStringToUnicodeString(&Destination,

11 years, 2 months

[hbelusca] 60655: [USETUP]: The STRING_CONSOLEFAIL1/2/3 are aimed to be printed with NtDisplayString, which will use InbvDisplayString. Therefore add \r with \n. Part 2/X

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 13 23:18:22 2013 New Revision: 60655 URL: http://svn.reactos.org/svn/reactos?rev=60655&view=rev Log: [USETUP]: The STRING_CONSOLEFAIL1/2/3 are aimed to be printed with NtDisplayString, which will use InbvDisplayString. Therefore add \r with \n. Part 2/X Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/uk-UA.h Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1658,11 +1658,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = à¥§ ¯ãáª ¥ ª®¬¯îâêà "}, {STRING_CONSOLEFAIL1, - "â¢ àï¥â® ª®§®« â ¥ ¥¢ê§¬®¦®\n\n"}, + "â¢ àï¥â® ª®§®« â ¥ ¥¢ê§¬®¦®\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "®¢ á¥ á«ãç¢ ©- ç¥áâ® ¯à¨ ã¯®âà¥¡ USB ª« ¢¨ âãà \n"}, + "®¢ á¥ á«ãç¢ ©- ç¥áâ® ¯à¨ ã¯®âà¥¡ USB ª« ¢¨ âãà \r\n"}, {STRING_CONSOLEFAIL3, - "®¤¤àê¦ª â USB ¥ ¢á¥ ®é¥ ¥¯ê« \n"}, + "®¤¤àê¦ª â USB ¥ ¢á¥ ®é¥ ¥¯ê« \r\n"}, {STRING_FORMATTINGDISK, "¥ç¥ ä®à¬ â¨à ¥ ¤¨áª "}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1654,11 +1654,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Restartovat po¡ta"}, {STRING_CONSOLEFAIL1, - "Nelze otevý¡t konzoli\n\n"}, + "Nelze otevý¡t konzoli\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "NejbØ§nØjç¡ pý¡inou je pou§¡v n¡ USB kl vesnice\n"}, + "NejbØ§nØjç¡ pý¡inou je pou§¡v n¡ USB kl vesnice\r\n"}, {STRING_CONSOLEFAIL3, - "USB kl vesnice zat¡m nejsou plnØ podporov ny\n"}, + "USB kl vesnice zat¡m nejsou plnØ podporov ny\r\n"}, {STRING_FORMATTINGDISK, "Instalace form tuje disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1647,11 +1647,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Computer neu starten"}, {STRING_CONSOLEFAIL1, - "Konsole konnte nicht geffnet werden\n\n"}, + "Konsole konnte nicht geffnet werden\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Der hufigste Grund hierfr ist die Verwendung einer USB-Tastatur\n"}, + "Der hufigste Grund hierfr ist die Verwendung einer USB-Tastatur\r\n"}, {STRING_CONSOLEFAIL3, - "USB-Tastaturen werden noch nicht vollstndig untersttzt\n"}, + "USB-Tastaturen werden noch nicht vollstndig untersttzt\r\n"}, {STRING_FORMATTINGDISK, "Setup formatiert Ihre Festplatte"}, {STRING_CHECKINGDISK, 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] Sun Oct 13 23:18:22 2013 @@ -1670,11 +1670,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = §¤ ¡¡å¤© ¬§¦¢¦ ©«ã"}, {STRING_CONSOLEFAIL1, - "ç¤«¦ ¤ ¤¦ ®«å ¡¦¤©æ¢\n\n"}, + "ç¤«¦ ¤ ¤¦ ®«å ¡¦¤©æ¢\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, - " USB §¢¡«¨¦¢æ ¤ å¤ §¢ã¨àª ¬§¦©«¨ æ£¤ ¡æ£\n"}, + " USB §¢¡«¨¦¢æ ¤ å¤ §¢ã¨àª ¬§¦©«¨ æ£¤ ¡æ£\r\n"}, {STRING_FORMATTINGDISK, " ¡«á©«© £¦¨é¤ «¦ å©¡¦ ©ª"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1645,11 +1645,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Reboot computer"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGDISK, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1652,11 +1652,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Reiniciar el equipo"}, {STRING_CONSOLEFAIL1, - "Incapaz de abrir la consola\n\n"}, + "Incapaz de abrir la consola\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "La causa m s com£n es la utilizaci¢n de un teclado USB\n"}, + "La causa m s com£n es la utilizaci¢n de un teclado USB\r\n"}, {STRING_CONSOLEFAIL3, - "Los teclados USB aun no son soportados completamente\n"}, + "Los teclados USB aun no son soportados completamente\r\n"}, {STRING_FORMATTINGDISK, "El instalador est formateando su disco"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1643,11 +1643,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Taaskivita arvuti"}, {STRING_CONSOLEFAIL1, - "Konsooli ei ännestunud avada\n\n"}, + "Konsooli ei ännestunud avada\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Täenoliselt on probleem USB klaviatuuri kasutamises\n"}, + "Täenoliselt on probleem USB klaviatuuri kasutamises\r\n"}, {STRING_CONSOLEFAIL3, - "USB klaviatuurid ei ole veel toetatud\n"}, + "USB klaviatuurid ei ole veel toetatud\r\n"}, {STRING_FORMATTINGDISK, "Kävaketta vormindamine"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1659,11 +1659,11 @@ {STRING_REBOOTCOMPUTER2, " ENTRE = Redmarrer l'ordinateur"}, {STRING_CONSOLEFAIL1, - "Impossible d'ouvrir la console\n\n"}, + "Impossible d'ouvrir la console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "La cause propbable est l'utilisation d'un clavier USB\n"}, + "La cause probable est l'utilisation d'un clavier USB\r\n"}, {STRING_CONSOLEFAIL3, - "Les claviers USB ne sont pas compltement supports actuellement\n"}, + "Les claviers USB ne sont pas compltement supports actuellement\r\n"}, {STRING_FORMATTINGDISK, "Setup formate votre disque"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1646,11 +1646,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = "}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGDISK, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1647,11 +1647,11 @@ {STRING_REBOOTCOMPUTER2, " INVIO = Riavvia il computer"}, {STRING_CONSOLEFAIL1, - "Impossibile aprire la console\n\n"}, + "Impossibile aprire la console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "La causa pi frequente di questo l'uso di una tastiera USB\n"}, + "La causa pi frequente di questo l'uso di una tastiera USB\r\n"}, {STRING_CONSOLEFAIL3, - "le tastiere USB non sono ancora completamente supportate\n"}, + "le tastiere USB non sono ancora completamente supportate\r\n"}, {STRING_FORMATTINGDISK, "Setup sta formattando il disco"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1646,11 +1646,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = ºÝËß°ÀÉ »²·ÄÞ³"}, {STRING_CONSOLEFAIL1, - "ºÝ¿°Ù¦ µ°ÌßÝ ÃÞ·Ï¾Ý\n\n"}, + "ºÝ¿°Ù¦ µ°ÌßÝ ÃÞ·Ï¾Ý\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "²¯ÊßÝÃ·Å ¹ÞÝ²Ý Ä¼Ã USB ·°ÎÞ°ÄÞ ¦ Â¶¯Ã ²ÙºÄ¶Þ ¶Ý¶Þ´×Ú Ï½\n"}, + "²¯ÊßÝÃ·Å ¹ÞÝ²Ý Ä¼Ã USB ·°ÎÞ°ÄÞ ¦ Â¶¯Ã ²ÙºÄ¶Þ ¶Ý¶Þ´×Ú Ï½\r\n"}, {STRING_CONSOLEFAIL3, - "USB ·°ÎÞ°ÄÞ Ê ÏÀÞ ¶Ý¾ÞÝÆ »Îß°Ä »ÚÃ ²Ï¾Ý\n"}, + "USB ·°ÎÞ°ÄÞ Ê ÏÀÞ ¶Ý¾ÞÝÆ »Îß°Ä »ÚÃ ²Ï¾Ý\r\n"}, {STRING_FORMATTINGDISK, "¾¯Ä±¯ÌßÊ ÃÞ¨½¸¦ Ì«°Ï¯Ä ¼Ã²Ï½"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1656,11 +1656,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Reboot computer"}, {STRING_CONSOLEFAIL1, - "Unable to open the console\n\n"}, + "Unable to open the console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "The most common cause of this is using an USB keyboard\n"}, + "The most common cause of this is using an USB keyboard\r\n"}, {STRING_CONSOLEFAIL3, - "USB keyboards are not fully supported yet\n"}, + "USB keyboards are not fully supported yet\r\n"}, {STRING_FORMATTINGDISK, "Setup is formatting your disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1691,11 +1691,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Computer opnieuw opstarten"}, {STRING_CONSOLEFAIL1, - "Kan console niet openen.\n\n"}, + "Kan console niet openen.\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "De meest voorkomende oorzaak is het gebruik van een USB toetsenbord.\n"}, + "De meest voorkomende oorzaak is het gebruik van een USB toetsenbord.\r\n"}, {STRING_CONSOLEFAIL3, - "USB toetsenborden worden nog niet volledig ondersteund.\n"}, + "USB toetsenborden worden nog niet volledig ondersteund.\r\n"}, {STRING_FORMATTINGDISK, "Setup is de vaste schijf aan het formatteren."}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1655,11 +1655,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Restart komputera"}, {STRING_CONSOLEFAIL1, - "Otwarcie konsoli nieudane\n\n"}, + "Otwarcie konsoli nieudane\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB.\n"}, + "Najcz©stsz¥ tego przyczyn¥ jest u¾ycie klawiatury USB.\r\n"}, {STRING_CONSOLEFAIL3, - "Nie s¥ obecnie w peni obsugiwane.\n"}, + "Nie s¥ obecnie w peni obsugiwane.\r\n"}, {STRING_FORMATTINGDISK, "Instalator formatuje tw¢j dysk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1682,11 +1682,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER=Reiniciar"}, {STRING_CONSOLEFAIL1, - "NÆo foi poss¡vel abrir o console\n\n"}, + "NÆo foi poss¡vel abrir o console\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "A causa mais com£m a utilizaÆo de um teclado USB\n"}, + "A causa mais com£m a utilizaÆo de um teclado USB\r\n"}, {STRING_CONSOLEFAIL3, - "Os teclados USB ainda nÆo sÆo completamente suportados\n"}, + "Os teclados USB ainda nÆo sÆo completamente suportados\r\n"}, {STRING_FORMATTINGDISK, "O instalador est formatando o disco"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1723,11 +1723,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Repornire calculator"}, {STRING_CONSOLEFAIL1, - "Nu se poate deschide consola\n\n"}, + "Nu se poate deschide consola\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Cea mai frecventÇ cauzÇ pentru asta este utilizarea unei tastaturi USB\n"}, + "Cea mai frecventÇ cauzÇ pentru asta este utilizarea unei tastaturi USB\r\n"}, {STRING_CONSOLEFAIL3, - "Tastaturile USB ncÇ nu sunt complet suportate\n"}, + "Tastaturile USB ncÇ nu sunt complet suportate\r\n"}, {STRING_FORMATTINGDISK, "Formatarea discului"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1647,11 +1647,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = ¥à¥§ £àã§ª "}, {STRING_CONSOLEFAIL1, - "¥ ã¤ «®áì ®âªàëâì ª®á®«ì\n\n"}, + "¥ ã¤ «®áì ®âªàëâì ª®á®«ì\r\n\r\n"}, {STRING_CONSOLEFAIL2, - " ¨¡®«¥¥ ¢¥à®ïâ ï ¯à¨ç¨ íâ®£® - ¨á¯®«ì§®¢ ¨¥ USB-ª« ¢¨ âãàë\n"}, + " ¨¡®«¥¥ ¢¥à®ïâ ï ¯à¨ç¨ íâ®£® - ¨á¯®«ì§®¢ ¨¥ USB-ª« ¢¨ âãàë\r\n"}, {STRING_CONSOLEFAIL3, - "USB ª« ¢¨ âãàë á¥©ç á ¯®¤¤¥à¦¨¢ îâáï ¥ ¯®«®áâìî\n"}, + "USB ª« ¢¨ âãàë á¥©ç á ¯®¤¤¥à¦¨¢ îâáï ¥ ¯®«®áâìî\r\n"}, {STRING_FORMATTINGDISK, "à®£à ¬¬ ãáâ ®¢ª¨ ä®à¬ â¨àã¥â ¢ è ¤¨áª"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1657,11 +1657,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Reçtart po¡taa"}, {STRING_CONSOLEFAIL1, - "Nemo§no otvori konzolu\n\n"}, + "Nemo§no otvori konzolu\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Najbe§nejçou pr¡inou tohto je pou§itie USB kl vesnice\n"}, + "Najbe§nejçou pr¡inou tohto je pou§itie USB kl vesnice\r\n"}, {STRING_CONSOLEFAIL3, - "USB kl vesnica eçte nie je plne podporovan \n"}, + "USB kl vesnica eçte nie je plne podporovan \r\n"}, {STRING_FORMATTINGDISK, "Inçtal tor form tuje V ç disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1652,11 +1652,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = Starta om datorn"}, {STRING_CONSOLEFAIL1, - "Det gr inte ppna Konsollen\n\n"}, + "Det gr inte ppna Konsollen\r\n\r\n"}, {STRING_CONSOLEFAIL2, - "Den vanligaste orsaken till detta r att ett USB tangentbord anvnds\n"}, + "Den vanligaste orsaken till detta r att ett USB tangentbord anvnds\r\n"}, {STRING_CONSOLEFAIL3, - "USB tangentbord r itne helt sttt n\n"}, + "USB tangentbord r itne helt sttt n\r\n"}, {STRING_FORMATTINGDISK, "Setup formaterar din disk"}, {STRING_CHECKINGDISK, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Sun Oct 13 23:18:22 2013 @@ -1652,11 +1652,11 @@ {STRING_REBOOTCOMPUTER2, " ENTER = ¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"}, {STRING_CONSOLEFAIL1, - "¥ ¢¤ «®áì ¢i¤ªà¨â¨ ª®á®«ì\n\n"}, + "¥ ¢¤ «®áì ¢i¤ªà¨â¨ ª®á®«ì\r\n\r\n"}, {STRING_CONSOLEFAIL2, - " ©¡i«ìè ©¬®¢ià ¯à¨ç¨ æì®£® - ¢¨ª®à¨áâ ï USB ª« ¢i âãà¨\n"}, + " ©¡i«ìè ©¬®¢ià ¯à¨ç¨ æì®£® - ¢¨ª®à¨áâ ï USB ª« ¢i âãà¨\r\n"}, {STRING_CONSOLEFAIL3, - "USB ª« ¢i âãà¨ é¥ ¥ ¯i¤âà¨¬ãîâìáï ¯®¢iáâî\n"}, + "USB ª« ¢i âãà¨ é¥ ¥ ¯i¤âà¨¬ãîâìáï ¯®¢iáâî\r\n"}, {STRING_FORMATTINGDISK, "áâ ®¢«î¢ ç ä®à¬ âãó ¢ è ¤¨áª"}, {STRING_CHECKINGDISK,

11 years, 2 months

[akhaldi] 60654: [FREELDR] * Use the FrLdr prefix with the heap functions to avoid any ambiguities.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 13 23:14:40 2013 New Revision: 60654 URL: http://svn.reactos.org/svn/reactos?rev=60654&view=rev Log: [FREELDR] * Use the FrLdr prefix with the heap functions to avoid any ambiguities. Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/fat.c trunk/reactos/boot/freeldr/freeldr/include/mm.h trunk/reactos/boot/freeldr/freeldr/mm/heap.c trunk/reactos/boot/freeldr/freeldr/windows/winldr.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -866,7 +866,9 @@ TRACE("Ext2ReadPartialBlock() BlockNumber = %d StartingOffset = %d Length = %d Buffer = 0x%x\n", BlockNumber, StartingOffset, Length, Buffer); - TempBuffer = HeapAllocate(FrLdrTempHeap, Ext2BlockSizeInBytes, '2TXE'); + TempBuffer = FrLdrHeapAllocate(FrLdrTempHeap, + Ext2BlockSizeInBytes, + '2TXE'); if (!Ext2ReadBlock(BlockNumber, TempBuffer)) { @@ -875,7 +877,7 @@ memcpy(Buffer, ((PUCHAR)TempBuffer + StartingOffset), Length); - HeapFree(FrLdrTempHeap, TempBuffer, '2TXE'); + FrLdrHeapFree(FrLdrTempHeap, TempBuffer, '2TXE'); return TRUE; } @@ -1098,9 +1100,9 @@ BlockPointersPerBlock = Ext2BlockSizeInBytes / sizeof(ULONG); - BlockBuffer = HeapAllocate(FrLdrTempHeap, - Ext2BlockSizeInBytes, - '2TXE'); + BlockBuffer = FrLdrHeapAllocate(FrLdrTempHeap, + Ext2BlockSizeInBytes, + '2TXE'); if (!BlockBuffer) { return FALSE; @@ -1117,7 +1119,7 @@ (*CurrentBlockInList)++; } - HeapFree(FrLdrTempHeap, BlockBuffer, '2TXE'); + FrLdrHeapFree(FrLdrTempHeap, BlockBuffer, '2TXE'); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/fa… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -911,7 +911,9 @@ //TRACE("FatGetFatEntry() Retrieving FAT entry for cluster %d.\n", Cluster); // We need a buffer for 2 secors - ReadBuffer = HeapAllocate(FrLdrTempHeap, 2 * Volume->BytesPerSector, 'xTAF'); + ReadBuffer = FrLdrHeapAllocate(FrLdrTempHeap, + 2 * Volume->BytesPerSector, + 'xTAF'); if (!ReadBuffer) { return FALSE; @@ -997,7 +999,7 @@ //TRACE("FAT entry is 0x%x.\n", fat); - HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); + FrLdrHeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); *ClusterPointer = fat; @@ -1181,7 +1183,7 @@ // Calculate rounded up read size ReadSize = SectorCount * Volume->BytesPerSector; - ReadBuffer = HeapAllocate(FrLdrTempHeap, ReadSize, 'xTAF'); + ReadBuffer = FrLdrHeapAllocate(FrLdrTempHeap, ReadSize, 'xTAF'); if (!ReadBuffer) { return FALSE; @@ -1193,7 +1195,7 @@ status = TRUE; } - HeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); + FrLdrHeapFree(FrLdrTempHeap, ReadBuffer, 'xTAF'); return status; } Modified: trunk/reactos/boot/freeldr/freeldr/include/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/mm.h [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -125,34 +125,33 @@ extern PVOID FrLdrTempHeap; PVOID -HeapCreate( +FrLdrHeapCreate( SIZE_T MaximumSize, TYPE_OF_MEMORY MemoryType); VOID -HeapDestroy( +FrLdrHeapDestroy( PVOID HeapHandle); VOID -HeapRelease( +FrLdrHeapRelease( PVOID HeapHandle); VOID -HeapVerify( +FrLdrHeapVerify( PVOID HeapHandle); VOID -HeapCleanupAll(VOID); +FrLdrHeapCleanupAll(VOID); PVOID -HeapAllocate( +FrLdrHeapAllocate( PVOID HeapHandle, SIZE_T ByteSize, ULONG Tag); VOID -HeapFree( +FrLdrHeapFree( PVOID HeapHandle, PVOID Pointer, ULONG Tag); - Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap.c [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -66,7 +66,7 @@ } HEAP, *PHEAP; PVOID -HeapCreate( +FrLdrHeapCreate( SIZE_T MaximumSize, TYPE_OF_MEMORY MemoryType) { @@ -137,7 +137,7 @@ } VOID -HeapDestroy( +FrLdrHeapDestroy( PVOID HeapHandle) { PHEAP Heap = HeapHandle; @@ -151,7 +151,7 @@ #ifdef FREELDR_HEAP_VERIFIER VOID -HeapVerify( +FrLdrHeapVerify( PVOID HeapHandle) { PHEAP Heap = HeapHandle; @@ -176,7 +176,7 @@ #endif /* FREELDR_HEAP_VERIFIER */ VOID -HeapRelease( +FrLdrHeapRelease( PVOID HeapHandle) { PHEAP Heap = HeapHandle; @@ -242,7 +242,7 @@ } VOID -HeapCleanupAll(VOID) +FrLdrHeapCleanupAll(VOID) { PHEAP Heap; @@ -257,7 +257,7 @@ /* Release fre pages */ - HeapRelease(FrLdrDefaultHeap); + FrLdrHeapRelease(FrLdrDefaultHeap); Heap = FrLdrTempHeap; TRACE("Heap statistics for temp heap:\n" @@ -267,11 +267,11 @@ Heap->NumAllocs, Heap->NumFrees); /* Destroy the heap */ - HeapDestroy(FrLdrTempHeap); + FrLdrHeapDestroy(FrLdrTempHeap); } static VOID -HeapRemoveFreeList( +FrLdrHeapRemoveFreeList( PHEAP Heap, PHEAP_BLOCK Block) { @@ -289,7 +289,7 @@ } static VOID -HeapInsertFreeList( +FrLdrHeapInsertFreeList( PHEAP Heap, PHEAP_BLOCK FreeBlock) { @@ -311,7 +311,7 @@ } PVOID -HeapAllocate( +FrLdrHeapAllocate( PVOID HeapHandle, SIZE_T ByteSize, ULONG Tag) @@ -323,7 +323,7 @@ #ifdef FREELDR_HEAP_VERIFIER /* Verify the heap */ - HeapVerify(HeapHandle); + FrLdrHeapVerify(HeapHandle); /* Add space for a size field and 2 redzones */ ByteSize += REDZONE_ALLOCATION; @@ -357,7 +357,7 @@ Block->Tag = Tag; /* Remove this entry from the free list */ - HeapRemoveFreeList(Heap, Block); + FrLdrHeapRemoveFreeList(Heap, Block); /* Calculate the remaining size */ Remaining = Block->Size - BlockSize; @@ -376,7 +376,7 @@ NextBlock->Size = Remaining - 1; NextBlock->PreviousSize = BlockSize; BlockSize = NextBlock->Size; - HeapInsertFreeList(Heap, NextBlock); + FrLdrHeapInsertFreeList(Heap, NextBlock); /* Advance to the next block */ NextBlock = NextBlock + 1 + BlockSize; @@ -426,7 +426,7 @@ } VOID -HeapFree( +FrLdrHeapFree( PVOID HeapHandle, PVOID Pointer, ULONG Tag) @@ -439,7 +439,7 @@ #ifdef FREELDR_HEAP_VERIFIER /* Verify the heap */ - HeapVerify(HeapHandle); + FrLdrHeapVerify(HeapHandle); #endif /* Check if the block is really inside this heap */ @@ -485,7 +485,7 @@ { /* Merge next block into current */ Block->Size += NextBlock->Size + 1; - HeapRemoveFreeList(Heap, NextBlock); + FrLdrHeapRemoveFreeList(Heap, NextBlock); NextBlock = Block + Block->Size + 1; } @@ -501,7 +501,7 @@ else { /* Insert the entry into the free list */ - HeapInsertFreeList(Heap, Block); + FrLdrHeapInsertFreeList(Heap, Block); } /* Update the next block's back link */ @@ -519,11 +519,11 @@ TRACE("MmInitializeHeap()\n"); /* Create the default heap */ - FrLdrDefaultHeap = HeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap); + FrLdrDefaultHeap = FrLdrHeapCreate(DEFAULT_HEAP_SIZE, LoaderOsloaderHeap); ASSERT(FrLdrDefaultHeap); /* Create a temporary heap */ - FrLdrTempHeap = HeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary); + FrLdrTempHeap = FrLdrHeapCreate(TEMP_HEAP_SIZE, LoaderFirmwareTemporary); ASSERT(FrLdrTempHeap); TRACE("MmInitializeHeap() done, default heap %p, temp heap %p\n", @@ -533,13 +533,13 @@ PVOID MmHeapAlloc(SIZE_T MemorySize) { - return HeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM'); + return FrLdrHeapAllocate(FrLdrDefaultHeap, MemorySize, 'pHmM'); } VOID MmHeapFree(PVOID MemoryPointer) { - HeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); + FrLdrHeapFree(FrLdrDefaultHeap, MemoryPointer, 'pHmM'); } PVOID @@ -549,7 +549,7 @@ IN SIZE_T NumberOfBytes, IN ULONG Tag) { - return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); + return FrLdrHeapAllocate(FrLdrDefaultHeap, NumberOfBytes, Tag); } PVOID @@ -558,7 +558,7 @@ IN POOL_TYPE PoolType, IN SIZE_T NumberOfBytes) { - return HeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); + return FrLdrHeapAllocate(FrLdrDefaultHeap, NumberOfBytes, 0); } VOID @@ -566,7 +566,7 @@ ExFreePool( IN PVOID P) { - HeapFree(FrLdrDefaultHeap, P, 0); + FrLdrHeapFree(FrLdrDefaultHeap, P, 0); } VOID @@ -575,7 +575,7 @@ IN PVOID P, IN ULONG Tag) { - HeapFree(FrLdrDefaultHeap, P, Tag); + FrLdrHeapFree(FrLdrDefaultHeap, P, Tag); } PVOID @@ -587,7 +587,7 @@ { PVOID ptr; - ptr = HeapAllocate(FrLdrDefaultHeap, Size, ' ltR'); + ptr = FrLdrHeapAllocate(FrLdrDefaultHeap, Size, ' ltR'); if (ptr && (Flags & HEAP_ZERO_MEMORY)) { RtlZeroMemory(ptr, Size); @@ -603,7 +603,6 @@ IN ULONG Flags, IN PVOID HeapBase) { - HeapFree(FrLdrDefaultHeap, HeapBase, ' ltR'); + FrLdrHeapFree(FrLdrDefaultHeap, HeapBase, ' ltR'); return TRUE; } - Modified: trunk/reactos/boot/freeldr/freeldr/windows/winldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/winldr.c [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -144,9 +144,9 @@ PARC_DISK_SIGNATURE_EX ArcDiskSig; /* Allocate the ARC structure */ - ArcDiskSig = HeapAllocate(FrLdrDefaultHeap, - sizeof(ARC_DISK_SIGNATURE_EX), - 'giSD'); + ArcDiskSig = FrLdrHeapAllocate(FrLdrDefaultHeap, + sizeof(ARC_DISK_SIGNATURE_EX), + 'giSD'); /* Copy the data over */ ArcDiskSig->DiskSignature.Signature = reactos_arc_disk_info[i].Signature; Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Sun Oct 13 23:14:40 2013 @@ -188,7 +188,7 @@ //BOOLEAN Status; /* Cleanup heap */ - HeapCleanupAll(); + FrLdrHeapCleanupAll(); // // Creating a suitable memory map for Windows can be tricky, so let's

11 years, 2 months

[akhaldi] 60653: * Addendum to r60650. CORE-7471 #resolve

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Oct 13 23:12:09 2013 New Revision: 60653 URL: http://svn.reactos.org/svn/reactos?rev=60653&view=rev Log: * Addendum to r60650. CORE-7471 #resolve Modified: trunk/rostests/dibtests/alphablend/alphablend.rc trunk/rostests/dibtests/bitblt/bitblt.rc trunk/rostests/dibtests/icontest/icontest.rc trunk/rostests/kmtests/kmtest/kmtest.rc trunk/rostests/tests/carets/carets.rc trunk/rostests/tests/dirdlg/dirdlg.rc trunk/rostests/tests/mdi/mdi.rc trunk/rostests/tests/miditest/miditest.rc trunk/rostests/tests/popupmenu/popupmenu.rc trunk/rostests/win32/user32/kbdlayout/kbdlayout.rc Modified: trunk/rostests/dibtests/alphablend/alphablend.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/alphablend/alpha… ============================================================================== --- trunk/rostests/dibtests/alphablend/alphablend.rc [iso-8859-1] (original) +++ trunk/rostests/dibtests/alphablend/alphablend.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,3 +1,3 @@ -1000 BITMAP MOVEABLE PURE "lena.bmp" -2000 BITMAP MOVEABLE PURE "lenaalpha.bmp" +1000 BITMAP "lena.bmp" +2000 BITMAP "lenaalpha.bmp" Modified: trunk/rostests/dibtests/bitblt/bitblt.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/bitblt/bitblt.rc… ============================================================================== --- trunk/rostests/dibtests/bitblt/bitblt.rc [iso-8859-1] (original) +++ trunk/rostests/dibtests/bitblt/bitblt.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,2 +1 @@ -1000 BITMAP MOVEABLE PURE "lena.bmp" - +1000 BITMAP "lena.bmp" Modified: trunk/rostests/dibtests/icontest/icontest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/dibtests/icontest/icontes… ============================================================================== --- trunk/rostests/dibtests/icontest/icontest.rc [iso-8859-1] (original) +++ trunk/rostests/dibtests/icontest/icontest.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,4 +1,4 @@ #include <windows.h> #include "resource.h" -IDI_ICON ICON DISCARDABLE "icon.ico" +IDI_ICON ICON "icon.ico" Modified: trunk/rostests/kmtests/kmtest/kmtest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest/kmtest.rc?… ============================================================================== --- trunk/rostests/kmtests/kmtest/kmtest.rc [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest/kmtest.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -12,4 +12,4 @@ #define REACTOS_STR_ORIGINAL_FILENAME "kmtest.exe\0" #include <reactos/version.rc> -CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "kmtest/kmtest.exe.manifest" +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "kmtest/kmtest.exe.manifest" Modified: trunk/rostests/tests/carets/carets.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/carets/carets.rc?re… ============================================================================== --- trunk/rostests/tests/carets/carets.rc [iso-8859-1] (original) +++ trunk/rostests/tests/carets/carets.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,3 +1,3 @@ #include <windows.h> -1 BITMAP DISCARDABLE "caret.bmp" +1 BITMAP "caret.bmp" Modified: trunk/rostests/tests/dirdlg/dirdlg.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/dirdlg/dirdlg.rc?re… ============================================================================== --- trunk/rostests/tests/dirdlg/dirdlg.rc [iso-8859-1] (original) +++ trunk/rostests/tests/dirdlg/dirdlg.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -IDD_MAIN DIALOG DISCARDABLE 20, 20, 220, 140 +IDD_MAIN DIALOG 20, 20, 220, 140 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU FONT 8, "MS Sans Serif" CAPTION "Select a file" Modified: trunk/rostests/tests/mdi/mdi.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mdi/mdi.rc?rev=6065… ============================================================================== --- trunk/rostests/tests/mdi/mdi.rc [iso-8859-1] (original) +++ trunk/rostests/tests/mdi/mdi.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -IDR_MAINMENU MENU DISCARDABLE +IDR_MAINMENU MENU BEGIN POPUP "&File" BEGIN Modified: trunk/rostests/tests/miditest/miditest.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/miditest/miditest.r… ============================================================================== --- trunk/rostests/tests/miditest/miditest.rc [iso-8859-1] (original) +++ trunk/rostests/tests/miditest/miditest.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,6 +1,6 @@ #include <windows.h> -IDR_MAINMENU MENU DISCARDABLE +IDR_MAINMENU MENU BEGIN POPUP "&File" BEGIN Modified: trunk/rostests/tests/popupmenu/popupmenu.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/popupmenu/popupmenu… ============================================================================== --- trunk/rostests/tests/popupmenu/popupmenu.rc [iso-8859-1] (original) +++ trunk/rostests/tests/popupmenu/popupmenu.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -1,7 +1,7 @@ #include <windows.h> #include "resource.h" -IDM_MAINMENU MENU LOADONCALL MOVEABLE DISCARDABLE +IDM_MAINMENU MENU { POPUP "&File" { Modified: trunk/rostests/win32/user32/kbdlayout/kbdlayout.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/win32/user32/kbdlayout/kb… ============================================================================== --- trunk/rostests/win32/user32/kbdlayout/kbdlayout.rc [iso-8859-1] (original) +++ trunk/rostests/win32/user32/kbdlayout/kbdlayout.rc [iso-8859-1] Sun Oct 13 23:12:09 2013 @@ -26,7 +26,7 @@ // Dialog // -IDD_MAINDIALOG DIALOG DISCARDABLE 0, 0, 327, 194 +IDD_MAINDIALOG DIALOG 0, 0, 327, 194 STYLE DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU CAPTION "Keyboard layout test" FONT 8, "MS Sans Serif" @@ -87,7 +87,7 @@ // #ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE +GUIDELINES DESIGNINFO BEGIN IDD_MAINDIALOG, DIALOG BEGIN @@ -106,18 +106,18 @@ // TEXTINCLUDE // -1 TEXTINCLUDE DISCARDABLE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE DISCARDABLE +2 TEXTINCLUDE BEGIN "#include ""afxres.h""\r\n" "\0" END -3 TEXTINCLUDE DISCARDABLE +3 TEXTINCLUDE BEGIN "\r\n" "\0"

11 years, 2 months

[hbelusca] 60652: [NTOS]: Move 'buffer' to a better place (i.e. fix build).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Oct 13 23:07:26 2013 New Revision: 60652 URL: http://svn.reactos.org/svn/reactos?rev=60652&view=rev Log: [NTOS]: Move 'buffer' to a better place (i.e. fix build). Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdbg.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdbg.c [iso-8859-1] Sun Oct 13 23:07:26 2013 @@ -53,7 +53,6 @@ IN ULONG ComPortNumber) { NTSTATUS Status; - CHAR buffer[80]; #if 0 // Deactivated because never used in fact (was in KdPortInitialize but we use KdPortInitializeEx) /* @@ -109,6 +108,8 @@ else { #ifndef NDEBUG + CHAR buffer[80]; + /* Print message to blue screen */ sprintf(buffer, "\r\nKernel Debugger: Serial port found: COM%ld (Port 0x%lx) BaudRate %ld\r\n\r\n",

11 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
33
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 October 2013