Sort callback tables by id

This way the generated file is more deterministic, and hopefully less
irrelevant diff is produced (for example when switching from Python 2
to Python 3, or when adding more callbacks that cause rehashing the
dictionary).

lsteamclient/cb_getapi_sizes.dat

@@ -1,112 +1,118 @@
 #ifdef __i386__
-case 513: /* LobbyCreated_t_16 */
-    return 12;
-case 4524: /* HTML_ShowToolTip_t_8 */
-    return 8;
-case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 16;
-case 4514: /* HTML_JSAlert_t_8 */
-    return 8;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 4502: /* HTML_NeedsPaint_t_48 */
-    return 48;
-case 1303: /* RemoteStorageAppSyncProgress_t_288 */
-    return 280;
 case 152: /* MicroTxnAuthorizationResponse_t_24 */
     return 16;
+case 209: /* GSReputation_t_40 */
+    return 32;
+case 513: /* LobbyCreated_t_16 */
+    return 12;
+case 1023: /* FileDetailsResult_t_40 */
+    return 36;
+case 1106: /* LeaderboardScoreUploaded_t_32 */
+    return 28;
+case 1111: /* LeaderboardUGCSet_t_16 */
+    return 12;
+case 1112: /* PS3TrophiesInstalled_t_24 */
+    return 20;
+case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
+    return 704;
+case 1303: /* RemoteStorageAppSyncProgress_t_288 */
+    return 280;
+case 1307: /* RemoteStorageFileShareResult_t_280 */
+    return 272;
+case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
+    return 32;
+case 1309: /* RemoteStoragePublishFileResult_t_24 */
+    return 16;
+case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
+    return 1732;
+case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
+    return 12;
+case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
+    return 412;
+case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
+    return 12;
+case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
+    return 612;
+case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
+    return 12;
+case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
+    return 16;
+case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
+    return 288;
+case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
+    return 9748;
+case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
+    return 620;
+case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
+    return 28;
+case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
+    return 12;
+case 1325: /* RemoteStorageUserVoteDetails_t_24 */
+    return 16;
+case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
+    return 412;
+case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
+    return 16;
+case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
+    return 20;
+case 2101: /* HTTPRequestCompleted_t_32 */
+    return 24;
+case 2102: /* HTTPRequestHeadersReceived_t_16 */
+    return 12;
+case 2103: /* HTTPRequestDataReceived_t_24 */
+    return 20;
+case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
+    return 9768;
+case 3403: /* CreateItemResult_t_24 */
+    return 16;
+case 3405: /* ItemInstalled_t_16 */
+    return 12;
+case 3406: /* DownloadItemResult_t_24 */
+    return 16;
+case 3412: /* AddUGCDependencyResult_t_24 */
+    return 20;
+case 3413: /* RemoveUGCDependencyResult_t_24 */
+    return 20;
+case 3414: /* AddAppDependencyResult_t_24 */
+    return 16;
+case 3415: /* RemoveAppDependencyResult_t_24 */
+    return 16;
+case 3416: /* GetAppDependenciesResult_t_152 */
+    return 148;
+case 3417: /* DeleteItemResult_t_16 */
+    return 12;
+case 4502: /* HTML_NeedsPaint_t_48 */
+    return 48;
+case 4503: /* HTML_StartRequest_t_20 */
+    return 20;
 case 4505: /* HTML_URLChanged_t_24 */
     return 24;
 case 4506: /* HTML_FinishedRequest_t_12 */
     return 12;
-case 1307: /* RemoteStorageFileShareResult_t_280 */
+case 4507: /* HTML_OpenLinkInNewTab_t_8 */
-    return 272;
+    return 8;
 case 4508: /* HTML_ChangedTitle_t_8 */
     return 8;
-case 1309: /* RemoteStoragePublishFileResult_t_24 */
+case 4513: /* HTML_LinkAtPosition_t_20 */
+    return 20;
+case 4514: /* HTML_JSAlert_t_8 */
+    return 8;
+case 4515: /* HTML_JSConfirm_t_8 */
+    return 8;
+case 4516: /* HTML_FileOpenDialog_t_12 */
+    return 12;
+case 4517: /* HTML_ComboNeedsPaint_t_16 */
     return 16;
-case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
-    return 1732;
-case 1311: /* RemoteStorageDeletePublishedFileResult_t_16 */
-    return 12;
-case 1312: /* RemoteStorageEnumerateUserPublishedFilesResult_t_416 */
-    return 412;
-case 1313: /* RemoteStorageSubscribePublishedFileResult_t_16 */
-    return 12;
-case 1314: /* RemoteStorageEnumerateUserSubscribedFilesResult_t_616 */
-    return 612;
-case 1315: /* RemoteStorageUnsubscribePublishedFileResult_t_16 */
-    return 12;
-case 1316: /* RemoteStorageUpdatePublishedFileResult_t_24 */
-    return 16;
-case 1317: /* RemoteStorageDownloadUGCResult_t_296 */
-    return 288;
-case 1318: /* RemoteStorageGetPublishedFileDetailsResult_t_9760 */
-    return 9748;
-case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
-    return 620;
-case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
-    return 28;
 case 4521: /* HTML_NewWindow_t_28 */
     return 28;
 case 4523: /* HTML_StatusText_t_8 */
     return 8;
-case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
+case 4524: /* HTML_ShowToolTip_t_8 */
-    return 12;
-case 1325: /* RemoteStorageUserVoteDetails_t_24 */
-    return 16;
-case 1326: /* RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 */
-    return 412;
-case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
-    return 16;
-case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
-    return 20;
-case 5301: /* JoinPartyCallback_t_280 */
-    return 276;
-case 5302: /* CreateBeaconCallback_t_16 */
-    return 12;
-case 2103: /* HTTPRequestDataReceived_t_24 */
-    return 20;
-case 4507: /* HTML_OpenLinkInNewTab_t_8 */
     return 8;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
 case 4525: /* HTML_UpdateToolTip_t_8 */
     return 8;
-case 4503: /* HTML_StartRequest_t_20 */
+case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
     return 20;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 4513: /* HTML_LinkAtPosition_t_20 */
-    return 20;
-case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
-    return 9768;
-case 3403: /* CreateItemResult_t_24 */
-    return 16;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
-case 3405: /* ItemInstalled_t_16 */
-    return 12;
-case 3406: /* DownloadItemResult_t_24 */
-    return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 4515: /* HTML_JSConfirm_t_8 */
-    return 8;
-case 3412: /* AddUGCDependencyResult_t_24 */
-    return 20;
-case 3413: /* RemoveUGCDependencyResult_t_24 */
-    return 20;
-case 3414: /* AddAppDependencyResult_t_24 */
-    return 16;
-case 1111: /* LeaderboardUGCSet_t_16 */
-    return 12;
-case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 20;
-case 3417: /* DeleteItemResult_t_16 */
-    return 12;
 case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
     return 12;
 case 5212: /* RequestPlayersForGameResultCallback_t_64 */
@@ -117,42 +123,34 @@ case 5214: /* SubmitPlayerResultResultCallback_t_24 */
     return 20;
 case 5215: /* EndGameResultCallback_t_16 */
     return 12;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
+case 5301: /* JoinPartyCallback_t_280 */
-    return 20;
+    return 276;
-case 4517: /* HTML_ComboNeedsPaint_t_16 */
+case 5302: /* CreateBeaconCallback_t_16 */
+    return 12;
+#endif
+#ifdef __x86_64__
+case 152: /* MicroTxnAuthorizationResponse_t_24 */
     return 16;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
+case 209: /* GSReputation_t_40 */
     return 32;
-case 4516: /* HTML_FileOpenDialog_t_12 */
+case 513: /* LobbyCreated_t_16 */
     return 12;
 case 1023: /* FileDetailsResult_t_40 */
     return 36;
-#endif
+case 1106: /* LeaderboardScoreUploaded_t_32 */
-#ifdef __x86_64__
+    return 28;
-case 513: /* LobbyCreated_t_16 */
+case 1111: /* LeaderboardUGCSet_t_16 */
     return 12;
-case 4524: /* HTML_ShowToolTip_t_16 */
+case 1112: /* PS3TrophiesInstalled_t_24 */
-    return 12;
+    return 20;
-case 3415: /* RemoveAppDependencyResult_t_24 */
+case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 16;
+    return 704;
-case 4514: /* HTML_JSAlert_t_16 */
-    return 12;
-case 3416: /* GetAppDependenciesResult_t_152 */
-    return 148;
-case 4502: /* HTML_NeedsPaint_t_56 */
-    return 52;
 case 1303: /* RemoteStorageAppSyncProgress_t_288 */
     return 280;
-case 152: /* MicroTxnAuthorizationResponse_t_24 */
-    return 16;
-case 4505: /* HTML_URLChanged_t_48 */
-    return 36;
-case 4506: /* HTML_FinishedRequest_t_24 */
-    return 20;
 case 1307: /* RemoteStorageFileShareResult_t_280 */
     return 272;
-case 4508: /* HTML_ChangedTitle_t_16 */
+case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
-    return 12;
+    return 32;
 case 1309: /* RemoteStoragePublishFileResult_t_24 */
     return 16;
 case 1310: /* RemoteStorageGetPublishedFileDetailsResult_t_1744 */
@@ -177,10 +175,6 @@ case 1319: /* RemoteStorageEnumerateWorkshopFilesResult_t_624 */
     return 620;
 case 1320: /* RemoteStorageGetPublishedItemVoteDetailsResult_t_32 */
     return 28;
-case 4521: /* HTML_NewWindow_t_40 */
-    return 32;
-case 4523: /* HTML_StatusText_t_16 */
-    return 12;
 case 1324: /* RemoteStorageUpdateUserPublishedItemVoteResult_t_16 */
     return 12;
 case 1325: /* RemoteStorageUserVoteDetails_t_24 */
@@ -191,52 +185,64 @@ case 1327: /* RemoteStorageSetUserPublishedFileActionResult_t_24 */
     return 16;
 case 1330: /* RemoteStoragePublishedFileUpdated_t_24 */
     return 20;
-case 5301: /* JoinPartyCallback_t_280 */
+case 2101: /* HTTPRequestCompleted_t_32 */
-    return 276;
+    return 24;
-case 5302: /* CreateBeaconCallback_t_16 */
+case 2102: /* HTTPRequestHeadersReceived_t_16 */
     return 12;
 case 2103: /* HTTPRequestDataReceived_t_24 */
     return 20;
-case 4507: /* HTML_OpenLinkInNewTab_t_16 */
-    return 12;
-case 2101: /* HTTPRequestCompleted_t_32 */
-    return 24;
-case 4525: /* HTML_UpdateToolTip_t_16 */
-    return 12;
-case 4503: /* HTML_StartRequest_t_40 */
-    return 32;
-case 2102: /* HTTPRequestHeadersReceived_t_16 */
-    return 12;
-case 4513: /* HTML_LinkAtPosition_t_32 */
-    return 24;
 case 3402: /* SteamUGCRequestUGCDetailsResult_t_9784 */
     return 9768;
 case 3403: /* CreateItemResult_t_24 */
     return 16;
-case 1221: /* SteamNetConnectionStatusChangedCallback_t_712 */
-    return 704;
 case 3405: /* ItemInstalled_t_16 */
     return 12;
 case 3406: /* DownloadItemResult_t_24 */
     return 16;
-case 209: /* GSReputation_t_40 */
-    return 32;
-case 1106: /* LeaderboardScoreUploaded_t_32 */
-    return 28;
-case 4515: /* HTML_JSConfirm_t_16 */
-    return 12;
 case 3412: /* AddUGCDependencyResult_t_24 */
     return 20;
 case 3413: /* RemoveUGCDependencyResult_t_24 */
     return 20;
 case 3414: /* AddAppDependencyResult_t_24 */
     return 16;
-case 1111: /* LeaderboardUGCSet_t_16 */
+case 3415: /* RemoveAppDependencyResult_t_24 */
-    return 12;
+    return 16;
-case 1112: /* PS3TrophiesInstalled_t_24 */
+case 3416: /* GetAppDependenciesResult_t_152 */
-    return 20;
+    return 148;
 case 3417: /* DeleteItemResult_t_16 */
     return 12;
+case 4502: /* HTML_NeedsPaint_t_56 */
+    return 52;
+case 4503: /* HTML_StartRequest_t_40 */
+    return 32;
+case 4505: /* HTML_URLChanged_t_48 */
+    return 36;
+case 4506: /* HTML_FinishedRequest_t_24 */
+    return 20;
+case 4507: /* HTML_OpenLinkInNewTab_t_16 */
+    return 12;
+case 4508: /* HTML_ChangedTitle_t_16 */
+    return 12;
+case 4513: /* HTML_LinkAtPosition_t_32 */
+    return 24;
+case 4514: /* HTML_JSAlert_t_16 */
+    return 12;
+case 4515: /* HTML_JSConfirm_t_16 */
+    return 12;
+case 4516: /* HTML_FileOpenDialog_t_24 */
+    return 20;
+case 4517: /* HTML_ComboNeedsPaint_t_24 */
+    return 20;
+case 4521: /* HTML_NewWindow_t_40 */
+    return 32;
+case 4523: /* HTML_StatusText_t_16 */
+    return 12;
+case 4524: /* HTML_ShowToolTip_t_16 */
+    return 12;
+case 4525: /* HTML_UpdateToolTip_t_16 */
+    return 12;
+case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
+    return 20;
 case 5211: /* RequestPlayersForGameProgressCallback_t_16 */
     return 12;
 case 5212: /* RequestPlayersForGameResultCallback_t_64 */
@@ -247,14 +253,8 @@ case 5214: /* SubmitPlayerResultResultCallback_t_24 */
     return 20;
 case 5215: /* EndGameResultCallback_t_16 */
     return 12;
-case 4704: /* SteamInventoryStartPurchaseResult_t_24 */
+case 5301: /* JoinPartyCallback_t_280 */
-    return 20;
+    return 276;
-case 4517: /* HTML_ComboNeedsPaint_t_24 */
+case 5302: /* CreateBeaconCallback_t_16 */
-    return 20;
+    return 12;
-case 1308: /* RemoteStorageDownloadUGCResult_t_40 */
-    return 32;
-case 4516: /* HTML_FileOpenDialog_t_24 */
-    return 20;
-case 1023: /* FileDetailsResult_t_40 */
-    return 36;
 #endif

lsteamclient/gen_wrapper.py

@@ -1263,7 +1263,7 @@ cbsizefile = open("cb_getapi_sizes.dat", "w")
 
 cbsizefile.write("#ifdef __i386__\n")
 getapifile.write("#ifdef __i386__\n")
-for cb in cb_table.keys():
+for cb in sorted(cb_table.keys()):
     cbsizefile.write("case %u: /* %s */\n" % (cb, cb_table[cb][1][0][1]))
     cbsizefile.write("    return %u;\n" % cb_table[cb][0])
     getapifile.write("case %u:\n" % cb)
@@ -1277,7 +1277,7 @@ getapifile.write("#endif\n")
 
 cbsizefile.write("#ifdef __x86_64__\n")
 getapifile.write("#ifdef __x86_64__\n")
-for cb in cb_table64.keys():
+for cb in sorted(cb_table64.keys()):
     cbsizefile.write("case %u: /* %s */\n" % (cb, cb_table64[cb][1][0][1]))
     cbsizefile.write("    return %u;\n" % cb_table64[cb][0])
     getapifile.write("case %u:\n" % cb)