Skip to content

Commit 8570243

Browse files
sdottakasdottaka
authored
Add Output Pane for Logs and Messages (#2663)
1 parent 8167c0d commit 8570243

File tree

125 files changed

+2845
-342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+2845
-342
lines changed

‎ALL.vs2017.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Users", "Users", "{5D37AB3C
236236
EndProject
237237
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{2313487A-3891-4F6E-A4F4-13E8DE53D7AC}"
238238
ProjectSection(SolutionItems) = preProject
239+
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
239240
Docs\Manual\build_htmlhelp.bat = Docs\Manual\build_htmlhelp.bat
240241
Docs\Manual\build_htmlhelp_en.bat = Docs\Manual\build_htmlhelp_en.bat
241242
Docs\Manual\build_htmlhelp_he.bat = Docs\Manual\build_htmlhelp_he.bat
242243
Docs\Manual\build_htmlhelp_jp.bat = Docs\Manual\build_htmlhelp_jp.bat
243-
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
244244
Docs\Manual\build_html_en.bat = Docs\Manual\build_html_en.bat
245245
Docs\Manual\build_html_he.bat = Docs\Manual\build_html_he.bat
246246
Docs\Manual\build_html_jp.bat = Docs\Manual\build_html_jp.bat
@@ -1379,6 +1379,7 @@ Global
13791379
GlobalSection(SharedMSBuildProjectFiles) = preSolution
13801380
Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4
13811381
Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4
1382+
Plugins\src_VCPP\Common\Common.vcxitems*{0ee652ff-27b0-4f91-bad6-2931bc072762}*SharedItemsImports = 4
13821383
Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9
13831384
Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9
13841385
Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9
@@ -1401,6 +1402,7 @@ Global
14011402
Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14021403
Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14031404
Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
1405+
Plugins\src_VCPP\Common\Common.vcxitems*{bd0c5fe1-8457-49c2-8801-0c99a6e6cc03}*SharedItemsImports = 4
14041406
Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14051407
Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14061408
Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9

‎ALL.vs2019.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Users", "Users", "{5D37AB3C
236236
EndProject
237237
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{2313487A-3891-4F6E-A4F4-13E8DE53D7AC}"
238238
ProjectSection(SolutionItems) = preProject
239+
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
239240
Docs\Manual\build_htmlhelp.bat = Docs\Manual\build_htmlhelp.bat
240241
Docs\Manual\build_htmlhelp_en.bat = Docs\Manual\build_htmlhelp_en.bat
241242
Docs\Manual\build_htmlhelp_he.bat = Docs\Manual\build_htmlhelp_he.bat
242243
Docs\Manual\build_htmlhelp_jp.bat = Docs\Manual\build_htmlhelp_jp.bat
243-
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
244244
Docs\Manual\build_html_en.bat = Docs\Manual\build_html_en.bat
245245
Docs\Manual\build_html_he.bat = Docs\Manual\build_html_he.bat
246246
Docs\Manual\build_html_jp.bat = Docs\Manual\build_html_jp.bat
@@ -1448,6 +1448,7 @@ Global
14481448
GlobalSection(SharedMSBuildProjectFiles) = preSolution
14491449
Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4
14501450
Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4
1451+
Plugins\src_VCPP\Common\Common.vcxitems*{0ee652ff-27b0-4f91-bad6-2931bc072762}*SharedItemsImports = 4
14511452
Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9
14521453
Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9
14531454
Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9
@@ -1470,6 +1471,7 @@ Global
14701471
Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14711472
Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14721473
Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
1474+
Plugins\src_VCPP\Common\Common.vcxitems*{bd0c5fe1-8457-49c2-8801-0c99a6e6cc03}*SharedItemsImports = 4
14731475
Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14741476
Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14751477
Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9

‎ALL.vs2022.sln

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Users", "Users", "{5D37AB3C
236236
EndProject
237237
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Manual", "Manual", "{2313487A-3891-4F6E-A4F4-13E8DE53D7AC}"
238238
ProjectSection(SolutionItems) = preProject
239+
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
239240
Docs\Manual\build_htmlhelp.bat = Docs\Manual\build_htmlhelp.bat
240241
Docs\Manual\build_htmlhelp_en.bat = Docs\Manual\build_htmlhelp_en.bat
241242
Docs\Manual\build_htmlhelp_he.bat = Docs\Manual\build_htmlhelp_he.bat
242243
Docs\Manual\build_htmlhelp_jp.bat = Docs\Manual\build_htmlhelp_jp.bat
243-
Docs\Manual\build_html.bat = Docs\Manual\build_html.bat
244244
Docs\Manual\build_html_en.bat = Docs\Manual\build_html_en.bat
245245
Docs\Manual\build_html_he.bat = Docs\Manual\build_html_he.bat
246246
Docs\Manual\build_html_jp.bat = Docs\Manual\build_html_jp.bat
@@ -1448,6 +1448,7 @@ Global
14481448
GlobalSection(SharedMSBuildProjectFiles) = preSolution
14491449
Plugins\src_VCPP\Common\Common.vcxitems*{098b241d-63af-4683-baf8-6da57fd8fe75}*SharedItemsImports = 4
14501450
Externals\googletest\googletest\googletest.vcxitems*{0a3727b1-51e7-4702-ad0c-8aee317ea510}*SharedItemsImports = 4
1451+
Plugins\src_VCPP\Common\Common.vcxitems*{0ee652ff-27b0-4f91-bad6-2931bc072762}*SharedItemsImports = 4
14511452
Src\CompareEngines\CompareEngines.vcxitems*{0f686afa-d587-43c0-bada-2beddc3fa758}*SharedItemsImports = 9
14521453
Externals\crystaledit\editlib\editlibparsers.vcxitems*{4170552a-09e2-4fac-b71d-0e2f5eb3c869}*SharedItemsImports = 9
14531454
Externals\xdiff\xdiff.vcxitems*{68f1d3a1-9dca-4b3d-b245-f4aca5f16563}*SharedItemsImports = 9
@@ -1470,6 +1471,7 @@ Global
14701471
Externals\xdiff\xdiff.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14711472
Src\CompareEngines\CompareEngines.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
14721473
Src\diffutils\diffutils.vcxitems*{ab827c6b-5116-408f-b453-e2075e9b73b4}*SharedItemsImports = 4
1474+
Plugins\src_VCPP\Common\Common.vcxitems*{bd0c5fe1-8457-49c2-8801-0c99a6e6cc03}*SharedItemsImports = 4
14731475
Externals\crystaledit\editlib\editlib.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14741476
Externals\crystaledit\editlib\editlibparsers.vcxitems*{c347d6ae-7a2b-4ed0-97ad-2595e1c5d7dd}*SharedItemsImports = 4
14751477
Src\diffutils\diffutils.vcxitems*{fc3b9df3-2854-4264-ab4b-ee8c43982513}*SharedItemsImports = 9

‎Externals/crystaledit/editlib/ccrystaltextview.cpp

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,7 @@ CCrystalTextView::CCrystalTextView ()
427427
, m_pCrystalRendererSaved(nullptr)
428428
, m_nColumnResizing(-1)
429429
, m_nLineNumberUsedAsHeaders(-1)
430+
, m_nRevMarkWidth(MARGIN_REV_WIDTH)
430431
{
431432
#ifdef _WIN64
432433
if (m_nRenderingMode == RENDERING_MODE::GDI)
@@ -2569,8 +2570,11 @@ DrawMargin (const CRect & rect, int nLineIndex, int nLineNumber)
25692570
}
25702571

25712572
// draw line revision marks
2572-
CRect rc(rect.right - MARGIN_REV_WIDTH, rect.top, rect.right, rect.bottom);
2573-
m_pCrystalRenderer->FillSolidRectangle (rc, clrRevisionMark);
2573+
if (m_nRevMarkWidth > 0)
2574+
{
2575+
CRect rc(rect.right - m_nRevMarkWidth, rect.top, rect.right, rect.bottom);
2576+
m_pCrystalRenderer->FillSolidRectangle (rc, clrRevisionMark);
2577+
}
25742578

25752579
if (!m_bSelMargin)
25762580
return;
@@ -6211,7 +6215,7 @@ GetMarginWidth (CDC *pdc /*= nullptr*/)
62116215
else
62126216
{
62136217
if (pdc == nullptr || !pdc->IsPrinting ())
6214-
nMarginWidth += MARGIN_REV_WIDTH; // Space for revision marks
6218+
nMarginWidth += m_nRevMarkWidth; // Space for revision marks
62156219
}
62166220

62176221
return nMarginWidth;
@@ -6980,7 +6984,8 @@ CString CCrystalTextView::GetTextBufferEol(int nLine) const
69806984

69816985
void CCrystalTextView::SetMarkersContext(CCrystalTextMarkers * pMarkers)
69826986
{
6983-
pMarkers->AddView(this);
6987+
if (pMarkers)
6988+
pMarkers->AddView(this);
69846989
m_pMarkers = pMarkers;
69856990
}
69866991

@@ -7042,8 +7047,20 @@ void CCrystalTextView::EnsureVisible (CEPoint ptStart, CEPoint ptEnd)
70427047
//BEGIN SW
70437048
int nSubLineCount = GetSubLineCount();
70447049
int nNewTopSubLine = m_nTopSubLine;
7045-
CEPoint subLinePos;
70467050

7051+
if (ptStart != ptEnd)
7052+
{
7053+
CEPoint subLinePosEnd;
7054+
CharPosToPoint(ptEnd.y, ptEnd.x, subLinePosEnd);
7055+
subLinePosEnd.y += GetSubLineIndex(ptEnd.y);
7056+
7057+
if (subLinePosEnd.y >= nNewTopSubLine + GetScreenLines())
7058+
nNewTopSubLine = subLinePosEnd.y - GetScreenLines() + 1;
7059+
if (subLinePosEnd.y < nNewTopSubLine)
7060+
nNewTopSubLine = subLinePosEnd.y;
7061+
}
7062+
7063+
CEPoint subLinePos;
70477064
CharPosToPoint( ptStart.y, ptStart.x, subLinePos );
70487065
subLinePos.y += GetSubLineIndex( ptStart.y );
70497066

‎Externals/crystaledit/editlib/ccrystaltextview.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,8 @@ protected :
231231
HACCEL m_hAccel;
232232
bool m_bVertScrollBarLocked, m_bHorzScrollBarLocked;
233233
CEPoint m_ptDraggedTextBegin, m_ptDraggedTextEnd;
234+
int m_nRevMarkWidth;
235+
234236
void UpdateCaret ();
235237
void SetAnchor (const CEPoint & ptNewAnchor);
236238
int GetTopMarginHeight ();
@@ -708,6 +710,8 @@ public :
708710
void SetTopMargin (bool bTopMargin);
709711
bool GetSelectionMargin () const { return m_bSelMargin; }
710712
void SetSelectionMargin (bool bSelMargin);
713+
int GetRevisionMarkWidth() const { return m_nRevMarkWidth; }
714+
void SetRevisionMarkWidth(int width) { m_nRevMarkWidth = width; };
711715
bool GetViewLineNumbers() const { return m_bViewLineNumbers; }
712716
void SetViewLineNumbers(bool bViewLineNumbers);
713717
int GetLineUsedAsHeaders () const { return m_nLineNumberUsedAsHeaders; }

‎Externals/crystaledit/editlib/utils/ctchar.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <cstring>
66
#include <cstdlib>
77
#include <cstdarg>
8+
#include <ctime>
89

910
#if defined(_WIN32)
1011
#define STRSAFE_NO_DEPRECATE
@@ -85,6 +86,7 @@ namespace tc
8586
constexpr auto tcscmplogical = ::wcscmplogical;
8687
constexpr auto tcsspn = ::wcsspn;
8788
constexpr auto tcsdup = ::wcsdup;
89+
constexpr auto tcsftime = wcsftime;
8890
inline tchar_t* tcschr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::wcschr(str, ch)); }
8991
inline tchar_t* tcsrchr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::wcsrchr(str, ch)); }
9092
inline tchar_t* tcsstr(const tchar_t* str, const tchar_t* substr) { return const_cast<tchar_t*>(::wcsstr(str, substr)); }
@@ -119,6 +121,7 @@ namespace tc
119121
constexpr auto tcscmplogical = ::strcmplogical;
120122
constexpr auto tcsspn = ::strspn;
121123
constexpr auto tcsdup = ::strdup;
124+
constexpr auto tcsftime = strftime;
122125
inline tchar_t* tcschr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::strchr(str, ch)); }
123126
inline tchar_t* tcsrchr(const tchar_t* str, tchar_t ch) { return const_cast<tchar_t*>(::strrchr(str, ch)); }
124127
inline tchar_t* tcsstr(const tchar_t* str, const tchar_t* substr) { return const_cast<tchar_t*>(::strstr(str, substr)); }

‎Externals/poco/Foundation/Foundation.vcxproj

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,12 +430,18 @@
430430
<ClCompile Include="src\Ascii.cpp">
431431
<ExcludedFromBuild>true</ExcludedFromBuild>
432432
</ClCompile>
433+
<ClCompile Include="src\AsyncChannel.cpp">
434+
<ExcludedFromBuild>true</ExcludedFromBuild>
435+
</ClCompile>
433436
<ClCompile Include="src\AtomicCounter.cpp">
434437
<ExcludedFromBuild>true</ExcludedFromBuild>
435438
</ClCompile>
436439
<ClCompile Include="src\Bugcheck.cpp">
437440
<ExcludedFromBuild>true</ExcludedFromBuild>
438441
</ClCompile>
442+
<ClCompile Include="src\Channel.cpp">
443+
<ExcludedFromBuild>true</ExcludedFromBuild>
444+
</ClCompile>
439445
<ClCompile Include="src\Clock.cpp">
440446
<ExcludedFromBuild>true</ExcludedFromBuild>
441447
</ClCompile>
@@ -464,6 +470,9 @@
464470
<ClCompile Include="src\Latin2Encoding.cpp">
465471
<ExcludedFromBuild>true</ExcludedFromBuild>
466472
</ClCompile>
473+
<ClCompile Include="src\LogFile.cpp">
474+
<ExcludedFromBuild>true</ExcludedFromBuild>
475+
</ClCompile>
467476
<ClCompile Include="src\NumberFormatter.cpp">
468477
<ExcludedFromBuild>true</ExcludedFromBuild>
469478
</ClCompile>
@@ -516,6 +525,9 @@
516525
<ClCompile Include="src\RefCountedObject.cpp">
517526
<ExcludedFromBuild>true</ExcludedFromBuild>
518527
</ClCompile>
528+
<ClCompile Include="src\SimpleFileChannel.cpp">
529+
<ExcludedFromBuild>true</ExcludedFromBuild>
530+
</ClCompile>
519531
<ClCompile Include="src\StringTokenizer.cpp">
520532
<ExcludedFromBuild>true</ExcludedFromBuild>
521533
</ClCompile>
@@ -818,6 +830,9 @@
818830
<ClInclude Include="include\Poco\Foundation.h" />
819831
<ClInclude Include="include\Poco\Instantiator.h" />
820832
<ClInclude Include="include\Poco\Latin2Encoding.h" />
833+
<ClInclude Include="include\Poco\LogFile.h" />
834+
<ClInclude Include="include\Poco\Logger.h" />
835+
<ClInclude Include="include\Poco\LoggingRegistry.h" />
821836
<ClInclude Include="include\Poco\MetaProgramming.h" />
822837
<ClInclude Include="include\Poco\NamedTuple.h" />
823838
<ClInclude Include="include\Poco\Nullable.h" />

‎Externals/poco/Foundation/Foundation.vcxproj.filters

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,15 @@
106106
<Filter Include="Hashing\Source Files">
107107
<UniqueIdentifier>{da88549e-329c-444c-85bb-b2339bc09505}</UniqueIdentifier>
108108
</Filter>
109+
<Filter Include="Logging">
110+
<UniqueIdentifier>{dba241b1-80ce-44a9-b2f2-f7e4f1772d71}</UniqueIdentifier>
111+
</Filter>
112+
<Filter Include="Logging\Source Files">
113+
<UniqueIdentifier>{c68948ba-ba36-45f2-8fc8-322e0e95d1b6}</UniqueIdentifier>
114+
</Filter>
115+
<Filter Include="Logging\Header Files">
116+
<UniqueIdentifier>{e2cc5f65-592c-4ab8-9720-da96c8240607}</UniqueIdentifier>
117+
</Filter>
109118
</ItemGroup>
110119
<ItemGroup>
111120
<ClCompile Include="src\Ascii.cpp">
@@ -532,6 +541,18 @@
532541
<ClCompile Include="src\pcre2_chkdint.c">
533542
<Filter>RegularExpression\PCRE Source Files</Filter>
534543
</ClCompile>
544+
<ClCompile Include="src\LogFile.cpp">
545+
<Filter>Logging\Source Files</Filter>
546+
</ClCompile>
547+
<ClCompile Include="src\Channel.cpp">
548+
<Filter>Logging\Source Files</Filter>
549+
</ClCompile>
550+
<ClCompile Include="src\AsyncChannel.cpp">
551+
<Filter>Logging\Source Files</Filter>
552+
</ClCompile>
553+
<ClCompile Include="src\SimpleFileChannel.cpp">
554+
<Filter>Logging\Source Files</Filter>
555+
</ClCompile>
535556
</ItemGroup>
536557
<ItemGroup>
537558
<ClInclude Include="include\Poco\Any.h">
@@ -1020,5 +1041,14 @@
10201041
<ClInclude Include="src\pcre2_internal.h">
10211042
<Filter>RegularExpression\PCRE Header Files</Filter>
10221043
</ClInclude>
1044+
<ClInclude Include="include\Poco\LogFile.h">
1045+
<Filter>Logging\Header Files</Filter>
1046+
</ClInclude>
1047+
<ClInclude Include="include\Poco\LoggingRegistry.h">
1048+
<Filter>Logging\Header Files</Filter>
1049+
</ClInclude>
1050+
<ClInclude Include="include\Poco\Logger.h">
1051+
<Filter>Logging\Header Files</Filter>
1052+
</ClInclude>
10231053
</ItemGroup>
10241054
</Project>

‎Externals/poco/Foundation/src/Foundation.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@
2626
#include "Path.cpp"
2727
// Hashing
2828
#include "Hash.cpp"
29+
// Logging
30+
#include "AsyncChannel.cpp"
31+
#include "Channel.cpp"
32+
#include "LogFile.cpp"
33+
#include "LoggingRegistry.cpp"
34+
#include "SimpleFileChannel.cpp"
35+
#include "Message.cpp"
36+
#include "Configurable.cpp"
2937
// Notifications
3038
#include "AbstractObserver.cpp"
3139
#include "Notification.cpp"

‎Plugins/src_VCPP/Common/Common.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
constexpr int DISPID_Translate = 1;
77
constexpr int DISPID_GetOption = 2;
88
constexpr int DISPID_SaveOption = 3;
9+
constexpr int DISPID_LogError = 6;
910

1011
static std::pair<CString, CString> SplitKeyValueName(BSTR bstrName)
1112
{
@@ -124,6 +125,17 @@ BSTR MergeApp_Translate(IDispatch* pDispatch, BSTR bstrText)
124125
return varResult.bstrVal;
125126
}
126127

128+
HRESULT MergeApp_LogError(IDispatch* pDispatch, const CString& sMessage)
129+
{
130+
if (!pDispatch)
131+
return E_FAIL;
132+
CComBSTR bstrText{ sMessage };
133+
VARIANT varText{ VT_BSTR };
134+
varText.bstrVal = bstrText;
135+
CComDispatchDriver drv(pDispatch);
136+
return drv.Invoke1(DISPID_LogError, &varText);
137+
}
138+
127139
HRESULT MergeApp_SaveOptionString(IDispatch* pDispatch, const CString& sName, const CString& sValue)
128140
{
129141
CComBSTR bstrName{ sName };

‎Plugins/src_VCPP/Common/Common.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ CString MergeApp_GetOptionString(IDispatch* pDispatch, const CString& sName, con
88
HRESULT MergeApp_SaveOption(IDispatch* pDispatch, BSTR bstrName, VARIANT& varValue);
99
HRESULT MergeApp_SaveOptionString(IDispatch* pDispatch, const CString& sName, const CString& sValue);
1010
BSTR MergeApp_Translate(IDispatch* pDispatch, BSTR bstrText);
11+
HRESULT MergeApp_LogError(IDispatch* pDispatch, const CString& sMessage);
1112
void TranslateDialog(HWND h, IDispatch* pDispatch);

‎Plugins/src_VCPP/DisplayXMLFiles/DisplayXMLFiles.idl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import "ocidl.idl";
2424
[id(7), helpstring("method UnpackFile")] HRESULT UnpackFile([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT * pSubcode, [out, retval] VARIANT_BOOL * pbSuccess);
2525
[id(8), helpstring("method PackFile")] HRESULT PackFile([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT pSubcode, [out, retval] VARIANT_BOOL * pbSuccess);
2626
[id(9), helpstring("method ShowSettingsDialog")] HRESULT ShowSettingsDialog([out, retval] VARIANT_BOOL * pbHandled);
27+
[id(10), helpstring("method PluginOnEvent")] HRESULT PluginOnEvent([in] int iEventType, [in] IDispatch* pDispatch);
2728
};
2829

2930
[

0 commit comments

Comments
 (0)