Skip to content

Commit 7c4b6a7

Browse files
committed
Fix static code analysis waaring
1 parent 986953a commit 7c4b6a7

File tree

2 files changed

+21
-23
lines changed

2 files changed

+21
-23
lines changed
+7-14
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,19 @@
11
#pragma once
22
#include <string>
33

4-
enum class JsonNodeType
4+
enum class JsonNodeType : short
55
{
6-
UNKNOWN = 0x00,
7-
STRING = 0x01,
8-
NUMBER = 0x02,
9-
BOOL = 0x04,
10-
ARRAY = 0x08,
11-
OBJECT = 0x10
12-
};
13-
14-
struct JsonNodePos
15-
{
16-
int line = 0;
17-
int col = 0;
6+
UNKNOWN,
7+
STRING,
8+
NUMBER,
9+
BOOL,
10+
ARRAY,
11+
OBJECT,
1812
};
1913

2014
struct JsonNode
2115
{
2216
std::string key;
2317
std::string value;
2418
JsonNodeType type = JsonNodeType::UNKNOWN;
25-
JsonNodePos pos = {};
2619
};

NppJSONViewer/external/npp/StaticDialog.cpp

+14-9
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,20 @@ HGLOBAL StaticDialog::makeRTLResource(int dialogID, DLGTEMPLATE **ppMyDlgTemplat
5151
// Duplicate Dlg Template resource
5252
unsigned long sizeDlg = ::SizeofResource(_hInst, hDialogRC);
5353
HGLOBAL hMyDlgTemplate = ::GlobalAlloc(GPTR, sizeDlg);
54-
*ppMyDlgTemplate = reinterpret_cast<DLGTEMPLATE *>(::GlobalLock(hMyDlgTemplate));
55-
56-
::memcpy(*ppMyDlgTemplate, pDlgTemplate, sizeDlg);
57-
58-
DLGTEMPLATEEX *pMyDlgTemplateEx = reinterpret_cast<DLGTEMPLATEEX *>(*ppMyDlgTemplate);
59-
if (pMyDlgTemplateEx->signature == 0xFFFF)
60-
pMyDlgTemplateEx->exStyle |= WS_EX_LAYOUTRTL;
61-
else
62-
(*ppMyDlgTemplate)->dwExtendedStyle |= WS_EX_LAYOUTRTL;
54+
if (hMyDlgTemplate)
55+
{
56+
*ppMyDlgTemplate = reinterpret_cast<DLGTEMPLATE *>(::GlobalLock(hMyDlgTemplate));
57+
if (*ppMyDlgTemplate)
58+
{
59+
::memcpy(*ppMyDlgTemplate, pDlgTemplate, sizeDlg);
60+
61+
DLGTEMPLATEEX *pMyDlgTemplateEx = reinterpret_cast<DLGTEMPLATEEX *>(*ppMyDlgTemplate);
62+
if (pMyDlgTemplateEx->signature == 0xFFFF)
63+
pMyDlgTemplateEx->exStyle |= WS_EX_LAYOUTRTL;
64+
else
65+
(*ppMyDlgTemplate)->dwExtendedStyle |= WS_EX_LAYOUTRTL;
66+
}
67+
}
6368

6469
return hMyDlgTemplate;
6570
}

0 commit comments

Comments
 (0)