--- a/QTfrontend/util/platform/xfiregameclient.cpp Sat Jan 26 22:59:48 2013 +0400
+++ b/QTfrontend/util/platform/xfiregameclient.cpp Sat Jan 26 23:56:10 2013 +0100
@@ -34,88 +34,88 @@
int XfireIsLoaded()
{
- HelperInit();
- if (ptr_XfireSetCustomGameDataA &&
- ptr_XfireSetCustomGameDataW &&
- ptr_XfireSetCustomGameDataUTF8)
- return 1;
- return 0;
+ HelperInit();
+ if (ptr_XfireSetCustomGameDataA &&
+ ptr_XfireSetCustomGameDataW &&
+ ptr_XfireSetCustomGameDataUTF8)
+ return 1;
+ return 0;
}
int XfireSetCustomGameDataA(int num_keys, const char **keys, const char **values)
{
- HelperInit();
- if (ptr_XfireSetCustomGameDataA)
- return ptr_XfireSetCustomGameDataA(num_keys, keys, values);
- return 1;
+ HelperInit();
+ if (ptr_XfireSetCustomGameDataA)
+ return ptr_XfireSetCustomGameDataA(num_keys, keys, values);
+ return 1;
}
int XfireSetCustomGameDataW(int num_keys, const wchar_t **keys, const wchar_t **values)
{
- HelperInit();
- if (ptr_XfireSetCustomGameDataW)
- return ptr_XfireSetCustomGameDataW(num_keys, keys, values);
- return 1;
+ HelperInit();
+ if (ptr_XfireSetCustomGameDataW)
+ return ptr_XfireSetCustomGameDataW(num_keys, keys, values);
+ return 1;
}
int XfireSetCustomGameDataUTF8(int num_keys, const char **keys, const char **values)
{
- HelperInit();
- if (ptr_XfireSetCustomGameDataUTF8)
- return ptr_XfireSetCustomGameDataUTF8(num_keys, keys, values);
- return 1;
+ HelperInit();
+ if (ptr_XfireSetCustomGameDataUTF8)
+ return ptr_XfireSetCustomGameDataUTF8(num_keys, keys, values);
+ return 1;
}
/* ------------------------------------------------------------------------- */
static void HelperInit()
{
- if (!ptr_XfireSetCustomGameDataA ||
- !ptr_XfireSetCustomGameDataW ||
- !ptr_XfireSetCustomGameDataUTF8)
- {
- HMODULE toucan_dll = HelperGetToucanDLL();
- if (toucan_dll)
- {
- ptr_XfireSetCustomGameDataA = (XfireSetCustomGameDataAFunction)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataA_V1");
- ptr_XfireSetCustomGameDataW = (XfireSetCustomGameDataWFunction)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataW_V1");
- ptr_XfireSetCustomGameDataUTF8 = (XfireSetCustomGameDataUTF8Function)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataUTF8_V1");
- }
- }
+ if (!ptr_XfireSetCustomGameDataA ||
+ !ptr_XfireSetCustomGameDataW ||
+ !ptr_XfireSetCustomGameDataUTF8)
+ {
+ HMODULE toucan_dll = HelperGetToucanDLL();
+ if (toucan_dll)
+ {
+ ptr_XfireSetCustomGameDataA = (XfireSetCustomGameDataAFunction)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataA_V1");
+ ptr_XfireSetCustomGameDataW = (XfireSetCustomGameDataWFunction)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataW_V1");
+ ptr_XfireSetCustomGameDataUTF8 = (XfireSetCustomGameDataUTF8Function)::GetProcAddress(toucan_dll, "ToucanSendGameClientDataUTF8_V1");
+ }
+ }
}
static HMODULE HelperGetToucanDLL()
{
- if (g_toucan_dll)
- return g_toucan_dll;
+ if (g_toucan_dll)
+ return g_toucan_dll;
- /*
- ** We need to enumerate the DLLs loaded to find toucan dll.
- ** This is done because the toucan dll changes with each update.
- ** The toucan dll has the following format. "xfire_toucan_{BUILD_NUMBER}.dll"
- ** We simply try to find a dll w/ the prefix "xfire_toucan"
- */
- HANDLE snapshot_handle = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
- if (snapshot_handle != INVALID_HANDLE_VALUE)
- {
- MODULEENTRY32 module_entry;
- module_entry.dwSize = sizeof(MODULEENTRY32);
+ /*
+ ** We need to enumerate the DLLs loaded to find toucan dll.
+ ** This is done because the toucan dll changes with each update.
+ ** The toucan dll has the following format. "xfire_toucan_{BUILD_NUMBER}.dll"
+ ** We simply try to find a dll w/ the prefix "xfire_toucan"
+ */
+ HANDLE snapshot_handle = CreateToolhelp32Snapshot(TH32CS_SNAPMODULE, GetCurrentProcessId());
+ if (snapshot_handle != INVALID_HANDLE_VALUE)
+ {
+ MODULEENTRY32 module_entry;
+ module_entry.dwSize = sizeof(MODULEENTRY32);
- BOOL result = Module32First(snapshot_handle, &module_entry);
- char module_name[] = "xfire_toucan";
- DWORD module_name_len = sizeof(module_name)-1;
- while (result)
- {
- if (CompareStringA(LOCALE_USER_DEFAULT, NORM_IGNORECASE, module_entry.szModule, module_name_len, module_name, module_name_len) == CSTR_EQUAL)
- {
- g_toucan_dll = module_entry.hModule;
- break;
- }
- result = Module32Next(snapshot_handle, &module_entry);
- }
+ BOOL result = Module32First(snapshot_handle, &module_entry);
+ char module_name[] = "xfire_toucan";
+ DWORD module_name_len = sizeof(module_name)-1;
+ while (result)
+ {
+ if (CompareStringA(LOCALE_USER_DEFAULT, NORM_IGNORECASE, module_entry.szModule, module_name_len, module_name, module_name_len) == CSTR_EQUAL)
+ {
+ g_toucan_dll = module_entry.hModule;
+ break;
+ }
+ result = Module32Next(snapshot_handle, &module_entry);
+ }
- CloseHandle(snapshot_handle);
- }
+ CloseHandle(snapshot_handle);
+ }
- return g_toucan_dll;
+ return g_toucan_dll;
}