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

Use WNetGetUniversalName to convert paths to UNC in vulkan registration

Browse Source 
* If we use a mounted network drive as the JSON path but then elevate to
  register, the elevated run will not get the mounted drive but the full UNC
  path. This will cause renderdoc to constantly think it needs to re-register.
* Converting to UNC first gives us a baseline comparison.
This commit is contained in:
baldurk
2018-12-04 18:40:07 +00:00
parent 59f0bfeefd
commit 3889ecb552
1 changed files with 40 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/vulkan/vk_win32.cpp
+40 -3
View File
@@ -26,6 +26,8 @@
#include "vk_core.h"
#include "vk_replay.h"
#include <shlwapi.h>
static int dllLocator = 0;
void VulkanReplay::OutputWindow::SetWindowHandle(WindowingData window)
@@ -168,12 +170,47 @@ std::wstring GetJSONPath(bool wow6432)
FileIO::GetLibraryFilename(libPath);
std::string jsonPath = dirname(FileIO::GetFullPathname(libPath));
std::wstring jsonWide = StringFormat::UTF82Wide(jsonPath);
if(jsonWide[1] == L':' && PathIsNetworkPathW(jsonWide.c_str()))
{
using PFN_WNetGetUniversalNameW = decltype(&WNetGetUniversalNameW);
HMODULE mpr = LoadLibraryA("mpr.dll");
if(mpr)
{
PFN_WNetGetUniversalNameW getUniversal =
(PFN_WNetGetUniversalNameW)GetProcAddress(mpr, "WNetGetUniversalNameW");
DWORD bufSize = 2048;
byte *buf = new byte[bufSize];
memset(buf, 0, bufSize);
DWORD result = getUniversal(jsonWide.c_str(), UNIVERSAL_NAME_INFO_LEVEL, buf, &bufSize);
if(result == NO_ERROR)
{
UNIVERSAL_NAME_INFOW *nameInfo = (UNIVERSAL_NAME_INFOW *)buf;
RDCLOG("Converted %ls network path to %ls", jsonWide.c_str(), nameInfo->lpUniversalName);
jsonWide = nameInfo->lpUniversalName;
}
else
{
RDCERR("Error calling WNetGetUniversalNameW: %d", result);
}
delete[] buf;
}
else
{
RDCERR("Can't load mpr.dll for WNetGetUniversalNameW");
}
}
if(wow6432)
jsonPath += "\\x86";
jsonWide += L"\\x86";
jsonPath += "\\renderdoc.json";
jsonWide += L"\\renderdoc.json";
return StringFormat::UTF82Wide(jsonPath);
return jsonWide;
}
static HKEY GetImplicitLayersKey(bool writeable, bool wow6432)