--- mstools/mfc/include/afxwin.inl	2018/08/09 18:22:43	1.1.1.2
+++ mstools/mfc/include/afxwin.inl	2018/08/09 18:25:01	1.1.1.3
@@ -402,10 +402,15 @@ inline BOOL CDC::CreateCompatibleDC(CDC*
 	{ return Attach(::CreateCompatibleDC(pDC->GetSafeHdc())); }
 inline int CDC::ExcludeUpdateRgn(CWnd* pWnd)
 	{ return ::ExcludeUpdateRgn(m_hDC, pWnd->m_hWnd); }
-#ifndef _NTWIN
 inline CPoint CDC::GetDCOrg() const
+#ifdef _NTWIN
+	{ POINT point;
+		VERIFY(::GetDCOrgEx(m_hDC, &point));
+		return point; }
+#else
 	{ return ::GetDCOrg(m_hDC); }
 #endif
+
 inline int CDC::SaveDC() const
 	{ return ::SaveDC(m_hDC); }
 inline BOOL CDC::RestoreDC(int nSavedDC)
@@ -842,10 +847,18 @@ inline int CDC::StartDoc(LPCSTR pDocName
 #endif
 
 #if (WINVER >= 0x030a)
+#ifndef _NTWIN
 inline BOOL CDC::QueryAbort() const
 	{ return ::QueryAbort(m_hDC, 0); }
+#else
+inline BOOL CDC::QueryAbort() const
+	{ return TRUE; }	// NOTE: Win32 API does not support QueryAbort.
+#endif
 inline int CDC::StartDoc(LPDOCINFO lpDocInfo)
 	{ return ::StartDoc(m_hDC, lpDocInfo);}
+#endif
+
+#if (WINVER >= 0x030a) || defined(_NTWIN)
 inline int CDC::StartPage()
 	{ return ::StartPage(m_hDC); }
 inline int CDC::EndPage()
@@ -944,18 +957,18 @@ inline BOOL CMenu::InsertMenu(UINT nPosi
 inline BOOL CMenu::InsertMenu(UINT nPosition, UINT nFlags, UINT nIDNewItem, const CBitmap* pBmp)
 	{ return ::InsertMenu(m_hMenu, nPosition, nFlags | MF_BITMAP, nIDNewItem,
 #ifndef _NTWIN
-	MAKEINTRESOURCE(pBmp->m_hObject)); }
+		MAKEINTRESOURCE(pBmp->m_hObject)); }
 #else
-	(LPCSTR)pBmp->m_hObject); }
+		(LPCSTR)pBmp->m_hObject); }
 #endif
 inline BOOL CMenu::ModifyMenu(UINT nPosition, UINT nFlags, UINT nIDNewItem /* = 0 */, LPCSTR lpNewItem /* = NULL */)
 	{ return ::ModifyMenu(m_hMenu, nPosition, nFlags, nIDNewItem, lpNewItem); }
 inline BOOL CMenu::ModifyMenu(UINT nPosition, UINT nFlags, UINT nIDNewItem, const CBitmap* pBmp)
 	{ return ::ModifyMenu(m_hMenu, nPosition, nFlags | MF_BITMAP, nIDNewItem,
 #ifndef _NTWIN
-	MAKEINTRESOURCE(pBmp->m_hObject)); }
+		MAKEINTRESOURCE(pBmp->m_hObject)); }
 #else
-	(LPCSTR)pBmp->m_hObject); }
+		(LPCSTR)pBmp->m_hObject); }
 #endif
 inline BOOL CMenu::RemoveMenu(UINT nPosition, UINT nFlags)
 	{ return ::RemoveMenu(m_hMenu, nPosition, nFlags); }
@@ -1030,7 +1043,7 @@ inline void CWnd::MoveWindow(LPRECT lpRe
 	{ ::MoveWindow(m_hWnd, lpRect->left, lpRect->top, lpRect->right - lpRect->left,
 			lpRect->bottom - lpRect->top, bRepaint); }
 inline BOOL CWnd::SetWindowPos(const CWnd* pWndInsertAfter, int x, int y, int cx, int cy, UINT nFlags)
-#if (WINVER >= 0x030a)
+#if (WINVER >= 0x030a) || defined(_NTWIN)
 	{ return ::SetWindowPos(m_hWnd, pWndInsertAfter->GetSafeHwnd(),
 		x, y, cx, cy, nFlags); }
 #else
@@ -1236,11 +1249,7 @@ inline BOOL CWnd::FlashWindow(BOOL bInve
 	{ return ::FlashWindow(m_hWnd, bInvert); }
 inline int CWnd::MessageBox(LPCSTR lpText, LPCSTR lpCaption /* = NULL */,
 	UINT nType /* = MB_OK */)
-#ifdef _NTWIN
-	{ return ::MessageBoxEx(GetSafeHwnd(), lpText, lpCaption, nType, 0); }
-#else
 	{ return ::MessageBox(GetSafeHwnd(), lpText, lpCaption,nType); }
-#endif
 inline BOOL CWnd::ChangeClipboardChain(HWND hWndNext)
 	{ return ::ChangeClipboardChain(m_hWnd, hWndNext); }
 inline HWND CWnd::SetClipboardViewer()