ImGui/backends/imgui_impl_dx10.cpp

@@ -346,7 +346,7 @@ static void ImGui_ImplDX10_CreateFontsTexture()
         desc.MipLODBias = 0.f;
         desc.ComparisonFunc = D3D10_COMPARISON_ALWAYS;
         desc.MinLOD = 0.f;
-        desc.MaxLOD = D3D10_FLOAT32_MAX;
+        desc.MaxLOD = 0.f;
         bd->pd3dDevice->CreateSamplerState(&desc, &bd->pFontSampler);
     }
 }

ImGui/backends/imgui_impl_dx11.cpp

@@ -358,7 +358,7 @@ static void ImGui_ImplDX11_CreateFontsTexture()
         desc.MipLODBias = 0.f;
         desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
         desc.MinLOD = 0.f;
-        desc.MaxLOD = D3D11_FLOAT32_MAX;
+        desc.MaxLOD = 0.f;
         bd->pd3dDevice->CreateSamplerState(&desc, &bd->pFontSampler);
     }
 }

dll/appticket.h

@@ -1,300 +0,0 @@
-
-struct AppTicketV1
-{
-    // Total ticket size - 16
-    uint32_t TicketSize;
-    uint32_t TicketVersion;
-    uint32_t Unk2;
-    std::vector<uint8_t> UserData;
-
-    void Reset()
-    {
-        TicketSize = 0;
-        TicketVersion = 0;
-        Unk2 = 0;
-        UserData.clear();
-    }
-
-    std::vector<uint8_t> Serialize()
-    {
-        std::vector<uint8_t> buffer;
-        uint8_t* pBuffer;
-
-        buffer.resize(16 + UserData.size());
-        pBuffer = buffer.data();
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketSize;      pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketVersion;   pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = UserData.size(); pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = Unk2;            pBuffer += 4;
-        memcpy(pBuffer, UserData.data(), UserData.size());
-
-        return buffer;
-    }
-
-    bool Deserialize(const uint8_t* pBuffer, size_t size)
-    {
-        if (size < 16)
-            return false;
-
-        uint32_t user_data_size;
-
-        TicketSize     = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        TicketVersion  = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        user_data_size = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-
-        if (size < (user_data_size + 16))
-            return false;
-
-        Unk2 = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        UserData.resize(user_data_size);
-        memcpy(UserData.data(), pBuffer, user_data_size);
-
-        return true;
-    }
-
-    //inline uint32_t TicketSize()   { return *reinterpret_cast<uint32_t*>(_Buffer); }
-    //inline uint32_t TicketVersion(){ return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 4); }
-    //inline uint32_t UserDataSize() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 8); }
-    //inline uint32_t Unk2()         { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 12); }
-    //inline uint8_t* UserData()     { return  reinterpret_cast<uint8_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 16); }
-};
-
-struct AppTicketV2
-{
-    // Totals ticket size - 16 - TicketV1::UserData.size()
-    uint32_t TicketSize;
-    uint32_t TicketVersion;
-    uint64_t SteamID;
-    uint32_t AppID;
-    uint32_t Unk1;
-    uint32_t Unk2;
-    uint32_t TicketFlags;
-    uint32_t TicketIssueTime;
-    uint32_t TicketValidityEnd;
-
-    static constexpr uint32_t LicenseBorrowed = 0x00000002; // Bit 1: IsLicenseBorrowed
-    static constexpr uint32_t LicenseTemporary = 0x00000004; // Bit 2: IsLicenseTemporary
-
-    void Reset()
-    {
-        TicketSize = 0;
-        TicketVersion = 0;
-        SteamID = 0;
-        AppID = 0;
-        Unk1 = 0;
-        Unk2 = 0;
-        TicketFlags = 0;
-        TicketIssueTime = 0;
-        TicketValidityEnd = 0;
-    }
-
-    std::vector<uint8_t> Serialize()
-    {
-        std::vector<uint8_t> buffer;
-        uint8_t* pBuffer;
-
-        buffer.resize(40);
-        pBuffer = buffer.data();
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketSize;      pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketVersion;   pBuffer += 4;
-        *reinterpret_cast<uint64_t*>(pBuffer) = SteamID;         pBuffer += 8;
-        *reinterpret_cast<uint32_t*>(pBuffer) = AppID;           pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = Unk1;            pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = Unk2;            pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketFlags;     pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketIssueTime; pBuffer += 4;
-        *reinterpret_cast<uint32_t*>(pBuffer) = TicketValidityEnd;
-
-        return buffer;
-    }
-
-    bool Deserialize(const uint8_t* pBuffer, size_t size)
-    {
-        if (size < 40)
-            return false;
-
-        TicketSize        = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        TicketVersion     = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        SteamID           = *reinterpret_cast<const uint64_t*>(pBuffer); pBuffer += 8;
-        AppID             = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        Unk1              = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        Unk2              = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        TicketFlags       = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        TicketIssueTime   = *reinterpret_cast<const uint32_t*>(pBuffer); pBuffer += 4;
-        TicketValidityEnd = *reinterpret_cast<const uint32_t*>(pBuffer);
-
-        return true;
-    }
-
-    //inline uint32_t TicketSize() { return *reinterpret_cast<uint32_t*>(_Buffer); }
-    //inline uint32_t TicketVersion() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 4); }
-    //inline uint64_t SteamID() { return *reinterpret_cast<uint64_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 8); };
-    //inline uint32_t AppID() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 16); }
-    //inline uint32_t Unk1() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 20); }
-    //inline uint32_t Unk2() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 24); }
-    //inline uint32_t TicketFlags() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 28); }
-    //inline uint32_t TicketIssueTime() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 32); }
-    //inline uint32_t TicketValidityEnd() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 36); }
-};
-
-struct AppTicketV4
-{
-    std::vector<uint32_t> AppIDs;
-
-    bool HasVACStatus = false;
-    uint32_t VACStatus;
-    bool HasAppValue = false;
-    uint32_t AppValue;
-
-    void Reset()
-    {
-        AppIDs.clear();
-        HasVACStatus = false;
-        HasAppValue = false;
-    }
-
-    std::vector<uint8_t> Serialize()
-    {
-        std::vector<uint32_t> appids = AppIDs;
-        if (appids.size() == 0)
-        {
-            appids.emplace_back(0);
-        }
-
-        uint16_t appid_count = static_cast<uint16_t>(appids.size() > 140 ? 140 : appids.size());
-        size_t buffer_size = static_cast<uint32_t>(appid_count) * 4ul + 2ul;
-        std::vector<uint8_t> buffer;
-        uint8_t* pBuffer;
-
-        if (HasAppValue)
-        {// VACStatus + AppValue
-            buffer_size += 4;
-            if (!HasVACStatus)
-            {
-                HasVACStatus = true;
-                VACStatus = 0;
-            }
-        }
-        if (HasVACStatus)
-        {// VACStatus only
-            buffer_size += 4;
-        }
-
-        buffer.resize(buffer_size);
-        pBuffer = buffer.data();
-        *reinterpret_cast<uint16_t*>(pBuffer) = appid_count;
-        pBuffer += 2;
-
-        for (int i = 0; i < appid_count && i < 140; ++i)
-        {
-            *reinterpret_cast<uint32_t*>(pBuffer) = appids[i];
-            pBuffer += 4;
-        }
-
-        if (HasVACStatus)
-        {
-            *reinterpret_cast<uint32_t*>(pBuffer) = VACStatus;
-            pBuffer += 4;
-        }
-        if (HasAppValue)
-        {
-            *reinterpret_cast<uint32_t*>(pBuffer) = AppValue;
-        }
-
-        return buffer;
-    }
-
-    bool Deserialize(const uint8_t* pBuffer, size_t size)
-    {
-        if (size < 2)
-            return false;
-
-        uint16_t appid_count = *reinterpret_cast<const uint16_t*>(pBuffer);
-        if (size < (appid_count * 4 + 2) || appid_count >= 140)
-            return false;
-
-        AppIDs.resize(appid_count);
-        pBuffer += 2;
-        size -= 2;
-        for (int i = 0; i < appid_count; ++i)
-        {
-            AppIDs[i] = *reinterpret_cast<const uint32_t*>(pBuffer);
-            pBuffer += 4;
-            size -= 4;
-        }
-
-        HasVACStatus = false;
-        HasAppValue = false;
-
-        if (size < 4)
-            return true;
-
-        HasVACStatus = true;
-        VACStatus = *reinterpret_cast<const uint32_t*>(pBuffer);
-        pBuffer += 4;
-        size -= 4;
-
-        if (size < 4)
-            return true;
-
-        HasAppValue = true;
-        AppValue = *reinterpret_cast<const uint32_t*>(pBuffer);
-
-        return true;
-    }
-
-    // Often 1 with empty appid
-    //inline uint16_t  AppIDCount() { return *reinterpret_cast<uint16_t*>(_Buffer); }
-    //inline uint32_t* AppIDs() { return reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 2); }
-    // Optional
-    //inline uint32_t  VACStatus() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 2 + AppIDCount() * 4); }
-    // Optional
-    //inline uint32_t  AppValue() { return *reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(_Buffer) + 2 + AppIDCount() * 4 + 4); }
-};
-
-class DecryptedAppTicket
-{
-public:
-    AppTicketV1 TicketV1;
-    AppTicketV2 TicketV2;
-    AppTicketV4 TicketV4;
-
-    bool DeserializeTicket(const uint8_t* pBuffer, size_t buf_size)
-    {
-        if (!TicketV1.Deserialize(pBuffer, buf_size))
-            return false;
-
-        pBuffer += 16 + TicketV1.UserData.size();
-        buf_size -= 16 + TicketV1.UserData.size();
-        if (!TicketV2.Deserialize(pBuffer, buf_size))
-            return false;
-
-        if (TicketV2.TicketVersion > 2)
-        {
-            pBuffer += 40;
-            buf_size -= 40;
-            if (!TicketV4.Deserialize(pBuffer, buf_size))
-                return false;
-        }
-
-        return true;
-    }
-
-    std::vector<uint8_t> SerializeTicket()
-    {
-        std::vector<uint8_t> buffer;
-
-        TicketV1.TicketSize = TicketV1.UserData.size() + 40 + 2 + ((TicketV4.AppIDs.size() == 0 ? 1 : TicketV4.AppIDs.size()) * 4) + (TicketV4.HasVACStatus ? 4 : 0) + (TicketV4.HasAppValue ? 4 : 0);
-        TicketV2.TicketSize = TicketV1.TicketSize - TicketV1.UserData.size();
-
-        buffer = TicketV1.Serialize();
-
-        auto v = TicketV2.Serialize();
-
-        buffer.insert(buffer.end(), v.begin(), v.end());
-        v = TicketV4.Serialize();
-        buffer.insert(buffer.end(), v.begin(), v.end());
-
-        return buffer;
-    }
-};

dll/common_includes.h

@@ -99,11 +99,6 @@ inline std::wstring utf8_decode(const std::string &str)
     return wstrTo;
 }
 
-inline void reset_LastError()
-{
-    SetLastError(0);
-}
-
 #elif defined(__LINUX__)
     #include <arpa/inet.h>
 
@@ -134,7 +129,6 @@ inline void reset_LastError()
     #define PATH_SEPARATOR "/" 
 
     #define utf8_decode(a) a
-    #define reset_LastError()
 #endif
 //#define PRINT_DEBUG(...) fprintf(stdout, __VA_ARGS__)
 #ifdef EMU_RELEASE_BUILD

dll/dll.cpp

@@ -112,7 +112,6 @@ static void load_old_interface_versions()
     PRINT_DEBUG("networking: %s\n", old_networking);
     PRINT_DEBUG("html surface: %s\n", old_html_surface);
     PRINT_DEBUG("utils: %s\n", old_utils);
-    reset_LastError();
     loaded = true;
 }
 

dll/local_storage.cpp

@@ -261,7 +261,6 @@ static std::vector<struct File_Data> get_filenames_recursive_w(std::wstring base
         //printf("Failed to find path: %s", strPath.c_str());
     }
 
-    reset_LastError();
     return output;
 }
 
@@ -570,7 +569,6 @@ int Local_Storage::get_file_data(std::string full_path, char *data, unsigned int
     myfile.seekg (offset, std::ios::beg);
     myfile.read (data, max_length);
     myfile.close();
-    reset_LastError();
     return myfile.gcount();
 }
 
@@ -728,7 +726,6 @@ bool Local_Storage::load_json(std::string full_path, nlohmann::json& json)
         PRINT_DEBUG("Couldn't open file \"%s\" to read json\n", full_path.c_str());
     }
 
-    reset_LastError();
     return false;
 }
 
@@ -762,7 +759,6 @@ bool Local_Storage::write_json_file(std::string folder, std::string const&file,
     
     PRINT_DEBUG("Couldn't open file \"%s\" to write json\n", full_path.c_str());
 
-    reset_LastError();
     return false;
 }
 
@@ -778,8 +774,6 @@ std::vector<image_pixel_t> Local_Storage::load_image(std::string const& image_pa
 
         stbi_image_free(img);
     }
-
-    reset_LastError();
     return res;
 }
 

dll/net.proto

@@ -235,13 +235,3 @@ message Common_Message {
     uint32 source_ip = 128;
     uint32 source_port = 129;
 }
-
-//Non networking related protobufs
-
-message SteamAppTicket_pb {
-	uint32 ticket_version_no = 1;
-	uint32 crc_encryptedticket = 2;
-	uint32 cb_encrypteduserdata = 3;
-	uint32 cb_encrypted_appownershipticket = 4;
-	bytes encrypted_ticket = 5;
-}

dll/settings_parser.cpp

@@ -588,7 +588,6 @@ uint32 create_localstorage_settings(Settings **settings_client_out, Settings **s
     *settings_server_out = settings_server;
     *local_storage_out = local_storage;
 
-    reset_LastError();
     return appid;
 }
 

dll/steam_user.h

@@ -17,8 +17,6 @@
 
 #include "base.h"
 
-#include "appticket.h"
-
 class Steam_User :
 public ISteamUser009,
 public ISteamUser010,
@@ -369,44 +367,7 @@ SteamAPICall_t RequestEncryptedAppTicket( void *pDataToInclude, int cbDataToIncl
     EncryptedAppTicketResponse_t data;
 	data.m_eResult = k_EResultOK;
 
-    DecryptedAppTicket ticket;
+    encrypted_app_ticket = std::string((char *)pDataToInclude, cbDataToInclude);
-    ticket.TicketV1.Reset();
-    ticket.TicketV2.Reset();
-    ticket.TicketV4.Reset();
-
-    ticket.TicketV1.TicketVersion = 1;
-    if (pDataToInclude) {
-        ticket.TicketV1.UserData.assign((uint8_t*)pDataToInclude, (uint8_t*)pDataToInclude + cbDataToInclude);
-    }
-
-    ticket.TicketV2.TicketVersion = 4;
-    ticket.TicketV2.SteamID = settings->get_local_steam_id().ConvertToUint64();
-    ticket.TicketV2.TicketIssueTime = std::chrono::duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-    ticket.TicketV2.TicketValidityEnd = ticket.TicketV2.TicketIssueTime + (21 * 24 * 60 * 60);
-
-    for (int i = 0; i < 140; ++i)
-    {
-        AppId_t appid;
-        bool available;
-        std::string name;
-        if (!settings->getDLC(appid, appid, available, name)) break;
-        ticket.TicketV4.AppIDs.emplace_back(appid);
-    }
-
-    ticket.TicketV4.HasVACStatus = true;
-    ticket.TicketV4.VACStatus = 0;
-
-    auto serialized = ticket.SerializeTicket();
-
-    SteamAppTicket_pb pb;
-    pb.set_ticket_version_no(1);
-    pb.set_crc_encryptedticket(0); // TODO: Find out how to compute the CRC
-    pb.set_cb_encrypteduserdata(cbDataToInclude);
-    pb.set_cb_encrypted_appownershipticket(serialized.size() - 16);
-    pb.mutable_encrypted_ticket()->assign(serialized.begin(), serialized.end()); // TODO: Find how to encrypt datas
-
-    encrypted_app_ticket = pb.SerializeAsString();
-
     return callback_results->addCallResult(data.k_iCallback, &data, sizeof(data));
 }
 
@@ -414,17 +375,21 @@ SteamAPICall_t RequestEncryptedAppTicket( void *pDataToInclude, int cbDataToIncl
 bool GetEncryptedAppTicket( void *pTicket, int cbMaxTicket, uint32 *pcbTicket )
 {
     PRINT_DEBUG("Steam_User::GetEncryptedAppTicket %i\n", cbMaxTicket);
-    unsigned int ticket_size = encrypted_app_ticket.size();
-    if (!cbMaxTicket) {
     if (!pcbTicket) return false;
+    unsigned int ticket_size = encrypted_app_ticket.size() + 126;
+    if (!cbMaxTicket) {
         *pcbTicket = ticket_size;
         return true;
     }
 
     if (!pTicket) return false;
-    if (ticket_size > cbMaxTicket) return false;
+
-    encrypted_app_ticket.copy((char *)pTicket, cbMaxTicket);
+    //TODO figure out exact sizes?
-    if (pcbTicket) *pcbTicket = ticket_size;
+    if (ticket_size < cbMaxTicket) cbMaxTicket = ticket_size;
+    char ticket_base[] = {0x08, 0x01};
+    memset(pTicket, 'g', cbMaxTicket);
+    memcpy(pTicket, ticket_base, sizeof(ticket_base));
+    *pcbTicket = cbMaxTicket;
 
     return true;
 }