From 979ac46904291f5988c55efaa01d22d298f4e525 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Thu, 16 Apr 2020 22:01:13 +0200
Subject: [PATCH] Fix class saving

---
 src/game/demonware/services/bdStorage.cpp | 48 ++++++++++++++++++++---
 src/game/demonware/services/bdStorage.hpp |  1 +
 src/std_include.cpp                       |  4 --
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/src/game/demonware/services/bdStorage.cpp b/src/game/demonware/services/bdStorage.cpp
index 2b3816c..bb9a453 100644
--- a/src/game/demonware/services/bdStorage.cpp
+++ b/src/game/demonware/services/bdStorage.cpp
@@ -4,6 +4,7 @@
 #include "utils/cryptography.hpp"
 #include "utils/nt.hpp"
 #include "utils/io.hpp"
+#include "utils/string.hpp"
 
 namespace demonware
 {
@@ -14,6 +15,7 @@ namespace demonware
 		this->register_service(5, &bdStorage::list_legacy_user_files);
 		this->register_service(6, &bdStorage::list_publisher_files);
 		this->register_service(7, &bdStorage::get_publisher_file);
+		this->register_service(8, &bdStorage::update_legacy_user_file);
 		this->register_service(10, &bdStorage::set_user_file);
 		this->register_service(11, &bdStorage::delete_user_file);
 		this->register_service(12, &bdStorage::get_user_file);
@@ -71,14 +73,17 @@ namespace demonware
 		buffer->read_bool(&priv);
 		buffer->read_blob(&data);
 
-		printf("DW: Storing user file: %s\n", filename.data());
+		const auto id = *reinterpret_cast<const uint64_t*>(utils::cryptography::sha1::compute(filename).data());
+		std::string id_string = utils::string::va("%llX", id);
 
-		const auto path = get_user_file_path(filename);
+		printf("DW: Storing user file '%s' as %s\n", filename.data(), id_string.data());
+
+		const auto path = get_user_file_path(id_string);
 		utils::io::write_file(path, data);
 
 		auto info = new bdFileInfo;
 
-		info->file_id = *reinterpret_cast<const uint64_t*>(utils::cryptography::sha1::compute(filename).data());
+		info->file_id = id;
 		info->filename = filename;
 		info->create_time = uint32_t(time(nullptr));
 		info->modified_time = info->create_time;
@@ -91,14 +96,47 @@ namespace demonware
 		reply->send();
 	}
 
+	void bdStorage::update_legacy_user_file(i_server* server, byte_buffer* buffer) const
+	{
+		uint64_t id;
+		std::string data;
+
+		buffer->read_uint64(&id);
+		buffer->read_blob(&data);
+
+		std::string id_string = utils::string::va("%llX", id);
+
+		printf("DW: Updating user file %s\n", id_string.data());
+
+		const auto path = get_user_file_path(id_string);
+		utils::io::write_file(path, data);
+
+		auto info = new bdFileInfo;
+
+		info->file_id = id;
+		info->filename = "<>";
+		info->create_time = uint32_t(time(nullptr));
+		info->modified_time = info->create_time;
+		info->file_size = uint32_t(data.size());
+		info->owner_id = 0;
+		info->priv = false;
+
+		auto reply = server->create_reply(this->get_sub_type());
+		reply->add(info);
+		reply->send();
+	}
+
 	void bdStorage::get_legacy_user_file(i_server* server, byte_buffer* buffer) const
 	{
 		std::string filename, data;
 		buffer->read_string(&filename);
 
-		printf("DW: Loading user file: %s\n", filename.data());
+		const auto id = *reinterpret_cast<const uint64_t*>(utils::cryptography::sha1::compute(filename).data());
+		std::string id_string = utils::string::va("%llX", id);
 
-		const auto path = get_user_file_path(filename);
+		printf("DW: Loading user file: %s (%s)\n", filename.data(), id_string.data());
+
+		const auto path = get_user_file_path(id_string);
 		if (utils::io::read_file(path, &data))
 		{
 			auto reply = server->create_reply(this->get_sub_type());
diff --git a/src/game/demonware/services/bdStorage.hpp b/src/game/demonware/services/bdStorage.hpp
index 811ff9f..0eed97c 100644
--- a/src/game/demonware/services/bdStorage.hpp
+++ b/src/game/demonware/services/bdStorage.hpp
@@ -12,6 +12,7 @@ namespace demonware
 		std::vector<std::pair<std::regex, std::string>> publisher_resources_;
 
 		void set_legacy_user_file(i_server* server, byte_buffer* buffer) const;
+		void update_legacy_user_file(i_server* server, byte_buffer* buffer) const;
 		void get_legacy_user_file(i_server* server, byte_buffer* buffer) const;
 		void list_legacy_user_files(i_server* server, byte_buffer* buffer) const;
 		void list_publisher_files(i_server* server, byte_buffer* buffer);
diff --git a/src/std_include.cpp b/src/std_include.cpp
index 1e3c599..ad0bf52 100644
--- a/src/std_include.cpp
+++ b/src/std_include.cpp
@@ -4,7 +4,6 @@
 #pragma comment(linker, "/merge:.rdata=.clr")
 #pragma comment(linker, "/merge:.cl=.main")
 #pragma comment(linker, "/merge:.text=.main")
-#pragma comment(linker, "/section:.main,re")
 #pragma comment(linker, "/base:0x400000")
 
 #pragma comment(linker,"/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='x86' publicKeyToken='6595b64144ccf1df' language='*'\"")
@@ -12,9 +11,6 @@
 #pragma bss_seg(".payload")
 char payload_data[BINARY_PAYLOAD_SIZE];
 
-#pragma data_seg(".main")
-char main_data[200] = {1};
-
 extern "C" {
 int s_read_arc4random(void*, size_t)
 {