diff --git a/Blitz/BlitzSteam.bb b/Blitz/BlitzSteam.bb index bf87e87..f99cbe8 100644 --- a/Blitz/BlitzSteam.bb +++ b/Blitz/BlitzSteam.bb @@ -15,79 +15,81 @@ ; along with this program. If not, see . ; Steam ------------------------------------------------------------------------- -Const BLITZSTEAM_ENUM_CALLBACK_SteamAppListCallbacks = 3900 -Const BLITZSTEAM_ENUM_CALLBACK_SteamAppsCallbacks = 1000 -Const BLITZSTEAM_ENUM_CALLBACK_SteamBillingCallbacks = 400 -Const BLITZSTEAM_ENUM_CALLBACK_SteamContentServerCallbacks = 600 -Const BLITZSTEAM_ENUM_CALLBACK_SteamControllerCallbacks = 2800 -Const BLITZSTEAM_ENUM_CALLBACK_SteamFriendsCallbacks = 300 -Const BLITZSTEAM_ENUM_CALLBACK_SteamGameCoordinatorCallbacks = 1700 -Const BLITZSTEAM_ENUM_CALLBACK_SteamGameServerCallbacks = 200 -Const BLITZSTEAM_ENUM_CALLBACK_SteamGameServerItemsCallbacks = 1500 -Const BLITZSTEAM_ENUM_CALLBACK_SteamGameServerStatsCallbacks = 1800 -Const BLITZSTEAM_ENUM_CALLBACK_SteamGameStatsCallbacks = 2000 -Const BLITZSTEAM_ENUM_CALLBACK_SteamHTMLSurfaceCallbacks = 4500 -Const BLITZSTEAM_ENUM_CALLBACK_SteamMatchmakingCallbacks = 500 -Const BLITZSTEAM_ENUM_CALLBACK_SteamMusicCallbacks = 4000 -Const BLITZSTEAM_ENUM_CALLBACK_SteamMusicRemoteCallbacks = 4100 -Const BLITZSTEAM_ENUM_CALLBACK_SteamNetworkingCallbacks = 1200 -Const BLITZSTEAM_ENUM_CALLBACK_SteamReservedCallbacks = 4400 -Const BLITZSTEAM_ENUM_CALLBACK_SteamScreenshotsCallbacks = 2300 -Const BLITZSTEAM_ENUM_CALLBACK_SteamStreamLauncherCallbacks = 2600 -Const BLITZSTEAM_ENUM_CALLBACK_SteamStreamClientCallbacks = 3500 -Const BLITZSTEAM_ENUM_CALLBACK_SteamUserCallbacks = 100 -Const BLITZSTEAM_ENUM_CALLBACK_SteamUserStatsCallbacks = 1100 -Const BLITZSTEAM_ENUM_CALLBACK_SteamUtilsCallbacks = 700 -Const BLITZSTEAM_ENUM_CALLBACK_Steam2AsyncCallbacks = 1900 -Const BLITZSTEAM_ENUM_CALLBACK_ClientAudioCallbacks = 2400 -Const BLITZSTEAM_ENUM_CALLBACK_ClientControllerCallbacks = 2700 -Const BLITZSTEAM_ENUM_CALLBACK_ClientDepotBuilderCallbacks = 1400 -Const BLITZSTEAM_ENUM_CALLBACK_ClientDeviceAuthCallbacks = 3000 -Const BLITZSTEAM_ENUM_CALLBACK_ClientFriendsCallbacks = 800 -Const BLITZSTEAM_ENUM_CALLBACK_ClientHTTPCallbacks = 2100 -Const BLITZSTEAM_ENUM_CALLBACK_ClientInventoryCallbacks = 4700 -Const BLITZSTEAM_ENUM_CALLBACK_ClientMusicCallbacks = 3200 -Const BLITZSTEAM_ENUM_CALLBACK_ClientNetworkDeviceManagerCallbacks = 3100 -Const BLITZSTEAM_ENUM_CALLBACK_ClientParentalSettingsCallbacks = 2900 -Const BLITZSTEAM_ENUM_CALLBACK_ClientProductBuilderCallbacks = 3600 -Const BLITZSTEAM_ENUM_CALLBACK_ClientRemoteStorageCallbacks = 1300 -Const BLITZSTEAM_ENUM_CALLBACK_ClientRemoteClientManagerCallbacks = 3300 -Const BLITZSTEAM_ENUM_CALLBACK_ClientRemoteControlManagerCallbacks = 3800 -Const BLITZSTEAM_ENUM_CALLBACK_ClientReservedCallbacks = 4300 -Const BLITZSTEAM_ENUM_CALLBACK_ClientScreenshotsCallbacks = 2200 -Const BLITZSTEAM_ENUM_CALLBACK_ClientShortcutsCallbacks = 3700 -Const BLITZSTEAM_ENUM_CALLBACK_ClientUGCCallbacks = 3400 -Const BLITZSTEAM_ENUM_CALLBACK_ClientUnifiedMessagesCallbacks = 2500 -Const BLITZSTEAM_ENUM_CALLBACK_ClientUserCallbacks = 900 -Const BLITZSTEAM_ENUM_CALLBACK_ClientUtilsCallbacks = 1600 -Const BLITZSTEAM_ENUM_CALLBACK_ClientVideoCallbacks = 4600 -Const BLITZSTEAM_ENUM_CALLBACK_ClientVRCallbacks = 4200 + +; SteamClient ------------------------------------------------------------------- +Const BLITZSTEAM_EAccountType_Invalid = 0 +Const BLITZSTEAM_EAccountType_Individual = 1 +Const BLITZSTEAM_EAccountType_Multiseat = 2 +Const BLITZSTEAM_EAccountType_Gameserver = 3 +Const BLITZSTEAM_EAccountType_AnonGamerserver = 4 +Const BLITZSTEAM_EAccountType_Pending = 5 +Const BLITZSTEAM_EAccountType_ContentServer = 6 +Const BLITZSTEAM_EAccountType_Clan = 7 +Const BLITZSTEAM_EAccountType_Chat = 8 +Const BLITZSTEAM_EAccountType_ConsoleUser = 9 +Const BLITZSTEAM_EAccountType_AnonUser = 10 + +Const BLITZSTEAM_ECallback_SteamAppListCallbacks = 3900 +Const BLITZSTEAM_ECallback_SteamAppsCallbacks = 1000 +Const BLITZSTEAM_ECallback_SteamBillingCallbacks = 400 +Const BLITZSTEAM_ECallback_SteamContentServerCallbacks = 600 +Const BLITZSTEAM_ECallback_SteamControllerCallbacks = 2800 +Const BLITZSTEAM_ECallback_SteamFriendsCallbacks = 300 +Const BLITZSTEAM_ECallback_SteamGameCoordinatorCallbacks = 1700 +Const BLITZSTEAM_ECallback_SteamGameServerCallbacks = 200 +Const BLITZSTEAM_ECallback_SteamGameServerItemsCallbacks = 1500 +Const BLITZSTEAM_ECallback_SteamGameServerStatsCallbacks = 1800 +Const BLITZSTEAM_ECallback_SteamGameStatsCallbacks = 2000 +Const BLITZSTEAM_ECallback_SteamHTMLSurfacECallback_s = 4500 +Const BLITZSTEAM_ECallback_SteamMatchmakingCallbacks = 500 +Const BLITZSTEAM_ECallback_SteamMusicCallbacks = 4000 +Const BLITZSTEAM_ECallback_SteamMusicRemotECallback_s = 4100 +Const BLITZSTEAM_ECallback_SteamNetworkingCallbacks = 1200 +Const BLITZSTEAM_ECallback_SteamReservedCallbacks = 4400 +Const BLITZSTEAM_ECallback_SteamScreenshotsCallbacks = 2300 +Const BLITZSTEAM_ECallback_SteamStreamLauncherCallbacks = 2600 +Const BLITZSTEAM_ECallback_SteamStreamClientCallbacks = 3500 +Const BLITZSTEAM_ECallback_SteamUserCallbacks = 100 +Const BLITZSTEAM_ECallback_SteamUserStatsCallbacks = 1100 +Const BLITZSTEAM_ECallback_SteamUtilsCallbacks = 700 +Const BLITZSTEAM_ECallback_Steam2AsyncCallbacks = 1900 +Const BLITZSTEAM_ECallback_ClientAudioCallbacks = 2400 +Const BLITZSTEAM_ECallback_ClientControllerCallbacks = 2700 +Const BLITZSTEAM_ECallback_ClientDepotBuilderCallbacks = 1400 +Const BLITZSTEAM_ECallback_ClientDeviceAuthCallbacks = 3000 +Const BLITZSTEAM_ECallback_ClientFriendsCallbacks = 800 +Const BLITZSTEAM_ECallback_ClientHTTPCallbacks = 2100 +Const BLITZSTEAM_ECallback_ClientInventoryCallbacks = 4700 +Const BLITZSTEAM_ECallback_ClientMusicCallbacks = 3200 +Const BLITZSTEAM_ECallback_ClientNetworkDeviceManagerCallbacks = 3100 +Const BLITZSTEAM_ECallback_ClientParentalSettingsCallbacks = 2900 +Const BLITZSTEAM_ECallback_ClientProductBuilderCallbacks = 3600 +Const BLITZSTEAM_ECallback_ClientRemoteStoragECallback_s = 1300 +Const BLITZSTEAM_ECallback_ClientRemoteClientManagerCallbacks = 3300 +Const BLITZSTEAM_ECallback_ClientRemoteControlManagerCallbacks = 3800 +Const BLITZSTEAM_ECallback_ClientReservedCallbacks = 4300 +Const BLITZSTEAM_ECallback_ClientScreenshotsCallbacks = 2200 +Const BLITZSTEAM_ECallback_ClientShortcutsCallbacks = 3700 +Const BLITZSTEAM_ECallback_ClientUGCCallbacks = 3400 +Const BLITZSTEAM_ECallback_ClientUnifiedMessagesCallbacks = 2500 +Const BLITZSTEAM_ECallback_ClientUserCallbacks = 900 +Const BLITZSTEAM_ECallback_ClientUtilsCallbacks = 1600 +Const BLITZSTEAM_ECallback_ClientVideoCallbacks = 4600 +Const BLITZSTEAM_ECallback_ClientVRCallbacks = 4200 ; SteamAppList ------------------------------------------------------------------ -Const BLITZSTEAM_CALLBACK_APPINSTALLED = BLITZSTEAM_ENUM_CALLBACK_SteamAppListCallbacks + 1 -Const BLITZSTEAM_CALLBACK_APPUNINSTALLED = BLITZSTEAM_ENUM_CALLBACK_SteamAppListCallbacks + 2 +Const BLITZSTEAM_CALLBACK_AppInstalled = BLITZSTEAM_ECallback_SteamAppListCallbacks + 1 +Const BLITZSTEAM_CALLBACK_AppUninstalled = BLITZSTEAM_ECallback_SteamAppListCallbacks + 2 + ; SteamApps --------------------------------------------------------------------- -Const BLITZSTEAM_CALLBACK_DLCINSTALLED = BLITZSTEAM_ENUM_CALLBACK_SteamAppsCallbacks + 5 -Const BLITZSTEAM_CALLBACK_APPPROOFOFPURCHASEKEYRESPONSE = BLITZSTEAM_ENUM_CALLBACK_SteamAppsCallbacks + 13 -Const BLITZSTEAM_CALLBACK_NEWLAUNCHQUERYPARAMETERS = BLITZSTEAM_ENUM_CALLBACK_SteamAppsCallbacks + 14 +Const BLITZSTEAM_CALLBACK_DLCInstalled = BLITZSTEAM_ECallback_SteamAppsCallbacks + 5 +Const BLITZSTEAM_CALLBACK_APPProofOfPurchaseKeyResponse = BLITZSTEAM_ECallback_SteamAppsCallbacks + 13 +Const BLITZSTEAM_CALLBACK_NewLaunchQueryParameters = BLITZSTEAM_ECallback_SteamAppsCallbacks + 14 ; The following things are PS3 only: ; ERegisterActivationCodeResult ; RegisterActivationCodeResponse_t -; SteamClient ------------------------------------------------------------------- -Const BLITZSTEAM_EACCOUNTYPE_INVALID = 0 -Const BLITZSTEAM_EACCOUNTYPE_INDIVIDUAL = 1 -Const BLITZSTEAM_EACCOUNTYPE_MULTISEAT = 2 -Const BLITZSTEAM_EACCOUNTYPE_GAMESERVER = 3 -Const BLITZSTEAM_EACCOUNTYPE_ANONGAMESERVER = 4 -Const BLITZSTEAM_EACCOUNTYPE_PENDING = 5 -Const BLITZSTEAM_EACCOUNTYPE_CONTENTSERVER = 6 -Const BLITZSTEAM_EACCOUNTYPE_CLAN = 7 -Const BLITZSTEAM_EACCOUNTYPE_CHAT = 8 -;Const BLITZSTEAM_EACCOUNTYPE_CONSOLEUSER = 9 -Const BLITZSTEAM_EACCOUNTYPE_ANONUSER = 10 - ; SteamController --------------------------------------------------------------- Const BLITZSTEAM_MASK_RIGHT_TRIGGER = $00000001 Const BLITZSTEAM_MASK_LEFT_TRIGGER = $00000002 @@ -111,8 +113,8 @@ Const BLITZSTEAM_MASK_BUTTON_RIGHTPAD_CLICKED = $0040000 Const BLITZSTEAM_MASK_LEFTPAD_FINGERDOWN = $0080000 Const BLITZSTEAM_MASK_RIGHTPAD_FINGERDOWN = $0100000 Const BLITZSTEAM_MASK_JOYSTICK_BUTTON = $0400000 -Const BLITZSTEAM_ESTEAMCONTROLLERPAD_LEFT = 0 -Const BLITZSTEAM_ESTEAMCONTROLLERPAD_RIGHT = 1 +Const BLITZSTEAM_ESteamControllerPad_Left = 0 +Const BLITZSTEAM_ESteamControllerPad_Right = 1 Type BlitzSteamControllerState Field unPacketNum% @@ -184,153 +186,41 @@ Const BLITZSTEAM_cchMaxRichPresenceValueLength = 256 Const BLITZSTEAM_EOverlayToStoreFlag_None = 0 Const BLITZSTEAM_EOverlayToStoreFlag_AddToCart = 1 Const BLITZSTEAM_EOverlayToStoreFlag_AddToCartAndShow = 2 +Const BLITZSTEAM_CALLBACK_PersonaStateChange = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 4 +Const BLITZSTEAM_EPersonaChange_Name = $0001 +Const BLITZSTEAM_EPersonaChange_Status = $0002 +Const BLITZSTEAM_EPersonaChange_ComeOnline = $0004 +Const BLITZSTEAM_EPersonaChange_GoneOffline = $0008 +Const BLITZSTEAM_EPersonaChange_GamePlayed = $0010 +Const BLITZSTEAM_EPersonaChange_GameServer = $0020 +Const BLITZSTEAM_EPersonaChange_Avatar = $0040 +Const BLITZSTEAM_EPersonaChange_JoinedSource = $0080 +Const BLITZSTEAM_EPersonaChange_LeftSource = $0100 +Const BLITZSTEAM_EPersonaChange_RelationshipChanged = $0200 +Const BLITZSTEAM_EPersonaChange_NameFirstSet = $0400 +Const BLITZSTEAM_EPersonaChange_FacebookInfo = $0800 +Const BLITZSTEAM_EPersonaChange_Nickname = $1000 +Const BLITZSTEAM_EPersonaChange_SteamLevel = $2000 +Const BLITZSTEAM_CALLBACK_GameOverlayActivated = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 31 +Const BLITZSTEAM_CALLBACK_GameServerChangeRequested = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 32 +Const BLITZSTEAM_CALLBACK_GameLobbyJoinRequested = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 33 +Const BLITZSTEAM_CALLBACK_AvatarImageLoaded = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 34 +Const BLITZSTEAM_CALLBACK_ClanOfficerListResponse = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 35 +Const BLITZSTEAM_CALLBACK_FriendRichPresenceUpdate = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 36 +Const BLITZSTEAM_CALLBACK_GameRichPresenceJoinRequested = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 37 +Const BLITZSTEAM_CALLBACK_GameConnectedClanChatMsg = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 38 +Const BLITZSTEAM_CALLBACK_GameConnectedChatJoin = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 39 +Const BLITZSTEAM_CALLBACK_GameConnectedChatLeave = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 40 +Const BLITZSTEAM_CALLBACK_DownloadClanActivityCountsResult = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 41 +Const BLITZSTEAM_CALLBACK_JoinClanChatRoomCompletionResult = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 42 +Const BLITZSTEAM_CALLBACK_GameConnectedFriendChatMsg = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 43 +Const BLITZSTEAM_CALLBACK_FriendsGetFollowerCount = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 44 +Const BLITZSTEAM_CALLBACK_FriendsIsFollowing = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 45 +Const BLITZSTEAM_CALLBACK_FriendsEnumerateFollowingList = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 46 +Const BLITZSTEAM_CALLBACK_SetPersonaNameResponse = BLITZSTEAM_ECallback_SteamFriendsCallbacks + 47 -;---------------------------------------------------------------- -;-- Enumerations -;---------------------------------------------------------------- -Const EResultOK = 1; ; success -Const EResultFail = 2; ; generic failure -Const EResultNoConnection = 3; ; no/failed network connection -Const EResultInvalidPassword = 5; ; password/ticket is invalid -Const EResultLoggedInElsewhere = 6; ; same user logged in elsewhere -Const EResultInvalidProtocolVer = 7; ; protocol version is incorrect -Const EResultInvalidParam = 8; ; a parameter is incorrect -Const EResultFileNotFound = 9; ; file was not found -Const EResultBusy = 10; ; called method busy - action not taken -Const EResultInvalidState = 11; ; called object was in an invalid state -Const EResultInvalidName = 12; ; name is invalid -Const EResultInvalidEmail = 13; ; email is invalid -Const EResultDuplicateName = 14; ; name is not unique -Const EResultAccessDenied = 15; ; access is denied -Const EResultTimeout = 16; ; operation timed out -Const EResultBanned = 17; ; VAC2 banned -Const EResultAccountNotFound = 18; ; account not found -Const EResultInvalidSteamID = 19; ; steamID is invalid -Const EResultServiceUnavailable = 20; ; The requested service is currently unavailable -Const EResultNotLoggedOn = 21; ; The user is not logged on -Const EResultPending = 22; ; Request is pending (may be in process; or waiting on third party) -Const EResultEncryptionFailure = 23; ; Encryption or Decryption failed -Const EResultInsufficientPrivilege = 24; ; Insufficient privilege -Const EResultLimitExceeded = 25; ; Too much of a good thing -Const EResultRevoked = 26; ; Access has been revoked (used for revoked guest passes) -Const EResultExpired = 27; ; License/Guest pass the user is trying to access is expired -Const EResultAlreadyRedeemed = 28; ; Guest pass has already been redeemed by account; cannot be acked again -Const EResultDuplicateRequest = 29; ; The request is a duplicate and the action has already occurred in the past; ignored this time -Const EResultAlreadyOwned = 30; ; All the games in this guest pass redemption request are already owned by the user -Const EResultIPNotFound = 31; ; IP address not found -Const EResultPersistFailed = 32; ; failed to write change to the data store -Const EResultLockingFailed = 33; ; failed to acquire access lock for this operation -Const EResultLogonSessionReplaced = 34; -Const EResultConnectFailed = 35; -Const EResultHandshakeFailed = 36; -Const EResultIOFailure = 37; -Const EResultRemoteDisconnect = 38; -Const EResultShoppingCartNotFound = 39; ; failed to find the shopping cart requested -Const EResultBlocked = 40; ; a user didn't allow it -Const EResultIgnored = 41; ; target is ignoring sender -Const EResultNoMatch = 42; ; nothing matching the request found -Const EResultAccountDisabled = 43; -Const EResultServiceReadOnly = 44; ; this service is not accepting content changes right now -Const EResultAccountNotFeatured = 45; ; account doesn't have value; so this feature isn't available -Const EResultAdministratorOK = 46; ; allowed to take this action; but only because requester is admin -Const EResultContentVersion = 47; ; A Version mismatch in content transmitted within the Steam protocol. -Const EResultTryAnotherCM = 48; ; The current CM can't service the user making a request; user should try another. -Const EResultPasswordRequiredToKickSession = 49;; You are already logged in elsewhere; this cached credential login has failed. -Const EResultAlreadyLoggedInElsewhere = 50; ; You are already logged in elsewhere; you must wait -Const EResultSuspended = 51; ; Long running operation (content download) suspended/paused -Const EResultCancelled = 52; ; Operation canceled (typically by user: content download) -Const EResultDataCorruption = 53; ; Operation canceled because data is ill formed or unrecoverable -Const EResultDiskFull = 54; ; Operation canceled - not enough disk space. -Const EResultRemoteCallFailed = 55; ; an remote call or IPC call failed -Const EResultPasswordUnset = 56; ; Password could not be verified as it's unset server side -Const EResultExternalAccountUnlinked = 57; ; External account (PSN; Facebook...) is not linked to a Steam account -Const EResultPSNTicketInvalid = 58; ; PSN ticket was invalid -Const EResultExternalAccountAlreadyLinked = 59; ; External account (PSN; Facebook...) is already linked to some other account; must explicitly request to replace/delete the link first -Const EResultRemoteFileConflict = 60; ; The sync cannot resume due to a conflict between the local and remote files -Const EResultIllegalPassword = 61; ; The requested new password is not legal -Const EResultSameAsPreviousValue = 62; ; new value is the same as the old one ( secret question and answer ) -Const EResultAccountLogonDenied = 63; ; account login denied due to 2nd factor authentication failure -Const EResultCannotUseOldPassword = 64; ; The requested new password is not legal -Const EResultInvalidLoginAuthCode = 65; ; account login denied due to auth code invalid -Const EResultAccountLogonDeniedNoMail = 66; ; account login denied due to 2nd factor auth failure - and no mail has been sent -Const EResultHardwareNotCapableOfIPT = 67; ; -Const EResultIPTInitError = 68; ; -Const EResultParentalControlRestricted = 69; ; operation failed due to parental control restrictions for current user -Const EResultFacebookQueryError = 70; ; Facebook query returned an error -Const EResultExpiredLoginAuthCode = 71; ; account login denied due to auth code expired -Const EResultIPLoginRestrictionFailed = 72; -Const EResultAccountLockedDown = 73; -Const EResultAccountLogonDeniedVerifiedEmailRequired = 74; -Const EResultNoMatchingURL = 75; -Const EResultBadResponse = 76; ; parse failure; missing field; etc. -Const EResultRequirePasswordReEntry = 77; ; The user cannot complete the action until they re-enter their password -Const EResultValueOutOfRange = 78; ; the value entered is outside the acceptable range -Const EResultUnexpectedError = 79; ; something happened that we didn't expect to ever happen -Const EResultDisabled = 80; ; The requested service has been configured to be unavailable -Const EResultInvalidCEGSubmission = 81; ; The set of files submitted to the CEG server are not valid ! -Const EResultRestrictedDevice = 82; ; The device being used is not allowed to perform this action -Const EResultRegionLocked = 83; ; The action could not be complete because it is region restricted -Const EResultRateLimitExceeded = 84; ; Temporary rate limit exceeded; try again later; different from k_EResultLimitExceeded which may be permanent -Const EResultAccountLoginDeniedNeedTwoFactor = 85; ; Need two-factor code to login -Const EResultItemDeleted = 86; ; The thing we're trying to access has been deleted -Const EResultAccountLoginDeniedThrottle = 87; ; login attempt failed; try to throttle response to possible attacker -Const EResultTwoFactorCodeMismatch = 88; ; two factor code mismatch -Const EResultTwoFactorActivationCodeMismatch = 89; ; activation code for two-factor didn't match -Const EResultAccountAssociatedToMultiplePartners = 90; ; account has been associated with multiple partners -Const EResultNotModified = 91; ; data not modified -Const EResultNoMobileDevice = 92; ; the account does not have a mobile device associated with it -Const EResultTimeNotSynced = 93; ; the time presented is out of range or tolerance -Const EResultSmsCodeFailed = 94; ; SMS code failure (no match; none pending; etc.) -Const EResultAccountLimitExceeded = 95; ; Too many accounts access this resource -Const EResultAccountActivityLimitExceeded = 96; ; Too many changes to this account -Const EResultPhoneActivityLimitExceeded = 97; ; Too many changes to this phone - -Const EVoiceResultOK = 0; -Const EVoiceResultNotInitialized = 1; -Const EVoiceResultNotRecording = 2; -Const EVoiceResultNoData = 3; -Const EVoiceResultBufferTooSmall = 4; -Const EVoiceResultDataCorrupted = 5; -Const EVoiceResultRestricted = 6; -Const EVoiceResultUnsupportedCodec = 7; -Const EVoiceResultReceiverOutOfDate = 8; -Const EVoiceResultReceiverDidNotAnswer = 9; - -Const EDenyInvalid = 0; -Const EDenyInvalidVersion = 1; -Const EDenyGeneric = 2; -Const EDenyNotLoggedOn = 3; -Const EDenyNoLicense = 4; -Const EDenyCheater = 5; -Const EDenyLoggedInElseWhere = 6; -Const EDenyUnknownText = 7; -Const EDenyIncompatibleAnticheat = 8; -Const EDenyMemoryCorruption = 9; -Const EDenyIncompatibleSoftware = 10; -Const EDenySteamConnectionLost = 11; -Const EDenySteamConnectionError = 12; -Const EDenySteamResponseTimedOut = 13; -Const EDenySteamValidationStalled = 14; -Const EDenySteamOwnerLeftGuestUser = 15; - -Const EBeginAuthSessionResultOK = 0; ; Ticket is valid for this game and this steamID. -Const EBeginAuthSessionResultInvalidTicket = 1; ; Ticket is not valid. -Const EBeginAuthSessionResultDuplicateRequest = 2; ; A ticket has already been submitted for this steamID -Const EBeginAuthSessionResultInvalidVersion = 3; ; Ticket is from an incompatible interface version -Const EBeginAuthSessionResultGameMismatch = 4; ; Ticket is not for this game -Const EBeginAuthSessionResultExpiredTicket = 5; ; Ticket has expired - -Const EAuthSessionResponseOK = 0; ; Steam has verified the user is online; the ticket is valid and ticket has not been reused. -Const EAuthSessionResponseUserNotConnectedToSteam = 1; ; The user in question is not connected to steam -Const EAuthSessionResponseNoLicenseOrExpired = 2; ; The license has expired. -Const EAuthSessionResponseVACBanned = 3; ; The user is VAC banned for this game. -Const EAuthSessionResponseLoggedInElseWhere = 4; ; The user account has logged in elsewhere and the session containing the game instance has been disconnected. -Const EAuthSessionResponseVACCheckTimedOut = 5; ; VAC has been unable to perform anti-cheat checks on this user -Const EAuthSessionResponseAuthTicketCanceled = 6; ; The ticket has been canceled by the issuer -Const EAuthSessionResponseAuthTicketInvalidAlreadyUsed = 7; ; This ticket has already been used; it is not valid. -Const EAuthSessionResponseAuthTicketInvalid = 8; ; This ticket is not from a user instance currently connected to steam. -Const EAuthSessionResponsePublisherIssuedBan = 9; ; The user is banned for this game. The ban came via the web api and not VAC - -Const EUserHasLicenseResultHasLicense = 0; ; User has a license for specified app -Const EUserHasLicenseResultDoesNotHaveLicense = 1; ; User does not have a license for the specified app -Const EUserHasLicenseResultNoAuth = 2; ; User has not been authenticated +; SteamGameServer --------------------------------------------------------------- +Const BLITZSTEAM_EServerMode_Invalid = 0 +Const BLITZSTEAM_EServerMode_NoAuthentication = 1 +Const BLITZSTEAM_EServerMode_Authentication = 2 +Const BLITZSTEAM_EServerMode_AuthenticationAndSecure = 3 diff --git a/BlitzSteam.vcxproj b/BlitzSteam.vcxproj index 2bae6ee..34e34fa 100644 --- a/BlitzSteam.vcxproj +++ b/BlitzSteam.vcxproj @@ -79,7 +79,7 @@ false - StdCall + Cdecl true @@ -119,7 +119,7 @@ Default false - StdCall + Cdecl false @@ -139,8 +139,6 @@ - - @@ -169,6 +167,8 @@ + + diff --git a/BlitzSteam.vcxproj.filters b/BlitzSteam.vcxproj.filters index 983cf84..9b8e0dc 100644 --- a/BlitzSteam.vcxproj.filters +++ b/BlitzSteam.vcxproj.filters @@ -46,12 +46,6 @@ Source Files\Wrapper - - Source Files\Helpers - - - Source Files\Helpers - Source Files\Wrapper @@ -120,6 +114,12 @@ Source Files\Libraries + + Source Files\Helpers + + + Source Files\Helpers + diff --git a/Helpers/CSteamID.cpp b/Helpers/CSteamID.cpp index fba9823..84ddf20 100644 --- a/Helpers/CSteamID.cpp +++ b/Helpers/CSteamID.cpp @@ -16,196 +16,196 @@ #include "dllmain.h" -DLL_EXPORT CSteamID* BlitzSteamCSteamID_New() { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamCSteamID_New() { return new CSteamID(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_New=_BlitzSteamCSteamID_New@0") -DLL_EXPORT CSteamID* BlitzSteamCSteamID_FromID(uint32_t unAccountID, EUniverse eUniverse, EAccountType eAccountType) { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamCSteamID_FromID(uint32_t unAccountID, EUniverse eUniverse, EAccountType eAccountType) { return new CSteamID(unAccountID, eUniverse, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_FromID=_BlitzSteamCSteamID_FromID@12") -DLL_EXPORT CSteamID* BlitzSteamCSteamID_FromIDInstance(uint32_t unAccountID, uint32_t unInstance, EUniverse eUniverse, EAccountType eAccountType) { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamCSteamID_FromIDInstance(uint32_t unAccountID, uint32_t unInstance, EUniverse eUniverse, EAccountType eAccountType) { return new CSteamID(unAccountID, unInstance, eUniverse, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_FromIDInstance=_BlitzSteamCSteamID_FromIDInstance@16") -DLL_EXPORT CSteamID* BlitzSteamCSteamID_FromSteamID(uint64_t* ulSteamID) { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamCSteamID_FromSteamID(uint64_t* ulSteamID) { return new CSteamID(*ulSteamID); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_FromSteamID=_BlitzSteamCSteamID_FromSteamID@4") -DLL_EXPORT CSteamID* BlitzSteamCSteamID_Copy(CSteamID* pSteamID) { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamCSteamID_Copy(CSteamID* pSteamID) { return new CSteamID(*pSteamID); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_Copy=_BlitzSteamCSteamID_Copy@4") -DLL_EXPORT void BlitzSteamCSteamID_Destroy(CSteamID* pSteamID) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_Destroy(CSteamID* pSteamID) { delete pSteamID; } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_Destroy=_BlitzSteamCSteamID_Destroy@4") -DLL_EXPORT void BlitzSteamCSteamID_Set(CSteamID* pSteamID, uint32_t unAccountID, EUniverse eUniverse, EAccountType eAccountType) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_Set(CSteamID* pSteamID, uint32_t unAccountID, EUniverse eUniverse, EAccountType eAccountType) { pSteamID->Set(unAccountID, eUniverse, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_Set=_BlitzSteamCSteamID_Set@16") -DLL_EXPORT void BlitzSteamCSteamID_InstancedSet(CSteamID* pSteamID, uint32_t unAccountID, uint32_t unInstance, EUniverse eUniverse, EAccountType eAccountType) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_InstancedSet(CSteamID* pSteamID, uint32_t unAccountID, uint32_t unInstance, EUniverse eUniverse, EAccountType eAccountType) { pSteamID->InstancedSet(unAccountID, unInstance, eUniverse, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_InstancedSet=_BlitzSteamCSteamID_InstancedSet@20") -DLL_EXPORT void BlitzSteamCSteamID_FullSet(CSteamID* pSteamID, uint64_t* ulIdentifier, EUniverse eUniverse, EAccountType eAccountType) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_FullSet(CSteamID* pSteamID, uint64_t* ulIdentifier, EUniverse eUniverse, EAccountType eAccountType) { pSteamID->FullSet(*ulIdentifier, eUniverse, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_FullSet=_BlitzSteamCSteamID_FullSet@16") -DLL_EXPORT void BlitzSteamCSteamID_SetFromUInt64(CSteamID* pSteamID, uint64_t* ulSteamID) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_SetFromUInt64(CSteamID* pSteamID, uint64_t* ulSteamID) { pSteamID->SetFromUint64(*ulSteamID); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_SetFromUInt64=_BlitzSteamCSteamID_SetFromUInt64@8") -DLL_EXPORT void BlitzSteamCSteamID_Clear(CSteamID* pSteamID) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_Clear(CSteamID* pSteamID) { pSteamID->Clear(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_Clear=_BlitzSteamCSteamID_Clear@4") -DLL_EXPORT uint64_t* BlitzSteamCSteamID_ConvertToUInt64(CSteamID* pSteamID) { +DLL_EXPORT uint64_t* DLL_CALL BlitzSteamCSteamID_ConvertToUInt64(CSteamID* pSteamID) { uint64_t* val = new uint64_t; *val = pSteamID->ConvertToUint64(); return val; } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ConvertToUInt64=_BlitzSteamCSteamID_ConvertToUInt64@4") -DLL_EXPORT uint64_t* BlitzSteamCSteamID_GetStaticAccountKey(CSteamID* pSteamID) { +DLL_EXPORT uint64_t* DLL_CALL BlitzSteamCSteamID_GetStaticAccountKey(CSteamID* pSteamID) { uint64_t* val = new uint64_t; *val = pSteamID->GetStaticAccountKey(); return val; } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GetStaticAccountKey=_BlitzSteamCSteamID_GetStaticAccountKey@4") -DLL_EXPORT void BlitzSteamCSteamID_CreateBlankAnonLogon(CSteamID* pSteamID, EUniverse eUniverse) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_CreateBlankAnonLogon(CSteamID* pSteamID, EUniverse eUniverse) { pSteamID->CreateBlankAnonLogon(eUniverse); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_CreateBlankAnonLogon=_BlitzSteamCSteamID_CreateBlankAnonLogon@8") -DLL_EXPORT void BlitzSteamCSteamID_CreateBlankAnonUserLogon(CSteamID* pSteamID, EUniverse eUniverse) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_CreateBlankAnonUserLogon(CSteamID* pSteamID, EUniverse eUniverse) { pSteamID->CreateBlankAnonUserLogon(eUniverse); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_CreateBlankAnonUserLogon=_BlitzSteamCSteamID_CreateBlankAnonUserLogon@8") -DLL_EXPORT uint32_t BlitzSteamCSteamID_BlankAnonAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_BlankAnonAccount(CSteamID* pSteamID) { return pSteamID->BBlankAnonAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_BlankAnonAccount=_BlitzSteamCSteamID_BlankAnonAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_GameServerAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_GameServerAccount(CSteamID* pSteamID) { return pSteamID->BGameServerAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GameServerAccount=_BlitzSteamCSteamID_GameServerAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_PersistentGameServerAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_PersistentGameServerAccount(CSteamID* pSteamID) { return pSteamID->BPersistentGameServerAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_PersistentGameServerAccount=_BlitzSteamCSteamID_PersistentGameServerAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_AnonGameServerAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_AnonGameServerAccount(CSteamID* pSteamID) { return pSteamID->BAnonGameServerAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_AnonGameServerAccount=_BlitzSteamCSteamID_AnonGameServerAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_ContentServerAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_ContentServerAccount(CSteamID* pSteamID) { return pSteamID->BContentServerAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ContentServerAccount=_BlitzSteamCSteamID_ContentServerAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_ClanAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_ClanAccount(CSteamID* pSteamID) { return pSteamID->BClanAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ClanAccount=_BlitzSteamCSteamID_ClanAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_ChatAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_ChatAccount(CSteamID* pSteamID) { return pSteamID->BChatAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ChatAccount=_BlitzSteamCSteamID_ChatAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_IsLobby(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_IsLobby(CSteamID* pSteamID) { return pSteamID->IsLobby(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_IsLobby=_BlitzSteamCSteamID_IsLobby@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_IndividualAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_IndividualAccount(CSteamID* pSteamID) { return pSteamID->BIndividualAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_IndividualAccount=_BlitzSteamCSteamID_IndividualAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_AnonAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_AnonAccount(CSteamID* pSteamID) { return pSteamID->BAnonAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_AnonAccount=_BlitzSteamCSteamID_AnonAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_AnonUserAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_AnonUserAccount(CSteamID* pSteamID) { return pSteamID->BAnonUserAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_AnonUserAccount=_BlitzSteamCSteamID_AnonUserAccount@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_ConsoleUserAccount(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_ConsoleUserAccount(CSteamID* pSteamID) { return pSteamID->BConsoleUserAccount(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ConsoleUserAccount=_BlitzSteamCSteamID_ConsoleUserAccount@4") -DLL_EXPORT void BlitzSteamCSteamID_SetAccountID(CSteamID* pSteamID, AccountID_t unAccountID) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_SetAccountID(CSteamID* pSteamID, AccountID_t unAccountID) { pSteamID->SetAccountID(unAccountID); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_SetAccountID=_BlitzSteamCSteamID_SetAccountID@8") -DLL_EXPORT void BlitzSteamCSteamID_SetAccountInstance(CSteamID* pSteamID, uint32_t unInstance) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_SetAccountInstance(CSteamID* pSteamID, uint32_t unInstance) { pSteamID->SetAccountInstance(unInstance); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_SetAccountInstance=_BlitzSteamCSteamID_SetAccountInstance@8") -DLL_EXPORT void BlitzSteamCSteamID_ClearIndividualInstance(CSteamID* pSteamID) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_ClearIndividualInstance(CSteamID* pSteamID) { pSteamID->ClearIndividualInstance(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_ClearIndividualInstance=_BlitzSteamCSteamID_ClearIndividualInstance@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_HasNoIndividualInstance(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_HasNoIndividualInstance(CSteamID* pSteamID) { return pSteamID->HasNoIndividualInstance(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_HasNoIndividualInstance=_BlitzSteamCSteamID_HasNoIndividualInstance@4") -DLL_EXPORT AccountID_t BlitzSteamCSteamID_GetAccountID(CSteamID* pSteamID) { +DLL_EXPORT AccountID_t DLL_CALL BlitzSteamCSteamID_GetAccountID(CSteamID* pSteamID) { return pSteamID->GetAccountID(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GetAccountID=_BlitzSteamCSteamID_GetAccountID@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_GetAccountInstance(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_GetAccountInstance(CSteamID* pSteamID) { return pSteamID->GetUnAccountInstance(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GetAccountInstance=_BlitzSteamCSteamID_GetAccountInstance@4") -DLL_EXPORT EAccountType BlitzSteamCSteamID_GetEAccountType(CSteamID* pSteamID) { +DLL_EXPORT EAccountType DLL_CALL BlitzSteamCSteamID_GetEAccountType(CSteamID* pSteamID) { return pSteamID->GetEAccountType(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GetEAccountType=_BlitzSteamCSteamID_GetEAccountType@4") -DLL_EXPORT EUniverse BlitzSteamCSteamID_GetEUniverse(CSteamID* pSteamID) { +DLL_EXPORT EUniverse DLL_CALL BlitzSteamCSteamID_GetEUniverse(CSteamID* pSteamID) { return pSteamID->GetEUniverse(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_GetEUniverse=_BlitzSteamCSteamID_GetEUniverse@4") -DLL_EXPORT void BlitzSteamCSteamID_SetEUniverse(CSteamID* pSteamID, EUniverse eUniverse) { +DLL_EXPORT void DLL_CALL BlitzSteamCSteamID_SetEUniverse(CSteamID* pSteamID, EUniverse eUniverse) { pSteamID->SetEUniverse(eUniverse); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_SetEUniverse=_BlitzSteamCSteamID_SetEUniverse@8") -DLL_EXPORT uint32_t BlitzSteamCSteamID_IsValid(CSteamID* pSteamID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_IsValid(CSteamID* pSteamID) { return pSteamID->IsValid(); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_IsValid=_BlitzSteamCSteamID_IsValid@4") -DLL_EXPORT uint32_t BlitzSteamCSteamID_Compare(CSteamID* pSteamID, CSteamID* pSteamIDOther) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamCSteamID_Compare(CSteamID* pSteamID, CSteamID* pSteamIDOther) { return (pSteamID == pSteamIDOther ? 1 : 0) + (pSteamID < pSteamIDOther ? 2 : 0) + (pSteamID > pSteamIDOther ? 4 : 0); } #pragma comment(linker, "/EXPORT:BlitzSteamCSteamID_Compare=_BlitzSteamCSteamID_Compare@8") diff --git a/Helpers/CSteamID.h b/Helpers/CSteamID.h new file mode 100644 index 0000000..e69de29 diff --git a/Helpers/Callbacks.cpp b/Helpers/Callbacks.cpp index c083522..0d5f02d 100644 --- a/Helpers/Callbacks.cpp +++ b/Helpers/Callbacks.cpp @@ -36,14 +36,14 @@ class BlitzSteamCallback : CCallbackBase { } }; -DLL_EXPORT void* BlitzSteamHelper_CreateCallback(uint32_t fpFunctionPointer) { +DLL_EXPORT void* DLL_CALL BlitzSteamHelper_CreateCallback(uint32_t fpFunctionPointer) { BlitzSteamCallback* lpBSCallback = new BlitzSteamCallback(); lpBSCallback->blitzFunctionPointer = fpFunctionPointer; return lpBSCallback; } #pragma comment(linker, "/EXPORT:BlitzSteamHelper_CreateCallback=_BlitzSteamHelper_CreateCallback@4") -DLL_EXPORT void BlitzSteamHelper_DestroyCallback(uint32_t lpCallback) { +DLL_EXPORT void DLL_CALL BlitzSteamHelper_DestroyCallback(uint32_t lpCallback) { BlitzSteamCallback* lpBSCallback = (BlitzSteamCallback*)lpCallback; if (lpBSCallback != nullptr) { delete lpBSCallback; @@ -51,7 +51,7 @@ DLL_EXPORT void BlitzSteamHelper_DestroyCallback(uint32_t lpCallback) { } #pragma comment(linker, "/EXPORT:BlitzSteamHelper_DestroyCallback=_BlitzSteamHelper_DestroyCallback@4") -DLL_EXPORT const char* BlitzSteamHelper_FormatUnixTime(uint32_t unTime, const char* pchFormat) { +DLL_EXPORT const char* DLL_CALL BlitzSteamHelper_FormatUnixTime(uint32_t unTime, const char* pchFormat) { char* output = new char[strlen(pchFormat) * 4]; time_t t = unTime; struct tm *tm = localtime(&t); diff --git a/Helpers/Callbacks.h b/Helpers/Callbacks.h new file mode 100644 index 0000000..e69de29 diff --git a/Helpers/Double.cpp b/Helpers/Double.cpp deleted file mode 100644 index 2180564..0000000 --- a/Helpers/Double.cpp +++ /dev/null @@ -1,113 +0,0 @@ -// BlitzSteam - Steam wrapper for Blitz. -// Copyright (C) 2015 Project Kube (Michael Fabian Dirks) -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . - -#include "dllmain.h" -#include -#include - -#pragma region Construction & Destruction -DLL_EXPORT double_t* BlitzSteamDouble_New() { - return new double_t; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_New=_BlitzSteamDouble_New@0") - -DLL_EXPORT double_t* BlitzSteamDouble_Copy(double_t* other) { - double_t* pthis = new double_t; - *pthis = *other; - return pthis; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_Copy=_BlitzSteamDouble_Copy@4") - -DLL_EXPORT void BlitzSteamDouble_Delete(double_t* pthis) { - delete pthis; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_Delete=_BlitzSteamDouble_Delete@4") -#pragma endregion Construction & Destruction - -#pragma region Math -DLL_EXPORT void BlitzSteamDouble_SetP(double_t* pthis, double_t* other) { *pthis = *other; } -DLL_EXPORT void BlitzSteamDouble_SetF(double_t* pthis, float_t other) { *pthis = other; } -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_SetP=_BlitzSteamDouble_SetP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_SetF=_BlitzSteamDouble_SetF@8") - -DLL_EXPORT void BlitzSteamDouble_AddP(double_t* pthis, double_t* other) { *pthis += *other; } -DLL_EXPORT void BlitzSteamDouble_AddF(double_t* pthis, float_t other) { *pthis += other; } -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_AddP=_BlitzSteamDouble_AddP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_AddF=_BlitzSteamDouble_AddF@8") - -DLL_EXPORT void BlitzSteamDouble_SubP(double_t* pthis, double_t* other) { *pthis -= *other; } -DLL_EXPORT void BlitzSteamDouble_SubF(double_t* pthis, float_t other) { *pthis -= other; } -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_SubP=_BlitzSteamDouble_SubP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_SubF=_BlitzSteamDouble_SubF@8") - -DLL_EXPORT void BlitzSteamDouble_MulP(double_t* pthis, double_t* other) { *pthis *= *other; } -DLL_EXPORT void BlitzSteamDouble_MulF(double_t* pthis, float_t other) { *pthis *= other; } -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_MulP=_BlitzSteamDouble_MulP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_MulF=_BlitzSteamDouble_MulF@8") - -DLL_EXPORT void BlitzSteamDouble_DivP(double_t* pthis, double_t* other) { *pthis /= *other; } -DLL_EXPORT void BlitzSteamDouble_DivF(double_t* pthis, float_t other) { *pthis /= other; } -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_DivP=_BlitzSteamDouble_DivP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_DivF=_BlitzSteamDouble_DivF@8") -#pragma endregion Math - -#pragma region Comparison -DLL_EXPORT uint32_t BlitzSteamDouble_CompareP(double_t* pthis, double_t* other) { - return (*pthis == *other ? 1 : 0) + (*pthis < *other ? 2 : 0) + (*pthis > *other ? 4 : 0); -} -DLL_EXPORT uint32_t BlitzSteamDouble_CompareF(double_t* pthis, float_t other) { - return (*pthis == other ? 1 : 0) + (*pthis < other ? 2 : 0) + (*pthis > other ? 4 : 0); -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_CompareP=_BlitzSteamDouble_CompareP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_CompareF=_BlitzSteamDouble_CompareF@8") -#pragma endregion Comparison - -#pragma region Conversion -DLL_EXPORT const char* BlitzSteamDouble_ToString(double_t* pthis) { - std::stringstream stream; - stream << *pthis; - return stream.str().c_str(); -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_ToString=_BlitzSteamDouble_ToString@4") - -// Double <-> Float -DLL_EXPORT float_t BlitzSteamDouble_ToFloat(double_t* pthis) { return (float_t)*pthis; } -DLL_EXPORT double_t* BlitzSteamDouble_FromFloat(float_t other) { - double_t* val = new double_t; - *val = (double_t)other; - return val; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_ToFloat=_BlitzSteamDouble_ToFloat@4") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_FromFloat=_BlitzSteamDouble_FromFloat@4") - -// Double <-> Int32 -DLL_EXPORT int32_t BlitzSteamDouble_ToInt32(double_t* pthis) { return (int32_t)*pthis; } -DLL_EXPORT double_t* BlitzSteamDouble_FromInt32(int32_t other) { - double_t* val = new double_t; - *val = (double_t)other; - return val; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_ToInt32=_BlitzSteamDouble_ToInt32@4") -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_FromInt32=_BlitzSteamDouble_FromInt32@4") - -// Double -> Int64 -DLL_EXPORT int64_t* BlitzSteamDouble_ToInt64(double_t* pthis) { - int64_t* val = new int64_t; - *val = (int64_t)*pthis; - return val; -} -#pragma comment(linker, "/EXPORT:BlitzSteamDouble_ToInt64=_BlitzSteamDouble_ToInt64@4") -#pragma endregion Conversion diff --git a/Helpers/Int64.cpp b/Helpers/Int64.cpp deleted file mode 100644 index 9c95dbb..0000000 --- a/Helpers/Int64.cpp +++ /dev/null @@ -1,109 +0,0 @@ -// BlitzSteam - Steam wrapper for Blitz. -// Copyright (C) 2015 Project Kube (Michael Fabian Dirks) -// -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with this program. If not, see . - -#include "dllmain.h" -#include -#include - -#pragma region Construction & Destruction -DLL_EXPORT int64_t* BlitzSteamInt64_New() { - return new int64_t; -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_New=_BlitzSteamInt64_New@0") - -DLL_EXPORT int64_t* BlitzSteamInt64_Copy(int64_t* other) { - int64_t* pthis = new int64_t; - *pthis = *other; - return pthis; -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_Copy=_BlitzSteamInt64_Copy@4") - -DLL_EXPORT void BlitzSteamInt64_Destroy(int64_t* pthis) { - delete pthis; -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_Destroy=_BlitzSteamInt64_Destroy@4") -#pragma endregion Construction & Destruction - -#pragma region Math -DLL_EXPORT void BlitzSteamInt64_SetP(int64_t* pthis, int64_t* other) { *pthis = *other; } -DLL_EXPORT void BlitzSteamInt64_SetV(int64_t* pthis, uint32_t left, uint32_t right) { *pthis = ((int64_t)left << 32) + right; } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_SetP=_BlitzSteamInt64_SetP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_SetV=_BlitzSteamInt64_SetV@12") - -DLL_EXPORT void BlitzSteamInt64_AddP(int64_t* pthis, int64_t* other) { *pthis += *other; } -DLL_EXPORT void BlitzSteamInt64_AddV(int64_t* pthis, uint32_t left, uint32_t right) { *pthis += ((int64_t)left << 32) + right; } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_AddP=_BlitzSteamInt64_AddP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_AddV=_BlitzSteamInt64_AddV@12") - -DLL_EXPORT void BlitzSteamInt64_SubP(int64_t* pthis, int64_t* other) { *pthis -= *other; } -DLL_EXPORT void BlitzSteamInt64_SubV(int64_t* pthis, uint32_t left, uint32_t right) { *pthis -= ((int64_t)left << 32) + right; } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_SubP=_BlitzSteamInt64_SubP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_SubV=_BlitzSteamInt64_SubV@12") - -DLL_EXPORT void BlitzSteamInt64_MulP(int64_t* pthis, int64_t* other) { *pthis *= *other; } -DLL_EXPORT void BlitzSteamInt64_MulV(int64_t* pthis, uint32_t left, uint32_t right) { *pthis *= ((int64_t)left << 32) + right; } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_MulP=_BlitzSteamInt64_MulP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_MulV=_BlitzSteamInt64_MulV@12") - -DLL_EXPORT void BlitzSteamInt64_DivP(int64_t* pthis, int64_t* other) { *pthis *= *other; } -DLL_EXPORT void BlitzSteamInt64_DivV(int64_t* pthis, uint32_t left, uint32_t right) { *pthis *= ((int64_t)left << 32) + right; } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_DivP=_BlitzSteamInt64_DivP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_DivV=_BlitzSteamInt64_DivV@12") -#pragma endregion Math - -#pragma region Comparison -DLL_EXPORT uint32_t BlitzSteamInt64_CompareP(int64_t* pthis, int64_t* other) { - return (*pthis == *other ? 1 : 0) + (*pthis < *other ? 2 : 0) + (*pthis > *other ? 4 : 0); -} -DLL_EXPORT uint32_t BlitzSteamInt64_CompareV(int64_t* pthis, uint32_t left, uint32_t right) { - int64_t other = ((int64_t)left << 32) + right; - return (*pthis == other ? 1 : 0) + (*pthis < other ? 2 : 0) + (*pthis > other ? 4 : 0); -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_CompareP=_BlitzSteamInt64_CompareP@8") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_CompareV=_BlitzSteamInt64_CompareV@12") -#pragma endregion Comparison - -#pragma region Conversion -DLL_EXPORT const char* BlitzSteamInt64_ToString(int64_t* pthis) { - std::stringstream stream; - stream << *pthis; - return stream.str().c_str(); -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_ToString=_BlitzSteamInt64_ToString@4") - -// Int64 -> Int32 -DLL_EXPORT int32_t BlitzSteamInt64_ValueL(int64_t* pthis) { return (int32_t)((*pthis) >> 32); } -DLL_EXPORT int32_t BlitzSteamInt64_ValueR(int64_t* pthis) { return (int32_t)((*pthis) && 0xFFFFFFFF); } -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_ValueL=_BlitzSteamInt64_ValueL@4") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_ValueR=_BlitzSteamInt64_ValueR@4") - -// Int64 <-> Float -DLL_EXPORT float BlitzSteamInt64_ToFloat(int64_t* pthis) { return (float)*pthis; } -DLL_EXPORT int64_t* BlitzSteamInt64_FromFloat(float_t other) { - int64_t val = (int64_t)other; - return BlitzSteamInt64_Copy(&val); -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_ToFloat=_BlitzSteamInt64_ToFloat@4") -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_FromFloat=_BlitzSteamInt64_FromFloat@4") - -// Int64 -> Double -DLL_EXPORT double_t* BlitzSteamInt64_ToDouble(int64_t* pthis) { - double_t* val = new double_t; - *val = (double_t)*pthis; - return val; -} -#pragma comment(linker, "/EXPORT:BlitzSteamInt64_ToDouble=_BlitzSteamInt64_ToDouble@4") -#pragma endregion Conversion diff --git a/Libraries/BlitzPointer.h b/Libraries/BlitzPointer.h index ebac672..8f23fe3 100644 --- a/Libraries/BlitzPointer.h +++ b/Libraries/BlitzPointer.h @@ -16,11 +16,11 @@ #include "dllmain.h" -typedef uint32_t(__cdecl *BlitzPointer_CallFunction0_t)(uint32_t); -typedef uint32_t(__cdecl *BlitzPointer_CallFunction1_t)(uint32_t, uint32_t); -typedef uint32_t(__cdecl *BlitzPointer_CallFunction2_t)(uint32_t, uint32_t, uint32_t); -typedef uint32_t(__cdecl *BlitzPointer_CallFunction3_t)(uint32_t, uint32_t, uint32_t, uint32_t); -typedef uint32_t(__cdecl *BlitzPointer_CallFunction4_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); +typedef uint32_t(__stdcall *BlitzPointer_CallFunction0_t)(uint32_t); +typedef uint32_t(__stdcall *BlitzPointer_CallFunction1_t)(uint32_t, uint32_t); +typedef uint32_t(__stdcall *BlitzPointer_CallFunction2_t)(uint32_t, uint32_t, uint32_t); +typedef uint32_t(__stdcall *BlitzPointer_CallFunction3_t)(uint32_t, uint32_t, uint32_t, uint32_t); +typedef uint32_t(__stdcall *BlitzPointer_CallFunction4_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t); extern BlitzPointer_CallFunction0_t BlitzPointer_CallFunction0; extern BlitzPointer_CallFunction1_t BlitzPointer_CallFunction1; diff --git a/Wrapper/Steam.cpp b/Wrapper/Steam.cpp index 4c3e58e..310db7b 100644 --- a/Wrapper/Steam.cpp +++ b/Wrapper/Steam.cpp @@ -16,164 +16,164 @@ #include "dllmain.h" -DLL_EXPORT uint32_t BlitzSteam_Init() { +DLL_EXPORT uint32_t DLL_CALL BlitzSteam_Init() { return SteamAPI_Init(); } #pragma comment(linker, "/EXPORT:BlitzSteam_Init=_BlitzSteam_Init@0") -DLL_EXPORT void BlitzSteam_Shutdown() { +DLL_EXPORT void DLL_CALL BlitzSteam_Shutdown() { SteamAPI_Shutdown(); } #pragma comment(linker, "/EXPORT:BlitzSteam_Shutdown=_BlitzSteam_Shutdown@0") -DLL_EXPORT uint32_t BlitzSteam_IsSteamRunning() { +DLL_EXPORT uint32_t DLL_CALL BlitzSteam_IsSteamRunning() { return SteamAPI_IsSteamRunning(); } #pragma comment(linker, "/EXPORT:BlitzSteam_IsSteamRunning=_BlitzSteam_IsSteamRunning@0") -DLL_EXPORT uint32_t BlitzSteam_RestartAppIfNecessary(uint32 unOwnAppID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteam_RestartAppIfNecessary(uint32 unOwnAppID) { return SteamAPI_RestartAppIfNecessary(unOwnAppID); } #pragma comment(linker, "/EXPORT:BlitzSteam_RestartAppIfNecessary=_BlitzSteam_RestartAppIfNecessary@4") -DLL_EXPORT void BlitzSteam_SetMiniDumpComment(const char* pchMsg) { +DLL_EXPORT void DLL_CALL BlitzSteam_SetMiniDumpComment(const char* pchMsg) { SteamAPI_SetMiniDumpComment(pchMsg); } #pragma comment(linker, "/EXPORT:BlitzSteam_SetMiniDumpComment=_BlitzSteam_SetMiniDumpComment@4") -DLL_EXPORT void BlitzSteam_WriteMiniDump(uint32_t uStructuredExceptionCode, void* pvExceptionInfo, uint32 uBuildID) { +DLL_EXPORT void DLL_CALL BlitzSteam_WriteMiniDump(uint32_t uStructuredExceptionCode, void* pvExceptionInfo, uint32 uBuildID) { SteamAPI_WriteMiniDump(uStructuredExceptionCode, pvExceptionInfo, uBuildID); } #pragma comment(linker, "/EXPORT:BlitzSteam_WriteMiniDump=_BlitzSteam_WriteMiniDump@12") // Interface Pointers, configured by SteamAPI_Init(). -DLL_EXPORT ISteamClient* BlitzSteamClient() { +DLL_EXPORT ISteamClient* DLL_CALL BlitzSteamClient() { return SteamClient(); } #pragma comment(linker, "/EXPORT:BlitzSteamClient=_BlitzSteamClient@0") -DLL_EXPORT ISteamUser* BlitzSteamUser() { +DLL_EXPORT ISteamUser* DLL_CALL BlitzSteamUser() { return SteamUser(); } #pragma comment(linker, "/EXPORT:BlitzSteamUser=_BlitzSteamUser@0") -DLL_EXPORT ISteamFriends* BlitzSteamFriends() { +DLL_EXPORT ISteamFriends* DLL_CALL BlitzSteamFriends() { return SteamFriends(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends=_BlitzSteamFriends@0") -DLL_EXPORT ISteamUtils* BlitzSteamUtils() { +DLL_EXPORT ISteamUtils* DLL_CALL BlitzSteamUtils() { return SteamUtils(); } #pragma comment(linker, "/EXPORT:BlitzSteamUtils=_BlitzSteamUtils@0") -DLL_EXPORT ISteamMatchmaking* BlitzSteamMatchmaking() { +DLL_EXPORT ISteamMatchmaking* DLL_CALL BlitzSteamMatchmaking() { return SteamMatchmaking(); } #pragma comment(linker, "/EXPORT:BlitzSteamMatchmaking=_BlitzSteamMatchmaking@0") -DLL_EXPORT ISteamUserStats* BlitzSteamUserStats() { +DLL_EXPORT ISteamUserStats* DLL_CALL BlitzSteamUserStats() { return SteamUserStats(); } #pragma comment(linker, "/EXPORT:BlitzSteamUserStats=_BlitzSteamUserStats@0") -DLL_EXPORT ISteamApps* BlitzSteamApps() { +DLL_EXPORT ISteamApps* DLL_CALL BlitzSteamApps() { return SteamApps(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps=_BlitzSteamApps@0") -DLL_EXPORT ISteamNetworking* BlitzSteamNetworking() { +DLL_EXPORT ISteamNetworking* DLL_CALL BlitzSteamNetworking() { return SteamNetworking(); } #pragma comment(linker, "/EXPORT:BlitzSteamNetworking=_BlitzSteamNetworking@0") -DLL_EXPORT ISteamMatchmakingServers* BlitzSteamMatchmakingServers() { +DLL_EXPORT ISteamMatchmakingServers* DLL_CALL BlitzSteamMatchmakingServers() { return SteamMatchmakingServers(); } #pragma comment(linker, "/EXPORT:BlitzSteamMatchmakingServers=_BlitzSteamMatchmakingServers@0") -DLL_EXPORT ISteamRemoteStorage* BlitzSteamRemoteStorage() { +DLL_EXPORT ISteamRemoteStorage* DLL_CALL BlitzSteamRemoteStorage() { return SteamRemoteStorage(); } #pragma comment(linker, "/EXPORT:BlitzSteamRemoteStorage=_BlitzSteamRemoteStorage@0") -DLL_EXPORT ISteamScreenshots* BlitzSteamScreenshots() { +DLL_EXPORT ISteamScreenshots* DLL_CALL BlitzSteamScreenshots() { return SteamScreenshots(); } #pragma comment(linker, "/EXPORT:BlitzSteamScreenshots=_BlitzSteamScreenshots@0") -DLL_EXPORT ISteamHTTP* BlitzSteamHTTP() { +DLL_EXPORT ISteamHTTP* DLL_CALL BlitzSteamHTTP() { return SteamHTTP(); } #pragma comment(linker, "/EXPORT:BlitzSteamHTTP=_BlitzSteamHTTP@0") -DLL_EXPORT ISteamUnifiedMessages* BlitzSteamUnifiedMessages() { +DLL_EXPORT ISteamUnifiedMessages* DLL_CALL BlitzSteamUnifiedMessages() { return SteamUnifiedMessages(); } #pragma comment(linker, "/EXPORT:BlitzSteamUnifiedMessages=_BlitzSteamUnifiedMessages@0") -DLL_EXPORT ISteamController* BlitzSteamController() { +DLL_EXPORT ISteamController* DLL_CALL BlitzSteamController() { return SteamController(); } #pragma comment(linker, "/EXPORT:BlitzSteamController=_BlitzSteamController@0") -DLL_EXPORT ISteamUGC* BlitzSteamUGC() { +DLL_EXPORT ISteamUGC* DLL_CALL BlitzSteamUGC() { return SteamUGC(); } #pragma comment(linker, "/EXPORT:BlitzSteamUGC=_BlitzSteamUGC@0") -DLL_EXPORT ISteamAppList* BlitzSteamAppList() { +DLL_EXPORT ISteamAppList* DLL_CALL BlitzSteamAppList() { return SteamAppList(); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList=_BlitzSteamAppList@0") -DLL_EXPORT ISteamMusic* BlitzSteamMusic() { +DLL_EXPORT ISteamMusic* DLL_CALL BlitzSteamMusic() { return SteamMusic(); } #pragma comment(linker, "/EXPORT:BlitzSteamMusic=_BlitzSteamMusic@0") -DLL_EXPORT ISteamMusicRemote* BlitzSteamMusicRemote() { +DLL_EXPORT ISteamMusicRemote* DLL_CALL BlitzSteamMusicRemote() { return SteamMusicRemote(); } #pragma comment(linker, "/EXPORT:BlitzSteamMusicRemote=_BlitzSteamMusicRemote@0") -DLL_EXPORT ISteamHTMLSurface* BlitzSteamHTMLSurface() { +DLL_EXPORT ISteamHTMLSurface* DLL_CALL BlitzSteamHTMLSurface() { return SteamHTMLSurface(); } #pragma comment(linker, "/EXPORT:BlitzSteamHTMLSurface=_BlitzSteamHTMLSurface@0") -DLL_EXPORT ISteamInventory* BlitzSteamInventory() { +DLL_EXPORT ISteamInventory* DLL_CALL BlitzSteamInventory() { return SteamInventory(); } #pragma comment(linker, "/EXPORT:BlitzSteamInventory=_BlitzSteamInventory@0") -DLL_EXPORT ISteamVideo* BlitzSteamVideo() { +DLL_EXPORT ISteamVideo* DLL_CALL BlitzSteamVideo() { return SteamVideo(); } #pragma comment(linker, "/EXPORT:BlitzSteamVideo=_BlitzSteamVideo@0") // Callbacks & Hooks -DLL_EXPORT void BlitzSteam_RunCallbacks() { +DLL_EXPORT void DLL_CALL BlitzSteam_RunCallbacks() { SteamAPI_RunCallbacks(); } #pragma comment(linker, "/EXPORT:BlitzSteam_RunCallbacks=_BlitzSteam_RunCallbacks@0") -DLL_EXPORT void BlitzSteam_RegisterCallback(class CCallbackBase *pCallback, int iCallback) { +DLL_EXPORT void DLL_CALL BlitzSteam_RegisterCallback(class CCallbackBase *pCallback, int iCallback) { SteamAPI_RegisterCallback(pCallback, iCallback); } #pragma comment(linker, "/EXPORT:BlitzSteam_RegisterCallback=_BlitzSteam_RegisterCallback@8") -DLL_EXPORT void BlitzSteam_UnregisterCallback(class CCallbackBase *pCallback) { +DLL_EXPORT void DLL_CALL BlitzSteam_UnregisterCallback(class CCallbackBase *pCallback) { SteamAPI_UnregisterCallback(pCallback); } #pragma comment(linker, "/EXPORT:BlitzSteam_UnregisterCallback=_BlitzSteam_UnregisterCallback@4") -DLL_EXPORT void BlitzSteam_RegisterCallResult(class CCallbackBase *pCallback, uint32_t hAPICall_L, uint32_t hAPICall_R) { +DLL_EXPORT void DLL_CALL BlitzSteam_RegisterCallResult(class CCallbackBase *pCallback, uint32_t hAPICall_L, uint32_t hAPICall_R) { SteamAPI_RegisterCallResult(pCallback, ((uint64_t)hAPICall_L << 32) + (uint64_t)hAPICall_R); } #pragma comment(linker, "/EXPORT:BlitzSteam_RegisterCallResult=_BlitzSteam_RegisterCallResult@12") -DLL_EXPORT void BlitzSteam_UnregisterCallResult(class CCallbackBase *pCallback, uint32_t hAPICall_L, uint32_t hAPICall_R) { +DLL_EXPORT void DLL_CALL BlitzSteam_UnregisterCallResult(class CCallbackBase *pCallback, uint32_t hAPICall_L, uint32_t hAPICall_R) { SteamAPI_UnregisterCallResult(pCallback, ((uint64_t)hAPICall_L << 32) + (uint64_t)hAPICall_R); } #pragma comment(linker, "/EXPORT:BlitzSteam_UnregisterCallResult=_BlitzSteam_UnregisterCallResult@12") \ No newline at end of file diff --git a/Wrapper/SteamAppList.cpp b/Wrapper/SteamAppList.cpp index 4c6c2a0..b556fcf 100644 --- a/Wrapper/SteamAppList.cpp +++ b/Wrapper/SteamAppList.cpp @@ -16,27 +16,27 @@ #include "dllmain.h" -DLL_EXPORT uint32_t BlitzSteamAppList_GetNumInstalledApps(ISteamAppList* lpSteamAppList) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamAppList_GetNumInstalledApps(ISteamAppList* lpSteamAppList) { return lpSteamAppList->GetNumInstalledApps(); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList_GetNumInstalledApps=_BlitzSteamAppList_GetNumInstalledApps@4") -DLL_EXPORT uint32_t BlitzSteamAppList_GetInstalledApps(ISteamAppList* lpSteamAppList, AppId_t *pvecAppID, uint32 unMaxAppIDs) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamAppList_GetInstalledApps(ISteamAppList* lpSteamAppList, AppId_t *pvecAppID, uint32 unMaxAppIDs) { return lpSteamAppList->GetInstalledApps(pvecAppID, unMaxAppIDs); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList_GetInstalledApps=_BlitzSteamAppList_GetInstalledApps@12") -DLL_EXPORT uint32_t BlitzSteamAppList_GetAppName(ISteamAppList* lpSteamAppList, AppId_t nAppID, char* pchName, uint32_t cchNameMax) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamAppList_GetAppName(ISteamAppList* lpSteamAppList, AppId_t nAppID, char* pchName, uint32_t cchNameMax) { return lpSteamAppList->GetAppName(nAppID, pchName, cchNameMax); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList_GetAppName=_BlitzSteamAppList_GetAppName@16") -DLL_EXPORT uint32_t BlitzSteamAppList_GetAppInstallDir(ISteamAppList* lpSteamAppList, AppId_t nAppID, char* pchDirectory, uint32_t cchDirectoryMax) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamAppList_GetAppInstallDir(ISteamAppList* lpSteamAppList, AppId_t nAppID, char* pchDirectory, uint32_t cchDirectoryMax) { return lpSteamAppList->GetAppInstallDir(nAppID, pchDirectory, cchDirectoryMax); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList_GetAppInstallDir=_BlitzSteamAppList_GetAppInstallDir@16") -DLL_EXPORT uint32_t BlitzSteamAppList_GetAppBuildId(ISteamAppList* lpSteamAppList, AppId_t nAppID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamAppList_GetAppBuildId(ISteamAppList* lpSteamAppList, AppId_t nAppID) { return lpSteamAppList->GetAppBuildId(nAppID); } #pragma comment(linker, "/EXPORT:BlitzSteamAppList_GetAppBuildId=_BlitzSteamAppList_GetAppBuildId@8") diff --git a/Wrapper/SteamApps.cpp b/Wrapper/SteamApps.cpp index fdcb925..ae79eb4 100644 --- a/Wrapper/SteamApps.cpp +++ b/Wrapper/SteamApps.cpp @@ -16,122 +16,123 @@ #include "dllmain.h" -DLL_EXPORT uint32_t BlitzSteamApps_IsSubscribed(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsSubscribed(ISteamApps* lpSteamApps) { return lpSteamApps->BIsSubscribed(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsSubscribed=_BlitzSteamApps_IsSubscribed@4") -DLL_EXPORT uint32_t BlitzSteamApps_IsLowViolence(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsLowViolence(ISteamApps* lpSteamApps) { return lpSteamApps->BIsLowViolence(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsLowViolence=_BlitzSteamApps_IsLowViolence@4") -DLL_EXPORT uint32_t BlitzSteamApps_IsCybercafe(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsCybercafe(ISteamApps* lpSteamApps) { return lpSteamApps->BIsCybercafe(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsCybercafe=_BlitzSteamApps_IsCybercafe@4") -DLL_EXPORT uint32_t BlitzSteamApps_IsVACBanned(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsVACBanned(ISteamApps* lpSteamApps) { return lpSteamApps->BIsVACBanned(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsVACBanned=_BlitzSteamApps_IsVACBanned@4") -DLL_EXPORT const char* BlitzSteamApps_GetCurrentGameLanguage(ISteamApps* lpSteamApps) { +DLL_EXPORT const char* DLL_CALL BlitzSteamApps_GetCurrentGameLanguage(ISteamApps* lpSteamApps) { return lpSteamApps->GetCurrentGameLanguage(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetCurrentGameLanguage=_BlitzSteamApps_GetCurrentGameLanguage@4") -DLL_EXPORT const char* BlitzSteamApps_GetAvailableGameLanguages(ISteamApps* lpSteamApps) { +DLL_EXPORT const char* DLL_CALL BlitzSteamApps_GetAvailableGameLanguages(ISteamApps* lpSteamApps) { return lpSteamApps->GetAvailableGameLanguages(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetAvailableGameLanguages=_BlitzSteamApps_GetAvailableGameLanguages@4") -DLL_EXPORT uint32_t BlitzSteamApps_IsSubscribedApp(ISteamApps* lpSteamApps, AppId_t appID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsSubscribedApp(ISteamApps* lpSteamApps, AppId_t appID) { return lpSteamApps->BIsSubscribedApp(appID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsSubscribedApp=_BlitzSteamApps_IsSubscribedApp@8") -DLL_EXPORT uint32_t BlitzSteamApps_IsDlcInstalled(ISteamApps* lpSteamApps, AppId_t appID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsDlcInstalled(ISteamApps* lpSteamApps, AppId_t appID) { return lpSteamApps->BIsDlcInstalled(appID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsDlcInstalled=_BlitzSteamApps_IsDlcInstalled@8") -DLL_EXPORT uint32_t BlitzSteamApps_GetEarliestPurchaseUnixTime(ISteamApps* lpSteamApps, AppId_t appID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetEarliestPurchaseUnixTime(ISteamApps* lpSteamApps, AppId_t appID) { return lpSteamApps->GetEarliestPurchaseUnixTime(appID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetEarliestPurchaseUnixTime=_BlitzSteamApps_GetEarliestPurchaseUnixTime@8") -DLL_EXPORT uint32_t BlitzSteamApps_IsSubscribedFromFreeWeekend(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsSubscribedFromFreeWeekend(ISteamApps* lpSteamApps) { return lpSteamApps->BIsSubscribedFromFreeWeekend(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsSubscribedFromFreeWeekend=_BlitzSteamApps_IsSubscribedFromFreeWeekend@4") -DLL_EXPORT uint32_t BlitzSteamApps_GetDLCCount(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetDLCCount(ISteamApps* lpSteamApps) { return lpSteamApps->GetDLCCount(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetDLCCount=_BlitzSteamApps_GetDLCCount@4") -DLL_EXPORT uint32_t BlitzSteamApps_GetDLCDataByIndex(ISteamApps* lpSteamApps, uint32_t iDLC, AppId_t *pAppId, bool *pbAvailable, char *pchName, uint32_t cchNameBufferSize) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetDLCDataByIndex(ISteamApps* lpSteamApps, uint32_t iDLC, AppId_t *pAppId, bool *pbAvailable, char *pchName, uint32_t cchNameBufferSize) { return lpSteamApps->BGetDLCDataByIndex(iDLC, pAppId, pbAvailable, pchName, cchNameBufferSize); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetDLCDataByIndex=_BlitzSteamApps_GetDLCDataByIndex@24") -DLL_EXPORT void BlitzSteamApps_InstallDLC(ISteamApps* lpSteamApps, AppId_t nAppID) { +DLL_EXPORT void DLL_CALL BlitzSteamApps_InstallDLC(ISteamApps* lpSteamApps, AppId_t nAppID) { lpSteamApps->InstallDLC(nAppID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_InstallDLC=_BlitzSteamApps_InstallDLC@8") -DLL_EXPORT void BlitzSteamApps_UninstallDLC(ISteamApps* lpSteamApps, AppId_t nAppID) { +DLL_EXPORT void DLL_CALL BlitzSteamApps_UninstallDLC(ISteamApps* lpSteamApps, AppId_t nAppID) { lpSteamApps->UninstallDLC(nAppID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_UninstallDLC=_BlitzSteamApps_UninstallDLC@8") -DLL_EXPORT void BlitzSteamApps_RequestAppProofOfPurchaseKey(ISteamApps* lpSteamApps, AppId_t nAppID) { +DLL_EXPORT void DLL_CALL BlitzSteamApps_RequestAppProofOfPurchaseKey(ISteamApps* lpSteamApps, AppId_t nAppID) { lpSteamApps->RequestAppProofOfPurchaseKey(nAppID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_RequestAppProofOfPurchaseKey=_BlitzSteamApps_RequestAppProofOfPurchaseKey@8") -DLL_EXPORT uint32_t BlitzSteamApps_GetCurrentBetaName(ISteamApps* lpSteamApps, char *pchName, int cchNameBufferSize) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetCurrentBetaName(ISteamApps* lpSteamApps, char *pchName, int cchNameBufferSize) { return lpSteamApps->GetCurrentBetaName(pchName, cchNameBufferSize); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetCurrentBetaName=_BlitzSteamApps_GetCurrentBetaName@12") -DLL_EXPORT uint32_t BlitzSteamApps_MarkContentCorrupt(ISteamApps* lpSteamApps, bool bMissingFilesOnly) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_MarkContentCorrupt(ISteamApps* lpSteamApps, bool bMissingFilesOnly) { return lpSteamApps->MarkContentCorrupt(bMissingFilesOnly); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_MarkContentCorrupt=_BlitzSteamApps_MarkContentCorrupt@8") -DLL_EXPORT uint32_t BlitzSteamApps_GetInstalledDepots(ISteamApps* lpSteamApps, AppId_t nAppID, DepotId_t *pvecDepots, uint32_t cMaxDepots) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetInstalledDepots(ISteamApps* lpSteamApps, AppId_t nAppID, DepotId_t *pvecDepots, uint32_t cMaxDepots) { return lpSteamApps->GetInstalledDepots(nAppID, pvecDepots, cMaxDepots); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetInstalledDepots=_BlitzSteamApps_GetInstalledDepots@16") -DLL_EXPORT uint32_t BlitzSteamApps_GetAppInstallDir(ISteamApps* lpSteamApps, AppId_t appID, char *pchFolder, uint32 cchFolderBufferSize) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetAppInstallDir(ISteamApps* lpSteamApps, AppId_t appID, char *pchFolder, uint32 cchFolderBufferSize) { return lpSteamApps->GetAppInstallDir(appID, pchFolder, cchFolderBufferSize); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetAppInstallDir=_BlitzSteamApps_GetAppInstallDir@16") -DLL_EXPORT uint32_t BlitzSteamApps_IsAppInstalled(ISteamApps* lpSteamApps, AppId_t appID) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_IsAppInstalled(ISteamApps* lpSteamApps, AppId_t appID) { return lpSteamApps->BIsAppInstalled(appID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_IsAppInstalled=_BlitzSteamApps_IsAppInstalled@8") -DLL_EXPORT CSteamID* BlitzSteamApps_GetAppOwner(ISteamApps* lpSteamApps) { - return new CSteamID(lpSteamApps->GetAppOwner()); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamApps_GetAppOwner(ISteamApps* lpSteamApps) { + CSteamID* steamID = new CSteamID(lpSteamApps->GetAppOwner()); + return BlitzCSteamID_Copy(steamID); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetAppOwner=_BlitzSteamApps_GetAppOwner@4") -DLL_EXPORT const char* BlitzSteamApps_GetLaunchQueryParam(ISteamApps* lpSteamApps, const char *pchKey) { +DLL_EXPORT const char* DLL_CALL BlitzSteamApps_GetLaunchQueryParam(ISteamApps* lpSteamApps, const char *pchKey) { return lpSteamApps->GetLaunchQueryParam(pchKey); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetLaunchQueryParam=_BlitzSteamApps_GetLaunchQueryParam@8") -DLL_EXPORT uint32_t BlitzSteamApps_GetDlcDownloadProgress(ISteamApps* lpSteamApps, AppId_t nAppID, uint64_t* punBytesDownloaded, uint64_t* punBytesTotal) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetDlcDownloadProgress(ISteamApps* lpSteamApps, AppId_t nAppID, uint64_t* punBytesDownloaded, uint64_t* punBytesTotal) { return lpSteamApps->GetDlcDownloadProgress(nAppID, punBytesDownloaded, punBytesTotal); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetDlcDownloadProgress=_BlitzSteamApps_GetDlcDownloadProgress@16") -DLL_EXPORT uint32_t BlitzSteamApps_GetAppBuildId(ISteamApps* lpSteamApps) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamApps_GetAppBuildId(ISteamApps* lpSteamApps) { return lpSteamApps->GetAppBuildId(); } #pragma comment(linker, "/EXPORT:BlitzSteamApps_GetAppBuildId=_BlitzSteamApps_GetAppBuildId@4") \ No newline at end of file diff --git a/Wrapper/SteamClient.cpp b/Wrapper/SteamClient.cpp index f7fe2cc..1aaac4b 100644 --- a/Wrapper/SteamClient.cpp +++ b/Wrapper/SteamClient.cpp @@ -16,178 +16,178 @@ #include "dllmain.h" -DLL_EXPORT HSteamPipe BlitzSteamClient_CreateSteamPipe(ISteamClient* lpSteamClient) { +DLL_EXPORT HSteamPipe DLL_CALL BlitzSteamClient_CreateSteamPipe(ISteamClient* lpSteamClient) { return lpSteamClient->CreateSteamPipe(); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_CreateSteamPipe=_BlitzSteamClient_CreateSteamPipe@4") -DLL_EXPORT bool BlitzSteamClient_ReleaseSteamPipe(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe) { +DLL_EXPORT bool DLL_CALL BlitzSteamClient_ReleaseSteamPipe(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe) { return lpSteamClient->BReleaseSteamPipe(hSteamPipe); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_ReleaseSteamPipe=_BlitzSteamClient_ReleaseSteamPipe@8") -DLL_EXPORT HSteamUser BlitzSteamClient_ConnectToGlobalUser(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe) { +DLL_EXPORT HSteamUser DLL_CALL BlitzSteamClient_ConnectToGlobalUser(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe) { return lpSteamClient->ConnectToGlobalUser(hSteamPipe); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_ConnectToGlobalUser=_BlitzSteamClient_ConnectToGlobalUser@8") -DLL_EXPORT void BlitzSteamClient_SetLocalIPBinding(ISteamClient* lpSteamClient, uint32_t unIP, uint16 usPort) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_SetLocalIPBinding(ISteamClient* lpSteamClient, uint32_t unIP, uint16 usPort) { return lpSteamClient->SetLocalIPBinding(unIP, usPort); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_SetLocalIPBinding=_BlitzSteamClient_SetLocalIPBinding@12") -DLL_EXPORT HSteamUser BlitzSteamClient_CreateLocalUser(ISteamClient* lpSteamClient, HSteamPipe* phSteamPipe, EAccountType eAccountType) { +DLL_EXPORT HSteamUser DLL_CALL BlitzSteamClient_CreateLocalUser(ISteamClient* lpSteamClient, HSteamPipe* phSteamPipe, EAccountType eAccountType) { return lpSteamClient->CreateLocalUser(phSteamPipe, eAccountType); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_CreateLocalUser=_BlitzSteamClient_CreateLocalUser@12") -DLL_EXPORT void BlitzSteamClient_ReleaseUser(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe, HSteamUser hSteamUser) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_ReleaseUser(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe, HSteamUser hSteamUser) { return lpSteamClient->ReleaseUser(hSteamPipe, hSteamUser); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_ReleaseUser=_BlitzSteamClient_ReleaseUser@12") -DLL_EXPORT void BlitzSteamClient_RunFrame(ISteamClient* lpSteamClient) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_RunFrame(ISteamClient* lpSteamClient) { lpSteamClient->RunFrame(); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_RunFrame=_BlitzSteamClient_RunFrame@4") -DLL_EXPORT uint32_t BlitzSteamClient_GetIPCCallCount(ISteamClient* lpSteamClient) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamClient_GetIPCCallCount(ISteamClient* lpSteamClient) { return lpSteamClient->GetIPCCallCount(); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetIPCCallCount=_BlitzSteamClient_GetIPCCallCount@4") -DLL_EXPORT uint32_t BlitzSteamClient_ShutdownIfAllPipesClosed(ISteamClient* lpSteamClient) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamClient_ShutdownIfAllPipesClosed(ISteamClient* lpSteamClient) { return lpSteamClient->BShutdownIfAllPipesClosed(); } // Interfaces -DLL_EXPORT ISteamAppList* BlitzSteamClient_GetSteamAppList(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamAppList* DLL_CALL BlitzSteamClient_GetSteamAppList(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamAppList(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamAppList=_BlitzSteamClient_GetSteamAppList@16") -DLL_EXPORT ISteamApps* BlitzSteamClient_GetSteamApps(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamApps* DLL_CALL BlitzSteamClient_GetSteamApps(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamApps(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamApps=_BlitzSteamClient_GetSteamApps@16") -DLL_EXPORT ISteamController* BlitzSteamClient_GetSteamController(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamController* DLL_CALL BlitzSteamClient_GetSteamController(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamController(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamController=_BlitzSteamClient_GetSteamController@16") -DLL_EXPORT ISteamFriends* BlitzSteamClient_GetSteamFriends(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamFriends* DLL_CALL BlitzSteamClient_GetSteamFriends(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamFriends(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamFriends=_BlitzSteamClient_GetSteamFriends@16") -DLL_EXPORT ISteamGameServer* BlitzSteamClient_GetSteamGameServer(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamGameServer* DLL_CALL BlitzSteamClient_GetSteamGameServer(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamGameServer(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamGameServer=_BlitzSteamClient_GetSteamGameServer@16") -DLL_EXPORT ISteamGameServerStats* BlitzSteamClient_GetSteamGameServerStats(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamGameServerStats* DLL_CALL BlitzSteamClient_GetSteamGameServerStats(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamGameServerStats(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamGameServerStats=_BlitzSteamClient_GetSteamGameServerStats@16") -DLL_EXPORT ISteamHTMLSurface* BlitzSteamClient_GetSteamHTMLSurface(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamHTMLSurface* DLL_CALL BlitzSteamClient_GetSteamHTMLSurface(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamHTMLSurface(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamHTMLSurface=_BlitzSteamClient_GetSteamHTMLSurface@16") -DLL_EXPORT ISteamHTTP* BlitzSteamClient_GetSteamHTTP(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamHTTP* DLL_CALL BlitzSteamClient_GetSteamHTTP(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamHTTP(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamHTTP=_BlitzSteamClient_GetSteamHTTP@16") -DLL_EXPORT ISteamInventory* BlitzSteamClient_GetSteamInventory(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamInventory* DLL_CALL BlitzSteamClient_GetSteamInventory(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamInventory(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamInventory=_BlitzSteamClient_GetSteamInventory@16") -DLL_EXPORT ISteamMatchmaking* BlitzSteamClient_GetSteamMatchmaking(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamMatchmaking* DLL_CALL BlitzSteamClient_GetSteamMatchmaking(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamMatchmaking(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamMatchmaking=_BlitzSteamClient_GetSteamMatchmaking@16") -DLL_EXPORT ISteamMatchmakingServers* BlitzSteamClient_GetSteamMatchmakingServers(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamMatchmakingServers* DLL_CALL BlitzSteamClient_GetSteamMatchmakingServers(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamMatchmakingServers(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamMatchmakingServers=_BlitzSteamClient_GetSteamMatchmakingServers@16") -DLL_EXPORT ISteamMusic* BlitzSteamClient_GetSteamMusic(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamMusic* DLL_CALL BlitzSteamClient_GetSteamMusic(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamMusic(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamMusic=_BlitzSteamClient_GetSteamMusic@16") -DLL_EXPORT ISteamMusicRemote* BlitzSteamClient_GetSteamMusicRemote(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamMusicRemote* DLL_CALL BlitzSteamClient_GetSteamMusicRemote(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamMusicRemote(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamMusicRemote=_BlitzSteamClient_GetSteamMusicRemote@16") -DLL_EXPORT ISteamNetworking* BlitzSteamClient_GetSteamNetworking(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamNetworking* DLL_CALL BlitzSteamClient_GetSteamNetworking(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamNetworking(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamNetworking=_BlitzSteamClient_GetSteamNetworking@16") -DLL_EXPORT ISteamRemoteStorage* BlitzSteamClient_GetSteamRemoteStorage(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamRemoteStorage* DLL_CALL BlitzSteamClient_GetSteamRemoteStorage(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamRemoteStorage(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamRemoteStorage=_BlitzSteamClient_GetSteamRemoteStorage@16") -DLL_EXPORT ISteamScreenshots* BlitzSteamClient_GetSteamScreenshots(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamScreenshots* DLL_CALL BlitzSteamClient_GetSteamScreenshots(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamScreenshots(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamScreenshots=_BlitzSteamClient_GetSteamScreenshots@16") -DLL_EXPORT ISteamUGC* BlitzSteamClient_GetSteamUGC(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamUGC* DLL_CALL BlitzSteamClient_GetSteamUGC(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamUGC(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamUGC=_BlitzSteamClient_GetSteamUGC@16") -DLL_EXPORT ISteamUnifiedMessages* BlitzSteamClient_GetSteamUnifiedMessages(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamUnifiedMessages* DLL_CALL BlitzSteamClient_GetSteamUnifiedMessages(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamUnifiedMessages(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamUnifiedMessages=_BlitzSteamClient_GetSteamUnifiedMessages@16") -DLL_EXPORT ISteamUser* BlitzSteamClient_GetSteamUser(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamUser* DLL_CALL BlitzSteamClient_GetSteamUser(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamUser(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamUser=_BlitzSteamClient_GetSteamUser@16") -DLL_EXPORT ISteamUserStats* BlitzSteamClient_GetSteamUserStats(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamUserStats* DLL_CALL BlitzSteamClient_GetSteamUserStats(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamUserStats(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamUserStats=_BlitzSteamClient_GetSteamUserStats@16") -DLL_EXPORT ISteamUtils* BlitzSteamClient_GetSteamUtils(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamUtils* DLL_CALL BlitzSteamClient_GetSteamUtils(ISteamClient* lpSteamClient, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamUtils(hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamUtils=_BlitzSteamClient_GetSteamUtils@12") -DLL_EXPORT ISteamVideo* BlitzSteamClient_GetSteamVideo(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { +DLL_EXPORT ISteamVideo* DLL_CALL BlitzSteamClient_GetSteamVideo(ISteamClient* lpSteamClient, HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion) { return lpSteamClient->GetISteamVideo(hSteamUser, hSteamPipe, pchVersion); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_GetSteamVideo=_BlitzSteamClient_GetSteamVideo@16") // Callbacks & Hooks -DLL_EXPORT void BlitzSteamClient_SetWarningMessageHook(ISteamClient* lpSteamClient, SteamAPIWarningMessageHook_t fpfunction) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_SetWarningMessageHook(ISteamClient* lpSteamClient, SteamAPIWarningMessageHook_t fpfunction) { lpSteamClient->SetWarningMessageHook(fpfunction); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_SetWarningMessageHook=_BlitzSteamClient_SetWarningMessageHook@8") -DLL_EXPORT void BlitzSteamClient_Set_SteamAPI_CPostAPIResultInProcess(ISteamClient* lpSteamClient, SteamAPI_PostAPIResultInProcess_t fpFunction) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_Set_SteamAPI_CPostAPIResultInProcess(ISteamClient* lpSteamClient, SteamAPI_PostAPIResultInProcess_t fpFunction) { lpSteamClient->Set_SteamAPI_CPostAPIResultInProcess(fpFunction); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_Set_SteamAPI_CPostAPIResultInProcess=_BlitzSteamClient_Set_SteamAPI_CPostAPIResultInProcess@8") -DLL_EXPORT void BlitzSteamClient_Remove_SteamAPI_CPostAPIResultInProcess(ISteamClient* lpSteamClient, SteamAPI_PostAPIResultInProcess_t fpFunction) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_Remove_SteamAPI_CPostAPIResultInProcess(ISteamClient* lpSteamClient, SteamAPI_PostAPIResultInProcess_t fpFunction) { lpSteamClient->Remove_SteamAPI_CPostAPIResultInProcess(fpFunction); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_Remove_SteamAPI_CPostAPIResultInProcess=_BlitzSteamClient_Remove_SteamAPI_CPostAPIResultInProcess@8") -DLL_EXPORT void BlitzSteamClient_Set_SteamAPI_CCheckCallbackRegisteredInProcess(ISteamClient* lpSteamClient, SteamAPI_CheckCallbackRegistered_t fpFunction) { +DLL_EXPORT void DLL_CALL BlitzSteamClient_Set_SteamAPI_CCheckCallbackRegisteredInProcess(ISteamClient* lpSteamClient, SteamAPI_CheckCallbackRegistered_t fpFunction) { lpSteamClient->Set_SteamAPI_CCheckCallbackRegisteredInProcess(fpFunction); } #pragma comment(linker, "/EXPORT:BlitzSteamClient_Set_SteamAPI_CCheckCallbackRegisteredInProcess=_BlitzSteamClient_Set_SteamAPI_CCheckCallbackRegisteredInProcess@8") diff --git a/Wrapper/SteamController.cpp b/Wrapper/SteamController.cpp index bd1c138..66f44c7 100644 --- a/Wrapper/SteamController.cpp +++ b/Wrapper/SteamController.cpp @@ -16,32 +16,32 @@ #include "dllmain.h" -DLL_EXPORT uint32_t BlitzSteamController_Init(ISteamController* lpSteamController, const char* pchAbsolutePathToControllerConfigVDF) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamController_Init(ISteamController* lpSteamController, const char* pchAbsolutePathToControllerConfigVDF) { return lpSteamController->Init(pchAbsolutePathToControllerConfigVDF); } #pragma comment(linker, "/EXPORT:BlitzSteamController_Init=_BlitzSteamController_Init@8") -DLL_EXPORT uint32_t BlitzSteamController_Shutdown(ISteamController* lpSteamController) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamController_Shutdown(ISteamController* lpSteamController) { return lpSteamController->Shutdown(); } #pragma comment(linker, "/EXPORT:BlitzSteamController_Shutdown=_BlitzSteamController_Shutdown@4") -DLL_EXPORT void BlitzSteamController_RunFrame(ISteamController* lpSteamController) { +DLL_EXPORT void DLL_CALL BlitzSteamController_RunFrame(ISteamController* lpSteamController) { lpSteamController->RunFrame(); } #pragma comment(linker, "/EXPORT:BlitzSteamController_RunFrame=_BlitzSteamController_RunFrame@4") -DLL_EXPORT uint32_t BlitzSteamController_GetControllerState(ISteamController* lpSteamController, uint32_t unControllerIndex, SteamControllerState_t *pState) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamController_GetControllerState(ISteamController* lpSteamController, uint32_t unControllerIndex, SteamControllerState_t *pState) { return lpSteamController->GetControllerState(unControllerIndex, pState); } #pragma comment(linker, "/EXPORT:BlitzSteamController_GetControllerState=_BlitzSteamController_GetControllerState@12") -DLL_EXPORT void BlitzSteamController_TriggerHapticPulse(ISteamController* lpSteamController, uint32_t unControllerIndex, ESteamControllerPad eTargetPad, uint32_t usDurationMicroSec) { +DLL_EXPORT void DLL_CALL BlitzSteamController_TriggerHapticPulse(ISteamController* lpSteamController, uint32_t unControllerIndex, ESteamControllerPad eTargetPad, uint32_t usDurationMicroSec) { lpSteamController->TriggerHapticPulse(unControllerIndex, eTargetPad, usDurationMicroSec); } #pragma comment(linker, "/EXPORT:BlitzSteamController_TriggerHapticPulse=_BlitzSteamController_TriggerHapticPulse@16") -DLL_EXPORT void BlitzSteamController_SetOverrideMode(ISteamController* lpSteamController, const char *pchMode) { +DLL_EXPORT void DLL_CALL BlitzSteamController_SetOverrideMode(ISteamController* lpSteamController, const char *pchMode) { lpSteamController->SetOverrideMode(pchMode); } #pragma comment(linker, "/EXPORT:BlitzSteamController_SetOverrideMode=_BlitzSteamController_SetOverrideMode@8") \ No newline at end of file diff --git a/Wrapper/SteamFriends.cpp b/Wrapper/SteamFriends.cpp index f0ad105..57685ff 100644 --- a/Wrapper/SteamFriends.cpp +++ b/Wrapper/SteamFriends.cpp @@ -16,63 +16,63 @@ #include "dllmain.h" -DLL_EXPORT const char* BlitzSteamFriends_GetPersonaName(ISteamFriends* lpSteamFriends) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetPersonaName(ISteamFriends* lpSteamFriends) { return lpSteamFriends->GetPersonaName(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetPersonaName=_BlitzSteamFriends_GetPersonaName@4") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_SetPersonaName(ISteamFriends* lpSteamFriends, const char* pchPersonaName) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_SetPersonaName(ISteamFriends* lpSteamFriends, const char* pchPersonaName) { return lpSteamFriends->SetPersonaName(pchPersonaName); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SetPersonaName=_BlitzSteamFriends_SetPersonaName@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetPersonaState(ISteamFriends* lpSteamFriends) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetPersonaState(ISteamFriends* lpSteamFriends) { return lpSteamFriends->GetPersonaState(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetPersonaState=_BlitzSteamFriends_GetPersonaState@4") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendCount(ISteamFriends* lpSteamFriends, int32_t iFriendFlags) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendCount(ISteamFriends* lpSteamFriends, int32_t iFriendFlags) { return lpSteamFriends->GetFriendCount(iFriendFlags); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendCount=_BlitzSteamFriends_GetFriendCount@8") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetFriendByIndex(ISteamFriends* lpSteamFriends, int32_t iFriend, int32_t iFriendFlags) { +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetFriendByIndex(ISteamFriends* lpSteamFriends, int32_t iFriend, int32_t iFriendFlags) { CSteamID* pSteamID = new CSteamID(lpSteamFriends->GetFriendByIndex(iFriend, iFriendFlags)); return pSteamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendByIndex=_BlitzSteamFriends_GetFriendByIndex@12") -DLL_EXPORT EFriendRelationship BlitzSteamFriends_GetFriendRelationship(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT EFriendRelationship DLL_CALL BlitzSteamFriends_GetFriendRelationship(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendRelationship(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendRelationship=_BlitzSteamFriends_GetFriendRelationship@8") -DLL_EXPORT EPersonaState BlitzSteamFriends_GetFriendPersonaState(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT EPersonaState DLL_CALL BlitzSteamFriends_GetFriendPersonaState(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendPersonaState(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendPersonaState=_BlitzSteamFriends_GetFriendPersonaState@8") -DLL_EXPORT const char* BlitzSteamFriends_GetFriendPersonaName(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetFriendPersonaName(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendPersonaName(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendPersonaName=_BlitzSteamFriends_GetFriendPersonaName@8") -DLL_EXPORT uint32_t BlitzSteamFriends_GetFriendGamePlayed(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, FriendGameInfo_t *pFriendGameInfo) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_GetFriendGamePlayed(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, FriendGameInfo_t *pFriendGameInfo) { return lpSteamFriends->GetFriendGamePlayed(*steamIDFriend, pFriendGameInfo); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendGamePlayed=_BlitzSteamFriends_GetFriendGamePlayed@12") -DLL_EXPORT const char* BlitzSteamFriends_GetFriendPersonaNameHistory(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iPersonaName) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetFriendPersonaNameHistory(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iPersonaName) { return lpSteamFriends->GetFriendPersonaNameHistory(*steamIDFriend, iPersonaName); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendPersonaNameHistory=_BlitzSteamFriends_GetFriendPersonaNameHistory@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendSteamLevel(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendSteamLevel(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendSteamLevel(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendSteamLevel=_BlitzSteamFriends_GetFriendSteamLevel@8") -DLL_EXPORT const char* BlitzSteamFriends_GetPlayerNickname(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriends) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetPlayerNickname(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriends) { const char* nickname = lpSteamFriends->GetPlayerNickname(*steamIDFriends); if (nickname == NULL) { nickname = ""; @@ -81,292 +81,298 @@ DLL_EXPORT const char* BlitzSteamFriends_GetPlayerNickname(ISteamFriends* lpStea } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetPlayerNickname=_BlitzSteamFriends_GetPlayerNickname@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendsGroupCount(ISteamFriends* lpSteamFriends) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendsGroupCount(ISteamFriends* lpSteamFriends) { return lpSteamFriends->GetFriendsGroupCount(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendsGroupCount=_BlitzSteamFriends_GetFriendsGroupCount@4") -DLL_EXPORT FriendsGroupID_t BlitzSteamFriends_GetFriendsGroupIDByIndex(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { +DLL_EXPORT FriendsGroupID_t DLL_CALL BlitzSteamFriends_GetFriendsGroupIDByIndex(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { return lpSteamFriends->GetFriendsGroupIDByIndex(friendsGroupID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendsGroupIDByIndex=_BlitzSteamFriends_GetFriendsGroupIDByIndex@8") -DLL_EXPORT const char* BlitzSteamFriends_GetFriendsGroupName(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetFriendsGroupName(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { return lpSteamFriends->GetFriendsGroupName(friendsGroupID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendsGroupName=_BlitzSteamFriends_GetFriendsGroupName@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendsGroupMembersCount(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendsGroupMembersCount(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID) { return lpSteamFriends->GetFriendsGroupMembersCount(friendsGroupID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendsGroupMembersCount=_BlitzSteamFriends_GetFriendsGroupMembersCount@8") -DLL_EXPORT void BlitzSteamFriends_GetFriendsGroupMembersList(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID, CSteamID* pOutSteamIDMembers, int32_t nMembersCount) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_GetFriendsGroupMembersList(ISteamFriends* lpSteamFriends, FriendsGroupID_t friendsGroupID, CSteamID* pOutSteamIDMembers, int32_t nMembersCount) { lpSteamFriends->GetFriendsGroupMembersList(friendsGroupID, pOutSteamIDMembers, nMembersCount); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendsGroupMembersList=_BlitzSteamFriends_GetFriendsGroupMembersList@16") -DLL_EXPORT uint32_t BlitzSteamFriends_HasFriend(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iFriendsFlags) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_HasFriend(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iFriendsFlags) { return lpSteamFriends->HasFriend(*steamIDFriend, iFriendsFlags); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_HasFriends=_BlitzSteamFriends_HasFriend@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetClanCount(ISteamFriends* lpSteamFriends) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetClanCount(ISteamFriends* lpSteamFriends) { return lpSteamFriends->GetClanCount(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanCount=_BlitzSteamFriends_GetClanCount@4") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetClanByIndex(ISteamFriends* lpSteamFriends, int32_t iClan) { - return new CSteamID(lpSteamFriends->GetClanByIndex(iClan)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetClanByIndex(ISteamFriends* lpSteamFriends, int32_t iClan) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetClanByIndex(iClan)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanByIndex=_BlitzSteamFriends_GetClanByIndex@8") -DLL_EXPORT const char* BlitzSteamFriends_GetClanName(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetClanName(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->GetClanName(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanName=_BlitzSteamFriends_GetClanName@8") -DLL_EXPORT const char* BlitzSteamFriends_GetClanTag(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetClanTag(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->GetClanTag(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanTag=_BlitzSteamFriends_GetClanTag@8") -DLL_EXPORT uint32_t BlitzSteamFriends_GetClanActivityCounts(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t* pnOnline, int32_t* pnInGame, int32_t* pnChatting) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_GetClanActivityCounts(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t* pnOnline, int32_t* pnInGame, int32_t* pnChatting) { return lpSteamFriends->GetClanActivityCounts(*steamIDClan, pnOnline, pnInGame, pnChatting); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanActivityCounts=_BlitzSteamFriends_GetClanActivityCounts@20") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_DownloadClanActivityCounts(ISteamFriends* lpSteamFriends, CSteamID* psteamIDClans, int32_t cClansToRequest) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_DownloadClanActivityCounts(ISteamFriends* lpSteamFriends, CSteamID* psteamIDClans, int32_t cClansToRequest) { return lpSteamFriends->DownloadClanActivityCounts(psteamIDClans, cClansToRequest); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_DownloadClanActivityCounts=_BlitzSteamFriends_DownloadClanActivityCounts@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendCountFromSource(ISteamFriends* lpSteamFriends, CSteamID* steamIDSource) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendCountFromSource(ISteamFriends* lpSteamFriends, CSteamID* steamIDSource) { return lpSteamFriends->GetFriendCountFromSource(*steamIDSource); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendCountFromSource=_BlitzSteamFriends_GetFriendCountFromSource@8") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetFriendFromSourceByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDSource, int32_t iFriend) { - return new CSteamID(lpSteamFriends->GetFriendFromSourceByIndex(*steamIDSource, iFriend)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetFriendFromSourceByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDSource, int32_t iFriend) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetFriendFromSourceByIndex(*steamIDSource, iFriend)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendFromSourceByIndex=_BlitzSteamFriends_GetFriendFromSourceByIndex@12") -DLL_EXPORT uint32_t BlitzSteamFriends_IsUserInSource(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, CSteamID* steamIDSource) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_IsUserInSource(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, CSteamID* steamIDSource) { return lpSteamFriends->IsUserInSource(*steamIDUser, *steamIDSource); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_IsUserInSource=_BlitzSteamFriends_IsUserInSource@12") -DLL_EXPORT void BlitzSteamFriends_SetInGameVoiceSpeaking(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, bool bSpeaking) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_SetInGameVoiceSpeaking(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, bool bSpeaking) { lpSteamFriends->SetInGameVoiceSpeaking(*steamIDUser, bSpeaking); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SetInGameVoiceSpeaking=_BlitzSteamFriends_SetInGameVoiceSpeaking@12") -DLL_EXPORT void BlitzSteamFriends_ActivateGameOverlay(ISteamFriends* lpSteamFriends, const char* pchDialog) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ActivateGameOverlay(ISteamFriends* lpSteamFriends, const char* pchDialog) { lpSteamFriends->ActivateGameOverlay(pchDialog); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ActivateGameOverlay=_BlitzSteamFriends_ActivateGameOverlay@8") -DLL_EXPORT void BlitzSteamFriends_ActivateGameOverlayToUser(ISteamFriends* lpSteamFriends, const char* pchDialog, CSteamID* steamID) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ActivateGameOverlayToUser(ISteamFriends* lpSteamFriends, const char* pchDialog, CSteamID* steamID) { lpSteamFriends->ActivateGameOverlayToUser(pchDialog, *steamID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ActivateGameOverlayToUser=_BlitzSteamFriends_ActivateGameOverlayToUser@12") -DLL_EXPORT void BlitzSteamFriends_ActivateGameOverlayToWebPage(ISteamFriends* lpSteamFriends, const char* pchURL) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ActivateGameOverlayToWebPage(ISteamFriends* lpSteamFriends, const char* pchURL) { lpSteamFriends->ActivateGameOverlayToWebPage(pchURL); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ActivateGameOverlayToWebPage=_BlitzSteamFriends_ActivateGameOverlayToWebPage@8") -DLL_EXPORT void BlitzSteamFriends_ActivateGameOverlayToStore(ISteamFriends* lpSteamFriends, AppId_t nAppID, EOverlayToStoreFlag eFlag) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ActivateGameOverlayToStore(ISteamFriends* lpSteamFriends, AppId_t nAppID, EOverlayToStoreFlag eFlag) { lpSteamFriends->ActivateGameOverlayToStore(nAppID, eFlag); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ActivateGameOverlayToStore=_BlitzSteamFriends_ActivateGameOverlayToStore@12") -DLL_EXPORT void BlitzSteamFriends_SetPlayedWith(ISteamFriends* lpSteamFriends, CSteamID* steamIDUserPlayedWith) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_SetPlayedWith(ISteamFriends* lpSteamFriends, CSteamID* steamIDUserPlayedWith) { lpSteamFriends->SetPlayedWith(*steamIDUserPlayedWith); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SetPlayedWith=_BlitzSteamFriends_SetPlayedWith@8") -DLL_EXPORT void BlitzSteamFriends_ActivateGameOverlayInviteDialog(ISteamFriends* lpSteamFriends, CSteamID* steamIDLobby) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ActivateGameOverlayInviteDialog(ISteamFriends* lpSteamFriends, CSteamID* steamIDLobby) { lpSteamFriends->ActivateGameOverlayInviteDialog(*steamIDLobby); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ActivateGameOverlayInviteDialog=_BlitzSteamFriends_ActivateGameOverlayInviteDialog@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetSmallFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetSmallFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetSmallFriendAvatar(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetSmallFriendAvatar=_BlitzSteamFriends_GetSmallFriendAvatar@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetMediumFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetMediumFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetMediumFriendAvatar(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetMediumFriendAvatar=_BlitzSteamFriends_GetMediumFriendAvatar@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetLargeFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetLargeFriendAvatar(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetLargeFriendAvatar(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetLargeFriendAvatar=_BlitzSteamFriends_GetLargeFriendAvatar@8") -DLL_EXPORT uint32_t BlitzSteamFriends_RequestUserInformation(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, bool bRequireNameOnly) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_RequestUserInformation(ISteamFriends* lpSteamFriends, CSteamID* steamIDUser, bool bRequireNameOnly) { return lpSteamFriends->RequestUserInformation(*steamIDUser, bRequireNameOnly); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_RequestUserInformation=_BlitzSteamFriends_RequestUserInformation@12") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_RequestClanOfficerList(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_RequestClanOfficerList(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->RequestClanOfficerList(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_RequestClanOfficerList=_BlitzSteamFriends_RequestClanOfficerList@8") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetClanOwner(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { - return new CSteamID(lpSteamFriends->GetClanOwner(*steamIDClan)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetClanOwner(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetClanOwner(*steamIDClan)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanOwner=_BlitzSteamFriends_GetClanOwner@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetClanOfficerCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetClanOfficerCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->GetClanOfficerCount(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanOfficerCount=_BlitzSteamFriends_GetClanOfficerCount@8") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetClanOfficerByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t iOfficer) { - return new CSteamID(lpSteamFriends->GetClanOfficerByIndex(*steamIDClan, iOfficer)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetClanOfficerByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t iOfficer) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetClanOfficerByIndex(*steamIDClan, iOfficer)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanOfficerByIndex=_BlitzSteamFriends_GetClanOfficerByIndex@12") -DLL_EXPORT EUserRestriction BlitzSteamFriends_GetUserRestrictions(ISteamFriends* lpSteamFriends) { +DLL_EXPORT EUserRestriction DLL_CALL BlitzSteamFriends_GetUserRestrictions(ISteamFriends* lpSteamFriends) { return (EUserRestriction)lpSteamFriends->GetUserRestrictions(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetUserRestrictions=_BlitzSteamFriends_GetUserRestrictions@4") -DLL_EXPORT uint32_t BlitzSteamFriends_SetRichPresence(ISteamFriends* lpSteamFriends, const char* pchKey, const char* pchValue) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_SetRichPresence(ISteamFriends* lpSteamFriends, const char* pchKey, const char* pchValue) { return lpSteamFriends->SetRichPresence(pchKey, pchValue); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SetRichPresence=_BlitzSteamFriends_SetRichPresence@12") -DLL_EXPORT void BlitzSteamFriends_ClearRichPresence(ISteamFriends* lpSteamFriends) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_ClearRichPresence(ISteamFriends* lpSteamFriends) { lpSteamFriends->ClearRichPresence(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ClearRichPresence=_BlitzSteamFriends_ClearRichPresence@4") -DLL_EXPORT const char* BlitzSteamFriends_GetFriendRichPresence(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char* pchKey) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetFriendRichPresence(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char* pchKey) { return lpSteamFriends->GetFriendRichPresence(*steamIDFriend, pchKey); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendRichPresence=_BlitzSteamFriends_GetFriendRichPresence@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendRichPresenceKeyCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendRichPresenceKeyCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendRichPresenceKeyCount(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendRichPresenceKeyCount=_BlitzSteamFriends_GetFriendRichPresenceKeyCount@8") -DLL_EXPORT const char* BlitzSteamFriends_GetFriendRichPresenceKeyByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iKey) { +DLL_EXPORT const char* DLL_CALL BlitzSteamFriends_GetFriendRichPresenceKeyByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iKey) { return lpSteamFriends->GetFriendRichPresenceKeyByIndex(*steamIDFriend, iKey); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendRichPresenceKeyByIndex=_BlitzSteamFriends_GetFriendRichPresenceKeyByIndex@12") -DLL_EXPORT void BlitzSteamFriends_RequestFriendRichPresence(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT void DLL_CALL BlitzSteamFriends_RequestFriendRichPresence(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { lpSteamFriends->RequestFriendRichPresence(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_RequestFriendRichPresence=_BlitzSteamFriends_RequestFriendRichPresence@8") -DLL_EXPORT uint32_t BlitzSteamFriends_InviteUserToGame(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char *pchConnectString) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_InviteUserToGame(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char *pchConnectString) { return lpSteamFriends->InviteUserToGame(*steamIDFriend, pchConnectString); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_InviteUserToGame=_BlitzSteamFriends_InviteUserToGame@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetCoplayFriendCount(ISteamFriends* lpSteamFriends) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetCoplayFriendCount(ISteamFriends* lpSteamFriends) { return lpSteamFriends->GetCoplayFriendCount(); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetCoplayFriendCount=_BlitzSteamFriends_GetCoplayFriendCount@4") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetCoplayFriend(ISteamFriends* lpSteamFriends, int32_t iCoplayFriend) { - return new CSteamID(lpSteamFriends->GetCoplayFriend(iCoplayFriend)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetCoplayFriend(ISteamFriends* lpSteamFriends, int32_t iCoplayFriend) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetCoplayFriend(iCoplayFriend)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetCoplayFriend=_BlitzSteamFriends_GetCoplayFriend@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendCoplayTime(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendCoplayTime(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendCoplayTime(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendCoplayTime=_BlitzSteamFriends_GetFriendCoplayTime@8") -DLL_EXPORT AppId_t BlitzSteamFriends_GetFriendCoplayGame(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { +DLL_EXPORT AppId_t DLL_CALL BlitzSteamFriends_GetFriendCoplayGame(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend) { return lpSteamFriends->GetFriendCoplayGame(*steamIDFriend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendCoplayGame=_BlitzSteamFriends_GetFriendCoplayGame@8") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_JoinClanChatRoom(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_JoinClanChatRoom(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->JoinClanChatRoom(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_JoinClanChatRoom=_BlitzSteamFriends_JoinClanChatRoom@8") -DLL_EXPORT uint32_t BlitzSteamFriends_LeaveClanChatRoom(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_LeaveClanChatRoom(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->LeaveClanChatRoom(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_LeaveClanChatRoom=_BlitzSteamFriends_LeaveClanChatRoom@8") -DLL_EXPORT int32_t BlitzSteamFriends_GetClanChatMemberCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetClanChatMemberCount(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan) { return lpSteamFriends->GetClanChatMemberCount(*steamIDClan); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanChatMemberCount=_BlitzSteamFriends_GetClanChatMemberCount@8") -DLL_EXPORT CSteamID* BlitzSteamFriends_GetChatMemberByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t iUser) { - return new CSteamID(lpSteamFriends->GetChatMemberByIndex(*steamIDClan, iUser)); +DLL_EXPORT CSteamID* DLL_CALL BlitzSteamFriends_GetChatMemberByIndex(ISteamFriends* lpSteamFriends, CSteamID* steamIDClan, int32_t iUser) { + CSteamID* steamID = new CSteamID(lpSteamFriends->GetChatMemberByIndex(*steamIDClan, iUser)); + return steamID; } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetChatMemberByIndex=_BlitzSteamFriends_GetChatMemberByIndex@12") -DLL_EXPORT uint32_t BlitzSteamFriends_SendClanChatMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, const char *pchText) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_SendClanChatMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, const char *pchText) { return lpSteamFriends->SendClanChatMessage(*steamIDClanChat, pchText); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SendClanChatMessage=_BlitzSteamFriends_SendClanChatMessage@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetClanChatMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, int32_t iMessage, void* prgchText, int32_t cchTextMax, EChatEntryType* peChatEntryType, CSteamID* psteamidChatter) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetClanChatMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, int32_t iMessage, void* prgchText, int32_t cchTextMax, EChatEntryType* peChatEntryType, CSteamID* psteamidChatter) { return lpSteamFriends->GetClanChatMessage(*steamIDClanChat, iMessage, prgchText, cchTextMax, peChatEntryType, psteamidChatter); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetClanChatMessage=_BlitzSteamFriends_GetClanChatMessage@28") -DLL_EXPORT uint32_t BlitzSteamFriends_IsClanChatAdmin(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, CSteamID* steamIDUser) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_IsClanChatAdmin(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat, CSteamID* steamIDUser) { return lpSteamFriends->IsClanChatAdmin(*steamIDClanChat, *steamIDUser); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_IsClanChatAdmin=_BlitzSteamFriends_IsClanChatAdmin@12") -DLL_EXPORT uint32_t BlitzSteamFriends_IsClanChatWindowOpenInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_IsClanChatWindowOpenInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { return lpSteamFriends->IsClanChatWindowOpenInSteam(*steamIDClanChat); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_IsClanChatWindowOpenInSteam=_BlitzSteamFriends_IsClanChatWindowOpenInSteam@8") -DLL_EXPORT uint32_t BlitzSteamFriends_OpenClanChatWindowInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_OpenClanChatWindowInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { return lpSteamFriends->OpenClanChatWindowInSteam(*steamIDClanChat); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_OpenClanChatWindowInSteam=_BlitzSteamFriends_OpenClanChatWindowInSteam@8") -DLL_EXPORT uint32_t BlitzSteamFriends_CloseClanChatWindowInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_CloseClanChatWindowInSteam(ISteamFriends* lpSteamFriends, CSteamID* steamIDClanChat) { return lpSteamFriends->CloseClanChatWindowInSteam(*steamIDClanChat); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_CloseClanChatWindowInSteam=_BlitzSteamFriends_CloseClanChatWindowInSteam@8") -DLL_EXPORT uint32_t BlitzSteamFriends_SetListenForFriendsMessages(ISteamFriends* lpSteamFriends, bool bInterceptEnabled) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_SetListenForFriendsMessages(ISteamFriends* lpSteamFriends, bool bInterceptEnabled) { return lpSteamFriends->SetListenForFriendsMessages(bInterceptEnabled); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_SetListenForFriendsMessages=_BlitzSteamFriends_SetListenForFriendsMessages@8") -DLL_EXPORT uint32_t BlitzSteamFriends_ReplyToFriendMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char* pchMsgToSend) { +DLL_EXPORT uint32_t DLL_CALL BlitzSteamFriends_ReplyToFriendMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, const char* pchMsgToSend) { return lpSteamFriends->ReplyToFriendMessage(*steamIDFriend, pchMsgToSend); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_ReplyToFriendMessage=_BlitzSteamFriends_ReplyToFriendMessage@12") -DLL_EXPORT int32_t BlitzSteamFriends_GetFriendMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iMessageID, void* pvData, int32_t cubData, EChatEntryType* peChatEntryType) { +DLL_EXPORT int32_t DLL_CALL BlitzSteamFriends_GetFriendMessage(ISteamFriends* lpSteamFriends, CSteamID* steamIDFriend, int32_t iMessageID, void* pvData, int32_t cubData, EChatEntryType* peChatEntryType) { return lpSteamFriends->GetFriendMessage(*steamIDFriend, iMessageID, pvData, cubData, peChatEntryType); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFriendMessage=_BlitzSteamFriends_GetFriendMessage@24") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_GetFollowerCount(ISteamFriends* lpSteamFriends, CSteamID* steamID) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_GetFollowerCount(ISteamFriends* lpSteamFriends, CSteamID* steamID) { return lpSteamFriends->GetFollowerCount(*steamID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_GetFollowerCount=_BlitzSteamFriends_GetFollowerCount@8") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_IsFollowing(ISteamFriends* lpSteamFriends, CSteamID* steamID) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_IsFollowing(ISteamFriends* lpSteamFriends, CSteamID* steamID) { return lpSteamFriends->IsFollowing(*steamID); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_IsFollowing=_BlitzSteamFriends_IsFollowing@8") -DLL_EXPORT SteamAPICall_t BlitzSteamFriends_EnumerateFollowingList(ISteamFriends* lpSteamFriends, uint32 unStartIndex) { +DLL_EXPORT SteamAPICall_t DLL_CALL BlitzSteamFriends_EnumerateFollowingList(ISteamFriends* lpSteamFriends, uint32 unStartIndex) { return lpSteamFriends->EnumerateFollowingList(unStartIndex); } #pragma comment(linker, "/EXPORT:BlitzSteamFriends_EnumerateFollowingList=_BlitzSteamFriends_EnumerateFollowingList@8") diff --git a/Wrapper/SteamGameServer.cpp b/Wrapper/SteamGameServer.cpp index e69de29..bc08118 100644 --- a/Wrapper/SteamGameServer.cpp +++ b/Wrapper/SteamGameServer.cpp @@ -0,0 +1,68 @@ +// BlitzSteam - Steam wrapper for Blitz. +// Copyright (C) 2015 Project Kube (Michael Fabian Dirks) +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with this program. If not, see . + +#include "dllmain.h" +#include "steam\steam_gameserver.h" + +DLL_EXPORT uint32_t DLL_CALL BlitzSteamGameServer_Init(uint32_t unIP, uint16_t usSteamPort, uint16_t usGamePort, uint16_t usQueryPort, EServerMode eServerMode, const char *pchVersionString) { + return SteamGameServer_Init(unIP, usSteamPort, usGamePort, usQueryPort, eServerMode, pchVersionString); +} + +DLL_EXPORT void DLL_CALL BlitzSteamGameServer_Shutdown() { + SteamGameServer_Shutdown(); +} + +DLL_EXPORT void DLL_CALL BlitzSteamGameServer_RunCallbacks() { + SteamGameServer_RunCallbacks(); +} + +DLL_EXPORT uint32_t DLL_CALL BlitzSteamGameServer_Secure() { + return SteamGameServer_BSecure(); +} + +DLL_EXPORT uint64_t* DLL_CALL BlitzSteamGameServer_GetSteamID() { + uint64_t* val = new uint64_t(SteamGameServer_GetSteamID()); + return val; +} + +DLL_EXPORT HSteamPipe DLL_CALL BlitzSteamGameServer_GetHSteamPipe() { + return SteamGameServer_GetHSteamPipe(); +} + +// Interfaces +DLL_EXPORT ISteamGameServer* DLL_CALL BlitzSteamGameServer() { + return SteamGameServer(); +} + +DLL_EXPORT ISteamUtils* DLL_CALL BlitzSteamGameServerUtils() { + return SteamGameServerUtils(); +} + +DLL_EXPORT ISteamNetworking* DLL_CALL BlitzSteamGameServerNetworking() { + return SteamGameServerNetworking(); +} + +DLL_EXPORT ISteamGameServerStats* DLL_CALL BlitzSteamGameServerStats() { + return SteamGameServerStats(); +} + +DLL_EXPORT ISteamHTTP* DLL_CALL BlitzSteamGameServerHTTP() { + return SteamGameServerHTTP(); +} + +DLL_EXPORT ISteamInventory* DLL_CALL BlitzSteamGameServerInventory() { + return SteamGameServerInventory(); +} \ No newline at end of file diff --git a/Wrapper/SteamUser.cpp b/Wrapper/SteamUser.cpp index 0b5267f..584286c 100644 --- a/Wrapper/SteamUser.cpp +++ b/Wrapper/SteamUser.cpp @@ -16,8 +16,8 @@ #include "dllmain.h" -DLL_EXPORT void* BlitzSteam_ISteamUser_GetSteamID(void* lpSteamUser) { +DLL_EXPORT void* DLL_CALL BlitzSteam_ISteamUser_GetSteamID(void* lpSteamUser) { return (void*)&(((ISteamUser*)lpSteamUser)->GetSteamID()); } -//DLL_EXPORT void* BlitzSteam_ISteamUser_ \ No newline at end of file +//DLL_EXPORT void* DLL_CALL BlitzSteam_ISteamUser_ \ No newline at end of file diff --git a/dllmain.h b/dllmain.h index 80dcb8e..0e661f2 100644 --- a/dllmain.h +++ b/dllmain.h @@ -26,6 +26,7 @@ // Macros #define DLL_EXPORT extern "C" //__declspec(dllexport) +#define DLL_CALL __stdcall // Steam #include "steam/steam_api.h"