Skip to content

Commit bbf4028

Browse files
authored
Merge pull request #5575 from RaiKoHoff/Dev_Master
fix: enhance InfoBoxLng() to replace non dark-mode aware MessageBoxEx
2 parents da74cab + 15b4a29 commit bbf4028

10 files changed

Lines changed: 164 additions & 264 deletions

File tree

src/Config/Config.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,13 +193,13 @@ HANDLE AcquireWriteFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
193193
if (!bLocked) {
194194
HSTRINGW msg = StrgCreate(NULL);
195195
StrgFormat(msg, L"AcquireWriteFileLock(%s): NO EXCLUSIVE LOCK ACQUIRED!", lpIniFilePath);
196-
MsgBoxLastError(StrgGet(msg), 0);
196+
InfoBoxLastError(StrgGet(msg), 0);
197197
StrgDestroy(msg);
198198
}
199199
} else {
200200
HSTRINGW msg = StrgCreate(NULL);
201201
StrgFormat(msg, L"AcquireWriteFileLock(%s): INVALID FILE HANDLE!", lpIniFilePath);
202-
MsgBoxLastError(StrgGet(msg), 0);
202+
InfoBoxLastError(StrgGet(msg), 0);
203203
StrgDestroy(msg);
204204
}
205205
return (bLocked ? hFile : INVALID_HANDLE_VALUE);
@@ -226,13 +226,13 @@ HANDLE AcquireReadFileLock(LPCWSTR lpIniFilePath, OVERLAPPED& rOvrLpd)
226226
if (!bLocked) {
227227
HSTRINGW msg = StrgCreate(NULL);
228228
StrgFormat(msg, L"AcquireReadFileLock(%s): NO READER LOCK ACQUIRED!", lpIniFilePath);
229-
MsgBoxLastError(StrgGet(msg), 0);
229+
InfoBoxLastError(StrgGet(msg), 0);
230230
StrgDestroy(msg);
231231
}
232232
} else {
233233
HSTRINGW msg = StrgCreate(NULL);
234234
StrgFormat(msg, L"AcquireReadFileLock(%s): INVALID FILE HANDLE!", lpIniFilePath);
235-
MsgBoxLastError(StrgGet(msg), 0);
235+
InfoBoxLastError(StrgGet(msg), 0);
236236
StrgDestroy(msg);
237237
}
238238
return (bLocked ? hFile : INVALID_HANDLE_VALUE);
@@ -1138,11 +1138,11 @@ extern "C" bool CreateIniFile(const HPATHL hini_pth, DWORD* pdwFileSize_out)
11381138
if (IS_VALID_HANDLE(hFile)) {
11391139
CloseHandle(hFile); // done
11401140
} else {
1141-
WCHAR fileName[MAX_PATH_EXPLICIT>>1] = { L'\0' };
1141+
WCHAR fileName[MAX_PATH_EXPLICIT] = { L'\0' };
11421142
Path_GetDisplayName(fileName, COUNTOF(fileName), hini_pth, NULL, true);
11431143
HSTRINGW msg = StrgCreate(NULL);
11441144
StrgFormat(msg, L"CreateIniFile(%s): FAILED TO CREATE INITIAL INI FILE!", fileName);
1145-
MsgBoxLastError(StrgGet(msg), 0);
1145+
InfoBoxLastError(StrgGet(msg), 0);
11461146
StrgDestroy(msg);
11471147
if (pdwFileSize_out) { *pdwFileSize_out = 0UL; }
11481148
return false;
@@ -1157,11 +1157,11 @@ extern "C" bool CreateIniFile(const HPATHL hini_pth, DWORD* pdwFileSize_out)
11571157
dwFileSize = GetFileSize(hFile, &dwFSHigh);
11581158
CloseHandle(hFile);
11591159
} else {
1160-
WCHAR fileName[MAX_PATH_EXPLICIT>>1] = { L'\0' };
1160+
WCHAR fileName[MAX_PATH_EXPLICIT] = { L'\0' };
11611161
Path_GetDisplayName(fileName, COUNTOF(fileName), hini_pth, NULL, true);
11621162
HSTRINGW msg = StrgCreate(NULL);
11631163
StrgFormat(msg, L"CreateIniFile(%s): FAILED TO READ FILESIZE!", fileName);
1164-
MsgBoxLastError(StrgGet(msg), 0);
1164+
InfoBoxLastError(StrgGet(msg), 0);
11651165
StrgDestroy(msg);
11661166
dwFileSize = INVALID_FILE_SIZE;
11671167
}

0 commit comments

Comments
 (0)