diff --git a/GloSC/GloSC.cpp b/GloSC/GloSC.cpp
index dda3762..7bd7d11 100644
--- a/GloSC/GloSC.cpp
+++ b/GloSC/GloSC.cpp
@@ -290,7 +290,7 @@ void GloSC::on_pbAddToSteam_clicked()
}
shortcutsFile.close();
- if (!shortcutsFile.open(QFile::ReadWrite | QIODevice::Truncate)) //damn qt is complicated...
+ if (!shortcutsFile.open(QFile::ReadWrite | QIODevice::Truncate))
{
QMessageBox::information(this, "GloSC", "Couldn't open Steam shortcuts file!", QMessageBox::Ok);
return;
diff --git a/GloSC/GloSC.vcxproj b/GloSC/GloSC.vcxproj
index d2e3500..c13cc78 100644
--- a/GloSC/GloSC.vcxproj
+++ b/GloSC/GloSC.vcxproj
@@ -266,7 +266,7 @@
-
+
diff --git a/GloSC_GameLauncher/GloSC_GameLauncher.cpp b/GloSC_GameLauncher/GloSC_GameLauncher.cpp
index 5773114..23e5eaf 100644
--- a/GloSC_GameLauncher/GloSC_GameLauncher.cpp
+++ b/GloSC_GameLauncher/GloSC_GameLauncher.cpp
@@ -39,7 +39,7 @@ GloSC_GameLauncher::GloSC_GameLauncher(QWidget *parent)
QDataStream out(&buffer);
out << defaultSharedMemData;
int size = buffer.size();
- char *to = (char*)sharedMemInstance.data();
+ char *to = static_cast(sharedMemInstance.data());
const char *from = buffer.data().data();
memcpy(to, from, qMin(sharedMemInstance.size(), size));
@@ -66,7 +66,7 @@ void GloSC_GameLauncher::checkSharedMem()
sharedMemInstance.lock();
- buffer.setData((char*)sharedMemInstance.constData(), sharedMemInstance.size());
+ buffer.setData(static_cast(sharedMemInstance.constData()), sharedMemInstance.size());
buffer.open(QBuffer::ReadOnly);
dataStream >> stringList;
buffer.close();
@@ -104,7 +104,7 @@ void GloSC_GameLauncher::checkSharedMem()
QDataStream out(&buffer);
out << stringList;
int size = buffer.size();
- char *to = (char*)sharedMemInstance.data();
+ char *to = static_cast(sharedMemInstance.data());
const char *from = buffer.data().data();
memcpy(to, from, qMin(sharedMemInstance.size(), size));
buffer.close();
diff --git a/Injector/main.cpp b/Injector/main.cpp
index 8e19ad2..f712868 100644
--- a/Injector/main.cpp
+++ b/Injector/main.cpp
@@ -29,7 +29,7 @@ int wmain(int argc, wchar_t* argv[])
{
while (Process32Next(snapshot, &entry) == TRUE)
{
- if (wcsicmp(entry.szExeFile, L"steam.exe") == 0)
+ if (_wcsicmp(entry.szExeFile, L"steam.exe") == 0)
{
pid = entry.th32ProcessID;
}
diff --git a/SteamTarget/SteamTarget.vcxproj b/SteamTarget/SteamTarget.vcxproj
index 27f5ef6..748b9dc 100644
--- a/SteamTarget/SteamTarget.vcxproj
+++ b/SteamTarget/SteamTarget.vcxproj
@@ -58,8 +58,8 @@
- UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_AMD64_;QT_CORE_LIB;%(PreprocessorDefinitions)
- ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x64\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_AMD64_;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
+ ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x64\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -70,13 +70,13 @@
$(OutDir)\$(ProjectName).exe
..\dependencies\ViGEmUM\x64\lib;..\dependencies\SFML-2.4.1-x64\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)
true
- qtmaind.lib;Qt5Cored.lib;Xinput.lib;dwmapi.lib;ViGEmUM.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;%(AdditionalDependencies)
+ qtmaind.lib;Qt5Cored.lib;Xinput.lib;dwmapi.lib;ViGEmUM.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_X86_;QT_CORE_LIB;%(PreprocessorDefinitions)
- ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x86\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_X86_;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
+ ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x86\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
Disabled
ProgramDatabase
MultiThreadedDebugDLL
@@ -87,13 +87,13 @@
$(OutDir)\$(ProjectName).exe
..\dependencies\ViGEmUM\x86\lib;..\dependencies\SFML-2.4.1-x86\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)
true
- qtmaind.lib;Qt5Cored.lib;Xinput.lib;dwmapi.lib;ViGEmUM.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;%(AdditionalDependencies)
+ qtmaind.lib;Qt5Cored.lib;Xinput.lib;dwmapi.lib;ViGEmUM.lib;sfml-system-d.lib;sfml-window-d.lib;sfml-graphics-d.lib;Qt5Guid.lib;Qt5Widgetsd.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_AMD64_;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)
- ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x64\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_AMD64_;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
+ ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x64\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
MultiThreadedDLL
true
@@ -105,13 +105,13 @@
$(OutDir)\$(ProjectName).exe
..\dependencies\ViGEmUM\x64\lib;..\dependencies\SFML-2.4.1-x64\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)
false
- qtmain.lib;Qt5Core.lib;xinput.lib;dwmapi.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;vigemum.lib;%(AdditionalDependencies)
+ qtmain.lib;Qt5Core.lib;xinput.lib;dwmapi.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;vigemum.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
- UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_X86_;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;%(PreprocessorDefinitions)
- ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x86\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;%(AdditionalIncludeDirectories)
+ UNICODE;WIN32;WIN64;_CONSOLE;QT_DLL;_X86_;QT_NO_DEBUG;NDEBUG;QT_CORE_LIB;QT_GUI_LIB;QT_WIDGETS_LIB;%(PreprocessorDefinitions)
+ ..\dependencies\ViGEmUM\include;..\dependencies\SFML-2.4.1-x86\include;.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtWidgets;%(AdditionalIncludeDirectories)
MultiThreadedDLL
@@ -124,7 +124,7 @@
$(OutDir)\$(ProjectName).exe
..\dependencies\ViGEmUM\x86\lib;..\dependencies\SFML-2.4.1-x86\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)
false
- qtmain.lib;Qt5Core.lib;xinput.lib;dwmapi.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;vigemum.lib;%(AdditionalDependencies)
+ qtmain.lib;Qt5Core.lib;xinput.lib;dwmapi.lib;sfml-system.lib;sfml-window.lib;sfml-graphics.lib;vigemum.lib;Qt5Gui.lib;Qt5Widgets.lib;%(AdditionalDependencies)
@@ -158,16 +158,16 @@
Moc%27ing SteamTargetRenderer.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_AMD64_ -DQT_CORE_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x64\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore"
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_X86_ -DQT_CORE_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x86\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_AMD64_ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x64\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_X86_ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x86\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
$(QTDIR)\bin\moc.exe;%(FullPath)
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing SteamTargetRenderer.h...
Moc%27ing SteamTargetRenderer.h...
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
.\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_AMD64_ -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x64\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore"
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_X86_ -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x86\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_AMD64_ -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x64\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DUNICODE -DWIN32 -DWIN64 -D_CONSOLE -DQT_DLL -D_X86_ -DQT_NO_DEBUG -DNDEBUG -DQT_CORE_LIB -DQT_GUI_LIB -DQT_WIDGETS_LIB "-I.\..\dependencies\ViGEmUM\include" "-I.\..\dependencies\SFML-2.4.1-x86\include" "-I.\GeneratedFiles" "-I." "-I$(QTDIR)\include" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include\QtCore" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtWidgets"
@@ -198,7 +198,7 @@
-
+
diff --git a/SteamTarget/VirtualControllerThread.cpp b/SteamTarget/VirtualControllerThread.cpp
index 962e063..99a9b38 100644
--- a/SteamTarget/VirtualControllerThread.cpp
+++ b/SteamTarget/VirtualControllerThread.cpp
@@ -120,7 +120,7 @@ void VirtualControllerThread::controllerLoop()
VirtualControllerThread::ulTargetSerials[i] = vtX360[i].SerialNo;
- vigem_register_xusb_notification((PVIGEM_XUSB_NOTIFICATION)&VirtualControllerThread::controllerCallback, vtX360[i]);
+ vigem_register_xusb_notification(reinterpret_cast(&VirtualControllerThread::controllerCallback), vtX360[i]);
}
RtlCopyMemory(&xrReport[i], &xsState[i].Gamepad, sizeof(XUSB_REPORT));
@@ -192,10 +192,6 @@ int VirtualControllerThread::getRealControllers()
void VirtualControllerThread::controllerCallback(VIGEM_TARGET Target, UCHAR LargeMotor, UCHAR SmallMotor, UCHAR LedNumber)
{
- std::cout << "Target Serial: " << Target.SerialNo
- << "; LMotor: " << (unsigned int)(LargeMotor * 0xff) << "; "
- << " SMotor: " << (unsigned int)(SmallMotor * 0xff) << "; " << std::endl;
-
XINPUT_VIBRATION vibration;
ZeroMemory(&vibration, sizeof(XINPUT_VIBRATION));
vibration.wLeftMotorSpeed = LargeMotor * 0xff; //Controllers only use 1 byte, XInput-API uses two, ViGEm also only uses one, like the hardware does, so we have to multiply