Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[dquintana] 63313: [WIN32k/NTUSER] * Make the conditions actually check what was intended.

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 16 11:14:04 2014 New Revision: 63313 URL: http://svn.reactos.org/svn/reactos?rev=63313&view=rev Log: [WIN32k/NTUSER] * Make the conditions actually check what was intended. Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -240,9 +240,9 @@ (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + Window->spwndOwner == NULL && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) { // FIXME lParam; The value is TRUE if the window is in full-screen mode, or FALSE otherwise. co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (WPARAM) UserHMGetHandle(Window), FALSE); Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -2429,9 +2429,9 @@ /* Notify the shell that a new window was created */ if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + Window->spwndOwner == NULL && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); } Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -1881,10 +1881,10 @@ } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + if (Window->spwndParent == UserGetDesktopWindow() && + Window->spwndOwner == NULL && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 );

10 years, 7 months

[dquintana] 63312: [RSHELL] * Fix shell menus closing when clicking on the frame/banner. CORE-7586

by dquintana＠svn.reactos.org

Author: dquintana Date: Fri May 16 11:12:51 2014 New Revision: 63312 URL: http://svn.reactos.org/svn/reactos?rev=63312&view=rev Log: [RSHELL] * Fix shell menus closing when clicking on the frame/banner. CORE-7586 Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.cpp [iso-8859-1] Fri May 16 11:12:51 2014 @@ -212,13 +212,13 @@ { ::SetCapture(child); m_captureHwnd = child; - TRACE("MouseTrack is now capturing %p\n", child); + DbgPrint("MouseTrack is now capturing %p\n", child); } else { ::ReleaseCapture(); m_captureHwnd = NULL; - TRACE("MouseTrack is now off\n"); + DbgPrint("MouseTrack is now off\n"); } } @@ -250,6 +250,40 @@ return S_FALSE; } +HRESULT CMenuFocusManager::IsTrackedWindowOrParent(HWND hWnd) +{ + for (int i = m_bandCount; --i >= 0;) + { + StackEntry& entry = m_bandStack[i]; + + if (entry.type != TrackedMenuEntry) + { + HRESULT hr = entry.mb->IsWindowOwner(hWnd); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + if (hr == S_OK) + return S_OK; + if (entry.mb->_IsPopup() == S_OK) + { + CComPtr<IUnknown> site; + CComPtr<IOleWindow> pw; + hr = entry.mb->GetSite(IID_PPV_ARG(IUnknown, &site)); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + hr = IUnknown_QueryService(site, SID_SMenuBandParent, IID_PPV_ARG(IOleWindow, &pw)); + if (FAILED_UNEXPECTEDLY(hr)) + continue; + + HWND hParent; + if (pw->GetWindow(&hParent) == S_OK && hParent == hWnd) + return S_OK; + } + } + } + + return S_FALSE; +} + LRESULT CMenuFocusManager::ProcessMouseMove(MSG* msg) { HWND child; @@ -284,7 +318,7 @@ if (SendMessage(child, WM_USER_ISTRACKEDITEM, iHitTestResult, 0) == S_FALSE) { - TRACE("Hot item tracking detected a change (capture=%p)...\n", m_captureHwnd); + DbgPrint("Hot item tracking detected a change (capture=%p / cCapture=%p)...\n", m_captureHwnd, cCapture); DisableMouseTrack(NULL, FALSE); if (isTracking && iHitTestResult>=0 && m_current->type == TrackedMenuEntry) SendMessage(entry->hwnd, WM_CANCELMODE, 0, 0); @@ -359,13 +393,13 @@ callNext = ProcessMouseMove(msg); break; case WM_INITMENUPOPUP: - TRACE("WM_INITMENUPOPUP %p %p\n", msg->wParam, msg->lParam); + DbgPrint("WM_INITMENUPOPUP %p %p\n", msg->wParam, msg->lParam); m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam); m_selectedItem = -1; m_selectedItemFlags = 0; break; case WM_MENUSELECT: - TRACE("WM_MENUSELECT %p %p\n", msg->wParam, msg->lParam); + DbgPrint("WM_MENUSELECT %p %p\n", msg->wParam, msg->lParam); m_selectedMenu = reinterpret_cast<HMENU>(msg->lParam); m_selectedItem = GET_X_LPARAM(msg->wParam); m_selectedItemFlags = HIWORD(msg->wParam); @@ -415,7 +449,7 @@ { HWND child = WindowFromPoint(pt); - if (IsTrackedWindow(child) != S_OK) + if (IsTrackedWindowOrParent(child) != S_OK) { SetCapture(NULL); m_current->mb->_MenuItemHotTrack(MPOS_FULLCANCEL); @@ -476,12 +510,12 @@ { if (m_current->type == TrackedMenuEntry) { - TRACE("Entering MSGFILTER hook...\n"); + DbgPrint("Entering MSGFILTER hook...\n"); m_hMsgFilterHook = SetWindowsHookEx(WH_MSGFILTER, s_MsgFilterHook, NULL, m_threadId); } else { - TRACE("Entering GETMESSAGE hook...\n"); + DbgPrint("Entering GETMESSAGE hook...\n"); m_hGetMsgHook = SetWindowsHookEx(WH_GETMESSAGE, s_GetMsgHook, NULL, m_threadId); } return S_OK; @@ -489,7 +523,7 @@ HRESULT CMenuFocusManager::RemoveHooks() { - TRACE("Removing all hooks...\n"); + DbgPrint("Removing all hooks...\n"); if (m_hMsgFilterHook) UnhookWindowsHookEx(m_hMsgFilterHook); if (m_hGetMsgHook) @@ -627,7 +661,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return hr; - TRACE("PushTrackedPopup %p\n", popup); + DbgPrint("PushTrackedPopup %p\n", popup); m_selectedMenu = popup; m_selectedItem = -1; m_selectedItemFlags = 0; Modified: branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/rs… ============================================================================== --- branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/rshell/CMenuFocusManager.h [iso-8859-1] Fri May 16 11:12:51 2014 @@ -103,6 +103,7 @@ HRESULT RemoveHooks(); HRESULT UpdateFocus(); HRESULT IsTrackedWindow(HWND hWnd, StackEntry ** pentry = NULL); + HRESULT IsTrackedWindowOrParent(HWND hWnd); void DisableMouseTrack(HWND parent, BOOL disableThis); void SetCapture(HWND child);

10 years, 7 months

[hbelusca] 63311: [NTVDM] Implement INT 21h, AH=5Ch "Lock/Unlock Region of File".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 16 00:56:46 2014 New Revision: 63311 URL: http://svn.reactos.org/svn/reactos?rev=63311&view=rev Log: [NTVDM] Implement INT 21h, AH=5Ch "Lock/Unlock Region of File". Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 16 00:56:46 2014 @@ -2622,6 +2622,59 @@ break; } + /* Lock/Unlock Region of File */ + case 0x5C: + { + HANDLE Handle = DosGetRealHandle(getBX()); + + if (Handle == INVALID_HANDLE_VALUE) + { + /* The handle is invalid */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ERROR_INVALID_HANDLE); + break; + } + + if (getAL() == 0x00) + { + /* Lock region of file */ + if (LockFile(Handle, + MAKELONG(getCX(), getDX()), 0, + MAKELONG(getSI(), getDI()), 0)) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + } + } + else if (getAL() == 0x01) + { + /* Unlock region of file */ + if (UnlockFile(Handle, + MAKELONG(getCX(), getDX()), 0, + MAKELONG(getSI(), getDI()), 0)) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + } + } + else + { + /* Invalid subfunction */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ERROR_INVALID_FUNCTION); + } + + break; + } + /* Canonicalize File Name or Path */ case 0x60: {

10 years, 7 months

[hbelusca] 63310: [NTVDM] Partially implement INT 21h, AH=60h -- "Canonicalize File Name or Path".

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri May 16 00:34:54 2014 New Revision: 63310 URL: http://svn.reactos.org/svn/reactos?rev=63310&view=rev Log: [NTVDM] Partially implement INT 21h, AH=60h -- "Canonicalize File Name or Path". Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Fri May 16 00:34:54 2014 @@ -2625,7 +2625,36 @@ /* Canonicalize File Name or Path */ case 0x60: { - // TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + /* + * See Ralf Brown: http://www.ctyme.com/intr/rb-3137.htm + * for more information. + */ + + /* + * We suppose that the DOS app gave to us a valid + * 128-byte long buffer for the canonicalized name. + */ + DWORD dwRetVal = GetFullPathNameA(SEG_OFF_TO_PTR(getDS(), getSI()), + 128, + SEG_OFF_TO_PTR(getES(), getDI()), + NULL); + if (dwRetVal == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + } + else + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setAX(0x0000); + } + + // FIXME: Convert the full path name into short version. + // We cannot reliably use GetShortPathName, because it fails + // if the path name given doesn't exist. However this DOS + // function AH=60h should be able to work even for non-existing + // path and file names. + break; }

10 years, 7 months

[hbelusca] 63309: [NTVDM] - Add some diagnostic DPRINTs (they are off by default), and fix few of them. - Fix/complete few comments. - Implement INT 21h, AH=56h (rename file), 5Ah (create temporary...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 15 23:13:06 2014 New Revision: 63309 URL: http://svn.reactos.org/svn/reactos?rev=63309&view=rev Log: [NTVDM] - Add some diagnostic DPRINTs (they are off by default), and fix few of them. - Fix/complete few comments. - Implement INT 21h, AH=56h (rename file), 5Ah (create temporary file), 5Bh (create new file), 68h and 6Ah ("commit" aka. flush file; they are the same function). - Stubplement INT 21h, AH=60h (canonicalize file name or path) and 6Ch (extended open or create file). For this latest one I will merge DosCreateFile and DosOpenFile into the same function (in fact a wrapper around CreateFileA, that is used both for creating and opening files). Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/bios.c [iso-8859-1] Thu May 15 23:13:06 2014 @@ -1,8 +1,8 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: dos.c - * PURPOSE: VDM DOS Kernel + * FILE: dos/dos32krnl/bios.c + * PURPOSE: DOS32 Bios * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -30,6 +30,8 @@ { CHAR Character = '\0'; WORD BytesRead; + + DPRINT("DosReadCharacter\n"); /* Use the file reading function */ DosReadFile(FileHandle, &Character, 1, &BytesRead); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Thu May 15 23:13:06 2014 @@ -2,8 +2,9 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: dos/dos32krnl/dos.c - * PURPOSE: VDM DOS Kernel + * PURPOSE: DOS32 Kernel * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -1436,13 +1437,16 @@ /* Read Character from STDIN with Echo */ case 0x01: { + DPRINT("INT 21h, AH = 01h\n"); + // FIXME: Under DOS 2+, input / output handle may be redirected!!!! DoEcho = TRUE; Character = DosReadCharacter(DOS_INPUT_HANDLE); DoEcho = FALSE; - // /* Let the BOP repeat if needed */ - // if (getCF()) break; + // FIXME: Check whether Ctrl-C / Ctrl-Break is pressed, and call INT 23h if so. + // Check also Ctrl-P and set echo-to-printer flag. + // Ctrl-Z is not interpreted. setAL(Character); break; @@ -1536,6 +1540,8 @@ case 0x07: case 0x08: { + DPRINT("Char input without echo\n"); + // FIXME: Under DOS 2+, input handle may be redirected!!!! Character = DosReadCharacter(DOS_INPUT_HANDLE); @@ -1566,7 +1572,7 @@ * See Ralf Brown: http://www.ctyme.com/intr/rb-2562.htm * for more information. */ - setAL('$'); + setAL('$'); // *String break; } @@ -1576,7 +1582,7 @@ WORD Count = 0; InputBuffer = (PDOS_INPUT_BUFFER)SEG_OFF_TO_PTR(getDS(), getDX()); - DPRINT1("Read Buffered Input\n"); + DPRINT("Read Buffered Input\n"); while (Count < InputBuffer->MaxLength) { @@ -1584,13 +1590,16 @@ /* Try to read a character (wait) */ Character = DosReadCharacter(DOS_INPUT_HANDLE); + + // FIXME: Check whether Ctrl-C / Ctrl-Break is pressed, and call INT 23h if so. /* Echo the character and append it to the buffer */ DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); InputBuffer->Buffer[Count] = Character; + Count++; /* Carriage returns are also counted */ + if (Character == '\r') break; - Count++; } /* Update the length */ @@ -1623,13 +1632,9 @@ InputFunction == 0x07 || InputFunction == 0x08 || InputFunction == 0x0A) { + /* Call ourselves recursively */ setAH(InputFunction); - /* - * Instead of calling ourselves really recursively as in: - * DosInt21h(Stack); - * prefer resetting the CF flag to let the BOP repeat. - */ - setCF(1); + DosInt21h(Stack); } break; } @@ -1737,7 +1742,7 @@ /* Create New PSP */ case 0x26: { - DPRINT1("INT 21h, 26h - Create New PSP is UNIMPLEMENTED\n"); + DPRINT1("INT 21h, AH = 26h - Create New PSP is UNIMPLEMENTED\n"); break; } @@ -1993,15 +1998,16 @@ break; } - /* Create File */ + /* Create or Truncate File */ case 0x3C: { WORD FileHandle; WORD ErrorCode = DosCreateFile(&FileHandle, (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()), + CREATE_ALWAYS, getCX()); - if (ErrorCode == 0) + if (ErrorCode == ERROR_SUCCESS) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; setAX(FileHandle); @@ -2023,7 +2029,7 @@ (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()), getAL()); - if (ErrorCode == 0) + if (ErrorCode == ERROR_SUCCESS) { Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; setAX(FileHandle); @@ -2058,6 +2064,8 @@ { WORD BytesRead = 0; WORD ErrorCode; + + DPRINT("INT 21h, AH = 3Fh\n"); DoEcho = TRUE; ErrorCode = DosReadFile(getBX(), @@ -2468,6 +2476,30 @@ break; } + /* Rename File */ + case 0x56: + { + LPSTR ExistingFileName = (LPSTR)SEG_OFF_TO_PTR(getDS(), getDX()); + LPSTR NewFileName = (LPSTR)SEG_OFF_TO_PTR(getES(), getDI()); + + /* + * See Ralf Brown: http://www.ctyme.com/intr/rb-2990.htm + * for more information. + */ + + if (MoveFileA(ExistingFileName, NewFileName)) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + } + + break; + } + /* Get/Set Memory Management Options */ case 0x58: { @@ -2524,6 +2556,79 @@ break; } + /* Create Temporary File */ + case 0x5A: + { + LPSTR PathName = (LPSTR)SEG_OFF_TO_PTR(getDS(), getDX()); + LPSTR FileName = PathName; // The buffer for the path and the full file name is the same. + UINT uRetVal; + WORD FileHandle; + WORD ErrorCode; + + /* + * See Ralf Brown: http://www.ctyme.com/intr/rb-3014.htm + * for more information. + */ + + // FIXME: Check for buffer validity? + // It should be a ASCIZ path ending with a '\' + 13 zero bytes + // to receive the generated filename. + + /* First create the temporary file */ + uRetVal = GetTempFileNameA(PathName, NULL, 0, FileName); + if (uRetVal == 0) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + break; + } + + /* Now try to open it in read/write access */ + ErrorCode = DosOpenFile(&FileHandle, FileName, 2); + if (ErrorCode == ERROR_SUCCESS) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setAX(FileHandle); + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ErrorCode); + } + + break; + } + + /* Create New File */ + case 0x5B: + { + WORD FileHandle; + WORD ErrorCode = DosCreateFile(&FileHandle, + (LPCSTR)SEG_OFF_TO_PTR(getDS(), getDX()), + CREATE_NEW, + getCX()); + + if (ErrorCode == ERROR_SUCCESS) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + setAX(FileHandle); + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ErrorCode); + } + + break; + } + + /* Canonicalize File Name or Path */ + case 0x60: + { + // TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + break; + } + /* Set Handle Count */ case 0x67: { @@ -2533,6 +2638,50 @@ setAX(DosLastError); } else Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + + break; + } + + /* Commit File */ + case 0x68: + case 0x6A: + { + /* + * Function 6Ah is identical to function 68h, + * and sets AH to 68h if success. + * See Ralf Brown: http://www.ctyme.com/intr/rb-3176.htm + * for more information. + */ + setAH(0x68); + + if (DosFlushFileBuffers(getBX())) + { + Stack[STACK_FLAGS] &= ~EMULATOR_FLAG_CF; + } + else + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(GetLastError()); + } + + break; + } + + /* Extended Open/Create */ + case 0x6C: + { + /* Check for AL == 00 */ + if (getAL() != 0x00) + { + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; + setAX(ERROR_INVALID_FUNCTION); + break; + } + + // TODO!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // FIXME: Extend and merge DosOpenFile and DosCreateFile into + // a single wrapper around CreateFileA, which acts as: + // http://www.ctyme.com/intr/rb-3179.htm break; } @@ -2562,6 +2711,8 @@ { /* * This is the DOS 2+ Fast Console Output Interrupt. + * The default handler under DOS 2.x and 3.x simply calls INT 10h/AH=0Eh. + * * See Ralf Brown: http://www.ctyme.com/intr/rb-4124.htm * for more information. */ @@ -2570,7 +2721,12 @@ USHORT AX = getAX(); USHORT BX = getBX(); - /* Set the parameters (AL = character, already set) */ + /* + * Set the parameters: + * AL contains the character to print (already set), + * BL contains the character attribute, + * BH contains the video page to use. + */ setBL(DOS_CHAR_ATTRIBUTE); setBH(Bda->VideoPage); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Thu May 15 23:13:06 2014 @@ -1,8 +1,8 @@ /* * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine - * FILE: dos.h - * PURPOSE: VDM DOS Kernel + * FILE: dos/dos32krnl/dos.h + * PURPOSE: DOS32 Kernel * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ @@ -191,8 +191,8 @@ WORD DosOpenHandle(HANDLE Handle); HANDLE DosGetRealHandle(WORD DosHandle); -WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD Attributes); -WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode); +WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD CreationFlags, WORD Attributes); +WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessShareModes); WORD DosReadFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesRead); WORD DosWriteFile(WORD FileHandle, LPVOID Buffer, WORD Count, LPWORD BytesWritten); WORD DosSeekFile(WORD FileHandle, LONG Offset, BYTE Origin, LPDWORD NewOffset); Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Thu May 15 23:13:06 2014 @@ -2,8 +2,9 @@ * COPYRIGHT: GPL - See COPYING in the top level directory * PROJECT: ReactOS Virtual DOS Machine * FILE: dos/dos32krnl/dosfiles.c - * PURPOSE: DOS Files + * PURPOSE: DOS32 Files Support * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> + * Hermes Belusca-Maito (hermes.belusca(a)sfr.fr) */ /* INCLUDES *******************************************************************/ @@ -22,13 +23,14 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD Attributes) +WORD DosCreateFile(LPWORD Handle, LPCSTR FilePath, WORD CreationFlags, WORD Attributes) { HANDLE FileHandle; WORD DosHandle; - DPRINT("DosCreateFile: FilePath \"%s\", Attributes 0x%04X\n", + DPRINT("DosCreateFile: FilePath \"%s\", CreationFlags 0x%04X, Attributes 0x%04X\n", FilePath, + CreationFlags, Attributes); /* Create the file */ @@ -36,7 +38,7 @@ GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, - CREATE_ALWAYS, + CreationFlags, Attributes, NULL); @@ -63,37 +65,40 @@ return ERROR_SUCCESS; } -WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessMode) +WORD DosOpenFile(LPWORD Handle, LPCSTR FilePath, BYTE AccessShareModes) { HANDLE FileHandle; - ACCESS_MASK Access = 0; + ACCESS_MASK AccessMode = 0; + DWORD ShareMode = 0; + BOOL InheritableFile = FALSE; + SECURITY_ATTRIBUTES SecurityAttributes; WORD DosHandle; - DPRINT("DosOpenFile: FilePath \"%s\", AccessMode 0x%04X\n", + DPRINT("DosOpenFile: FilePath \"%s\", AccessShareModes 0x%04X\n", FilePath, - AccessMode); + AccessShareModes); /* Parse the access mode */ - switch (AccessMode & 3) + switch (AccessShareModes & 0x03) { case 0: { /* Read-only */ - Access = GENERIC_READ; + AccessMode = GENERIC_READ; break; } case 1: { /* Write only */ - Access = GENERIC_WRITE; + AccessMode = GENERIC_WRITE; break; } case 2: { /* Read and write */ - Access = GENERIC_READ | GENERIC_WRITE; + AccessMode = GENERIC_READ | GENERIC_WRITE; break; } @@ -104,11 +109,64 @@ } } + /* Parse the share mode */ + switch ((AccessShareModes >> 4) & 0x07) + { + case 0: + { + /* Compatibility mode */ + ShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; + break; + } + + case 1: + { + /* No sharing "DenyAll" */ + ShareMode = 0; + break; + } + + case 2: + { + /* No write share "DenyWrite" */ + ShareMode = FILE_SHARE_READ; + break; + } + + case 3: + { + /* No read share "DenyRead" */ + ShareMode = FILE_SHARE_WRITE; + break; + } + + case 4: + { + /* Full share "DenyNone" */ + ShareMode = FILE_SHARE_READ | FILE_SHARE_WRITE; + break; + } + + default: + { + /* Invalid */ + return ERROR_INVALID_PARAMETER; + } + } + + /* Check for inheritance */ + InheritableFile = ((AccessShareModes & 0x80) == 0); + + /* Assign default security attributes to the file, and set the inheritance flag */ + SecurityAttributes.nLength = sizeof(SecurityAttributes); + SecurityAttributes.lpSecurityDescriptor = NULL; + SecurityAttributes.bInheritHandle = InheritableFile; + /* Open the file */ FileHandle = CreateFileA(FilePath, - Access, - FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, - NULL, + AccessMode, + ShareMode, + &SecurityAttributes, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); @@ -142,7 +200,7 @@ DWORD BytesRead32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); - DPRINT1("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); + DPRINT("DosReadFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); /* Make sure the handle is valid */ if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; @@ -207,9 +265,7 @@ DWORD BytesWritten32 = 0; HANDLE Handle = DosGetRealHandle(FileHandle); - DPRINT1("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", - FileHandle, - Count); + DPRINT("DosWriteFile: FileHandle 0x%04X, Count 0x%04X\n", FileHandle, Count); /* Make sure the handle is valid */ if (Handle == INVALID_HANDLE_VALUE) return ERROR_INVALID_HANDLE; @@ -313,7 +369,6 @@ return ERROR_SUCCESS; } -// This function is almost exclusively used as a DosFlushInputBuffer BOOL DosFlushFileBuffers(WORD FileHandle) { HANDLE Handle = DosGetRealHandle(FileHandle); @@ -322,9 +377,11 @@ if (Handle == INVALID_HANDLE_VALUE) return FALSE; /* - * No need to check whether the handle is a console handle since - * FlushFileBuffers() automatically does this check and calls - * FlushConsoleInputBuffer() for us. + * This function can either flush files back to disks, or flush + * console input buffers, in which case there is no need to check + * whether the handle is a console handle. FlushFileBuffers() + * automatically does this check and calls FlushConsoleInputBuffer() + * if needed. */ return FlushFileBuffers(Handle); }

10 years, 7 months

[aandrejevic] 63308: [NTVDM] Fix dead code.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Thu May 15 23:00:01 2014 New Revision: 63308 URL: http://svn.reactos.org/svn/reactos?rev=63308&view=rev Log: [NTVDM] Fix dead code. Modified: trunk/reactos/subsystems/ntvdm/hardware/cmos.c Modified: trunk/reactos/subsystems/ntvdm/hardware/cmos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/cmos.c [iso-8859-1] Thu May 15 23:00:01 2014 @@ -53,6 +53,7 @@ BYTE CmosReadData(VOID) { + BYTE Value; SYSTEMTIME CurrentTime; /* Get the current time */ @@ -61,21 +62,33 @@ switch (SelectedRegister) { case CMOS_REG_SECONDS: - return READ_CMOS_DATA(CmosMemory, CurrentTime.wSecond); + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wSecond); + break; + } case CMOS_REG_ALARM_SEC: - return READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmSecond); + { + Value = READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmSecond); + break; + } case CMOS_REG_MINUTES: - return READ_CMOS_DATA(CmosMemory, CurrentTime.wMinute); + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wMinute); + break; + } case CMOS_REG_ALARM_MIN: - return READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmMinute); + { + Value = READ_CMOS_DATA(CmosMemory, CmosMemory.AlarmMinute); + break; + } case CMOS_REG_HOURS: { BOOLEAN Afternoon = FALSE; - BYTE Value = CurrentTime.wHour; + Value = CurrentTime.wHour; if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) { @@ -88,13 +101,13 @@ /* Convert to 12-hour */ if (Afternoon) Value |= 0x80; - return Value; + break; } case CMOS_REG_ALARM_HRS: { BOOLEAN Afternoon = FALSE; - BYTE Value = CmosMemory.AlarmHour; + Value = CmosMemory.AlarmHour; if (!(CmosMemory.StatusRegB & CMOS_STB_24HOUR) && (Value >= 12)) { @@ -107,35 +120,47 @@ /* Convert to 12-hour */ if (Afternoon) Value |= 0x80; - return Value; + break; } case CMOS_REG_DAY_OF_WEEK: + { /* * The CMOS value is 1-based but the * GetLocalTime API value is 0-based. * Correct it. */ - return READ_CMOS_DATA(CmosMemory, CurrentTime.wDayOfWeek + 1); + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wDayOfWeek + 1); + break; + } case CMOS_REG_DAY: - return READ_CMOS_DATA(CmosMemory, CurrentTime.wDay); + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wDay); + break; + } case CMOS_REG_MONTH: - return READ_CMOS_DATA(CmosMemory, CurrentTime.wMonth); + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wMonth); + break; + } case CMOS_REG_YEAR: - return READ_CMOS_DATA(CmosMemory, CurrentTime.wYear % 100); + { + Value = READ_CMOS_DATA(CmosMemory, CurrentTime.wYear % 100); + break; + } case CMOS_REG_STATUS_C: { - BYTE Value = CmosMemory.StatusRegC; + /* Return the old value */ + Value = CmosMemory.StatusRegC; /* Clear status register C */ CmosMemory.StatusRegC = 0x00; - /* Return the old value */ - return Value; + break; } case CMOS_REG_STATUS_A: @@ -146,12 +171,14 @@ default: { // ASSERT(SelectedRegister < CMOS_REG_MAX); - return CmosMemory.Regs[SelectedRegister]; + Value = CmosMemory.Regs[SelectedRegister]; } } /* Return to Status Register D */ SelectedRegister = CMOS_REG_STATUS_D; + + return Value; } VOID CmosWriteData(BYTE Value)

10 years, 7 months

[dquintana] 63307: [WIN32K/NTUSER] * Fix gcc compilation.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu May 15 18:30:31 2014 New Revision: 63307 URL: http://svn.reactos.org/svn/reactos?rev=63307&view=rev Log: [WIN32K/NTUSER] * Fix gcc compilation. Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] Thu May 15 18:30:31 2014 @@ -240,9 +240,9 @@ (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() && - Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW)) + ((Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW)) || + (Window->ExStyle & WS_EX_APPWINDOW))) { // FIXME lParam; The value is TRUE if the window is in full-screen mode, or FALSE otherwise. co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (WPARAM) UserHMGetHandle(Window), FALSE); Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] Thu May 15 18:30:31 2014 @@ -2428,10 +2428,10 @@ IntSendParentNotify(Window, WM_CREATE); /* Notify the shell that a new window was created */ - if ((!hWndParent) && (!hWndOwner) && - Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW)) + if (Window->spwndParent == UserGetDesktopWindow() && + ((Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW)) || + (Window->ExStyle & WS_EX_APPWINDOW))) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); } Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu May 15 18:30:31 2014 @@ -1882,9 +1882,9 @@ else if (WinPos.flags & SWP_SHOWWINDOW) { if (Window->spwndParent == UserGetDesktopWindow() && - Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW) || - (Window->ExStyle & WS_EX_APPWINDOW)) + ((Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW)) || + (Window->ExStyle & WS_EX_APPWINDOW))) co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 );

10 years, 7 months

[dquintana] 63306: [WIN32K/NTUSER] * Apply the same filter to HSHELL_WINDOWACTIVATED, that I used for _WINDOWCREATED.

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu May 15 18:07:41 2014 New Revision: 63306 URL: http://svn.reactos.org/svn/reactos?rev=63306&view=rev Log: [WIN32K/NTUSER] * Apply the same filter to HSHELL_WINDOWACTIVATED, that I used for _WINDOWCREATED. Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] Thu May 15 18:07:41 2014 @@ -239,10 +239,17 @@ MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE, Window->style & WS_MINIMIZE), (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); - if (!Window->spwndOwner && !IntGetParent(Window)) + if (Window->spwndParent == UserGetDesktopWindow() && + Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW)) { // FIXME lParam; The value is TRUE if the window is in full-screen mode, or FALSE otherwise. co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (WPARAM) UserHMGetHandle(Window), FALSE); + } + else + { + co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, 0, FALSE); } Window->state &= ~WNDS_NONCPAINT;

10 years, 7 months

[ekohl] 63305: [FORMATTING] Fix indentation and coding style. No code changes!

by ekohl＠svn.reactos.org

Author: ekohl Date: Thu May 15 16:32:30 2014 New Revision: 63305 URL: http://svn.reactos.org/svn/reactos?rev=63305&view=rev Log: [FORMATTING] Fix indentation and coding style. No code changes! Modified: trunk/reactos/base/setup/usetup/interface/consup.c trunk/reactos/base/setup/usetup/native/console.c trunk/reactos/base/setup/usetup/native/fslist.c trunk/reactos/base/setup/usetup/native/utils/console.c trunk/reactos/base/setup/usetup/native/utils/console.h Modified: trunk/reactos/base/setup/usetup/interface/consup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/consup.c [iso-8859-1] Thu May 15 16:32:30 2014 @@ -43,230 +43,230 @@ BOOLEAN CONSOLE_Init( - VOID) -{ - CONSOLE_SCREEN_BUFFER_INFO csbi; - if (!HOST_InitConsole()) - return FALSE; - - StdInput = GetStdHandle(STD_INPUT_HANDLE); - StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); - if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) - return FALSE; - xScreen = csbi.dwSize.X; - yScreen = 50;//csbi.dwSize.Y; - return TRUE; + VOID) +{ + CONSOLE_SCREEN_BUFFER_INFO csbi; + if (!HOST_InitConsole()) + return FALSE; + + StdInput = GetStdHandle(STD_INPUT_HANDLE); + StdOutput = GetStdHandle(STD_OUTPUT_HANDLE); + if (!GetConsoleScreenBufferInfo(StdOutput, &csbi)) + return FALSE; + xScreen = csbi.dwSize.X; + yScreen = 50;//csbi.dwSize.Y; + return TRUE; } VOID CONSOLE_ConInKey( - OUT PINPUT_RECORD Buffer) -{ - DWORD Read; - - while (TRUE) - { - ReadConsoleInput(StdInput, Buffer, 1, &Read); - - if ((Buffer->EventType == KEY_EVENT) - && (Buffer->Event.KeyEvent.bKeyDown == TRUE)) - break; - } + OUT PINPUT_RECORD Buffer) +{ + DWORD Read; + + while (TRUE) + { + ReadConsoleInput(StdInput, Buffer, 1, &Read); + + if ((Buffer->EventType == KEY_EVENT) + && (Buffer->Event.KeyEvent.bKeyDown == TRUE)) + break; + } } VOID CONSOLE_ConOutChar( - IN CHAR c) -{ - DWORD Written; - - WriteConsole( - StdOutput, - &c, - 1, - &Written, - NULL); + IN CHAR c) +{ + DWORD Written; + + WriteConsole( + StdOutput, + &c, + 1, + &Written, + NULL); } VOID CONSOLE_ConOutPuts( - IN LPCSTR szText) -{ - DWORD Written; - - WriteConsole( - StdOutput, - szText, - (ULONG)strlen(szText), - &Written, - NULL); - WriteConsole( - StdOutput, - "\n", - 1, - &Written, - NULL); + IN LPCSTR szText) +{ + DWORD Written; + + WriteConsole( + StdOutput, + szText, + (ULONG)strlen(szText), + &Written, + NULL); + WriteConsole( + StdOutput, + "\n", + 1, + &Written, + NULL); } VOID CONSOLE_ConOutPrintf( - IN LPCSTR szFormat, ...) -{ - CHAR szOut[256]; - DWORD dwWritten; - va_list arg_ptr; - - va_start(arg_ptr, szFormat); - vsprintf(szOut, szFormat, arg_ptr); - va_end(arg_ptr); - - WriteConsole( - StdOutput, - szOut, - (ULONG)strlen(szOut), - &dwWritten, - NULL); + IN LPCSTR szFormat, ...) +{ + CHAR szOut[256]; + DWORD dwWritten; + va_list arg_ptr; + + va_start(arg_ptr, szFormat); + vsprintf(szOut, szFormat, arg_ptr); + va_end(arg_ptr); + + WriteConsole( + StdOutput, + szOut, + (ULONG)strlen(szOut), + &dwWritten, + NULL); } BOOL CONSOLE_Flush(VOID) { - return FlushConsoleInputBuffer(StdInput); + return FlushConsoleInputBuffer(StdInput); } SHORT CONSOLE_GetCursorX(VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(StdOutput, &csbi); - - return csbi.dwCursorPosition.X; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(StdOutput, &csbi); + + return csbi.dwCursorPosition.X; } SHORT CONSOLE_GetCursorY(VOID) { - CONSOLE_SCREEN_BUFFER_INFO csbi; - - GetConsoleScreenBufferInfo(StdOutput, &csbi); - - return csbi.dwCursorPosition.Y; + CONSOLE_SCREEN_BUFFER_INFO csbi; + + GetConsoleScreenBufferInfo(StdOutput, &csbi); + + return csbi.dwCursorPosition.Y; } VOID CONSOLE_SetCursorType( - IN BOOL bInsert, - IN BOOL bVisible) -{ - CONSOLE_CURSOR_INFO cci; - - cci.dwSize = bInsert ? 10 : 99; - cci.bVisible = bVisible; - - SetConsoleCursorInfo(StdOutput, &cci); + IN BOOL bInsert, + IN BOOL bVisible) +{ + CONSOLE_CURSOR_INFO cci; + + cci.dwSize = bInsert ? 10 : 99; + cci.bVisible = bVisible; + + SetConsoleCursorInfo(StdOutput, &cci); } VOID CONSOLE_SetCursorXY( - IN SHORT x, - IN SHORT y) -{ - COORD coPos; - - coPos.X = x; - coPos.Y = y; - SetConsoleCursorPosition(StdOutput, coPos); + IN SHORT x, + IN SHORT y) +{ + COORD coPos; + + coPos.X = x; + coPos.Y = y; + SetConsoleCursorPosition(StdOutput, coPos); } VOID CONSOLE_ClearScreen(VOID) { - COORD coPos; - DWORD Written; - - coPos.X = 0; - coPos.Y = 0; - - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - xScreen * yScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen * yScreen, - coPos, - &Written); + COORD coPos; + DWORD Written; + + coPos.X = 0; + coPos.Y = 0; + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + xScreen * yScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen * yScreen, + coPos, + &Written); } VOID CONSOLE_InvertTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT col, - IN SHORT row) -{ - COORD coPos; - DWORD Written; - - for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) - { - coPos.X = x; - - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - col, - coPos, - &Written); - } + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row) +{ + COORD coPos; + DWORD Written; + + for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) + { + coPos.X = x; + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + col, + coPos, + &Written); + } } VOID CONSOLE_NormalTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT col, - IN SHORT row) -{ - COORD coPos; - DWORD Written; - - for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) - { - coPos.X = x; - - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | BACKGROUND_BLUE, - col, - coPos, - &Written); - } + IN SHORT x, + IN SHORT y, + IN SHORT col, + IN SHORT row) +{ + COORD coPos; + DWORD Written; + + for (coPos.Y = y; coPos.Y < y + row; coPos.Y++) + { + coPos.X = x; + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_WHITE | BACKGROUND_BLUE, + col, + coPos, + &Written); + } } VOID CONSOLE_SetTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text) -{ - COORD coPos; - DWORD Written; - - coPos.X = x; - coPos.Y = y; - - WriteConsoleOutputCharacterA( - StdOutput, - Text, - (ULONG)strlen(Text), - coPos, - &Written); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + (ULONG)strlen(Text), + coPos, + &Written); } static @@ -290,164 +290,164 @@ VOID CONSOLE_SetInputTextXY( - IN SHORT x, - IN SHORT y, - IN SHORT len, - IN LPCWSTR Text) -{ - COORD coPos; - SHORT Length; - DWORD Written; - - coPos.X = x; - coPos.Y = y; - - Length = (SHORT)wcslen(Text); - if (Length > len - 1) - Length = len - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - len, - coPos, - &Written); - - WriteConsoleOutputCharacterW( - StdOutput, - Text, - (ULONG)Length, - coPos, - &Written); - - coPos.X += Length; - FillConsoleOutputCharacterA( - StdOutput, - '_', - 1, - coPos, - &Written); - - if (len > Length + 1) - { - coPos.X++; - FillConsoleOutputCharacterA( - StdOutput, - ' ', - len - Length - 1, - coPos, - &Written); - } + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCWSTR Text) +{ + COORD coPos; + SHORT Length; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + Length = (SHORT)wcslen(Text); + if (Length > len - 1) + Length = len - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + len, + coPos, + &Written); + + WriteConsoleOutputCharacterW( + StdOutput, + Text, + (ULONG)Length, + coPos, + &Written); + + coPos.X += Length; + FillConsoleOutputCharacterA( + StdOutput, + '_', + 1, + coPos, + &Written); + + if (len > Length + 1) + { + coPos.X++; + FillConsoleOutputCharacterA( + StdOutput, + ' ', + len - Length - 1, + coPos, + &Written); + } } VOID CONSOLE_SetUnderlinedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text) -{ - COORD coPos; - DWORD Length; - DWORD Written; - - coPos.X = x; - coPos.Y = y; - - Length = (ULONG)strlen(Text); - - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); - - coPos.Y++; - FillConsoleOutputCharacterA( - StdOutput, - 0xCD, - Length, - coPos, - &Written); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + DWORD Length; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + Length = (ULONG)strlen(Text); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); + + coPos.Y++; + FillConsoleOutputCharacterA( + StdOutput, + 0xCD, + Length, + coPos, + &Written); } VOID CONSOLE_SetStatusText( - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X = 0; - coPos.Y = yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X = 0; + coPos.Y = yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); } VOID CONSOLE_SetStatusTextX( IN SHORT x, - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); - - coPos.X = 0; - coPos.Y = yScreen - 1; - - FillConsoleOutputAttribute( - StdOutput, - BACKGROUND_WHITE, - xScreen, - coPos, - &Written); - - FillConsoleOutputCharacterA( - StdOutput, - ' ', - xScreen, - coPos, - &Written); - - coPos.X = x; - - WriteConsoleOutputCharacterA( - StdOutput, - Buffer, - (ULONG)strlen(Buffer), - coPos, - &Written); + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); + + coPos.X = 0; + coPos.Y = yScreen - 1; + + FillConsoleOutputAttribute( + StdOutput, + BACKGROUND_WHITE, + xScreen, + coPos, + &Written); + + FillConsoleOutputCharacterA( + StdOutput, + ' ', + xScreen, + coPos, + &Written); + + coPos.X = x; + + WriteConsoleOutputCharacterA( + StdOutput, + Buffer, + (ULONG)strlen(Buffer), + coPos, + &Written); } static @@ -472,15 +472,15 @@ VOID CONSOLE_SetStatusTextAutoFitX( IN SHORT x, - IN LPCSTR fmt, ...) -{ - CHAR Buffer[128]; + IN LPCSTR fmt, ...) +{ + CHAR Buffer[128]; DWORD Length; - va_list ap; - - va_start(ap, fmt); - vsprintf(Buffer, fmt, ap); - va_end(ap); + va_list ap; + + va_start(ap, fmt); + vsprintf(Buffer, fmt, ap); + va_end(ap); Length = (ULONG)strlen(Buffer); @@ -496,211 +496,211 @@ VOID CONSOLE_SetInvertedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text) -{ - COORD coPos; - DWORD Length; - DWORD Written; - - coPos.X = x; - coPos.Y = y; - - Length = (ULONG)strlen(Text); - - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_BLUE | BACKGROUND_WHITE, - Length, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + DWORD Length; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + Length = (ULONG)strlen(Text); + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_BLUE | BACKGROUND_WHITE, + Length, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); } VOID CONSOLE_SetHighlightedTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR Text) -{ - COORD coPos; - DWORD Length; - DWORD Written; - - coPos.X = x; - coPos.Y = y; - - Length = (ULONG)strlen(Text); - - FillConsoleOutputAttribute( - StdOutput, - FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, - Length, - coPos, - &Written); - - WriteConsoleOutputCharacterA( - StdOutput, - Text, - Length, - coPos, - &Written); + IN SHORT x, + IN SHORT y, + IN LPCSTR Text) +{ + COORD coPos; + DWORD Length; + DWORD Written; + + coPos.X = x; + coPos.Y = y; + + Length = (ULONG)strlen(Text); + + FillConsoleOutputAttribute( + StdOutput, + FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, + Length, + coPos, + &Written); + + WriteConsoleOutputCharacterA( + StdOutput, + Text, + Length, + coPos, + &Written); } VOID CONSOLE_PrintTextXY( - IN SHORT x, - IN SHORT y, - IN LPCSTR fmt, ...) -{ - CHAR buffer[512]; - va_list ap; - COORD coPos; - DWORD Written; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - coPos.X = x; - coPos.Y = y; - - WriteConsoleOutputCharacterA( - StdOutput, - buffer, - (ULONG)strlen(buffer), - coPos, - &Written); + IN SHORT x, + IN SHORT y, + IN LPCSTR fmt, ...) +{ + CHAR buffer[512]; + va_list ap; + COORD coPos; + DWORD Written; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + coPos.X = x; + coPos.Y = y; + + WriteConsoleOutputCharacterA( + StdOutput, + buffer, + (ULONG)strlen(buffer), + coPos, + &Written); } VOID CONSOLE_PrintTextXYN( - IN SHORT x, - IN SHORT y, - IN SHORT len, - IN LPCSTR fmt, ...) -{ - CHAR buffer[512]; - va_list ap; - COORD coPos; - SHORT Length; - DWORD Written; - - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - coPos.X = x; - coPos.Y = y; - - Length = (SHORT)strlen(buffer); - if (Length > len - 1) - Length = len - 1; - - WriteConsoleOutputCharacterA( - StdOutput, - buffer, - Length, - coPos, - &Written); - - coPos.X += Length; - - if (len > Length) - { - FillConsoleOutputCharacterA( - StdOutput, - ' ', - len - Length, - coPos, - &Written); - } + IN SHORT x, + IN SHORT y, + IN SHORT len, + IN LPCSTR fmt, ...) +{ + CHAR buffer[512]; + va_list ap; + COORD coPos; + SHORT Length; + DWORD Written; + + va_start(ap, fmt); + vsprintf(buffer, fmt, ap); + va_end(ap); + + coPos.X = x; + coPos.Y = y; + + Length = (SHORT)strlen(buffer); + if (Length > len - 1) + Length = len - 1; + + WriteConsoleOutputCharacterA( + StdOutput, + buffer, + Length, + coPos, + &Written); + + coPos.X += Length; + + if (len > Length) + { + FillConsoleOutputCharacterA( + StdOutput, + ' ', + len - Length, + coPos, + &Written); + } } VOID CONSOLE_SetStyledText( - IN SHORT x, - IN SHORT y, - IN INT Flags, - IN LPCSTR Text) -{ - COORD coPos; - DWORD Length; - - coPos.X = x; - coPos.Y = y; - - Length = (ULONG)strlen(Text); + IN SHORT x, + IN SHORT y, + IN INT Flags, + IN LPCSTR Text) +{ + COORD coPos; + DWORD Length; + + coPos.X = x; + coPos.Y = y; + + Length = (ULONG)strlen(Text); if (Flags & TEXT_TYPE_STATUS) - { - coPos.X = x; - coPos.Y = yScreen - 1; - } + { + coPos.X = x; + coPos.Y = yScreen - 1; + } else /* TEXT_TYPE_REGULAR (Default) */ { coPos.X = x; - coPos.Y = y; + coPos.Y = y; } if (Flags & TEXT_ALIGN_CENTER) - { - coPos.X = (xScreen - Length) /2; - } + { + coPos.X = (xScreen - Length) /2; + } else if(Flags & TEXT_ALIGN_RIGHT) - { - coPos.X = coPos.X - Length; - - if (Flags & TEXT_PADDING_SMALL) - { - coPos.X -= 1; - } - else if (Flags & TEXT_PADDING_MEDIUM) - { - coPos.X -= 2; - } - else if (Flags & TEXT_PADDING_BIG) - { - coPos.X -= 3; - } - } - else /* TEXT_ALIGN_LEFT (Default) */ - { - if (Flags & TEXT_PADDING_SMALL) - { - coPos.X += 1; - } - else if (Flags & TEXT_PADDING_MEDIUM) - { - coPos.X += 2; - } - else if (Flags & TEXT_PADDING_BIG) - { - coPos.X += 3; - } - } - - if (Flags & TEXT_TYPE_STATUS) - { + { + coPos.X = coPos.X - Length; + + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X -= 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X -= 2; + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X -= 3; + } + } + else /* TEXT_ALIGN_LEFT (Default) */ + { + if (Flags & TEXT_PADDING_SMALL) + { + coPos.X += 1; + } + else if (Flags & TEXT_PADDING_MEDIUM) + { + coPos.X += 2; + } + else if (Flags & TEXT_PADDING_BIG) + { + coPos.X += 3; + } + } + + if (Flags & TEXT_TYPE_STATUS) + { CONSOLE_SetStatusTextX(coPos.X, Text); - } + } else /* TEXT_TYPE_REGULAR (Default) */ { if (Flags & TEXT_STYLE_HIGHLIGHT) - { + { CONSOLE_SetHighlightedTextXY(coPos.X, coPos.Y, Text); - } + } else if (Flags & TEXT_STYLE_UNDERLINE) - { + { CONSOLE_SetUnderlinedTextXY(coPos.X, coPos.Y, Text); - } + } else /* TEXT_STYLE_NORMAL (Default) */ { CONSOLE_SetTextXY(coPos.X, coPos.Y, Text); Modified: trunk/reactos/base/setup/usetup/native/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/c… ============================================================================== --- trunk/reactos/base/setup/usetup/native/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/console.c [iso-8859-1] Thu May 15 16:32:30 2014 @@ -1,8 +1,7 @@ #include <usetup.h> BOOLEAN -NATIVE_InitConsole( - VOID) +NATIVE_InitConsole(VOID) { - return (BOOLEAN)AllocConsole(); + return (BOOLEAN)AllocConsole(); } Modified: trunk/reactos/base/setup/usetup/native/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/f… ============================================================================== --- trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/fslist.c [iso-8859-1] Thu May 15 16:32:30 2014 @@ -2,30 +2,29 @@ BOOLEAN NATIVE_CreateFileSystemList( - IN PFILE_SYSTEM_LIST List) + IN PFILE_SYSTEM_LIST List) { - FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); + FS_AddProvider(List, L"FAT", VfatFormat, VfatChkdsk); #if 0 - FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); + FS_AddProvider(List, L"EXT2", Ext2Format, Ext2Chkdsk); #endif - return TRUE; + return TRUE; } + BOOLEAN NATIVE_FormatPartition( - IN PFILE_SYSTEM_ITEM FileSystem, - IN PCUNICODE_STRING DriveRoot, - IN PFMIFSCALLBACK Callback) + IN PFILE_SYSTEM_ITEM FileSystem, + IN PCUNICODE_STRING DriveRoot, + IN PFMIFSCALLBACK Callback) { - NTSTATUS Status; + NTSTATUS Status; - Status = FileSystem->FormatFunc( - (PUNICODE_STRING)DriveRoot, - FMIFS_HARDDISK, /* MediaFlag */ - NULL, /* Label */ - FileSystem->QuickFormat, /* QuickFormat */ - 0, /* ClusterSize */ - Callback); /* Callback */ - - return NT_SUCCESS(Status); + Status = FileSystem->FormatFunc((PUNICODE_STRING)DriveRoot, + FMIFS_HARDDISK, /* MediaFlag */ + NULL, /* Label */ + FileSystem->QuickFormat, /* QuickFormat */ + 0, /* ClusterSize */ + Callback); /* Callback */ + return NT_SUCCESS(Status); } Modified: trunk/reactos/base/setup/usetup/native/utils/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.c [iso-8859-1] Thu May 15 16:32:30 2014 @@ -36,476 +36,481 @@ /* FUNCTIONS *****************************************************************/ -BOOL WINAPI +BOOL +WINAPI AllocConsole(VOID) { - UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); - UNICODE_STRING KeyboardName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); - OBJECT_ATTRIBUTES ObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - /* Open the screen */ - InitializeObjectAttributes( - &ObjectAttributes, - &ScreenName, - 0, - NULL, - NULL); - Status = NtOpenFile( - &StdOutput, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - FILE_OPEN, - FILE_SYNCHRONOUS_IO_ALERT); - if (!NT_SUCCESS(Status)) - return FALSE; - - /* Open the keyboard */ - InitializeObjectAttributes( - &ObjectAttributes, - &KeyboardName, - 0, - NULL, - NULL); - Status = NtOpenFile( - &StdInput, - FILE_ALL_ACCESS, - &ObjectAttributes, - &IoStatusBlock, - FILE_OPEN, - 0); - if (!NT_SUCCESS(Status)) - return FALSE; - - return TRUE; -} - -BOOL WINAPI + UNICODE_STRING ScreenName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); + UNICODE_STRING KeyboardName = RTL_CONSTANT_STRING(L"\\Device\\KeyboardClass0"); + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + /* Open the screen */ + InitializeObjectAttributes(&ObjectAttributes, + &ScreenName, + 0, + NULL, + NULL); + Status = NtOpenFile(&StdOutput, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + FILE_OPEN, + FILE_SYNCHRONOUS_IO_ALERT); + if (!NT_SUCCESS(Status)) + return FALSE; + + /* Open the keyboard */ + InitializeObjectAttributes(&ObjectAttributes, + &KeyboardName, + 0, + NULL, + NULL); + Status = NtOpenFile(&StdInput, + FILE_ALL_ACCESS, + &ObjectAttributes, + &IoStatusBlock, + FILE_OPEN, + 0); + if (!NT_SUCCESS(Status)) + return FALSE; + + return TRUE; +} + + +BOOL +WINAPI AttachConsole( - IN DWORD dwProcessId) -{ - return FALSE; -} - -BOOL WINAPI + IN DWORD dwProcessId) +{ + return FALSE; +} + + +BOOL +WINAPI FreeConsole(VOID) { - if (StdInput != INVALID_HANDLE_VALUE) - NtClose(StdInput); - - if (StdOutput != INVALID_HANDLE_VALUE) - NtClose(StdOutput); - - return TRUE; -} - -BOOL WINAPI + if (StdInput != INVALID_HANDLE_VALUE) + NtClose(StdInput); + + if (StdOutput != INVALID_HANDLE_VALUE) + NtClose(StdOutput); + + return TRUE; +} + + +BOOL +WINAPI WriteConsole( - IN HANDLE hConsoleOutput, - IN const VOID* lpBuffer, - IN DWORD nNumberOfCharsToWrite, - OUT LPDWORD lpNumberOfCharsWritten, - IN LPVOID lpReserved) -{ - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = NtWriteFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - (PVOID)lpBuffer, - nNumberOfCharsToWrite, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfCharsWritten = IoStatusBlock.Information; - return TRUE; -} - -HANDLE WINAPI + IN HANDLE hConsoleOutput, + IN const VOID *lpBuffer, + IN DWORD nNumberOfCharsToWrite, + OUT LPDWORD lpNumberOfCharsWritten, + IN LPVOID lpReserved) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtWriteFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + (PVOID)lpBuffer, + nNumberOfCharsToWrite, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfCharsWritten = IoStatusBlock.Information; + return TRUE; +} + + +HANDLE +WINAPI GetStdHandle( - IN DWORD nStdHandle) -{ - switch (nStdHandle) - { - case STD_INPUT_HANDLE: - return StdInput; - case STD_OUTPUT_HANDLE: - return StdOutput; - default: - return INVALID_HANDLE_VALUE; - } -} - -BOOL WINAPI + IN DWORD nStdHandle) +{ + switch (nStdHandle) + { + case STD_INPUT_HANDLE: + return StdInput; + case STD_OUTPUT_HANDLE: + return StdOutput; + default: + return INVALID_HANDLE_VALUE; + } +} + + +BOOL +WINAPI FlushConsoleInputBuffer( - IN HANDLE hConsoleInput) -{ - LARGE_INTEGER Offset, Timeout; - IO_STATUS_BLOCK IoStatusBlock; - KEYBOARD_INPUT_DATA InputData; - NTSTATUS Status; - - do - { - Offset.QuadPart = 0; - Status = NtReadFile( - hConsoleInput, - NULL, - NULL, - NULL, - &IoStatusBlock, - &InputData, - sizeof(KEYBOARD_INPUT_DATA), - &Offset, - 0); - if (Status == STATUS_PENDING) - { - Timeout.QuadPart = -100; - Status = NtWaitForSingleObject(hConsoleInput, FALSE, &Timeout); - if (Status == STATUS_TIMEOUT) - { - NtCancelIoFile(hConsoleInput, &IoStatusBlock); - return TRUE; - } - } - } while (NT_SUCCESS(Status)); - return FALSE; -} - -BOOL WINAPI + IN HANDLE hConsoleInput) +{ + LARGE_INTEGER Offset, Timeout; + IO_STATUS_BLOCK IoStatusBlock; + KEYBOARD_INPUT_DATA InputData; + NTSTATUS Status; + + do + { + Offset.QuadPart = 0; + Status = NtReadFile(hConsoleInput, + NULL, + NULL, + NULL, + &IoStatusBlock, + &InputData, + sizeof(KEYBOARD_INPUT_DATA), + &Offset, + 0); + if (Status == STATUS_PENDING) + { + Timeout.QuadPart = -100; + Status = NtWaitForSingleObject(hConsoleInput, FALSE, &Timeout); + if (Status == STATUS_TIMEOUT) + { + NtCancelIoFile(hConsoleInput, &IoStatusBlock); + return TRUE; + } + } + } while (NT_SUCCESS(Status)); + return FALSE; +} + + +BOOL +WINAPI ReadConsoleInput( - IN HANDLE hConsoleInput, - OUT PINPUT_RECORD lpBuffer, - IN DWORD nLength, - OUT LPDWORD lpNumberOfEventsRead) -{ - LARGE_INTEGER Offset; - IO_STATUS_BLOCK IoStatusBlock; - KEYBOARD_INPUT_DATA InputData; - NTSTATUS Status; - - Offset.QuadPart = 0; - Status = NtReadFile( - hConsoleInput, - NULL, - NULL, - NULL, - &IoStatusBlock, - &InputData, - sizeof(KEYBOARD_INPUT_DATA), - &Offset, - 0); - if (Status == STATUS_PENDING) - { - Status = NtWaitForSingleObject(hConsoleInput, FALSE, NULL); - Status = IoStatusBlock.Status; - } - if (!NT_SUCCESS(Status)) - return FALSE; - - lpBuffer->EventType = KEY_EVENT; - Status = IntTranslateKey(&InputData, &lpBuffer->Event.KeyEvent); - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfEventsRead = 1; - return TRUE; -} - -BOOL WINAPI + IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead) +{ + LARGE_INTEGER Offset; + IO_STATUS_BLOCK IoStatusBlock; + KEYBOARD_INPUT_DATA InputData; + NTSTATUS Status; + + Offset.QuadPart = 0; + Status = NtReadFile(hConsoleInput, + NULL, + NULL, + NULL, + &IoStatusBlock, + &InputData, + sizeof(KEYBOARD_INPUT_DATA), + &Offset, + 0); + if (Status == STATUS_PENDING) + { + Status = NtWaitForSingleObject(hConsoleInput, FALSE, NULL); + Status = IoStatusBlock.Status; + } + if (!NT_SUCCESS(Status)) + return FALSE; + + lpBuffer->EventType = KEY_EVENT; + Status = IntTranslateKey(&InputData, &lpBuffer->Event.KeyEvent); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfEventsRead = 1; + return TRUE; +} + + +BOOL +WINAPI WriteConsoleOutputCharacterA( - HANDLE hConsoleOutput, - IN LPCSTR lpCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten) -{ - IO_STATUS_BLOCK IoStatusBlock; - PCHAR Buffer; - COORD *pCoord; - PCHAR pText; - NTSTATUS Status; - - Buffer = (CHAR*) RtlAllocateHeap( - ProcessHeap, - 0, - nLength + sizeof(COORD)); - pCoord = (COORD *)Buffer; - pText = (PCHAR)(pCoord + 1); - - *pCoord = dwWriteCoord; - memcpy(pText, lpCharacter, nLength); - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER, - NULL, - 0, - Buffer, - nLength + sizeof(COORD)); - - RtlFreeHeap( - ProcessHeap, - 0, - Buffer); - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfCharsWritten = IoStatusBlock.Information; - return TRUE; -} - -BOOL WINAPI + HANDLE hConsoleOutput, + IN LPCSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) +{ + IO_STATUS_BLOCK IoStatusBlock; + PCHAR Buffer; + COORD *pCoord; + PCHAR pText; + NTSTATUS Status; + + Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, + 0, + nLength + sizeof(COORD)); + pCoord = (COORD *)Buffer; + pText = (PCHAR)(pCoord + 1); + + *pCoord = dwWriteCoord; + memcpy(pText, lpCharacter, nLength); + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER, + NULL, + 0, + Buffer, + nLength + sizeof(COORD)); + + RtlFreeHeap(ProcessHeap, 0, Buffer); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfCharsWritten = IoStatusBlock.Information; + return TRUE; +} + + +BOOL +WINAPI WriteConsoleOutputCharacterW( - HANDLE hConsoleOutput, - IN LPCWSTR lpCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten) -{ - IO_STATUS_BLOCK IoStatusBlock; - PCHAR Buffer; - COORD *pCoord; - PCHAR pText; - NTSTATUS Status; - ULONG i; - - Buffer = (CHAR*) RtlAllocateHeap( - ProcessHeap, - 0, - nLength + sizeof(COORD)); - pCoord = (COORD *)Buffer; - pText = (PCHAR)(pCoord + 1); - - *pCoord = dwWriteCoord; - - /* FIXME: use real unicode->oem conversion */ - for (i = 0; i < nLength; i++) - pText[i] = (CHAR)lpCharacter[i]; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER, - NULL, - 0, - Buffer, - nLength + sizeof(COORD)); - - RtlFreeHeap( - ProcessHeap, - 0, - Buffer); - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfCharsWritten = IoStatusBlock.Information; - return TRUE; -} - -BOOL WINAPI + HANDLE hConsoleOutput, + IN LPCWSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) +{ + IO_STATUS_BLOCK IoStatusBlock; + PCHAR Buffer; + COORD *pCoord; + PCHAR pText; + NTSTATUS Status; + ULONG i; + + Buffer = (CHAR*)RtlAllocateHeap(ProcessHeap, + 0, + nLength + sizeof(COORD)); + pCoord = (COORD *)Buffer; + pText = (PCHAR)(pCoord + 1); + + *pCoord = dwWriteCoord; + + /* FIXME: use real unicode->oem conversion */ + for (i = 0; i < nLength; i++) + pText[i] = (CHAR)lpCharacter[i]; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_WRITE_OUTPUT_CHARACTER, + NULL, + 0, + Buffer, + nLength + sizeof(COORD)); + + RtlFreeHeap(ProcessHeap, 0, Buffer); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfCharsWritten = IoStatusBlock.Information; + return TRUE; +} + + +BOOL +WINAPI FillConsoleOutputAttribute( - IN HANDLE hConsoleOutput, - IN WORD wAttribute, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfAttrsWritten) -{ - IO_STATUS_BLOCK IoStatusBlock; - OUTPUT_ATTRIBUTE Buffer; - NTSTATUS Status; - - Buffer.wAttribute = wAttribute; - Buffer.nLength = nLength; - Buffer.dwCoord = dwWriteCoord; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE, - &Buffer, - sizeof(OUTPUT_ATTRIBUTE), - &Buffer, - sizeof(OUTPUT_ATTRIBUTE)); - - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfAttrsWritten = Buffer.dwTransfered; - return TRUE; -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + IN WORD wAttribute, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfAttrsWritten) +{ + IO_STATUS_BLOCK IoStatusBlock; + OUTPUT_ATTRIBUTE Buffer; + NTSTATUS Status; + + Buffer.wAttribute = wAttribute; + Buffer.nLength = nLength; + Buffer.dwCoord = dwWriteCoord; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_FILL_OUTPUT_ATTRIBUTE, + &Buffer, + sizeof(OUTPUT_ATTRIBUTE), + &Buffer, + sizeof(OUTPUT_ATTRIBUTE)); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfAttrsWritten = Buffer.dwTransfered; + return TRUE; +} + + +BOOL +WINAPI FillConsoleOutputCharacterA( - IN HANDLE hConsoleOutput, - IN CHAR cCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten) -{ - IO_STATUS_BLOCK IoStatusBlock; - OUTPUT_CHARACTER Buffer; - NTSTATUS Status; - - Buffer.cCharacter = cCharacter; - Buffer.nLength = nLength; - Buffer.dwCoord = dwWriteCoord; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER, - &Buffer, - sizeof(OUTPUT_CHARACTER), - &Buffer, - sizeof(OUTPUT_CHARACTER)); - if (!NT_SUCCESS(Status)) - return FALSE; - - *lpNumberOfCharsWritten = Buffer.dwTransfered; - return TRUE; -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + IN CHAR cCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten) +{ + IO_STATUS_BLOCK IoStatusBlock; + OUTPUT_CHARACTER Buffer; + NTSTATUS Status; + + Buffer.cCharacter = cCharacter; + Buffer.nLength = nLength; + Buffer.dwCoord = dwWriteCoord; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_FILL_OUTPUT_CHARACTER, + &Buffer, + sizeof(OUTPUT_CHARACTER), + &Buffer, + sizeof(OUTPUT_CHARACTER)); + if (!NT_SUCCESS(Status)) + return FALSE; + + *lpNumberOfCharsWritten = Buffer.dwTransfered; + return TRUE; +} + + +BOOL +WINAPI GetConsoleScreenBufferInfo( - IN HANDLE hConsoleOutput, - OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo) -{ - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO, - NULL, - 0, - lpConsoleScreenBufferInfo, - sizeof(CONSOLE_SCREEN_BUFFER_INFO)); - return NT_SUCCESS(Status); -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO, + NULL, + 0, + lpConsoleScreenBufferInfo, + sizeof(CONSOLE_SCREEN_BUFFER_INFO)); + return NT_SUCCESS(Status); +} + + +BOOL +WINAPI SetConsoleCursorInfo( - IN HANDLE hConsoleOutput, - IN const CONSOLE_CURSOR_INFO* lpConsoleCursorInfo) -{ - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_SET_CURSOR_INFO, - (PCONSOLE_CURSOR_INFO)lpConsoleCursorInfo, - sizeof(CONSOLE_CURSOR_INFO), - NULL, - 0); - return NT_SUCCESS(Status); -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + IN const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_SET_CURSOR_INFO, + (PCONSOLE_CURSOR_INFO)lpConsoleCursorInfo, + sizeof(CONSOLE_CURSOR_INFO), + NULL, + 0); + return NT_SUCCESS(Status); +} + + +BOOL +WINAPI SetConsoleCursorPosition( - IN HANDLE hConsoleOutput, - IN COORD dwCursorPosition) -{ - CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo); - if (!NT_SUCCESS(Status)) - return FALSE; - - ConsoleScreenBufferInfo.dwCursorPosition.X = dwCursorPosition.X; - ConsoleScreenBufferInfo.dwCursorPosition.Y = dwCursorPosition.Y; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, - &ConsoleScreenBufferInfo, - sizeof(CONSOLE_SCREEN_BUFFER_INFO), - NULL, - 0); - - return NT_SUCCESS(Status); -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + IN COORD dwCursorPosition) +{ + CONSOLE_SCREEN_BUFFER_INFO ConsoleScreenBufferInfo; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = GetConsoleScreenBufferInfo(hConsoleOutput, &ConsoleScreenBufferInfo); + if (!NT_SUCCESS(Status)) + return FALSE; + + ConsoleScreenBufferInfo.dwCursorPosition.X = dwCursorPosition.X; + ConsoleScreenBufferInfo.dwCursorPosition.Y = dwCursorPosition.Y; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_SET_SCREEN_BUFFER_INFO, + &ConsoleScreenBufferInfo, + sizeof(CONSOLE_SCREEN_BUFFER_INFO), + NULL, + 0); + return NT_SUCCESS(Status); +} + + +BOOL +WINAPI SetConsoleTextAttribute( - IN HANDLE hConsoleOutput, - IN WORD wAttributes) -{ - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE, - &wAttributes, - sizeof(USHORT), - NULL, - 0); - return NT_SUCCESS(Status); -} - -BOOL WINAPI + IN HANDLE hConsoleOutput, + IN WORD wAttributes) +{ + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_SET_TEXT_ATTRIBUTE, + &wAttributes, + sizeof(USHORT), + NULL, + 0); + return NT_SUCCESS(Status); +} + + +BOOL +WINAPI SetConsoleOutputCP( - IN UINT wCodepage) -{ - HANDLE hConsoleOutput; - IO_STATUS_BLOCK IoStatusBlock; - NTSTATUS Status; - - hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); - - Status = NtDeviceIoControlFile( - hConsoleOutput, - NULL, - NULL, - NULL, - &IoStatusBlock, - IOCTL_CONSOLE_LOADFONT, - &wCodepage, - sizeof(ULONG), - NULL, - 0); - return NT_SUCCESS(Status); + IN UINT wCodepage) +{ + HANDLE hConsoleOutput; + IO_STATUS_BLOCK IoStatusBlock; + NTSTATUS Status; + + hConsoleOutput = GetStdHandle(STD_OUTPUT_HANDLE); + + Status = NtDeviceIoControlFile(hConsoleOutput, + NULL, + NULL, + NULL, + &IoStatusBlock, + IOCTL_CONSOLE_LOADFONT, + &wCodepage, + sizeof(ULONG), + NULL, + 0); + return NT_SUCCESS(Status); } Modified: trunk/reactos/base/setup/usetup/native/utils/console.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/native/u… ============================================================================== --- trunk/reactos/base/setup/usetup/native/utils/console.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/native/utils/console.h [iso-8859-1] Thu May 15 16:32:30 2014 @@ -26,90 +26,105 @@ #pragma once -BOOL WINAPI +BOOL +WINAPI AllocConsole(VOID); -BOOL WINAPI +BOOL +WINAPI AttachConsole( - IN DWORD dwProcessId); + IN DWORD dwProcessId); -BOOL WINAPI +BOOL +WINAPI FillConsoleOutputAttribute( - IN HANDLE hConsoleOutput, - IN WORD wAttribute, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfAttrsWritten); + IN HANDLE hConsoleOutput, + IN WORD wAttribute, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfAttrsWritten); -BOOL WINAPI +BOOL +WINAPI FillConsoleOutputCharacterA( - IN HANDLE hConsoleOutput, - IN CHAR cCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten); + IN HANDLE hConsoleOutput, + IN CHAR cCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten); -BOOL WINAPI +BOOL +WINAPI FreeConsole(VOID); -BOOL WINAPI +BOOL +WINAPI GetConsoleScreenBufferInfo( - IN HANDLE hConsoleOutput, - OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo); + IN HANDLE hConsoleOutput, + OUT PCONSOLE_SCREEN_BUFFER_INFO lpConsoleScreenBufferInfo); -HANDLE WINAPI +HANDLE +WINAPI GetStdHandle( - IN DWORD nStdHandle); + IN DWORD nStdHandle); -BOOL WINAPI +BOOL +WINAPI ReadConsoleInput( - IN HANDLE hConsoleInput, - OUT PINPUT_RECORD lpBuffer, - IN DWORD nLength, - OUT LPDWORD lpNumberOfEventsRead); + IN HANDLE hConsoleInput, + OUT PINPUT_RECORD lpBuffer, + IN DWORD nLength, + OUT LPDWORD lpNumberOfEventsRead); -BOOL WINAPI +BOOL +WINAPI SetConsoleCursorInfo( - IN HANDLE hConsoleOutput, - IN const CONSOLE_CURSOR_INFO* lpConsoleCursorInfo); + IN HANDLE hConsoleOutput, + IN const CONSOLE_CURSOR_INFO *lpConsoleCursorInfo); -BOOL WINAPI +BOOL +WINAPI SetConsoleCursorPosition( - IN HANDLE hConsoleOutput, - IN COORD dwCursorPosition); + IN HANDLE hConsoleOutput, + IN COORD dwCursorPosition); -BOOL WINAPI +BOOL +WINAPI SetConsoleTextAttribute( - IN HANDLE hConsoleOutput, - IN WORD wAttributes); + IN HANDLE hConsoleOutput, + IN WORD wAttributes); -BOOL WINAPI +BOOL +WINAPI WriteConsole( - IN HANDLE hConsoleOutput, - IN const VOID* lpBuffer, - IN DWORD nNumberOfCharsToWrite, - OUT LPDWORD lpNumberOfCharsWritten, - IN LPVOID lpReserved); + IN HANDLE hConsoleOutput, + IN const VOID *lpBuffer, + IN DWORD nNumberOfCharsToWrite, + OUT LPDWORD lpNumberOfCharsWritten, + IN LPVOID lpReserved); -BOOL WINAPI +BOOL +WINAPI WriteConsoleOutputCharacterA( - HANDLE hConsoleOutput, - IN LPCSTR lpCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten); + HANDLE hConsoleOutput, + IN LPCSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten); -BOOL WINAPI +BOOL +WINAPI WriteConsoleOutputCharacterW( - HANDLE hConsoleOutput, - IN LPCSTR lpCharacter, - IN DWORD nLength, - IN COORD dwWriteCoord, - OUT LPDWORD lpNumberOfCharsWritten); + HANDLE hConsoleOutput, + IN LPCSTR lpCharacter, + IN DWORD nLength, + IN COORD dwWriteCoord, + OUT LPDWORD lpNumberOfCharsWritten); -BOOL WINAPI +BOOL +WINAPI SetConsoleOutputCP( - IN UINT wCodePageID + IN UINT wCodePageID ); /* EOF */

10 years, 7 months

[dquintana] 63304: [EXPLORER-NEW] * Fix handling of taskbar items. * Filter out the desktop and taskbar from the button list. * Fixes minimizing from the taskbar in Windows (something else is preve...

by dquintana＠svn.reactos.org

Author: dquintana Date: Thu May 15 13:23:06 2014 New Revision: 63304 URL: http://svn.reactos.org/svn/reactos?rev=63304&view=rev Log: [EXPLORER-NEW] * Fix handling of taskbar items. * Filter out the desktop and taskbar from the button list. * Fixes minimizing from the taskbar in Windows (something else is preventing it from working in ros). [NTUSER] * Improve filtering of windows before calling HSHELL_WINDOWCREATED. [USER32] * Menus are supposed to be WS_EX_TOOLWINDOW so they don't show up in the taskbar. [ATL] [BROWSEUI] [SHELL32] * Include ATL aggregation patch by Huw (Frontier) (with Amine's changes). CORE-8175 Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.c branches/shell-experiments/dll/win32/browseui/bandsite.h branches/shell-experiments/dll/win32/shell32/shellord.cpp branches/shell-experiments/lib/atl/atlcom.h branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c branches/shell-experiments/win32ss/user/user32/windows/menu.c Modified: branches/shell-experiments/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/ex… ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu May 15 13:23:06 2014 @@ -934,10 +934,10 @@ TaskSwitchWnd_CheckActivateTaskItem(IN OUT PTASK_SWITCH_WND This, IN OUT PTASK_ITEM TaskItem) { - PTASK_ITEM ActiveTaskItem; + PTASK_ITEM CurrentTaskItem; PTASK_GROUP TaskGroup = NULL; - ActiveTaskItem = This->ActiveTaskItem; + CurrentTaskItem = This->ActiveTaskItem; if (TaskItem != NULL) TaskGroup = TaskItem->Group; @@ -950,20 +950,20 @@ return; } - if (ActiveTaskItem != NULL) - { - PTASK_GROUP ActiveTaskGroup; - - if (ActiveTaskItem == TaskItem) + if (CurrentTaskItem != NULL) + { + PTASK_GROUP CurrentTaskGroup; + + if (CurrentTaskItem == TaskItem) return; - ActiveTaskGroup = ActiveTaskItem->Group; + CurrentTaskGroup = CurrentTaskItem->Group; if (This->IsGroupingEnabled && - ActiveTaskGroup != NULL && - ActiveTaskGroup->IsCollapsed) - { - if (ActiveTaskGroup == TaskGroup) + CurrentTaskGroup != NULL && + CurrentTaskGroup->IsCollapsed) + { + if (CurrentTaskGroup == TaskGroup) return; /* FIXME */ @@ -971,10 +971,9 @@ else { This->ActiveTaskItem = NULL; - if (ActiveTaskItem->Index >= 0) - { - TaskSwitchWnd_UpdateTaskItemButton(This, - ActiveTaskItem); + if (CurrentTaskItem->Index >= 0) + { + TaskSwitchWnd_UpdateTaskItemButton(This, CurrentTaskItem); } } } @@ -983,8 +982,11 @@ if (TaskItem != NULL && TaskItem->Index >= 0) { - TaskSwitchWnd_UpdateTaskItemButton(This, - TaskItem); + TaskSwitchWnd_UpdateTaskItemButton(This, TaskItem); + } + else if (TaskItem == NULL) + { + DbgPrint("Active TaskItem now NULL\n"); } } @@ -1030,6 +1032,9 @@ IN HWND hWnd) { PTASK_ITEM TaskItem; + + if (!IsWindow(hWnd) || ITrayWindow_IsSpecialHWND(This->Tray, hWnd)) + return FALSE; TaskItem = TaskSwitchWnd_FindTaskItem(This, hWnd); @@ -1066,8 +1071,7 @@ DbgPrint("Activate window 0x%p on button %d\n", TaskItem->hWnd, TaskItem->Index); } - TaskSwitchWnd_CheckActivateTaskItem(This, - TaskItem); + TaskSwitchWnd_CheckActivateTaskItem(This, TaskItem); return FALSE; } @@ -1078,6 +1082,11 @@ { PTASK_ITEM TaskItem; + if (!hWnd) + { + return TaskSwitchWnd_ActivateTaskItem(This, NULL); + } + TaskItem = TaskSwitchWnd_FindTaskItem(This, hWnd); if (TaskItem == NULL) @@ -1091,8 +1100,7 @@ DbgPrint("Activate window 0x%p, could not find task\n", hWnd); } - return TaskSwitchWnd_ActivateTaskItem(This, - TaskItem); + return TaskSwitchWnd_ActivateTaskItem(This, TaskItem); } static BOOL @@ -1361,14 +1369,12 @@ /* Only show windows that still exist and are visible and none of explorer's special windows (such as the desktop or the tray window) */ if (IsWindow(hWnd) && IsWindowVisible(hWnd) && - !ITrayWindow_IsSpecialHWND(This->Tray, - hWnd)) - { + !ITrayWindow_IsSpecialHWND(This->Tray, hWnd)) + { + DWORD exStyle = GetWindowLong(hWnd, GWL_EXSTYLE); /* Don't list popup windows and also no tool windows */ - if (GetWindow(hWnd, - GW_OWNER) == NULL && - !(GetWindowLong(hWnd, - GWL_EXSTYLE) & WS_EX_TOOLWINDOW)) + if ((GetWindow(hWnd, GW_OWNER) == NULL || exStyle & WS_EX_APPWINDOW) && + !(exStyle & WS_EX_TOOLWINDOW)) { TaskSwitchWnd_AddTask(This, hWnd); @@ -1592,28 +1598,23 @@ break; case HSHELL_WINDOWCREATED: - TaskSwitchWnd_AddTask(This, + Ret = TaskSwitchWnd_AddTask(This, (HWND)lParam); + break; + + case HSHELL_WINDOWDESTROYED: + /* The window still exists! Delay destroying it a bit */ + TaskSwitchWnd_DeleteTask(This, (HWND)lParam); Ret = TRUE; break; - case HSHELL_WINDOWDESTROYED: - /* The window still exists! Delay destroying it a bit */ - TaskSwitchWnd_DeleteTask(This, - (HWND)lParam); - Ret = TRUE; - break; - - case HSHELL_ACTIVATESHELLWINDOW: - goto UnhandledShellMessage; - case HSHELL_RUDEAPPACTIVATED: - goto UnhandledShellMessage; - case HSHELL_WINDOWACTIVATED: - TaskSwitchWnd_ActivateTask(This, - (HWND)lParam); - Ret = TRUE; + if (lParam) + { + TaskSwitchWnd_ActivateTask(This, (HWND) lParam); + Ret = TRUE; + } break; case HSHELL_GETMINRECT: @@ -1635,6 +1636,7 @@ PostMessage(ITrayWindow_GetHWND(This->Tray), TWM_OPENSTARTMENU,0, 0); break; + case HSHELL_ACTIVATESHELLWINDOW: case HSHELL_LANGUAGE: case HSHELL_SYSMENU: case HSHELL_ENDTASK: @@ -1708,12 +1710,20 @@ bIsMinimized = IsIconic(TaskItem->hWnd); bIsActive = (TaskItem == This->ActiveTaskItem); + DbgPrint("Active TaskItem %p, selected TaskItem %p\n", This->ActiveTaskItem, TaskItem); + if (This->ActiveTaskItem) + DbgPrint("Active TaskItem hWnd=%p, TaskItem hWnd %p\n", This->ActiveTaskItem->hWnd, TaskItem->hWnd); + + DbgPrint("Valid button clicked. HWND=%p, IsMinimized=%s, IsActive=%s...\n", + TaskItem->hWnd, bIsMinimized ? "Yes" : "No", bIsActive ? "Yes" : "No"); + if (!bIsMinimized && bIsActive) { PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); + DbgPrint("Valid button clicked. App window Minimized.\n"); } else { @@ -1723,9 +1733,11 @@ WM_SYSCOMMAND, SC_RESTORE, 0); + DbgPrint("Valid button clicked. App window Restored.\n"); } SetForegroundWindow(TaskItem->hWnd); + DbgPrint("Valid button clicked. App window Activated.\n"); } } } Modified: branches/shell-experiments/dll/win32/browseui/bandsite.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/bandsite.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/bandsite.h [iso-8859-1] Thu May 15 13:23:06 2014 @@ -144,7 +144,7 @@ public: DECLARE_REGISTRY_RESOURCEID(IDR_BANDSITE) - DECLARE_NOT_AGGREGATABLE(CBandSite) + DECLARE_AGGREGATABLE(CBandSite) DECLARE_PROTECT_FINAL_CONSTRUCT() }; Modified: branches/shell-experiments/dll/win32/shell32/shellord.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/she… ============================================================================== --- branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/shell32/shellord.cpp [iso-8859-1] Thu May 15 13:23:06 2014 @@ -294,8 +294,13 @@ HWND hWnd, DWORD dwType) { - FIXME("(%p,0x%08x):stub.\n",hWnd, dwType); - return TRUE; + if (dwType == 3) + return RegisterShellHookWindow(hWnd); + else if (dwType == 0) + return DeregisterShellHookWindow(hWnd); + + ERR("Unsupported argument"); + return FALSE; } /************************************************************************* Modified: branches/shell-experiments/lib/atl/atlcom.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/lib/atl/atlco… ============================================================================== --- branches/shell-experiments/lib/atl/atlcom.h [iso-8859-1] (original) +++ branches/shell-experiments/lib/atl/atlcom.h [iso-8859-1] Thu May 15 13:23:06 2014 @@ -194,6 +194,205 @@ }; +template <class Base> +class CComContainedObject : public Base +{ +public: + IUnknown* m_pUnkOuter; + CComContainedObject(void * pv = NULL) : m_pUnkOuter(static_cast<IUnknown*>(pv)) + { + } + + STDMETHOD_(ULONG, AddRef)() + { + return m_pUnkOuter->AddRef(); + } + + STDMETHOD_(ULONG, Release)() + { + return m_pUnkOuter->Release(); + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + return m_pUnkOuter->QueryInterface(iid, ppvObject); + } + + IUnknown* GetControllingUnknown() + { + return m_pUnkOuter; + } +}; + +template <class contained> +class CComAggObject : public contained +{ +public: + CComContainedObject<contained> m_contained; + + CComAggObject(void * pv = NULL) : m_contained(static_cast<contained*>(pv)) + { + _pAtlModule->Lock(); + } + + virtual ~CComAggObject() + { + this->FinalRelease(); + _pAtlModule->Unlock(); + } + + HRESULT FinalConstruct() + { + return m_contained.FinalConstruct(); + } + void FinalRelease() + { + m_contained.FinalRelease(); + } + + STDMETHOD_(ULONG, AddRef)() + { + return this->InternalAddRef(); + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount; + newRefCount = this->InternalRelease(); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + if (ppvObject == NULL) + return E_POINTER; + if (iid == IID_IUnknown) + *ppvObject = reinterpret_cast<void*>(this); + else + return m_contained._InternalQueryInterface(iid, ppvObject); + return S_OK; + } + + static HRESULT WINAPI CreateInstance(IUnknown * punkOuter, CComAggObject<contained> **pp) + { + CComAggObject<contained> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComAggObject<contained>(punkOuter)) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; + } +}; + +template <class contained> +class CComPolyObject : public contained +{ +public: + CComContainedObject<contained> m_contained; + + CComPolyObject(void * pv = NULL) + : m_contained(pv ? static_cast<contained*>(pv) : this) + { + _pAtlModule->Lock(); + } + + virtual ~CComPolyObject() + { + this->FinalRelease(); + _pAtlModule->Unlock(); + } + + HRESULT FinalConstruct() + { + return m_contained.FinalConstruct(); + } + void FinalRelease() + { + m_contained.FinalRelease(); + } + + STDMETHOD_(ULONG, AddRef)() + { + return this->InternalAddRef(); + } + + STDMETHOD_(ULONG, Release)() + { + ULONG newRefCount; + newRefCount = this->InternalRelease(); + if (newRefCount == 0) + delete this; + return newRefCount; + } + + STDMETHOD(QueryInterface)(REFIID iid, void **ppvObject) + { + if (ppvObject == NULL) + return E_POINTER; + if (iid == IID_IUnknown) + *ppvObject = reinterpret_cast<void*>(this); + else + return m_contained._InternalQueryInterface(iid, ppvObject); + return S_OK; + } + + static HRESULT WINAPI CreateInstance(IUnknown * punkOuter, CComPolyObject<contained> **pp) + { + CComPolyObject<contained> *newInstance; + HRESULT hResult; + + ATLASSERT(pp != NULL); + if (pp == NULL) + return E_POINTER; + + hResult = E_OUTOFMEMORY; + newInstance = NULL; + ATLTRY(newInstance = new CComPolyObject<contained>(punkOuter)) + if (newInstance != NULL) + { + newInstance->SetVoid(NULL); + newInstance->InternalFinalConstructAddRef(); + hResult = newInstance->_AtlInitialConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->FinalConstruct(); + if (SUCCEEDED(hResult)) + hResult = newInstance->_AtlFinalConstruct(); + newInstance->InternalFinalConstructRelease(); + if (hResult != S_OK) + { + delete newInstance; + newInstance = NULL; + } + } + *pp = newInstance; + return hResult; + } +}; + template <HRESULT hResult> class CComFailCreator { @@ -225,7 +424,7 @@ hResult = E_OUTOFMEMORY; newInstance = NULL; - ATLTRY(newInstance = new T1()) + ATLTRY(newInstance = new T1(pv)) if (newInstance != NULL) { newInstance->SetVoid(pv); @@ -254,7 +453,7 @@ public: static HRESULT WINAPI CreateInstance(void *pv, REFIID riid, LPVOID *ppv) { - ATLASSERT(ppv != NULL && ppv != NULL); + ATLASSERT(ppv != NULL && riid != NULL); if (pv == NULL) return T1::CreateInstance(NULL, riid, ppv); @@ -370,15 +569,15 @@ #define DECLARE_AGGREGATABLE(x) \ public: \ - typedef CComCreator2<CComCreator<CComObject<x> >, CComCreator<CComAggObject<x> > > _CreatorClass; + typedef ATL::CComCreator2<ATL::CComCreator<ATL::CComObject<x> >, ATL::CComCreator<ATL::CComAggObject<x> > > _CreatorClass; #define DECLARE_ONLY_AGGREGATABLE(x) \ public: \ - typedef CComCreator2<CComFailCreator<E_FAIL>, CComCreator<CComAggObject<x> > > _CreatorClass; + typedef ATL::CComCreator2<ATL::CComFailCreator<E_FAIL>, ATL::CComCreator<ATL::CComAggObject<x> > > _CreatorClass; #define DECLARE_POLY_AGGREGATABLE(x) \ public: \ - typedef CComCreator<CComPolyObject<x> > _CreatorClass; + typedef ATL::CComCreator<ATL::CComPolyObject<x> > _CreatorClass; #define DECLARE_GET_CONTROLLING_UNKNOWN() \ public: \ Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] Thu May 15 13:23:06 2014 @@ -2428,7 +2428,10 @@ IntSendParentNotify(Window, WM_CREATE); /* Notify the shell that a new window was created */ - if ((!hWndParent) && (!hWndOwner)) + if ((!hWndParent) && (!hWndOwner) && + Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW)) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); } Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] Thu May 15 13:23:06 2014 @@ -1881,7 +1881,10 @@ } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (Window->spwndParent == UserGetDesktopWindow()) + if (Window->spwndParent == UserGetDesktopWindow() && + Window->spwndOwner == NULL && + !(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW)) co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 ); Modified: branches/shell-experiments/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/… ============================================================================== --- branches/shell-experiments/win32ss/user/user32/windows/menu.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/user32/windows/menu.c [iso-8859-1] Thu May 15 13:23:06 2014 @@ -1988,7 +1988,7 @@ static BOOL MENU_InitPopup( HWND hwndOwner, HMENU hmenu, UINT flags ) { MENU *menu; - DWORD ex_style = 0; + DWORD ex_style = WS_EX_TOOLWINDOW; ROSMENUINFO MenuInfo; TRACE("owner=%p hmenu=%p\n", hwndOwner, hmenu);

10 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
44
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 2014