diff options
| author | Jakob Lichtenberg (170957) <[email protected]> | 2024-06-28 11:39:18 -0700 |
|---|---|---|
| committer | Jakob Lichtenberg (170957) <[email protected]> | 2024-06-28 11:39:18 -0700 |
| commit | 1971c7bfc27f90764155ef96df64db4b4cfb93df (patch) | |
| tree | 9193a001a463219d073ce9ea5f1e3408a0ba3d56 /hid | |
| parent | 3c4d58d08b74cf2925ec632ed1fe81e0d81df8a1 (diff) | |
| parent | b3af8c8f9bd508f54075da2f2516b31d05cd52c8 (diff) | |
Merge branch 'main' into user/jakobl/nuget_packagereference_instead_of_packages_configuser/jakobl/nuget_packagereference_instead_of_packages_config
Diffstat (limited to 'hid')
| -rw-r--r-- | hid/firefly/sauron/Sauron.cpp | 6 | ||||
| -rw-r--r-- | hid/hclient/ecdisp.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hid/firefly/sauron/Sauron.cpp b/hid/firefly/sauron/Sauron.cpp index 16cb12d4..36ef367b 100644 --- a/hid/firefly/sauron/Sauron.cpp +++ b/hid/firefly/sauron/Sauron.cpp @@ -445,7 +445,7 @@ HRESULT CSauron::WzToColor(const WCHAR *pwszColor, COLORREF *pcrColor) return E_POINTER; } - if (0 == lstrlenW(pwszColor)) + if (0 == wcslen(pwszColor)) { //Empty color string passed in return E_INVALIDARG; @@ -457,7 +457,7 @@ HRESULT CSauron::WzToColor(const WCHAR *pwszColor, COLORREF *pcrColor) return E_POINTER; } - if (lstrlenW(pwszColor) != 7) + if (wcslen(pwszColor) != 7) { //hex color string is not of the correct length return E_INVALIDARG; @@ -534,5 +534,3 @@ inline DWORD CSauron::SwapBytes(DWORD dwRet) { return ((dwRet & 0x0000FF00) | ((dwRet & 0x00FF0000) >> 16) | ((dwRet & 0x000000FF) << 16)); } - - diff --git a/hid/hclient/ecdisp.c b/hid/hclient/ecdisp.c index 0d15774f..28433aea 100644 --- a/hid/hclient/ecdisp.c +++ b/hid/hclient/ecdisp.c @@ -3588,8 +3588,7 @@ bSetDataDlgProc( break; } - #pragma prefast(suppress: 28750, "Banned API check.") - CharUpperBuff(DataString, lstrlen(DataString)); + CharUpperBuff(DataString, (DWORD)strlen(DataString)); if (0 == lstrcmp(DataString, "TRUE")) { |