CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-11 21:03:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

+rev: previous fix reverted - missing .ini must not have an assertion failure, allowed case here

Browse Source
This commit is contained in:
METANEOCORTEX\Kotti 2021-08-22 18:17:26 +02:00
parent a5b71f992d
commit 3db3bbbcff
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
grepWinNP3/sktoolslib_mod/SimpleIni.h
View File

@ -214,12 +214,6 @@
# pragma warning (disable: 4127 4503 4702 4786)
#endif
// workaround for invalid (false positive) assertion SI_ASSERT(hFile != INVALID_HANDLE_VALUE)
#ifndef _WIN64
# undef INVALID_HANDLE_VALUE
# define INVALID_HANDLE_VALUE ((HANDLE)INTPTR_MAX)
#endif
// Defines the conversion classes for different libraries. Before including
// SimpleIni.h, set the converter that you wish you use by defining one of the
// following symbols.
@ -1449,9 +1443,10 @@ CSimpleIniTempl<SI_CHAR, SI_STRLESS, SI_CONVERTER>::LoadFile(
GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
SI_ASSERT(hFile != INVALID_HANDLE_VALUE);
//~SI_ASSERT(hFile != INVALID_HANDLE_VALUE); // maybe .ini does not exist: allowed here
if (!IS_VALID_HANDLE(hFile)) {
if (!IS_VALID_HANDLE(hFile))
{
return SI_Error::SI_FILE;
}

11
src/Config/SimpleIni.h
View File

@ -214,12 +214,6 @@
# pragma warning (disable: 4127 4503 4702 4786)
#endif
// workaround for invalid (false positive) assertion SI_ASSERT(hFile != INVALID_HANDLE_VALUE)
#ifndef _WIN64
# undef INVALID_HANDLE_VALUE
# define INVALID_HANDLE_VALUE ((HANDLE)INTPTR_MAX)
#endif
// Defines the conversion classes for different libraries. Before including
// SimpleIni.h, set the converter that you wish you use by defining one of the
// following symbols.
@ -1449,9 +1443,10 @@ CSimpleIniTempl<SI_CHAR, SI_STRLESS, SI_CONVERTER>::LoadFile(
GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
nullptr, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, nullptr);
SI_ASSERT(hFile != INVALID_HANDLE_VALUE);
//~SI_ASSERT(hFile != INVALID_HANDLE_VALUE); // maybe .ini does not exist: allowed here
if (!IS_VALID_HANDLE(hFile)) {
if (!IS_VALID_HANDLE(hFile))
{
return SI_Error::SI_FILE;
}