Compare commits

..

No commits in common. "39cb2c7c1776bb9f530ca62bb606f5029b675ed3" and "02ee5f9a6d200ff4680da2a59a63775bcc33818b" have entirely different histories.

3 changed files with 6 additions and 35 deletions

View File

@ -116,7 +116,7 @@ bool Steam_HTTP::SetHTTPRequestGetOrPostParameter( HTTPRequestHandle hRequest, c
// header and only do a local cache lookup rather than sending any actual remote request. // header and only do a local cache lookup rather than sending any actual remote request.
bool Steam_HTTP::SendHTTPRequest( HTTPRequestHandle hRequest, SteamAPICall_t *pCallHandle ) bool Steam_HTTP::SendHTTPRequest( HTTPRequestHandle hRequest, SteamAPICall_t *pCallHandle )
{ {
PRINT_DEBUG("SendHTTPRequest %u %p\n", hRequest, pCallHandle); PRINT_DEBUG("SendHTTPRequest\n");
Steam_Http_Request *request = get_request(hRequest); Steam_Http_Request *request = get_request(hRequest);
if (!request) { if (!request) {
return false; return false;
@ -276,12 +276,7 @@ bool Steam_HTTP::GetHTTPDownloadProgressPct( HTTPRequestHandle hRequest, float *
bool Steam_HTTP::SetHTTPRequestRawPostBody( HTTPRequestHandle hRequest, const char *pchContentType, uint8 *pubBody, uint32 unBodyLen ) bool Steam_HTTP::SetHTTPRequestRawPostBody( HTTPRequestHandle hRequest, const char *pchContentType, uint8 *pubBody, uint32 unBodyLen )
{ {
PRINT_DEBUG("SetHTTPRequestRawPostBody\n"); PRINT_DEBUG("SetHTTPRequestRawPostBody\n");
Steam_Http_Request *request = get_request(hRequest); return false;
if (!request) {
return false;
}
return true;
} }
@ -365,11 +360,5 @@ bool Steam_HTTP::SetHTTPRequestAbsoluteTimeoutMS( HTTPRequestHandle hRequest, ui
bool Steam_HTTP::GetHTTPRequestWasTimedOut( HTTPRequestHandle hRequest, bool *pbWasTimedOut ) bool Steam_HTTP::GetHTTPRequestWasTimedOut( HTTPRequestHandle hRequest, bool *pbWasTimedOut )
{ {
PRINT_DEBUG("GetHTTPRequestWasTimedOut\n"); PRINT_DEBUG("GetHTTPRequestWasTimedOut\n");
Steam_Http_Request *request = get_request(hRequest); return false;
if (!request) {
return false;
}
if (pbWasTimedOut) *pbWasTimedOut = false;
return true;
} }

View File

@ -453,11 +453,6 @@ STEAM_METHOD_DESC(GrantPromoItems() checks the list of promotional items for whi
bool GrantPromoItems( SteamInventoryResult_t *pResultHandle ) bool GrantPromoItems( SteamInventoryResult_t *pResultHandle )
{ {
PRINT_DEBUG("GrantPromoItems\n"); PRINT_DEBUG("GrantPromoItems\n");
std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Steam_Inventory_Requests* request = new_inventory_result(false);
if (pResultHandle != nullptr)
*pResultHandle = request->inventory_result;
return true; return true;
} }
@ -469,25 +464,13 @@ bool GrantPromoItems( SteamInventoryResult_t *pResultHandle )
bool AddPromoItem( SteamInventoryResult_t *pResultHandle, SteamItemDef_t itemDef ) bool AddPromoItem( SteamInventoryResult_t *pResultHandle, SteamItemDef_t itemDef )
{ {
PRINT_DEBUG("AddPromoItem\n"); PRINT_DEBUG("AddPromoItem\n");
//TODO return false;
std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Steam_Inventory_Requests* request = new_inventory_result(false);
if (pResultHandle != nullptr)
*pResultHandle = request->inventory_result;
return true;
} }
bool AddPromoItems( SteamInventoryResult_t *pResultHandle, STEAM_ARRAY_COUNT(unArrayLength) const SteamItemDef_t *pArrayItemDefs, uint32 unArrayLength ) bool AddPromoItems( SteamInventoryResult_t *pResultHandle, STEAM_ARRAY_COUNT(unArrayLength) const SteamItemDef_t *pArrayItemDefs, uint32 unArrayLength )
{ {
PRINT_DEBUG("AddPromoItems\n"); PRINT_DEBUG("AddPromoItems\n");
//TODO return false;
std::lock_guard<std::recursive_mutex> lock(global_mutex);
struct Steam_Inventory_Requests* request = new_inventory_result(false);
if (pResultHandle != nullptr)
*pResultHandle = request->inventory_result;
return true;
} }

View File

@ -149,9 +149,8 @@ void remove_connection(CSteamID id)
SNetSocket_t create_connection_socket(CSteamID target, int nVirtualPort, uint32 nIP, uint16 nPort, SNetListenSocket_t id=0, enum steam_socket_connection_status status=SOCKET_CONNECTING, SNetSocket_t other_id=0) SNetSocket_t create_connection_socket(CSteamID target, int nVirtualPort, uint32 nIP, uint16 nPort, SNetListenSocket_t id=0, enum steam_socket_connection_status status=SOCKET_CONNECTING, SNetSocket_t other_id=0)
{ {
static SNetSocket_t socket_number = 0; static SNetSocket_t socket_number = 0;
bool found; bool found = 0;
do { do {
found = false;
++socket_number; ++socket_number;
for (auto & c: connection_sockets) { for (auto & c: connection_sockets) {
if (c.id == socket_number || socket_number == 0) { if (c.id == socket_number || socket_number == 0) {