Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 68361: [RAPPS_NEW][EXPLORER][RSHELL][BROWSEUI] - Use ATL::CWindow methods where appropriate. By Benedikt Freisen. CORE-9675 #resolve
by tfaber＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: tfaber Date: Mon Jul 6 19:38:22 2015 New Revision: 68361 URL: http://svn.reactos.org/svn/reactos?rev=68361&view=rev Log: [RAPPS_NEW][EXPLORER][RSHELL][BROWSEUI] - Use ATL::CWindow methods where appropriate. By Benedikt Freisen. CORE-9675 #resolve Modified: trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/rosui.h trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -949,7 +949,7 @@ WCHAR szWndText[MAX_STR_LEN]; LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - ::GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + m_SearchBar->GetWindowTextW(szWndText, MAX_STR_LEN); if (wcscmp(szBuf, szWndText) == 0) { SearchEnabled = FALSE; @@ -960,7 +960,7 @@ case EN_KILLFOCUS: { - ::GetWindowTextW(m_SearchBar->m_hWnd, szBuf, MAX_STR_LEN); + m_SearchBar->GetWindowTextW(szBuf, MAX_STR_LEN); if (wcslen(szBuf) < 1) { LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); @@ -981,7 +981,7 @@ } LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - ::GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + m_SearchBar->GetWindowTextW(szWndText, MAX_STR_LEN); if (wcscmp(szBuf, szWndText) != 0) { StringCbCopy(szSearchPattern, sizeof(szSearchPattern), @@ -1019,7 +1019,7 @@ break; case ID_EXIT: - ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + PostMessageW(WM_CLOSE, 0, 0); break; case ID_INSTALL: @@ -1054,7 +1054,7 @@ break; case ID_HELP: - ::MessageBoxW(m_hWnd, L"Help not implemented yet", NULL, MB_OK); + MessageBoxW(L"Help not implemented yet", NULL, MB_OK); break; case ID_ABOUT: Modified: trunk/reactos/base/applications/rapps_new/rosui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rosui.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rosui.h [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -668,7 +668,7 @@ if (hDwp) { - return ::DeferWindowPos(hDwp, m_hWnd, NULL, + return DeferWindowPos(hDwp, NULL, splitter.left, splitter.top, splitter.right - splitter.left, splitter.bottom - splitter.top, Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -1790,7 +1790,7 @@ RECT* prcMinRect = (RECT*) lParam; RECT rcItem, rcToolbar; m_TaskBar.GetItemRect(TaskItem->Index, &rcItem); - ::GetWindowRect(m_TaskBar.m_hWnd, &rcToolbar); + m_TaskBar.GetWindowRect(&rcToolbar); OffsetRect(&rcItem, rcToolbar.left, rcToolbar.top); Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -345,7 +345,7 @@ POINT ptItem = { rcItem.left, rcItem.top }; SIZE szItem = { rcItem.right - rcItem.left, rcItem.bottom - rcItem.top }; - ::ClientToScreen(m_hWnd, &ptItem); + ClientToScreen(&ptItem); ptItem.x += szItem.cx / 2; ptItem.y -= szTip.cy; @@ -732,7 +732,7 @@ INT c, i; BOOL bRet = TRUE; - hDC = ::GetDC(m_hWnd); + hDC = GetDC(); if (hDC != NULL) { if (hFont) @@ -752,7 +752,7 @@ if (hFont) SelectObject(hDC, hPrevFont); - ::ReleaseDC(m_hWnd, hDC); + ReleaseDC(hDC); if (bRet) { @@ -895,7 +895,7 @@ CurrentSize = szWnd; } - if (::IsWindowVisible(m_hWnd)) + if (IsWindowVisible()) { InvalidateRect(NULL, TRUE); @@ -906,7 +906,7 @@ NMHDR nmh; nmh.hwndFrom = m_hWnd; - nmh.idFrom = ::GetWindowLongPtr(m_hWnd, GWLP_ID); + nmh.idFrom = GetWindowLongPtr(GWLP_ID); nmh.code = NTNWM_REALIGN; SendMessage(hWndNotify, @@ -1497,10 +1497,10 @@ BOOL GetClockRect(OUT PRECT rcClock) { - if (!::IsWindowVisible(m_clock->m_hWnd)) + if (!m_clock->IsWindowVisible()) return FALSE; - return ::GetWindowRect(m_clock->m_hWnd, rcClock); + return m_clock->GetWindowRect(rcClock); } LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -882,7 +882,7 @@ m_TrayRects[m_Position] = rcTray; goto ChangePos; } - else if (::GetWindowRect(m_hWnd, &rcTray)) + else if (GetWindowRect(&rcTray)) { if (InSizeMove) { @@ -952,7 +952,7 @@ RECT rcClip, rcWindow; HRGN hClipRgn; - if (::GetWindowRect(m_hWnd, &rcWindow)) + if (GetWindowRect(&rcWindow)) { /* Disable clipping on systems with only one monitor */ if (GetSystemMetrics(SM_CMONITORS) <= 1) @@ -980,7 +980,7 @@ /* Set the clipping region or make sure the window isn't clipped by disabling it explicitly. */ - ::SetWindowRgn(m_hWnd, hClipRgn, TRUE); + SetWindowRgn(hClipRgn, TRUE); } } @@ -1215,7 +1215,7 @@ { if (ptmp == NULL && GetClientRect(&tmp.rcExclude) && - ::MapWindowPoints(m_hWnd, + MapWindowPoints( NULL, (LPPOINT) &tmp.rcExclude, 2) != 0) @@ -1344,14 +1344,13 @@ if (m_StartButton.m_hWnd != NULL) { /* Resize and reposition the button */ - dwp = ::DeferWindowPos(dwp, - m_StartButton.m_hWnd, - NULL, - 0, - 0, - StartSize.cx, - StartSize.cy, - SWP_NOZORDER | SWP_NOACTIVATE); + dwp = m_StartButton.DeferWindowPos(dwp, + NULL, + 0, + 0, + StartSize.cx, + StartSize.cy, + SWP_NOZORDER | SWP_NOACTIVATE); if (dwp == NULL) { ERR("DeferWindowPos for start button failed. lastErr=%d\n", GetLastError()); @@ -1586,7 +1585,7 @@ If it was somehow destroyed just create a new tray window. */ if (m_hWnd != NULL && IsWindow()) { - if (!::IsWindowVisible(m_hWnd)) + if (!IsWindowVisible()) { CheckTrayWndPosition(); @@ -1656,7 +1655,7 @@ HWND hwnd; RECT posRect; - ::GetWindowRect(m_StartButton.m_hWnd, &posRect); + m_StartButton.GetWindowRect(&posRect); hwnd = CreateWindowEx(0, WC_STATIC, NULL, @@ -1886,10 +1885,10 @@ RECT rect; int backoundPart; - ::GetWindowRect(m_hWnd, &rect); + GetWindowRect(&rect); OffsetRect(&rect, -rect.left, -rect.top); - hdc = ::GetDCEx(m_hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + hdc = GetDCEx(hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); switch (m_Position) { @@ -1917,7 +1916,7 @@ } DrawThemeBackground(m_Theme, hdc, backoundPart, 0, &rect, 0); - ::ReleaseDC(m_hWnd, hdc); + ReleaseDC(hdc); return 0; } @@ -1926,7 +1925,7 @@ HWND hwnd; RECT posRect; - ::GetWindowRect(m_StartButton.m_hWnd, &posRect); + m_StartButton.GetWindowRect(&posRect); hwnd = CreateWindowEx(0, WC_STATIC, @@ -1982,7 +1981,7 @@ RECTL rcExclude; DWORD dwFlags = 0; - if (::GetWindowRect(m_StartButton.m_hWnd, (RECT*) &rcExclude)) + if (m_StartButton.GetWindowRect((RECT*) &rcExclude)) { switch (m_Position) { @@ -2023,7 +2022,7 @@ UINT state = m_AutoHideState; GetCursorPos(&pt); - ::GetWindowRect(m_hWnd, &rcCurrent); + GetWindowRect(&rcCurrent); over = PtInRect(&rcCurrent, pt); if (m_StartButton.SendMessage( BM_GETSTATE, 0, 0) != BST_UNCHECKED) @@ -2243,7 +2242,7 @@ SetLastError(ERROR_SUCCESS); if (GetClientRect(&rcClient) && - (::MapWindowPoints(m_hWnd, NULL, (LPPOINT) &rcClient, 2) != 0 || GetLastError() == ERROR_SUCCESS)) + (MapWindowPoints(NULL, (LPPOINT) &rcClient, 2) != 0 || GetLastError() == ERROR_SUCCESS)) { pt.x = (SHORT) LOWORD(lParam); pt.y = (SHORT) HIWORD(lParam); @@ -2386,7 +2385,7 @@ if (!Locked) { /* Apply clipping */ - ::PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); + PostMessage(WM_SIZE, SIZE_RESTORED, 0); } return TRUE; } @@ -2415,7 +2414,7 @@ /* temporarily enable the system menu */ SetWindowStyle(m_hWnd, WS_SYSMENU, WS_SYSMENU); - hSysMenu = ::GetSystemMenu(m_hWnd, FALSE); + hSysMenu = GetSystemMenu(FALSE); if (hSysMenu != NULL) { /* Disable all items that are not relevant */ @@ -2505,7 +2504,7 @@ /* Convert the coordinates to client-coordinates */ ::MapWindowPoints(NULL, m_hWnd, &ptClient, 1); - hWndAtPt = ::ChildWindowFromPoint(m_hWnd, ptClient); + hWndAtPt = ChildWindowFromPoint(ptClient); if (hWndAtPt != NULL && (hWndAtPt == m_Rebar || ::IsChild(m_Rebar, hWndAtPt))) { @@ -2561,7 +2560,7 @@ { case NTNWM_REALIGN: /* Cause all controls to be aligned */ - ::PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); + PostMessage(WM_SIZE, SIZE_RESTORED, 0); break; } } Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -700,8 +700,8 @@ POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - ::ClientToScreen(m_hWnd, &a); - ::ClientToScreen(m_hWnd, &b); + ClientToScreen(&a); + ClientToScreen(&b); POINTL pt = { a.x, b.y }; RECTL rcl = { a.x, a.y, b.x, b.y }; @@ -741,8 +741,8 @@ POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - ::ClientToScreen(m_hWnd, &a); - ::ClientToScreen(m_hWnd, &b); + ClientToScreen(&a); + ClientToScreen(&b); POINT pt = { a.x, b.y }; RECT rcl = { a.x, a.y, b.x, b.y }; @@ -937,7 +937,7 @@ HWND tlw; m_menuBand->_GetTopLevelWindow(&tlw); SendMessageW(tlw, WM_CANCELMODE, 0, 0); - ::PostMessageW(m_hWnd, WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE)); + PostMessageW(WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE)); } else m_menuBand->_ChangeHotItem(this, btn.idCommand, 0); Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -108,10 +108,10 @@ return hr; LPWSTR input; - int inputLength = ::GetWindowTextLength(fCombobox.m_hWnd) + 2; + int inputLength = fCombobox.GetWindowTextLength() + 2; input = new WCHAR[inputLength]; - ::GetWindowText(fCombobox.m_hWnd, input, inputLength); + fCombobox.GetWindowText(input, inputLength); LPWSTR address; int addressLength = ExpandEnvironmentStrings(input, NULL, 0); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jul 6 19:38:22 2015 @@ -1841,7 +1841,7 @@ fStartPosition.y = GET_Y_LPARAM(msgp); RECT rc; - ::GetWindowRect(m_hWnd, &rc); + GetWindowRect(&rc); fStartHeight = rc.bottom - rc.top;

1 0

[tfaber] 68360: [ATL] - Implement missing ATL::CWindow methods. Patch by Benedikt Freisen. CORE-9675
by tfaber＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: tfaber Date: Mon Jul 6 19:29:21 2015 New Revision: 68360 URL: http://svn.reactos.org/svn/reactos?rev=68360&view=rev Log: [ATL] - Implement missing ATL::CWindow methods. Patch by Benedikt Freisen. CORE-9675 Modified: trunk/reactos/lib/atl/atlwin.h Modified: trunk/reactos/lib/atl/atlwin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/atl/atlwin.h?rev=68360… ============================================================================== --- trunk/reactos/lib/atl/atlwin.h [iso-8859-1] (original) +++ trunk/reactos/lib/atl/atlwin.h [iso-8859-1] Mon Jul 6 19:29:21 2015 @@ -266,10 +266,146 @@ return NULL; } + UINT ArrangeIconicWindows() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ArrangeIconicWindows(m_hWnd); + } + + void Attach(HWND hWndNew) + { + m_hWnd = hWndNew; + } + HDC BeginPaint(LPPAINTSTRUCT lpPaint) { ATLASSERT(::IsWindow(m_hWnd)); return ::BeginPaint(m_hWnd, lpPaint); + } + + BOOL BringWindowToTop() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::BringWindowToTop(m_hWnd); + } + + BOOL CenterWindow(HWND hWndCenter = NULL) + { + ATLASSERT(::IsWindow(m_hWnd)); + if (hWndCenter == NULL) + hWndCenter = ::GetParent(m_hWnd); + if (hWndCenter == NULL) + return FALSE; + RECT wndCenterRect, wndRect; + if (!::GetWindowRect(hWndCenter, &wndCenterRect) || !::GetWindowRect(m_hWnd, &wndRect)) + return FALSE; + int wndCenterWidth = wndCenterRect.right - wndCenterRect.left; + int wndCenterHeight = wndCenterRect.bottom - wndCenterRect.top; + int wndWidth = wndRect.right - wndRect.left; + int wndHeight = wndRect.bottom - wndRect.top; + return ::MoveWindow(m_hWnd, + wndCenterRect.left + ((wndCenterWidth - wndWidth + 1) >> 1), + wndCenterRect.top + ((wndCenterHeight - wndHeight + 1) >> 1), + wndWidth, wndHeight, TRUE); + } + + BOOL ChangeClipboardChain(HWND hWndNewNext) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ChangeClipboardChain(m_hWnd, hWndNewNext); + } + + BOOL CheckDlgButton(int nIDButton, UINT nCheck) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::CheckDlgButton(m_hWnd, nIDButton, nCheck); + } + + BOOL CheckRadioButton(int nIDFirstButton, int nIDLastButton, int nIDCheckButton) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::CheckRadioButton(m_hWnd, nIDFirstButton, nIDLastButton, nIDCheckButton); + } + + HWND ChildWindowFromPoint(POINT point) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ChildWindowFromPoint(m_hWnd, point); + } + + HWND ChildWindowFromPointEx(POINT point, UINT uFlags) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ChildWindowFromPointEx(m_hWnd, point, uFlags); + } + + BOOL ClientToScreen(LPPOINT lpPoint) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ClientToScreen(m_hWnd, lpPoint); + } + + BOOL ClientToScreen(LPRECT lpRect) const + { + if (lpRect == NULL) + return FALSE; + ATLASSERT(::IsWindow(m_hWnd)); + POINT leftTop = {lpRect->left, lpRect->top}; + POINT rightBottom = {lpRect->right, lpRect->bottom}; + BOOL success = ::ClientToScreen(m_hWnd, &leftTop) && ::ClientToScreen(m_hWnd, &rightBottom); + if (success) + { + lpRect->left = leftTop.x; + lpRect->top = leftTop.y; + lpRect->right = rightBottom.x; + lpRect->bottom = rightBottom.y; + } + return success; + } + + HWND Create(LPCTSTR lpstrWndClass, HWND hWndParent, _U_RECT rect = NULL, LPCTSTR szWindowName = NULL, DWORD dwStyle = 0, DWORD dwExStyle = 0, _U_MENUorID MenuOrID = 0U, LPVOID lpCreateParam = NULL) + { + HWND hWnd; + ATLASSERT(m_hWnd == NULL); + hWnd = ::CreateWindowEx(dwExStyle, + lpstrWndClass, + szWindowName, + dwStyle, + rect.m_lpRect->left, + rect.m_lpRect->top, + rect.m_lpRect->right - rect.m_lpRect->left, + rect.m_lpRect->bottom - rect.m_lpRect->top, + hWndParent, + MenuOrID.m_hMenu, + _AtlBaseModule.GetModuleInstance(), + lpCreateParam); + if (hWnd != NULL) + m_hWnd = hWnd; + return hWnd; + } + + BOOL CreateCaret(HBITMAP pBitmap) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::CreateCaret(m_hWnd, pBitmap, 0, 0); + } + + BOOL CreateGrayCaret(int nWidth, int nHeight) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::CreateCaret(m_hWnd, (HBITMAP)1, nWidth, nHeight); + } + + BOOL CreateSolidCaret(int nWidth, int nHeight) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::CreateCaret(m_hWnd, (HBITMAP)0, nWidth, nHeight); + } + + HDWP DeferWindowPos(HDWP hWinPosInfo, HWND hWndInsertAfter, int x, int y, int cx, int cy, UINT uFlags) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DeferWindowPos(hWinPosInfo, m_hWnd, hWndInsertAfter, x, y, cx, cy, uFlags); } BOOL DestroyWindow() @@ -283,24 +419,384 @@ return TRUE; } + HWND Detach() + { + HWND hWnd = m_hWnd; + m_hWnd = NULL; + return hWnd; + } + + int DlgDirList(LPTSTR lpPathSpec, int nIDListBox, int nIDStaticPath, UINT nFileType) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DlgDirList(m_hWnd, lpPathSpec, nIDListBox, nIDStaticPath, nFileType); + } + + int DlgDirListComboBox(LPTSTR lpPathSpec, int nIDComboBox, int nIDStaticPath, UINT nFileType) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DlgDirListComboBox(m_hWnd, lpPathSpec, nIDComboBox, nIDStaticPath, nFileType); + } + + BOOL DlgDirSelect(LPTSTR lpString, int nCount, int nIDListBox) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DlgDirSelectEx(m_hWnd, lpString, nCount, nIDListBox); + } + + BOOL DlgDirSelectComboBox(LPTSTR lpString, int nCount, int nIDComboBox) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DlgDirSelectComboBoxEx(m_hWnd, lpString, nCount, nIDComboBox); + } + + void DragAcceptFiles(BOOL bAccept = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); +// FIXME following line requires shellapi.h +// ::DragAcceptFiles(m_hWnd, bAccept); + } + + BOOL DrawMenuBar() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::DrawMenuBar(m_hWnd); + } + + BOOL EnableScrollBar(UINT uSBFlags, UINT uArrowFlags = ESB_ENABLE_BOTH) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::EnableScrollBar(m_hWnd, uSBFlags, uArrowFlags); + } + + BOOL EnableWindow(BOOL bEnable = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::EnableWindow(m_hWnd, bEnable); + } + void EndPaint(LPPAINTSTRUCT lpPaint) { ATLASSERT(::IsWindow(m_hWnd)); ::EndPaint(m_hWnd, lpPaint); } + BOOL FlashWindow(BOOL bInvert) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::FlashWindow(m_hWnd, bInvert); + } + BOOL GetClientRect(LPRECT lpRect) const { ATLASSERT(::IsWindow(m_hWnd)); return ::GetClientRect(m_hWnd, lpRect); } + HDC GetDC() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDC(m_hWnd); + } + + HDC GetDCEx(HRGN hRgnClip, DWORD flags) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDCEx(m_hWnd, hRgnClip, flags); + } + +private: + typedef struct _IDHWNDPAIR { + int nID; + HWND hWnd; + } IDHWNDPAIR, *PIDHWNDPAIR; + + static BOOL CALLBACK GetDescendantWindowCallback(HWND hWnd, LPARAM lParam) + { + if (::GetWindowLong(hWnd, GWL_ID) == ((PIDHWNDPAIR)lParam)->nID) + { + ((PIDHWNDPAIR)lParam)->hWnd = hWnd; + return FALSE; + } + ::EnumChildWindows(hWnd, &GetDescendantWindowCallback, lParam); + return (((PIDHWNDPAIR)lParam)->hWnd == NULL); + } + +public: + HWND GetDescendantWindow(int nID) const + { + ATLASSERT(::IsWindow(m_hWnd)); + IDHWNDPAIR idHWndPair; + idHWndPair.nID = nID; + idHWndPair.hWnd = NULL; + ::EnumChildWindows(m_hWnd, &GetDescendantWindowCallback, (LPARAM)&idHWndPair); + return idHWndPair.hWnd; + } + + HRESULT GetDlgControl(int nID, REFIID iid, void** ppCtrl) + { + ATLASSERT(::IsWindow(m_hWnd)); + return E_FAIL;//FIXME stub + } + + int GetDlgCtrlID() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDlgCtrlID(m_hWnd); + } + + HRESULT GetDlgHost(int nID, REFIID iid, void** ppHost) + { + ATLASSERT(::IsWindow(m_hWnd)); + return E_FAIL;//FIXME stub + } + + HWND GetDlgItem(int nID) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDlgItem(m_hWnd, nID); + } + + UINT GetDlgItemInt(int nID, BOOL* lpTrans = NULL, BOOL bSigned = TRUE) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDlgItemInt(m_hWnd, nID, lpTrans, bSigned); + } + + UINT GetDlgItemText(int nID, LPTSTR lpStr, int nMaxCount) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetDlgItemText(m_hWnd, nID, lpStr, nMaxCount); + } + + BOOL GetDlgItemText(int nID, BSTR& bstrText) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return FALSE;//FIXME stub + } + + DWORD GetExStyle() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowLong(m_hWnd, GWL_EXSTYLE); + } + + HFONT GetFont() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return (HFONT)::SendMessage(m_hWnd, WM_GETFONT, 0, 0); + } + + DWORD GetHotKey() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return (DWORD)::SendMessage(m_hWnd, WM_GETHOTKEY, 0, 0); + } + + HICON GetIcon(BOOL bBigIcon = TRUE) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return (HICON)::SendMessage(m_hWnd, WM_GETICON, (WPARAM)bBigIcon, 0); + } + + HWND GetLastActivePopup() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetLastActivePopup(m_hWnd); + } + + HMENU GetMenu() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetMenu(m_hWnd); + } + + HWND GetNextDlgGroupItem(HWND hWndCtl, BOOL bPrevious = FALSE) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetNextDlgGroupItem(m_hWnd, hWndCtl, bPrevious); + } + + HWND GetNextDlgTabItem(HWND hWndCtl, BOOL bPrevious = FALSE) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetNextDlgTabItem(m_hWnd, hWndCtl, bPrevious); + } + CWindow GetParent() const { ATLASSERT(::IsWindow(m_hWnd)); return CWindow(::GetParent(m_hWnd)); } + BOOL GetScrollInfo(int nBar, LPSCROLLINFO lpScrollInfo) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetScrollInfo(m_hWnd, nBar, lpScrollInfo); + } + + BOOL GetScrollPos(int nBar) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetScrollPos(m_hWnd, nBar); + } + + BOOL GetScrollRange(int nBar, LPINT lpMinPos, LPINT lpMaxPos) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetScrollRange(m_hWnd, nBar, lpMinPos, lpMaxPos); + } + + DWORD GetStyle() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowLong(m_hWnd, GWL_STYLE); + } + + HMENU GetSystemMenu(BOOL bRevert) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetSystemMenu(m_hWnd, bRevert); + } + + HWND GetTopLevelParent() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return NULL;//FIXME stub + } + + HWND GetTopLevelWindow() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return NULL;//FIXME stub + } + + HWND GetTopWindow() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetTopWindow(m_hWnd); + } + + BOOL GetUpdateRect(LPRECT lpRect, BOOL bErase = FALSE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetUpdateRect(m_hWnd, lpRect, bErase); + } + + int GetUpdateRgn(HRGN hRgn, BOOL bErase = FALSE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return :: GetUpdateRgn(m_hWnd, hRgn, bErase); + } + + HWND GetWindow(UINT nCmd) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindow(m_hWnd, nCmd); + } + + DWORD GetWindowContextHelpId() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowContextHelpId(m_hWnd); + } + + HDC GetWindowDC() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowDC(m_hWnd); + } + + LONG GetWindowLong(int nIndex) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowLong(m_hWnd, nIndex); + } + + LONG_PTR GetWindowLongPtr(int nIndex) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowLongPtr(m_hWnd, nIndex); + } + + BOOL GetWindowPlacement(WINDOWPLACEMENT* lpwndpl) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowPlacement(m_hWnd, lpwndpl); + } + + DWORD GetWindowProcessID() + { + ATLASSERT(::IsWindow(m_hWnd)); + DWORD processID; + ::GetWindowThreadProcessId(m_hWnd, &processID); + return processID; + } + + BOOL GetWindowRect(LPRECT lpRect) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowRect(m_hWnd, lpRect); + } + + int GetWindowRgn(HRGN hRgn) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowRgn(m_hWnd, hRgn); + } + + int GetWindowText(LPTSTR lpszStringBuf, int nMaxCount) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowText(m_hWnd, lpszStringBuf, nMaxCount); + } + + BOOL GetWindowText(BSTR& bstrText) + { + ATLASSERT(::IsWindow(m_hWnd)); + int length = ::GetWindowTextLength(m_hWnd); + if (!SysReAllocStringLen(&bstrText, NULL, length)) + return FALSE; + ::GetWindowText(m_hWnd, (LPTSTR)&bstrText[2], length); + return TRUE; + } + + int GetWindowTextLength() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowTextLength(m_hWnd); + } + + DWORD GetWindowThreadID() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::GetWindowThreadProcessId(m_hWnd, NULL); + } + + WORD GetWindowWord(int nIndex) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return (WORD)::GetWindowLong(m_hWnd, nIndex); + } + + void GotoDlgCtrl(HWND hWndCtrl) const + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_NEXTDLGCTL, 0, 0); + } + + BOOL HideCaret() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::HideCaret(m_hWnd); + } + + BOOL HiliteMenuItem(HMENU hMenu, UINT uHiliteItem, UINT uHilite) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::HiliteMenuItem(m_hWnd, hMenu, uHiliteItem, uHilite); + } + BOOL Invalidate(BOOL bErase = TRUE) { ATLASSERT(::IsWindow(m_hWnd)); @@ -313,9 +809,72 @@ return ::InvalidateRect(m_hWnd, lpRect, bErase); } + void InvalidateRgn(HRGN hRgn, BOOL bErase = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + ::InvalidateRgn(m_hWnd, hRgn, bErase); + } + + BOOL IsChild(const HWND hWnd) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsChild(m_hWnd, hWnd); + } + + BOOL IsDialogMessage(LPMSG lpMsg) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsDialogMessage(m_hWnd, lpMsg); + } + + UINT IsDlgButtonChecked(int nIDButton) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsDlgButtonChecked(m_hWnd, nIDButton); + } + + BOOL IsIconic() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsIconic(m_hWnd); + } + + BOOL IsParentDialog() + { + ATLASSERT(::IsWindow(m_hWnd)); + TCHAR pszType[10]; + if (!RealGetWindowClass(::GetParent(m_hWnd), pszType, sizeof(pszType) / sizeof(pszType[0]))) + return FALSE; + return !_tcscmp(pszType, _T("#32770")); + } + BOOL IsWindow() const { return ::IsWindow(m_hWnd); + } + + BOOL IsWindowEnabled() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsWindowEnabled(m_hWnd); + } + + BOOL IsWindowVisible() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsWindowVisible(m_hWnd); + } + + BOOL IsWindowUnicode() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsWindowUnicode(m_hWnd); + } + + BOOL IsZoomed() const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::IsZoomed(m_hWnd); } BOOL KillTimer(UINT_PTR nIDEvent) @@ -332,10 +891,130 @@ return ::LockWindowUpdate(NULL); } + int MapWindowPoints(HWND hWndTo, LPPOINT lpPoint, UINT nCount) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::MapWindowPoints(m_hWnd, hWndTo, lpPoint, nCount); + } + + int MapWindowPoints(HWND hWndTo, LPRECT lpRect) const + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::MapWindowPoints(m_hWnd, hWndTo, (LPPOINT)lpRect, sizeof(RECT) / sizeof(POINT)); + } + + int MessageBox(LPCTSTR lpszText, LPCTSTR lpszCaption = NULL, UINT nType = MB_OK) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::MessageBox(m_hWnd, lpszText, lpszCaption, nType); + } + + BOOL ModifyStyle(DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SetWindowLong(m_hWnd, GWL_STYLE, (::GetWindowLong(m_hWnd, GWL_STYLE) & ~dwRemove) | dwAdd); + if (nFlags != 0) + return ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, nFlags | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + return TRUE; + } + + BOOL ModifyStyleEx(DWORD dwRemove, DWORD dwAdd, UINT nFlags = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SetWindowLong(m_hWnd, GWL_EXSTYLE, (::GetWindowLong(m_hWnd, GWL_EXSTYLE) & ~dwRemove) | dwAdd); + if (nFlags != 0) + return ::SetWindowPos(m_hWnd, NULL, 0, 0, 0, 0, nFlags | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE); + return TRUE; + } + + BOOL MoveWindow(int x, int y, int nWidth, int nHeight, BOOL bRepaint = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::MoveWindow(m_hWnd, x, y, nWidth, nHeight, bRepaint); + } + + void NextDlgCtrl() const + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_NEXTDLGCTL, 0, 0); + } + + BOOL OpenClipboard() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::OpenClipboard(m_hWnd); + } + + BOOL PostMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::PostMessage(m_hWnd, message, wParam, lParam); + } + + void PrevDlgCtrl() const + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_NEXTDLGCTL, 1, 0); + } + + void Print(HDC hDC, DWORD dwFlags) const + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_PRINT, (WPARAM)hDC, (LPARAM)dwFlags); + } + + void PrintClient(HDC hDC, DWORD dwFlags) const + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_PRINTCLIENT, (WPARAM)hDC, (LPARAM)dwFlags); + } + + BOOL RedrawWindow(LPCRECT lpRectUpdate = NULL, HRGN hRgnUpdate = NULL, UINT flags = RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::RedrawWindow(m_hWnd, lpRectUpdate, hRgnUpdate, flags); + } + + int ReleaseDC(HDC hDC) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ReleaseDC(m_hWnd, hDC); + } + + BOOL ResizeClient(int nWidth, int nHeight, BOOL bRedraw = FALSE) + { + ATLASSERT(::IsWindow(m_hWnd)); + RECT clientRect, wndRect; + ::GetClientRect(m_hWnd, &clientRect); + ::GetWindowRect(m_hWnd, &wndRect); + return ::MoveWindow(m_hWnd, wndRect.left, wndRect.top, + nWidth + (wndRect.right - wndRect.left) - (clientRect.right - clientRect.left), + nHeight + (wndRect.bottom - wndRect.top) - (clientRect.bottom - clientRect.top), + bRedraw); + } + BOOL ScreenToClient(LPPOINT lpPoint) const { ATLASSERT(::IsWindow(m_hWnd)); return ::ScreenToClient(m_hWnd, lpPoint); + } + + BOOL ScrollWindow(int xAmount, int yAmount, LPCRECT lpRect = NULL, LPCRECT lpClipRect = NULL) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ScrollWindow(m_hWnd, xAmount, yAmount, lpRect, lpClipRect); + } + + int ScrollWindowEx(int dx, int dy, LPCRECT lpRectScroll, LPCRECT lpRectClip, HRGN hRgnUpdate, LPRECT lpRectUpdate, UINT flags) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ScrollWindowEx(m_hWnd, dx, dy, lpRectScroll, lpRectClip, hRgnUpdate, lpRectUpdate, flags); + } + + LRESULT SendDlgItemMessage(int nID, UINT message, WPARAM wParam = 0, LPARAM lParam = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SendDlgItemMessage(m_hWnd, nID, message, wParam, lParam); } LRESULT SendMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0) @@ -350,46 +1029,245 @@ return ::SendMessage(hWnd, message, wParam, lParam); } +private: + static BOOL CALLBACK SendMessageToDescendantsCallback(HWND hWnd, LPARAM lParam) + { + ::SendMessage(hWnd, ((LPMSG)lParam)->message, ((LPMSG)lParam)->wParam, ((LPMSG)lParam)->lParam); + return TRUE; + } + + static BOOL CALLBACK SendMessageToDescendantsCallbackDeep(HWND hWnd, LPARAM lParam) + { + ::SendMessage(hWnd, ((LPMSG)lParam)->message, ((LPMSG)lParam)->wParam, ((LPMSG)lParam)->lParam); + ::EnumChildWindows(hWnd, &SendMessageToDescendantsCallbackDeep, lParam); + return TRUE; + } + +public: + void SendMessageToDescendants(UINT message, WPARAM wParam = 0, LPARAM lParam = 0, BOOL bDeep = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + MSG msg; + msg.message = message; + msg.wParam = wParam; + msg.lParam = lParam; + if (bDeep) + ::EnumChildWindows(m_hWnd, &SendMessageToDescendantsCallback, (LPARAM)&msg); + else + ::EnumChildWindows(m_hWnd, &SendMessageToDescendantsCallbackDeep, (LPARAM)&msg); + } + + BOOL SendNotifyMessage(UINT message, WPARAM wParam = 0, LPARAM lParam = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SendNotifyMessage(m_hWnd, message, wParam, lParam); + } + + HWND SetActiveWindow() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetActiveWindow(m_hWnd); + } + HWND SetCapture() { ATLASSERT(::IsWindow(m_hWnd)); return ::SetCapture(m_hWnd); } + HWND SetClipboardViewer() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetClipboardViewer(m_hWnd); + } + + int SetDlgCtrlID(int nID) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowLong(m_hWnd, GWL_ID, nID); + } + + BOOL SetDlgItemInt(int nID, UINT nValue, BOOL bSigned = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetDlgItemInt(m_hWnd, nID, nValue, bSigned); + } + + BOOL SetDlgItemText(int nID, LPCTSTR lpszString) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetDlgItemText(m_hWnd, nID, lpszString); + } + HWND SetFocus() { ATLASSERT(::IsWindow(m_hWnd)); return ::SetFocus(m_hWnd); } + void SetFont(HFONT hFont, BOOL bRedraw = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_SETFONT, (WPARAM)hFont, (LPARAM)bRedraw); + } + + int SetHotKey(WORD wVirtualKeyCode, WORD wModifiers) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SendMessage(m_hWnd, WM_SETHOTKEY, MAKEWPARAM(wVirtualKeyCode, wModifiers), 0); + } + + HICON SetIcon(HICON hIcon, BOOL bBigIcon = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return (HICON)::SendMessage(m_hWnd, WM_SETICON, (WPARAM)bBigIcon, (LPARAM)hIcon); + } + + BOOL SetMenu(HMENU hMenu) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetMenu(m_hWnd, hMenu); + } + + HWND SetParent(HWND hWndNewParent) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetParent(m_hWnd, hWndNewParent); + } + + void SetRedraw(BOOL bRedraw = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + ::SendMessage(m_hWnd, WM_SETREDRAW, (WPARAM)bRedraw, 0); + } + + int SetScrollInfo(int nBar, LPSCROLLINFO lpScrollInfo, BOOL bRedraw = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetScrollInfo(m_hWnd, nBar, lpScrollInfo, bRedraw); + } + + int SetScrollPos(int nBar, int nPos, BOOL bRedraw = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetScrollPos(m_hWnd, nBar, nPos, bRedraw); + } + + BOOL SetScrollRange(int nBar, int nMinPos, int nMaxPos, BOOL bRedraw = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetScrollRange(m_hWnd, nBar, nMinPos, nMaxPos, bRedraw); + } + UINT_PTR SetTimer(UINT_PTR nIDEvent, UINT nElapse, void (CALLBACK *lpfnTimer)(HWND, UINT, UINT_PTR, DWORD) = NULL) { ATLASSERT(::IsWindow(m_hWnd)); return ::SetTimer(m_hWnd, nIDEvent, nElapse, reinterpret_cast<TIMERPROC>(lpfnTimer)); } + BOOL SetWindowContextHelpId(DWORD dwContextHelpId) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowContextHelpId(m_hWnd, dwContextHelpId); + } + + LONG SetWindowLong(int nIndex, LONG dwNewLong) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowLong(m_hWnd, nIndex, dwNewLong); + } + + LONG_PTR SetWindowLongPtr(int nIndex, LONG_PTR dwNewLong) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowLongPtr(m_hWnd, nIndex, dwNewLong); + } + + BOOL SetWindowPlacement(const WINDOWPLACEMENT* lpwndpl) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowPlacement(m_hWnd, lpwndpl); + } + BOOL SetWindowPos(HWND hWndInsertAfter, int x, int y, int cx, int cy, UINT nFlags) { ATLASSERT(::IsWindow(m_hWnd)); return ::SetWindowPos(m_hWnd, hWndInsertAfter, x, y, cx, cy, nFlags); } + int SetWindowRgn(HRGN hRgn, BOOL bRedraw = FALSE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::SetWindowRgn(m_hWnd, hRgn, bRedraw); + } + BOOL SetWindowText(LPCTSTR lpszString) { ATLASSERT(::IsWindow(m_hWnd)); return ::SetWindowText(m_hWnd, lpszString); } + WORD SetWindowWord(int nIndex, WORD wNewWord) + { + ATLASSERT(::IsWindow(m_hWnd)); + if (nIndex >= -4) + return ::SetWindowLong(m_hWnd, nIndex - 2, MAKELONG(LOWORD(::GetWindowLong(m_hWnd, nIndex - 2)), wNewWord)); + else + return ::SetWindowLong(m_hWnd, nIndex, MAKELONG(wNewWord, HIWORD(::GetWindowLong(m_hWnd, nIndex)))); + } + + BOOL ShowCaret() + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ShowCaret(m_hWnd); + } + + BOOL ShowOwnedPopups(BOOL bShow = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ShowOwnedPopups(m_hWnd, bShow); + } + + BOOL ShowScrollBar(UINT nBar, BOOL bShow = TRUE) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ShowScrollBar(m_hWnd, nBar, bShow); + } + BOOL ShowWindow(int nCmdShow) { ATLASSERT(::IsWindow(m_hWnd)); return ::ShowWindow(m_hWnd, nCmdShow); } + BOOL ShowWindowAsync(int nCmdShow) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ShowWindowAsync(m_hWnd, nCmdShow); + } + BOOL UpdateWindow() { ATLASSERT(::IsWindow(m_hWnd)); return ::UpdateWindow(m_hWnd); + } + + BOOL ValidateRect(LPCRECT lpRect) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ValidateRect(m_hWnd, lpRect); + } + + BOOL ValidateRgn(HRGN hRgn) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::ValidateRgn(m_hWnd, hRgn); + } + + BOOL WinHelp(LPCTSTR lpszHelp, UINT nCmd = HELP_CONTEXT, DWORD dwData = 0) + { + ATLASSERT(::IsWindow(m_hWnd)); + return ::WinHelp(m_hWnd, lpszHelp, nCmd, dwData); } };

1 0

[tfaber] 68359: [RAPPS_NEW][EXPLORER][RSHELL][BROWSEUI] - Unambiguously specify top-level namespace for Win32 API functions in preparation for upcoming ATL changes. Based on a patch by Benedikt Fre...
by tfaber＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: tfaber Date: Mon Jul 6 19:20:39 2015 New Revision: 68359 URL: http://svn.reactos.org/svn/reactos?rev=68359&view=rev Log: [RAPPS_NEW][EXPLORER][RSHELL][BROWSEUI] - Unambiguously specify top-level namespace for Win32 API functions in preparation for upcoming ATL changes. Based on a patch by Benedikt Freisen. CORE-9675 Modified: trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/rosui.h trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp trunk/reactos/base/shell/rshell/CMenuToolbars.cpp trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/internettoolbar.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/gui.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -611,7 +611,7 @@ { case WM_CREATE: if (!InitControls()) - PostMessage(hwnd, WM_CLOSE, 0, 0); + ::PostMessage(hwnd, WM_CLOSE, 0, 0); break; case WM_DESTROY: @@ -729,8 +729,8 @@ } } - HMENU mainMenu = GetMenu(hwnd); - HMENU lvwMenu = GetMenu(m_ListView->m_hWnd); + HMENU mainMenu = ::GetMenu(hwnd); + HMENU lvwMenu = ::GetMenu(m_ListView->m_hWnd); /* Disable/enable items based on treeview selection */ if (IsSelectedNodeInstalled()) @@ -949,7 +949,7 @@ WCHAR szWndText[MAX_STR_LEN]; LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + ::GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); if (wcscmp(szBuf, szWndText) == 0) { SearchEnabled = FALSE; @@ -960,7 +960,7 @@ case EN_KILLFOCUS: { - GetWindowTextW(m_SearchBar->m_hWnd, szBuf, MAX_STR_LEN); + ::GetWindowTextW(m_SearchBar->m_hWnd, szBuf, MAX_STR_LEN); if (wcslen(szBuf) < 1) { LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); @@ -981,7 +981,7 @@ } LoadStringW(hInst, IDS_SEARCH_TEXT, szBuf, _countof(szBuf)); - GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); + ::GetWindowTextW(m_SearchBar->m_hWnd, szWndText, MAX_STR_LEN); if (wcscmp(szBuf, szWndText) != 0) { StringCbCopy(szSearchPattern, sizeof(szSearchPattern), @@ -1019,7 +1019,7 @@ break; case ID_EXIT: - PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); break; case ID_INSTALL: @@ -1054,7 +1054,7 @@ break; case ID_HELP: - MessageBoxW(m_hWnd, L"Help not implemented yet", NULL, MB_OK); + ::MessageBoxW(m_hWnd, L"Help not implemented yet", NULL, MB_OK); break; case ID_ABOUT: Modified: trunk/reactos/base/applications/rapps_new/rosui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… ============================================================================== --- trunk/reactos/base/applications/rapps_new/rosui.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps_new/rosui.h [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -457,7 +457,7 @@ virtual void ComputeContentBounds(RECT* rect) { RECT r; - GetWindowRect(T::m_hWnd, &r); + ::GetWindowRect(T::m_hWnd, &r); rect->left = min(rect->left, r.left); rect->top = min(rect->top, r.top); rect->right = max(rect->right, r.right); @@ -479,7 +479,7 @@ if (hDwp) { - return DeferWindowPos(hDwp, T::m_hWnd, NULL, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOZORDER); + return ::DeferWindowPos(hDwp, T::m_hWnd, NULL, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOZORDER); } else { @@ -668,7 +668,7 @@ if (hDwp) { - return DeferWindowPos(hDwp, m_hWnd, NULL, + return ::DeferWindowPos(hDwp, m_hWnd, NULL, splitter.left, splitter.top, splitter.right - splitter.left, splitter.bottom - splitter.top, Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… ============================================================================== --- trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskswnd.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -1235,9 +1235,9 @@ if (::IsWindow(hWnd) && ::IsWindowVisible(hWnd) && !m_Tray->IsSpecialHWND(hWnd)) { - DWORD exStyle = GetWindowLong(hWnd, GWL_EXSTYLE); + DWORD exStyle = ::GetWindowLong(hWnd, GWL_EXSTYLE); /* Don't list popup windows and also no tool windows */ - if ((GetWindow(hWnd, GW_OWNER) == NULL || exStyle & WS_EX_APPWINDOW) && + if ((::GetWindow(hWnd, GW_OWNER) == NULL || exStyle & WS_EX_APPWINDOW) && !(exStyle & WS_EX_TOOLWINDOW)) { TRACE("Adding task for %p...\n", hWnd); @@ -1404,7 +1404,7 @@ break; case HSHELL_TASKMAN: - PostMessage(m_Tray->GetHWND(), TWM_OPENSTARTMENU, 0, 0); + ::PostMessage(m_Tray->GetHWND(), TWM_OPENSTARTMENU, 0, 0); break; case HSHELL_ACTIVATESHELLWINDOW: @@ -1455,7 +1455,7 @@ if (::IsWindow(TaskItem->hWnd)) { - bIsMinimized = IsIconic(TaskItem->hWnd); + bIsMinimized = ::IsIconic(TaskItem->hWnd); bIsActive = (TaskItem == m_ActiveTaskItem); TRACE("Active TaskItem %p, selected TaskItem %p\n", m_ActiveTaskItem, TaskItem); @@ -1467,7 +1467,7 @@ if (!bIsMinimized && bIsActive) { - PostMessage(TaskItem->hWnd, + ::PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); @@ -1477,7 +1477,7 @@ { if (bIsMinimized) { - PostMessage(TaskItem->hWnd, + ::PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, SC_RESTORE, 0); @@ -1524,7 +1524,7 @@ VOID HandleTaskItemRightClick(IN OUT PTASK_ITEM TaskItem) { - HMENU hmenu = GetSystemMenu(TaskItem->hWnd, FALSE); + HMENU hmenu = ::GetSystemMenu(TaskItem->hWnd, FALSE); if (hmenu) { @@ -1535,7 +1535,7 @@ if (cmd) { SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed - PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); + ::PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); } } } @@ -1790,7 +1790,7 @@ RECT* prcMinRect = (RECT*) lParam; RECT rcItem, rcToolbar; m_TaskBar.GetItemRect(TaskItem->Index, &rcItem); - GetWindowRect(m_TaskBar.m_hWnd, &rcToolbar); + ::GetWindowRect(m_TaskBar.m_hWnd, &rcToolbar); OffsetRect(&rcItem, rcToolbar.left, rcToolbar.top); Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -291,10 +291,10 @@ if (pid == GetCurrentProcessId() || (uMsg >= WM_MOUSEFIRST && uMsg <= WM_MOUSELAST)) { - PostMessage(notifyItem->hWnd, - notifyItem->uCallbackMessage, - notifyItem->uID, - uMsg); + ::PostMessage(notifyItem->hWnd, + notifyItem->uCallbackMessage, + notifyItem->uID, + uMsg); } else { @@ -323,7 +323,7 @@ LRESULT OnTooltipShow(INT uCode, LPNMHDR hdr, BOOL& bHandled) { RECT rcTip, rcItem; - GetWindowRect(hdr->hwndFrom, &rcTip); + ::GetWindowRect(hdr->hwndFrom, &rcTip); SIZE szTip = { rcTip.right - rcTip.left, rcTip.bottom - rcTip.top }; @@ -339,13 +339,13 @@ if (hMon) GetMonitorInfo(hMon, &monInfo); else - GetWindowRect(GetDesktopWindow(), &monInfo.rcMonitor); + ::GetWindowRect(GetDesktopWindow(), &monInfo.rcMonitor); GetItemRect(iBtn, &rcItem); POINT ptItem = { rcItem.left, rcItem.top }; SIZE szItem = { rcItem.right - rcItem.left, rcItem.bottom - rcItem.top }; - ClientToScreen(m_hWnd, &ptItem); + ::ClientToScreen(m_hWnd, &ptItem); ptItem.x += szItem.cx / 2; ptItem.y -= szTip.cy; @@ -436,10 +436,10 @@ Toolbar.Initialize(m_hWnd); // Explicitly request running applications to re-register their systray icons - SendNotifyMessage(HWND_BROADCAST, - RegisterWindowMessage(TEXT("TaskbarCreated")), - 0, - 0); + ::SendNotifyMessage(HWND_BROADCAST, + RegisterWindowMessage(TEXT("TaskbarCreated")), + 0, + 0); return TRUE; } @@ -732,7 +732,7 @@ INT c, i; BOOL bRet = TRUE; - hDC = GetDC(m_hWnd); + hDC = ::GetDC(m_hWnd); if (hDC != NULL) { if (hFont) @@ -752,7 +752,7 @@ if (hFont) SelectObject(hDC, hPrevFont); - ReleaseDC(m_hWnd, hDC); + ::ReleaseDC(m_hWnd, hDC); if (bRet) { @@ -895,7 +895,7 @@ CurrentSize = szWnd; } - if (IsWindowVisible(m_hWnd)) + if (::IsWindowVisible(m_hWnd)) { InvalidateRect(NULL, TRUE); @@ -906,7 +906,7 @@ NMHDR nmh; nmh.hwndFrom = m_hWnd; - nmh.idFrom = GetWindowLongPtr(m_hWnd, GWLP_ID); + nmh.idFrom = ::GetWindowLongPtr(m_hWnd, GWLP_ID); nmh.code = NTNWM_REALIGN; SendMessage(hWndNotify, @@ -1497,10 +1497,10 @@ BOOL GetClockRect(OUT PRECT rcClock) { - if (!IsWindowVisible(m_clock->m_hWnd)) + if (!::IsWindowVisible(m_clock->m_hWnd)) return FALSE; - return GetWindowRect(m_clock->m_hWnd, rcClock); + return ::GetWindowRect(m_clock->m_hWnd, rcClock); } LRESULT OnGetMinimumSize(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -218,7 +218,7 @@ SmallIcon.cy, LR_SHARED | LR_DEFAULTCOLOR); - hDCScreen = GetDC(NULL); + hDCScreen = ::GetDC(NULL); if (hDCScreen == NULL) goto Cleanup; @@ -282,7 +282,7 @@ Cleanup: if (hDCScreen != NULL) { - ReleaseDC(NULL, hDCScreen); + ::ReleaseDC(NULL, hDCScreen); } if (hbmp != NULL) @@ -882,7 +882,7 @@ m_TrayRects[m_Position] = rcTray; goto ChangePos; } - else if (GetWindowRect(m_hWnd, &rcTray)) + else if (::GetWindowRect(m_hWnd, &rcTray)) { if (InSizeMove) { @@ -952,7 +952,7 @@ RECT rcClip, rcWindow; HRGN hClipRgn; - if (GetWindowRect(m_hWnd, &rcWindow)) + if (::GetWindowRect(m_hWnd, &rcWindow)) { /* Disable clipping on systems with only one monitor */ if (GetSystemMetrics(SM_CMONITORS) <= 1) @@ -980,7 +980,7 @@ /* Set the clipping region or make sure the window isn't clipped by disabling it explicitly. */ - SetWindowRgn(m_hWnd, hClipRgn, TRUE); + ::SetWindowRgn(m_hWnd, hClipRgn, TRUE); } } @@ -1202,7 +1202,7 @@ /* Get the client rectangle and map it to screen coordinates */ if (::GetClientRect(hwndExclude, &tmp.rcExclude) && - MapWindowPoints(hwndExclude, + ::MapWindowPoints(hwndExclude, NULL, (LPPOINT) &tmp.rcExclude, 2) != 0) @@ -1215,7 +1215,7 @@ { if (ptmp == NULL && GetClientRect(&tmp.rcExclude) && - MapWindowPoints(m_hWnd, + ::MapWindowPoints(m_hWnd, NULL, (LPPOINT) &tmp.rcExclude, 2) != 0) @@ -1344,14 +1344,14 @@ if (m_StartButton.m_hWnd != NULL) { /* Resize and reposition the button */ - dwp = DeferWindowPos(dwp, - m_StartButton.m_hWnd, - NULL, - 0, - 0, - StartSize.cx, - StartSize.cy, - SWP_NOZORDER | SWP_NOACTIVATE); + dwp = ::DeferWindowPos(dwp, + m_StartButton.m_hWnd, + NULL, + 0, + 0, + StartSize.cx, + StartSize.cy, + SWP_NOZORDER | SWP_NOACTIVATE); if (dwp == NULL) { ERR("DeferWindowPos for start button failed. lastErr=%d\n", GetLastError()); @@ -1383,14 +1383,14 @@ else ptTrayNotify.y = rcClient.bottom - TraySize.cy; - dwp = DeferWindowPos(dwp, - m_TrayNotify, - NULL, - ptTrayNotify.x, - ptTrayNotify.y, - TraySize.cx, - TraySize.cy, - SWP_NOZORDER | SWP_NOACTIVATE); + dwp = ::DeferWindowPos(dwp, + m_TrayNotify, + NULL, + ptTrayNotify.x, + ptTrayNotify.y, + TraySize.cx, + TraySize.cy, + SWP_NOZORDER | SWP_NOACTIVATE); if (dwp == NULL) { ERR("DeferWindowPos for notification area failed. lastErr=%d\n", GetLastError()); @@ -1419,14 +1419,14 @@ szRebar.cy = ptTrayNotify.y - ptRebar.y; } - dwp = DeferWindowPos(dwp, - m_Rebar, - NULL, - ptRebar.x, - ptRebar.y, - szRebar.cx, - szRebar.cy, - SWP_NOZORDER | SWP_NOACTIVATE); + dwp = ::DeferWindowPos(dwp, + m_Rebar, + NULL, + ptRebar.x, + ptRebar.y, + szRebar.cx, + szRebar.cy, + SWP_NOZORDER | SWP_NOACTIVATE); } if (dwp != NULL) @@ -1586,7 +1586,7 @@ If it was somehow destroyed just create a new tray window. */ if (m_hWnd != NULL && IsWindow()) { - if (!IsWindowVisible(m_hWnd)) + if (!::IsWindowVisible(m_hWnd)) { CheckTrayWndPosition(); @@ -1656,7 +1656,7 @@ HWND hwnd; RECT posRect; - GetWindowRect(m_StartButton.m_hWnd, &posRect); + ::GetWindowRect(m_StartButton.m_hWnd, &posRect); hwnd = CreateWindowEx(0, WC_STATIC, NULL, @@ -1693,7 +1693,7 @@ if (m_TrayPropertiesOwner) { - hTrayProp = GetLastActivePopup(m_TrayPropertiesOwner); + hTrayProp = ::GetLastActivePopup(m_TrayPropertiesOwner); if (hTrayProp != NULL && hTrayProp != m_TrayPropertiesOwner) { @@ -1886,10 +1886,10 @@ RECT rect; int backoundPart; - GetWindowRect(m_hWnd, &rect); + ::GetWindowRect(m_hWnd, &rect); OffsetRect(&rect, -rect.left, -rect.top); - hdc = GetDCEx(m_hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); + hdc = ::GetDCEx(m_hWnd, hRgn, DCX_WINDOW | DCX_INTERSECTRGN | DCX_PARENTCLIP); switch (m_Position) { @@ -1917,7 +1917,7 @@ } DrawThemeBackground(m_Theme, hdc, backoundPart, 0, &rect, 0); - ReleaseDC(m_hWnd, hdc); + ::ReleaseDC(m_hWnd, hdc); return 0; } @@ -1926,7 +1926,7 @@ HWND hwnd; RECT posRect; - GetWindowRect(m_StartButton.m_hWnd, &posRect); + ::GetWindowRect(m_StartButton.m_hWnd, &posRect); hwnd = CreateWindowEx(0, WC_STATIC, @@ -1962,7 +1962,7 @@ HWND hRunDlg; if (m_RunFileDlgOwner) { - hRunDlg = GetLastActivePopup(m_RunFileDlgOwner); + hRunDlg = ::GetLastActivePopup(m_RunFileDlgOwner); if (hRunDlg != NULL && hRunDlg != m_RunFileDlgOwner) { @@ -1982,7 +1982,7 @@ RECTL rcExclude; DWORD dwFlags = 0; - if (GetWindowRect(m_StartButton.m_hWnd, (RECT*) &rcExclude)) + if (::GetWindowRect(m_StartButton.m_hWnd, (RECT*) &rcExclude)) { switch (m_Position) { @@ -2023,7 +2023,7 @@ UINT state = m_AutoHideState; GetCursorPos(&pt); - GetWindowRect(m_hWnd, &rcCurrent); + ::GetWindowRect(m_hWnd, &rcCurrent); over = PtInRect(&rcCurrent, pt); if (m_StartButton.SendMessage( BM_GETSTATE, 0, 0) != BST_UNCHECKED) @@ -2243,7 +2243,7 @@ SetLastError(ERROR_SUCCESS); if (GetClientRect(&rcClient) && - (MapWindowPoints(m_hWnd, NULL, (LPPOINT) &rcClient, 2) != 0 || GetLastError() == ERROR_SUCCESS)) + (::MapWindowPoints(m_hWnd, NULL, (LPPOINT) &rcClient, 2) != 0 || GetLastError() == ERROR_SUCCESS)) { pt.x = (SHORT) LOWORD(lParam); pt.y = (SHORT) HIWORD(lParam); @@ -2386,7 +2386,7 @@ if (!Locked) { /* Apply clipping */ - PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); + ::PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); } return TRUE; } @@ -2415,7 +2415,7 @@ /* temporarily enable the system menu */ SetWindowStyle(m_hWnd, WS_SYSMENU, WS_SYSMENU); - hSysMenu = GetSystemMenu(m_hWnd, FALSE); + hSysMenu = ::GetSystemMenu(m_hWnd, FALSE); if (hSysMenu != NULL) { /* Disable all items that are not relevant */ @@ -2503,17 +2503,17 @@ POINT ptClient = *ppt; /* Convert the coordinates to client-coordinates */ - MapWindowPoints(NULL, m_hWnd, &ptClient, 1); - - hWndAtPt = ChildWindowFromPoint(m_hWnd, ptClient); + ::MapWindowPoints(NULL, m_hWnd, &ptClient, 1); + + hWndAtPt = ::ChildWindowFromPoint(m_hWnd, ptClient); if (hWndAtPt != NULL && - (hWndAtPt == m_Rebar || IsChild(m_Rebar, hWndAtPt))) + (hWndAtPt == m_Rebar || ::IsChild(m_Rebar, hWndAtPt))) { /* Check if the user clicked on the task switch window */ ptClient = *ppt; - MapWindowPoints(NULL, m_Rebar, &ptClient, 1); - - hWndAtPt = ChildWindowFromPointEx(m_Rebar, ptClient, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED); + ::MapWindowPoints(NULL, m_Rebar, &ptClient, 1); + + hWndAtPt = ::ChildWindowFromPointEx(m_Rebar, ptClient, CWP_SKIPINVISIBLE | CWP_SKIPDISABLED); if (hWndAtPt == m_TaskSwitch) goto HandleTrayContextMenu; @@ -2561,7 +2561,7 @@ { case NTNWM_REALIGN: /* Cause all controls to be aligned */ - PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); + ::PostMessage(m_hWnd, WM_SIZE, SIZE_RESTORED, 0); break; } } @@ -2604,7 +2604,7 @@ if (FAILED_UNEXPECTEDLY(hr)) return FALSE; - if (IsWindowVisible(hwndStartMenu)) + if (::IsWindowVisible(hwndStartMenu)) { m_StartMenuPopup->OnSelect(MPOS_CANCELLEVEL); } Modified: trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuDes… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuDeskBar.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -371,7 +371,7 @@ } RECT rcWorkArea; - GetWindowRect(GetDesktopWindow(), &rcWorkArea); + ::GetWindowRect(GetDesktopWindow(), &rcWorkArea); int cxWorkArea = rcWorkArea.right - rcWorkArea.left; int cyWorkArea = rcWorkArea.bottom - rcWorkArea.top; Modified: trunk/reactos/base/shell/rshell/CMenuToolbars.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/rshell/CMenuToo… ============================================================================== --- trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/rshell/CMenuToolbars.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -700,8 +700,8 @@ POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - ClientToScreen(m_hWnd, &a); - ClientToScreen(m_hWnd, &b); + ::ClientToScreen(m_hWnd, &a); + ::ClientToScreen(m_hWnd, &b); POINTL pt = { a.x, b.y }; RECTL rcl = { a.x, a.y, b.x, b.y }; @@ -741,8 +741,8 @@ POINT a = { rc.left, rc.top }; POINT b = { rc.right, rc.bottom }; - ClientToScreen(m_hWnd, &a); - ClientToScreen(m_hWnd, &b); + ::ClientToScreen(m_hWnd, &a); + ::ClientToScreen(m_hWnd, &b); POINT pt = { a.x, b.y }; RECT rcl = { a.x, a.y, b.x, b.y }; @@ -937,7 +937,7 @@ HWND tlw; m_menuBand->_GetTopLevelWindow(&tlw); SendMessageW(tlw, WM_CANCELMODE, 0, 0); - PostMessageW(m_hWnd, WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE)); + ::PostMessageW(m_hWnd, WM_USER_CHANGETRACKEDITEM, index, MAKELPARAM(m_isTrackingPopup, FALSE)); } else m_menuBand->_ChangeHotItem(this, btn.idCommand, 0); Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -108,10 +108,10 @@ return hr; LPWSTR input; - int inputLength = GetWindowTextLength(fCombobox.m_hWnd) + 2; + int inputLength = ::GetWindowTextLength(fCombobox.m_hWnd) + 2; input = new WCHAR[inputLength]; - GetWindowText(fCombobox.m_hWnd, input, inputLength); + ::GetWindowText(fCombobox.m_hWnd, input, inputLength); LPWSTR address; int addressLength = ExpandEnvironmentStrings(input, NULL, 0); Modified: trunk/reactos/dll/win32/browseui/internettoolbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/interne… ============================================================================== --- trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/internettoolbar.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -974,7 +974,7 @@ // RBSTR_CHANGERECT does not seem to set the proper size in the rect. // Let's make sure we fetch the actual size properly. - GetWindowRect(fMainReBar, &availableBorderSpace); + ::GetWindowRect(fMainReBar, &availableBorderSpace); neededBorderSpace.left = 0; neededBorderSpace.top = availableBorderSpace.bottom - availableBorderSpace.top; if (!fLocked) @@ -1841,7 +1841,7 @@ fStartPosition.y = GET_Y_LPARAM(msgp); RECT rc; - GetWindowRect(m_hWnd, &rc); + ::GetWindowRect(m_hWnd, &rc); fStartHeight = rc.bottom - rc.top; Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Mon Jul 6 19:20:39 2015 @@ -1306,10 +1306,10 @@ { if (uMsg == WM_NCDESTROY) { - saveWindowProc = reinterpret_cast<WNDPROC>(GetWindowLongPtr(hWnd, GWL_WNDPROC)); + saveWindowProc = reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWL_WNDPROC)); lResult = pThis->DefWindowProc(uMsg, wParam, lParam); - if (saveWindowProc == reinterpret_cast<WNDPROC>(GetWindowLongPtr(hWnd, GWL_WNDPROC))) - SetWindowLongPtr(hWnd, GWL_WNDPROC, (LONG_PTR)pThis->m_pfnSuperWindowProc); + if (saveWindowProc == reinterpret_cast<WNDPROC>(::GetWindowLongPtr(hWnd, GWL_WNDPROC))) + ::SetWindowLongPtr(hWnd, GWL_WNDPROC, (LONG_PTR)pThis->m_pfnSuperWindowProc); pThis->m_dwState |= WINSTATE_DESTROYED; } else

1 0

[tfaber] 68358: [ACTXPRXY] - Sync usrmarshal.c to Wine aka fix build
by tfaber＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: tfaber Date: Mon Jul 6 18:51:18 2015 New Revision: 68358 URL: http://svn.reactos.org/svn/reactos?rev=68358&view=rev Log: [ACTXPRXY] - Sync usrmarshal.c to Wine aka fix build Modified: trunk/reactos/dll/win32/actxprxy/usrmarshal.c Modified: trunk/reactos/dll/win32/actxprxy/usrmarshal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/actxprxy/usrmars… ============================================================================== --- trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/actxprxy/usrmarshal.c [iso-8859-1] Mon Jul 6 18:51:18 2015 @@ -215,3 +215,21 @@ TRACE("(%p)->(%p)\n", This, hwndOwner); return IModalWindow_Show(This, hwndOwner); } + +HRESULT __RPC_STUB IFolderView2_GetGroupBy_Stub( + IFolderView2 *This, + PROPERTYKEY *pkey, + BOOL *ascending) +{ + TRACE("(%p)->(%p %p)\n", This, pkey, ascending); + return IFolderView2_GetGroupBy(This, pkey, ascending); +} + +HRESULT __RPC_STUB IFolderView2_GetGroupBy_Proxy( + IFolderView2 *This, + PROPERTYKEY *pkey, + BOOL *ascending) +{ + TRACE("(%p)->(%p %p)\n", This, pkey, ascending); + return IFolderView2_RemoteGetGroupBy_Proxy(This, pkey, ascending); +}

1 0

[tfaber] 68357: [PSDK] - Add IFolderView2 definition from Wine
by tfaber＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: tfaber Date: Mon Jul 6 18:38:15 2015 New Revision: 68357 URL: http://svn.reactos.org/svn/reactos?rev=68357&view=rev Log: [PSDK] - Add IFolderView2 definition from Wine Modified: trunk/reactos/include/psdk/shobjidl.idl trunk/rostests/apitests/com/com_apitest.h Modified: trunk/reactos/include/psdk/shobjidl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/shobjidl.idl?… ============================================================================== --- trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] (original) +++ trunk/reactos/include/psdk/shobjidl.idl [iso-8859-1] Mon Jul 6 18:38:15 2015 @@ -845,6 +845,126 @@ [in, unique, size_is(cidl)] POINT* apt, [in] DWORD flags ); +} + +[v1_enum] enum tagSORTDIRECTION +{ + SORT_DESCENDING = -1, + SORT_ASCENDING = 1 +}; +typedef int SORTDIRECTION; + +typedef struct SORTCOLUMN +{ + PROPERTYKEY propkey; + SORTDIRECTION direction; +} SORTCOLUMN; + +typedef [v1_enum] enum FVTEXTTYPE +{ + FVST_EMPTYTEXT = 0 +} FVTEXTTYPE; + +[ + uuid(1af3a467-214f-4298-908e-06b03e0b39f9), + object, + pointer_default(unique) +] +interface IFolderView2 : IFolderView +{ + HRESULT SetGroupBy( + [in] REFPROPERTYKEY key, + [in] BOOL ascending); + + [local] + HRESULT GetGroupBy( + [out] PROPERTYKEY *pkey, + [out] BOOL *ascending); + + [call_as(GetGroupBy)] + HRESULT RemoteGetGroupBy( + [out] PROPERTYKEY *pkey, + [out] BOOL *ascending); + + HRESULT SetViewProperty( + [in] PCUITEMID_CHILD pidl, + [in] REFPROPERTYKEY propkey, + [in] REFPROPVARIANT propvar); + + HRESULT GetViewProperty( + [in] PCUITEMID_CHILD pidl, + [in] REFPROPERTYKEY propkey, + [out] PROPVARIANT *propvar); + + HRESULT SetTileViewProperties( + [in] PCUITEMID_CHILD pidl, + [in, string] LPCWSTR prop_list); + + HRESULT SetExtendedTileViewProperties( + [in] PCUITEMID_CHILD pidl, + [in, string] LPCWSTR prop_list); + + HRESULT SetText( + [in] FVTEXTTYPE type, + [in] LPCWSTR text); + + HRESULT SetCurrentFolderFlags( + [in] DWORD mask, + [in] DWORD flags); + + HRESULT GetCurrentFolderFlags([out] DWORD *flags); + + HRESULT GetSortColumnCount([out] int *columns); + + HRESULT SetSortColumns( + [in, size_is(count)] const SORTCOLUMN *columns, + [in] int count); + + HRESULT GetSortColumns( + [out, size_is(count)] SORTCOLUMN *columns, + [in] int count); + + HRESULT GetItem( + [in] int ittem, + [in] REFIID riid, + [out, iid_is(riid)] void **ppv); + + HRESULT GetVisibleItem( + [in] int start, + [in] BOOL previous, + [out] int *item); + + HRESULT GetSelectedItem( + [in] int start, + [out] int *item); + + HRESULT GetSelection( + [in] BOOL none_implies_folder, + [out] IShellItemArray **array); + + HRESULT GetSelectionState( + [in] PCUITEMID_CHILD pidl, + [out] DWORD *flags); + + HRESULT InvokeVerbOnSelection([in, unique, string] LPCSTR verb); + + HRESULT SetViewModeAndIconSize( + [in] FOLDERVIEWMODE mode, + [in] int size); + + HRESULT GetViewModeAndIconSize( + [out] FOLDERVIEWMODE *mode, + [out] int *size); + + HRESULT SetGroupSubsetCount([in] UINT visible_rows); + + HRESULT GetGroupSubsetCount([out] UINT *visible_rows); + + HRESULT SetRedraw([in] BOOL redraw); + + HRESULT IsMoveInSameFolder(); + + HRESULT DoRename(); } /***************************************************************************** Modified: trunk/rostests/apitests/com/com_apitest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/com/com_apitest.… ============================================================================== --- trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] (original) +++ trunk/rostests/apitests/com/com_apitest.h [iso-8859-1] Mon Jul 6 18:38:15 2015 @@ -126,7 +126,6 @@ DEFINE_GUID(IID_IFolderBandPriv, 0x47c01f95, 0xe185, 0x412c, 0xb5, 0xc5, 0x4f, 0x27, 0xdf, 0x96, 0x5a, 0xea); DEFINE_GUID(IID_IFolderFilter, 0x9cc22886, 0xdc8e, 0x11d2, 0xb1, 0xd0, 0x00, 0xc0, 0x4f, 0x8e, 0xeb, 0x3e); DEFINE_GUID(IID_IFolderFilterSite, 0xc0a651f5, 0xb48b, 0x11d2, 0xb5, 0xed, 0x00, 0x60, 0x97, 0xc6, 0x86, 0xf6); -DEFINE_GUID(IID_IFolderView2, 0x1af3a467, 0x214f, 0x4298, 0x90, 0x8e, 0x06, 0xb0, 0x3e, 0x0b, 0x39, 0xf9); DEFINE_GUID(IID_IFolderViewHost, 0x1ea58f02, 0xd55a, 0x411d, 0xb0, 0x9e, 0x9e, 0x65, 0xac, 0x21, 0x60, 0x5b); DEFINE_GUID(IID_IFolderViewSettings, 0xae8c987d, 0x8797, 0x4ed3, 0xbe, 0x72, 0x2a, 0x47, 0xdd, 0x93, 0x8d, 0xb0); DEFINE_GUID(IID_IGetNameSpaceExtensionPointer,0x287d4a71, 0x439f, 0x43a4, 0x8d, 0x5b, 0x0e, 0x0a, 0xe7, 0x1e, 0x84, 0xa9);

1 0

[cfinck] 68356: [LOCALMON] Implement a Local Port Monitor for COM, FILE: and LPT ports, usable as a drop-in replacement for the Windows original. Fully implements opening, enumerating and closing p...
by cfinck＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: cfinck Date: Mon Jul 6 12:41:06 2015 New Revision: 68356 URL: http://svn.reactos.org/svn/reactos?rev=68356&view=rev Log: [LOCALMON] Implement a Local Port Monitor for COM, FILE: and LPT ports, usable as a drop-in replacement for the Windows original. Fully implements opening, enumerating and closing ports, starting and ending documents as well as reading and writing to ports along with Xcv data transfer between Port Monitor and Port Monitor UI. Does not support IrDA printers unlike the Windows original, sorry guys :-P The Windows Local Port Monitor is partly documented in an ancient DDK sample. Additional information was gathered through API monitoring. TODO: - AddPort, DeletePort and PortIsValid Xcv functions need to be implemented. - A real privilege check needs to be added to LocalmonXcvOpenPort. - TESTING TESTING TESTING (under Windows) and fixing bugs. To test it under Windows: - Copy the compiled "localmon.dll" to the system32 directory. - Open regedit.exe and move to HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Print\Monitors\Local Port. - Replace "localspl.dll" by "localmon.dll" for the "Driver" value. [SPOOLSS] - Properly stub EnumPortsW to let localmon compile. Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/ (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/de-DE.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/en-US.rc (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/resource.h (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c (with props) branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c (with props) Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/CMakeLists.txt [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -6,6 +6,7 @@ jobs.c main.c memory.c + ports.c precomp.h printers.c printprocessors.c Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,14 @@ +/* + * PROJECT: ReactOS Spooler Router + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to ports + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +BOOL WINAPI +EnumPortsW(PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + return FALSE; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/ports.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/base/spoolss/spoolss.spec [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -62,7 +62,7 @@ @ stdcall EnumJobsW(long long long long ptr long ptr ptr) @ stub EnumMonitorsW @ stub EnumPerMachineConnectionsW -@ stub EnumPortsW +@ stdcall EnumPortsW(ptr long ptr long ptr ptr) @ stub EnumPrinterDataExW @ stub EnumPrinterDataW @ stub EnumPrinterDriversW Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/CMakeLists.txt [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -1,20 +1,22 @@ add_subdirectory(ui) -spec2def(localmon localmon.spec ADD_IMPORTLIB) +spec2def(localmon.dll localmon.spec ADD_IMPORTLIB) list(APPEND SOURCE main.c - precomp.h) + ports.c + precomp.h + tools.c + xcv.c) add_library(localmon SHARED ${SOURCE} localmon.rc - ${CMAKE_CURRENT_BINARY_DIR}/localmon_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/localmon.def) set_module_type(localmon win32dll UNICODE) target_link_libraries(localmon wine) -add_importlibs(localmon kernel32 msvcrt ntdll) +add_importlibs(localmon advapi32 spoolss user32 msvcrt kernel32 ntdll) add_pch(localmon precomp.h SOURCE) add_cd_file(TARGET localmon DESTINATION reactos/system32 FOR all) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Mon Jul 6 12:41:06 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/de-DE.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/de-DE.rc [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_LOCAL_PORT "Lokaler Anschluss" + IDS_LOCAL_MONITOR "Lokaler Monitor" +END Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/en-US.rc (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/en-US.rc [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,7 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +STRINGTABLE +BEGIN + IDS_LOCAL_PORT "Local Port" + IDS_LOCAL_MONITOR "Local Monitor" +END Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/localmon.rc [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -1,5 +1,26 @@ +/* + * PROJECT: ReactOS Local Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Resource file + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include <windef.h> +#include "resource.h" + +/* Version Information */ #define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Local Spooler Port Monitor" +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Local Port Monitor" #define REACTOS_STR_INTERNAL_NAME "localmon" #define REACTOS_STR_ORIGINAL_FILENAME "localmon.dll" #include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_DE_DE + #include "lang/de-DE.rc" +#endif +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/main.c [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Local Spooler Port Monitor + * PROJECT: ReactOS Local Port Monitor * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Main functions * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> @@ -7,8 +7,170 @@ #include "precomp.h" -LPMONITOR2 WINAPI +// Global Variables +DWORD cbLocalMonitor; +DWORD cbLocalPort; +PCWSTR pwszLocalMonitor; +PCWSTR pwszLocalPort; + +// Local Constants +static MONITOR2 _MonitorFunctions = { + sizeof(MONITOR2), // cbSize + LocalmonEnumPorts, // pfnEnumPorts + LocalmonOpenPort, // pfnOpenPort + NULL, // pfnOpenPortEx + LocalmonStartDocPort, // pfnStartDocPort + LocalmonWritePort, // pfnWritePort + LocalmonReadPort, // pfnReadPort + LocalmonEndDocPort, // pfnEndDocPort + LocalmonClosePort, // pfnClosePort + NULL, // pfnAddPort + NULL, // pfnAddPortEx + NULL, // pfnConfigurePort + NULL, // pfnDeletePort + LocalmonGetPrinterDataFromPort, // pfnGetPrinterDataFromPort + LocalmonSetPortTimeOuts, // pfnSetPortTimeOuts + LocalmonXcvOpenPort, // pfnXcvOpenPort + LocalmonXcvDataPort, // pfnXcvDataPort + LocalmonXcvClosePort, // pfnXcvClosePort + LocalmonShutdown, // pfnShutdown + NULL, // pfnSendRecvBidiDataFromPort +}; + + +static void +_LoadResources(HINSTANCE hinstDLL) +{ + LoadStringW(hinstDLL, IDS_LOCAL_MONITOR, (PWSTR)&pwszLocalMonitor, 0); + cbLocalMonitor = (wcslen(pwszLocalMonitor) + 1) * sizeof(WCHAR); + + LoadStringW(hinstDLL, IDS_LOCAL_PORT, (PWSTR)&pwszLocalPort, 0); + cbLocalPort = (wcslen(pwszLocalPort) + 1) * sizeof(WCHAR); +} + +BOOL WINAPI +DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + switch (fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDLL); + _LoadResources(hinstDLL); + break; + } + + return TRUE; +} + +void WINAPI +LocalmonShutdown(HANDLE hMonitor) +{ + PLOCALMON_HANDLE pLocalmon; + PLOCALMON_PORT pPort; + + pLocalmon = (PLOCALMON_HANDLE)hMonitor; + + // Close all virtual file ports. + while (!IsListEmpty(&pLocalmon->FilePorts)) + { + pPort = CONTAINING_RECORD(&pLocalmon->FilePorts.Flink, LOCALMON_PORT, Entry); + LocalmonClosePort((HANDLE)pPort); + } + + // Now close all regular ports and remove them from the list. + while (!IsListEmpty(&pLocalmon->Ports)) + { + pPort = CONTAINING_RECORD(&pLocalmon->Ports.Flink, LOCALMON_PORT, Entry); + RemoveEntryList(&pPort->Entry); + LocalmonClosePort((HANDLE)pPort); + } + + // Finally free the memory for the LOCALMON_HANDLE structure itself. + DllFreeSplMem(pLocalmon); +} + +PMONITOR2 WINAPI InitializePrintMonitor2(PMONITORINIT pMonitorInit, PHANDLE phMonitor) { - return NULL; + DWORD cchMaxPortName; + DWORD cchPortName; + DWORD dwErrorCode; + DWORD dwPortCount; + DWORD i; + HKEY hKey; + PMONITOR2 pReturnValue = NULL; + PLOCALMON_HANDLE pLocalmon; + PLOCALMON_PORT pPort = NULL; + + // Create a new LOCALMON_HANDLE structure. + pLocalmon = DllAllocSplMem(sizeof(LOCALMON_HANDLE)); + InitializeListHead(&pLocalmon->FilePorts); + InitializeListHead(&pLocalmon->Ports); + + // The Local Spooler Port Monitor doesn't need to care about the given registry key and functions. + // Instead it uses a well-known registry key for getting its information about local ports. Open this one. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Ports", 0, KEY_READ, &hKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Get the number of ports and the length of the largest port name. + dwErrorCode = (DWORD)RegQueryInfoKeyW(hKey, NULL, NULL, NULL, NULL, NULL, NULL, &dwPortCount, &cchMaxPortName, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegQueryInfoKeyW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Loop through all ports. + for (i = 0; i < dwPortCount; i++) + { + // Allocate memory for a new LOCALMON_PORT structure and its name. + pPort = DllAllocSplMem(sizeof(LOCALMON_PORT) + (cchMaxPortName + 1) * sizeof(WCHAR)); + if (!pPort) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + pPort->hFile = INVALID_HANDLE_VALUE; + pPort->pwszPortName = (PWSTR)((PBYTE)pPort + sizeof(LOCALMON_PORT)); + + // Get the port name. + cchPortName = cchMaxPortName + 1; + dwErrorCode = (DWORD)RegEnumValueW(hKey, i, pPort->pwszPortName, &cchPortName, NULL, NULL, NULL, NULL); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegEnumValueW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // This Port Monitor supports COM, FILE and LPT ports. Skip all others. + if (_wcsnicmp(pPort->pwszPortName, L"COM", 3) != 0 && _wcsicmp(pPort->pwszPortName, L"FILE:") != 0 && _wcsnicmp(pPort->pwszPortName, L"LPT", 3) != 0) + { + DllFreeSplMem(pPort); + continue; + } + + // Add it to the list. + InsertTailList(&pLocalmon->Ports, &pPort->Entry); + + // Don't let the cleanup routine free this. + pPort = NULL; + } + + // Return our handle and the Print Monitor functions. + *phMonitor = (HANDLE)pLocalmon; + pReturnValue = &_MonitorFunctions; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (pPort) + DllFreeSplMem(pPort); + + SetLastError(dwErrorCode); + return pReturnValue; } Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,1004 @@ +/* + * PROJECT: ReactOS Local Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Functions related to ports + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + + +// Local Constants +static const WCHAR wszNonspooledPrefix[] = L"NONSPOOLED_"; +static const DWORD cchNonspooledPrefix = _countof(wszNonspooledPrefix) - 1; + + +/** + * @name _GetNonspooledPortName + * + * Prepends "NONSPOOLED_" to a port name without colon. + * You have to free the returned buffer using DllFreeSplMem. + * + * @param pwszPortNameWithoutColon + * Result of a previous GetPortNameWithoutColon call. + * + * @return + * Buffer containing the NONSPOOLED port name or NULL in case of failure. + */ +static __inline PWSTR +_GetNonspooledPortName(PCWSTR pwszPortNameWithoutColon) +{ + DWORD cchPortNameWithoutColon; + PWSTR pwszNonspooledPortName; + + cchPortNameWithoutColon = wcslen(pwszPortNameWithoutColon); + + pwszNonspooledPortName = DllAllocSplMem((cchNonspooledPrefix + cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + if (!pwszNonspooledPortName) + { + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + return NULL; + } + + CopyMemory(pwszNonspooledPortName, wszNonspooledPrefix, cchNonspooledPrefix * sizeof(WCHAR)); + CopyMemory(&pwszNonspooledPortName[cchNonspooledPrefix], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + + return pwszNonspooledPortName; +} + +/** + * @name _ClosePortHandles + * + * Closes a port of any type if its opened. + * Removes any saved mapping or existing definition of a NONSPOOLED device mapping. + * + * @param pPort + * The port you want to close. + */ +static void +_ClosePortHandles(PLOCALMON_PORT pPort) +{ + PWSTR pwszNonspooledPortName; + PWSTR pwszPortNameWithoutColon; + + // A port is already fully closed if the file handle is invalid. + if (pPort->hFile == INVALID_HANDLE_VALUE) + return; + + // Close the file handle. + CloseHandle(pPort->hFile); + pPort->hFile = INVALID_HANDLE_VALUE; + + // A NONSPOOLED port was only created if pwszMapping contains the current port mapping. + if (!pPort->pwszMapping) + return; + + // Free the information about the current mapping. + DllFreeSplStr(pPort->pwszMapping); + pPort->pwszMapping = NULL; + + // Finally get the required strings and remove the DOS device definition for the NONSPOOLED port. + pwszPortNameWithoutColon = GetPortNameWithoutColon(pPort->pwszPortName); + if (pwszPortNameWithoutColon) + { + pwszNonspooledPortName = _GetNonspooledPortName(pwszPortNameWithoutColon); + if (pwszNonspooledPortName) + { + DefineDosDeviceW(DDD_REMOVE_DEFINITION, pwszNonspooledPortName, NULL); + DllFreeSplMem(pwszNonspooledPortName); + } + + DllFreeSplMem(pwszPortNameWithoutColon); + } +} + +/** + * @name _CreateNonspooledPort + * + * Queries the system-wide device definition of the given port. + * If such a definition exists, it's a legacy port remapped to a named pipe by the spooler. + * In this case, the function creates and opens a NONSPOOLED device definition to the most recent mapping before the current one (usually the physical device). + * + * @param pPort + * Pointer to the LOCALMON_PORT structure of the desired port. + * + * @return + * TRUE if a NONSPOOLED port was successfully created, FALSE otherwise. + * A more specific error code can be obtained through GetLastError. + * In particular, if the return value is FALSE and GetLastError returns ERROR_SUCCESS, no NONSPOOLED port is needed, + * because no system-wide device definition is available. + */ +static BOOL +_CreateNonspooledPort(PLOCALMON_PORT pPort) +{ + const WCHAR wszLocalSlashes[] = L"\\\\.\\"; + const DWORD cchLocalSlashes = _countof(wszLocalSlashes) - 1; + + const WCHAR wszSpoolerNamedPipe[] = L"\\Device\\NamedPipe\\Spooler\\"; + const DWORD cchSpoolerNamedPipe = _countof(wszSpoolerNamedPipe) - 1; + + BOOL bReturnValue = FALSE; + DWORD cchPortNameWithoutColon; + DWORD dwErrorCode; + HANDLE hToken = NULL; + PWSTR p; + PWSTR pwszDeviceMappings = NULL; + PWSTR pwszNonspooledFileName = NULL; + PWSTR pwszNonspooledPortName = NULL; + PWSTR pwszPipeName = NULL; + PWSTR pwszPortNameWithoutColon = NULL; + + // We need the port name without the trailing colon. + pwszPortNameWithoutColon = GetPortNameWithoutColon(pPort->pwszPortName); + if (!pwszPortNameWithoutColon) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + cchPortNameWithoutColon = wcslen(pwszPortNameWithoutColon); + + // The spooler has usually remapped the legacy port to a named pipe of the format in wszSpoolerNamedPipe. + // Construct the device name of this pipe. + pwszPipeName = DllAllocSplMem((cchSpoolerNamedPipe + cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + if (!pwszPipeName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + CopyMemory(pwszPipeName, wszSpoolerNamedPipe, cchSpoolerNamedPipe * sizeof(WCHAR)); + CopyMemory(&pwszPipeName[cchSpoolerNamedPipe], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + + // QueryDosDeviceW is one of the shitty APIs that gives no information about the required buffer size and wants you to know it by pure magic. + // Examples show that a value of MAX_PATH * sizeof(WCHAR) is usually taken here, so we have no other option either. + pwszDeviceMappings = DllAllocSplMem(MAX_PATH * sizeof(WCHAR)); + if (!pwszDeviceMappings) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Switch to the SYSTEM context, because we're only interested in creating NONSPOOLED ports for system-wide ports. + // User-local ports (like _some_ redirected networked ones) aren't remapped by the spooler and can be opened directly. + hToken = RevertToPrinterSelf(); + if (!hToken) + { + dwErrorCode = GetLastError(); + ERR("RevertToPrinterSelf failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // QueryDosDeviceW returns the current mapping and a list of prior mappings of this legacy port, which is managed as a DOS device in the system. + if (!QueryDosDeviceW(pwszPortNameWithoutColon, pwszDeviceMappings, MAX_PATH)) + { + // No system-wide port exists, so we also need no NONSPOOLED mapping. + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // Check if this port has already been opened by _CreateNonspooledPort previously. + if (pPort->pwszMapping) + { + // In this case, we just need to do something if the mapping has changed. + // Therefore, check if the stored mapping equals the current mapping. + if (wcscmp(pPort->pwszMapping, pwszDeviceMappings) == 0) + { + // We don't need to do anything in this case. + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + else + { + // Close the open file handle and free the memory for pwszMapping before remapping. + CloseHandle(pPort->hFile); + pPort->hFile = INVALID_HANDLE_VALUE; + + DllFreeSplStr(pPort->pwszMapping); + pPort->pwszMapping = NULL; + } + } + + // The port is usually mapped to the named pipe and this is how we received our data for printing. + // What we now need for accessing the actual port is the most recent mapping different from the named pipe. + p = pwszDeviceMappings; + + for (;;) + { + if (!*p) + { + // We reached the end of the list without finding a mapping. + ERR("Can't find a suitable mapping for the port \"%S\"!", pPort->pwszPortName); + goto Cleanup; + } + + if (_wcsicmp(p, pwszPipeName) != 0) + break; + + // Advance to the next mapping in the list. + p += wcslen(p) + 1; + } + + // We now want to create a DOS device "NONSPOOLED_<PortName>" to this mapping, so that we're able to open it through CreateFileW. + pwszNonspooledPortName = _GetNonspooledPortName(pwszPortNameWithoutColon); + if (!pwszNonspooledPortName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + // Delete a possibly existing NONSPOOLED device before creating the new one, so we don't stack up device definitions. + DefineDosDeviceW(DDD_REMOVE_DEFINITION, pwszNonspooledPortName, NULL); + + if (!DefineDosDeviceW(DDD_RAW_TARGET_PATH, pwszNonspooledPortName, p)) + { + dwErrorCode = GetLastError(); + ERR("DefineDosDeviceW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // This is all we needed to do in SYSTEM context. + ImpersonatePrinterClient(hToken); + hToken = NULL; + + // Construct the file name to our created device for CreateFileW. + pwszNonspooledFileName = DllAllocSplMem((cchLocalSlashes + cchNonspooledPrefix + cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + if (!pwszNonspooledFileName) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + CopyMemory(pwszNonspooledFileName, wszLocalSlashes, cchLocalSlashes * sizeof(WCHAR)); + CopyMemory(&pwszNonspooledFileName[cchLocalSlashes], wszNonspooledPrefix, cchNonspooledPrefix * sizeof(WCHAR)); + CopyMemory(&pwszNonspooledFileName[cchLocalSlashes + cchNonspooledPrefix], pwszPortNameWithoutColon, (cchPortNameWithoutColon + 1) * sizeof(WCHAR)); + + // Finally open it for reading and writing. + pPort->hFile = CreateFileW(pwszNonspooledFileName, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + if (pPort->hFile == INVALID_HANDLE_VALUE) + { + dwErrorCode = GetLastError(); + ERR("CreateFileW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Store the current mapping of the port, so that we can check if it has changed. + pPort->pwszMapping = AllocSplStr(pwszDeviceMappings); + if (!pPort->pwszMapping) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + bReturnValue = TRUE; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (hToken) + ImpersonatePrinterClient(hToken); + + if (pwszDeviceMappings) + DllFreeSplMem(pwszDeviceMappings); + + if (pwszNonspooledFileName) + DllFreeSplMem(pwszNonspooledFileName); + + if (pwszNonspooledPortName) + DllFreeSplMem(pwszNonspooledPortName); + + if (pwszPipeName) + DllFreeSplMem(pwszPipeName); + + if (pwszPortNameWithoutColon) + DllFreeSplMem(pwszPortNameWithoutColon); + + SetLastError(dwErrorCode); + return bReturnValue; +} + +static PLOCALMON_PORT +_FindPort(PLOCALMON_HANDLE pLocalmon, PCWSTR pwszPortName) +{ + PLIST_ENTRY pEntry; + PLOCALMON_PORT pPort; + + for (pEntry = pLocalmon->Ports.Flink; pEntry != &pLocalmon->Ports; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCALMON_PORT, Entry); + + if (wcscmp(pPort->pwszPortName, pwszPortName) == 0) + return pPort; + } + + return NULL; +} + +static DWORD +_LocalmonEnumPortsLevel1(PLOCALMON_HANDLE pLocalmon, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + DWORD cbPortName; + DWORD dwErrorCode; + DWORD dwPortCount = 0; + PBYTE pPortInfo; + PBYTE pPortString; + PLIST_ENTRY pEntry; + PLOCALMON_PORT pPort; + PORT_INFO_1W PortInfo1; + + // Count the required buffer size and the number of datatypes. + for (pEntry = pLocalmon->Ports.Flink; pEntry != &pLocalmon->Ports; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCALMON_PORT, Entry); + + cbPortName = (wcslen(pPort->pwszPortName) + 1) * sizeof(WCHAR); + *pcbNeeded += sizeof(PORT_INFO_1W) + cbPortName; + dwPortCount++; + } + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Put the strings right after the last PORT_INFO_1W structure. + pPortInfo = pPorts; + pPortString = pPorts + dwPortCount * sizeof(PORT_INFO_1W); + + // Copy over all ports. + for (pEntry = pLocalmon->Ports.Flink; pEntry != &pLocalmon->Ports; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCALMON_PORT, Entry); + + // Copy the port name. + PortInfo1.pName = (PWSTR)pPortString; + cbPortName = (wcslen(pPort->pwszPortName) + 1) * sizeof(WCHAR); + CopyMemory(pPortString, pPort->pwszPortName, cbPortName); + pPortString += cbPortName; + + // Copy the structure and advance to the next one in the output buffer. + CopyMemory(pPortInfo, &PortInfo1, sizeof(PORT_INFO_1W)); + pPortInfo += sizeof(PORT_INFO_1W); + } + + *pcReturned = dwPortCount; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +static DWORD +_LocalmonEnumPortsLevel2(PLOCALMON_HANDLE pLocalmon, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + DWORD cbPortName; + DWORD dwErrorCode; + DWORD dwPortCount = 0; + PBYTE pPortInfo; + PBYTE pPortString; + PLIST_ENTRY pEntry; + PLOCALMON_PORT pPort; + PORT_INFO_2W PortInfo2; + + // Count the required buffer size and the number of datatypes. + for (pEntry = pLocalmon->Ports.Flink; pEntry != &pLocalmon->Ports; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCALMON_PORT, Entry); + + cbPortName = (wcslen(pPort->pwszPortName) + 1) * sizeof(WCHAR); + *pcbNeeded += sizeof(PORT_INFO_2W) + cbPortName + cbLocalMonitor + cbLocalPort; + dwPortCount++; + } + + // Check if the supplied buffer is large enough. + if (cbBuf < *pcbNeeded) + { + dwErrorCode = ERROR_INSUFFICIENT_BUFFER; + goto Cleanup; + } + + // Put the strings right after the last PORT_INFO_2W structure. + pPortInfo = pPorts; + pPortString = pPorts + dwPortCount * sizeof(PORT_INFO_2W); + + // Copy over all ports. + for (pEntry = pLocalmon->Ports.Flink; pEntry != &pLocalmon->Ports; pEntry = pEntry->Flink) + { + pPort = CONTAINING_RECORD(pEntry, LOCALMON_PORT, Entry); + + // All local ports are writable and readable. + PortInfo2.fPortType = PORT_TYPE_WRITE | PORT_TYPE_READ; + PortInfo2.Reserved = 0; + + // Copy the port name. + PortInfo2.pPortName = (PWSTR)pPortString; + cbPortName = (wcslen(pPort->pwszPortName) + 1) * sizeof(WCHAR); + CopyMemory(pPortString, pPort->pwszPortName, cbPortName); + pPortString += cbPortName; + + // Copy the monitor name. + PortInfo2.pMonitorName = (PWSTR)pPortString; + CopyMemory(pPortString, pwszLocalMonitor, cbLocalMonitor); + pPortString += cbLocalMonitor; + + // Copy the description. + PortInfo2.pDescription = (PWSTR)pPortString; + CopyMemory(pPortString, pwszLocalPort, cbLocalPort); + pPortString += cbLocalPort; + + // Copy the structure and advance to the next one in the output buffer. + CopyMemory(pPortInfo, &PortInfo2, sizeof(PORT_INFO_2W)); + pPortInfo += sizeof(PORT_INFO_2W); + } + + *pcReturned = dwPortCount; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + return dwErrorCode; +} + +/** + * @name _SetTransmissionRetryTimeout + * + * Checks if the given port is a physical one and sets the transmission retry timeout in this case using the value from registry. + * + * @param pPort + * The port to operate on. + * + * @return + * TRUE if the given port is a physical one, FALSE otherwise. + */ +static BOOL +_SetTransmissionRetryTimeout(PLOCALMON_PORT pPort) +{ + COMMTIMEOUTS CommTimeouts; + + // Get the timeout from the port. + if (!GetCommTimeouts(pPort->hFile, &CommTimeouts)) + return FALSE; + + // Set the timeout using the value from registry. + CommTimeouts.WriteTotalTimeoutConstant = GetLPTTransmissionRetryTimeout() * 1000; + SetCommTimeouts(pPort->hFile, &CommTimeouts); + + return TRUE; +} + +BOOL WINAPI +LocalmonClosePort(HANDLE hPort) +{ + PLOCALMON_PORT pPort; + + // Sanity checks + if (!hPort) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + pPort = (PLOCALMON_PORT)hPort; + + if (pPort->PortType == PortType_FILE) + { + // Remove it from the list of virtual file ports. + RemoveEntryList(&pPort->Entry); + } + + // Close the file handle, free memory for pwszMapping and delete any NONSPOOLED port. + _ClosePortHandles(pPort); + + // Close any open printer handle. + if (pPort->hPrinter) + ClosePrinter(pPort->hPrinter); + + // Finally free the memory for the port itself. + DllFreeSplMem(pPort); + + SetLastError(ERROR_SUCCESS); + return TRUE; +} + +BOOL WINAPI +LocalmonEndDocPort(HANDLE hPort) +{ + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Ending a document requires starting it first :-P + if (pPort->bStartedDoc) + { + // Close all ports opened in StartDocPort. + // That is, all but physical LPT ports (opened in OpenPort). + if (pPort->PortType != PortType_PhysicalLPT) + _ClosePortHandles(pPort); + + // Report our progress. + SetJobW(pPort->hPrinter, pPort->dwJobID, 0, NULL, JOB_CONTROL_SENT_TO_PRINTER); + + // We're done with the printer. + ClosePrinter(pPort->hPrinter); + pPort->hPrinter = NULL; + } + + SetLastError(ERROR_SUCCESS); + return TRUE; +} + +BOOL WINAPI +LocalmonEnumPorts(HANDLE hMonitor, PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned) +{ + DWORD dwErrorCode; + + // Sanity checks + if (!hMonitor || (cbBuf && !pPorts) || !pcbNeeded || !pcReturned) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + if (Level > 2) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Begin counting. + *pcbNeeded = 0; + *pcReturned = 0; + + // The function behaves differently for each level. + if (Level == 1) + dwErrorCode = _LocalmonEnumPortsLevel1((PLOCALMON_HANDLE)hMonitor, pPorts, cbBuf, pcbNeeded, pcReturned); + else if (Level == 2) + dwErrorCode = _LocalmonEnumPortsLevel2((PLOCALMON_HANDLE)hMonitor, pPorts, cbBuf, pcbNeeded, pcReturned); + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +/* + * @name LocalmonSetPortTimeOuts + * + * Performs a DeviceIoControl call for the given port. + * + * @param hPort + * The port to operate on. + * + * @param ControlID + * The dwIoControlCode passed to DeviceIoControl. Must not be zero! + * + * @param pValueName + * This parameter is ignored. + * + * @param lpInBuffer + * The lpInBuffer passed to DeviceIoControl. + * + * @param cbInBuffer + * The nInBufferSize passed to DeviceIoControl. + * + * @param lpOutBuffer + * The lpOutBuffer passed to DeviceIoControl. + * + * @param cbOutBuffer + * The nOutBufferSize passed to DeviceIoControl. + * + * @param lpcbReturned + * The lpBytesReturned passed to DeviceIoControl. Must not be zero! + * + * @return + * TRUE if the DeviceIoControl call was successful, FALSE otherwise. + * A more specific error code can be obtained through GetLastError. + */ +BOOL WINAPI +LocalmonGetPrinterDataFromPort(HANDLE hPort, DWORD ControlID, PWSTR pValueName, PWSTR lpInBuffer, DWORD cbInBuffer, PWSTR lpOutBuffer, DWORD cbOutBuffer, PDWORD lpcbReturned) +{ + BOOL bOpenedPort = FALSE; + DWORD dwErrorCode; + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort || !ControlID || !lpcbReturned) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // If this is a serial port, a temporary file handle may be opened. + if (pPort->PortType == PortType_PhysicalCOM) + { + if (_CreateNonspooledPort(pPort)) + { + bOpenedPort = TRUE; + } + else if (GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else if (pPort->hFile == INVALID_HANDLE_VALUE) + { + // All other port types need to be opened already. + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Pass the parameters to DeviceIoControl. + if (!DeviceIoControl(pPort->hFile, ControlID, lpInBuffer, cbInBuffer, lpOutBuffer, cbOutBuffer, lpcbReturned, NULL)) + { + dwErrorCode = GetLastError(); + ERR("DeviceIoControl failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (bOpenedPort) + _ClosePortHandles(pPort); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalmonOpenPort(HANDLE hMonitor, PWSTR pName, PHANDLE pHandle) +{ + DWORD dwErrorCode; + PLOCALMON_HANDLE pLocalmon = (PLOCALMON_HANDLE)hMonitor; + PLOCALMON_PORT pPort; + + // Sanity checks + if (!pLocalmon || !pName || !pHandle) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Check if this is a FILE: port. + if (_wcsicmp(pName, L"FILE:") == 0) + { + // For FILE:, we create a virtual port for each request. + pPort = DllAllocSplMem(sizeof(LOCALMON_PORT)); + pPort->PortType = PortType_FILE; + pPort->hFile = INVALID_HANDLE_VALUE; + + // Add it to the list of file ports. + InsertTailList(&pLocalmon->FilePorts, &pPort->Entry); + } + else + { + // Check if the port name is valid. + pPort = _FindPort(pLocalmon, pName); + if (!pPort) + { + dwErrorCode = ERROR_UNKNOWN_PORT; + goto Cleanup; + } + + // Even if this API is called OpenPort, port file handles aren't always opened here :-P + // Windows only does this for physical LPT ports here to enable bidirectional communication with the printer outside of jobs (using ReadPort and WritePort). + // The others are only opened per job in StartDocPort. + if (_wcsnicmp(pName, L"LPT", 3) == 0) + { + // Try to create a NONSPOOLED port and open it. + if (_CreateNonspooledPort(pPort)) + { + // Set the transmission retry timeout for the ReadPort and WritePort calls. + // This also checks if this port is a physical one. + if (_SetTransmissionRetryTimeout(pPort)) + { + // This is definitely a physical LPT port! + pPort->PortType = PortType_PhysicalLPT; + } + else + { + // This is no physical port, so don't keep its handle open all the time. + _ClosePortHandles(pPort); + pPort->PortType = PortType_OtherLPT; + } + } + else if (GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else + { + // This can only be a COM port. + pPort->PortType = PortType_PhysicalCOM; + } + } + + // Return our fetched LOCALMON_PORT structure in the handle. + *pHandle = (PHANDLE)pPort; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +/* + * @name LocalmonSetPortTimeOuts + * + * Performs a SetCommTimeouts call for the given port. + * + * @param hPort + * The port to operate on. + * + * @param lpCTO + * Pointer to a COMMTIMEOUTS structure that is passed to SetCommTimeouts. + * + * @param Reserved + * Reserved parameter, must be 0. + * + * @return + * TRUE if the SetCommTimeouts call was successful, FALSE otherwise. + * A more specific error code can be obtained through GetLastError. + */ +BOOL WINAPI +LocalmonSetPortTimeOuts(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, DWORD Reserved) +{ + BOOL bOpenedPort = FALSE; + DWORD dwErrorCode; + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort || !lpCTO) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // If this is a serial port, a temporary file handle may be opened. + if (pPort->PortType == PortType_PhysicalCOM) + { + if (_CreateNonspooledPort(pPort)) + { + bOpenedPort = TRUE; + } + else if (GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else if (pPort->hFile == INVALID_HANDLE_VALUE) + { + // All other port types need to be opened already. + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Finally pass the parameters to SetCommTimeouts. + if (!SetCommTimeouts(pPort->hFile, lpCTO)) + { + dwErrorCode = GetLastError(); + ERR("SetCommTimeouts failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (bOpenedPort) + _ClosePortHandles(pPort); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalmonReadPort(HANDLE hPort, PBYTE pBuffer, DWORD cbBuffer, PDWORD pcbRead) +{ + BOOL bOpenedPort = FALSE; + DWORD dwErrorCode; + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort || (cbBuffer && !pBuffer) || !pcbRead) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Reading is only supported for physical ports. + if (pPort->PortType != PortType_PhysicalCOM && pPort->PortType != PortType_PhysicalLPT) + { + dwErrorCode = ERROR_INVALID_HANDLE; + goto Cleanup; + } + + // If this is a serial port, a temporary file handle may be opened. + if (pPort->PortType == PortType_PhysicalCOM) + { + if (_CreateNonspooledPort(pPort)) + { + bOpenedPort = TRUE; + } + else if (GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + + // Pass the parameters to ReadFile. + if (!ReadFile(pPort->hFile, pBuffer, cbBuffer, pcbRead, NULL)) + { + dwErrorCode = GetLastError(); + ERR("ReadFile failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + +Cleanup: + if (bOpenedPort) + _ClosePortHandles(pPort); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalmonStartDocPort(HANDLE hPort, PWSTR pPrinterName, DWORD JobId, DWORD Level, PBYTE pDocInfo) +{ + DWORD dwErrorCode; + PDOC_INFO_1W pDocInfo1 = (PDOC_INFO_1W)pDocInfo; // DOC_INFO_1W is the least common denominator for both DOC_INFO levels. + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort || !pPrinterName || (pPort->PortType == PortType_FILE && (!pDocInfo1 || !pDocInfo1->pOutputFile || !*pDocInfo1->pOutputFile))) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + if (Level > 2) + { + dwErrorCode = ERROR_INVALID_LEVEL; + goto Cleanup; + } + + // Calling StartDocPort multiple times isn't considered a failure, but we don't need to do anything then. + if (pPort->bStartedDoc) + { + dwErrorCode = ERROR_SUCCESS; + goto Cleanup; + } + + // Open a handle to the given printer for later reporting our progress using SetJobW. + if (!OpenPrinterW(pPrinterName, &pPort->hPrinter, NULL)) + { + dwErrorCode = GetLastError(); + ERR("OpenPrinterW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // We need our Job ID for SetJobW as well. + pPort->dwJobID = JobId; + + // Check the port type. + if (pPort->PortType == PortType_PhysicalLPT) + { + // Update the NONSPOOLED mapping if the port mapping has changed since our OpenPort call. + if (!_CreateNonspooledPort(pPort) && GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + + // Update the transmission retry timeout as well. + _SetTransmissionRetryTimeout(pPort); + } + else if(pPort->PortType == PortType_FILE) + { + // This is a FILE: port. Open the output file given in the Document Info. + pPort->hFile = CreateFileW(pDocInfo1->pOutputFile, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, 0, NULL); + if (pPort->hFile == INVALID_HANDLE_VALUE) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else + { + // This is a COM port or a non-physical LPT port. We open NONSPOOLED ports for these per job. + if (!_CreateNonspooledPort(pPort)) + { + if (GetLastError() == ERROR_SUCCESS) + { + // This is a user-local instead of a system-wide port. + // Such local ports haven't been remapped by the spooler, so we can just open them. + pPort->hFile = CreateFileW(pPort->pwszPortName, GENERIC_WRITE, FILE_SHARE_READ, NULL, OPEN_ALWAYS, 0, NULL); + if (pPort->hFile == INVALID_HANDLE_VALUE) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + } + + // We were successful! + dwErrorCode = ERROR_SUCCESS; + pPort->bStartedDoc = TRUE; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} + +BOOL WINAPI +LocalmonWritePort(HANDLE hPort, PBYTE pBuffer, DWORD cbBuf, PDWORD pcbWritten) +{ + BOOL bOpenedPort = FALSE; + DWORD dwErrorCode; + PLOCALMON_PORT pPort = (PLOCALMON_PORT)hPort; + + // Sanity checks + if (!pPort || (cbBuf && !pBuffer) || !pcbWritten) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // If this is a serial port, a temporary file handle may be opened. + if (pPort->PortType == PortType_PhysicalCOM) + { + if (_CreateNonspooledPort(pPort)) + { + bOpenedPort = TRUE; + } + else if (GetLastError() != ERROR_SUCCESS) + { + dwErrorCode = GetLastError(); + goto Cleanup; + } + } + else if (pPort->hFile == INVALID_HANDLE_VALUE) + { + // All other port types need to be opened already. + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + // Pass the parameters to WriteFile. + if (!WriteFile(pPort->hFile, pBuffer, cbBuf, pcbWritten, NULL)) + { + dwErrorCode = GetLastError(); + ERR("WriteFile failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // If something was written down, we consider that a success, otherwise it's a timeout. + if (*pcbWritten) + dwErrorCode = ERROR_SUCCESS; + else + dwErrorCode = ERROR_TIMEOUT; + +Cleanup: + if (bOpenedPort) + _ClosePortHandles(pPort); + + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/ports.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/precomp.h [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -1,5 +1,5 @@ /* - * PROJECT: ReactOS Local Spooler Port Monitor + * PROJECT: ReactOS Local Port Monitor * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation * PURPOSE: Precompiled Header for all source files * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> @@ -9,14 +9,96 @@ #define _PRECOMP_H #define WIN32_NO_STATUS +#include <stdlib.h> + #include <windef.h> #include <winbase.h> #include <wingdi.h> #include <winreg.h> #include <winspool.h> #include <winsplp.h> +#include <winuser.h> +#include <ndk/rtlfuncs.h> + +#include <spoolss.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(localmon); +#include "resource.h" + +// Structures +/** + * Describes the port handle returned by LocalmonOpenPort. + * Manages a legacy port (COM/LPT) or virtual FILE: port for printing as well as its associated printer and job. + */ +typedef struct _LOCALMON_PORT +{ + LIST_ENTRY Entry; + enum { + PortType_FILE, /** A virtual port for redirecting the document into a file. */ + PortType_PhysicalCOM, /** A physical serial port (COM) */ + PortType_PhysicalLPT, /** A physical parallel port (LPT) */ + PortType_OtherLPT /** A non-physical parallel port (e.g. a redirected one over network using "net use LPT1 ...") */ + } + PortType; + BOOL bStartedDoc; /** Whether a document has been started with StartDocPort. */ + DWORD dwJobID; /** ID of the printing job we are processing (for later reporting progress using SetJobW). */ + HANDLE hFile; /** Handle to the opened port or INVALID_HANDLE_VALUE if it isn't currently opened. */ + HANDLE hPrinter; /** Handle to the printer for the job on this port (for using SetJobW). */ + PWSTR pwszMapping; /** The current mapping of the DOS Device corresponding to this port at the time _CreateNonspooledPort has been called. */ + PWSTR pwszPortName; /** The name of this port including the trailing colon. Empty for virtual file ports. */ +} +LOCALMON_PORT, *PLOCALMON_PORT; + +/** + * Describes the monitor handle returned by InitializePrintMonitor2. + * Manages all available ports in this instance. + */ +typedef struct _LOCALMON_HANDLE +{ + LIST_ENTRY FilePorts; /** Virtual ports created for every document that's redirected to an output file. */ + LIST_ENTRY Ports; /** Ports found on the system (except for FILE:) */ +} +LOCALMON_HANDLE, *PLOCALMON_HANDLE; + +/** + * Describes the Xcv handle returned by LocalmonXcvOpenPort. + * Manages the required data for the Xcv* calls. + */ +typedef struct _LOCALMON_XCV +{ + ACCESS_MASK GrantedAccess; + PWSTR pwszObject; +} +LOCALMON_XCV, *PLOCALMON_XCV; + +// main.c +extern DWORD cbLocalMonitor; +extern DWORD cbLocalPort; +extern PCWSTR pwszLocalMonitor; +extern PCWSTR pwszLocalPort; +void WINAPI LocalmonShutdown(HANDLE hMonitor); + +// ports.c +BOOL WINAPI LocalmonClosePort(HANDLE hPort); +BOOL WINAPI LocalmonEndDocPort(HANDLE hPort); +BOOL WINAPI LocalmonEnumPorts(HANDLE hMonitor, PWSTR pName, DWORD Level, PBYTE pPorts, DWORD cbBuf, PDWORD pcbNeeded, PDWORD pcReturned); +BOOL WINAPI LocalmonGetPrinterDataFromPort(HANDLE hPort, DWORD ControlID, PWSTR pValueName, PWSTR lpInBuffer, DWORD cbInBuffer, PWSTR lpOutBuffer, DWORD cbOutBuffer, PDWORD lpcbReturned); +BOOL WINAPI LocalmonOpenPort(HANDLE hMonitor, PWSTR pName, PHANDLE pHandle); +BOOL WINAPI LocalmonReadPort(HANDLE hPort, PBYTE pBuffer, DWORD cbBuffer, PDWORD pcbRead); +BOOL WINAPI LocalmonSetPortTimeOuts(HANDLE hPort, LPCOMMTIMEOUTS lpCTO, DWORD Reserved); +BOOL WINAPI LocalmonStartDocPort(HANDLE hPort, PWSTR pPrinterName, DWORD JobId, DWORD Level, PBYTE pDocInfo); +BOOL WINAPI LocalmonWritePort(HANDLE hPort, PBYTE pBuffer, DWORD cbBuf, PDWORD pcbWritten); + +// tools.c +BOOL DoesPortExist(PCWSTR pwszPortName); +DWORD GetLPTTransmissionRetryTimeout(); +PWSTR GetPortNameWithoutColon(PCWSTR pwszPortName); + +// xcv.c +BOOL WINAPI LocalmonXcvClosePort(HANDLE hXcv); +DWORD WINAPI LocalmonXcvDataPort(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded); +BOOL WINAPI LocalmonXcvOpenPort(HANDLE hMonitor, PCWSTR pszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv); + #endif Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/resource.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/resource.h (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/resource.h [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,11 @@ +/* + * PROJECT: ReactOS Local Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Resource IDs + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#pragma once + +#define IDS_LOCAL_PORT 500 +#define IDS_LOCAL_MONITOR 507 Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,155 @@ +/* + * PROJECT: ReactOS Local Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Various support functions shared by multiple files + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +/** + * @name DoesPortExist + * + * Checks all Port Monitors installed on the local system to find out if a given port already exists. + * + * @param pwszPortName + * The port name to check. + * + * @return + * TRUE if a port with that name already exists on the local system. + * If the return value is FALSE, either the port doesn't exist or an error occurred. + * Use GetLastError in this case to check the error case. + */ +BOOL +DoesPortExist(PCWSTR pwszPortName) +{ + BOOL bReturnValue = FALSE; + DWORD cbNeeded; + DWORD dwErrorCode; + DWORD dwReturned; + DWORD i; + PPORT_INFO_1W p; + PPORT_INFO_1W pPortInfo1 = NULL; + + // Determine the required buffer size. + EnumPortsW(NULL, 1, NULL, 0, &cbNeeded, &dwReturned); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + { + dwErrorCode = GetLastError(); + ERR("EnumPortsW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Allocate a buffer large enough. + pPortInfo1 = DllAllocSplMem(cbNeeded); + if (!pPortInfo1) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + // Now get the actual port information. + if (!EnumPortsW(NULL, 1, (PBYTE)pPortInfo1, cbNeeded, &cbNeeded, &dwReturned)) + { + dwErrorCode = GetLastError(); + ERR("EnumPortsW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // We were successful! Loop through all returned ports. + dwErrorCode = ERROR_SUCCESS; + p = pPortInfo1; + + for (i = 0; i < dwReturned; i++) + { + // Check if this existing port matches our queried one. + if (wcsicmp(p->pName, pwszPortName) == 0) + { + bReturnValue = TRUE; + goto Cleanup; + } + + p++; + } + +Cleanup: + if (pPortInfo1) + DllFreeSplMem(pPortInfo1); + + SetLastError(dwErrorCode); + return bReturnValue; +} + +DWORD +GetLPTTransmissionRetryTimeout() +{ + DWORD cbBuffer; + DWORD dwReturnValue = 90; // Use 90 seconds as default if we fail to read from registry. + HKEY hKey; + LSTATUS lStatus; + + // Six digits is the most you can enter in Windows' LocalUI.dll. + // Larger values make it crash, so introduce a limit here. + WCHAR wszBuffer[6 + 1]; + + // Open the key where our value is stored. + lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Windows", 0, KEY_READ, &hKey); + if (lStatus != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %ld!\n", lStatus); + goto Cleanup; + } + + // Query the value. + cbBuffer = sizeof(wszBuffer); + lStatus = RegQueryValueExW(hKey, L"TransmissionRetryTimeout", NULL, NULL, (PBYTE)wszBuffer, &cbBuffer); + if (lStatus != ERROR_SUCCESS) + { + ERR("RegQueryValueExW failed with status %ld!\n", lStatus); + goto Cleanup; + } + + // Return it converted to a DWORD. + dwReturnValue = wcstoul(wszBuffer, NULL, 10); + +Cleanup: + if (hKey) + RegCloseKey(hKey); + + return dwReturnValue; +} + +/** + * @name GetPortNameWithoutColon + * + * Most of the time, we operate on port names with a trailing colon. But some functions require the name without the trailing colon. + * This function returns the port name without the colon. You have to free the returned buffer using DllFreeSplMem. + * + * @param pwszPortName + * The port name with colon + * + * @return + * Buffer containing the port name without a colon or NULL in case of failure. + */ +PWSTR +GetPortNameWithoutColon(PCWSTR pwszPortName) +{ + DWORD cchPortName; + PWSTR pwszPortNameWithoutColon; + + // Every port in our port list has a trailing colon, so we just need to remove the last character of the string. + cchPortName = wcslen(pwszPortName) - 1; + + pwszPortNameWithoutColon = DllAllocSplMem((cchPortName + 1) * sizeof(WCHAR)); + if (!pwszPortNameWithoutColon) + { + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + return NULL; + } + + CopyMemory(pwszPortNameWithoutColon, pwszPortName, cchPortName * sizeof(WCHAR)); + pwszPortNameWithoutColon[cchPortName] = 0; + + return pwszPortNameWithoutColon; +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/tools.c ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c (added) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c [iso-8859-1] Mon Jul 6 12:41:06 2015 @@ -0,0 +1,440 @@ +/* + * PROJECT: ReactOS Local Port Monitor + * LICENSE: GNU LGPL v2.1 or any later version as published by the Free Software Foundation + * PURPOSE: Implementation of Xcv* and support functions + * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + */ + +#include "precomp.h" + +static DWORD +_HandleAddPort(PLOCALMON_XCV pXcv, PBYTE pInputData, PDWORD pcbOutputNeeded) +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/** + * @name _HandleConfigureLPTPortCommandOK + * + * Writes the value for "TransmissionRetryTimeout" to the registry. Checks for granted SERVER_ACCESS_ADMINISTER access. + * Actually the opposite of _HandleGetTransmissionRetryTimeout, but name kept for compatibility. + * + * @param pXcv + * Pointer to the LOCALMON_XCV structure of the currently opened Xcv port. + * + * @param pInputData + * Pointer to a Unicode string containing the value to be written to the registry. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that will be zeroed on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandleConfigureLPTPortCommandOK(PLOCALMON_XCV pXcv, PBYTE pInputData, PDWORD pcbOutputNeeded) +{ + DWORD cbBuffer; + DWORD dwErrorCode; + HKEY hKey = NULL; + HKEY hToken = NULL; + + // Sanity checks + if (!pXcv || !pInputData || !pcbOutputNeeded) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + *pcbOutputNeeded = 0; + + // This action can only happen at SERVER_ACCESS_ADMINISTER access level. + if (!(pXcv->GrantedAccess & SERVER_ACCESS_ADMINISTER)) + { + dwErrorCode = ERROR_ACCESS_DENIED; + goto Cleanup; + } + + // Switch to the SYSTEM context for modifying the registry. + hToken = RevertToPrinterSelf(); + if (!hToken) + { + dwErrorCode = GetLastError(); + ERR("RevertToPrinterSelf failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Open the key where our value is stored. + dwErrorCode = (DWORD)RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Windows", 0, KEY_SET_VALUE, &hKey); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegOpenKeyExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + + // We don't use cbInputData here, because the buffer pInputData could be bigger than the data it contains. + cbBuffer = (wcslen((PWSTR)pInputData) + 1) * sizeof(WCHAR); + + // Write the value to the registry. + dwErrorCode = (DWORD)RegSetValueExW(hKey, L"TransmissionRetryTimeout", 0, REG_SZ, pInputData, cbBuffer); + if (dwErrorCode != ERROR_SUCCESS) + { + ERR("RegSetValueExW failed with status %lu!\n", dwErrorCode); + goto Cleanup; + } + +Cleanup: + if (hKey) + RegCloseKey(hKey); + + if (hToken) + ImpersonatePrinterClient(hToken); + + return dwErrorCode; +} + +static DWORD +_HandleDeletePort(PLOCALMON_XCV pXcv, PBYTE pInputData, PDWORD pcbOutputNeeded) +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/** + * @name _HandleGetDefaultCommConfig + * + * Gets the default configuration of a legacy port. + * The opposite function is _HandleSetDefaultCommConfig. + * + * @param pInputData + * The port name (without colon!) whose default configuration you want to get. + * + * @param pOutputData + * Pointer to a COMMCONFIG structure that will receive the configuration information. + * + * @param cbOutputData + * Size of the variable pointed to by pOutputData. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that contains the required size for pOutputData on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandleGetDefaultCommConfig(PBYTE pInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + // Sanity checks + if (!pInputData || !pcbOutputNeeded) + return ERROR_INVALID_PARAMETER; + + *pcbOutputNeeded = sizeof(COMMCONFIG); + + // Check if the supplied buffer is large enough. + if (cbOutputData < *pcbOutputNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Finally get the port configuration. + if (!GetDefaultCommConfigW((PCWSTR)pInputData, (LPCOMMCONFIG)pOutputData, pcbOutputNeeded)) + return GetLastError(); + + return ERROR_SUCCESS; +} + +/** + * @name _HandleGetTransmissionRetryTimeout + * + * Reads the value for "TransmissionRetryTimeout" from the registry and converts it to a DWORD. + * The opposite function is _HandleConfigureLPTPortCommandOK. + * + * @param pOutputData + * Pointer to a DWORD that will receive the timeout value. + * + * @param cbOutputData + * Size of the variable pointed to by pOutputData. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that contains the required size for pOutputData on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandleGetTransmissionRetryTimeout(PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + DWORD dwTimeout; + + // Sanity checks + if (!pOutputData || !pcbOutputNeeded) + return ERROR_INVALID_PARAMETER; + + *pcbOutputNeeded = sizeof(DWORD); + + // Check if the supplied buffer is large enough. + if (cbOutputData < *pcbOutputNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Retrieve and copy the number. + dwTimeout = GetLPTTransmissionRetryTimeout(); + CopyMemory(pOutputData, &dwTimeout, sizeof(DWORD)); + return ERROR_SUCCESS; +} + +/** + * @name _HandleMonitorUI + * + * Returns the filename of the associated UI DLL for this Port Monitor. + * + * @param pOutputData + * Pointer to a Unicode string that will receive the DLL filename. + * + * @param cbOutputData + * Size of the variable pointed to by pOutputData. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that contains the required size for pOutputData on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandleMonitorUI(PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + const WCHAR wszMonitorUI[] = L"LocalUI.dll"; + + // Sanity checks + if (!pOutputData || !pcbOutputNeeded) + return ERROR_INVALID_PARAMETER; + + *pcbOutputNeeded = sizeof(wszMonitorUI); + + // Check if the supplied buffer is large enough. + if (cbOutputData < *pcbOutputNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Copy the string. + CopyMemory(pOutputData, wszMonitorUI, sizeof(wszMonitorUI)); + return ERROR_SUCCESS; +} + +/** + * @name _HandlePortExists + * + * Checks all Port Monitors installed on the local system to find out if a given port already exists. + * + * @param pInputData + * Pointer to a Unicode string specifying the port name to check. + * + * @param pOutputData + * Pointer to a BOOL that receives the result of the check. + * + * @param cbOutputData + * Size of the variable pointed to by pOutputData. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that contains the required size for pOutputData on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandlePortExists(PBYTE pInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + // Sanity checks + if (!pInputData || !pOutputData || !pcbOutputNeeded) + return ERROR_INVALID_PARAMETER; + + *pcbOutputNeeded = sizeof(BOOL); + + // Check if the supplied buffer is large enough. + if (cbOutputData < *pcbOutputNeeded) + return ERROR_INSUFFICIENT_BUFFER; + + // Return the check result and error code. + *(PBOOL)pOutputData = DoesPortExist((PCWSTR)pInputData); + return GetLastError(); +} + +static DWORD +_HandlePortIsValid(PBYTE pInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/** + * @name _HandleSetDefaultCommConfig + * + * Sets the default configuration of a legacy port. Checks for granted SERVER_ACCESS_ADMINISTER access. + * You have to supply the port name (with colon!) in XcvOpenPort. + * The opposite function is _HandleGetDefaultCommConfig. + * + * @param pXcv + * Pointer to the LOCALMON_XCV structure of the currently opened Xcv port. + * + * @param pInputData + * Pointer to the COMMCONFIG structure that shall be passed to SetDefaultCommConfigW. + * + * @param pcbOutputNeeded + * Pointer to a DWORD that will be zeroed on return. + * + * @return + * An error code indicating success or failure. + */ +static DWORD +_HandleSetDefaultCommConfig(PLOCALMON_XCV pXcv, PBYTE pInputData, PDWORD pcbOutputNeeded) +{ + DWORD dwErrorCode; + HANDLE hToken = NULL; + LPCOMMCONFIG pCommConfig; + PWSTR pwszPortNameWithoutColon = NULL; + + // Sanity checks + // pwszObject needs to be at least 2 characters long to be a port name with a trailing colon. + if (!pXcv || !pXcv->pwszObject || !pXcv->pwszObject[0] || !pXcv->pwszObject[1] || !pInputData || !pcbOutputNeeded) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + *pcbOutputNeeded = 0; + + // This action can only happen at SERVER_ACCESS_ADMINISTER access level. + if (!(pXcv->GrantedAccess & SERVER_ACCESS_ADMINISTER)) + { + dwErrorCode = ERROR_ACCESS_DENIED; + goto Cleanup; + } + + // SetDefaultCommConfigW needs the port name without colon. + pwszPortNameWithoutColon = GetPortNameWithoutColon(pXcv->pwszObject); + if (!pwszPortNameWithoutColon) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + goto Cleanup; + } + + // Switch to the SYSTEM context for setting the port configuration. + hToken = RevertToPrinterSelf(); + if (!hToken) + { + dwErrorCode = GetLastError(); + ERR("RevertToPrinterSelf failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + // Finally pass the parameters to SetDefaultCommConfigW. + pCommConfig = (LPCOMMCONFIG)pInputData; + if (!SetDefaultCommConfigW(pwszPortNameWithoutColon, pCommConfig, pCommConfig->dwSize)) + { + dwErrorCode = GetLastError(); + ERR("SetDefaultCommConfigW failed with error %lu!\n", dwErrorCode); + goto Cleanup; + } + + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + if (hToken) + ImpersonatePrinterClient(hToken); + + if (pwszPortNameWithoutColon) + DllFreeSplMem(pwszPortNameWithoutColon); + + return dwErrorCode; +} + +BOOL WINAPI +LocalmonXcvClosePort(HANDLE hXcv) +{ + // Sanity checks + if (!hXcv) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + // Free the memory. + DllFreeSplMem(hXcv); + SetLastError(ERROR_SUCCESS); + return TRUE; +} + +DWORD WINAPI +LocalmonXcvDataPort(HANDLE hXcv, PCWSTR pszDataName, PBYTE pInputData, DWORD cbInputData, PBYTE pOutputData, DWORD cbOutputData, PDWORD pcbOutputNeeded) +{ + // Sanity checks + if (!pszDataName) + return ERROR_INVALID_PARAMETER; + + // Call the appropriate handler for the requested data name. + if (wcscmp(pszDataName, L"AddPort") == 0) + return _HandleAddPort((PLOCALMON_XCV)hXcv, pInputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"ConfigureLPTPortCommandOK") == 0) + return _HandleConfigureLPTPortCommandOK((PLOCALMON_XCV)hXcv, pInputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"DeletePort") == 0) + return _HandleDeletePort((PLOCALMON_XCV)hXcv, pInputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"GetDefaultCommConfig") == 0) + return _HandleGetDefaultCommConfig(pInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"GetTransmissionRetryTimeout") == 0) + return _HandleGetTransmissionRetryTimeout(pOutputData, cbOutputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"MonitorUI") == 0) + return _HandleMonitorUI(pOutputData, cbOutputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"PortExists") == 0) + return _HandlePortExists(pInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"PortIsValid") == 0) + return _HandlePortIsValid(pInputData, pOutputData, cbOutputData, pcbOutputNeeded); + + if (wcscmp(pszDataName, L"SetDefaultCommConfig") == 0) + return _HandleSetDefaultCommConfig((PLOCALMON_XCV)hXcv, pInputData, pcbOutputNeeded); + + return ERROR_INVALID_PARAMETER; +} + +BOOL WINAPI +LocalmonXcvOpenPort(HANDLE hMonitor, PCWSTR pwszObject, ACCESS_MASK GrantedAccess, PHANDLE phXcv) +{ + DWORD cbObject = 0; + DWORD dwErrorCode; + PLOCALMON_XCV pXcv; + + // Sanity checks + if (!hMonitor || !phXcv) + { + dwErrorCode = ERROR_INVALID_PARAMETER; + goto Cleanup; + } + + if (pwszObject) + cbObject = (wcslen(pwszObject) + 1) * sizeof(WCHAR); + + // Create a new LOCALMON_XCV structure and fill the relevant fields. + pXcv = DllAllocSplMem(sizeof(LOCALMON_XCV) + cbObject); + if (!pXcv) + { + dwErrorCode = ERROR_NOT_ENOUGH_MEMORY; + ERR("DllAllocSplMem failed with error %lu!\n", GetLastError()); + goto Cleanup; + } + + pXcv->GrantedAccess = GrantedAccess; + + if (cbObject) + { + pXcv->pwszObject = (PWSTR)((PBYTE)pXcv + sizeof(LOCALMON_XCV)); + CopyMemory(pXcv->pwszObject, pwszObject, cbObject); + } + + // Return it as the Xcv handle. + *phXcv = (HANDLE)pXcv; + dwErrorCode = ERROR_SUCCESS; + +Cleanup: + SetLastError(dwErrorCode); + return (dwErrorCode == ERROR_SUCCESS); +} Propchange: branches/colins-printing-for-freedom/reactos/win32ss/printing/monitors/localmon/xcv.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cfinck] 68355: [PSDK] Source our winspool.h from MinGW-w64. Our current version was still based on MinGW w32api from 2005 and missing lots of definitions added ages ago.
by cfinck＠svn.reactos.org 06 Jul '15

06 Jul '15

Author: cfinck Date: Mon Jul 6 09:57:09 2015 New Revision: 68355 URL: http://svn.reactos.org/svn/reactos?rev=68355&view=rev Log: [PSDK] Source our winspool.h from MinGW-w64. Our current version was still based on MinGW w32api from 2005 and missing lots of definitions added ages ago. Modified: branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/colins-printing-for-freedom/reactos/include/psdk/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea…

1 0

[ekohl] 68354: [USETUP] Make the keyboard layouts selection not dependent on the selected language. Patch by joao.jeronimo.89. CORE-9630 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: ekohl Date: Sun Jul 5 21:00:38 2015 New Revision: 68354 URL: http://svn.reactos.org/svn/reactos?rev=68354&view=rev Log: [USETUP] Make the keyboard layouts selection not dependent on the selected language. Patch by joao.jeronimo.89. CORE-9630 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/settings.c Modified: trunk/reactos/base/setup/usetup/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/settings… ============================================================================== --- trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/settings.c [iso-8859-1] Sun Jul 5 21:00:38 2015 @@ -1052,7 +1052,6 @@ return NULL; } - if (_wcsicmp(LayoutsList[uIndex].LayoutID, KeyName) == 0) { UserData = (WCHAR*)RtlAllocateHeap(ProcessHeap, 0,

1 0

[pschweitzer] 68353: [NTFS] Properly return allocation size on directory enum
by pschweitzer＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: pschweitzer Date: Sun Jul 5 20:31:54 2015 New Revision: 68353 URL: http://svn.reactos.org/svn/reactos?rev=68353&view=rev Log: [NTFS] Properly return allocation size on directory enum Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/dirctl.c [iso-8859-1] Sun Jul 5 20:31:54 2015 @@ -135,8 +135,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; @@ -185,8 +184,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; Info->EaSize = 0; @@ -250,8 +248,7 @@ /* Convert file flags */ NtfsFileFlagsToAttributes(FileName->FileAttributes | StdInfo->FileAttribute, &Info->FileAttributes); - Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, NULL); - Info->AllocationSize.QuadPart = ROUND_UP(Info->EndOfFile.QuadPart, DeviceExt->NtfsInfo.BytesPerCluster); + Info->EndOfFile.QuadPart = NtfsGetFileSize(DeviceExt, FileRecord, L"", 0, (PULONGLONG)&Info->AllocationSize.QuadPart); Info->FileIndex = MFTIndex; Info->EaSize = 0;

1 0

[tfaber] 68352: [NTOS:MM] - Show that PAGE_NOCACHE also works for image and data sections - Show that *MapViewOfSection returns user space addresses CORE-9808
by tfaber＠svn.reactos.org 05 Jul '15

05 Jul '15

Author: tfaber Date: Sun Jul 5 19:44:05 2015 New Revision: 68352 URL: http://svn.reactos.org/svn/reactos?rev=68352&view=rev Log: [NTOS:MM] - Show that PAGE_NOCACHE also works for image and data sections - Show that *MapViewOfSection returns user space addresses CORE-9808 Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Sun Jul 5 19:44:05 2015 @@ -62,6 +62,21 @@ ok_eq_hex(Status, ExpectAtBase ? STATUS_SUCCESS : STATUS_IMAGE_NOT_AT_BASE);\ if (!skip(NT_SUCCESS(Status), "Section not mapped\n")) \ { \ + ok((LONG_PTR)BaseAddress > 0, "BaseAddress = %p\n", BaseAddress); \ + ok_eq_uint(*(PUCHAR)BaseAddress, ExpectM ? 'M' : 0); \ + Status = MmUnmapViewOfSection(PsGetCurrentProcess(), BaseAddress); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + } \ + BaseAddress = NULL; \ + ViewSize = 0; \ + Status = MmMapViewOfSection(SectionObject, PsGetCurrentProcess(), \ + &BaseAddress, 0, 1, &SectionOffset, \ + &ViewSize, ViewUnmap, 0, \ + PAGE_READONLY | PAGE_NOCACHE); \ + ok_eq_hex(Status, ExpectAtBase ? STATUS_SUCCESS : STATUS_IMAGE_NOT_AT_BASE);\ + if (!skip(NT_SUCCESS(Status), "Section not mapped\n")) \ + { \ + ok((LONG_PTR)BaseAddress > 0, "BaseAddress = %p\n", BaseAddress); \ ok_eq_uint(*(PUCHAR)BaseAddress, ExpectM ? 'M' : 0); \ Status = MmUnmapViewOfSection(PsGetCurrentProcess(), BaseAddress); \ ok_eq_hex(Status, STATUS_SUCCESS); \ @@ -452,6 +467,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, ZeroPageContents, PAGE_SIZE); @@ -476,6 +492,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, ZeroPageContents, PAGE_SIZE); @@ -500,6 +517,7 @@ ok_eq_hex(Status, STATUS_SUCCESS); if (!skip(NT_SUCCESS(Status), "No view\n")) { + ok((LONG_PTR)Mapping > 0, "Mapping = %p\n", Mapping); EqualBytes = RtlCompareMemory(Mapping, MyPage, PAGE_SIZE);

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