diff --git a/Readme.txt b/Readme.txt index 990ce31..030b764 100644 --- a/Readme.txt +++ b/Readme.txt @@ -8,6 +8,35 @@ Copyright Welcome to the Steamworks SDK. For documentation please see our partner website at: http://partner.steamgames.com +---------------------------------------------------------------- +v1.38 14th October 2016 +---------------------------------------------------------------- + +ISteamUGC +* Added ability to track the playtime of Workshop items. Call StartPlaytimeTracking() and StopPlaytimeTracking() when appropriate. On application shutdown all playtime tracking will stop, but StopPlaytimeTrackingForAllItems() can also be used. +* Added ability to query Workshop items by total playtime in a given period, total lifetime playtime, average playtime in a given period, lifetime average playtime, number of play sessions in a given period, and number of lifetime play sessions. +* Added ability to retrieve item statistics for number of seconds played, number of play sessions, and number of comments. +* Added SetReturnOnlyIDs() for queries. This is useful for retrieving the list of items a user has subscribed to or favorited without having to get all the details for those items. +* Modified GetQueryUGCStatistic() to take in a uint64 instead of a uint32 to support larger values + +ISteamUser +* Added BIsPhoneIdentifying() +* Added BIsPhoneRequiringVerification() + +ISteamScreenshots +* Added IsScreenshotsHooked() if the application has hooked the screenshot +* Added ability to add a VR screenshot that was saved to disk to the user's library + +ISteamRemoteStorage +* Modified GetQuota() to take in uint64 from int32, since Steam Cloud can now support quotas above 2GB +* Removed RemoteStorageConflictResolution_t callback + +ISteamApps +* Added GetFileDetails() which will return FileDetailsResult_t through a call result. The FileDetailsResult_t struct contains information on the original file's size, SHA1, etc. + +ISteamFriends +* Deprecated k_EFriendRelationshipSuggested relationship type that was originally used by Facebook linking feature + ---------------------------------------------------------------- v1.37 23rd May 2016 ---------------------------------------------------------------- diff --git a/SteamworksExample/RemoteStorage.cpp b/SteamworksExample/RemoteStorage.cpp index e574457..71d5724 100644 --- a/SteamworksExample/RemoteStorage.cpp +++ b/SteamworksExample/RemoteStorage.cpp @@ -204,10 +204,10 @@ void CRemoteStorageScreen::LoadMessage() //----------------------------------------------------------------------------- void CRemoteStorageScreen::GetFileStats() { - m_nBytesQuota = 0; - m_nAvailableBytes = 0; + m_ulBytesQuota = 0; + m_ulAvailableBytes = 0; m_nNumFilesInCloud = m_pSteamRemoteStorage->GetFileCount(); - m_pSteamRemoteStorage->GetQuota( &m_nBytesQuota, &m_nAvailableBytes ); + m_pSteamRemoteStorage->GetQuota( &m_ulBytesQuota, &m_ulAvailableBytes ); } @@ -234,7 +234,7 @@ void CRemoteStorageScreen::Render() DWORD dwVKDown = 0; - bool bQuotaExceeded = nGreetingNextLength > m_nBytesQuota; + bool bQuotaExceeded = nGreetingNextLength > m_ulBytesQuota; while ( m_pGameEngine->BGetFirstKeyDown( &dwVKDown ) ) { @@ -323,7 +323,7 @@ void CRemoteStorageScreen::Render() rect.right = rect.left + CLOUDDISP_COLUMN_WIDTH; pxVertOffset = rect.bottom + CLOUDDISP_TEXT_HEIGHT + CLOUDDISP_VERT_SPACING; - sprintf_safe( rgchBuffer, "Quota: %d bytes, %d bytes remaining", m_nBytesQuota, m_nAvailableBytes ); + sprintf_safe( rgchBuffer, "Quota: %llu bytes, %llu bytes remaining", m_ulBytesQuota, m_ulAvailableBytes ); m_pGameEngine->BDrawString( m_hDisplayFont, rect, D3DCOLOR_ARGB( 255, 25, 200, 25 ), TEXTPOS_CENTER|TEXTPOS_VCENTER, rgchBuffer ); rect.top = pxVertOffset; diff --git a/SteamworksExample/RemoteStorage.h b/SteamworksExample/RemoteStorage.h index 1a50128..e36fbbb 100644 --- a/SteamworksExample/RemoteStorage.h +++ b/SteamworksExample/RemoteStorage.h @@ -21,8 +21,6 @@ enum ERemoteStorageSyncMenuCommand k_EMenuCommandNone = 0, k_EMenuCommandProgress = 1, k_EMenuCommandSyncComplete = 2, - k_EMenuCommandKeepClient = 3, - k_EMenuCommandKeepServer = 4 }; //----------------------------------------------------------------------------- @@ -103,8 +101,8 @@ private: bool m_bFinished; int32 m_nNumFilesInCloud; - int32 m_nBytesQuota; - int32 m_nAvailableBytes; + uint64 m_ulBytesQuota; + uint64 m_ulAvailableBytes; }; diff --git a/SteamworksExample/SpaceWarServer.cpp b/SteamworksExample/SpaceWarServer.cpp index 01b625a..0a275e1 100644 --- a/SteamworksExample/SpaceWarServer.cpp +++ b/SteamworksExample/SpaceWarServer.cpp @@ -12,10 +12,6 @@ #include "time.h" #include -#ifdef _PS3 -// From main.cpp -extern SteamPS3Params_t g_SteamPS3Params; -#endif //----------------------------------------------------------------------------- // Purpose: Constructor -- note the syntax for setting up Steam API callback handlers @@ -41,11 +37,7 @@ CSpaceWarServer::CSpaceWarServer( IGameEngine *pGameEngine ) // !FIXME! We need a way to pass the dedicated server flag here! -#ifdef _PS3 - if ( !SteamGameServer_Init( &g_SteamPS3Params, unIP, SPACEWAR_AUTHENTICATION_PORT, SPACEWAR_SERVER_PORT, usMasterServerUpdaterPort, eMode, SPACEWAR_SERVER_VERSION ) ) -#else if ( !SteamGameServer_Init( unIP, SPACEWAR_AUTHENTICATION_PORT, SPACEWAR_SERVER_PORT, usMasterServerUpdaterPort, eMode, SPACEWAR_SERVER_VERSION ) ) -#endif { OutputDebugString( "SteamGameServer_Init call failed\n" ); } diff --git a/client/steam.exe b/client/steam.exe index c268840..3edaae2 100644 Binary files a/client/steam.exe and b/client/steam.exe differ diff --git a/public/steam/isteamapps.h b/public/steam/isteamapps.h index 0b2bf4f..9a97b4a 100644 --- a/public/steam/isteamapps.h +++ b/public/steam/isteamapps.h @@ -84,6 +84,9 @@ public: // appropriate appid values, ending with a final callback where the m_nAppId // member is k_uAppIdInvalid (zero). virtual void RequestAllProofOfPurchaseKeys() = 0; + + CALL_RESULT( FileDetailsResult_t ) + virtual SteamAPICall_t GetFileDetails( const char* pszFileName ) = 0; }; #define STEAMAPPS_INTERFACE_VERSION "STEAMAPPS_INTERFACE_VERSION008" @@ -156,5 +159,18 @@ struct AppProofOfPurchaseKeyResponse_t }; +//----------------------------------------------------------------------------- +// Purpose: response to GetFileDetails +//----------------------------------------------------------------------------- +struct FileDetailsResult_t +{ + enum { k_iCallback = k_iSteamAppsCallbacks + 23 }; + EResult m_eResult; + uint64 m_ulFileSize; // original file size in bytes + uint8 m_FileSHA[20]; // original file SHA1 hash + uint32 m_unFlags; // +}; + + #pragma pack( pop ) #endif // ISTEAMAPPS_H diff --git a/public/steam/isteamcontroller.h b/public/steam/isteamcontroller.h index 10d5ec2..68f7af6 100644 --- a/public/steam/isteamcontroller.h +++ b/public/steam/isteamcontroller.h @@ -60,7 +60,9 @@ enum EControllerSourceMode k_EControllerSourceMode_Trigger, k_EControllerSourceMode_TouchMenu, k_EControllerSourceMode_MouseJoystick, - k_EControllerSourceMode_MouseRegion + k_EControllerSourceMode_MouseRegion, + k_EControllerSourceMode_RadialMenu, + k_EControllerSourceMode_Switches }; enum EControllerActionOrigin @@ -142,6 +144,25 @@ struct ControllerDigitalActionData_t bool bActive; }; +struct ControllerMotionData_t +{ + // Sensor-fused absolute rotation; will drift in heading + float rotQuatX; + float rotQuatY; + float rotQuatZ; + float rotQuatW; + + // Positional acceleration + float posAccelX; + float posAccelY; + float posAccelZ; + + // Angular velocity + float rotVelX; + float rotVelY; + float rotVelZ; +}; + #pragma pack( pop ) @@ -206,9 +227,25 @@ public: // Trigger a haptic pulse on a controller virtual void TriggerHapticPulse( ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec ) = 0; + // Trigger a pulse with a duty cycle of usDurationMicroSec / usOffMicroSec, unRepeat times. + // nFlags is currently unused and reserved for future use. virtual void TriggerRepeatedHapticPulse( ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags ) = 0; + + // Returns the associated gamepad index for the specified controller, if emulating a gamepad + virtual int GetGamepadIndexForController( ControllerHandle_t ulControllerHandle ) = 0; + + // Returns the associated controller handle for the specified emulated gamepad + virtual ControllerHandle_t GetControllerForGamepadIndex( int nIndex ) = 0; + + // Returns raw motion data from the specified controller + virtual ControllerMotionData_t GetMotionData( ControllerHandle_t controllerHandle ) = 0; + + // Attempt to display origins of given action in the controller HUD, for the currently active action set + // Returns false is overlay is disabled / unavailable, or the user is not in Big Picture mode + virtual bool ShowDigitalActionOrigins( ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle, float flScale, float flXPosition, float flYPosition ) = 0; + virtual bool ShowAnalogActionOrigins( ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle, float flScale, float flXPosition, float flYPosition ) = 0; }; -#define STEAMCONTROLLER_INTERFACE_VERSION "SteamController003" +#define STEAMCONTROLLER_INTERFACE_VERSION "SteamController004" #endif // ISTEAMCONTROLLER_H diff --git a/public/steam/isteamfriends.h b/public/steam/isteamfriends.h index f7ac6e9..8013356 100644 --- a/public/steam/isteamfriends.h +++ b/public/steam/isteamfriends.h @@ -26,7 +26,7 @@ enum EFriendRelationship k_EFriendRelationshipRequestInitiator = 4, k_EFriendRelationshipIgnored = 5, // this is stored; the user has explicit blocked this other user from comments/chat/etc k_EFriendRelationshipIgnoredFriend = 6, - k_EFriendRelationshipSuggested = 7, + k_EFriendRelationshipSuggested_DEPRECATED = 7, // was used by the original implementation of the facebook linking feature, but now unused. // keep this updated k_EFriendRelationshipMax = 8, @@ -327,7 +327,7 @@ public: // Rich Presence data is automatically shared between friends who are in the same game // Each user has a set of Key/Value pairs - // Up to 20 different keys can be set + // Note the following limits: k_cchMaxRichPresenceKeys, k_cchMaxRichPresenceKeyLength, k_cchMaxRichPresenceValueLength // There are two magic keys: // "status" - a UTF-8 string that will show up in the 'view game info' dialog in the Steam friends list // "connect" - a UTF-8 string that contains the command-line for how a friend can connect to a game diff --git a/public/steam/isteaminventory.h b/public/steam/isteaminventory.h index 0a2e81b..5d236a5 100644 --- a/public/steam/isteaminventory.h +++ b/public/steam/isteaminventory.h @@ -306,9 +306,12 @@ public: // on the current Steam language settings (see ISteamApps::GetCurrentGameLanguage). // Property names are always composed of ASCII letters, numbers, and/or underscores. // Pass a NULL pointer for pchPropertyName to get a comma - separated list of available - // property names. + // property names. If pchValueBuffer is NULL, *punValueBufferSize will contain the + // suggested buffer size. Otherwise it will be the number of bytes actually copied + // to pchValueBuffer. If the results do not fit in the given buffer, partial + // results may be copied. virtual bool GetItemDefinitionProperty( SteamItemDef_t iDefinition, const char *pchPropertyName, - OUT_STRING_COUNT(punValueBufferSize) char *pchValueBuffer, uint32 *punValueBufferSize ) = 0; + OUT_STRING_COUNT(punValueBufferSizeOut) char *pchValueBuffer, uint32 *punValueBufferSizeOut ) = 0; }; #define STEAMINVENTORY_INTERFACE_VERSION "STEAMINVENTORY_INTERFACE_V001" diff --git a/public/steam/isteammatchmaking.h b/public/steam/isteammatchmaking.h index 84f6b09..837d98b 100644 --- a/public/steam/isteammatchmaking.h +++ b/public/steam/isteammatchmaking.h @@ -256,7 +256,7 @@ public: // after completion, the local user will no longer be the owner virtual void CheckForPSNGameBootInvite( unsigned int iGameBootAttributes ) = 0; #endif - CALL_BACK( LobbyChatUpdate_t ); + CALL_BACK( LobbyChatUpdate_t ) }; #define STEAMMATCHMAKING_INTERFACE_VERSION "SteamMatchMaking009" diff --git a/public/steam/isteamremotestorage.h b/public/steam/isteamremotestorage.h index 5b229c1..3ac2871 100644 --- a/public/steam/isteamremotestorage.h +++ b/public/steam/isteamremotestorage.h @@ -57,12 +57,6 @@ const uint32 k_cchTagListMax = 1024 + 1; const uint32 k_cchFilenameMax = 260; const uint32 k_cchPublishedFileURLMax = 256; -// Ways to handle a synchronization conflict -enum EResolveConflict -{ - k_EResolveConflictKeepClient = 1, // The local version of each file will be used to overwrite the server version - k_EResolveConflictKeepServer = 2, // The server version of each file will be used to overwrite the local version -}; enum ERemoteStoragePlatform { @@ -208,7 +202,7 @@ class ISteamRemoteStorage virtual const char *GetFileNameAndSize( int iFile, int32 *pnFileSizeInBytes ) = 0; // configuration management - virtual bool GetQuota( int32 *pnTotalBytes, int32 *puAvailableBytes ) = 0; + virtual bool GetQuota( uint64 *pnTotalBytes, uint64 *puAvailableBytes ) = 0; virtual bool IsCloudEnabledForAccount() = 0; virtual bool IsCloudEnabledForApp() = 0; virtual void SetCloudEnabledForApp( bool bEnabled ) = 0; @@ -297,7 +291,7 @@ class ISteamRemoteStorage virtual SteamAPICall_t EnumerateUserSharedWorkshopFiles( CSteamID steamId, uint32 unStartIndex, SteamParamStringArray_t *pRequiredTags, SteamParamStringArray_t *pExcludedTags ) = 0; CALL_RESULT( RemoteStoragePublishFileProgress_t ) virtual SteamAPICall_t PublishVideo( EWorkshopVideoProvider eVideoProvider, const char *pchVideoAccount, const char *pchVideoIdentifier, const char *pchPreviewFile, AppId_t nConsumerAppId, const char *pchTitle, const char *pchDescription, ERemoteStoragePublishedFileVisibility eVisibility, SteamParamStringArray_t *pTags ) = 0; - CALL_RESULT( RemoteStorageEnumeratePublishedFilesByUserActionResult_t ) + CALL_RESULT( RemoteStorageSetUserPublishedFileActionResult_t ) virtual SteamAPICall_t SetUserPublishedFileAction( PublishedFileId_t unPublishedFileId, EWorkshopFileAction eAction ) = 0; CALL_RESULT( RemoteStorageEnumeratePublishedFilesByUserActionResult_t ) virtual SteamAPICall_t EnumeratePublishedFilesByUserAction( EWorkshopFileAction eAction, uint32 unStartIndex ) = 0; @@ -309,7 +303,7 @@ class ISteamRemoteStorage virtual SteamAPICall_t UGCDownloadToLocation( UGCHandle_t hContent, const char *pchLocation, uint32 unPriority ) = 0; }; -#define STEAMREMOTESTORAGE_INTERFACE_VERSION "STEAMREMOTESTORAGE_INTERFACE_VERSION013" +#define STEAMREMOTESTORAGE_INTERFACE_VERSION "STEAMREMOTESTORAGE_INTERFACE_VERSION014" // callbacks @@ -375,15 +369,6 @@ struct RemoteStorageAppSyncStatusCheck_t EResult m_eResult; }; -//----------------------------------------------------------------------------- -// Purpose: Sent after a conflict resolution attempt. -//----------------------------------------------------------------------------- -struct RemoteStorageConflictResolution_t -{ - enum { k_iCallback = k_iClientRemoteStorageCallbacks + 6 }; - AppId_t m_nAppID; - EResult m_eResult; -}; //----------------------------------------------------------------------------- // Purpose: The result of a call to FileShare() diff --git a/public/steam/isteamscreenshots.h b/public/steam/isteamscreenshots.h index cfa7211..6095705 100644 --- a/public/steam/isteamscreenshots.h +++ b/public/steam/isteamscreenshots.h @@ -25,6 +25,16 @@ const int k_ScreenshotThumbWidth = 200; typedef uint32 ScreenshotHandle; #define INVALID_SCREENSHOT_HANDLE 0 +enum EVRScreenshotType +{ + k_EVRScreenshotType_None = 0, + k_EVRScreenshotType_Mono = 1, + k_EVRScreenshotType_Stereo = 2, + k_EVRScreenshotType_MonoCubemap = 3, + k_EVRScreenshotType_MonoPanorama = 4, + k_EVRScreenshotType_StereoPanorama = 5 +}; + //----------------------------------------------------------------------------- // Purpose: Functions for adding screenshots to the user's screenshot library //----------------------------------------------------------------------------- @@ -57,9 +67,19 @@ public: // Tags a published file as being visible in the screenshot virtual bool TagPublishedFile( ScreenshotHandle hScreenshot, PublishedFileId_t unPublishedFileID ) = 0; + + // Returns true if the app has hooked the screenshot + virtual bool IsScreenshotsHooked() = 0; + + // Adds a VR screenshot to the user's screenshot library from disk in the supported type. + // pchFilename should be the normal 2D image used in the library view + // pchVRFilename should contain the image that matches the correct type + // The return value is a handle that is valid for the duration of the game process and can be used to apply tags. + // JPEG, TGA, and PNG formats are supported. + virtual ScreenshotHandle AddVRScreenshotToLibrary( EVRScreenshotType eType, const char *pchFilename, const char *pchVRFilename ) = 0; }; -#define STEAMSCREENSHOTS_INTERFACE_VERSION "STEAMSCREENSHOTS_INTERFACE_VERSION002" +#define STEAMSCREENSHOTS_INTERFACE_VERSION "STEAMSCREENSHOTS_INTERFACE_VERSION003" // callbacks #if defined( VALVE_CALLBACK_PACK_SMALL ) @@ -92,5 +112,5 @@ struct ScreenshotRequested_t #pragma pack( pop ) - #endif // ISTEAMSCREENSHOTS_H + diff --git a/public/steam/isteamugc.h b/public/steam/isteamugc.h index 26f8453..1827fc6 100644 --- a/public/steam/isteamugc.h +++ b/public/steam/isteamugc.h @@ -92,6 +92,12 @@ enum EUGCQuery k_EUGCQuery_RankedByVotesUp = 10, k_EUGCQuery_RankedByTextSearch = 11, k_EUGCQuery_RankedByTotalUniqueSubscriptions = 12, + k_EUGCQuery_RankedByPlaytimeTrend = 13, + k_EUGCQuery_RankedByTotalPlaytime = 14, + k_EUGCQuery_RankedByAveragePlaytimeTrend = 15, + k_EUGCQuery_RankedByLifetimeAveragePlaytime = 16, + k_EUGCQuery_RankedByPlaytimeSessionsTrend = 17, + k_EUGCQuery_RankedByLifetimePlaytimeSessions = 18, }; enum EItemUpdateStatus @@ -125,6 +131,9 @@ enum EItemStatistic k_EItemStatistic_NumUniqueFollowers = 5, k_EItemStatistic_NumUniqueWebsiteViews = 6, k_EItemStatistic_ReportScore = 7, + k_EItemStatistic_NumSecondsPlayed = 8, + k_EItemStatistic_NumPlaytimeSessions = 9, + k_EItemStatistic_NumComments = 10, }; enum EItemPreviewType @@ -206,7 +215,7 @@ public: virtual bool GetQueryUGCPreviewURL( UGCQueryHandle_t handle, uint32 index, OUT_STRING_COUNT(cchURLSize) char *pchURL, uint32 cchURLSize ) = 0; virtual bool GetQueryUGCMetadata( UGCQueryHandle_t handle, uint32 index, OUT_STRING_COUNT(cchMetadatasize) char *pchMetadata, uint32 cchMetadatasize ) = 0; virtual bool GetQueryUGCChildren( UGCQueryHandle_t handle, uint32 index, PublishedFileId_t* pvecPublishedFileID, uint32 cMaxEntries ) = 0; - virtual bool GetQueryUGCStatistic( UGCQueryHandle_t handle, uint32 index, EItemStatistic eStatType, uint32 *pStatValue ) = 0; + virtual bool GetQueryUGCStatistic( UGCQueryHandle_t handle, uint32 index, EItemStatistic eStatType, uint64 *pStatValue ) = 0; virtual uint32 GetQueryUGCNumAdditionalPreviews( UGCQueryHandle_t handle, uint32 index ) = 0; virtual bool GetQueryUGCAdditionalPreview( UGCQueryHandle_t handle, uint32 index, uint32 previewIndex, OUT_STRING_COUNT(cchURLSize) char *pchURLOrVideoID, uint32 cchURLSize, OUT_STRING_COUNT(cchURLSize) char *pchOriginalFileName, uint32 cchOriginalFileNameSize, EItemPreviewType *pPreviewType ) = 0; virtual uint32 GetQueryUGCNumKeyValueTags( UGCQueryHandle_t handle, uint32 index ) = 0; @@ -218,6 +227,7 @@ public: // Options to set for querying UGC virtual bool AddRequiredTag( UGCQueryHandle_t handle, const char *pTagName ) = 0; virtual bool AddExcludedTag( UGCQueryHandle_t handle, const char *pTagName ) = 0; + virtual bool SetReturnOnlyIDs( UGCQueryHandle_t handle, bool bReturnOnlyIDs ) = 0; virtual bool SetReturnKeyValueTags( UGCQueryHandle_t handle, bool bReturnKeyValueTags ) = 0; virtual bool SetReturnLongDescription( UGCQueryHandle_t handle, bool bReturnLongDescription ) = 0; virtual bool SetReturnMetadata( UGCQueryHandle_t handle, bool bReturnMetadata ) = 0; @@ -302,9 +312,17 @@ public: // SuspendDownloads( true ) will suspend all workshop downloads until SuspendDownloads( false ) is called or the game ends virtual void SuspendDownloads( bool bSuspend ) = 0; + + // usage tracking + CALL_RESULT( StartPlaytimeTrackingResult_t ); + virtual SteamAPICall_t StartPlaytimeTracking( PublishedFileId_t *pvecPublishedFileID, uint32 unNumPublishedFileIDs ) = 0; + CALL_RESULT( StopPlaytimeTrackingResult_t ); + virtual SteamAPICall_t StopPlaytimeTracking( PublishedFileId_t *pvecPublishedFileID, uint32 unNumPublishedFileIDs ) = 0; + CALL_RESULT( StopPlaytimeTrackingResult_t ); + virtual SteamAPICall_t StopPlaytimeTrackingForAllItems() = 0; }; -#define STEAMUGC_INTERFACE_VERSION "STEAMUGC_INTERFACE_VERSION008" +#define STEAMUGC_INTERFACE_VERSION "STEAMUGC_INTERFACE_VERSION009" //----------------------------------------------------------------------------- // Purpose: Callback for querying UGC @@ -411,6 +429,25 @@ struct GetUserItemVoteResult_t bool m_bVoteSkipped; }; +//----------------------------------------------------------------------------- +// Purpose: The result of a call to StartPlaytimeTracking() +//----------------------------------------------------------------------------- +struct StartPlaytimeTrackingResult_t +{ + enum { k_iCallback = k_iClientUGCCallbacks + 10 }; + EResult m_eResult; +}; + +//----------------------------------------------------------------------------- +// Purpose: The result of a call to StopPlaytimeTracking() +//----------------------------------------------------------------------------- +struct StopPlaytimeTrackingResult_t +{ + enum { k_iCallback = k_iClientUGCCallbacks + 11 }; + EResult m_eResult; +}; + + #pragma pack( pop ) #endif // ISTEAMUGC_H diff --git a/public/steam/isteamuser.h b/public/steam/isteamuser.h index 4c685b9..f97a057 100644 --- a/public/steam/isteamuser.h +++ b/public/steam/isteamuser.h @@ -184,6 +184,12 @@ public: // gets whether the user has two factor enabled on their account virtual bool BIsTwoFactorEnabled() = 0; + // gets whether the users phone number is identifying + virtual bool BIsPhoneIdentifying() = 0; + + // gets whether the users phone number is awaiting (re)verification + virtual bool BIsPhoneRequiringVerification() = 0; + }; #define STEAMUSER_INTERFACE_VERSION "SteamUser019" diff --git a/public/steam/isteamutils.h b/public/steam/isteamutils.h index ef439a4..aaf839f 100644 --- a/public/steam/isteamutils.h +++ b/public/steam/isteamutils.h @@ -61,7 +61,7 @@ public: // the universe this client is connecting to virtual EUniverse GetConnectedUniverse() = 0; - // Steam server time - in PST, number of seconds since January 1, 1970 (i.e unix time) + // Steam server time. Number of seconds since January 1, 1970, GMT (i.e unix time) virtual uint32 GetServerRealTime() = 0; // returns the 2 digit ISO 3166-1-alpha-2 format country code this client is running in (as looked up via an IP-to-location database) diff --git a/public/steam/lib/linux32/libsdkencryptedappticket.so b/public/steam/lib/linux32/libsdkencryptedappticket.so index 4908a08..0143c1a 100644 Binary files a/public/steam/lib/linux32/libsdkencryptedappticket.so and b/public/steam/lib/linux32/libsdkencryptedappticket.so differ diff --git a/public/steam/lib/linux64/libsdkencryptedappticket.so b/public/steam/lib/linux64/libsdkencryptedappticket.so index 0b6bc70..d1dfa32 100644 Binary files a/public/steam/lib/linux64/libsdkencryptedappticket.so and b/public/steam/lib/linux64/libsdkencryptedappticket.so differ diff --git a/public/steam/lib/win32/sdkencryptedappticket.dll b/public/steam/lib/win32/sdkencryptedappticket.dll index 1c4dfc8..9f5ba7b 100644 Binary files a/public/steam/lib/win32/sdkencryptedappticket.dll and b/public/steam/lib/win32/sdkencryptedappticket.dll differ diff --git a/public/steam/lib/win32/sdkencryptedappticket.lib b/public/steam/lib/win32/sdkencryptedappticket.lib index c308557..0cdd892 100644 Binary files a/public/steam/lib/win32/sdkencryptedappticket.lib and b/public/steam/lib/win32/sdkencryptedappticket.lib differ diff --git a/public/steam/lib/win64/sdkencryptedappticket64.dll b/public/steam/lib/win64/sdkencryptedappticket64.dll index 28ec919..b56c936 100644 Binary files a/public/steam/lib/win64/sdkencryptedappticket64.dll and b/public/steam/lib/win64/sdkencryptedappticket64.dll differ diff --git a/public/steam/lib/win64/sdkencryptedappticket64.lib b/public/steam/lib/win64/sdkencryptedappticket64.lib index 8ff9b68..47a996c 100644 Binary files a/public/steam/lib/win64/sdkencryptedappticket64.lib and b/public/steam/lib/win64/sdkencryptedappticket64.lib differ diff --git a/public/steam/steam_api.h b/public/steam/steam_api.h index 25e3959..e3a31ae 100644 --- a/public/steam/steam_api.h +++ b/public/steam/steam_api.h @@ -82,7 +82,7 @@ S_API void S_CALLTYPE SteamAPI_Shutdown(); // since the DRM wrapper will ensure that your application was launched properly through Steam. S_API bool S_CALLTYPE SteamAPI_RestartAppIfNecessary( uint32 unOwnAppID ); -// Most Steam API functions allocate some amount of thread-local memory for parameter storage. +// Many Steam API functions allocate a small amount of thread-local memory for parameter storage. // SteamAPI_ReleaseCurrentThreadMemory() will free API memory associated with the calling thread. // This function is also called automatically by SteamAPI_RunCallbacks(), so a single-threaded // program never needs to explicitly call this function. @@ -94,11 +94,14 @@ S_API void S_CALLTYPE SteamAPI_WriteMiniDump( uint32 uStructuredExceptionCode, v S_API void S_CALLTYPE SteamAPI_SetMiniDumpComment( const char *pchMsg ); -// If your application contains modules or libraries which could be built against different SDK -// versions, then you should define VERSION_SAFE_STEAM_API_INTERFACES to enforce that you cannot -// use the un-versioned global accessors. Instead, always create and use CSteamAPIContext objects -// to retrieve interface pointers which match the Steamworks SDK headers which match your build. -#if !defined( VERSION_SAFE_STEAM_API_INTERFACES ) && !defined( STEAM_API_EXPORTS ) +//----------------------------------------------------------------------------------------------------------------------------------------------------------// +// Global accessors for Steamworks C++ APIs. See individual isteam*.h files for details. +// You should not cache the results of these accessors or pass the result pointers across +// modules! Different modules may be compiled against different SDK header versions, and +// the interface pointers could therefore be different across modules. Every line of code +// which calls into a Steamworks API should retrieve the interface from a global accessor. +//----------------------------------------------------------------------------------------------------------------------------------------------------------// +#if !defined( STEAM_API_EXPORTS ) inline ISteamClient *SteamClient(); inline ISteamUser *SteamUser(); inline ISteamFriends *SteamFriends(); @@ -123,17 +126,15 @@ inline ISteamVideo *SteamVideo(); #endif // VERSION_SAFE_STEAM_API_INTERFACES -// Every compiled module will have its own inlined definitions of CSteamAPIContext::Init. -// Do NOT share CSteamAPIContext pointers across modules unless you are sure that they will -// all be compiled against the same SDK! +// CSteamAPIContext encapsulates the Steamworks API global accessors into +// a single object. This is DEPRECATED and only remains for compatibility. class CSteamAPIContext { public: + // DEPRECATED - there is no benefit to using this over the global accessors CSteamAPIContext() { Clear(); } void Clear(); - bool Init(); - ISteamClient* SteamClient() const { return m_pSteamClient; } ISteamUser* SteamUser() const { return m_pSteamUser; } ISteamFriends* SteamFriends() const { return m_pSteamFriends; } @@ -155,7 +156,7 @@ public: ISteamHTMLSurface* SteamHTMLSurface() const { return m_pSteamHTMLSurface; } ISteamInventory* SteamInventory() const { return m_pSteamInventory; } ISteamVideo* SteamVideo() const { return m_pSteamVideo; } - + // DEPRECATED - there is no benefit to using this over the global accessors private: ISteamClient *m_pSteamClient; ISteamUser *m_pSteamUser; @@ -384,7 +385,7 @@ S_API HSteamUser GetHSteamUser(); #if defined( VERSION_SAFE_STEAM_API_INTERFACES ) -// backwards compat with older SDKs +// exists only for backwards compat with code written against older SDKs S_API bool S_CALLTYPE SteamAPI_InitSafe(); #endif diff --git a/public/steam/steam_api.json b/public/steam/steam_api.json index 4eef47f..09adb0c 100644 --- a/public/steam/steam_api.json +++ b/public/steam/steam_api.json @@ -225,6 +225,7 @@ ,{"name": "k_EResultGSOwnerDenied","value": "103"} ,{"name": "k_EResultInvalidItemType","value": "104"} ,{"name": "k_EResultIPBanned","value": "105"} + ,{"name": "k_EResultGSLTExpired","value": "106"} ]} , {"enumname": "EVoiceResult","values": [ {"name": "k_EVoiceResultOK","value": "0"} @@ -335,9 +336,11 @@ ,{"name": "k_EAppType_Driver","value": "128"} ,{"name": "k_EAppType_Config","value": "256"} ,{"name": "k_EAppType_Hardware","value": "512"} + ,{"name": "k_EAppType_Franchise","value": "1024"} ,{"name": "k_EAppType_Video","value": "2048"} ,{"name": "k_EAppType_Plugin","value": "4096"} ,{"name": "k_EAppType_Music","value": "8192"} + ,{"name": "k_EAppType_Series","value": "16384"} ,{"name": "k_EAppType_Shortcut","value": "1073741824"} ,{"name": "k_EAppType_DepotOnly","value": "-2147483648"} ]} @@ -427,12 +430,14 @@ ,{"name": "k_ELaunchOptionType_Option1","value": "10"} ,{"name": "k_ELaunchOptionType_Option2","value": "11"} ,{"name": "k_ELaunchOptionType_Option3","value": "12"} - ,{"name": "k_ELaunchOptionType_OtherVR","value": "13"} + ,{"name": "k_ELaunchOptionType_OculusVR","value": "13"} ,{"name": "k_ELaunchOptionType_OpenVROverlay","value": "14"} + ,{"name": "k_ELaunchOptionType_OSVR","value": "15"} ,{"name": "k_ELaunchOptionType_Dialog","value": "1000"} ]} , {"enumname": "EVRHMDType","values": [ - {"name": "k_eEVRHMDType_Unknown","value": "0"} + {"name": "k_eEVRHMDType_None","value": "-1"} + ,{"name": "k_eEVRHMDType_Unknown","value": "0"} ,{"name": "k_eEVRHMDType_HTC_Dev","value": "1"} ,{"name": "k_eEVRHMDType_HTC_VivePre","value": "2"} ,{"name": "k_eEVRHMDType_HTC_Vive","value": "3"} @@ -442,6 +447,19 @@ ,{"name": "k_eEVRHMDType_Oculus_Rift","value": "23"} ,{"name": "k_eEVRHMDType_Oculus_Unknown","value": "40"} ]} +, {"enumname": "EControllerType","values": [ + {"name": "k_eControllerType_None","value": "-1"} + ,{"name": "k_eControllerType_Unknown","value": "0"} + ,{"name": "k_eControllerType_UnknownSteamController","value": "1"} + ,{"name": "k_eControllerType_SteamController","value": "2"} + ,{"name": "k_eControllerType_UnknownNonSteamController","value": "30"} + ,{"name": "k_eControllerType_XBox360Controller","value": "31"} + ,{"name": "k_eControllerType_XBoxOneController","value": "32"} + ,{"name": "k_eControllerType_PS3Controller","value": "33"} + ,{"name": "k_eControllerType_PS4Controller","value": "34"} + ,{"name": "k_eControllerType_WiiController","value": "35"} + ,{"name": "k_eControllerType_AppleController","value": "36"} +]} , {"enumname": "CGameID::EGameIDType","values": [ {"name": "k_EGameIDTypeApp","value": "0"} ,{"name": "k_EGameIDTypeGameMod","value": "1"} @@ -460,7 +478,7 @@ ,{"name": "k_EFriendRelationshipRequestInitiator","value": "4"} ,{"name": "k_EFriendRelationshipIgnored","value": "5"} ,{"name": "k_EFriendRelationshipIgnoredFriend","value": "6"} - ,{"name": "k_EFriendRelationshipSuggested","value": "7"} + ,{"name": "k_EFriendRelationshipSuggested_DEPRECATED","value": "7"} ,{"name": "k_EFriendRelationshipMax","value": "8"} ]} , {"enumname": "EPersonaState","values": [ @@ -573,10 +591,6 @@ ,{"name": "k_EChatMemberStateChangeKicked","value": "8"} ,{"name": "k_EChatMemberStateChangeBanned","value": "16"} ]} -, {"enumname": "EResolveConflict","values": [ - {"name": "k_EResolveConflictKeepClient","value": "1"} - ,{"name": "k_EResolveConflictKeepServer","value": "2"} -]} , {"enumname": "ERemoteStoragePlatform","values": [ {"name": "k_ERemoteStoragePlatformNone","value": "0"} ,{"name": "k_ERemoteStoragePlatformWindows","value": "1"} @@ -700,6 +714,14 @@ ,{"name": "k_ESNetSocketConnectionTypeUDP","value": "1"} ,{"name": "k_ESNetSocketConnectionTypeUDPRelay","value": "2"} ]} +, {"enumname": "EVRScreenshotType","values": [ + {"name": "k_EVRScreenshotType_None","value": "0"} + ,{"name": "k_EVRScreenshotType_Mono","value": "1"} + ,{"name": "k_EVRScreenshotType_Stereo","value": "2"} + ,{"name": "k_EVRScreenshotType_MonoCubemap","value": "3"} + ,{"name": "k_EVRScreenshotType_MonoPanorama","value": "4"} + ,{"name": "k_EVRScreenshotType_StereoPanorama","value": "5"} +]} , {"enumname": "AudioPlayback_Status","values": [ {"name": "AudioPlayback_Undefined","value": "0"} ,{"name": "AudioPlayback_Playing","value": "1"} @@ -792,6 +814,8 @@ ,{"name": "k_EControllerSourceMode_TouchMenu","value": "10"} ,{"name": "k_EControllerSourceMode_MouseJoystick","value": "11"} ,{"name": "k_EControllerSourceMode_MouseRegion","value": "12"} + ,{"name": "k_EControllerSourceMode_RadialMenu","value": "13"} + ,{"name": "k_EControllerSourceMode_Switches","value": "14"} ]} , {"enumname": "EControllerActionOrigin","values": [ {"name": "k_EControllerActionOrigin_None","value": "0"} @@ -835,6 +859,56 @@ ,{"name": "k_EControllerActionOrigin_Gyro_Roll","value": "38"} ,{"name": "k_EControllerActionOrigin_Count","value": "39"} ]} +, {"enumname": "EControllerActivationType","values": [ + {"name": "k_EControllerActivationType_None","value": "0"} + ,{"name": "k_EControllerActivationType_FullPress","value": "1"} + ,{"name": "k_EControllerActivationType_SoftPress","value": "2"} + ,{"name": "k_EControllerActivationType_StartPress","value": "3"} + ,{"name": "k_EControllerActivationType_Release","value": "4"} + ,{"name": "k_EControllerActivationType_LongPress","value": "5"} + ,{"name": "k_EControllerActivationType_DoublePress","value": "6"} + ,{"name": "k_EControllerActivationType_Analog","value": "7"} +]} +, {"enumname": "EControllerPressureButton","values": [ + {"name": "k_EControllerPressureButton_LeftTrackPad","value": "0"} + ,{"name": "k_EControllerPressureButton_RightTrackPad","value": "1"} + ,{"name": "k_EControllerPressureButton_LeftBumper","value": "2"} + ,{"name": "k_EControllerPressureButton_RightBumper","value": "3"} + ,{"name": "k_EControllerPressureButton_LeftGripLower","value": "4"} + ,{"name": "k_EControllerPressureButton_RightGripLower","value": "5"} + ,{"name": "k_EControllerPressureButton_LeftGripUpper","value": "6"} + ,{"name": "k_EControllerPressureButton_RightGripUpper","value": "7"} + ,{"name": "k_EControllerPressureButton_Invalid","value": "8"} +]} +, {"enumname": "EControllerActivatorOutputAxis","values": [ + {"name": "k_EOutputAxisLeftTrigger","value": "0"} + ,{"name": "k_EOutputAxisRightTrigger","value": "1"} + ,{"name": "k_EOutputAxisLeftThumbXPos","value": "2"} + ,{"name": "k_EOutputAxisLeftThumbXNeg","value": "3"} + ,{"name": "k_EOutputAxisLeftThumbYPos","value": "4"} + ,{"name": "k_EOutputAxisLeftThumbYNeg","value": "5"} + ,{"name": "k_EOutputAxisRightThumbXPos","value": "6"} + ,{"name": "k_EOutputAxisRightThumbXNeg","value": "7"} + ,{"name": "k_EOutputAxisRightThumbYPos","value": "8"} + ,{"name": "k_EOutputAxisRightThumbYNeg","value": "9"} +]} +, {"enumname": "EControllerConfigFeature","values": [ + {"name": "k_EControllerConfigFeature_None","value": "0"} + ,{"name": "k_EControllerConfigFeature_Gamepad","value": "1"} + ,{"name": "k_EControllerConfigFeature_Keyboard","value": "2"} + ,{"name": "k_EControllerConfigFeature_Mouse","value": "3"} + ,{"name": "k_EControllerConfigFeature_Gyro","value": "4"} + ,{"name": "k_EControllerConfigFeature_TouchMenu","value": "5"} + ,{"name": "k_EControllerConfigFeature_ModeShift","value": "6"} + ,{"name": "k_EControllerConfigFeature_ActionSet","value": "7"} + ,{"name": "k_EControllerConfigFeature_Activator","value": "8"} +]} +, {"enumname": "EControllerPopupMenuActivationType","values": [ + {"name": "k_EMenuButtonPress","value": "0"} + ,{"name": "k_EMenuButtonRelease","value": "1"} + ,{"name": "k_EMenuTouchRelease","value": "2"} + ,{"name": "k_EMenuTouchAlways","value": "3"} +]} , {"enumname": "EUGCMatchingUGCType","values": [ {"name": "k_EUGCMatchingUGCType_Items","value": "0"} ,{"name": "k_EUGCMatchingUGCType_Items_Mtx","value": "1"} @@ -885,6 +959,12 @@ ,{"name": "k_EUGCQuery_RankedByVotesUp","value": "10"} ,{"name": "k_EUGCQuery_RankedByTextSearch","value": "11"} ,{"name": "k_EUGCQuery_RankedByTotalUniqueSubscriptions","value": "12"} + ,{"name": "k_EUGCQuery_RankedByPlaytimeTrend","value": "13"} + ,{"name": "k_EUGCQuery_RankedByTotalPlaytime","value": "14"} + ,{"name": "k_EUGCQuery_RankedByAveragePlaytimeTrend","value": "15"} + ,{"name": "k_EUGCQuery_RankedByLifetimeAveragePlaytime","value": "16"} + ,{"name": "k_EUGCQuery_RankedByPlaytimeSessionsTrend","value": "17"} + ,{"name": "k_EUGCQuery_RankedByLifetimePlaytimeSessions","value": "18"} ]} , {"enumname": "EItemUpdateStatus","values": [ {"name": "k_EItemUpdateStatusInvalid","value": "0"} @@ -912,6 +992,9 @@ ,{"name": "k_EItemStatistic_NumUniqueFollowers","value": "5"} ,{"name": "k_EItemStatistic_NumUniqueWebsiteViews","value": "6"} ,{"name": "k_EItemStatistic_ReportScore","value": "7"} + ,{"name": "k_EItemStatistic_NumSecondsPlayed","value": "8"} + ,{"name": "k_EItemStatistic_NumPlaytimeSessions","value": "9"} + ,{"name": "k_EItemStatistic_NumComments","value": "10"} ]} , {"enumname": "EItemPreviewType","values": [ {"name": "k_EItemPreviewType_Image","value": "0"} @@ -1335,9 +1418,6 @@ ,{"struct": "RemoteStorageAppSyncStatusCheck_t","fields": [ { "fieldname": "m_nAppID", "fieldtype": "AppId_t"}, { "fieldname": "m_eResult", "fieldtype": "enum EResult"}]} -,{"struct": "RemoteStorageConflictResolution_t","fields": [ -{ "fieldname": "m_nAppID", "fieldtype": "AppId_t"}, -{ "fieldname": "m_eResult", "fieldtype": "enum EResult"}]} ,{"struct": "RemoteStorageFileShareResult_t","fields": [ { "fieldname": "m_eResult", "fieldtype": "enum EResult"}, { "fieldname": "m_hFile", "fieldtype": "UGCHandle_t"}, @@ -1526,6 +1606,11 @@ { "fieldname": "m_nAppID", "fieldtype": "uint32"}, { "fieldname": "m_cchKeyLength", "fieldtype": "uint32"}, { "fieldname": "m_rgchKey", "fieldtype": "char [240]"}]} +,{"struct": "FileDetailsResult_t","fields": [ +{ "fieldname": "m_eResult", "fieldtype": "enum EResult"}, +{ "fieldname": "m_ulFileSize", "fieldtype": "uint64"}, +{ "fieldname": "m_FileSHA", "fieldtype": "uint8 [20]"}, +{ "fieldname": "m_unFlags", "fieldtype": "uint32"}]} ,{"struct": "P2PSessionState_t","fields": [ { "fieldname": "m_bConnectionActive", "fieldtype": "uint8"}, { "fieldname": "m_bConnecting", "fieldtype": "uint8"}, @@ -1589,6 +1674,17 @@ ,{"struct": "ControllerDigitalActionData_t","fields": [ { "fieldname": "bState", "fieldtype": "_Bool"}, { "fieldname": "bActive", "fieldtype": "_Bool"}]} +,{"struct": "ControllerMotionData_t","fields": [ +{ "fieldname": "rotQuatX", "fieldtype": "float"}, +{ "fieldname": "rotQuatY", "fieldtype": "float"}, +{ "fieldname": "rotQuatZ", "fieldtype": "float"}, +{ "fieldname": "rotQuatW", "fieldtype": "float"}, +{ "fieldname": "posAccelX", "fieldtype": "float"}, +{ "fieldname": "posAccelY", "fieldtype": "float"}, +{ "fieldname": "posAccelZ", "fieldtype": "float"}, +{ "fieldname": "rotVelX", "fieldtype": "float"}, +{ "fieldname": "rotVelY", "fieldtype": "float"}, +{ "fieldname": "rotVelZ", "fieldtype": "float"}]} ,{"struct": "SteamUGCDetails_t","fields": [ { "fieldname": "m_nPublishedFileId", "fieldtype": "PublishedFileId_t"}, { "fieldname": "m_eResult", "fieldtype": "enum EResult"}, @@ -1650,6 +1746,10 @@ { "fieldname": "m_bVotedUp", "fieldtype": "_Bool"}, { "fieldname": "m_bVotedDown", "fieldtype": "_Bool"}, { "fieldname": "m_bVoteSkipped", "fieldtype": "_Bool"}]} +,{"struct": "StartPlaytimeTrackingResult_t","fields": [ +{ "fieldname": "m_eResult", "fieldtype": "enum EResult"}]} +,{"struct": "StopPlaytimeTrackingResult_t","fields": [ +{ "fieldname": "m_eResult", "fieldtype": "enum EResult"}]} ,{"struct": "SteamAppInstalled_t","fields": [ { "fieldname": "m_nAppID", "fieldtype": "AppId_t"}]} ,{"struct": "SteamAppUninstalled_t","fields": [ @@ -2370,6 +2470,16 @@ "methodname": "BIsTwoFactorEnabled", "returntype": "bool" } +,{ + "classname": "ISteamUser", + "methodname": "BIsPhoneIdentifying", + "returntype": "bool" +} +,{ + "classname": "ISteamUser", + "methodname": "BIsPhoneRequiringVerification", + "returntype": "bool" +} ,{ "classname": "ISteamFriends", "methodname": "GetPersonaName", @@ -3897,8 +4007,8 @@ "methodname": "GetQuota", "returntype": "bool", "params": [ -{ "paramname": "pnTotalBytes" ,"paramtype": "int32 *"}, -{ "paramname": "puAvailableBytes" ,"paramtype": "int32 *"} +{ "paramname": "pnTotalBytes" ,"paramtype": "uint64 *"}, +{ "paramname": "puAvailableBytes" ,"paramtype": "uint64 *"} ] } ,{ @@ -4172,7 +4282,7 @@ } ,{ "classname": "ISteamRemoteStorage", - "methodname": "SetUserPublishedFileAction", "callresult": "RemoteStorageEnumeratePublishedFilesByUserActionResult_t", + "methodname": "SetUserPublishedFileAction", "callresult": "RemoteStorageSetUserPublishedFileActionResult_t", "returntype": "SteamAPICall_t", "params": [ { "paramname": "unPublishedFileId" ,"paramtype": "PublishedFileId_t"}, @@ -4769,6 +4879,14 @@ "methodname": "RequestAllProofOfPurchaseKeys", "returntype": "void" } +,{ + "classname": "ISteamApps", + "methodname": "GetFileDetails", "callresult": "FileDetailsResult_t", + "returntype": "SteamAPICall_t", + "params": [ +{ "paramname": "pszFileName" ,"paramtype": "const char *"} + ] +} ,{ "classname": "ISteamNetworking", "methodname": "SendP2PPacket", @@ -5047,6 +5165,21 @@ { "paramname": "unPublishedFileID" ,"paramtype": "PublishedFileId_t"} ] } +,{ + "classname": "ISteamScreenshots", + "methodname": "IsScreenshotsHooked", + "returntype": "bool" +} +,{ + "classname": "ISteamScreenshots", + "methodname": "AddVRScreenshotToLibrary", + "returntype": "ScreenshotHandle", + "params": [ +{ "paramname": "eType" ,"paramtype": "EVRScreenshotType"}, +{ "paramname": "pchFilename" ,"paramtype": "const char *"}, +{ "paramname": "pchVRFilename" ,"paramtype": "const char *"} + ] +} ,{ "classname": "ISteamMusic", "methodname": "BIsEnabled", @@ -5753,6 +5886,54 @@ { "paramname": "nFlags" ,"paramtype": "unsigned int"} ] } +,{ + "classname": "ISteamController", + "methodname": "GetGamepadIndexForController", + "returntype": "int", + "params": [ +{ "paramname": "ulControllerHandle" ,"paramtype": "ControllerHandle_t"} + ] +} +,{ + "classname": "ISteamController", + "methodname": "GetControllerForGamepadIndex", + "returntype": "ControllerHandle_t", + "params": [ +{ "paramname": "nIndex" ,"paramtype": "int"} + ] +} +,{ + "classname": "ISteamController", + "methodname": "GetMotionData", + "returntype": "struct ControllerMotionData_t", + "params": [ +{ "paramname": "controllerHandle" ,"paramtype": "ControllerHandle_t"} + ] +} +,{ + "classname": "ISteamController", + "methodname": "ShowDigitalActionOrigins", + "returntype": "bool", + "params": [ +{ "paramname": "controllerHandle" ,"paramtype": "ControllerHandle_t"}, +{ "paramname": "digitalActionHandle" ,"paramtype": "ControllerDigitalActionHandle_t"}, +{ "paramname": "flScale" ,"paramtype": "float"}, +{ "paramname": "flXPosition" ,"paramtype": "float"}, +{ "paramname": "flYPosition" ,"paramtype": "float"} + ] +} +,{ + "classname": "ISteamController", + "methodname": "ShowAnalogActionOrigins", + "returntype": "bool", + "params": [ +{ "paramname": "controllerHandle" ,"paramtype": "ControllerHandle_t"}, +{ "paramname": "analogActionHandle" ,"paramtype": "ControllerAnalogActionHandle_t"}, +{ "paramname": "flScale" ,"paramtype": "float"}, +{ "paramname": "flXPosition" ,"paramtype": "float"}, +{ "paramname": "flYPosition" ,"paramtype": "float"} + ] +} ,{ "classname": "ISteamUGC", "methodname": "CreateQueryUserUGCRequest", @@ -5847,7 +6028,7 @@ { "paramname": "handle" ,"paramtype": "UGCQueryHandle_t"}, { "paramname": "index" ,"paramtype": "uint32"}, { "paramname": "eStatType" ,"paramtype": "EItemStatistic"}, -{ "paramname": "pStatValue" ,"paramtype": "uint32 *"} +{ "paramname": "pStatValue" ,"paramtype": "uint64 *"} ] } ,{ @@ -5923,6 +6104,15 @@ { "paramname": "pTagName" ,"paramtype": "const char *"} ] } +,{ + "classname": "ISteamUGC", + "methodname": "SetReturnOnlyIDs", + "returntype": "bool", + "params": [ +{ "paramname": "handle" ,"paramtype": "UGCQueryHandle_t"}, +{ "paramname": "bReturnOnlyIDs" ,"paramtype": "bool"} + ] +} ,{ "classname": "ISteamUGC", "methodname": "SetReturnKeyValueTags", @@ -6347,6 +6537,29 @@ { "paramname": "bSuspend" ,"paramtype": "bool"} ] } +,{ + "classname": "ISteamUGC", + "methodname": "StartPlaytimeTracking", + "returntype": "SteamAPICall_t", + "params": [ +{ "paramname": "pvecPublishedFileID" ,"paramtype": "PublishedFileId_t *"}, +{ "paramname": "unNumPublishedFileIDs" ,"paramtype": "uint32"} + ] +} +,{ + "classname": "ISteamUGC", + "methodname": "StopPlaytimeTracking", + "returntype": "SteamAPICall_t", + "params": [ +{ "paramname": "pvecPublishedFileID" ,"paramtype": "PublishedFileId_t *"}, +{ "paramname": "unNumPublishedFileIDs" ,"paramtype": "uint32"} + ] +} +,{ + "classname": "ISteamUGC", + "methodname": "StopPlaytimeTrackingForAllItems", + "returntype": "SteamAPICall_t" +} ,{ "classname": "ISteamAppList", "methodname": "GetNumInstalledApps", @@ -6905,8 +7118,8 @@ "params": [ { "paramname": "iDefinition" ,"paramtype": "SteamItemDef_t"}, { "paramname": "pchPropertyName" ,"paramtype": "const char *"}, -{ "paramname": "pchValueBuffer" ,"out_string_count": "punValueBufferSize" ,"paramtype": "char *"}, -{ "paramname": "punValueBufferSize" ,"paramtype": "uint32 *"} +{ "paramname": "pchValueBuffer" ,"out_string_count": "punValueBufferSizeOut" ,"paramtype": "char *"}, +{ "paramname": "punValueBufferSizeOut" ,"paramtype": "uint32 *"} ] } ,{ diff --git a/public/steam/steam_api_flat.h b/public/steam/steam_api_flat.h index 539a9ee..e77e4cb 100644 --- a/public/steam/steam_api_flat.h +++ b/public/steam/steam_api_flat.h @@ -199,6 +199,8 @@ S_API int SteamAPI_ISteamUser_GetPlayerSteamLevel(intptr_t instancePtr); S_API SteamAPICall_t SteamAPI_ISteamUser_RequestStoreAuthURL(intptr_t instancePtr, const char * pchRedirectURL); S_API bool SteamAPI_ISteamUser_BIsPhoneVerified(intptr_t instancePtr); S_API bool SteamAPI_ISteamUser_BIsTwoFactorEnabled(intptr_t instancePtr); +S_API bool SteamAPI_ISteamUser_BIsPhoneIdentifying(intptr_t instancePtr); +S_API bool SteamAPI_ISteamUser_BIsPhoneRequiringVerification(intptr_t instancePtr); S_API const char * SteamAPI_ISteamFriends_GetPersonaName(intptr_t instancePtr); S_API SteamAPICall_t SteamAPI_ISteamFriends_SetPersonaName(intptr_t instancePtr, const char * pchPersonaName); S_API EPersonaState SteamAPI_ISteamFriends_GetPersonaState(intptr_t instancePtr); @@ -382,7 +384,7 @@ S_API int64 SteamAPI_ISteamRemoteStorage_GetFileTimestamp(intptr_t instancePtr, S_API ERemoteStoragePlatform SteamAPI_ISteamRemoteStorage_GetSyncPlatforms(intptr_t instancePtr, const char * pchFile); S_API int32 SteamAPI_ISteamRemoteStorage_GetFileCount(intptr_t instancePtr); S_API const char * SteamAPI_ISteamRemoteStorage_GetFileNameAndSize(intptr_t instancePtr, int iFile, int32 * pnFileSizeInBytes); -S_API bool SteamAPI_ISteamRemoteStorage_GetQuota(intptr_t instancePtr, int32 * pnTotalBytes, int32 * puAvailableBytes); +S_API bool SteamAPI_ISteamRemoteStorage_GetQuota(intptr_t instancePtr, uint64 * pnTotalBytes, uint64 * puAvailableBytes); S_API bool SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount(intptr_t instancePtr); S_API bool SteamAPI_ISteamRemoteStorage_IsCloudEnabledForApp(intptr_t instancePtr); S_API void SteamAPI_ISteamRemoteStorage_SetCloudEnabledForApp(intptr_t instancePtr, bool bEnabled); @@ -485,6 +487,7 @@ S_API const char * SteamAPI_ISteamApps_GetLaunchQueryParam(intptr_t instancePtr, S_API bool SteamAPI_ISteamApps_GetDlcDownloadProgress(intptr_t instancePtr, AppId_t nAppID, uint64 * punBytesDownloaded, uint64 * punBytesTotal); S_API int SteamAPI_ISteamApps_GetAppBuildId(intptr_t instancePtr); S_API void SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys(intptr_t instancePtr); +S_API SteamAPICall_t SteamAPI_ISteamApps_GetFileDetails(intptr_t instancePtr, const char * pszFileName); S_API bool SteamAPI_ISteamNetworking_SendP2PPacket(intptr_t instancePtr, class CSteamID steamIDRemote, const void * pubData, uint32 cubData, EP2PSend eP2PSendType, int nChannel); S_API bool SteamAPI_ISteamNetworking_IsP2PPacketAvailable(intptr_t instancePtr, uint32 * pcubMsgSize, int nChannel); S_API bool SteamAPI_ISteamNetworking_ReadP2PPacket(intptr_t instancePtr, void * pubDest, uint32 cubDest, uint32 * pcubMsgSize, class CSteamID * psteamIDRemote, int nChannel); @@ -514,6 +517,8 @@ S_API void SteamAPI_ISteamScreenshots_HookScreenshots(intptr_t instancePtr, bool S_API bool SteamAPI_ISteamScreenshots_SetLocation(intptr_t instancePtr, ScreenshotHandle hScreenshot, const char * pchLocation); S_API bool SteamAPI_ISteamScreenshots_TagUser(intptr_t instancePtr, ScreenshotHandle hScreenshot, class CSteamID steamID); S_API bool SteamAPI_ISteamScreenshots_TagPublishedFile(intptr_t instancePtr, ScreenshotHandle hScreenshot, PublishedFileId_t unPublishedFileID); +S_API bool SteamAPI_ISteamScreenshots_IsScreenshotsHooked(intptr_t instancePtr); +S_API ScreenshotHandle SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary(intptr_t instancePtr, EVRScreenshotType eType, const char * pchFilename, const char * pchVRFilename); S_API bool SteamAPI_ISteamMusic_BIsEnabled(intptr_t instancePtr); S_API bool SteamAPI_ISteamMusic_BIsPlaying(intptr_t instancePtr); S_API AudioPlayback_Status SteamAPI_ISteamMusic_GetPlaybackStatus(intptr_t instancePtr); @@ -602,6 +607,11 @@ S_API int SteamAPI_ISteamController_GetAnalogActionOrigins(intptr_t instancePtr, S_API void SteamAPI_ISteamController_StopAnalogActionMomentum(intptr_t instancePtr, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t eAction); S_API void SteamAPI_ISteamController_TriggerHapticPulse(intptr_t instancePtr, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec); S_API void SteamAPI_ISteamController_TriggerRepeatedHapticPulse(intptr_t instancePtr, ControllerHandle_t controllerHandle, ESteamControllerPad eTargetPad, unsigned short usDurationMicroSec, unsigned short usOffMicroSec, unsigned short unRepeat, unsigned int nFlags); +S_API int SteamAPI_ISteamController_GetGamepadIndexForController(intptr_t instancePtr, ControllerHandle_t ulControllerHandle); +S_API ControllerHandle_t SteamAPI_ISteamController_GetControllerForGamepadIndex(intptr_t instancePtr, int nIndex); +S_API struct ControllerMotionData_t SteamAPI_ISteamController_GetMotionData(intptr_t instancePtr, ControllerHandle_t controllerHandle); +S_API bool SteamAPI_ISteamController_ShowDigitalActionOrigins(intptr_t instancePtr, ControllerHandle_t controllerHandle, ControllerDigitalActionHandle_t digitalActionHandle, float flScale, float flXPosition, float flYPosition); +S_API bool SteamAPI_ISteamController_ShowAnalogActionOrigins(intptr_t instancePtr, ControllerHandle_t controllerHandle, ControllerAnalogActionHandle_t analogActionHandle, float flScale, float flXPosition, float flYPosition); S_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryUserUGCRequest(intptr_t instancePtr, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage); S_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryAllUGCRequest(intptr_t instancePtr, EUGCQuery eQueryType, EUGCMatchingUGCType eMatchingeMatchingUGCTypeFileType, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage); S_API UGCQueryHandle_t SteamAPI_ISteamUGC_CreateQueryUGCDetailsRequest(intptr_t instancePtr, PublishedFileId_t * pvecPublishedFileID, uint32 unNumPublishedFileIDs); @@ -610,7 +620,7 @@ S_API bool SteamAPI_ISteamUGC_GetQueryUGCResult(intptr_t instancePtr, UGCQueryHa S_API bool SteamAPI_ISteamUGC_GetQueryUGCPreviewURL(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, char * pchURL, uint32 cchURLSize); S_API bool SteamAPI_ISteamUGC_GetQueryUGCMetadata(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, char * pchMetadata, uint32 cchMetadatasize); S_API bool SteamAPI_ISteamUGC_GetQueryUGCChildren(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, PublishedFileId_t * pvecPublishedFileID, uint32 cMaxEntries); -S_API bool SteamAPI_ISteamUGC_GetQueryUGCStatistic(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, EItemStatistic eStatType, uint32 * pStatValue); +S_API bool SteamAPI_ISteamUGC_GetQueryUGCStatistic(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, EItemStatistic eStatType, uint64 * pStatValue); S_API uint32 SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index); S_API bool SteamAPI_ISteamUGC_GetQueryUGCAdditionalPreview(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index, uint32 previewIndex, char * pchURLOrVideoID, uint32 cchURLSize, char * pchOriginalFileName, uint32 cchOriginalFileNameSize, EItemPreviewType * pPreviewType); S_API uint32 SteamAPI_ISteamUGC_GetQueryUGCNumKeyValueTags(intptr_t instancePtr, UGCQueryHandle_t handle, uint32 index); @@ -618,6 +628,7 @@ S_API bool SteamAPI_ISteamUGC_GetQueryUGCKeyValueTag(intptr_t instancePtr, UGCQu S_API bool SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(intptr_t instancePtr, UGCQueryHandle_t handle); S_API bool SteamAPI_ISteamUGC_AddRequiredTag(intptr_t instancePtr, UGCQueryHandle_t handle, const char * pTagName); S_API bool SteamAPI_ISteamUGC_AddExcludedTag(intptr_t instancePtr, UGCQueryHandle_t handle, const char * pTagName); +S_API bool SteamAPI_ISteamUGC_SetReturnOnlyIDs(intptr_t instancePtr, UGCQueryHandle_t handle, bool bReturnOnlyIDs); S_API bool SteamAPI_ISteamUGC_SetReturnKeyValueTags(intptr_t instancePtr, UGCQueryHandle_t handle, bool bReturnKeyValueTags); S_API bool SteamAPI_ISteamUGC_SetReturnLongDescription(intptr_t instancePtr, UGCQueryHandle_t handle, bool bReturnLongDescription); S_API bool SteamAPI_ISteamUGC_SetReturnMetadata(intptr_t instancePtr, UGCQueryHandle_t handle, bool bReturnMetadata); @@ -665,6 +676,9 @@ S_API bool SteamAPI_ISteamUGC_GetItemDownloadInfo(intptr_t instancePtr, Publishe S_API bool SteamAPI_ISteamUGC_DownloadItem(intptr_t instancePtr, PublishedFileId_t nPublishedFileID, bool bHighPriority); S_API bool SteamAPI_ISteamUGC_BInitWorkshopForGameServer(intptr_t instancePtr, DepotId_t unWorkshopDepotID, const char * pszFolder); S_API void SteamAPI_ISteamUGC_SuspendDownloads(intptr_t instancePtr, bool bSuspend); +S_API SteamAPICall_t SteamAPI_ISteamUGC_StartPlaytimeTracking(intptr_t instancePtr, PublishedFileId_t * pvecPublishedFileID, uint32 unNumPublishedFileIDs); +S_API SteamAPICall_t SteamAPI_ISteamUGC_StopPlaytimeTracking(intptr_t instancePtr, PublishedFileId_t * pvecPublishedFileID, uint32 unNumPublishedFileIDs); +S_API SteamAPICall_t SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems(intptr_t instancePtr); S_API uint32 SteamAPI_ISteamAppList_GetNumInstalledApps(intptr_t instancePtr); S_API uint32 SteamAPI_ISteamAppList_GetInstalledApps(intptr_t instancePtr, AppId_t * pvecAppID, uint32 unMaxAppIDs); S_API int SteamAPI_ISteamAppList_GetAppName(intptr_t instancePtr, AppId_t nAppID, char * pchName, int cchNameMax); @@ -726,7 +740,7 @@ S_API bool SteamAPI_ISteamInventory_TriggerItemDrop(intptr_t instancePtr, SteamI S_API bool SteamAPI_ISteamInventory_TradeItems(intptr_t instancePtr, SteamInventoryResult_t * pResultHandle, class CSteamID steamIDTradePartner, const SteamItemInstanceID_t * pArrayGive, const uint32 * pArrayGiveQuantity, uint32 nArrayGiveLength, const SteamItemInstanceID_t * pArrayGet, const uint32 * pArrayGetQuantity, uint32 nArrayGetLength); S_API bool SteamAPI_ISteamInventory_LoadItemDefinitions(intptr_t instancePtr); S_API bool SteamAPI_ISteamInventory_GetItemDefinitionIDs(intptr_t instancePtr, SteamItemDef_t * pItemDefIDs, uint32 * punItemDefIDsArraySize); -S_API bool SteamAPI_ISteamInventory_GetItemDefinitionProperty(intptr_t instancePtr, SteamItemDef_t iDefinition, const char * pchPropertyName, char * pchValueBuffer, uint32 * punValueBufferSize); +S_API bool SteamAPI_ISteamInventory_GetItemDefinitionProperty(intptr_t instancePtr, SteamItemDef_t iDefinition, const char * pchPropertyName, char * pchValueBuffer, uint32 * punValueBufferSizeOut); S_API void SteamAPI_ISteamVideo_GetVideoURL(intptr_t instancePtr, AppId_t unVideoAppID); S_API bool SteamAPI_ISteamVideo_IsBroadcasting(intptr_t instancePtr, int * pnNumViewers); S_API bool SteamAPI_ISteamGameServer_InitGameServer(intptr_t instancePtr, uint32 unIP, uint16 usGamePort, uint16 usQueryPort, uint32 unFlags, AppId_t nGameAppId, const char * pchVersionString); diff --git a/public/steam/steam_api_internal.h b/public/steam/steam_api_internal.h index a12fca6..ed0423b 100644 --- a/public/steam/steam_api_internal.h +++ b/public/steam/steam_api_internal.h @@ -8,49 +8,51 @@ #define STEAM_API_INTERNAL_H S_API HSteamUser SteamAPI_GetHSteamUser(); -S_API bool S_CALLTYPE SteamInternal_Init(); +S_API void * S_CALLTYPE SteamInternal_ContextInit( void *pContextInitData ); S_API void * S_CALLTYPE SteamInternal_CreateInterface( const char *ver ); #if !defined( STEAM_API_EXPORTS ) -#if !defined( VERSION_SAFE_STEAM_API_INTERFACES ) +inline void S_CALLTYPE SteamInternal_OnContextInit( void* p ) +{ + ((CSteamAPIContext*)p)->Clear(); + if ( SteamAPI_GetHSteamPipe() ) + ((CSteamAPIContext*)p)->Init(); +} inline CSteamAPIContext& SteamInternal_ModuleContext() { + // SteamInternal_ContextInit takes a base pointer for the equivalent of + // struct { void (*pFn)(void* pCtx); uintp counter; CSteamAPIContext ctx; } + // Do not change layout of 2 + sizeof... or add non-pointer aligned data! // NOTE: declaring "static CSteamAPIConext" creates a large function // which queries the initialization status of the object. We know that // it is pointer-aligned and fully memset with zeros, so just alias a // static buffer of the appropriate size and call it a CSteamAPIContext. - static void* ctx[ sizeof(CSteamAPIContext)/sizeof(void*) ]; - return *(CSteamAPIContext*)ctx; + static void* s_CallbackCounterAndContext[ 2 + sizeof(CSteamAPIContext)/sizeof(void*) ] = { (void*)&SteamInternal_OnContextInit, 0 }; + return *(CSteamAPIContext*)SteamInternal_ContextInit( s_CallbackCounterAndContext ); } -#define _STEAMINTERNAL_ACCESSOR_BODY( AccessFunc ) \ - if ( !SteamAPI_GetHSteamPipe() ) return 0; \ - CSteamAPIContext &ctx = SteamInternal_ModuleContext(); \ - if ( !ctx.AccessFunc() ) ctx.Init(); \ - return ctx.AccessFunc(); -inline ISteamClient *SteamClient() { _STEAMINTERNAL_ACCESSOR_BODY( SteamClient ) } -inline ISteamUser *SteamUser() { _STEAMINTERNAL_ACCESSOR_BODY( SteamUser ) } -inline ISteamFriends *SteamFriends() { _STEAMINTERNAL_ACCESSOR_BODY( SteamFriends ) } -inline ISteamUtils *SteamUtils() { _STEAMINTERNAL_ACCESSOR_BODY( SteamUtils ) } -inline ISteamMatchmaking *SteamMatchmaking() { _STEAMINTERNAL_ACCESSOR_BODY( SteamMatchmaking ) } -inline ISteamUserStats *SteamUserStats() { _STEAMINTERNAL_ACCESSOR_BODY( SteamUserStats ) } -inline ISteamApps *SteamApps() { _STEAMINTERNAL_ACCESSOR_BODY( SteamApps ) } -inline ISteamMatchmakingServers *SteamMatchmakingServers() { _STEAMINTERNAL_ACCESSOR_BODY( SteamMatchmakingServers ) } -inline ISteamNetworking *SteamNetworking() { _STEAMINTERNAL_ACCESSOR_BODY( SteamNetworking ) } -inline ISteamRemoteStorage *SteamRemoteStorage() { _STEAMINTERNAL_ACCESSOR_BODY( SteamRemoteStorage ) } -inline ISteamScreenshots *SteamScreenshots() { _STEAMINTERNAL_ACCESSOR_BODY( SteamScreenshots ) } -inline ISteamHTTP *SteamHTTP() { _STEAMINTERNAL_ACCESSOR_BODY( SteamHTTP ) } -inline ISteamUnifiedMessages *SteamUnifiedMessages() { _STEAMINTERNAL_ACCESSOR_BODY( SteamUnifiedMessages ) } -inline ISteamController *SteamController() { _STEAMINTERNAL_ACCESSOR_BODY( SteamController ) } -inline ISteamUGC *SteamUGC() { _STEAMINTERNAL_ACCESSOR_BODY( SteamUGC ) } -inline ISteamAppList *SteamAppList() { _STEAMINTERNAL_ACCESSOR_BODY( SteamAppList ) } -inline ISteamMusic *SteamMusic() { _STEAMINTERNAL_ACCESSOR_BODY( SteamMusic ) } -inline ISteamMusicRemote *SteamMusicRemote() { _STEAMINTERNAL_ACCESSOR_BODY( SteamMusicRemote ) } -inline ISteamHTMLSurface *SteamHTMLSurface() { _STEAMINTERNAL_ACCESSOR_BODY( SteamHTMLSurface ) } -inline ISteamInventory *SteamInventory() { _STEAMINTERNAL_ACCESSOR_BODY( SteamInventory ) } -inline ISteamVideo *SteamVideo() { _STEAMINTERNAL_ACCESSOR_BODY( SteamVideo ) } -#undef _STEAMINTERNAL_ACCESSOR_BODY -#endif // !defined( VERSION_SAFE_STEAM_API_INTERFACES ) + +inline ISteamClient *SteamClient() { return SteamInternal_ModuleContext().SteamClient(); } +inline ISteamUser *SteamUser() { return SteamInternal_ModuleContext().SteamUser(); } +inline ISteamFriends *SteamFriends() { return SteamInternal_ModuleContext().SteamFriends(); } +inline ISteamUtils *SteamUtils() { return SteamInternal_ModuleContext().SteamUtils(); } +inline ISteamMatchmaking *SteamMatchmaking() { return SteamInternal_ModuleContext().SteamMatchmaking(); } +inline ISteamUserStats *SteamUserStats() { return SteamInternal_ModuleContext().SteamUserStats(); } +inline ISteamApps *SteamApps() { return SteamInternal_ModuleContext().SteamApps(); } +inline ISteamMatchmakingServers *SteamMatchmakingServers() { return SteamInternal_ModuleContext().SteamMatchmakingServers(); } +inline ISteamNetworking *SteamNetworking() { return SteamInternal_ModuleContext().SteamNetworking(); } +inline ISteamRemoteStorage *SteamRemoteStorage() { return SteamInternal_ModuleContext().SteamRemoteStorage(); } +inline ISteamScreenshots *SteamScreenshots() { return SteamInternal_ModuleContext().SteamScreenshots(); } +inline ISteamHTTP *SteamHTTP() { return SteamInternal_ModuleContext().SteamHTTP(); } +inline ISteamUnifiedMessages *SteamUnifiedMessages() { return SteamInternal_ModuleContext().SteamUnifiedMessages(); } +inline ISteamController *SteamController() { return SteamInternal_ModuleContext().SteamController(); } +inline ISteamUGC *SteamUGC() { return SteamInternal_ModuleContext().SteamUGC(); } +inline ISteamAppList *SteamAppList() { return SteamInternal_ModuleContext().SteamAppList(); } +inline ISteamMusic *SteamMusic() { return SteamInternal_ModuleContext().SteamMusic(); } +inline ISteamMusicRemote *SteamMusicRemote() { return SteamInternal_ModuleContext().SteamMusicRemote(); } +inline ISteamHTMLSurface *SteamHTMLSurface() { return SteamInternal_ModuleContext().SteamHTMLSurface(); } +inline ISteamInventory *SteamInventory() { return SteamInternal_ModuleContext().SteamInventory(); } +inline ISteamVideo *SteamVideo() { return SteamInternal_ModuleContext().SteamVideo(); } #endif // !defined( STEAM_API_EXPORTS ) diff --git a/public/steam/steam_api_interop.cs b/public/steam/steam_api_interop.cs index d15469b..f7a6775 100644 --- a/public/steam/steam_api_interop.cs +++ b/public/steam/steam_api_interop.cs @@ -135,6 +135,10 @@ internal static extern ulong SteamAPI_ISteamUser_RequestStoreAuthURL(IntPtr inst internal static extern bool SteamAPI_ISteamUser_BIsPhoneVerified(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUser_BIsTwoFactorEnabled")] internal static extern bool SteamAPI_ISteamUser_BIsTwoFactorEnabled(IntPtr instancePtr); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUser_BIsPhoneIdentifying")] +internal static extern bool SteamAPI_ISteamUser_BIsPhoneIdentifying(IntPtr instancePtr); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUser_BIsPhoneRequiringVerification")] +internal static extern bool SteamAPI_ISteamUser_BIsPhoneRequiringVerification(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamFriends_GetPersonaName")] internal static extern IntPtr SteamAPI_ISteamFriends_GetPersonaName(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamFriends_SetPersonaName")] @@ -502,7 +506,7 @@ internal static extern int SteamAPI_ISteamRemoteStorage_GetFileCount(IntPtr inst [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamRemoteStorage_GetFileNameAndSize")] internal static extern IntPtr SteamAPI_ISteamRemoteStorage_GetFileNameAndSize(IntPtr instancePtr, int iFile, ref int pnFileSizeInBytes); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamRemoteStorage_GetQuota")] -internal static extern bool SteamAPI_ISteamRemoteStorage_GetQuota(IntPtr instancePtr, ref int pnTotalBytes, ref int puAvailableBytes); +internal static extern bool SteamAPI_ISteamRemoteStorage_GetQuota(IntPtr instancePtr, ref ulong pnTotalBytes, ref ulong puAvailableBytes); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount")] internal static extern bool SteamAPI_ISteamRemoteStorage_IsCloudEnabledForAccount(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamRemoteStorage_IsCloudEnabledForApp")] @@ -707,6 +711,8 @@ internal static extern bool SteamAPI_ISteamApps_GetDlcDownloadProgress(IntPtr in internal static extern int SteamAPI_ISteamApps_GetAppBuildId(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys")] internal static extern void SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys(IntPtr instancePtr); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamApps_GetFileDetails")] +internal static extern ulong SteamAPI_ISteamApps_GetFileDetails(IntPtr instancePtr, string pszFileName); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamNetworking_SendP2PPacket")] internal static extern bool SteamAPI_ISteamNetworking_SendP2PPacket(IntPtr instancePtr, ulong steamIDRemote, IntPtr pubData, uint cubData, uint eP2PSendType, int nChannel); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamNetworking_IsP2PPacketAvailable")] @@ -765,6 +771,10 @@ internal static extern bool SteamAPI_ISteamScreenshots_SetLocation(IntPtr instan internal static extern bool SteamAPI_ISteamScreenshots_TagUser(IntPtr instancePtr, uint hScreenshot, ulong steamID); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamScreenshots_TagPublishedFile")] internal static extern bool SteamAPI_ISteamScreenshots_TagPublishedFile(IntPtr instancePtr, uint hScreenshot, ulong unPublishedFileID); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamScreenshots_IsScreenshotsHooked")] +internal static extern bool SteamAPI_ISteamScreenshots_IsScreenshotsHooked(IntPtr instancePtr); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary")] +internal static extern uint SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary(IntPtr instancePtr, uint eType, string pchFilename, string pchVRFilename); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamMusic_BIsEnabled")] internal static extern bool SteamAPI_ISteamMusic_BIsEnabled(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamMusic_BIsPlaying")] @@ -941,6 +951,16 @@ internal static extern void SteamAPI_ISteamController_StopAnalogActionMomentum(I internal static extern void SteamAPI_ISteamController_TriggerHapticPulse(IntPtr instancePtr, ulong controllerHandle, uint eTargetPad, char usDurationMicroSec); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_TriggerRepeatedHapticPulse")] internal static extern void SteamAPI_ISteamController_TriggerRepeatedHapticPulse(IntPtr instancePtr, ulong controllerHandle, uint eTargetPad, char usDurationMicroSec, char usOffMicroSec, char unRepeat, uint nFlags); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_GetGamepadIndexForController")] +internal static extern int SteamAPI_ISteamController_GetGamepadIndexForController(IntPtr instancePtr, ulong ulControllerHandle); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_GetControllerForGamepadIndex")] +internal static extern ulong SteamAPI_ISteamController_GetControllerForGamepadIndex(IntPtr instancePtr, int nIndex); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_GetMotionData")] +internal static extern ControllerMotionData_t SteamAPI_ISteamController_GetMotionData(IntPtr instancePtr, ulong controllerHandle); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_ShowDigitalActionOrigins")] +internal static extern bool SteamAPI_ISteamController_ShowDigitalActionOrigins(IntPtr instancePtr, ulong controllerHandle, ulong digitalActionHandle, float flScale, float flXPosition, float flYPosition); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamController_ShowAnalogActionOrigins")] +internal static extern bool SteamAPI_ISteamController_ShowAnalogActionOrigins(IntPtr instancePtr, ulong controllerHandle, ulong analogActionHandle, float flScale, float flXPosition, float flYPosition); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_CreateQueryUserUGCRequest")] internal static extern ulong SteamAPI_ISteamUGC_CreateQueryUserUGCRequest(IntPtr instancePtr, uint unAccountID, uint eListType, uint eMatchingUGCType, uint eSortOrder, uint nCreatorAppID, uint nConsumerAppID, uint unPage); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_CreateQueryAllUGCRequest")] @@ -958,7 +978,7 @@ internal static extern bool SteamAPI_ISteamUGC_GetQueryUGCMetadata(IntPtr instan [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_GetQueryUGCChildren")] internal static extern bool SteamAPI_ISteamUGC_GetQueryUGCChildren(IntPtr instancePtr, ulong handle, uint index, ref ulong pvecPublishedFileID, uint cMaxEntries); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_GetQueryUGCStatistic")] -internal static extern bool SteamAPI_ISteamUGC_GetQueryUGCStatistic(IntPtr instancePtr, ulong handle, uint index, uint eStatType, ref uint pStatValue); +internal static extern bool SteamAPI_ISteamUGC_GetQueryUGCStatistic(IntPtr instancePtr, ulong handle, uint index, uint eStatType, ref ulong pStatValue); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews")] internal static extern uint SteamAPI_ISteamUGC_GetQueryUGCNumAdditionalPreviews(IntPtr instancePtr, ulong handle, uint index); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_GetQueryUGCAdditionalPreview")] @@ -973,6 +993,8 @@ internal static extern bool SteamAPI_ISteamUGC_ReleaseQueryUGCRequest(IntPtr ins internal static extern bool SteamAPI_ISteamUGC_AddRequiredTag(IntPtr instancePtr, ulong handle, string pTagName); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_AddExcludedTag")] internal static extern bool SteamAPI_ISteamUGC_AddExcludedTag(IntPtr instancePtr, ulong handle, string pTagName); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_SetReturnOnlyIDs")] +internal static extern bool SteamAPI_ISteamUGC_SetReturnOnlyIDs(IntPtr instancePtr, ulong handle, bool bReturnOnlyIDs); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_SetReturnKeyValueTags")] internal static extern bool SteamAPI_ISteamUGC_SetReturnKeyValueTags(IntPtr instancePtr, ulong handle, bool bReturnKeyValueTags); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_SetReturnLongDescription")] @@ -1067,6 +1089,12 @@ internal static extern bool SteamAPI_ISteamUGC_DownloadItem(IntPtr instancePtr, internal static extern bool SteamAPI_ISteamUGC_BInitWorkshopForGameServer(IntPtr instancePtr, uint unWorkshopDepotID, string pszFolder); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_SuspendDownloads")] internal static extern void SteamAPI_ISteamUGC_SuspendDownloads(IntPtr instancePtr, bool bSuspend); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_StartPlaytimeTracking")] +internal static extern ulong SteamAPI_ISteamUGC_StartPlaytimeTracking(IntPtr instancePtr, ref ulong pvecPublishedFileID, uint unNumPublishedFileIDs); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_StopPlaytimeTracking")] +internal static extern ulong SteamAPI_ISteamUGC_StopPlaytimeTracking(IntPtr instancePtr, ref ulong pvecPublishedFileID, uint unNumPublishedFileIDs); +[DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems")] +internal static extern ulong SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamAppList_GetNumInstalledApps")] internal static extern uint SteamAPI_ISteamAppList_GetNumInstalledApps(IntPtr instancePtr); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamAppList_GetInstalledApps")] @@ -1190,7 +1218,7 @@ internal static extern bool SteamAPI_ISteamInventory_LoadItemDefinitions(IntPtr [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamInventory_GetItemDefinitionIDs")] internal static extern bool SteamAPI_ISteamInventory_GetItemDefinitionIDs(IntPtr instancePtr, [In, Out] int[] pItemDefIDs, ref uint punItemDefIDsArraySize); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamInventory_GetItemDefinitionProperty")] -internal static extern bool SteamAPI_ISteamInventory_GetItemDefinitionProperty(IntPtr instancePtr, int iDefinition, string pchPropertyName, System.Text.StringBuilder pchValueBuffer, ref uint punValueBufferSize); +internal static extern bool SteamAPI_ISteamInventory_GetItemDefinitionProperty(IntPtr instancePtr, int iDefinition, string pchPropertyName, System.Text.StringBuilder pchValueBuffer, ref uint punValueBufferSizeOut); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamVideo_GetVideoURL")] internal static extern void SteamAPI_ISteamVideo_GetVideoURL(IntPtr instancePtr, uint unVideoAppID); [DllImportAttribute("Steam_api", EntryPoint = "SteamAPI_ISteamVideo_IsBroadcasting")] @@ -1318,6 +1346,11 @@ public delegate void SteamAPI_RemoteStorageGetPublishedItemVoteDetailsResult_t_C public static extern ulong CRemoteStorageGetPublishedItemVoteDetailsResult_t_SetCallResult(ulong hAPICall, SteamAPI_RemoteStorageGetPublishedItemVoteDetailsResult_t_CallResult func); [DllImportAttribute("Steam_api", EntryPoint = "CRemoteStorageGetPublishedItemVoteDetailsResult_t_RemoveCallResult")] public static extern ulong CRemoteStorageGetPublishedItemVoteDetailsResult_t_RemoveCallResult(ulong handle); +public delegate void SteamAPI_FileDetailsResult_t_CallResult(FileDetailsResult_t pFileDetailsResult_t, bool bIOFailure); +[DllImportAttribute("Steam_api", EntryPoint = "CFileDetailsResult_t_SetCallResult")] +public static extern ulong CFileDetailsResult_t_SetCallResult(ulong hAPICall, SteamAPI_FileDetailsResult_t_CallResult func); +[DllImportAttribute("Steam_api", EntryPoint = "CFileDetailsResult_t_RemoveCallResult")] +public static extern ulong CFileDetailsResult_t_RemoveCallResult(ulong handle); public delegate void SteamAPI_GSStatsStored_t_CallResult(GSStatsStored_t pGSStatsStored_t, bool bIOFailure); [DllImportAttribute("Steam_api", EntryPoint = "CGSStatsStored_t_SetCallResult")] public static extern ulong CGSStatsStored_t_SetCallResult(ulong hAPICall, SteamAPI_GSStatsStored_t_CallResult func); @@ -1488,6 +1521,11 @@ public delegate void SteamAPI_EncryptedAppTicketResponse_t_CallResult(EncryptedA public static extern ulong CEncryptedAppTicketResponse_t_SetCallResult(ulong hAPICall, SteamAPI_EncryptedAppTicketResponse_t_CallResult func); [DllImportAttribute("Steam_api", EntryPoint = "CEncryptedAppTicketResponse_t_RemoveCallResult")] public static extern ulong CEncryptedAppTicketResponse_t_RemoveCallResult(ulong handle); +public delegate void SteamAPI_RemoteStorageSetUserPublishedFileActionResult_t_CallResult(RemoteStorageSetUserPublishedFileActionResult_t pRemoteStorageSetUserPublishedFileActionResult_t, bool bIOFailure); +[DllImportAttribute("Steam_api", EntryPoint = "CRemoteStorageSetUserPublishedFileActionResult_t_SetCallResult")] +public static extern ulong CRemoteStorageSetUserPublishedFileActionResult_t_SetCallResult(ulong hAPICall, SteamAPI_RemoteStorageSetUserPublishedFileActionResult_t_CallResult func); +[DllImportAttribute("Steam_api", EntryPoint = "CRemoteStorageSetUserPublishedFileActionResult_t_RemoveCallResult")] +public static extern ulong CRemoteStorageSetUserPublishedFileActionResult_t_RemoveCallResult(ulong handle); public delegate void SteamAPI_RemoteStorageEnumerateUserPublishedFilesResult_t_CallResult(RemoteStorageEnumerateUserPublishedFilesResult_t pRemoteStorageEnumerateUserPublishedFilesResult_t, bool bIOFailure); [DllImportAttribute("Steam_api", EntryPoint = "CRemoteStorageEnumerateUserPublishedFilesResult_t_SetCallResult")] public static extern ulong CRemoteStorageEnumerateUserPublishedFilesResult_t_SetCallResult(ulong hAPICall, SteamAPI_RemoteStorageEnumerateUserPublishedFilesResult_t_CallResult func); @@ -1624,6 +1662,8 @@ namespace Valve.Steamworks public abstract ulong RequestStoreAuthURL(string pchRedirectURL); public abstract bool BIsPhoneVerified(); public abstract bool BIsTwoFactorEnabled(); + public abstract bool BIsPhoneIdentifying(); + public abstract bool BIsPhoneRequiringVerification(); } @@ -1861,7 +1901,7 @@ namespace Valve.Steamworks public abstract uint GetSyncPlatforms(string pchFile); public abstract int GetFileCount(); public abstract string GetFileNameAndSize(int iFile,ref int pnFileSizeInBytes); - public abstract bool GetQuota(ref int pnTotalBytes,ref int puAvailableBytes); + public abstract bool GetQuota(ref ulong pnTotalBytes,ref ulong puAvailableBytes); public abstract bool IsCloudEnabledForAccount(); public abstract bool IsCloudEnabledForApp(); public abstract void SetCloudEnabledForApp(bool bEnabled); @@ -1976,6 +2016,7 @@ namespace Valve.Steamworks public abstract bool GetDlcDownloadProgress(uint nAppID,ref ulong punBytesDownloaded,ref ulong punBytesTotal); public abstract int GetAppBuildId(); public abstract void RequestAllProofOfPurchaseKeys(); + public abstract ulong GetFileDetails(string pszFileName); } @@ -2017,6 +2058,8 @@ namespace Valve.Steamworks public abstract bool SetLocation(uint hScreenshot,string pchLocation); public abstract bool TagUser(uint hScreenshot,ulong steamID); public abstract bool TagPublishedFile(uint hScreenshot,ulong unPublishedFileID); + public abstract bool IsScreenshotsHooked(); + public abstract uint AddVRScreenshotToLibrary(uint eType,string pchFilename,string pchVRFilename); } @@ -2135,6 +2178,11 @@ namespace Valve.Steamworks public abstract void StopAnalogActionMomentum(ulong controllerHandle,ulong eAction); public abstract void TriggerHapticPulse(ulong controllerHandle,uint eTargetPad,char usDurationMicroSec); public abstract void TriggerRepeatedHapticPulse(ulong controllerHandle,uint eTargetPad,char usDurationMicroSec,char usOffMicroSec,char unRepeat,uint nFlags); + public abstract int GetGamepadIndexForController(ulong ulControllerHandle); + public abstract ulong GetControllerForGamepadIndex(int nIndex); + public abstract ControllerMotionData_t GetMotionData(ulong controllerHandle); + public abstract bool ShowDigitalActionOrigins(ulong controllerHandle,ulong digitalActionHandle,float flScale,float flXPosition,float flYPosition); + public abstract bool ShowAnalogActionOrigins(ulong controllerHandle,ulong analogActionHandle,float flScale,float flXPosition,float flYPosition); } @@ -2149,7 +2197,7 @@ namespace Valve.Steamworks public abstract bool GetQueryUGCPreviewURL(ulong handle,uint index,out string pchURL); public abstract bool GetQueryUGCMetadata(ulong handle,uint index,out string pchMetadata); public abstract bool GetQueryUGCChildren(ulong handle,uint index,ref ulong pvecPublishedFileID,uint cMaxEntries); - public abstract bool GetQueryUGCStatistic(ulong handle,uint index,uint eStatType,ref uint pStatValue); + public abstract bool GetQueryUGCStatistic(ulong handle,uint index,uint eStatType,ref ulong pStatValue); public abstract uint GetQueryUGCNumAdditionalPreviews(ulong handle,uint index); public abstract bool GetQueryUGCAdditionalPreview(ulong handle,uint index,uint previewIndex,out string pchURLOrVideoID,out string pchOriginalFileName,uint cchOriginalFileNameSize,ref uint pPreviewType); public abstract uint GetQueryUGCNumKeyValueTags(ulong handle,uint index); @@ -2157,6 +2205,7 @@ namespace Valve.Steamworks public abstract bool ReleaseQueryUGCRequest(ulong handle); public abstract bool AddRequiredTag(ulong handle,string pTagName); public abstract bool AddExcludedTag(ulong handle,string pTagName); + public abstract bool SetReturnOnlyIDs(ulong handle,bool bReturnOnlyIDs); public abstract bool SetReturnKeyValueTags(ulong handle,bool bReturnKeyValueTags); public abstract bool SetReturnLongDescription(ulong handle,bool bReturnLongDescription); public abstract bool SetReturnMetadata(ulong handle,bool bReturnMetadata); @@ -2204,6 +2253,9 @@ namespace Valve.Steamworks public abstract bool DownloadItem(ulong nPublishedFileID,bool bHighPriority); public abstract bool BInitWorkshopForGameServer(uint unWorkshopDepotID,string pszFolder); public abstract void SuspendDownloads(bool bSuspend); + public abstract ulong StartPlaytimeTracking(ref ulong pvecPublishedFileID,uint unNumPublishedFileIDs); + public abstract ulong StopPlaytimeTracking(ref ulong pvecPublishedFileID,uint unNumPublishedFileIDs); + public abstract ulong StopPlaytimeTrackingForAllItems(); } @@ -2750,6 +2802,18 @@ public override bool BIsTwoFactorEnabled() bool result = NativeEntrypoints.SteamAPI_ISteamUser_BIsTwoFactorEnabled(m_pSteamUser); return result; } +public override bool BIsPhoneIdentifying() +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamUser_BIsPhoneIdentifying(m_pSteamUser); + return result; +} +public override bool BIsPhoneRequiringVerification() +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamUser_BIsPhoneRequiringVerification(m_pSteamUser); + return result; +} } @@ -4015,7 +4079,7 @@ public override string GetFileNameAndSize(int iFile,ref int pnFileSizeInBytes) IntPtr result = NativeEntrypoints.SteamAPI_ISteamRemoteStorage_GetFileNameAndSize(m_pSteamRemoteStorage,iFile,ref pnFileSizeInBytes); return Marshal.PtrToStringAnsi(result); } -public override bool GetQuota(ref int pnTotalBytes,ref int puAvailableBytes) +public override bool GetQuota(ref ulong pnTotalBytes,ref ulong puAvailableBytes) { CheckIfUsable(); pnTotalBytes = 0; @@ -4699,6 +4763,12 @@ public override void RequestAllProofOfPurchaseKeys() CheckIfUsable(); NativeEntrypoints.SteamAPI_ISteamApps_RequestAllProofOfPurchaseKeys(m_pSteamApps); } +public override ulong GetFileDetails(string pszFileName) +{ + CheckIfUsable(); + ulong result = NativeEntrypoints.SteamAPI_ISteamApps_GetFileDetails(m_pSteamApps,pszFileName); + return result; +} } @@ -4924,6 +4994,18 @@ public override bool TagPublishedFile(uint hScreenshot,ulong unPublishedFileID) bool result = NativeEntrypoints.SteamAPI_ISteamScreenshots_TagPublishedFile(m_pSteamScreenshots,hScreenshot,unPublishedFileID); return result; } +public override bool IsScreenshotsHooked() +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamScreenshots_IsScreenshotsHooked(m_pSteamScreenshots); + return result; +} +public override uint AddVRScreenshotToLibrary(uint eType,string pchFilename,string pchVRFilename) +{ + CheckIfUsable(); + uint result = NativeEntrypoints.SteamAPI_ISteamScreenshots_AddVRScreenshotToLibrary(m_pSteamScreenshots,eType,pchFilename,pchVRFilename); + return result; +} } @@ -5553,6 +5635,36 @@ public override void TriggerRepeatedHapticPulse(ulong controllerHandle,uint eTar CheckIfUsable(); NativeEntrypoints.SteamAPI_ISteamController_TriggerRepeatedHapticPulse(m_pSteamController,controllerHandle,eTargetPad,usDurationMicroSec,usOffMicroSec,unRepeat,nFlags); } +public override int GetGamepadIndexForController(ulong ulControllerHandle) +{ + CheckIfUsable(); + int result = NativeEntrypoints.SteamAPI_ISteamController_GetGamepadIndexForController(m_pSteamController,ulControllerHandle); + return result; +} +public override ulong GetControllerForGamepadIndex(int nIndex) +{ + CheckIfUsable(); + ulong result = NativeEntrypoints.SteamAPI_ISteamController_GetControllerForGamepadIndex(m_pSteamController,nIndex); + return result; +} +public override ControllerMotionData_t GetMotionData(ulong controllerHandle) +{ + CheckIfUsable(); + ControllerMotionData_t result = NativeEntrypoints.SteamAPI_ISteamController_GetMotionData(m_pSteamController,controllerHandle); + return result; +} +public override bool ShowDigitalActionOrigins(ulong controllerHandle,ulong digitalActionHandle,float flScale,float flXPosition,float flYPosition) +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamController_ShowDigitalActionOrigins(m_pSteamController,controllerHandle,digitalActionHandle,flScale,flXPosition,flYPosition); + return result; +} +public override bool ShowAnalogActionOrigins(ulong controllerHandle,ulong analogActionHandle,float flScale,float flXPosition,float flYPosition) +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamController_ShowAnalogActionOrigins(m_pSteamController,controllerHandle,analogActionHandle,flScale,flXPosition,flYPosition); + return result; +} } @@ -5627,7 +5739,7 @@ public override bool GetQueryUGCChildren(ulong handle,uint index,ref ulong pvecP bool result = NativeEntrypoints.SteamAPI_ISteamUGC_GetQueryUGCChildren(m_pSteamUGC,handle,index,ref pvecPublishedFileID,cMaxEntries); return result; } -public override bool GetQueryUGCStatistic(ulong handle,uint index,uint eStatType,ref uint pStatValue) +public override bool GetQueryUGCStatistic(ulong handle,uint index,uint eStatType,ref ulong pStatValue) { CheckIfUsable(); pStatValue = 0; @@ -5685,6 +5797,12 @@ public override bool AddExcludedTag(ulong handle,string pTagName) bool result = NativeEntrypoints.SteamAPI_ISteamUGC_AddExcludedTag(m_pSteamUGC,handle,pTagName); return result; } +public override bool SetReturnOnlyIDs(ulong handle,bool bReturnOnlyIDs) +{ + CheckIfUsable(); + bool result = NativeEntrypoints.SteamAPI_ISteamUGC_SetReturnOnlyIDs(m_pSteamUGC,handle,bReturnOnlyIDs); + return result; +} public override bool SetReturnKeyValueTags(ulong handle,bool bReturnKeyValueTags) { CheckIfUsable(); @@ -5975,6 +6093,26 @@ public override void SuspendDownloads(bool bSuspend) CheckIfUsable(); NativeEntrypoints.SteamAPI_ISteamUGC_SuspendDownloads(m_pSteamUGC,bSuspend); } +public override ulong StartPlaytimeTracking(ref ulong pvecPublishedFileID,uint unNumPublishedFileIDs) +{ + CheckIfUsable(); + pvecPublishedFileID = 0; + ulong result = NativeEntrypoints.SteamAPI_ISteamUGC_StartPlaytimeTracking(m_pSteamUGC,ref pvecPublishedFileID,unNumPublishedFileIDs); + return result; +} +public override ulong StopPlaytimeTracking(ref ulong pvecPublishedFileID,uint unNumPublishedFileIDs) +{ + CheckIfUsable(); + pvecPublishedFileID = 0; + ulong result = NativeEntrypoints.SteamAPI_ISteamUGC_StopPlaytimeTracking(m_pSteamUGC,ref pvecPublishedFileID,unNumPublishedFileIDs); + return result; +} +public override ulong StopPlaytimeTrackingForAllItems() +{ + CheckIfUsable(); + ulong result = NativeEntrypoints.SteamAPI_ISteamUGC_StopPlaytimeTrackingForAllItems(m_pSteamUGC); + return result; +} } @@ -6390,10 +6528,10 @@ public override bool GetItemDefinitionIDs(out int [] pItemDefIDs) public override bool GetItemDefinitionProperty(int iDefinition,string pchPropertyName,out string pchValueBuffer) { CheckIfUsable(); - uint punValueBufferSize = 0; - bool result = NativeEntrypoints.SteamAPI_ISteamInventory_GetItemDefinitionProperty(m_pSteamInventory,iDefinition,pchPropertyName,null,ref punValueBufferSize); - System.Text.StringBuilder pStrBuffer1 = new System.Text.StringBuilder((int)punValueBufferSize); - result = NativeEntrypoints.SteamAPI_ISteamInventory_GetItemDefinitionProperty(m_pSteamInventory,iDefinition,pchPropertyName,pStrBuffer1,ref punValueBufferSize); + uint punValueBufferSizeOut = 0; + bool result = NativeEntrypoints.SteamAPI_ISteamInventory_GetItemDefinitionProperty(m_pSteamInventory,iDefinition,pchPropertyName,null,ref punValueBufferSizeOut); + System.Text.StringBuilder pStrBuffer1 = new System.Text.StringBuilder((int)punValueBufferSizeOut); + result = NativeEntrypoints.SteamAPI_ISteamInventory_GetItemDefinitionProperty(m_pSteamInventory,iDefinition,pchPropertyName,pStrBuffer1,ref punValueBufferSizeOut); pchValueBuffer = pStrBuffer1.ToString(); return result; } @@ -6836,6 +6974,26 @@ public class CRemoteStorageGetPublishedItemVoteDetailsResult_t_CallResult m_Handle = Valve.Interop.NativeEntrypoints.CRemoteStorageGetPublishedItemVoteDetailsResult_t_SetCallResult(hAPICall, func); } } +public class CFileDetailsResult_t_CallResult +{ + public CFileDetailsResult_t_CallResult() { } + ~CFileDetailsResult_t_CallResult() + { + if(m_Handle != 0) + { + Valve.Interop.NativeEntrypoints.CFileDetailsResult_t_RemoveCallResult(m_Handle); + } + } + ulong m_Handle = 0; + public void Set(ulong hAPICall, Valve.Interop.NativeEntrypoints.SteamAPI_FileDetailsResult_t_CallResult func) + { + if (m_Handle != 0) + { + Valve.Interop.NativeEntrypoints.CFileDetailsResult_t_RemoveCallResult(m_Handle); + } + m_Handle = Valve.Interop.NativeEntrypoints.CFileDetailsResult_t_SetCallResult(hAPICall, func); + } +} public class CGSStatsStored_t_CallResult { public CGSStatsStored_t_CallResult() { } @@ -7516,6 +7674,26 @@ public class CEncryptedAppTicketResponse_t_CallResult m_Handle = Valve.Interop.NativeEntrypoints.CEncryptedAppTicketResponse_t_SetCallResult(hAPICall, func); } } +public class CRemoteStorageSetUserPublishedFileActionResult_t_CallResult +{ + public CRemoteStorageSetUserPublishedFileActionResult_t_CallResult() { } + ~CRemoteStorageSetUserPublishedFileActionResult_t_CallResult() + { + if(m_Handle != 0) + { + Valve.Interop.NativeEntrypoints.CRemoteStorageSetUserPublishedFileActionResult_t_RemoveCallResult(m_Handle); + } + } + ulong m_Handle = 0; + public void Set(ulong hAPICall, Valve.Interop.NativeEntrypoints.SteamAPI_RemoteStorageSetUserPublishedFileActionResult_t_CallResult func) + { + if (m_Handle != 0) + { + Valve.Interop.NativeEntrypoints.CRemoteStorageSetUserPublishedFileActionResult_t_RemoveCallResult(m_Handle); + } + m_Handle = Valve.Interop.NativeEntrypoints.CRemoteStorageSetUserPublishedFileActionResult_t_SetCallResult(hAPICall, func); + } +} public class CRemoteStorageEnumerateUserPublishedFilesResult_t_CallResult { public CRemoteStorageEnumerateUserPublishedFilesResult_t_CallResult() { } @@ -7940,6 +8118,7 @@ public enum EResult k_EResultGSOwnerDenied = 103, k_EResultInvalidItemType = 104, k_EResultIPBanned = 105, + k_EResultGSLTExpired = 106, } public enum EVoiceResult { @@ -8059,9 +8238,11 @@ public enum EAppType k_EAppType_Driver = 128, k_EAppType_Config = 256, k_EAppType_Hardware = 512, + k_EAppType_Franchise = 1024, k_EAppType_Video = 2048, k_EAppType_Plugin = 4096, k_EAppType_Music = 8192, + k_EAppType_Series = 16384, k_EAppType_Shortcut = 1073741824, k_EAppType_DepotOnly = -2147483648, } @@ -8159,12 +8340,14 @@ public enum ELaunchOptionType k_ELaunchOptionType_Option1 = 10, k_ELaunchOptionType_Option2 = 11, k_ELaunchOptionType_Option3 = 12, - k_ELaunchOptionType_OtherVR = 13, + k_ELaunchOptionType_OculusVR = 13, k_ELaunchOptionType_OpenVROverlay = 14, + k_ELaunchOptionType_OSVR = 15, k_ELaunchOptionType_Dialog = 1000, } public enum EVRHMDType { + k_eEVRHMDType_None = -1, k_eEVRHMDType_Unknown = 0, k_eEVRHMDType_HTC_Dev = 1, k_eEVRHMDType_HTC_VivePre = 2, @@ -8175,6 +8358,20 @@ public enum EVRHMDType k_eEVRHMDType_Oculus_Rift = 23, k_eEVRHMDType_Oculus_Unknown = 40, } +public enum EControllerType +{ + k_eControllerType_None = -1, + k_eControllerType_Unknown = 0, + k_eControllerType_UnknownSteamController = 1, + k_eControllerType_SteamController = 2, + k_eControllerType_UnknownNonSteamController = 30, + k_eControllerType_XBox360Controller = 31, + k_eControllerType_XBoxOneController = 32, + k_eControllerType_PS3Controller = 33, + k_eControllerType_PS4Controller = 34, + k_eControllerType_WiiController = 35, + k_eControllerType_AppleController = 36, +} public enum EFailureType { k_EFailureFlushedCallbackQueue = 0, @@ -8189,7 +8386,7 @@ public enum EFriendRelationship k_EFriendRelationshipRequestInitiator = 4, k_EFriendRelationshipIgnored = 5, k_EFriendRelationshipIgnoredFriend = 6, - k_EFriendRelationshipSuggested = 7, + k_EFriendRelationshipSuggested_DEPRECATED = 7, k_EFriendRelationshipMax = 8, } public enum EPersonaState @@ -8316,11 +8513,6 @@ public enum EChatMemberStateChange k_EChatMemberStateChangeKicked = 8, k_EChatMemberStateChangeBanned = 16, } -public enum EResolveConflict -{ - k_EResolveConflictKeepClient = 1, - k_EResolveConflictKeepServer = 2, -} public enum ERemoteStoragePlatform { k_ERemoteStoragePlatformNone = 0, @@ -8461,6 +8653,15 @@ public enum ESNetSocketConnectionType k_ESNetSocketConnectionTypeUDP = 1, k_ESNetSocketConnectionTypeUDPRelay = 2, } +public enum EVRScreenshotType +{ + k_EVRScreenshotType_None = 0, + k_EVRScreenshotType_Mono = 1, + k_EVRScreenshotType_Stereo = 2, + k_EVRScreenshotType_MonoCubemap = 3, + k_EVRScreenshotType_MonoPanorama = 4, + k_EVRScreenshotType_StereoPanorama = 5, +} public enum AudioPlayback_Status { AudioPlayback_Undefined = 0, @@ -8559,6 +8760,8 @@ public enum EControllerSourceMode k_EControllerSourceMode_TouchMenu = 10, k_EControllerSourceMode_MouseJoystick = 11, k_EControllerSourceMode_MouseRegion = 12, + k_EControllerSourceMode_RadialMenu = 13, + k_EControllerSourceMode_Switches = 14, } public enum EControllerActionOrigin { @@ -8603,6 +8806,61 @@ public enum EControllerActionOrigin k_EControllerActionOrigin_Gyro_Roll = 38, k_EControllerActionOrigin_Count = 39, } +public enum EControllerActivationType +{ + k_EControllerActivationType_None = 0, + k_EControllerActivationType_FullPress = 1, + k_EControllerActivationType_SoftPress = 2, + k_EControllerActivationType_StartPress = 3, + k_EControllerActivationType_Release = 4, + k_EControllerActivationType_LongPress = 5, + k_EControllerActivationType_DoublePress = 6, + k_EControllerActivationType_Analog = 7, +} +public enum EControllerPressureButton +{ + k_EControllerPressureButton_LeftTrackPad = 0, + k_EControllerPressureButton_RightTrackPad = 1, + k_EControllerPressureButton_LeftBumper = 2, + k_EControllerPressureButton_RightBumper = 3, + k_EControllerPressureButton_LeftGripLower = 4, + k_EControllerPressureButton_RightGripLower = 5, + k_EControllerPressureButton_LeftGripUpper = 6, + k_EControllerPressureButton_RightGripUpper = 7, + k_EControllerPressureButton_Invalid = 8, +} +public enum EControllerActivatorOutputAxis +{ + k_EOutputAxisLeftTrigger = 0, + k_EOutputAxisRightTrigger = 1, + k_EOutputAxisLeftThumbXPos = 2, + k_EOutputAxisLeftThumbXNeg = 3, + k_EOutputAxisLeftThumbYPos = 4, + k_EOutputAxisLeftThumbYNeg = 5, + k_EOutputAxisRightThumbXPos = 6, + k_EOutputAxisRightThumbXNeg = 7, + k_EOutputAxisRightThumbYPos = 8, + k_EOutputAxisRightThumbYNeg = 9, +} +public enum EControllerConfigFeature +{ + k_EControllerConfigFeature_None = 0, + k_EControllerConfigFeature_Gamepad = 1, + k_EControllerConfigFeature_Keyboard = 2, + k_EControllerConfigFeature_Mouse = 3, + k_EControllerConfigFeature_Gyro = 4, + k_EControllerConfigFeature_TouchMenu = 5, + k_EControllerConfigFeature_ModeShift = 6, + k_EControllerConfigFeature_ActionSet = 7, + k_EControllerConfigFeature_Activator = 8, +} +public enum EControllerPopupMenuActivationType +{ + k_EMenuButtonPress = 0, + k_EMenuButtonRelease = 1, + k_EMenuTouchRelease = 2, + k_EMenuTouchAlways = 3, +} public enum EUGCMatchingUGCType { k_EUGCMatchingUGCType_Items = 0, @@ -8657,6 +8915,12 @@ public enum EUGCQuery k_EUGCQuery_RankedByVotesUp = 10, k_EUGCQuery_RankedByTextSearch = 11, k_EUGCQuery_RankedByTotalUniqueSubscriptions = 12, + k_EUGCQuery_RankedByPlaytimeTrend = 13, + k_EUGCQuery_RankedByTotalPlaytime = 14, + k_EUGCQuery_RankedByAveragePlaytimeTrend = 15, + k_EUGCQuery_RankedByLifetimeAveragePlaytime = 16, + k_EUGCQuery_RankedByPlaytimeSessionsTrend = 17, + k_EUGCQuery_RankedByLifetimePlaytimeSessions = 18, } public enum EItemUpdateStatus { @@ -8687,6 +8951,9 @@ public enum EItemStatistic k_EItemStatistic_NumUniqueFollowers = 5, k_EItemStatistic_NumUniqueWebsiteViews = 6, k_EItemStatistic_ReportScore = 7, + k_EItemStatistic_NumSecondsPlayed = 8, + k_EItemStatistic_NumPlaytimeSessions = 9, + k_EItemStatistic_NumComments = 10, } public enum EItemPreviewType { @@ -9140,11 +9407,6 @@ public enum ESteamItemFlags public uint m_nAppID; public EResult m_eResult; } -[StructLayout(LayoutKind.Sequential)] public struct RemoteStorageConflictResolution_t -{ - public uint m_nAppID; - public EResult m_eResult; -} [StructLayout(LayoutKind.Sequential)] public struct RemoteStorageFileShareResult_t { public EResult m_eResult; @@ -9441,6 +9703,14 @@ public enum ESteamItemFlags [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 240)] public string m_rgchKey; //char[240] } +[StructLayout(LayoutKind.Sequential)] public struct FileDetailsResult_t +{ + public EResult m_eResult; + public ulong m_ulFileSize; + [MarshalAs(UnmanagedType.ByValArray, SizeConst = 20, ArraySubType = UnmanagedType.U1)] + public byte[] m_FileSHA; //byte[20] + public uint m_unFlags; +} [StructLayout(LayoutKind.Sequential)] public struct P2PSessionState_t { public byte m_bConnectionActive; @@ -9546,6 +9816,19 @@ public enum ESteamItemFlags [MarshalAs(UnmanagedType.I1)] public bool bActive; } +[StructLayout(LayoutKind.Sequential)] public struct ControllerMotionData_t +{ + public float rotQuatX; + public float rotQuatY; + public float rotQuatZ; + public float rotQuatW; + public float posAccelX; + public float posAccelY; + public float posAccelZ; + public float rotVelX; + public float rotVelY; + public float rotVelZ; +} [StructLayout(LayoutKind.Sequential)] public struct SteamUGCDetails_t { public ulong m_nPublishedFileId; @@ -9642,6 +9925,14 @@ public enum ESteamItemFlags [MarshalAs(UnmanagedType.I1)] public bool m_bVoteSkipped; } +[StructLayout(LayoutKind.Sequential)] public struct StartPlaytimeTrackingResult_t +{ + public EResult m_eResult; +} +[StructLayout(LayoutKind.Sequential)] public struct StopPlaytimeTrackingResult_t +{ + public EResult m_eResult; +} [StructLayout(LayoutKind.Sequential)] public struct SteamCallback_t { public uint m_nAppID; diff --git a/public/steam/steamclientpublic.h b/public/steam/steamclientpublic.h index 8ca755c..8d89376 100644 --- a/public/steam/steamclientpublic.h +++ b/public/steam/steamclientpublic.h @@ -130,6 +130,7 @@ enum EResult k_EResultGSOwnerDenied = 103, // game server owner is denied for other reason (account lock, community ban, vac ban, missing phone) k_EResultInvalidItemType = 104, // the type of thing we were requested to act on is invalid k_EResultIPBanned = 105, // the ip address has been banned from taking this action + k_EResultGSLTExpired = 106, // this token has expired from disuse; can be reset for use }; // Error codes for use with the voice functions @@ -285,10 +286,11 @@ enum EAppType k_EAppType_Driver = 0x080, // hardware driver updater (ATI, Razor etc) k_EAppType_Config = 0x100, // hidden app used to config Steam features (backpack, sales, etc) k_EAppType_Hardware = 0x200, // a hardware device (Steam Machine, Steam Controller, Steam Link, etc.) - // 0x400 is up for grabs here + k_EAppType_Franchise = 0x400, // A hub for collections of multiple apps, eg films, series, games k_EAppType_Video = 0x800, // A video component of either a Film or TVSeries (may be the feature, an episode, preview, making-of, etc) k_EAppType_Plugin = 0x1000, // Plug-in types for other Apps k_EAppType_Music = 0x2000, // Music files + k_EAppType_Series = 0x4000, // Container app for video series k_EAppType_Shortcut = 0x40000000, // just a shortcut, client side only k_EAppType_DepotOnly = 0x80000000, // placeholder since depots and apps share the same namespace @@ -457,8 +459,9 @@ enum ELaunchOptionType k_ELaunchOptionType_Option1 = 10, // generic run option, uses description field for game name k_ELaunchOptionType_Option2 = 11, // generic run option, uses description field for game name k_ELaunchOptionType_Option3 = 12, // generic run option, uses description field for game name - k_ELaunchOptionType_OtherVR = 13, // runs game in VR mode using the Oculus SDK or other vendor-specific VR SDK + k_ELaunchOptionType_OculusVR = 13, // runs game in VR mode using the Oculus SDK k_ELaunchOptionType_OpenVROverlay = 14, // runs an OpenVR dashboard overlay + k_ELaunchOptionType_OSVR = 15, // runs game in VR mode using the OSVR SDK k_ELaunchOptionType_Dialog = 1000, // show launch options dialog @@ -470,7 +473,10 @@ enum ELaunchOptionType //----------------------------------------------------------------------------- static inline bool BIsVRLaunchOptionType( const ELaunchOptionType eType ) { - return eType == k_ELaunchOptionType_OpenVR || eType == k_ELaunchOptionType_OpenVROverlay || eType == k_ELaunchOptionType_OtherVR; + return eType == k_ELaunchOptionType_OpenVR + || eType == k_ELaunchOptionType_OpenVROverlay + || eType == k_ELaunchOptionType_OculusVR + || eType == k_ELaunchOptionType_OSVR; } @@ -480,6 +486,8 @@ static inline bool BIsVRLaunchOptionType( const ELaunchOptionType eType ) //----------------------------------------------------------------------------- enum EVRHMDType { + k_eEVRHMDType_None = -1, // unknown vendor and model + k_eEVRHMDType_Unknown = 0, // unknown vendor and model k_eEVRHMDType_HTC_Dev = 1, // original HTC dev kits @@ -488,18 +496,41 @@ enum EVRHMDType k_eEVRHMDType_HTC_Unknown = 20, // unknown htc hmd - k_eEVRHMDType_Oculus_DK1 = 21, // occulus DK1 - k_eEVRHMDType_Oculus_DK2 = 22, // occulus DK2 - k_eEVRHMDType_Oculus_Rift = 23, // occulus rift + k_eEVRHMDType_Oculus_DK1 = 21, // Oculus DK1 + k_eEVRHMDType_Oculus_DK2 = 22, // Oculus DK2 + k_eEVRHMDType_Oculus_Rift = 23, // Oculus rift - k_eEVRHMDType_Oculus_Unknown = 40, // // occulus unknown HMD + k_eEVRHMDType_Oculus_Unknown = 40, // // Oculus unknown HMD }; +//----------------------------------------------------------------------------- +// Purpose: Steam Controller models +// WARNING: DO NOT RENUMBER EXISTING VALUES - STORED IN A DATABASE +//----------------------------------------------------------------------------- +enum EControllerType +{ + k_eControllerType_None = -1, + k_eControllerType_Unknown = 0, + + // Steam Controllers + k_eControllerType_UnknownSteamController = 1, + k_eControllerType_SteamController = 2, + + // Other Controllers + k_eControllerType_UnknownNonSteamController = 30, + k_eControllerType_XBox360Controller = 31, + k_eControllerType_XBoxOneController = 32, + k_eControllerType_PS3Controller = 33, + k_eControllerType_PS4Controller = 34, + k_eControllerType_WiiController = 35, + k_eControllerType_AppleController = 36 +}; + //----------------------------------------------------------------------------- // Purpose: true if this is from an Oculus HMD //----------------------------------------------------------------------------- -static inline bool BIsOcculusHMD( EVRHMDType eType ) +static inline bool BIsOculusHMD( EVRHMDType eType ) { return eType == k_eEVRHMDType_Oculus_DK1 || eType == k_eEVRHMDType_Oculus_DK2 || eType == k_eEVRHMDType_Oculus_Rift || eType == k_eEVRHMDType_Oculus_Unknown; } diff --git a/redistributable_bin/linux32/libsteam_api.so b/redistributable_bin/linux32/libsteam_api.so index 4574b80..8e283d6 100644 Binary files a/redistributable_bin/linux32/libsteam_api.so and b/redistributable_bin/linux32/libsteam_api.so differ diff --git a/redistributable_bin/linux64/libsteam_api.so b/redistributable_bin/linux64/libsteam_api.so index f930d8e..c42f382 100644 Binary files a/redistributable_bin/linux64/libsteam_api.so and b/redistributable_bin/linux64/libsteam_api.so differ diff --git a/redistributable_bin/osx32/libsteam_api.dylib b/redistributable_bin/osx32/libsteam_api.dylib index f358b08..d23ef4c 100644 Binary files a/redistributable_bin/osx32/libsteam_api.dylib and b/redistributable_bin/osx32/libsteam_api.dylib differ diff --git a/redistributable_bin/steam_api.dll b/redistributable_bin/steam_api.dll index 535ba15..8e5f502 100644 Binary files a/redistributable_bin/steam_api.dll and b/redistributable_bin/steam_api.dll differ diff --git a/redistributable_bin/steam_api.lib b/redistributable_bin/steam_api.lib index 415732e..4afaa03 100644 Binary files a/redistributable_bin/steam_api.lib and b/redistributable_bin/steam_api.lib differ diff --git a/redistributable_bin/win64/steam_api64.dll b/redistributable_bin/win64/steam_api64.dll index 7b4da36..bf392b1 100644 Binary files a/redistributable_bin/win64/steam_api64.dll and b/redistributable_bin/win64/steam_api64.dll differ diff --git a/redistributable_bin/win64/steam_api64.lib b/redistributable_bin/win64/steam_api64.lib index 4d9ce2d..13dcbb4 100644 Binary files a/redistributable_bin/win64/steam_api64.lib and b/redistributable_bin/win64/steam_api64.lib differ diff --git a/steamworksexample/remotestoragesync.cpp b/steamworksexample/remotestoragesync.cpp index 801a518..1eaf1b4 100644 --- a/steamworksexample/remotestoragesync.cpp +++ b/steamworksexample/remotestoragesync.cpp @@ -80,10 +80,6 @@ void CRemoteStorageSyncMenu::ShowConflict() // Description AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "There is a conflict between the local & server versions of your files:", k_EMenuCommandNone ) ); - // options - AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "- Keep the local client versions", k_EMenuCommandKeepClient ) ); - AddMenuItem( CRemoteStorageSyncMenu::MenuItem_t( "- Keep the remote server versions", k_EMenuCommandKeepServer ) ); - PopSelectedItem(); } @@ -96,8 +92,7 @@ CRemoteStorageSync::CRemoteStorageSync( IGameEngine *pGameEngine ) : m_menu( pGameEngine ), m_callbackAppSyncClientComplete( this, &CRemoteStorageSync::OnAppSyncClientComplete ), m_callbackAppSyncServerComplete( this, &CRemoteStorageSync::OnAppSyncServerComplete ), - m_callbackAppSyncProgress( this, &CRemoteStorageSync::OnAppSyncProgress ), - m_callbackConflictResolution( this, &CRemoteStorageSync::OnConflictResolution ) + m_callbackAppSyncProgress( this, &CRemoteStorageSync::OnAppSyncProgress ) { } @@ -217,20 +212,6 @@ void CRemoteStorageSync::OnAppSyncServerComplete( RemoteStorageAppSyncedServer_t } -//----------------------------------------------------------------------------- -// Purpose: Called by Steam when a conflict resolution has completed -//----------------------------------------------------------------------------- -void CRemoteStorageSync::OnConflictResolution( RemoteStorageConflictResolution_t *pParam ) -{ - // make sure the update is for us - if ( pParam->m_nAppID != SteamUtils()->GetAppID() ) - return; - - // check for errors - m_menu.ShowSyncComplete( m_eSyncOperation, pParam->m_eResult == k_EResultOK ); -} - - //----------------------------------------------------------------------------- // Purpose: A sync menu item has been selected //----------------------------------------------------------------------------- @@ -241,16 +222,6 @@ void CRemoteStorageSync::OnMenuSelection( ERemoteStorageSyncMenuCommand selectio case k_EMenuCommandSyncComplete: m_eSyncOperation = k_ESyncOperationIdle; break; - - case k_EMenuCommandKeepClient: - m_menu.ShowSyncProgress( m_eSyncOperation, 0.0 ); - //SteamRemoteStorage()->ResolveSyncConflict( k_EResolveConflictKeepClient ); - break; - - case k_EMenuCommandKeepServer: - m_menu.ShowSyncProgress( m_eSyncOperation, 0.0 ); - //SteamRemoteStorage()->ResolveSyncConflict( k_EResolveConflictKeepServer ); - break; } } diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Breakpad b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Breakpad index 5159262..9fd8b92 100644 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Breakpad and b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Breakpad differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers new file mode 100644 index 0000000..5bbdca6 --- /dev/null +++ b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers @@ -0,0 +1 @@ +Versions/Current/Headers diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/Breakpad.h b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/Breakpad.h deleted file mode 100644 index b9c3b78..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/Breakpad.h +++ /dev/null @@ -1,282 +0,0 @@ -// Copyright (c) 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Framework to provide a simple C API to crash reporting for -// applications. By default, if any machine-level exception (e.g., -// EXC_BAD_ACCESS) occurs, it will be handled by the BreakpadRef -// object as follows: -// -// 1. Create a minidump file (see Breakpad for details) -// 2. Prompt the user (using CFUserNotification) -// 3. Invoke a command line reporting tool to send the minidump to a -// server -// -// By specifying parameters to the BreakpadCreate function, you can -// modify the default behavior to suit your needs and wants and -// desires. - -// A service name associated with the original bootstrap parent port, saved in -// OnDemandServer and restored in Inspector. -#define BREAKPAD_BOOTSTRAP_PARENT_PORT "com.Breakpad.BootstrapParent" - -typedef void *BreakpadRef; - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#include "BreakpadDefines.h" - -// Optional user-defined function to dec to decide if we should handle -// this crash or forward it along. -// Return true if you want Breakpad to handle it. -// Return false if you want Breakpad to skip it -// The exception handler always returns false, as if SEND_AND_EXIT were false -// (which means the next exception handler will take the exception) -typedef bool (*BreakpadFilterCallback)(int exception_type, - int exception_code, - mach_port_t crashing_thread, - void *context); - -// Create a new BreakpadRef object and install it as an exception -// handler. The |parameters| will typically be the contents of your -// bundle's Info.plist. -// -// You can also specify these additional keys for customizable behavior: -// Key: Value: -// BREAKPAD_PRODUCT Product name (e.g., "MyAwesomeProduct") -// This one is used as the key to identify -// the product when uploading. Falls back to -// CFBundleName if not specified. -// REQUIRED -// -// BREAKPAD_PRODUCT_DISPLAY This is the display name, e.g. a pretty -// name for the product when the crash_sender -// pops up UI for the user. Falls back first to -// CFBundleDisplayName and then to -// BREAKPAD_PRODUCT if not specified. -// -// BREAKPAD_VERSION Product version (e.g., 1.2.3), used -// as metadata for crash report. Falls back to -// CFBundleVersion if not specified. -// REQUIRED -// -// BREAKPAD_VENDOR Vendor name, used in UI (e.g. "A report has -// been created that you can send to ") -// -// BREAKPAD_URL URL destination for reporting -// REQUIRED -// -// BREAKPAD_REPORT_INTERVAL # of seconds between sending -// reports. If an additional report is -// generated within this time, it will -// be ignored. Default: 3600sec. -// Specify 0 to send all reports. -// -// BREAKPAD_SKIP_CONFIRM If true, the reporter will send the report -// without any user intervention. -// Defaults to NO -// -// BREAKPAD_CONFIRM_TIMEOUT Number of seconds before the upload -// confirmation dialog will be automatically -// dismissed (cancelling the upload). -// Default: 300 seconds (min of 60). -// Specify 0 to prevent timeout. -// -// BREAKPAD_SEND_AND_EXIT If true, the handler will exit after sending. -// This will prevent any other handler (e.g., -// CrashReporter) from getting the crash. -// Defaults TO YES -// -// BREAKPAD_DUMP_DIRECTORY The directory to store crash-dumps -// in. By default, we use -// ~/Library/Breakpad/ -// The path you specify here is tilde-expanded. -// -// BREAKPAD_INSPECTOR_LOCATION The full path to the Inspector executable. -// Defaults to /Inspector -// -// BREAKPAD_REPORTER_EXE_LOCATION The full path to the Reporter/sender -// executable. -// Default: -// /crash_report_sender.app -// -// BREAKPAD_LOGFILES Indicates an array of log file paths that -// should be uploaded at crash time. -// -// BREAKPAD_REQUEST_COMMENTS If true, the message dialog will have a -// text box for the user to enter comments. -// Default: NO -// -// BREAKPAD_REQUEST_EMAIL If true and BREAKPAD_REQUEST_COMMENTS is also -// true, the message dialog will have a text -// box for the user to enter their email address. -// Default: NO -// -// BREAKPAD_SERVER_TYPE A parameter that tells Breakpad how to -// rewrite the upload parameters for a specific -// server type. The currently valid values are -// 'socorro' or 'google'. If you want to add -// other types, see the function in -// crash_report_sender.m that maps parameters to -// URL parameters. Defaults to 'google'. -// -// BREAKPAD_SERVER_PARAMETER_DICT A plist dictionary of static -// parameters that are uploaded to the -// server. The parameters are sent as -// is to the crash server. Their -// content isn't added to the minidump -// but pass as URL parameters when -// uploading theminidump to the crash -// server. -//============================================================================= -// The BREAKPAD_PRODUCT, BREAKPAD_VERSION and BREAKPAD_URL are -// required to have non-NULL values. By default, the BREAKPAD_PRODUCT -// will be the CFBundleName and the BREAKPAD_VERSION will be the -// CFBundleVersion when these keys are present in the bundle's -// Info.plist, which is usually passed in to BreakpadCreate() as an -// NSDictionary (you could also pass in another dictionary that had -// the same keys configured). If the BREAKPAD_PRODUCT or -// BREAKPAD_VERSION are ultimately undefined, BreakpadCreate() will -// fail. You have been warned. -// -// If you are running in a debugger, Breakpad will not install, unless the -// BREAKPAD_IGNORE_DEBUGGER envionment variable is set and/or non-zero. -// -// The BREAKPAD_SKIP_CONFIRM and BREAKPAD_SEND_AND_EXIT default -// values are NO and YES. However, they can be controlled by setting their -// values in a user or global plist. -// -// It's easiest to use Breakpad via the Framework, but if you're compiling the -// code in directly, BREAKPAD_INSPECTOR_LOCATION and -// BREAKPAD_REPORTER_EXE_LOCATION allow you to specify custom paths -// to the helper executables. -// -//============================================================================= -// The following are NOT user-supplied but are documented here for -// completeness. They are calculated by Breakpad during initialization & -// crash-dump generation, or entered in by the user. -// -// BREAKPAD_PROCESS_START_TIME The time, in seconds since the Epoch, the -// process started -// -// BREAKPAD_PROCESS_CRASH_TIME The time, in seconds since the Epoch, the -// process crashed. -// -// BREAKPAD_PROCESS_UP_TIME The total time in milliseconds the process -// has been running. This parameter is not -// set until the crash-dump-generation phase. -// -// BREAKPAD_LOGFILE_KEY_PREFIX Used to find out which parameters in the -// parameter dictionary correspond to log -// file paths. -// -// BREAKPAD_SERVER_PARAMETER_PREFIX This prefix is used by Breakpad -// internally, because Breakpad uses -// the same dictionary internally to -// track both its internal -// configuration parameters and -// parameters meant to be uploaded -// to the server. This string is -// used internally by Breakpad to -// prefix user-supplied parameter -// names so those can be sent to the -// server without leaking Breakpad's -// internal values. -// -// BREAKPAD_ON_DEMAND Used internally to indicate to the -// Reporter that we're sending on-demand, -// not as result of a crash. -// -// BREAKPAD_COMMENTS The text the user provided as comments. -// Only used in crash_report_sender. - -// Returns a new BreakpadRef object on success, NULL otherwise. -BreakpadRef BreakpadCreate(NSDictionary *parameters); - -// Uninstall and release the data associated with |ref|. -void BreakpadRelease(BreakpadRef ref); - -// Clients may set an optional callback which gets called when a crash -// occurs. The callback function should return |true| if we should -// handle the crash, generate a crash report, etc. or |false| if we -// should ignore it and forward the crash (normally to CrashReporter). -// Context is a pointer to arbitrary data to make the callback with. -void BreakpadSetFilterCallback(BreakpadRef ref, - BreakpadFilterCallback callback, - void *context); - -// User defined key and value string storage. Generally this is used -// to configure Breakpad's internal operation, such as whether the -// crash_sender should prompt the user, or the filesystem location for -// the minidump file. See Breakpad.h for some parameters that can be -// set. Anything longer than 255 bytes will be truncated. Note that -// the string is converted to UTF8 before truncation, so any multibyte -// character that straddles the 255(256 - 1 for terminator) byte limit -// will be mangled. -// -// A maximum number of 64 key/value pairs are supported. An assert() -// will fire if more than this number are set. Unfortunately, right -// now, the same dictionary is used for both Breakpad's parameters AND -// the Upload parameters. -// -// TODO (nealsid): Investigate how necessary this is if we don't -// automatically upload parameters to the server anymore. -// TODO (nealsid): separate server parameter dictionary from the -// dictionary used to configure Breakpad, and document limits for each -// independently. -void BreakpadSetKeyValue(BreakpadRef ref, NSString *key, NSString *value); -NSString *BreakpadKeyValue(BreakpadRef ref, NSString *key); -void BreakpadRemoveKeyValue(BreakpadRef ref, NSString *key); - -// You can use this method to specify parameters that will be uploaded -// to the crash server. They will be automatically encoded as -// necessary. Note that as mentioned above there are limits on both -// the number of keys and their length. -void BreakpadAddUploadParameter(BreakpadRef ref, NSString *key, - NSString *value); - -// This method will remove a previously-added parameter from the -// upload parameter set. -void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key); - -// Add a log file for Breakpad to read and send upon crash dump -void BreakpadAddLogFile(BreakpadRef ref, NSString *logPathname); - -// Generate a minidump and send -void BreakpadGenerateAndSendReport(BreakpadRef ref); - -void BreakpadSetComment( BreakpadRef ref, char const *pchComment ); - -#ifdef __cplusplus -} -#endif diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/BreakpadDefines.h b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/BreakpadDefines.h deleted file mode 100644 index 8986cd1..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Headers/BreakpadDefines.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2011, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Keys for configuration file -#define kReporterMinidumpDirectoryKey "MinidumpDir" -#define kReporterMinidumpIDKey "MinidumpID" - -// Filename for recording uploaded IDs -#define kReporterLogFilename "uploads.log" - -// The default subdirectory of the Library to put crash dumps in -// The subdirectory is -// ~/Library// -#define kDefaultLibrarySubdirectory "Breakpad" - -// Specify some special keys to be used in the configuration file that is -// generated by Breakpad and consumed by the crash_sender. -#define BREAKPAD_PRODUCT "BreakpadProduct" -#define BREAKPAD_PRODUCT_DISPLAY "BreakpadProductDisplay" -#define BREAKPAD_VERSION "BreakpadVersion" -#define BREAKPAD_VENDOR "BreakpadVendor" -#define BREAKPAD_URL "BreakpadURL" -#define BREAKPAD_REPORT_INTERVAL "BreakpadReportInterval" -#define BREAKPAD_SKIP_CONFIRM "BreakpadSkipConfirm" -#define BREAKPAD_CONFIRM_TIMEOUT "BreakpadConfirmTimeout" -#define BREAKPAD_SEND_AND_EXIT "BreakpadSendAndExit" -#define BREAKPAD_DUMP_DIRECTORY "BreakpadMinidumpLocation" -#define BREAKPAD_INSPECTOR_LOCATION "BreakpadInspectorLocation" -#define BREAKPAD_REPORTER_EXE_LOCATION \ - "BreakpadReporterExeLocation" -#define BREAKPAD_LOGFILES "BreakpadLogFiles" -#define BREAKPAD_LOGFILE_UPLOAD_SIZE "BreakpadLogFileTailSize" -#define BREAKPAD_REQUEST_COMMENTS "BreakpadRequestComments" -#define BREAKPAD_COMMENTS "BreakpadComments" -#define BREAKPAD_REQUEST_EMAIL "BreakpadRequestEmail" -#define BREAKPAD_EMAIL "BreakpadEmail" -#define BREAKPAD_SERVER_TYPE "BreakpadServerType" -#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters" - -// The keys below are NOT user supplied, and are used internally. -#define BREAKPAD_PROCESS_START_TIME "BreakpadProcStartTime" -#define BREAKPAD_PROCESS_UP_TIME "BreakpadProcessUpTime" -#define BREAKPAD_PROCESS_CRASH_TIME "BreakpadProcessCrashTime" -#define BREAKPAD_LOGFILE_KEY_PREFIX "BreakpadAppLogFile" -#define BREAKPAD_SERVER_PARAMETER_PREFIX "BreakpadServerParameterPrefix_" -#define BREAKPAD_ON_DEMAND "BreakpadOnDemand" diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources new file mode 100644 index 0000000..6e50ab9 --- /dev/null +++ b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources @@ -0,0 +1 @@ +Versions/Current/Resources diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Info.plist b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Info.plist deleted file mode 100644 index 1113206..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - BuildMachineOSBuild - 11G63 - CFBundleDevelopmentRegion - English - CFBundleExecutable - Breakpad - CFBundleIdentifier - com.googlecode.google-breakpad - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Breakpad - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0.compiler - DTPlatformBuild - 4E3002 - DTPlatformVersion - GM - DTSDKBuild - 10K549 - DTSDKName - macosx10.6 - DTXcode - 0433 - DTXcodeBuild - 4E3002 - - diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Inspector b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Inspector deleted file mode 100644 index e4d6ca5..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/Inspector and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib deleted file mode 100644 index ba6037a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/breakpadUtilities.dylib and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist deleted file mode 100644 index f802b01..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Info.plist +++ /dev/null @@ -1,48 +0,0 @@ - - - - - BuildMachineOSBuild - 11G63 - CFBundleDevelopmentRegion - English - CFBundleDisplayName - crash_report_sender - CFBundleExecutable - crash_report_sender - CFBundleIconFile - crash_report_sender - CFBundleIdentifier - com.Breakpad.crash_report_sender - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - crash_report_sender - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0.compiler - DTPlatformBuild - 4E3002 - DTPlatformVersion - GM - DTSDKBuild - 10K549 - DTSDKName - macosx10.6 - DTXcode - 0433 - DTXcodeBuild - 4E3002 - LSHasLocalizedDisplayName - - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender deleted file mode 100644 index 14abcbf..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/PkgInfo b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/PkgInfo deleted file mode 100644 index bd04210..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib deleted file mode 100644 index 432a001..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings deleted file mode 100644 index b731522..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns deleted file mode 100644 index e8c2124..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings deleted file mode 100644 index 59b0fae..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings deleted file mode 100644 index e30f049..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings deleted file mode 100644 index 4fb2a0a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings deleted file mode 100644 index 2ddf311..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings deleted file mode 100644 index ee3c368..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings deleted file mode 100644 index 760e85a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/goArrow.png b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/goArrow.png deleted file mode 100644 index f318a56..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/goArrow.png and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings deleted file mode 100644 index 9e99cd1..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings deleted file mode 100644 index 8d8fd91..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings deleted file mode 100644 index affe56e..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings deleted file mode 100644 index 8849c0b..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings deleted file mode 100644 index a375f9d..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings deleted file mode 100644 index 3ad772d..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings deleted file mode 100644 index ffcce74..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings deleted file mode 100644 index 3a0f347..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings deleted file mode 100644 index 05acb9b..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current new file mode 100644 index 0000000..f70f10e --- /dev/null +++ b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current @@ -0,0 +1 @@ +A diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Breakpad b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Breakpad deleted file mode 100644 index 5159262..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Breakpad and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/Breakpad.h b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/Breakpad.h deleted file mode 100644 index b9c3b78..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/Breakpad.h +++ /dev/null @@ -1,282 +0,0 @@ -// Copyright (c) 2006, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Framework to provide a simple C API to crash reporting for -// applications. By default, if any machine-level exception (e.g., -// EXC_BAD_ACCESS) occurs, it will be handled by the BreakpadRef -// object as follows: -// -// 1. Create a minidump file (see Breakpad for details) -// 2. Prompt the user (using CFUserNotification) -// 3. Invoke a command line reporting tool to send the minidump to a -// server -// -// By specifying parameters to the BreakpadCreate function, you can -// modify the default behavior to suit your needs and wants and -// desires. - -// A service name associated with the original bootstrap parent port, saved in -// OnDemandServer and restored in Inspector. -#define BREAKPAD_BOOTSTRAP_PARENT_PORT "com.Breakpad.BootstrapParent" - -typedef void *BreakpadRef; - -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include - -#include "BreakpadDefines.h" - -// Optional user-defined function to dec to decide if we should handle -// this crash or forward it along. -// Return true if you want Breakpad to handle it. -// Return false if you want Breakpad to skip it -// The exception handler always returns false, as if SEND_AND_EXIT were false -// (which means the next exception handler will take the exception) -typedef bool (*BreakpadFilterCallback)(int exception_type, - int exception_code, - mach_port_t crashing_thread, - void *context); - -// Create a new BreakpadRef object and install it as an exception -// handler. The |parameters| will typically be the contents of your -// bundle's Info.plist. -// -// You can also specify these additional keys for customizable behavior: -// Key: Value: -// BREAKPAD_PRODUCT Product name (e.g., "MyAwesomeProduct") -// This one is used as the key to identify -// the product when uploading. Falls back to -// CFBundleName if not specified. -// REQUIRED -// -// BREAKPAD_PRODUCT_DISPLAY This is the display name, e.g. a pretty -// name for the product when the crash_sender -// pops up UI for the user. Falls back first to -// CFBundleDisplayName and then to -// BREAKPAD_PRODUCT if not specified. -// -// BREAKPAD_VERSION Product version (e.g., 1.2.3), used -// as metadata for crash report. Falls back to -// CFBundleVersion if not specified. -// REQUIRED -// -// BREAKPAD_VENDOR Vendor name, used in UI (e.g. "A report has -// been created that you can send to ") -// -// BREAKPAD_URL URL destination for reporting -// REQUIRED -// -// BREAKPAD_REPORT_INTERVAL # of seconds between sending -// reports. If an additional report is -// generated within this time, it will -// be ignored. Default: 3600sec. -// Specify 0 to send all reports. -// -// BREAKPAD_SKIP_CONFIRM If true, the reporter will send the report -// without any user intervention. -// Defaults to NO -// -// BREAKPAD_CONFIRM_TIMEOUT Number of seconds before the upload -// confirmation dialog will be automatically -// dismissed (cancelling the upload). -// Default: 300 seconds (min of 60). -// Specify 0 to prevent timeout. -// -// BREAKPAD_SEND_AND_EXIT If true, the handler will exit after sending. -// This will prevent any other handler (e.g., -// CrashReporter) from getting the crash. -// Defaults TO YES -// -// BREAKPAD_DUMP_DIRECTORY The directory to store crash-dumps -// in. By default, we use -// ~/Library/Breakpad/ -// The path you specify here is tilde-expanded. -// -// BREAKPAD_INSPECTOR_LOCATION The full path to the Inspector executable. -// Defaults to /Inspector -// -// BREAKPAD_REPORTER_EXE_LOCATION The full path to the Reporter/sender -// executable. -// Default: -// /crash_report_sender.app -// -// BREAKPAD_LOGFILES Indicates an array of log file paths that -// should be uploaded at crash time. -// -// BREAKPAD_REQUEST_COMMENTS If true, the message dialog will have a -// text box for the user to enter comments. -// Default: NO -// -// BREAKPAD_REQUEST_EMAIL If true and BREAKPAD_REQUEST_COMMENTS is also -// true, the message dialog will have a text -// box for the user to enter their email address. -// Default: NO -// -// BREAKPAD_SERVER_TYPE A parameter that tells Breakpad how to -// rewrite the upload parameters for a specific -// server type. The currently valid values are -// 'socorro' or 'google'. If you want to add -// other types, see the function in -// crash_report_sender.m that maps parameters to -// URL parameters. Defaults to 'google'. -// -// BREAKPAD_SERVER_PARAMETER_DICT A plist dictionary of static -// parameters that are uploaded to the -// server. The parameters are sent as -// is to the crash server. Their -// content isn't added to the minidump -// but pass as URL parameters when -// uploading theminidump to the crash -// server. -//============================================================================= -// The BREAKPAD_PRODUCT, BREAKPAD_VERSION and BREAKPAD_URL are -// required to have non-NULL values. By default, the BREAKPAD_PRODUCT -// will be the CFBundleName and the BREAKPAD_VERSION will be the -// CFBundleVersion when these keys are present in the bundle's -// Info.plist, which is usually passed in to BreakpadCreate() as an -// NSDictionary (you could also pass in another dictionary that had -// the same keys configured). If the BREAKPAD_PRODUCT or -// BREAKPAD_VERSION are ultimately undefined, BreakpadCreate() will -// fail. You have been warned. -// -// If you are running in a debugger, Breakpad will not install, unless the -// BREAKPAD_IGNORE_DEBUGGER envionment variable is set and/or non-zero. -// -// The BREAKPAD_SKIP_CONFIRM and BREAKPAD_SEND_AND_EXIT default -// values are NO and YES. However, they can be controlled by setting their -// values in a user or global plist. -// -// It's easiest to use Breakpad via the Framework, but if you're compiling the -// code in directly, BREAKPAD_INSPECTOR_LOCATION and -// BREAKPAD_REPORTER_EXE_LOCATION allow you to specify custom paths -// to the helper executables. -// -//============================================================================= -// The following are NOT user-supplied but are documented here for -// completeness. They are calculated by Breakpad during initialization & -// crash-dump generation, or entered in by the user. -// -// BREAKPAD_PROCESS_START_TIME The time, in seconds since the Epoch, the -// process started -// -// BREAKPAD_PROCESS_CRASH_TIME The time, in seconds since the Epoch, the -// process crashed. -// -// BREAKPAD_PROCESS_UP_TIME The total time in milliseconds the process -// has been running. This parameter is not -// set until the crash-dump-generation phase. -// -// BREAKPAD_LOGFILE_KEY_PREFIX Used to find out which parameters in the -// parameter dictionary correspond to log -// file paths. -// -// BREAKPAD_SERVER_PARAMETER_PREFIX This prefix is used by Breakpad -// internally, because Breakpad uses -// the same dictionary internally to -// track both its internal -// configuration parameters and -// parameters meant to be uploaded -// to the server. This string is -// used internally by Breakpad to -// prefix user-supplied parameter -// names so those can be sent to the -// server without leaking Breakpad's -// internal values. -// -// BREAKPAD_ON_DEMAND Used internally to indicate to the -// Reporter that we're sending on-demand, -// not as result of a crash. -// -// BREAKPAD_COMMENTS The text the user provided as comments. -// Only used in crash_report_sender. - -// Returns a new BreakpadRef object on success, NULL otherwise. -BreakpadRef BreakpadCreate(NSDictionary *parameters); - -// Uninstall and release the data associated with |ref|. -void BreakpadRelease(BreakpadRef ref); - -// Clients may set an optional callback which gets called when a crash -// occurs. The callback function should return |true| if we should -// handle the crash, generate a crash report, etc. or |false| if we -// should ignore it and forward the crash (normally to CrashReporter). -// Context is a pointer to arbitrary data to make the callback with. -void BreakpadSetFilterCallback(BreakpadRef ref, - BreakpadFilterCallback callback, - void *context); - -// User defined key and value string storage. Generally this is used -// to configure Breakpad's internal operation, such as whether the -// crash_sender should prompt the user, or the filesystem location for -// the minidump file. See Breakpad.h for some parameters that can be -// set. Anything longer than 255 bytes will be truncated. Note that -// the string is converted to UTF8 before truncation, so any multibyte -// character that straddles the 255(256 - 1 for terminator) byte limit -// will be mangled. -// -// A maximum number of 64 key/value pairs are supported. An assert() -// will fire if more than this number are set. Unfortunately, right -// now, the same dictionary is used for both Breakpad's parameters AND -// the Upload parameters. -// -// TODO (nealsid): Investigate how necessary this is if we don't -// automatically upload parameters to the server anymore. -// TODO (nealsid): separate server parameter dictionary from the -// dictionary used to configure Breakpad, and document limits for each -// independently. -void BreakpadSetKeyValue(BreakpadRef ref, NSString *key, NSString *value); -NSString *BreakpadKeyValue(BreakpadRef ref, NSString *key); -void BreakpadRemoveKeyValue(BreakpadRef ref, NSString *key); - -// You can use this method to specify parameters that will be uploaded -// to the crash server. They will be automatically encoded as -// necessary. Note that as mentioned above there are limits on both -// the number of keys and their length. -void BreakpadAddUploadParameter(BreakpadRef ref, NSString *key, - NSString *value); - -// This method will remove a previously-added parameter from the -// upload parameter set. -void BreakpadRemoveUploadParameter(BreakpadRef ref, NSString *key); - -// Add a log file for Breakpad to read and send upon crash dump -void BreakpadAddLogFile(BreakpadRef ref, NSString *logPathname); - -// Generate a minidump and send -void BreakpadGenerateAndSendReport(BreakpadRef ref); - -void BreakpadSetComment( BreakpadRef ref, char const *pchComment ); - -#ifdef __cplusplus -} -#endif diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/BreakpadDefines.h b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/BreakpadDefines.h deleted file mode 100644 index 8986cd1..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Headers/BreakpadDefines.h +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) 2011, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Keys for configuration file -#define kReporterMinidumpDirectoryKey "MinidumpDir" -#define kReporterMinidumpIDKey "MinidumpID" - -// Filename for recording uploaded IDs -#define kReporterLogFilename "uploads.log" - -// The default subdirectory of the Library to put crash dumps in -// The subdirectory is -// ~/Library// -#define kDefaultLibrarySubdirectory "Breakpad" - -// Specify some special keys to be used in the configuration file that is -// generated by Breakpad and consumed by the crash_sender. -#define BREAKPAD_PRODUCT "BreakpadProduct" -#define BREAKPAD_PRODUCT_DISPLAY "BreakpadProductDisplay" -#define BREAKPAD_VERSION "BreakpadVersion" -#define BREAKPAD_VENDOR "BreakpadVendor" -#define BREAKPAD_URL "BreakpadURL" -#define BREAKPAD_REPORT_INTERVAL "BreakpadReportInterval" -#define BREAKPAD_SKIP_CONFIRM "BreakpadSkipConfirm" -#define BREAKPAD_CONFIRM_TIMEOUT "BreakpadConfirmTimeout" -#define BREAKPAD_SEND_AND_EXIT "BreakpadSendAndExit" -#define BREAKPAD_DUMP_DIRECTORY "BreakpadMinidumpLocation" -#define BREAKPAD_INSPECTOR_LOCATION "BreakpadInspectorLocation" -#define BREAKPAD_REPORTER_EXE_LOCATION \ - "BreakpadReporterExeLocation" -#define BREAKPAD_LOGFILES "BreakpadLogFiles" -#define BREAKPAD_LOGFILE_UPLOAD_SIZE "BreakpadLogFileTailSize" -#define BREAKPAD_REQUEST_COMMENTS "BreakpadRequestComments" -#define BREAKPAD_COMMENTS "BreakpadComments" -#define BREAKPAD_REQUEST_EMAIL "BreakpadRequestEmail" -#define BREAKPAD_EMAIL "BreakpadEmail" -#define BREAKPAD_SERVER_TYPE "BreakpadServerType" -#define BREAKPAD_SERVER_PARAMETER_DICT "BreakpadServerParameters" - -// The keys below are NOT user supplied, and are used internally. -#define BREAKPAD_PROCESS_START_TIME "BreakpadProcStartTime" -#define BREAKPAD_PROCESS_UP_TIME "BreakpadProcessUpTime" -#define BREAKPAD_PROCESS_CRASH_TIME "BreakpadProcessCrashTime" -#define BREAKPAD_LOGFILE_KEY_PREFIX "BreakpadAppLogFile" -#define BREAKPAD_SERVER_PARAMETER_PREFIX "BreakpadServerParameterPrefix_" -#define BREAKPAD_ON_DEMAND "BreakpadOnDemand" diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Info.plist b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Info.plist deleted file mode 100644 index 1113206..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - BuildMachineOSBuild - 11G63 - CFBundleDevelopmentRegion - English - CFBundleExecutable - Breakpad - CFBundleIdentifier - com.googlecode.google-breakpad - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - Breakpad - CFBundlePackageType - FMWK - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0.compiler - DTPlatformBuild - 4E3002 - DTPlatformVersion - GM - DTSDKBuild - 10K549 - DTSDKName - macosx10.6 - DTXcode - 0433 - DTXcodeBuild - 4E3002 - - diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Inspector b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Inspector deleted file mode 100644 index e4d6ca5..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/Inspector and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib deleted file mode 100644 index ba6037a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/breakpadUtilities.dylib and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist deleted file mode 100644 index f802b01..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Info.plist +++ /dev/null @@ -1,48 +0,0 @@ - - - - - BuildMachineOSBuild - 11G63 - CFBundleDevelopmentRegion - English - CFBundleDisplayName - crash_report_sender - CFBundleExecutable - crash_report_sender - CFBundleIconFile - crash_report_sender - CFBundleIdentifier - com.Breakpad.crash_report_sender - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - crash_report_sender - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleVersion - 1.0 - DTCompiler - com.apple.compilers.llvm.clang.1_0.compiler - DTPlatformBuild - 4E3002 - DTPlatformVersion - GM - DTSDKBuild - 10K549 - DTSDKName - macosx10.6 - DTXcode - 0433 - DTXcodeBuild - 4E3002 - LSHasLocalizedDisplayName - - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender deleted file mode 100644 index 14abcbf..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/MacOS/crash_report_sender and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/PkgInfo b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/PkgInfo deleted file mode 100644 index bd04210..0000000 --- a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/PkgInfo +++ /dev/null @@ -1 +0,0 @@ -APPL???? \ No newline at end of file diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib deleted file mode 100644 index 432a001..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/Breakpad.nib and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings deleted file mode 100644 index b731522..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/English.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns deleted file mode 100644 index e8c2124..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/crash_report_sender.icns and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings deleted file mode 100644 index 59b0fae..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/da.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings deleted file mode 100644 index e30f049..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings deleted file mode 100644 index 4fb2a0a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/de.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings deleted file mode 100644 index 2ddf311..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings deleted file mode 100644 index ee3c368..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/es.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings deleted file mode 100644 index 760e85a..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/fr.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/goArrow.png b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/goArrow.png deleted file mode 100644 index f318a56..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/goArrow.png and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings deleted file mode 100644 index 9e99cd1..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/it.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings deleted file mode 100644 index 8d8fd91..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/ja.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings deleted file mode 100644 index affe56e..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/nl.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings deleted file mode 100644 index 8849c0b..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/no.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings deleted file mode 100644 index a375f9d..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings deleted file mode 100644 index 3ad772d..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sl.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings deleted file mode 100644 index ae230ab..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings deleted file mode 100644 index ffcce74..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/sv.lproj/Localizable.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings deleted file mode 100644 index 3a0f347..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/InfoPlist.strings and /dev/null differ diff --git a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings b/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings deleted file mode 100644 index 05acb9b..0000000 Binary files a/tools/ContentBuilder/builder_osx/frameworks/Breakpad.framework/Versions/Current/Resources/crash_report_sender.app/Contents/Resources/tr.lproj/Localizable.strings and /dev/null differ diff --git a/tools/drm/drmtoolp.exe b/tools/drm/drmtoolp.exe index 68e76ab..6a0e7a3 100644 Binary files a/tools/drm/drmtoolp.exe and b/tools/drm/drmtoolp.exe differ diff --git a/tools/drm/ubuntu12_32/drmtoolp b/tools/drm/ubuntu12_32/drmtoolp index b824e3b..e639483 100644 Binary files a/tools/drm/ubuntu12_32/drmtoolp and b/tools/drm/ubuntu12_32/drmtoolp differ diff --git a/tools/drm/ubuntu12_32/drmunpackp.so b/tools/drm/ubuntu12_32/drmunpackp.so index 12f6fd5..f91d550 100644 Binary files a/tools/drm/ubuntu12_32/drmunpackp.so and b/tools/drm/ubuntu12_32/drmunpackp.so differ diff --git a/tools/drm/ubuntu12_32/steamdrmp.so b/tools/drm/ubuntu12_32/steamdrmp.so index 1ba15f7..e946c55 100644 Binary files a/tools/drm/ubuntu12_32/steamdrmp.so and b/tools/drm/ubuntu12_32/steamdrmp.so differ diff --git a/tools/drm/ubuntu12_64/drmtoolp b/tools/drm/ubuntu12_64/drmtoolp index fb7ba33..578227a 100644 Binary files a/tools/drm/ubuntu12_64/drmtoolp and b/tools/drm/ubuntu12_64/drmtoolp differ diff --git a/tools/drm/ubuntu12_64/drmunpackp.so b/tools/drm/ubuntu12_64/drmunpackp.so index fec16ea..9c8ab07 100644 Binary files a/tools/drm/ubuntu12_64/drmunpackp.so and b/tools/drm/ubuntu12_64/drmunpackp.so differ diff --git a/tools/drm/ubuntu12_64/steamdrmp.so b/tools/drm/ubuntu12_64/steamdrmp.so index a20591f..739c002 100644 Binary files a/tools/drm/ubuntu12_64/steamdrmp.so and b/tools/drm/ubuntu12_64/steamdrmp.so differ diff --git a/tools/goldmaster/disk_assets/481_depotcache_1.csd b/tools/goldmaster/disk_assets/481_depotcache_1.csd new file mode 100644 index 0000000..c43e06e Binary files /dev/null and b/tools/goldmaster/disk_assets/481_depotcache_1.csd differ diff --git a/tools/goldmaster/disk_assets/481_depotcache_1.csm b/tools/goldmaster/disk_assets/481_depotcache_1.csm new file mode 100644 index 0000000..19700fd Binary files /dev/null and b/tools/goldmaster/disk_assets/481_depotcache_1.csm differ diff --git a/tools/goldmaster/disk_assets/SteamSetup.exe b/tools/goldmaster/disk_assets/SteamSetup.exe index bec2493..3857f7b 100644 Binary files a/tools/goldmaster/disk_assets/SteamSetup.exe and b/tools/goldmaster/disk_assets/SteamSetup.exe differ diff --git a/tools/goldmaster/disk_assets/SteamworksExample_disk1.sim b/tools/goldmaster/disk_assets/SteamworksExample_disk1.sim deleted file mode 100644 index c735d1d..0000000 Binary files a/tools/goldmaster/disk_assets/SteamworksExample_disk1.sim and /dev/null differ diff --git a/tools/goldmaster/disk_assets/SteamworksExample_disk1.sis b/tools/goldmaster/disk_assets/SteamworksExample_disk1.sis deleted file mode 100644 index 69d34c0..0000000 --- a/tools/goldmaster/disk_assets/SteamworksExample_disk1.sis +++ /dev/null @@ -1,21 +0,0 @@ -"sku" -{ - "name" "Spacewar" - "subscriptionID" "0" - "appID" "480" - "disks" "1" - "language" "english" - "backup" "0" - "apps" - { - "0" "480" - } - "depots" - { - "0" "481" - } - "packages" - { - "1 0" "179664" - } -} diff --git a/tools/goldmaster/disk_assets/SteamworksExample_disk1_0.sid b/tools/goldmaster/disk_assets/SteamworksExample_disk1_0.sid deleted file mode 100644 index 8aaffa5..0000000 Binary files a/tools/goldmaster/disk_assets/SteamworksExample_disk1_0.sid and /dev/null differ diff --git a/tools/goldmaster/disk_assets/sku.sis b/tools/goldmaster/disk_assets/sku.sis new file mode 100644 index 0000000..e01e60f --- /dev/null +++ b/tools/goldmaster/disk_assets/sku.sis @@ -0,0 +1,27 @@ +"sku" +{ + "name" "Steamworks Spacewar" + "disks" "1" + "disk" "1" + "backup" "0" + "contenttype" "3" + "apps" + { + "0" "480" + } + "depots" + { + "0" "481" + } + "manifests" + { + "481" "8382873932604653347" + } + "chunkstores" + { + "481" + { + "1" "841424" + } + } +} diff --git a/tools/goldmaster/project_example.bat b/tools/goldmaster/project_example.bat index eba6034..659e4b3 100644 --- a/tools/goldmaster/project_example.bat +++ b/tools/goldmaster/project_example.bat @@ -1,2 +1,2 @@ -steam.exe -login -language english -build_install sku_project_example.txt -dest -@type logs\build_log.txt +steam.exe -login -build_installer sku_project_example.txt +@type logs\backup_log.txt \ No newline at end of file diff --git a/tools/goldmaster/sku_project_example.txt b/tools/goldmaster/sku_project_example.txt index 8029dfa..dc685a9 100644 --- a/tools/goldmaster/sku_project_example.txt +++ b/tools/goldmaster/sku_project_example.txt @@ -1,17 +1,12 @@ "sku" { - "appID" 20000 + "name" "Steamworks Spacewar" + "appID" "480" "disk_size_mb" 4700 "included_depots" { - "1" 20001 - "2" 20002 - } - - "excluded_depots" - { - - "1" 20003 + "1" "481" + // "2" "482" more depots if needed } }