github
/
openvpn-gui
mirror of https://github.com/OpenVPN/openvpn-gui
1
0
Fork 0
Code Issues Releases Wiki Activity

Add MB_ICONERROR to some error display message boxes 

Signed-off-by: Selva Nair <selva.nair@gmail.com>
pull/761/merge
Selva Nair 2025-10-25 15:55:13 -04:00 committed by Lev Stipakov
parent c6623258c6
commit 6ec7b236fe
1 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
as.c
View File

@ -133,8 +133,12 @@ ShowWinInetError(HANDLE hWnd)
err, err,
_countof(err), _countof(err),
NULL); NULL);
ShowLocalizedMsgEx( ShowLocalizedMsgEx(MB_OK | MB_ICONERROR,
MB_OK, hWnd, _T(PACKAGE_NAME), IDS_ERR_URL_IMPORT_PROFILE, GetLastError(), err); hWnd,
_T(PACKAGE_NAME),
IDS_ERR_URL_IMPORT_PROFILE,
GetLastError(),
err);
} }
struct UrlComponents struct UrlComponents
@ -208,7 +212,7 @@ DownloadProfileContent(HANDLE hWnd, HINTERNET hRequest, char **pbuf, size_t *psi
char *buf = *pbuf; char *buf = *pbuf;
if (buf == NULL) if (buf == NULL)
{ {
MessageBoxW(hWnd, L"Out of memory", _T(PACKAGE_NAME), MB_OK); MessageBoxW(hWnd, L"Out of memory", _T(PACKAGE_NAME), MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
while (true) while (true)
@ -235,7 +239,7 @@ DownloadProfileContent(HANDLE hWnd, HINTERNET hRequest, char **pbuf, size_t *psi
if (!*pbuf) if (!*pbuf)
{ {
free(buf); free(buf);
MessageBoxW(hWnd, L"Out of memory", _T(PACKAGE_NAME), MB_OK); MessageBoxW(hWnd, L"Out of memory", _T(PACKAGE_NAME), MB_OK | MB_ICONERROR);
return FALSE; return FALSE;
} }
buf = *pbuf; buf = *pbuf;
@ -614,8 +618,12 @@ again:
if (status_code != 200) if (status_code != 200)
{ {
ShowLocalizedMsgEx( ShowLocalizedMsgEx(MB_OK | MB_ICONERROR,
MB_OK, hWnd, _T(PACKAGE_NAME), IDS_ERR_URL_IMPORT_PROFILE, status_code, L"HTTP error"); hWnd,
_T(PACKAGE_NAME),
IDS_ERR_URL_IMPORT_PROFILE,
status_code,
L"HTTP error");
goto done; goto done;
} }
@ -627,7 +635,7 @@ again:
BOOL res = HttpQueryInfoA(hRequest, HTTP_QUERY_CONTENT_TYPE, tmp, &len, NULL); BOOL res = HttpQueryInfoA(hRequest, HTTP_QUERY_CONTENT_TYPE, tmp, &len, NULL);
if (!res || stricmp(comps->content_type, tmp)) if (!res || stricmp(comps->content_type, tmp))
{ {
ShowLocalizedMsgEx(MB_OK, ShowLocalizedMsgEx(MB_OK | MB_ICONERROR,
hWnd, hWnd,
_T(PACKAGE_NAME), _T(PACKAGE_NAME),
IDS_ERR_URL_IMPORT_PROFILE, IDS_ERR_URL_IMPORT_PROFILE,
@ -645,8 +653,10 @@ again:
WCHAR *wbuf = Widen(buf); WCHAR *wbuf = Widen(buf);
if (!wbuf) if (!wbuf)
{ {
MessageBoxW( MessageBoxW(hWnd,
hWnd, L"Failed to convert profile content to wchar", _T(PACKAGE_NAME), MB_OK); L"Failed to convert profile content to wchar",
_T(PACKAGE_NAME),
MB_OK | MB_ICONERROR);
goto done; goto done;
} }
ExtractProfileName(wbuf, comps->host, name, MAX_PATH); ExtractProfileName(wbuf, comps->host, name, MAX_PATH);
@ -657,7 +667,7 @@ again:
DWORD res = GetTempPathW((DWORD)out_path_size, out_path); DWORD res = GetTempPathW((DWORD)out_path_size, out_path);
if (res == 0 || res > out_path_size) if (res == 0 || res > out_path_size)
{ {
MessageBoxW(hWnd, L"Failed to get TMP path", _T(PACKAGE_NAME), MB_OK); MessageBoxW(hWnd, L"Failed to get TMP path", _T(PACKAGE_NAME), MB_OK | MB_ICONERROR);
goto done; goto done;
} }
if (out_path_size < (wcslen(out_path) + wcslen(name) + 1)) if (out_path_size < (wcslen(out_path) + wcslen(name) + 1))
@ -670,7 +680,8 @@ again:
FILE *f; FILE *f;
if (_wfopen_s(&f, out_path, L"w")) if (_wfopen_s(&f, out_path, L"w"))
{ {
MessageBoxW(hWnd, L"Unable to save downloaded profile", _T(PACKAGE_NAME), MB_OK); MessageBoxW(
hWnd, L"Unable to save downloaded profile", _T(PACKAGE_NAME), MB_OK | MB_ICONERROR);
goto done; goto done;
} }
fwrite(buf, sizeof(char), size, f); fwrite(buf, sizeof(char), size, f);