diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp index 5f48c3c..c5b7807 100644 --- a/src/proxy/proxypython.cpp +++ b/src/proxy/proxypython.cpp @@ -64,7 +64,7 @@ QString ExtractResource(WORD resourceID, const QString &szFilename) QString outFile = QDir::tempPath() + "/" + szFilename; - HANDLE hFile = CreateFileW(ToWString(outFile).c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); + HANDLE hFile = CreateFileW(outFile.toStdWString().c_str(), GENERIC_READ | GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr); HANDLE hFileMap = CreateFileMapping(hFile, nullptr, PAGE_READWRITE, 0, dwSize, nullptr); LPVOID lpAddress = MapViewOfFile(hFileMap, FILE_MAP_WRITE, 0, 0, 0); @@ -154,7 +154,7 @@ bool ProxyPython::init(IOrganizer *moInfo) return true; } else { DWORD error = ::GetLastError(); - qCritical("Failed to load python runner: %s", qPrintable(windowsErrorString(error))); + qCritical("Failed to load python runner (%s): %s", qPrintable(m_TempRunnerFile), qPrintable(windowsErrorString(error))); if (error == ERROR_MOD_NOT_FOUND) { m_LoadFailure = FAIL_MISSINGDEPENDENCIES; } diff --git a/src/runner/proxypluginwrappers.cpp b/src/runner/proxypluginwrappers.cpp index ddaaf04..b5d3b6a 100644 --- a/src/runner/proxypluginwrappers.cpp +++ b/src/runner/proxypluginwrappers.cpp @@ -1,4 +1,3 @@ -//#define HAVE_ROUND #include "proxypluginwrappers.h" #include #include "error.h" @@ -83,7 +82,6 @@ QString IPluginToolWrapper::tooltip() const QIcon IPluginToolWrapper::icon() const { try { -qDebug("%p", this->get_override("icon").ptr()); return this->get_override("icon")().as(); } PYCATCH; } diff --git a/src/runner/pythonRunner.pro b/src/runner/pythonRunner.pro index 4da9d64..a0aceed 100644 --- a/src/runner/pythonRunner.pro +++ b/src/runner/pythonRunner.pro @@ -13,7 +13,7 @@ CONFIG += warn_on DEFINES += PYTHONRUNNER_LIBRARY # suppress a few warnings caused by boost vs vc++ paranoia -DEFINES += _SCL_SECURE_NO_WARNINGS +DEFINES += _SCL_SECURE_NO_WARNINGS HAVE_ROUND !include(../LocalPaths.pri) { diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 31f42df..0749e44 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -1,5 +1,3 @@ -#define HAVE_ROUND - #include "pythonrunner.h" #pragma warning( disable : 4100 )