mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Struma 2020-03-03 17:42:02 -05:00 • committed by Roza
parent afa5bef210
commit 0f62eeb39a
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
steamshim/steamshim_parent.cpp
View file

@ -2,12 +2,12 @@
#define WIN32_LEAN_AND_MEAN 1 #define WIN32_LEAN_AND_MEAN 1
#define UNICODE #define UNICODE
#include <cstdio> #include <cstdio>
#include <windows.h>
#include <io.h>
#include <fcntl.h>
#include <errno.h> #include <errno.h>
#include <shellapi.h> #include <fcntl.h>
#include <io.h>
#include <process.h> #include <process.h>
#include <shellapi.h>
#include <windows.h>
typedef int ProcessType; typedef int ProcessType;
typedef int PipeType; typedef int PipeType;
#define NULLPIPE NULL #define NULLPIPE NULL
@ -137,12 +137,13 @@ static LPWSTR genCommandLine() {
static bool launchChild(ProcessType *pid) { static bool launchChild(ProcessType *pid) {
int nargs; int nargs;
LPWSTR* argv = CommandLineToArgvW(genCommandLine(), &nargs); LPWSTR *argv = CommandLineToArgvW(genCommandLine(), &nargs);
ProcessType ret = (ProcessType)_wspawnv(1, TEXT(".\\" GAME_LAUNCH_NAME ".exe"), argv); ProcessType ret =
(ProcessType)_wspawnv(1, TEXT(".\\" GAME_LAUNCH_NAME ".exe"), argv);
if (ret == (ProcessType)-1) if (ret == (ProcessType)-1)
return false; return false;
*pid = ret; *pid = ret;
return true; return true;
} // launchChild } // launchChild
@ -439,11 +440,13 @@ SteamBridge::SteamBridge(PipeType _fd)
fd(_fd) {} // SteamBridge::SteamBridge fd(_fd) {} // SteamBridge::SteamBridge
void SteamBridge::OnUserStatsReceived(UserStatsReceived_t *pCallback) { void SteamBridge::OnUserStatsReceived(UserStatsReceived_t *pCallback) {
if (GAppID != pCallback->m_nGameID) if (GAppID != pCallback->m_nGameID) {
return; return;
#ifndef _WIN32 //FIXME }
if (GUserID != pCallback->m_steamIDUser.ConvertToUint64()) #ifndef _WIN32 // FIXME
if (GUserID != pCallback->m_steamIDUser.ConvertToUint64()) {
return; return;
}
#endif #endif
writeStatsReceived(fd, pCallback->m_eResult == k_EResultOK); writeStatsReceived(fd, pCallback->m_eResult == k_EResultOK);
} // SteamBridge::OnUserStatsReceived } // SteamBridge::OnUserStatsReceived
@ -653,8 +656,8 @@ static int initSteamworks(PipeType fd) {
// - you forgot a steam_appid.txt in the current working directory. // - you forgot a steam_appid.txt in the current working directory.
// - you don't have Steam running // - you don't have Steam running
// - you don't own the game listed in steam_appid.txt // - you don't own the game listed in steam_appid.txt
// if (!SteamAPI_Init()) if (!SteamAPI_Init())
// return 0; return 0;
GSteamStats = SteamUserStats(); GSteamStats = SteamUserStats();
GSteamUtils = SteamUtils(); GSteamUtils = SteamUtils();
@ -663,7 +666,7 @@ static int initSteamworks(PipeType fd) {
GSteamApps = SteamApps(); GSteamApps = SteamApps();
GAppID = GSteamUtils ? SteamUtils()->GetAppID() : 0; GAppID = GSteamUtils ? SteamUtils()->GetAppID() : 0;
#ifndef _WIN32 //FIXME #ifndef _WIN32 // FIXME
GUserID = GSteamUser ? SteamUser()->GetSteamID().ConvertToUint64() : 0; GUserID = GSteamUser ? SteamUser()->GetSteamID().ConvertToUint64() : 0;
#endif #endif
GSteamBridge = new SteamBridge(fd); GSteamBridge = new SteamBridge(fd);
@ -686,7 +689,6 @@ static int mainline(void) {
if (SteamAPI_RestartAppIfNecessary(STEAM_APPID)) if (SteamAPI_RestartAppIfNecessary(STEAM_APPID))
return 0; return 0;
#endif #endif
SteamAPI_Init();
PipeType pipeParentRead = NULLPIPE; PipeType pipeParentRead = NULLPIPE;
PipeType pipeParentWrite = NULLPIPE; PipeType pipeParentWrite = NULLPIPE;