diff options
author | Robert Adam <krzmbrzl@gmail.com> | 2021-03-01 20:01:11 +0300 |
---|---|---|
committer | Robert Adam <krzmbrzl@gmail.com> | 2021-03-02 12:15:01 +0300 |
commit | 59ae429972c16c377135bcccfee646b7df446933 (patch) | |
tree | d4d82f96756f95255970f165195f3fde71273c40 /overlay/overlay_exe | |
parent | 86710dab6202794bb14a26aff76e303c99c7dc43 (diff) |
MAINT: Update copyright notice to 2021
This was done by running scripts/updateLicenseHeaders.py and then
manually editing the LICENSE file.
Diffstat (limited to 'overlay/overlay_exe')
-rw-r--r-- | overlay/overlay_exe/overlay_exe.cpp | 2 | ||||
-rw-r--r-- | overlay/overlay_exe/overlay_exe.h | 178 |
2 files changed, 90 insertions, 90 deletions
diff --git a/overlay/overlay_exe/overlay_exe.cpp b/overlay/overlay_exe/overlay_exe.cpp index 7bca1c3de..3bbf4f40b 100644 --- a/overlay/overlay_exe/overlay_exe.cpp +++ b/overlay/overlay_exe/overlay_exe.cpp @@ -1,4 +1,4 @@ -// Copyright 2005-2020 The Mumble Developers. All rights reserved. +// Copyright 2015-2021 The Mumble Developers. All rights reserved. // Use of this source code is governed by a BSD-style license // that can be found in the LICENSE file at the root of the // Mumble source tree or at <https://www.mumble.info/LICENSE>. diff --git a/overlay/overlay_exe/overlay_exe.h b/overlay/overlay_exe/overlay_exe.h index 9799e3149..82ec1b248 100644 --- a/overlay/overlay_exe/overlay_exe.h +++ b/overlay/overlay_exe/overlay_exe.h @@ -1,89 +1,89 @@ -// Copyright 2005-2020 The Mumble Developers. All rights reserved.
-// Use of this source code is governed by a BSD-style license
-// that can be found in the LICENSE file at the root of the
-// Mumble source tree or at <https://www.mumble.info/LICENSE>.
-
-#ifndef MUMBLE_OVERLAY_EXE_H_
-#define MUMBLE_OVERLAY_EXE_H_
-
-#if defined(_M_IX86)
-const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol.dll";
-#elif defined(_M_X64)
-const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol_x64.dll";
-#endif
-
-/// OverlayHelperError represents exit codes returned by the
-/// overlay helper process (mumble_ol_helper.exe) on Windows.
-enum OverlayHelperError {
- /// The overlay helper process was not passed any
- /// arguments.
- OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS = 0x0F000001,
- /// The magic number on the command line of the overlay
- /// helper process could not be converted to an integer.
- OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT = 0x0F000002,
- /// The magic number on the command line of the overlay
- /// helper did not match the built-in magic number of
- /// the helper process.
- OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH = 0x0F000003,
- /// The overlay helper process was unable to configure
- /// its environment in preparation of loading the
- /// overlay DLL.
- OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT = 0x0F000004,
- /// The overlay helper process was unable to get the
- /// path to the overlay DLL.
- OVERLAY_HELPER_ERROR_EXE_GET_DLL_PATH = 0x0F000005,
- /// The overlay helper process was unable to load the
- /// overlay DLL.
- OVERLAY_HELPER_ERROR_EXE_LOAD_DLL = 0x0F000006,
- /// The overlay helper process was uanble to look up
- /// the 'OverlayHelperProcessMain' entry point in the
- /// overlay DLL.
- OVERLAY_HELPER_ERROR_EXE_LOOKUP_ENTRY_POINT = 0x0F000007,
- /// The overlay helper process was uanble to parse
- /// the commandline arguments it was passed.
- /// The helper process exepcts two arguments, and this
- /// error occurs if it only finds one.
- OVERLAY_HELPER_ERROR_TOO_FEW_ARGUMENTS = 0x0F000008,
- /// The magic number on the command line of the overlay
- /// helper process could not be converted to a HANDLE.
- OVERLAY_HELPER_ERROR_EXE_INVALID_HANDLE_ARGUMENT = 0x0F000009,
-
- /// The magic number passed to the overlay DLL's
- /// OverlayHelperProcessMain function did not match
- /// the overlay DLL's built-in magic number.
- OVERLAY_HELPER_ERROR_DLL_MAGIC_MISMATCH = 0x0FF00000,
- /// The overlay helper process exited due to an error
- /// in the Windows message loop.
- OVERLAY_HELPER_ERROR_DLL_MESSAGE_LOOP = 0x0FF00001,
- /// The parent death thread could not be created.
- OVERLAY_HELPER_ERROR_DLL_PDEATH_THREAD_ERROR = 0x0FF00002,
- /// The helper's WaitForSingleObject call on its parent
- /// process failed unexpectedly.
- OVERLAY_HELPER_ERROR_DLL_PDEATH_WAIT_FAIL = 0x0FF00003,
-};
-
-/// OverlayHelperErrorToString converts an OverlayHelperError value
-/// to a printable string representation.
-static inline const char *OverlayHelperErrorToString(OverlayHelperError err) {
-#define OHE(x) \
- case x: \
- return #x
- switch (err) {
- OHE(OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS);
- OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT);
- OHE(OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH);
- OHE(OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT);
- OHE(OVERLAY_HELPER_ERROR_EXE_GET_DLL_PATH);
- OHE(OVERLAY_HELPER_ERROR_EXE_LOAD_DLL);
- OHE(OVERLAY_HELPER_ERROR_EXE_LOOKUP_ENTRY_POINT);
- OHE(OVERLAY_HELPER_ERROR_TOO_FEW_ARGUMENTS);
- OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_HANDLE_ARGUMENT);
- OHE(OVERLAY_HELPER_ERROR_DLL_MAGIC_MISMATCH);
- OHE(OVERLAY_HELPER_ERROR_DLL_MESSAGE_LOOP);
- OHE(OVERLAY_HELPER_ERROR_DLL_PDEATH_THREAD_ERROR);
- OHE(OVERLAY_HELPER_ERROR_DLL_PDEATH_WAIT_FAIL);
- }
- return nullptr;
-}
-
-#endif
+// Copyright 2015-2021 The Mumble Developers. All rights reserved. +// Use of this source code is governed by a BSD-style license +// that can be found in the LICENSE file at the root of the +// Mumble source tree or at <https://www.mumble.info/LICENSE>. + +#ifndef MUMBLE_OVERLAY_EXE_H_ +#define MUMBLE_OVERLAY_EXE_H_ + +#if defined(_M_IX86) +const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol.dll"; +#elif defined(_M_X64) +const wchar_t *MUMBLE_OVERLAY_DLL_NAME = L"mumble_ol_x64.dll"; +#endif + +/// OverlayHelperError represents exit codes returned by the +/// overlay helper process (mumble_ol_helper.exe) on Windows. +enum OverlayHelperError { + /// The overlay helper process was not passed any + /// arguments. + OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS = 0x0F000001, + /// The magic number on the command line of the overlay + /// helper process could not be converted to an integer. + OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT = 0x0F000002, + /// The magic number on the command line of the overlay + /// helper did not match the built-in magic number of + /// the helper process. + OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH = 0x0F000003, + /// The overlay helper process was unable to configure + /// its environment in preparation of loading the + /// overlay DLL. + OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT = 0x0F000004, + /// The overlay helper process was unable to get the + /// path to the overlay DLL. + OVERLAY_HELPER_ERROR_EXE_GET_DLL_PATH = 0x0F000005, + /// The overlay helper process was unable to load the + /// overlay DLL. + OVERLAY_HELPER_ERROR_EXE_LOAD_DLL = 0x0F000006, + /// The overlay helper process was uanble to look up + /// the 'OverlayHelperProcessMain' entry point in the + /// overlay DLL. + OVERLAY_HELPER_ERROR_EXE_LOOKUP_ENTRY_POINT = 0x0F000007, + /// The overlay helper process was uanble to parse + /// the commandline arguments it was passed. + /// The helper process exepcts two arguments, and this + /// error occurs if it only finds one. + OVERLAY_HELPER_ERROR_TOO_FEW_ARGUMENTS = 0x0F000008, + /// The magic number on the command line of the overlay + /// helper process could not be converted to a HANDLE. + OVERLAY_HELPER_ERROR_EXE_INVALID_HANDLE_ARGUMENT = 0x0F000009, + + /// The magic number passed to the overlay DLL's + /// OverlayHelperProcessMain function did not match + /// the overlay DLL's built-in magic number. + OVERLAY_HELPER_ERROR_DLL_MAGIC_MISMATCH = 0x0FF00000, + /// The overlay helper process exited due to an error + /// in the Windows message loop. + OVERLAY_HELPER_ERROR_DLL_MESSAGE_LOOP = 0x0FF00001, + /// The parent death thread could not be created. + OVERLAY_HELPER_ERROR_DLL_PDEATH_THREAD_ERROR = 0x0FF00002, + /// The helper's WaitForSingleObject call on its parent + /// process failed unexpectedly. + OVERLAY_HELPER_ERROR_DLL_PDEATH_WAIT_FAIL = 0x0FF00003, +}; + +/// OverlayHelperErrorToString converts an OverlayHelperError value +/// to a printable string representation. +static inline const char *OverlayHelperErrorToString(OverlayHelperError err) { +#define OHE(x) \ + case x: \ + return #x + switch (err) { + OHE(OVERLAY_HELPER_ERROR_EXE_NO_ARGUMENTS); + OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_MAGIC_ARGUMENT); + OHE(OVERLAY_HELPER_ERROR_EXE_MAGIC_MISMATCH); + OHE(OVERLAY_HELPER_ERROR_EXE_CONFIGURE_ENVIRONMENT); + OHE(OVERLAY_HELPER_ERROR_EXE_GET_DLL_PATH); + OHE(OVERLAY_HELPER_ERROR_EXE_LOAD_DLL); + OHE(OVERLAY_HELPER_ERROR_EXE_LOOKUP_ENTRY_POINT); + OHE(OVERLAY_HELPER_ERROR_TOO_FEW_ARGUMENTS); + OHE(OVERLAY_HELPER_ERROR_EXE_INVALID_HANDLE_ARGUMENT); + OHE(OVERLAY_HELPER_ERROR_DLL_MAGIC_MISMATCH); + OHE(OVERLAY_HELPER_ERROR_DLL_MESSAGE_LOOP); + OHE(OVERLAY_HELPER_ERROR_DLL_PDEATH_THREAD_ERROR); + OHE(OVERLAY_HELPER_ERROR_DLL_PDEATH_WAIT_FAIL); + } + return nullptr; +} + +#endif |