diff options
| author | Zousar Shaker <[email protected]> | 2021-11-29 23:27:18 -0700 |
|---|---|---|
| committer | Zousar Shaker <[email protected]> | 2021-11-29 23:27:18 -0700 |
| commit | 25c2eec10f64d22ee64a84a6bfb34e7933443c79 (patch) | |
| tree | cd9885775cce66009a9c65116e2053140e9c5485 | |
| parent | Disable forced elevation for zenserver.exe. (diff) | |
| download | zen-25c2eec10f64d22ee64a84a6bfb34e7933443c79.tar.xz zen-25c2eec10f64d22ee64a84a6bfb34e7933443c79.zip | |
Address review feedback and fix issue when deploying.
| -rw-r--r-- | zenhttp/httpsys.cpp | 2 | ||||
| -rw-r--r-- | zenhttp/httpsys.h | 2 | ||||
| -rw-r--r-- | zenserver/xmake.lua | 1 | ||||
| -rw-r--r-- | zenutil/zenserverprocess.cpp | 8 |
4 files changed, 6 insertions, 7 deletions
diff --git a/zenhttp/httpsys.cpp b/zenhttp/httpsys.cpp index 0d055f706..e9472e3b8 100644 --- a/zenhttp/httpsys.cpp +++ b/zenhttp/httpsys.cpp @@ -791,7 +791,7 @@ HttpSysServer::InitializeServer(int BasePort) // port for the current user. eg: // netsh http add urlacl url=http://*:1337/ user=<some_user> - std::vector<std::u8string_view> Hosts { u8"[::1]"sv, u8"localhost"sv, u8"127.0.0.1"sv }; + const std::u8string_view Hosts[] = { u8"[::1]"sv, u8"localhost"sv, u8"127.0.0.1"sv }; for (const std::u8string_view Host : Hosts) { diff --git a/zenhttp/httpsys.h b/zenhttp/httpsys.h index c00a041dc..7df8fba8f 100644 --- a/zenhttp/httpsys.h +++ b/zenhttp/httpsys.h @@ -80,7 +80,7 @@ private: HTTP_URL_GROUP_ID m_HttpUrlGroupId = 0; HANDLE m_RequestQueueHandle = 0; std::atomic_int32_t m_PendingRequests{0}; - std::atomic<int32_t> m_IsShuttingDown{0}; + std::atomic_int32_t m_IsShuttingDown{0}; int32_t m_MinPendingRequests = 16; int32_t m_MaxPendingRequests = 128; Event m_ShutdownEvent; diff --git a/zenserver/xmake.lua b/zenserver/xmake.lua index bba9b6ba5..bffb5d9d2 100644 --- a/zenserver/xmake.lua +++ b/zenserver/xmake.lua @@ -12,7 +12,6 @@ target("zenserver") if is_plat("windows") then add_ldflags("/subsystem:console,5.02") add_ldflags("/MANIFEST:EMBED") - add_ldflags("/MANIFESTUAC:level='requireAdministrator'") add_ldflags("/LTCG") else del_files("windows/**") diff --git a/zenutil/zenserverprocess.cpp b/zenutil/zenserverprocess.cpp index b43e86f00..dbe27ef20 100644 --- a/zenutil/zenserverprocess.cpp +++ b/zenutil/zenserverprocess.cpp @@ -98,9 +98,9 @@ ZenServerState::Initialize() { m_hMapFile = hMap; } - else if (HANDLE hMap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, L"Local\\ZenMap")) + else if (HANDLE hLocalMap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, L"Local\\ZenMap")) { - m_hMapFile = hMap; + m_hMapFile = hLocalMap; } else { @@ -154,9 +154,9 @@ ZenServerState::InitializeReadOnly() { m_hMapFile = hMap; } - else if (HANDLE hMap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, L"Local\\ZenMap")) + else if (HANDLE hLocalMap = OpenFileMapping(FILE_MAP_ALL_ACCESS, FALSE, L"Local\\ZenMap")) { - m_hMapFile = hMap; + m_hMapFile = hLocalMap; } else { |