Merge PR #2510: mumble/plugins: Rename Win32 headers

mumble-voip · Aug 11, 2016 · 30ec38d · 30ec38d
2 parents 58a7ff5 + 746322e
commit 30ec38d
Show file tree

Hide file tree

Showing 43 changed files with 45 additions and 45 deletions.
diff --git a/plugins/aoc/aoc.cpp b/plugins/aoc/aoc.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

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

diff --git a/plugins/bf1942/bf1942.cpp b/plugins/bf1942/bf1942.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_t faceptr, topptr;
 //BYTE *stateptr;

diff --git a/plugins/bf2/bf2.cpp b/plugins/bf2/bf2.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_t posptr, faceptr, topptr;
 

diff --git a/plugins/bf3/bf3.cpp b/plugins/bf3/bf3.cpp
@@ -36,7 +36,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x64.h" // Include standard plugin header.
+#include "../mumble_plugin_win32_64bit.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_x86.h" // Include standard plugin header.
+#include "../mumble_plugin_win32_32bit.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
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_t posptr, frontptr, topptr, contextptraddress, stateaddress, loginaddress;
 

diff --git a/plugins/borderlands2/borderlands2.cpp b/plugins/borderlands2/borderlands2.cpp
@@ -35,7 +35,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */ 
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 #include <algorithm>
 
 procptr32_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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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
@@ -35,7 +35,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

diff --git a/plugins/dys/dys.cpp b/plugins/dys/dys.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

diff --git a/plugins/etqw/etqw.cpp b/plugins/etqw/etqw.cpp
@@ -36,7 +36,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

diff --git a/plugins/gmod/gmod.cpp b/plugins/gmod/gmod.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 static unsigned int playerid;
 static procptr32_t base_address;

diff --git a/plugins/gtav/gtav.cpp b/plugins/gtav/gtav.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_x64.h" // Include standard plugin header.
+#include "../mumble_plugin_win32_64bit.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
 

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_x86.h"
+#include "../mumble_plugin_win32_32bit.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
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_t posptr, rotptr;
 

diff --git a/plugins/l4d2/l4d2.pro b/plugins/l4d2/l4d2.pro
@@ -8,7 +8,7 @@ include(../plugins.pri)
 TARGET		= l4d2
 
 win32 {
-	SOURCES		= l4d2.cpp
+	SOURCES		= l4d2_win32.cpp
 	LIBS		+= -luser32
 }
 

diff --git a/plugins/l4d2/l4d2.cpp → plugins/l4d2/l4d2_win32.cpp b/plugins/l4d2/l4d2.cpp → plugins/l4d2/l4d2_win32.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_x86.h" // Include standard plugin header.
+#include "../mumble_plugin_win32_32bit.h" // Include standard plugin header.
 #include "../mumble_plugin_utils.h" // Include plugin header for special functions, like "escape".
 
 procptr32_t serverid_steamclient, player_engine; // BYTE values 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_x86.h"  
+#include "../mumble_plugin_win32_32bit.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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_win32_x86.h → plugins/mumble_plugin_win32_32bit.h b/plugins/mumble_plugin_win32_x86.h → plugins/mumble_plugin_win32_32bit.h
@@ -3,8 +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>.
 
-#ifndef MUMBLE_MUMBLE_PLUGIN_WIN32_X86_H_
-#define MUMBLE_MUMBLE_PLUGIN_WIN32_X86_H_
+#ifndef MUMBLE_MUMBLE_PLUGIN_WIN32_32BIT_H_
+#define MUMBLE_MUMBLE_PLUGIN_WIN32_32BIT_H_
 
 typedef unsigned long procptr32_t;
 

diff --git a/plugins/mumble_plugin_win32_x64.h → plugins/mumble_plugin_win32_64bit.h b/plugins/mumble_plugin_win32_x64.h → plugins/mumble_plugin_win32_64bit.h
@@ -3,8 +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>.
 
-#ifndef MUMBLE_MUMBLE_PLUGIN_WIN32_X64_H_
-#define MUMBLE_MUMBLE_PLUGIN_WIN32_X64_H_
+#ifndef MUMBLE_MUMBLE_PLUGIN_WIN32_64BIT_H_
+#define MUMBLE_MUMBLE_PLUGIN_WIN32_64BIT_H_
 
 typedef unsigned long long procptr64_t;
 

diff --git a/plugins/ql/ql.cpp b/plugins/ql/ql.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_x86.h" // Include standard plugin header.
+#include "../mumble_plugin_win32_32bit.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/rl/rl.cpp b/plugins/rl/rl.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_x86.h"
+#include "../mumble_plugin_win32_32bit.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 &) {
 	for (int i=0;i<3;i++)

diff --git a/plugins/sr/sr.cpp b/plugins/sr/sr.cpp
@@ -35,7 +35,7 @@
    
 */ 
 
-#include "../mumble_plugin_win32_x86.h"  
+#include "../mumble_plugin_win32_32bit.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 &/*identity*/) {
 	for (int i=0;i<3;i++)

diff --git a/plugins/sto/sto.cpp b/plugins/sto/sto.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_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 static procptr32_t identptr, contextptr, posptr;
 

diff --git a/plugins/ut2004/ut2004.cpp b/plugins/ut2004/ut2004.cpp
@@ -35,7 +35,7 @@
 */
 
 ////
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

diff --git a/plugins/ut3/ut3.cpp b/plugins/ut3/ut3.cpp
@@ -37,7 +37,7 @@
 //
 
 ////
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 using namespace std;
 

diff --git a/plugins/ut99/ut99.cpp b/plugins/ut99/ut99.cpp
@@ -34,7 +34,7 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.h"
 
 procptr32_t posptr;
 procptr32_t frtptr;

diff --git a/plugins/wolfet/wolfet.cpp b/plugins/wolfet/wolfet.cpp
@@ -47,7 +47,7 @@
         Increasing when turning left.
 */
 
-#include "../mumble_plugin_win32_x86.h"
+#include "../mumble_plugin_win32_32bit.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 &) {
 	float viewHor, viewVer;