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

Replace assertions

pull/346/head
Wouter 2020-05-27 00:40:01 +02:00
parent e699e94d40
commit f93b335c9a
1 changed files with 55 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
options.c
View File

@ -37,9 +37,6 @@
#include <combaseapi.h> #include <combaseapi.h>
#include "options.h" #include "options.h"
#include <assert.h>
#include "main.h" #include "main.h"
#include "openvpn-gui-res.h" #include "openvpn-gui-res.h"
#include "localization.h" #include "localization.h"
@ -466,19 +463,23 @@ BrowseFolder (const WCHAR* initial_path, WCHAR* selected_path)
// Create dialog // Create dialog
initResult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); initResult = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
assert(SUCCEEDED(initResult)); if (FAILED(initResult))
{
return false;
}
result = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_ALL, &IID_IFileOpenDialog, &pfd); result = CoCreateInstance(&CLSID_FileOpenDialog, NULL, CLSCTX_ALL, &IID_IFileOpenDialog, &pfd);
assert(SUCCEEDED(result)); if (SUCCEEDED(result))
{
// Select folders, not files // Select folders, not files
{ {
DWORD dwOptions; DWORD dwOptions;
result = pfd->lpVtbl->GetOptions(pfd, &dwOptions); result = pfd->lpVtbl->GetOptions(pfd, &dwOptions);
assert(SUCCEEDED(result)); if(SUCCEEDED(result))
{
dwOptions |= FOS_PICKFOLDERS; dwOptions |= FOS_PICKFOLDERS;
result = pfd->lpVtbl->SetOptions(pfd, dwOptions); result = pfd->lpVtbl->SetOptions(pfd, dwOptions);
assert(SUCCEEDED(result)); }
} }
// Set initial path // Set initial path
@ -499,20 +500,29 @@ BrowseFolder (const WCHAR* initial_path, WCHAR* selected_path)
IShellItem* psi; IShellItem* psi;
LPOLESTR path = NULL; LPOLESTR path = NULL;
assert(SUCCEEDED(pfd->lpVtbl->GetResult(pfd, &psi))); result = pfd->lpVtbl->GetResult(pfd, &psi);
if(SUCCEEDED(result))
assert(SUCCEEDED(psi->lpVtbl->GetDisplayName(psi, SIGDN_FILESYSPATH, &path))); {
result = psi->lpVtbl->GetDisplayName(psi, SIGDN_FILESYSPATH, &path);
}
if (SUCCEEDED(result))
{
wcsncpy_s(selected_path, MAX_PATH, path, MAX_PATH); wcsncpy_s(selected_path, MAX_PATH, path, MAX_PATH);
selected_path[MAX_PATH - 1] = 0; selected_path[MAX_PATH - 1] = 0;
CoTaskMemFree(path); CoTaskMemFree(path);
psi->lpVtbl->Release(psi); psi->lpVtbl->Release(psi);
}else
{
dialogResult = E_FAIL;
}
} }
// Cleanup // Cleanup
pfd->lpVtbl->Release(pfd); pfd->lpVtbl->Release(pfd);
}
if (initResult != RPC_E_CHANGED_MODE && SUCCEEDED(initResult)) if (initResult != RPC_E_CHANGED_MODE && SUCCEEDED(initResult))
{ {