lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-04 17:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check all files are writeable before applying update. Closes #264

Browse Source
This commit is contained in:
baldurk
2016-05-19 22:01:56 +02:00
parent 69705d9e99
commit 84528ce316
2 changed files with 70 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoccmd/renderdoccmd_win32.cpp
+59 -2
View File
@@ -333,6 +333,9 @@ int WINAPI wWinMain(_In_ HINSTANCE hInst,
mz_zip_archive zip;
ZeroMemory(&zip, sizeof(zip));
bool successful = false;
wstring failReason;
mz_bool b = mz_zip_reader_init_file(&zip, "./update.zip", 0);
if(b)
@@ -373,7 +376,53 @@ int WINAPI wWinMain(_In_ HINSTANCE hInst,
}
}
for(mz_uint i=0; i < numfiles; i++)
// next make sure we can get read+write access to every file. If not
// one might be in use, but we definitely can't update it
successful = true;
for(mz_uint i=0; successful && i < numfiles; i++)
{
if(!mz_zip_reader_is_file_a_directory(&zip, i))
{
mz_zip_archive_file_stat zstat;
mz_zip_reader_file_stat(&zip, i, &zstat);
const char *fn = zstat.m_filename;
// skip first directory because it's RenderDoc_Version_Bitness/
fn = strchr(fn, '/');
if(fn) fn++;
if(fn && *fn)
{
wchar_t conv[MAX_PATH] = {0};
wchar_t *wfn = conv;
// I know the zip only contains ASCII chars, just upcast
while(*fn) *(wfn++) = wchar_t(*(fn++));
wstring target = wide_path + conv;
wfn = &target[0];
// convert slashes just to be consistent
while(*(wfn++)) { if(*wfn == L'/') *wfn = L'\\'; }
FILE *f = NULL;
_wfopen_s(&f, target.c_str(), L"a+");
if(!f)
{
failReason = L"\"Couldn't modify an install file - likely file is in use.\"";
successful = false;
}
else
{
fclose(f);
}
}
}
}
for(mz_uint i=0; successful && i < numfiles; i++)
{
if(!mz_zip_reader_is_file_a_directory(&zip, i))
{
@@ -405,11 +454,19 @@ int WINAPI wWinMain(_In_ HINSTANCE hInst,
}
}
}
else
{
failReason = L"\"Failed to open update .zip file - possibly corrupted.\"";
}
// run original UI exe and tell it an update succeeded
wstring cmdline = L"\"";
cmdline += wide_path;
cmdline += L"/renderdocui.exe\" --updatedone";
cmdline += L"/renderdocui.exe\" ";
if(successful)
cmdline += L"--updatedone";
else
cmdline += L"--updatefailed " + failReason;
wchar_t *paramsAlloc = new wchar_t[512];
renderdocui/Code/AppMain.cs
+11 -1
View File
@@ -156,8 +156,10 @@ namespace renderdocui.Code
var core = new Core(filename, remoteHost, remoteIdent, temp, cfg);
foreach (var a in args)
for(int i=0; i < args.Length; i++)
{
var a = args[i];
if (a.ToUpperInvariant() == "--UPDATEDONE")
{
cfg.CheckUpdate_UpdateAvailable = false;
@@ -178,6 +180,14 @@ namespace renderdocui.Code
Helpers.UpdateInstalledVersionNumber();
}
if (a.ToUpperInvariant() == "--UPDATEFAILED")
{
if(i < args.Length-1)
MessageBox.Show(String.Format("Error applying update: {0}", args[i+1]), "Error updating", MessageBoxButtons.OK, MessageBoxIcon.Error);
else
MessageBox.Show("Unknown error applying update", "Error updating", MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
try