plugins: use new header

dragan-radovic · Aug 8, 2019 · 9875c59 · 9875c59
1 parent e8afc38
commit 9875c59
Show file tree

Hide file tree

Showing 46 changed files with 70 additions and 63 deletions.
diff --git a/plugins/aoc/aoc.cpp b/plugins/aoc/aoc.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/arma2/arma2.cpp b/plugins/arma2/arma2.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 procptr_t posptr, frontptr, topptr;
 

diff --git a/plugins/bf1/bf1.cpp b/plugins/bf1/bf1.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &context, std::wstring &identity) {

diff --git a/plugins/bf1942/bf1942.cpp b/plugins/bf1942/bf1942.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 procptr_t faceptr, topptr;
 //BYTE *stateptr;

diff --git a/plugins/bf2/bf2.cpp b/plugins/bf2/bf2.cpp
@@ -3,7 +3,8 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
+
 using namespace std;
 
 

diff --git a/plugins/bf2142/bf2142.cpp b/plugins/bf2142/bf2142.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 // Variable to contain module's addresses

diff --git a/plugins/bf3/bf3.cpp b/plugins/bf3/bf3.cpp
@@ -36,7 +36,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
+
 static bool ptr_chain_valid = false;
 
 // Magic ptrs

diff --git a/plugins/bf4/bf4.cpp b/plugins/bf4/bf4.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &context, std::wstring &identity) {

diff --git a/plugins/bf4_x86/bf4_x86.cpp b/plugins/bf4_x86/bf4_x86.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &context, std::wstring &identity) {

diff --git a/plugins/bfbc2/bfbc2.cpp b/plugins/bfbc2/bfbc2.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 bool is_steam = false;
 

diff --git a/plugins/bfheroes/bfheroes.cpp b/plugins/bfheroes/bfheroes.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 procptr_t posptr, faceptr, topptr, stateptr;
 

diff --git a/plugins/blacklight/blacklight.cpp b/plugins/blacklight/blacklight.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 /* 
 	Arrays of bytes to find addresses accessed by respective functions so we don't have to blindly search for addresses after every update

diff --git a/plugins/borderlands/borderlands.cpp b/plugins/borderlands/borderlands.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 procptr_t posptr, frontptr, topptr, contextptraddress, stateaddress, loginaddress;
 

diff --git a/plugins/borderlands2/borderlands2.cpp b/plugins/borderlands2/borderlands2.cpp
@@ -35,7 +35,8 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */ 
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
+
 #include <algorithm>
 
 procptr_t vects_ptr;

diff --git a/plugins/breach/breach.cpp b/plugins/breach/breach.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 procptr_t posptr, frontptr, topptr;
 

diff --git a/plugins/cod2/cod2.cpp b/plugins/cod2/cod2.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &, std::wstring &) {
 	float viewHor, viewVer;

diff --git a/plugins/cod4/cod4.cpp b/plugins/cod4/cod4.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/cod5/cod5.cpp b/plugins/cod5/cod5.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &, std::wstring &) {
 	float viewHor, viewVer;

diff --git a/plugins/codmw2/codmw2.cpp b/plugins/codmw2/codmw2.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &, std::wstring &) {
 	float viewHor, viewVer;

diff --git a/plugins/codmw2so/codmw2so.cpp b/plugins/codmw2so/codmw2so.cpp
@@ -35,7 +35,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &, std::wstring &) {
 	float viewHor, viewVer;

diff --git a/plugins/cs/cs.cpp b/plugins/cs/cs.cpp
@@ -35,7 +35,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/dys/dys.cpp b/plugins/dys/dys.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/etqw/etqw.cpp b/plugins/etqw/etqw.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/ffxiv/ffxiv.cpp b/plugins/ffxiv/ffxiv.cpp
@@ -3,9 +3,9 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
-
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
+
 #include <cmath>
 
 // Offset values can be obtained from:

diff --git a/plugins/gmod/gmod.cpp b/plugins/gmod/gmod.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/gtaiv/gtaiv.cpp b/plugins/gtaiv/gtaiv.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static unsigned int playerid;
 static procptr_t base_address;

diff --git a/plugins/gtav/gtav.cpp b/plugins/gtav/gtav.cpp
@@ -3,8 +3,9 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
+
 #include <algorithm> // Include algorithm header for the game version detector
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &context, std::wstring &identity) {

diff --git a/plugins/gw/gw.cpp b/plugins/gw/gw.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 /*
 	Arrays of bytes to find addresses accessed by respective functions so we don't have to blindly search for addresses after every update

diff --git a/plugins/insurgency/insurgency.cpp b/plugins/insurgency/insurgency.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 using namespace std;
 

diff --git a/plugins/jc2/jc2.cpp b/plugins/jc2/jc2.cpp
@@ -35,7 +35,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 const unsigned int off_character_manager = 0xD8FB24;
 const unsigned int off_local_player = 0x3570;

diff --git a/plugins/l4d/l4d.cpp b/plugins/l4d/l4d.cpp
@@ -3,7 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 static procptr_t steamclient, engine; // Variables to contain modules addresses

diff --git a/plugins/l4d2/l4d2.cpp b/plugins/l4d2/l4d2.cpp
@@ -3,12 +3,7 @@
 // that can be found in the LICENSE file at the root of the
 // Mumble source tree or at <https://www.mumble.info/LICENSE>.
 
-#ifdef WIN32
-#include "../mumble_plugin_win32.h" // Include standard plugin header.
-#else
-#include "../mumble_plugin_linux.h" // Include standard plugin header.
-#endif
-
+#include "../mumble_plugin_main.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 // Variables to contain modules addresses

diff --git a/plugins/lol/lol.cpp b/plugins/lol/lol.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */ 
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 /*
 	Arrays of bytes to find addresses accessed by respective functions so we don't have to blindly search for addresses after every update

diff --git a/plugins/lotro/lotro.cpp b/plugins/lotro/lotro.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32.h"
+#include "../mumble_plugin_main.h"
 
 static int fetch(float *avatar_pos, float *avatar_front, float *avatar_top, float *camera_pos, float *camera_front, float *camera_top, std::string &context, std::wstring &) {
 	for (int i=0;i<3;i++)

diff --git a/plugins/mumble_plugin_linux.h b/plugins/mumble_plugin_linux.h
@@ -6,6 +6,10 @@
 #ifndef MUMBLE_PLUGIN_LINUX_H_
 #define MUMBLE_PLUGIN_LINUX_H_
 
+# ifndef MUMBLE_PLUGIN_MAIN_H_
+#  error "Include mumble_plugin_main.h instead of mumble_plugin_linux.h"
+# endif
+
 #include <sys/uio.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -16,8 +20,6 @@
 #include <fstream>
 #include <sstream>
 
-#include "mumble_plugin.h"
-
 static inline std::string readAll(const std::string &fn) {
 	std::ifstream ifs;
 	ifs.open(fn.c_str(), std::ifstream::binary);
@@ -168,7 +170,7 @@ static inline procptr_t getModuleAddr(const procid_t &pid, const wchar_t *modnam
 			if (pathname.size() > lastSlash + 1) {
 				std::string basename = pathname.substr(lastSlash + 1);
 				if (basename == modnameNonWide) {
-					unsigned long addr = strtoul(baseaddr.c_str(), NULL, 16);
+					unsigned long addr = strtoul(baseaddr.c_str(), nullptr, 16);
 					return addr;
 				}
 			}
@@ -192,7 +194,7 @@ static inline bool peekProc(const procptr_t &addr, void *dest, const size_t &len
 	return (nread != -1 && static_cast<size_t>(nread) == in.iov_len);
 }
 
-static bool inline initialize(const std::multimap<std::wstring, unsigned long long int> &pids, const wchar_t *procname, const wchar_t *modname = NULL) {
+static bool inline initialize(const std::multimap<std::wstring, unsigned long long int> &pids, const wchar_t *procname, const wchar_t *modname = nullptr) {
 	pModule = 0;
 
 	if (! pids.empty()) {

diff --git a/plugins/mumble_plugin_main.h b/plugins/mumble_plugin_main.h
@@ -1,15 +1,23 @@
-// Copyright 2005-2019 The Mumble Developers. All rights reserved.
+// Copyright 2019 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>.
 
+// This is the main header for process/OS stuff; it's included in most plugins
+// because values can rarely be retrieved without accessing the process' memory.
+//
+// Various functions are provided for common tasks when reading from memory.
+// The most important are getModuleAddr() and peekProc(); the first returns the
+// base address of a module (e.g. shared library), the latter reads memory at the
+// specified address and stores it in a variable.
+
 #ifndef MUMBLE_PLUGIN_MAIN_H_
 #define MUMBLE_PLUGIN_MAIN_H_
 
 #include "mumble_plugin.h"
 
-static procid_t pPid;
 static bool is64Bit;
+static procid_t pPid;
 static procptr_t pModule;
 
 static inline bool peekProc(const procptr_t &addr, void *dest, const size_t &len);