diff --git a/win-linux/src/cmainpanel.cpp b/win-linux/src/cmainpanel.cpp index d3679f273..d92eb16d5 100644 --- a/win-linux/src/cmainpanel.cpp +++ b/win-linux/src/cmainpanel.cpp @@ -64,7 +64,6 @@ #ifdef _WIN32 #include "win/cprintdialog.h" #include "shlobj.h" -#include "lmcons.h" #else #define VK_F4 0x73 @@ -228,7 +227,7 @@ CMainPanel::CMainPanel(QWidget *parent, bool isCustomWindow, uchar dpi_ratio) QString params = QString("lang=%1&username=%3&location=%2") .arg(CLangater::getLanguageName(), Utils::systemLocationCode()); wstring wparams = params.toStdWString(); - wstring user_name = readSystemUserName(); + wstring user_name = Utils::systemUserName(); wparams.replace(wparams.find(L"%3"), 2, user_name); AscAppManager::getInstance().InitAdditionalEditorParams(wparams); @@ -1326,27 +1325,6 @@ void CMainPanel::onOutsideAuth(QString json) } } -wstring CMainPanel::readSystemUserName() -{ -#ifdef Q_OS_WIN - WCHAR _env_name[UNLEN + 1]{0}; - DWORD _size = UNLEN + 1; - - return GetUserName(_env_name, &_size) ? - wstring(_env_name) : L"Unknown.User"; -#else - QString _env_name = qgetenv("USER"); - if ( _env_name.isEmpty() ) { - _env_name = qgetenv("USERNAME"); - - if (_env_name.isEmpty()) - _env_name = "Unknown.User"; - } - - return _env_name.toStdWString(); -#endif -} - void CMainPanel::setInputFiles(QStringList * list) { RELEASEOBJECT(m_inFiles) diff --git a/win-linux/src/cmainpanel.h b/win-linux/src/cmainpanel.h index b9f0836e4..8a1474958 100644 --- a/win-linux/src/cmainpanel.h +++ b/win-linux/src/cmainpanel.h @@ -92,7 +92,6 @@ private: int trySaveDocument(int); void RecalculatePlaces(); - wstring readSystemUserName(); signals: // void downloadEvent(NSEditorApi::CAscDownloadFileInfo *); void mainWindowChangeState(Qt::WindowState); diff --git a/win-linux/src/main.cpp b/win-linux/src/main.cpp index e9f68a051..7e8702c66 100644 --- a/win-linux/src/main.cpp +++ b/win-linux/src/main.cpp @@ -155,7 +155,7 @@ int main( int argc, char *argv[] ) application_cef->Init_CEF(&AscAppManager::getInstance(), argc, argv); /* ********************** */ - GET_REGISTRY_SYSTEM(reg_system) +// GET_REGISTRY_SYSTEM(reg_system) GET_REGISTRY_USER(reg_user) reg_user.setFallbacksEnabled(false); diff --git a/win-linux/src/utils.cpp b/win-linux/src/utils.cpp index 551692faa..62d457646 100644 --- a/win-linux/src/utils.cpp +++ b/win-linux/src/utils.cpp @@ -51,6 +51,7 @@ #ifdef _WIN32 #include "shlobj.h" +#include "lmcons.h" typedef HRESULT (__stdcall *SetCurrentProcessExplicitAppUserModelIDProc)(PCWSTR AppID); #else #include @@ -428,3 +429,24 @@ bool Utils::setAppUserModelId(const QString& modelid) return _result; } + +wstring Utils::systemUserName() +{ +#ifdef Q_OS_WIN + WCHAR _env_name[UNLEN + 1]{0}; + DWORD _size = UNLEN + 1; + + return GetUserName(_env_name, &_size) ? + wstring(_env_name) : L"Unknown.User"; +#else + QString _env_name = qgetenv("USER"); + if ( _env_name.isEmpty() ) { + _env_name = qgetenv("USERNAME"); + + if (_env_name.isEmpty()) + _env_name = "Unknown.User"; + } + + return _env_name.toStdWString(); +#endif +} diff --git a/win-linux/src/utils.h b/win-linux/src/utils.h index ae5568105..d74845bb5 100644 --- a/win-linux/src/utils.h +++ b/win-linux/src/utils.h @@ -44,6 +44,7 @@ public: static QString lastPath(int type); static void keepLastPath(int type, const QString&); static QString getUserPath(); + static wstring systemUserName(); static QString getAppCommonPath(); static QRect getScreenGeometry(const QPoint&); static void openUrl(const QString&);