Index: lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.cpp =================================================================== --- lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.cpp +++ lldb/trunk/tools/lldb-mi/MIUtilSystemWindows.cpp @@ -110,15 +110,13 @@ bool bOk = MIstatus::success; HMODULE hModule = ::GetModuleHandle(nullptr); char pPath[MAX_PATH]; - const DWORD nLen = ::GetModuleFileName(hModule, &pPath[0], MAX_PATH); - const CMIUtilString strLastErr(GetOSLastError()); - if ((nLen != 0) && (strLastErr == "Unknown OS error")) - vrwFileNamePath = &pPath[0]; - else + if (!::GetModuleFileName(hModule, &pPath[0], MAX_PATH)) { bOk = MIstatus::failure; - vrwFileNamePath = strLastErr; + vrwFileNamePath = GetOSLastError(); } + else + vrwFileNamePath = &pPath[0]; return bOk; }