Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 67011: [STOBJECT] Reorder volume menu items patch by Jared CORE-9468
by cwittich＠svn.reactos.org 02 Apr '15

02 Apr '15

Author: cwittich Date: Thu Apr 2 06:09:25 2015 New Revision: 67011 URL: http://svn.reactos.org/svn/reactos?rev=67011&view=rev Log: [STOBJECT] Reorder volume menu items patch by Jared CORE-9468 Modified: trunk/reactos/dll/shellext/stobject/volume.cpp Modified: trunk/reactos/dll/shellext/stobject/volume.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/stobject/volu… ============================================================================== --- trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/stobject/volume.cpp [iso-8859-1] Thu Apr 2 06:09:25 2015 @@ -216,12 +216,12 @@ { WCHAR strAdjust[128]; WCHAR strOpen[128]; + LoadStringW(g_hInstance, IDS_VOL_OPEN, strOpen, _countof(strOpen)); LoadStringW(g_hInstance, IDS_VOL_ADJUST, strAdjust, _countof(strAdjust)); - LoadStringW(g_hInstance, IDS_VOL_OPEN, strOpen, _countof(strOpen)); HMENU hPopup = CreatePopupMenu(); + AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); AppendMenuW(hPopup, MF_STRING, IDS_VOL_ADJUST, strAdjust); - AppendMenuW(hPopup, MF_STRING, IDS_VOL_OPEN, strOpen); DWORD flags = TPM_RETURNCMD | TPM_NONOTIFY | TPM_RIGHTALIGN | TPM_BOTTOMALIGN; DWORD msgPos = GetMessagePos();

1 0

[gadamopoulos] 67010: [SHELL32] - CNetFolder: As this folder isn't really implemented yet, there is no need to call the hacky common implementation of wine's shell folders (which will be removed ev...
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 20:34:52 2015 New Revision: 67010 URL: http://svn.reactos.org/svn/reactos?rev=67010&view=rev Log: [SHELL32] - CNetFolder: As this folder isn't really implemented yet, there is no need to call the hacky common implementation of wine's shell folders (which will be removed eventually). Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp Modified: trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders/… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders/CNetFolder.cpp [iso-8859-1] Wed Apr 1 20:34:52 2015 @@ -106,7 +106,7 @@ TRACE ("(%p)->(pidl=%p,%p,%s,%p)\n", this, pidl, pbcReserved, shdebugstr_guid (&riid), ppvOut); - return SHELL32_BindToChild(pidlRoot, NULL, pidl, riid, ppvOut); + return E_NOTIMPL; } /************************************************************************** @@ -127,12 +127,7 @@ HRESULT WINAPI CNetFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { - int nReturn; - - TRACE("(%p)->(0x%08lx,pidl1=%p,pidl2=%p)\n", this, lParam, pidl1, pidl2); - nReturn = SHELL32_CompareIDs(this, lParam, pidl1, pidl2); - TRACE("-- %i\n", nReturn); - return nReturn; + return E_NOTIMPL; } /************************************************************************** @@ -198,13 +193,7 @@ *rgfInOut = dwNethoodAttributes; else { - while (cidl > 0 && *apidl) - { - pdump(*apidl); - SHELL32_GetItemAttributes(this, *apidl, rgfInOut); - apidl++; - cidl--; - } + /* FIXME: Implement when enumerating items is implemented */ } /* make sure SFGAO_VALIDATE is cleared, some apps depend on that */

1 0

[gadamopoulos] 67009: [SHELL32] - Implement IContextMenu3 interface. Implement drawing the icons on WM_DRAWITEM. CORE-8866
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 20:22:25 2015 New Revision: 67009 URL: http://svn.reactos.org/svn/reactos?rev=67009&view=rev Log: [SHELL32] - Implement IContextMenu3 interface. Implement drawing the icons on WM_DRAWITEM. CORE-8866 Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp trunk/reactos/dll/win32/shell32/CNewMenu.h Modified: trunk/reactos/dll/win32/shell32/CNewMenu.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.cpp [iso-8859-1] Wed Apr 1 20:22:25 2015 @@ -30,17 +30,14 @@ m_pItems = NULL; m_pLinkItem = NULL; m_pSite = NULL; - m_hbmFolder = NULL; - m_hbmLink = NULL; + m_hiconFolder = NULL; + m_hiconLink = NULL; + m_idCmdFirst = 0; } CNewMenu::~CNewMenu() { UnloadAllItems(); - if (m_hbmFolder) - DeleteObject(m_hbmFolder); - if (m_hbmLink) - DeleteObject(m_hbmLink); } void CNewMenu::UnloadItem(SHELLNEW_ITEM *pItem) @@ -50,8 +47,8 @@ free(pItem->pwszDesc); free(pItem->pwszExt); - if (pItem->hBitmap) - DeleteObject(pItem->hBitmap); + if (pItem->hIcon) + DestroyIcon(pItem->hIcon); HeapFree(GetProcessHeap(), 0, pItem); } @@ -73,29 +70,6 @@ if (m_pLinkItem) UnloadItem(m_pLinkItem); m_pLinkItem = NULL; -} - -static HBITMAP IconToBitmap(HICON hIcon) -{ - HDC hdc, hdcScr; - HBITMAP hbm, hbmOld; - RECT rc; - - hdcScr = GetDC(NULL); - hdc = CreateCompatibleDC(hdcScr); - SetRect(&rc, 0, 0, GetSystemMetrics(SM_CXMENUCHECK), GetSystemMetrics(SM_CYMENUCHECK)); - hbm = CreateCompatibleBitmap(hdcScr, rc.right, rc.bottom); - ReleaseDC(NULL, hdcScr); - - hbmOld = (HBITMAP)SelectObject(hdc, hbm); - FillRect(hdc, &rc, (HBRUSH)(COLOR_MENU + 1)); - if (!DrawIconEx(hdc, 0, 0, hIcon, rc.right, rc.bottom, 0, NULL, DI_NORMAL)) - ERR("DrawIcon failed: %x\n", GetLastError()); - SelectObject(hdc, hbmOld); - - DeleteDC(hdc); - - return hbm; } CNewMenu::SHELLNEW_ITEM *CNewMenu::LoadItem(LPCWSTR pwszExt) @@ -179,10 +153,7 @@ pNewItem->pwszExt = _wcsdup(pwszExt); pNewItem->pwszDesc = _wcsdup(fi.szTypeName); if (fi.hIcon) - { - pNewItem->hBitmap = IconToBitmap(fi.hIcon); - DestroyIcon(fi.hIcon); - } + pNewItem->hIcon = fi.hIcon; return pNewItem; } @@ -262,16 +233,11 @@ /* Insert new folder action */ if (!LoadStringW(shell32_hInstance, FCIDM_SHVIEW_NEWFOLDER, wszBuf, _countof(wszBuf))) wszBuf[0] = 0; - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; - mii.fType = MFT_STRING; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (m_hbmFolder) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = m_hbmFolder; - } + mii.hbmpItem = HBMMENU_CALLBACK; if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -281,11 +247,6 @@ mii.dwTypeData = wszBuf; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (m_hbmLink) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = m_hbmLink; - } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; @@ -296,22 +257,16 @@ InsertMenuItemW(hMenu, Pos++, TRUE, &mii); /* Insert rest of items */ - mii.fType = MFT_STRING; - mii.fState = MFS_ENABLED; + mii.fMask = MIIM_ID | MIIM_BITMAP | MIIM_STRING; + mii.fType = 0; SHELLNEW_ITEM *pCurItem = m_pItems; while (pCurItem) { TRACE("szDesc %s\n", debugstr_w(pCurItem->pwszDesc)); - mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE | MIIM_DATA; mii.dwTypeData = pCurItem->pwszDesc; mii.cch = wcslen(mii.dwTypeData); mii.wID = idCmd; - if (pCurItem->hBitmap) - { - mii.fMask |= MIIM_CHECKMARKS; - mii.hbmpChecked = mii.hbmpUnchecked = pCurItem->hBitmap; - } if (InsertMenuItemW(hMenu, Pos++, TRUE, &mii)) ++idCmd; pCurItem = pCurItem->pNext; @@ -562,6 +517,8 @@ MENUITEMINFOW mii; UINT cItems = 0; + m_idCmdFirst = idCmdFirst; + TRACE("%p %p %u %u %u %u\n", this, hMenu, indexMenu, idCmdFirst, idCmdLast, uFlags); @@ -637,15 +594,71 @@ return S_OK; } +HRESULT +WINAPI +CNewMenu::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult) +{ + switch (uMsg) + { + case WM_MEASUREITEM: + { + MEASUREITEMSTRUCT* lpmis = reinterpret_cast<MEASUREITEMSTRUCT*>(lParam); + if (!lpmis || lpmis->CtlType != ODT_MENU) + break; + + if (lpmis->itemWidth < (UINT)GetSystemMetrics(SM_CXMENUCHECK)) + lpmis->itemWidth = GetSystemMetrics(SM_CXMENUCHECK); + if (lpmis->itemHeight < 16) + lpmis->itemHeight = 16; + + if (plResult) + *plResult = TRUE; + break; + } + case WM_DRAWITEM: + { + DRAWITEMSTRUCT* lpdis = reinterpret_cast<DRAWITEMSTRUCT*>(lParam); + if (!lpdis || lpdis->CtlType != ODT_MENU) + break; + + DWORD id = LOWORD(lpdis->itemID) - m_idCmdFirst; + HICON hIcon = 0; + if (id == 0) + hIcon = m_hiconFolder; + else if (id == 1) + hIcon = m_hiconLink; + else + { + SHELLNEW_ITEM *pItem = FindItemFromIdOffset(id); + if (pItem) + hIcon = pItem->hIcon; + } + + if (!hIcon) + break; + + DrawIconEx(lpdis->hDC, + 2, + lpdis->rcItem.top + (lpdis->rcItem.bottom - lpdis->rcItem.top - 16) / 2, + hIcon, + 16, + 16, + 0, NULL, DI_NORMAL); + + if(plResult) + *plResult = TRUE; + } + } + + return S_OK; +} + HRESULT WINAPI CNewMenu::Initialize(LPCITEMIDLIST pidlFolder, IDataObject *pdtobj, HKEY hkeyProgID) { /* Load folder and shortcut icons */ - HICON hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 0, 0, LR_SHARED); - m_hbmFolder = hIcon ? IconToBitmap(hIcon) : NULL; - hIcon = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 0, 0, LR_SHARED); - m_hbmLink = hIcon ? IconToBitmap(hIcon) : NULL; - + m_hiconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED); + m_hiconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED); return S_OK; } Modified: trunk/reactos/dll/win32/shell32/CNewMenu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CNewMenu… ============================================================================== --- trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CNewMenu.h [iso-8859-1] Wed Apr 1 20:22:25 2015 @@ -27,7 +27,7 @@ public CComCoClass<CNewMenu, &CLSID_NewMenu>, public CComObjectRootEx<CComMultiThreadModelNoCS>, public IObjectWithSite, - public IContextMenu2, + public IContextMenu3, public IShellExtInit { private: @@ -47,7 +47,7 @@ PBYTE pData; ULONG cbData; LPWSTR pwszDesc; - HBITMAP hBitmap; + HICON hIcon; SHELLNEW_ITEM *pNext; }; @@ -56,7 +56,8 @@ SHELLNEW_ITEM *m_pLinkItem; CComPtr<IUnknown> m_pSite; HMENU m_hSubMenu; - HBITMAP m_hbmFolder, m_hbmLink; + HICON m_hiconFolder, m_hiconLink; + UINT m_idCmdFirst; SHELLNEW_ITEM *LoadItem(LPCWSTR pwszExt); void UnloadItem(SHELLNEW_ITEM *pItem); @@ -80,6 +81,9 @@ virtual HRESULT WINAPI InvokeCommand(LPCMINVOKECOMMANDINFO lpcmi); virtual HRESULT WINAPI GetCommandString(UINT_PTR idCommand, UINT uFlags, UINT *lpReserved, LPSTR lpszName, UINT uMaxNameLen); + // IContextMenu3 + virtual HRESULT WINAPI HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT *plResult); + // IContextMenu2 virtual HRESULT WINAPI HandleMenuMsg(UINT uMsg, WPARAM wParam, LPARAM lParam); @@ -93,6 +97,7 @@ BEGIN_COM_MAP(CNewMenu) COM_INTERFACE_ENTRY_IID(IID_IObjectWithSite, IObjectWithSite) + COM_INTERFACE_ENTRY_IID(IID_IContextMenu3, IContextMenu3) COM_INTERFACE_ENTRY_IID(IID_IContextMenu2, IContextMenu2) COM_INTERFACE_ENTRY_IID(IID_IContextMenu, IContextMenu) COM_INTERFACE_ENTRY_IID(IID_IShellExtInit, IShellExtInit)

1 0

[gadamopoulos] 67008: [SHELL32] - Show hidden files as dithered.
by gadamopoulos＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: gadamopoulos Date: Wed Apr 1 19:18:34 2015 New Revision: 67008 URL: http://svn.reactos.org/svn/reactos?rev=67008&view=rev Log: [SHELL32] - Show hidden files as dithered. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Wed Apr 1 19:18:34 2015 @@ -787,6 +787,7 @@ lvItem.lParam = reinterpret_cast<LPARAM>(ILClone(pidl)); /*set the item's data*/ lvItem.pszText = LPSTR_TEXTCALLBACKW; /*get text on a callback basis*/ lvItem.iImage = I_IMAGECALLBACK; /*get the image on a callback basis*/ + lvItem.stateMask = LVIS_CUT; if (m_ListView.InsertItem(&lvItem) == -1) return FALSE; @@ -881,7 +882,10 @@ { /* if the value is 1, then show all hidden files/folders */ if (flagVal == 1) + { dFlags |= SHCONTF_INCLUDEHIDDEN; + m_ListView.SendMessageW(LVM_SETCALLBACKMASK, LVIS_CUT, 0); + } } /* close the key */ @@ -1755,6 +1759,17 @@ { lpdi->item.iImage = SHMapPIDLToSystemImageListIndex(m_pSFParent, pidl, 0); } + if(lpdi->item.mask & LVIF_STATE) + { + ULONG attributes = SFGAO_HIDDEN; + if (SUCCEEDED(m_pSFParent->GetAttributesOf(1, &pidl, &attributes))) + { + if (attributes & SFGAO_HIDDEN) + { + lpdi->item.state |= LVIS_CUT; + } + } + } lpdi->item.mask |= LVIF_DI_SETITEM; break;

1 0

[akhaldi] 67007: [STREAM] Plug a leak on failure path. Spotted by Samuel Serapion using cppcheck. CORE-8211
by akhaldi＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: akhaldi Date: Wed Apr 1 17:53:02 2015 New Revision: 67007 URL: http://svn.reactos.org/svn/reactos?rev=67007&view=rev Log: [STREAM] Plug a leak on failure path. Spotted by Samuel Serapion using cppcheck. CORE-8211 Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c Modified: trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/s… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/stream/driver.c [iso-8859-1] Wed Apr 1 17:53:02 2015 @@ -50,6 +50,7 @@ { /* Failed to attach */ IoDeleteDevice(DeviceObject); + ExFreePool(ItemList); return STATUS_UNSUCCESSFUL; }

1 0

[tkreuzer] 67006: [WINSRV] Enable C_ASSERT only on x86. Fixes x64 build.
by tkreuzer＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: tkreuzer Date: Wed Apr 1 17:51:05 2015 New Revision: 67006 URL: http://svn.reactos.org/svn/reactos?rev=67006&view=rev Log: [WINSRV] Enable C_ASSERT only on x86. Fixes x64 build. Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.h Modified: trunk/reactos/win32ss/user/winsrv/concfg/settings.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/concfg… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/concfg/settings.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/concfg/settings.h [iso-8859-1] Wed Apr 1 17:51:05 2015 @@ -58,7 +58,9 @@ WCHAR ConsoleTitle[ANYSIZE_ARRAY]; } CONSOLE_STATE_INFO, *PCONSOLE_STATE_INFO; +#ifdef _M_IX86 C_ASSERT(sizeof(CONSOLE_STATE_INFO) == 0xD0); +#endif #pragma pack(pop)

1 0

[cwittich] 67005: [DEVMGR] don't show an empty list when no driver files are required CORE-3341
by cwittich＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: cwittich Date: Wed Apr 1 12:03:12 2015 New Revision: 67005 URL: http://svn.reactos.org/svn/reactos?rev=67005&view=rev Log: [DEVMGR] don't show an empty list when no driver files are required CORE-3341 Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/devmgr/hwpage.c trunk/reactos/dll/win32/devmgr/precomp.h Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Wed Apr 1 12:03:12 2015 @@ -319,6 +319,7 @@ { LV_COLUMN lvc; HWND hDriversListView; + WCHAR szBuffer[260]; dap = (PDEVADVPROP_INFO)lParam; if (dap != NULL) @@ -341,6 +342,13 @@ UpdateDriverDetailsDlg(hwndDlg, hDriversListView, dap); + + if (ListView_GetItemCount(hDriversListView) == 0) + { + if(LoadStringW(hDllInstance, IDS_NODRIVERS, szBuffer, _countof(szBuffer))) + MessageBoxW(hwndDlg, szBuffer, dap->szDevName, MB_OK); + EndDialog(hwndDlg, IDCANCEL); + } } Ret = TRUE; Modified: trunk/reactos/dll/win32/devmgr/hwpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/hwpage.c?… ============================================================================== --- trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/hwpage.c [iso-8859-1] Wed Apr 1 12:03:12 2015 @@ -962,8 +962,8 @@ case WM_DESTROY: { - /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */ - SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL); + /* zero hpd pointer in window data, because it can be used later (WM_DESTROY has not to be last message) */ + SetWindowLongPtr(hwndDlg, DWL_USER, (DWORD_PTR)NULL); /* free devices list */ FreeDevicesList(hpd); Modified: trunk/reactos/dll/win32/devmgr/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/precomp.h… ============================================================================== --- trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/precomp.h [iso-8859-1] Wed Apr 1 12:03:12 2015 @@ -2,6 +2,7 @@ #define __DEVMGR_H #include <stdarg.h> +#include <stdlib.h> #define WIN32_NO_STATUS #include <windef.h>

1 0

[tkreuzer] 67004: [HOST] Make sure host-tools hosts get the correct type definitions on 64 bit (native) MSVC builds. x64 builds boot to desktop now. CORE-8587 #resolve
by tkreuzer＠svn.reactos.org 01 Apr '15

01 Apr '15

Author: tkreuzer Date: Wed Apr 1 08:35:16 2015 New Revision: 67004 URL: http://svn.reactos.org/svn/reactos?rev=67004&view=rev Log: [HOST] Make sure host-tools hosts get the correct type definitions on 64 bit (native) MSVC builds. x64 builds boot to desktop now. CORE-8587 #resolve Modified: trunk/reactos/include/host/typedefs.h Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Wed Apr 1 08:35:16 2015 @@ -69,7 +69,7 @@ typedef const uint16_t *PCWSTR, *LPCWSTR; typedef int32_t INT, LONG, *PLONG, *LPLONG, BOOL, WINBOOL; typedef uint32_t UINT, *PUINT, *LPUINT, ULONG, *PULONG, DWORD, *PDWORD, *LPDWORD, UINT32; -#ifdef _LP64 +#if defined(_LP64) || defined(_WIN64) typedef int64_t LONG_PTR, *PLONG_PTR, INT_PTR, *PINT_PTR; typedef uint64_t ULONG_PTR, DWORD_PTR, *PULONG_PTR, UINT_PTR, *PUINT_PTR; #else

1 0

[aandrejevic] 67003: [NTVDM] INT 21h, AH = OAh - Special characters should be echoed onto the screen (like ^A, etc...) and appended to the buffer.
by aandrejevic＠svn.reactos.org 31 Mar '15

31 Mar '15

Author: aandrejevic Date: Tue Mar 31 21:45:12 2015 New Revision: 67003 URL: http://svn.reactos.org/svn/reactos?rev=67003&view=rev Log: [NTVDM] INT 21h, AH = OAh - Special characters should be echoed onto the screen (like ^A, etc...) and appended to the buffer. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Mar 31 21:45:12 2015 @@ -1539,6 +1539,9 @@ /* Ctrl-C */ case 0x03: { + DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, 'C'); + if (DosControlBreak()) return; break; } @@ -1561,15 +1564,19 @@ default: { - if (Character == 0x0A || Character == 0x0D - || (Character >= 0x20 && Character <= 0x7F)) + /* Append it to the buffer */ + InputBuffer->Buffer[Count] = Character; + Count++; /* Carriage returns are also counted */ + + /* Check if this is a special character */ + if (Character < 0x20 && Character != 0x0A && Character != 0x0D) { - /* Echo the character and append it to the buffer */ - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); - InputBuffer->Buffer[Count] = Character; - - Count++; /* Carriage returns are also counted */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '^'); + Character += 'A' - 1; } + + /* Echo the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); } }

1 0

[aandrejevic] 67002: [NTVDM] - Implement Ctrl-C using interrupt 0x23. - Fix INT 21h, AH = 0Ah to detect special characters. - When attaching to / detaching from the console, adjust the console mode...
by aandrejevic＠svn.reactos.org 31 Mar '15

31 Mar '15

Author: aandrejevic Date: Tue Mar 31 21:28:40 2015 New Revision: 67002 URL: http://svn.reactos.org/svn/reactos?rev=67002&view=rev Log: [NTVDM] - Implement Ctrl-C using interrupt 0x23. - Fix INT 21h, AH = 0Ah to detect special characters. - When attaching to / detaching from the console, adjust the console mode and attach/detach the UI. - Do not translate scancodes to characters while ALT is held down. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Tue Mar 31 21:28:40 2015 @@ -245,12 +245,16 @@ /* Set the highest bit */ BiosKeyboardMap[VirtualKey] |= (1 << 7); - /* Find out which character this is */ Character = 0; - if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) - { - /* Not ASCII */ - Character = 0; + + /* If ALT isn't held down, find out which character this is */ + if (!((BiosKeyboardMap[VK_MENU] | BiosKeyboardMap[VK_RMENU] | BiosKeyboardMap[VK_LMENU]) & (1 << 7))) + { + if (ToAscii(VirtualKey, ScanCode, BiosKeyboardMap, &Character, 0) == 0) + { + /* Not ASCII */ + Character = 0; + } } /* Push it onto the BIOS keyboard queue */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Tue Mar 31 21:28:40 2015 @@ -648,6 +648,22 @@ /* Return success */ return TRUE; +} + +static BOOLEAN DosControlBreak(VOID) +{ + setCF(0); + + /* Call interrupt 0x23 */ + Int32Call(&DosContext, 0x23); + + if (getCF()) + { + DosTerminateProcess(CurrentPsp, 0, 0); + return TRUE; + } + + return FALSE; } /* PUBLIC FUNCTIONS ***********************************************************/ @@ -981,7 +997,8 @@ if (Result != ERROR_SUCCESS) goto Quit; /* Attach to the console */ - VidBiosAttachToConsole(); // FIXME: And in fact, attach the full NTVDM UI to the console + ConsoleAttach(); + VidBiosAttachToConsole(); // HACK: Simulate a ENTER key release scancode on the PS/2 port because // some apps expect to read a key release scancode (> 0x80) when they @@ -994,7 +1011,8 @@ CpuSimulate(); /* Detach from the console */ - VidBiosDetachFromConsole(); // FIXME: And in fact, detach the full NTVDM UI from the console + VidBiosDetachFromConsole(); + ConsoleDetach(); Quit: return Result; @@ -1125,9 +1143,10 @@ LPDWORD IntVecTable = (LPDWORD)((ULONG_PTR)BaseAddress); PDOS_PSP PspBlock = SEGMENT_TO_PSP(Psp); - DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X\n", + DPRINT("DosTerminateProcess: Psp 0x%04X, ReturnCode 0x%02X, KeepResident 0x%04X\n", Psp, - ReturnCode); + ReturnCode, + KeepResident); /* Check if this PSP is it's own parent */ if (PspBlock->ParentPsp == Psp) goto Done; @@ -1464,15 +1483,11 @@ { DPRINT("Char input without echo\n"); - // FIXME: Under DOS 2+, input handle may be redirected!!!! Character = DosReadCharacter(DOS_INPUT_HANDLE); // FIXME: For 0x07, do not check Ctrl-C/Break. // For 0x08, do check those control sequences and if needed, // call INT 0x23. - - // /* Let the BOP repeat if needed */ - // if (getCF()) break; setAL(Character); break; @@ -1508,18 +1523,55 @@ while (Count < InputBuffer->MaxLength) { - // FIXME!! This function should interpret backspaces etc... - /* 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 */ + switch (Character) + { + /* Extended character */ + case '\0': + { + /* Read the scancode */ + DosReadCharacter(DOS_INPUT_HANDLE); + break; + } + + /* Ctrl-C */ + case 0x03: + { + if (DosControlBreak()) return; + break; + } + + /* Backspace */ + case '\b': + { + if (Count > 0) + { + Count--; + + /* Erase the character */ + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + DosPrintCharacter(DOS_OUTPUT_HANDLE, ' '); + DosPrintCharacter(DOS_OUTPUT_HANDLE, '\b'); + } + + break; + } + + default: + { + if (Character == 0x0A || Character == 0x0D + || (Character >= 0x20 && Character <= 0x7F)) + { + /* 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; } @@ -2836,11 +2888,8 @@ VOID WINAPI DosBreakInterrupt(LPWORD Stack) { - UNREFERENCED_PARAMETER(Stack); - - /* Stop the VDM task */ - ResetEvent(VdmTaskEvent); - CpuUnsimulate(); + /* Set CF to terminate the running process */ + Stack[STACK_FLAGS] |= EMULATOR_FLAG_CF; } VOID WINAPI DosFastConOut(LPWORD Stack) Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Tue Mar 31 21:28:40 2015 @@ -316,34 +316,6 @@ return 0; } -static VOID EnableExtraHardware(HANDLE ConsoleInput) -{ - DWORD ConInMode; - - if (GetConsoleMode(ConsoleInput, &ConInMode)) - { -#if 0 - // GetNumberOfConsoleMouseButtons(); - // GetSystemMetrics(SM_CMOUSEBUTTONS); - // GetSystemMetrics(SM_MOUSEPRESENT); - if (MousePresent) - { -#endif - /* Support mouse input events if there is a mouse on the system */ - ConInMode |= ENABLE_MOUSE_INPUT; -#if 0 - } - else - { - /* Do not support mouse input events if there is no mouse on the system */ - ConInMode &= ~ENABLE_MOUSE_INPUT; - } -#endif - - SetConsoleMode(ConsoleInput, ConInMode); - } -} - /* PUBLIC FUNCTIONS ***********************************************************/ static VOID @@ -498,14 +470,6 @@ /* Register the I/O Ports */ RegisterIoPort(CONTROL_SYSTEM_PORT61H, Port61hRead, Port61hWrite); - /* Set the console input mode */ - // FIXME: Activate ENABLE_WINDOW_INPUT when we will want to perform actions - // upon console window events (screen buffer resize, ...). - SetConsoleMode(ConsoleInput, ENABLE_PROCESSED_INPUT /* | ENABLE_WINDOW_INPUT */); - // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); - - /**/EnableExtraHardware(ConsoleInput);/**/ - /* Initialize the PS/2 port */ PS2Initialize(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.c [iso-8859-1] Tue Mar 31 21:28:40 2015 @@ -176,6 +176,34 @@ } } +static VOID EnableExtraHardware(HANDLE ConsoleInput) +{ + DWORD ConInMode; + + if (GetConsoleMode(ConsoleInput, &ConInMode)) + { +#if 0 + // GetNumberOfConsoleMouseButtons(); + // GetSystemMetrics(SM_CMOUSEBUTTONS); + // GetSystemMetrics(SM_MOUSEPRESENT); + if (MousePresent) + { +#endif + /* Support mouse input events if there is a mouse on the system */ + ConInMode |= ENABLE_MOUSE_INPUT; +#if 0 + } + else + { + /* Do not support mouse input events if there is no mouse on the system */ + ConInMode &= ~ENABLE_MOUSE_INPUT; + } +#endif + + SetConsoleMode(ConsoleInput, ConInMode); + } +} + /* PUBLIC FUNCTIONS ***********************************************************/ VOID @@ -232,14 +260,6 @@ { switch (ControlType) { - case CTRL_C_EVENT: - case CTRL_BREAK_EVENT: - { - /* HACK: Stop the VDM */ - DPRINT1("Ctrl-C/Break: Stop the VDM\n"); - EmulatorTerminate(); - break; - } case CTRL_LAST_CLOSE_EVENT: { if (WaitForSingleObject(VdmTaskEvent, 0) == WAIT_TIMEOUT) @@ -260,6 +280,7 @@ break; } + default: { /* Stop the VDM if the user logs out or closes the console */ @@ -284,7 +305,7 @@ DestroyVdmMenu(); } -static BOOL +BOOL ConsoleAttach(VOID) { /* Save the original input and output console modes */ @@ -297,13 +318,22 @@ // return FALSE; } + /* Set the console input mode */ + // FIXME: Activate ENABLE_WINDOW_INPUT when we will want to perform actions + // upon console window events (screen buffer resize, ...). + SetConsoleMode(ConsoleInput, 0 /* | ENABLE_WINDOW_INPUT */); + EnableExtraHardware(ConsoleInput); + + /* Set the console output mode */ + // SetConsoleMode(ConsoleOutput, ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT); + /* Initialize the UI */ ConsoleInitUI(); return TRUE; } -static VOID +VOID ConsoleDetach(VOID) { /* Restore the original input and output console modes */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/ntvd… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/ntvdm.h [iso-8859-1] Tue Mar 31 21:28:40 2015 @@ -68,6 +68,8 @@ /*static*/ VOID DestroyVdmMenu(VOID); +BOOL ConsoleAttach(VOID); +VOID ConsoleDetach(VOID); VOID MenuEventHandler(PMENU_EVENT_RECORD MenuEvent); VOID FocusEventHandler(PFOCUS_EVENT_RECORD FocusEvent);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs