[ATL][MSPAINT] Add ATLTRACE and fix assertion failures (#4299)

- Implement ATLTRACE and AtlTrace in atlbase.h.
- Fix assertion failures in mspaint.
CORE-17969, CORE-18012
This commit is contained in:
Katayama Hirofumi MZ 2022-01-23 00:59:12 +09:00 committed by GitHub
parent 085f135f1a
commit 7014cf04b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 380 additions and 56 deletions

View file

@ -14,11 +14,13 @@
void ImageModel::NotifyDimensionsChanged() void ImageModel::NotifyDimensionsChanged()
{ {
if (imageArea.IsWindow())
imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED); imageArea.SendMessage(WM_IMAGEMODELDIMENSIONSCHANGED);
} }
void ImageModel::NotifyImageChanged() void ImageModel::NotifyImageChanged()
{ {
if (imageArea.IsWindow())
imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED); imageArea.SendMessage(WM_IMAGEMODELIMAGECHANGED);
} }
@ -44,7 +46,7 @@ ImageModel::ImageModel()
void ImageModel::CopyPrevious() void ImageModel::CopyPrevious()
{ {
DPRINT("%s: %d\n", __FUNCTION__, currInd); ATLTRACE("%s: %d\n", __FUNCTION__, currInd);
DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]); DeleteObject(hBms[(currInd + 1) % HISTORYSIZE]);
hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]); hBms[(currInd + 1) % HISTORYSIZE] = CopyDIBImage(hBms[currInd]);
currInd = (currInd + 1) % HISTORYSIZE; currInd = (currInd + 1) % HISTORYSIZE;
@ -57,7 +59,7 @@ void ImageModel::CopyPrevious()
void ImageModel::Undo() void ImageModel::Undo()
{ {
DPRINT("%s: %d\n", __FUNCTION__, undoSteps); ATLTRACE("%s: %d\n", __FUNCTION__, undoSteps);
if (undoSteps > 0) if (undoSteps > 0)
{ {
int oldWidth = GetWidth(); int oldWidth = GetWidth();
@ -76,7 +78,7 @@ void ImageModel::Undo()
void ImageModel::Redo() void ImageModel::Redo()
{ {
DPRINT("%s: %d\n", __FUNCTION__, redoSteps); ATLTRACE("%s: %d\n", __FUNCTION__, redoSteps);
if (redoSteps > 0) if (redoSteps > 0)
{ {
int oldWidth = GetWidth(); int oldWidth = GetWidth();
@ -95,7 +97,7 @@ void ImageModel::Redo()
void ImageModel::ResetToPrevious() void ImageModel::ResetToPrevious()
{ {
DPRINT("%s: %d\n", __FUNCTION__, currInd); ATLTRACE("%s: %d\n", __FUNCTION__, currInd);
DeleteObject(hBms[currInd]); DeleteObject(hBms[currInd]);
hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]); hBms[currInd] = CopyDIBImage(hBms[(currInd + HISTORYSIZE - 1) % HISTORYSIZE]);
SelectObject(hDrawingDC, hBms[currInd]); SelectObject(hDrawingDC, hBms[currInd]);

View file

@ -68,6 +68,8 @@ void CImgAreaWindow::drawZoomFrame(int mouseX, int mouseY)
LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT CImgAreaWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
if (!IsWindow() || !sizeboxLeftTop.IsWindow())
return 0;
int imgXRes = imageModel.GetWidth(); int imgXRes = imageModel.GetWidth();
int imgYRes = imageModel.GetHeight(); int imgYRes = imageModel.GetHeight();
sizeboxLeftTop.MoveWindow( sizeboxLeftTop.MoveWindow(
@ -105,7 +107,7 @@ LRESULT CImgAreaWindow::OnEraseBkGnd(UINT nMsg, WPARAM wParam, LPARAM lParam, BO
HDC hdc = (HDC)wParam; HDC hdc = (HDC)wParam;
if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() && if (toolsModel.GetActiveTool() == TOOL_TEXT && !toolsModel.IsBackgroundTransparent() &&
textEditWindow.IsWindowVisible()) ::IsWindowVisible(textEditWindow))
{ {
// Do clipping // Do clipping
HWND hChild = textEditWindow; HWND hChild = textEditWindow;
@ -143,11 +145,11 @@ LRESULT CImgAreaWindow::OnPaint(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& b
DeleteObject(SelectObject(hdc, oldPen)); DeleteObject(SelectObject(hdc, oldPen));
} }
EndPaint(&ps); EndPaint(&ps);
if (selectionWindow.IsWindowVisible()) if (selectionWindow.IsWindow())
selectionWindow.Invalidate(FALSE); selectionWindow.Invalidate(FALSE);
if (miniature.IsWindowVisible()) if (miniature.IsWindow())
miniature.Invalidate(FALSE); miniature.Invalidate(FALSE);
if (textEditWindow.IsWindowVisible()) if (textEditWindow.IsWindow())
textEditWindow.Invalidate(FALSE); textEditWindow.Invalidate(FALSE);
return 0; return 0;
} }

View file

@ -394,7 +394,7 @@ struct TextTool : ToolBase
{ {
imageModel.ResetToPrevious(); imageModel.ResetToPrevious();
BOOL bTextBoxShown = textEditWindow.IsWindowVisible(); BOOL bTextBoxShown = ::IsWindowVisible(textEditWindow);
if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0) if (bTextBoxShown && textEditWindow.GetWindowTextLength() > 0)
{ {
CString szText; CString szText;

View file

@ -95,7 +95,9 @@ void PaletteModel::SetBgColor(COLORREF newColor)
void PaletteModel::NotifyColorChanged() void PaletteModel::NotifyColorChanged()
{ {
if (paletteWindow.IsWindow())
paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); paletteWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED);
if (selectionWindow.IsWindow())
selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); selectionWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED);
if (textEditWindow.IsWindow()) if (textEditWindow.IsWindow())
textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED); textEditWindow.SendMessage(WM_PALETTEMODELCOLORCHANGED);
@ -103,5 +105,6 @@ void PaletteModel::NotifyColorChanged()
void PaletteModel::NotifyPaletteChanged() void PaletteModel::NotifyPaletteChanged()
{ {
if (paletteWindow.IsWindow())
paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED); paletteWindow.SendMessage(WM_PALETTEMODELPALETTECHANGED);
} }

View file

@ -1,6 +1,15 @@
#ifndef _MSPAINT_H #ifndef _MSPAINT_H
#define _MSPAINT_H #define _MSPAINT_H
#ifdef NDEBUG
#undef DBG
#undef _DEBUG
#endif
#if DBG && !defined(_DEBUG)
#define _DEBUG
#endif
#include <stdarg.h> #include <stdarg.h>
#include <windef.h> #include <windef.h>

View file

@ -61,6 +61,7 @@ UpdateScrollbox()
scrollboxWindow.GetWindowRect(&tempRect); scrollboxWindow.GetWindowRect(&tempRect);
sizeScrollBox = CSize(tempRect.Width(), tempRect.Height()); sizeScrollBox = CSize(tempRect.Width(), tempRect.Height());
if (imageArea.IsWindow())
imageArea.GetClientRect(&tempRect); imageArea.GetClientRect(&tempRect);
sizeImageArea = CSize(tempRect.Width(), tempRect.Height()); sizeImageArea = CSize(tempRect.Width(), tempRect.Height());
sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2); sizeImageArea += CSize(GRIP_SIZE * 2, GRIP_SIZE * 2);
@ -87,14 +88,17 @@ UpdateScrollbox()
si.nPage = sizeScrollBox.cy; si.nPage = sizeScrollBox.cy;
scrollboxWindow.SetScrollInfo(SB_VERT, &si); scrollboxWindow.SetScrollInfo(SB_VERT, &si);
scrlClientWindow.MoveWindow(-scrollboxWindow.GetScrollPos(SB_HORZ), if (scrlClientWindow.IsWindow())
-scrollboxWindow.GetScrollPos(SB_VERT), {
scrlClientWindow.MoveWindow(
-scrollboxWindow.GetScrollPos(SB_HORZ), -scrollboxWindow.GetScrollPos(SB_VERT),
sizeImageArea.cx, sizeImageArea.cy, TRUE); sizeImageArea.cx, sizeImageArea.cy, TRUE);
} }
}
LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT CScrollboxWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
if (m_hWnd == scrollboxWindow.m_hWnd) if (m_hWnd && m_hWnd == scrollboxWindow.m_hWnd)
{ {
UpdateScrollbox(); UpdateScrollbox();
} }

View file

@ -57,7 +57,7 @@ ColorKeyedMaskBlt(HDC hdcDest, int nXDest, int nYDest, int nWidth, int nHeight,
void void
ForceRefreshSelectionContents() ForceRefreshSelectionContents()
{ {
if (selectionWindow.IsWindowVisible()) if (::IsWindowVisible(selectionWindow))
{ {
selectionWindow.SendMessage(WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0)); selectionWindow.SendMessage(WM_LBUTTONDOWN, 0, MAKELPARAM(0, 0));
selectionWindow.SendMessage(WM_MOUSEMOVE, 0, MAKELPARAM(0, 0)); selectionWindow.SendMessage(WM_MOUSEMOVE, 0, MAKELPARAM(0, 0));

View file

@ -300,12 +300,12 @@ HWND CTextEditWindow::Create(HWND hwndParent)
const DWORD style = ES_LEFT | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL | const DWORD style = ES_LEFT | ES_MULTILINE | ES_WANTRETURN | ES_AUTOVSCROLL |
WS_CHILD | WS_THICKFRAME; WS_CHILD | WS_THICKFRAME;
m_hWnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0, HWND hwnd = ::CreateWindowEx(0, WC_EDIT, NULL, style, 0, 0, 0, 0,
hwndParent, NULL, hProgInstance, NULL); hwndParent, NULL, hProgInstance, NULL);
if (m_hWnd) if (hwnd)
{ {
#undef SubclassWindow // Don't use this macro #undef SubclassWindow // Don't use this macro
SubclassWindow(m_hWnd); SubclassWindow(hwnd);
UpdateFont(); UpdateFont();

View file

@ -159,12 +159,13 @@ void ToolsModel::SetZoom(int nZoom)
void ToolsModel::NotifyToolChanged() void ToolsModel::NotifyToolChanged()
{ {
if (toolBoxContainer.IsWindow())
toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); toolBoxContainer.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool);
if (toolSettingsWindow.IsWindow())
toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); toolSettingsWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool);
if (fontsDialog.IsWindow()) if (fontsDialog.IsWindow())
fontsDialog.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); fontsDialog.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool);
if (textEditWindow.IsWindow())
textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool); textEditWindow.SendMessage(WM_TOOLSMODELTOOLCHANGED, m_activeTool);
} }

View file

@ -51,7 +51,7 @@ void CMainWindow::alignChildrenToMainWindow()
RECT clientRect; RECT clientRect;
GetClientRect(&clientRect); GetClientRect(&clientRect);
if (toolBoxContainer.IsWindowVisible()) if (::IsWindowVisible(toolBoxContainer))
{ {
x = 56; x = 56;
w = clientRect.right - 56; w = clientRect.right - 56;
@ -61,7 +61,7 @@ void CMainWindow::alignChildrenToMainWindow()
x = 0; x = 0;
w = clientRect.right; w = clientRect.right;
} }
if (paletteWindow.IsWindowVisible()) if (::IsWindowVisible(paletteWindow))
{ {
y = 49; y = 49;
h = clientRect.bottom - 49; h = clientRect.bottom - 49;
@ -73,12 +73,17 @@ void CMainWindow::alignChildrenToMainWindow()
} }
RECT statusBarRect0; RECT statusBarRect0;
SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0);
int statusBarBorders[3]; int statusBarBorders[3];
SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders); if (::IsWindow(hStatusBar))
{
::SendMessage(hStatusBar, SB_GETRECT, 0, (LPARAM)&statusBarRect0);
::SendMessage(hStatusBar, SB_GETBORDERS, 0, (LPARAM)&statusBarBorders);
}
int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1]; int statusBarHeight = statusBarRect0.bottom - statusBarRect0.top + statusBarBorders[1];
if (scrollboxWindow.IsWindow())
scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE); scrollboxWindow.MoveWindow(x, y, w, ::IsWindowVisible(hStatusBar) ? h - statusBarHeight : h, TRUE);
if (paletteWindow.IsWindow())
paletteWindow.MoveWindow(x, 9, 255, 32, TRUE); paletteWindow.MoveWindow(x, 9, 255, 32, TRUE);
} }
@ -268,7 +273,9 @@ LRESULT CMainWindow::OnClose(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHan
LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
HMENU menu = GetMenu(); HMENU menu = GetMenu();
BOOL trueSelection = (selectionWindow.IsWindowVisible() && ((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL))); BOOL trueSelection =
(::IsWindowVisible(selectionWindow) &&
((toolsModel.GetActiveTool() == TOOL_FREESEL) || (toolsModel.GetActiveTool() == TOOL_RECTSEL)));
switch (lParam) switch (lParam)
{ {
case 0: /* File menu */ case 0: /* File menu */
@ -320,17 +327,17 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO
CloseClipboard(); CloseClipboard();
break; break;
case 2: /* View menu */ case 2: /* View menu */
CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(toolBoxContainer.IsWindowVisible())); CheckMenuItem(menu, IDM_VIEWTOOLBOX, CHECKED_IF(::IsWindowVisible(toolBoxContainer)));
CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(paletteWindow.IsWindowVisible())); CheckMenuItem(menu, IDM_VIEWCOLORPALETTE, CHECKED_IF(::IsWindowVisible(paletteWindow)));
CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar))); CheckMenuItem(menu, IDM_VIEWSTATUSBAR, CHECKED_IF(::IsWindowVisible(hStatusBar)));
CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(fontsDialog.IsWindowVisible())); CheckMenuItem(menu, IDM_FORMATICONBAR, CHECKED_IF(::IsWindowVisible(fontsDialog)));
EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT)); EnableMenuItem(menu, IDM_FORMATICONBAR, ENABLED_IF(toolsModel.GetActiveTool() == TOOL_TEXT));
CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid)); CheckMenuItem(menu, IDM_VIEWSHOWGRID, CHECKED_IF(showGrid));
CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature)); CheckMenuItem(menu, IDM_VIEWSHOWMINIATURE, CHECKED_IF(showMiniature));
break; break;
case 3: /* Image menu */ case 3: /* Image menu */
EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(selectionWindow.IsWindowVisible())); EnableMenuItem(menu, IDM_IMAGECROP, ENABLED_IF(::IsWindowVisible(selectionWindow)));
CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent())); CheckMenuItem(menu, IDM_IMAGEDRAWOPAQUE, CHECKED_IF(!toolsModel.IsBackgroundTransparent()));
break; break;
} }
@ -351,8 +358,11 @@ LRESULT CMainWindow::OnInitMenuPopup(UINT nMsg, WPARAM wParam, LPARAM lParam, BO
LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) LRESULT CMainWindow::OnSize(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)
{ {
int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 }; int test[] = { LOWORD(lParam) - 260, LOWORD(lParam) - 140, LOWORD(lParam) - 20 };
SendMessage(hStatusBar, WM_SIZE, wParam, lParam); if (::IsWindow(hStatusBar))
SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test); {
::SendMessage(hStatusBar, WM_SIZE, wParam, lParam);
::SendMessage(hStatusBar, SB_SETPARTS, 3, (LPARAM)&test);
}
alignChildrenToMainWindow(); alignChildrenToMainWindow();
Invalidate(TRUE); Invalidate(TRUE);
return 0; return 0;
@ -519,13 +529,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
break; break;
} }
case IDM_EDITUNDO: case IDM_EDITUNDO:
if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow))
break; break;
imageModel.Undo(); imageModel.Undo();
imageArea.Invalidate(FALSE); imageArea.Invalidate(FALSE);
break; break;
case IDM_EDITREDO: case IDM_EDITREDO:
if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow))
break; break;
imageModel.Redo(); imageModel.Redo();
imageArea.Invalidate(FALSE); imageArea.Invalidate(FALSE);
@ -558,7 +568,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
} }
case IDM_EDITSELECTALL: case IDM_EDITSELECTALL:
{ {
if (toolsModel.GetActiveTool() == TOOL_TEXT && textEditWindow.IsWindowVisible()) if (toolsModel.GetActiveTool() == TOOL_TEXT && ::IsWindowVisible(textEditWindow))
{ {
textEditWindow.SendMessage(EM_SETSEL, 0, -1); textEditWindow.SendMessage(EM_SETSEL, 0, -1);
break; break;
@ -608,13 +618,13 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd)) switch (mirrorRotateDialog.DoModal(mainWindow.m_hWnd))
{ {
case 1: /* flip horizontally */ case 1: /* flip horizontally */
if (selectionWindow.IsWindowVisible()) if (::IsWindowVisible(selectionWindow))
selectionModel.FlipHorizontally(); selectionModel.FlipHorizontally();
else else
imageModel.FlipHorizontally(); imageModel.FlipHorizontally();
break; break;
case 2: /* flip vertically */ case 2: /* flip vertically */
if (selectionWindow.IsWindowVisible()) if (::IsWindowVisible(selectionWindow))
selectionModel.FlipVertically(); selectionModel.FlipVertically();
else else
imageModel.FlipVertically(); imageModel.FlipVertically();
@ -622,7 +632,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
case 3: /* rotate 90 degrees */ case 3: /* rotate 90 degrees */
break; break;
case 4: /* rotate 180 degrees */ case 4: /* rotate 180 degrees */
if (selectionWindow.IsWindowVisible()) if (::IsWindowVisible(selectionWindow))
selectionModel.RotateNTimes90Degrees(2); selectionModel.RotateNTimes90Degrees(2);
else else
imageModel.RotateNTimes90Degrees(2); imageModel.RotateNTimes90Degrees(2);
@ -656,11 +666,11 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
break; break;
case IDM_VIEWTOOLBOX: case IDM_VIEWTOOLBOX:
toolBoxContainer.ShowWindow(toolBoxContainer.IsWindowVisible() ? SW_HIDE : SW_SHOW); toolBoxContainer.ShowWindow(::IsWindowVisible(toolBoxContainer) ? SW_HIDE : SW_SHOW);
alignChildrenToMainWindow(); alignChildrenToMainWindow();
break; break;
case IDM_VIEWCOLORPALETTE: case IDM_VIEWCOLORPALETTE:
paletteWindow.ShowWindow(paletteWindow.IsWindowVisible() ? SW_HIDE : SW_SHOW); paletteWindow.ShowWindow(::IsWindowVisible(paletteWindow) ? SW_HIDE : SW_SHOW);
alignChildrenToMainWindow(); alignChildrenToMainWindow();
break; break;
case IDM_VIEWSTATUSBAR: case IDM_VIEWSTATUSBAR:
@ -674,7 +684,7 @@ LRESULT CMainWindow::OnCommand(UINT nMsg, WPARAM wParam, LPARAM lParam, BOOL& bH
{ {
fontsDialog.Create(mainWindow); fontsDialog.Create(mainWindow);
} }
registrySettings.ShowTextTool = !fontsDialog.IsWindowVisible(); registrySettings.ShowTextTool = !::IsWindowVisible(fontsDialog);
fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE); fontsDialog.ShowWindow(registrySettings.ShowTextTool ? SW_SHOW : SW_HIDE);
fontsDialog.SendMessage(DM_REPOSITION, 0, 0); fontsDialog.SendMessage(DM_REPOSITION, 0, 0);
} }

View file

@ -26,6 +26,7 @@
#include "atlcomcli.h" #include "atlcomcli.h"
#include "atlalloc.h" #include "atlalloc.h"
#include "atlexcept.h" #include "atlexcept.h"
#include "atltrace.h"
#include "comcat.h" #include "comcat.h"
#include "tchar.h" #include "tchar.h"
@ -1856,7 +1857,6 @@ inline HRESULT WINAPI AtlComModuleRevokeClassObjects(_ATL_COM_MODULE *module)
return S_OK; return S_OK;
} }
}; // namespace ATL }; // namespace ATL
#ifndef _ATL_NO_AUTOMATIC_NAMESPACE #ifndef _ATL_NO_AUTOMATIC_NAMESPACE

293
sdk/lib/atl/atltrace.h Normal file
View file

@ -0,0 +1,293 @@
/*
* PROJECT: ReactOS ATL
* LICENSE: LGPL-2.0-or-later (https://spdx.org/licenses/LGPL-2.0-or-later)
* PURPOSE: Providing ATLTRACE macro
* COPYRIGHT: Copyright 2022 Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
*/
#pragma once
#include "atldef.h"
#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505
#include <stdio.h>
#include <crtdbg.h>
extern "C"
{
// FIXME: Enabling _DEBUG at top level causes assertion failures... CORE-17505
int __cdecl _CrtDbgReport(int reportType, const char *filename, int linenumber, const char *moduleName, const char *format, ...);
int __cdecl _CrtDbgReportW(int reportType, const wchar_t *filename, int linenumber, const wchar_t *moduleName, const wchar_t *format, ...);
}
namespace ATL
{
template <UINT t_category = (1 << 19), UINT t_level = 0>
class CTraceCategoryEx
{
public:
enum
{
TraceGeneral = (1 << 0),
TraceCom = (1 << 1),
TraceQI = (1 << 2),
TraceRegistrar = (1 << 3),
TraceRefcount = (1 << 4),
TraceWindowing = (1 << 5),
TraceControls = (1 << 6),
TraceHosting = (1 << 7),
TraceDBClient = (1 << 8),
TraceDBProvider = (1 << 9),
TraceSnapin = (1 << 10),
TraceNotImpl = (1 << 11),
TraceAllocation = (1 << 12),
TraceException = (1 << 13),
TraceTime = (1 << 14),
TraceCache = (1 << 15),
TraceStencil = (1 << 16),
TraceString = (1 << 17),
TraceMap = (1 << 18),
TraceUtil = (1 << 19),
TraceSecurity = (1 << 20),
TraceSync = (1 << 21),
TraceISAPI = (1 << 22),
TraceUser = TraceUtil
};
CTraceCategoryEx(LPCTSTR name = NULL) : m_name(name)
{
}
static UINT GetLevel() { return t_level; }
static UINT GetCategory() { return t_category; }
operator UINT() const { return GetCategory(); }
LPCTSTR GetCategoryName() const { return m_name; }
protected:
LPCTSTR m_name;
};
class CTraceCategory : public CTraceCategoryEx<>
{
CTraceCategory(LPCTSTR name = NULL) : CTraceCategoryEx<>(name)
{
}
};
#define DEFINE_TRACE_CATEGORY(name, cat) extern const DECLSPEC_SELECTANY CTraceCategoryEx<cat, 0> name(TEXT(#name))
DEFINE_TRACE_CATEGORY(atlTraceGeneral, CTraceCategoryEx<>::TraceGeneral);
DEFINE_TRACE_CATEGORY(atlTraceCOM, CTraceCategoryEx<>::TraceCom);
DEFINE_TRACE_CATEGORY(atlTraceQI, CTraceCategoryEx<>::TraceQI);
DEFINE_TRACE_CATEGORY(atlTraceRegistrar, CTraceCategoryEx<>::TraceRegistrar);
DEFINE_TRACE_CATEGORY(atlTraceRefcount, CTraceCategoryEx<>::TraceRefcount);
DEFINE_TRACE_CATEGORY(atlTraceWindowing, CTraceCategoryEx<>::TraceWindowing);
DEFINE_TRACE_CATEGORY(atlTraceControls, CTraceCategoryEx<>::TraceControls);
DEFINE_TRACE_CATEGORY(atlTraceHosting, CTraceCategoryEx<>::TraceHosting);
DEFINE_TRACE_CATEGORY(atlTraceDBClient, CTraceCategoryEx<>::TraceDBClient);
DEFINE_TRACE_CATEGORY(atlTraceDBProvider, CTraceCategoryEx<>::TraceDBProvider);
DEFINE_TRACE_CATEGORY(atlTraceSnapin, CTraceCategoryEx<>::TraceSnapin);
DEFINE_TRACE_CATEGORY(atlTraceNotImpl, CTraceCategoryEx<>::TraceNotImpl);
DEFINE_TRACE_CATEGORY(atlTraceAllocation, CTraceCategoryEx<>::TraceAllocation);
DEFINE_TRACE_CATEGORY(atlTraceException, CTraceCategoryEx<>::TraceException);
DEFINE_TRACE_CATEGORY(atlTraceTime, CTraceCategoryEx<>::TraceTime);
DEFINE_TRACE_CATEGORY(atlTraceCache, CTraceCategoryEx<>::TraceCache);
DEFINE_TRACE_CATEGORY(atlTraceStencil, CTraceCategoryEx<>::TraceStencil);
DEFINE_TRACE_CATEGORY(atlTraceString, CTraceCategoryEx<>::TraceString);
DEFINE_TRACE_CATEGORY(atlTraceMap, CTraceCategoryEx<>::TraceMap);
DEFINE_TRACE_CATEGORY(atlTraceUtil, CTraceCategoryEx<>::TraceUtil);
DEFINE_TRACE_CATEGORY(atlTraceSecurity, CTraceCategoryEx<>::TraceSecurity);
DEFINE_TRACE_CATEGORY(atlTraceSync, CTraceCategoryEx<>::TraceSync);
DEFINE_TRACE_CATEGORY(atlTraceISAPI, CTraceCategoryEx<>::TraceISAPI);
#undef DEFINE_TRACE_CATEGORY
struct CTraceCategoryEasy
{
UINT m_category;
UINT m_level;
LPCTSTR m_name;
template <UINT t_category, UINT t_level>
CTraceCategoryEasy(const CTraceCategoryEx<t_category, t_level>& cat)
{
m_category = t_category;
m_level = t_level;
m_name = cat.GetCategoryName();
}
operator UINT() const { return m_category; }
BOOL IsGeneral() const
{
return lstrcmp(m_name, TEXT("atlTraceGeneral")) == 0;
}
};
struct CTrace
{
enum
{
DefaultTraceLevel = 0,
DisableTracing = 0xFFFFFFFF,
EnableAllCategories = 0xFFFFFFFF
};
static UINT GetLevel() { return s_level; }
static UINT GetCategories() { return s_categories; }
static void SetLevel(UINT level) { s_level = level; }
static void SetCategories(UINT categories) { s_categories = categories; }
static bool IsTracingEnabled(UINT category, UINT level)
{
return (s_level != DisableTracing && s_level >= level && (s_categories & category));
}
protected:
static UINT s_categories;
static UINT s_level;
};
DECLSPEC_SELECTANY UINT CTrace::s_categories = CTrace::EnableAllCategories;
DECLSPEC_SELECTANY UINT CTrace::s_level = CTrace::DefaultTraceLevel;
template <typename X_CHAR>
inline VOID __stdcall
AtlTraceV(_In_opt_z_ const X_CHAR * file,
_In_ INT line,
_In_ const CTraceCategoryEasy& cat,
_In_ UINT level,
_In_z_ _Printf_format_string_ PCSTR format,
_In_ va_list va)
{
char szBuff[1024], szFile[MAX_PATH];
size_t cch = 0;
const BOOL bUnicode = (sizeof(TCHAR) == 2);
if (!CTrace::IsTracingEnabled(cat, level))
return;
#ifdef _STRSAFE_H_INCLUDED_
StringCchPrintfA(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file);
if (!cat.IsGeneral())
{
StringCchPrintfA(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name);
StringCchLengthA(szBuff, _countof(szBuff), &cch);
}
StringCchVPrintfA(&szBuff[cch], _countof(szBuff) - cch, format, va);
#else
_snprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? "%ls" : "%hs"), file);
if (!cat.IsGeneral())
cch = _snprintf(szBuff, _countof(szBuff), (bUnicode ? "%ls - " : "%hs - "), cat.m_name);
_vsnprintf(&szBuff[cch], _countof(szBuff) - cch, format, va);
#endif
_CrtDbgReport(_CRT_WARN, szFile, line, NULL, "%hs", szBuff);
}
template <typename X_CHAR>
inline VOID __stdcall
AtlTraceV(_In_opt_z_ const X_CHAR * file,
_In_ INT line,
_In_ const CTraceCategoryEasy& cat,
_In_ UINT level,
_In_z_ _Printf_format_string_ PCWSTR format,
_In_ va_list va)
{
WCHAR szBuff[1024], szFile[MAX_PATH];
size_t cch = 0;
const BOOL bUnicode = (sizeof(TCHAR) == 2);
if (!CTrace::IsTracingEnabled(cat, level))
return;
#ifdef _STRSAFE_H_INCLUDED_
StringCchPrintfW(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file);
if (!cat.IsGeneral())
{
StringCchPrintfW(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name);
StringCchLengthW(szBuff, _countof(szBuff), &cch);
}
StringCchVPrintfW(&szBuff[cch], _countof(szBuff) - cch, format, va);
#else
_snwprintf(szFile, _countof(szFile), ((sizeof(X_CHAR) == 2) ? L"%ls" : L"%hs"), file);
if (!cat.IsGeneral())
cch = _snwprintf(szBuff, _countof(szBuff), (bUnicode ? L"%ls - " : L"%hs - "), cat.m_name);
_vsnwprintf(&szBuff[cch], _countof(szBuff) - cch, format, va);
#endif
_CrtDbgReportW(_CRT_WARN, szFile, line, NULL, L"%ls", szBuff);
}
template <typename X_CHAR, typename Y_CHAR>
inline VOID __cdecl
AtlTraceEx(_In_opt_z_ const X_CHAR * file,
_In_ INT line,
_In_ const CTraceCategoryEasy& cat,
_In_ UINT level,
_In_z_ _Printf_format_string_ const Y_CHAR * format,
...)
{
va_list va;
va_start(va, format);
AtlTraceV(file, line, cat, level, format, va);
va_end(va);
}
template <typename X_CHAR, typename Y_CHAR>
inline VOID __cdecl
AtlTraceEx(_In_opt_z_ const X_CHAR *file,
_In_ INT line,
_In_z_ _Printf_format_string_ const Y_CHAR *format,
...)
{
va_list va;
va_start(va, format);
AtlTraceV(file, line, atlTraceGeneral, 0, format, va);
va_end(va);
}
inline VOID __stdcall
AtlTraceEx(_In_opt_z_ PCTSTR file,
_In_ INT line,
_In_ DWORD value)
{
AtlTraceEx(file, line, TEXT("%ld (0x%lX)\n"), value, value);
}
template <typename X_CHAR>
inline VOID __cdecl
AtlTrace(_In_z_ _Printf_format_string_ const X_CHAR *format, ...)
{
va_list va;
va_start(va, format);
AtlTraceV(NULL, -1, atlTraceGeneral, 0, format, va);
va_end(va);
}
} // namespace ATL
#endif // DBG
#ifndef ATLTRACE
#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505
#define ATLTRACE(format, ...) ATL::AtlTraceEx(__FILE__, __LINE__, format, ##__VA_ARGS__)
#else
#define ATLTRACE(format, ...) ((void)0)
#endif
#endif
#define ATLTRACE2 ATLTRACE
#if DBG // FIXME: We should use _DEBUG instead of DBG. CORE-17505
#define ATLTRACENOTIMPL(funcname) do { \
ATLTRACE(atlTraceNotImpl, 0, #funcname " is not implemented.\n"); \
return E_NOTIMPL; \
} while (0)
#else
#define ATLTRACENOTIMPL(funcname) return E_NOTIMPL
#endif
#ifndef _ATL_NO_AUTOMATIC_NAMESPACE
using namespace ATL;
#endif //!_ATL_NO_AUTOMATIC_NAMESPACE