Update CreateSteamPipe to return the first free number as pipe handle

Author: NicknineTheEagle

dll/dll/steam_client.h

@@ -187,7 +187,8 @@ public ISteamClient
     int steamclient_version{};
     bool using_old_callbacks{};
 
-    unsigned steam_pipe_counter = 1;
+    uint32 steam_pipe_counter = 1;
+    std::priority_queue<uint32, std::vector<uint32>, std::greater<>> freed_steam_pipes{};
     std::map<HSteamPipe, enum Steam_Pipe> steam_pipes{};
 
 

dll/steam_client.cpp

@@ -311,18 +311,24 @@ void Steam_Client::setAppID(uint32 appid)
 
 }
 
-    // Creates a communication pipe to the Steam client.
+// Creates a communication pipe to the Steam client.
 // NOT THREADSAFE - ensure that no other threads are accessing Steamworks API when calling
 HSteamPipe Steam_Client::CreateSteamPipe()
 {
     PRINT_DEBUG_ENTRY();
-    if (!steam_pipe_counter) ++steam_pipe_counter;
-    HSteamPipe pipe = steam_pipe_counter;
-    ++steam_pipe_counter;
-    PRINT_DEBUG("  returned pipe handle %i", pipe);
 
+    HSteamPipe pipe{};
+    if (!freed_steam_pipes.empty()) {
+        pipe = freed_steam_pipes.top();
+        freed_steam_pipes.pop();
+    } else {
+        if (!steam_pipe_counter) ++steam_pipe_counter;
+        pipe = steam_pipe_counter;
+        ++steam_pipe_counter;
+    }
+
+    PRINT_DEBUG("  returned pipe handle %i", pipe);
     steam_pipes[pipe] = Steam_Pipe::NO_USER;
-    
     return pipe;
 }
 
@@ -334,6 +340,7 @@ bool Steam_Client::BReleaseSteamPipe( HSteamPipe hSteamPipe )
 {
     PRINT_DEBUG("%i", hSteamPipe);
     if (steam_pipes.count(hSteamPipe)) {
+        freed_steam_pipes.push(hSteamPipe);
         return steam_pipes.erase(hSteamPipe) > 0;
     }
 

dll/steam_client_interface_getter.cpp

@@ -96,18 +96,7 @@ ISteamGameStats *Steam_Client::GetISteamGameStats( HSteamUser hSteamUser, HSteam
 ISteamUser *Steam_Client::GetISteamUser( HSteamUser hSteamUser, HSteamPipe hSteamPipe, const char *pchVersion )
 {
     PRINT_DEBUG("%s", pchVersion);
-    
-    if (!hSteamUser) {
-        return NULL;
-    }
-    if (!steam_pipes.count(hSteamPipe)) {
-        // Fallback for steamclient_experimental build: if pipe 1 is requested but not found,
-        // and we have other valid pipes, continue execution instead of returning NULL
-        if (hSteamPipe !=1 || steam_pipes.empty()) {
-            return NULL;
-        }
-    }
-
+    if (!steam_pipes.count(hSteamPipe) || !hSteamUser) return nullptr;
 
     Steam_User *steam_user_tmp{};