From af605f896b657c5a6363e6b929d2bd4939fb73ca Mon Sep 17 00:00:00 2001 From: DubbleClick Date: Mon, 13 Nov 2023 23:55:40 +0100 Subject: [PATCH] fix %lu warnings for printing addresses --- header/uMod_ArrayHandler.h | 8 ++-- source/uMod_ArrayHandler.cpp | 8 ++-- source/uMod_DX9_dll.cpp | 6 +-- source/uMod_IDirect3D9.cpp | 6 +-- source/uMod_IDirect3D9Ex.cpp | 2 +- source/uMod_IDirect3DCubeTexture9.cpp | 2 +- source/uMod_IDirect3DDevice9.cpp | 14 +++--- source/uMod_IDirect3DTexture9.cpp | 4 +- source/uMod_IDirect3DVolumeTexture9.cpp | 2 +- source/uMod_TextureClient.cpp | 58 ++++++++++++------------- source/uMod_TextureServer.cpp | 22 +++++----- 11 files changed, 66 insertions(+), 66 deletions(-) diff --git a/header/uMod_ArrayHandler.h b/header/uMod_ArrayHandler.h index c5e0ced..008ee75 100644 --- a/header/uMod_ArrayHandler.h +++ b/header/uMod_ArrayHandler.h @@ -71,7 +71,7 @@ private: template uMod_TextureHandler::uMod_TextureHandler() { - Message("uMod_TextureHandler(): %lu\n", this); + Message("uMod_TextureHandler(): %p\n", this); Number = 0; FieldCounter = 0; @@ -81,7 +81,7 @@ uMod_TextureHandler::uMod_TextureHandler() template uMod_TextureHandler::~uMod_TextureHandler() { - Message("~uMod_TextureHandler(): %lu\n", this); + Message("~uMod_TextureHandler(): %p\n", this); if (Textures != nullptr) { for (int i = 0; i < FieldCounter; i++) { delete [] Textures[i]; @@ -93,7 +93,7 @@ uMod_TextureHandler::~uMod_TextureHandler() template int uMod_TextureHandler::Add(T* pTexture) { - Message("uMod_TextureHandler::Add( %lu): %lu\n", pTexture, this); + Message("uMod_TextureHandler::Add( %p): %p\n", pTexture, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; } @@ -147,7 +147,7 @@ int uMod_TextureHandler::Add(T* pTexture) template int uMod_TextureHandler::Remove(T* pTexture) //will be called, if a texture is completely released { - Message("uMod_TextureHandler::Remove( %lu): %lu\n", pTexture, this); + Message("uMod_TextureHandler::Remove(%p): %p\n", pTexture, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; } diff --git a/source/uMod_ArrayHandler.cpp b/source/uMod_ArrayHandler.cpp index 0c45cf1..9bc4e0d 100644 --- a/source/uMod_ArrayHandler.cpp +++ b/source/uMod_ArrayHandler.cpp @@ -6,7 +6,7 @@ uMod_FileHandler::uMod_FileHandler() { - Message("uMod_FileHandler(): %lu\n", this); + Message("uMod_FileHandler(): %p\n", this); Number = 0; FieldCounter = 0; Files = nullptr; @@ -14,7 +14,7 @@ uMod_FileHandler::uMod_FileHandler() uMod_FileHandler::~uMod_FileHandler() { - Message("~uMod_FileHandler(): %lu\n", this); + Message("~uMod_FileHandler(): %p\n", this); if (Files != nullptr) { for (int i = 0; i < FieldCounter; i++) { delete [] Files[i]; @@ -25,7 +25,7 @@ uMod_FileHandler::~uMod_FileHandler() int uMod_FileHandler::Add(TextureFileStruct* file) { - Message("uMod_FileHandler::Add(%lu): %lu\n", file, this); + Message("uMod_FileHandler::Add(%p): %p\n", file, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; } @@ -80,7 +80,7 @@ int uMod_FileHandler::Add(TextureFileStruct* file) int uMod_FileHandler::Remove(TextureFileStruct* file) { - Message("uMod_FileHandler::Remove(%lu): %lu\n", file, this); + Message("uMod_FileHandler::Remove(%p): %p\n", file, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; } diff --git a/source/uMod_DX9_dll.cpp b/source/uMod_DX9_dll.cpp index 33bfaa1..b88b3d8 100644 --- a/source/uMod_DX9_dll.cpp +++ b/source/uMod_DX9_dll.cpp @@ -89,7 +89,7 @@ void InitInstance(HINSTANCE hModule) if (HookThisProgram(game)) //ask if we need to hook this program { OpenMessage(); - Message("InitInstance: %lu\n", hModule); + Message("InitInstance: %p\n", hModule); char uMod[MAX_PATH]; for (auto i = 0; i < MAX_PATH; i++) { uMod[i] = 0; @@ -226,7 +226,7 @@ void ExitInstance() IDirect3D9* APIENTRY uMod_Direct3DCreate9(UINT SDKVersion) { - Message("uMod_Direct3DCreate9: original %lu, uMod %lu\n", Direct3DCreate9_fn, uMod_Direct3DCreate9); + Message("uMod_Direct3DCreate9: original %p, uMod %p\n", Direct3DCreate9_fn, uMod_Direct3DCreate9); // in the Internet are many tutorials for detouring functions and all of them will work without the following 5 marked lines // but somehow, for me it only works, if I retour the function and calling afterward the original function @@ -272,7 +272,7 @@ IDirect3D9* APIENTRY uMod_Direct3DCreate9(UINT SDKVersion) HRESULT APIENTRY uMod_Direct3DCreate9Ex(UINT SDKVersion, IDirect3D9Ex** ppD3D) { - Message("uMod_Direct3DCreate9Ex: original %lu, uMod %lu\n", Direct3DCreate9Ex_fn, uMod_Direct3DCreate9Ex); + Message("uMod_Direct3DCreate9Ex: original %p, uMod %p\n", Direct3DCreate9Ex_fn, uMod_Direct3DCreate9Ex); // in the Internet are many tutorials for detouring functions and all of them will work without the following 5 marked lines // but somehow, for me it only works, if I retour the function and calling afterward the original function diff --git a/source/uMod_IDirect3D9.cpp b/source/uMod_IDirect3D9.cpp index 9bad5eb..cf8bced 100644 --- a/source/uMod_IDirect3D9.cpp +++ b/source/uMod_IDirect3D9.cpp @@ -6,14 +6,14 @@ uMod_IDirect3D9::uMod_IDirect3D9(IDirect3D9* pOriginal, uMod_TextureServer* server) { - Message(PRE_MESSAGE "::" PRE_MESSAGE "( %lu, %lu): %lu\n", pOriginal, server, this); + Message(PRE_MESSAGE "::" PRE_MESSAGE "( %p, %p): %p\n", pOriginal, server, this); m_pIDirect3D9 = pOriginal; uMod_Server = server; } uMod_IDirect3D9::~uMod_IDirect3D9() { - Message(PRE_MESSAGE "::~" PRE_MESSAGE "(): %lu\n", this); + Message(PRE_MESSAGE "::~" PRE_MESSAGE "(): %p\n", this); } HRESULT __stdcall uMod_IDirect3D9::QueryInterface(REFIID riid, void** ppvObj) @@ -118,7 +118,7 @@ HMONITOR __stdcall uMod_IDirect3D9::GetAdapterMonitor(UINT Adapter) HRESULT __stdcall uMod_IDirect3D9::CreateDevice(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, IDirect3DDevice9** ppReturnedDeviceInterface) { - Message(PRE_MESSAGE "::CreateDevice(): %lu\n", this); + Message(PRE_MESSAGE "::CreateDevice(): %p\n", this); // we intercept this call and provide our own "fake" Device Object const HRESULT hres = m_pIDirect3D9->CreateDevice(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, ppReturnedDeviceInterface); diff --git a/source/uMod_IDirect3D9Ex.cpp b/source/uMod_IDirect3D9Ex.cpp index f6d625f..12aa157 100644 --- a/source/uMod_IDirect3D9Ex.cpp +++ b/source/uMod_IDirect3D9Ex.cpp @@ -11,7 +11,7 @@ HRESULT __stdcall uMod_IDirect3D9Ex::CreateDeviceEx(UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, IDirect3DDevice9Ex** ppReturnedDeviceInterface) { - Message("uMod_IDirect3D9Ex::CreateDeviceEx: %lu\n", this); + Message("uMod_IDirect3D9Ex::CreateDeviceEx: %p\n", this); // we intercept this call and provide our own "fake" Device Object const HRESULT hres = m_pIDirect3D9Ex->CreateDeviceEx(Adapter, DeviceType, hFocusWindow, BehaviorFlags, pPresentationParameters, pFullscreenDisplayMode, ppReturnedDeviceInterface); diff --git a/source/uMod_IDirect3DCubeTexture9.cpp b/source/uMod_IDirect3DCubeTexture9.cpp index df29296..a85fe55 100644 --- a/source/uMod_IDirect3DCubeTexture9.cpp +++ b/source/uMod_IDirect3DCubeTexture9.cpp @@ -44,7 +44,7 @@ ULONG APIENTRY uMod_IDirect3DCubeTexture9::AddRef() //this function yields for the non switched texture object ULONG APIENTRY uMod_IDirect3DCubeTexture9::Release() { - Message("uMod_IDirect3DCubeTexture9::Release(): %lu\n", this); + Message("uMod_IDirect3DCubeTexture9::Release(): %p\n", this); void* cpy; const long ret = m_D3Ddev->QueryInterface(IID_IDirect3DTexture9, &cpy); diff --git a/source/uMod_IDirect3DDevice9.cpp b/source/uMod_IDirect3DDevice9.cpp index 044644e..a545bba 100644 --- a/source/uMod_IDirect3DDevice9.cpp +++ b/source/uMod_IDirect3DDevice9.cpp @@ -111,7 +111,7 @@ int uMod_IDirect3DDevice9::CreateSingleTexture() uMod_IDirect3DDevice9::uMod_IDirect3DDevice9(IDirect3DDevice9* pOriginal, uMod_TextureServer* server, int back_buffer_count) { - Message(PRE_MESSAGE "::" PRE_MESSAGE "( %lu, %lu): %lu\n", pOriginal, server, this); + Message(PRE_MESSAGE "::" PRE_MESSAGE "( %p, %p): %p\n", pOriginal, server, this); BackBufferCount = back_buffer_count; NormalRendering = true; @@ -137,7 +137,7 @@ uMod_IDirect3DDevice9::uMod_IDirect3DDevice9(IDirect3DDevice9* pOriginal, uMod_T uMod_IDirect3DDevice9::~uMod_IDirect3DDevice9() { - Message(PRE_MESSAGE "::~" PRE_MESSAGE "(): %lu\n", this); + Message(PRE_MESSAGE "::~" PRE_MESSAGE "(): %p\n", this); } HRESULT uMod_IDirect3DDevice9::QueryInterface(REFIID riid, void** ppvObj) @@ -150,7 +150,7 @@ HRESULT uMod_IDirect3DDevice9::QueryInterface(REFIID riid, void** ppvObj) } *ppvObj = nullptr; - Message(PRE_MESSAGE "::QueryInterface(): %lu\n", this); + Message(PRE_MESSAGE "::QueryInterface(): %p\n", this); const HRESULT hRes = m_pIDirect3DDevice9->QueryInterface(riid, ppvObj); if (*ppvObj == m_pIDirect3DDevice9) { @@ -164,7 +164,7 @@ HRESULT uMod_IDirect3DDevice9::QueryInterface(REFIID riid, void** ppvObj) ULONG uMod_IDirect3DDevice9::AddRef() { uMod_Reference++; //increasing our counter - Message("%lu = " PRE_MESSAGE "::AddRef(): %lu\n", uMod_Reference, this); + Message("%p = " PRE_MESSAGE "::AddRef(): %p\n", uMod_Reference, this); return m_pIDirect3DDevice9->AddRef(); } @@ -198,10 +198,10 @@ ULONG uMod_IDirect3DDevice9::Release() } const ULONG count = m_pIDirect3DDevice9->Release(); - Message("%lu = " PRE_MESSAGE "::Release(): %lu\n", count, this); + Message("%p = " PRE_MESSAGE "::Release(): %p\n", count, this); if (uMod_Reference != count) //bug { - Message("Error in " PRE_MESSAGE "::Release(): %lu!=%lu\n", uMod_Reference, count); + Message("Error in " PRE_MESSAGE "::Release(): %p!=%p\n", uMod_Reference, count); } if (count == 0u) { @@ -416,7 +416,7 @@ HRESULT uMod_IDirect3DDevice9::UpdateSurface(IDirect3DSurface9* pSourceSurface,C HRESULT uMod_IDirect3DDevice9::UpdateTexture(IDirect3DBaseTexture9* pSourceTexture, IDirect3DBaseTexture9* pDestinationTexture) { - Message(PRE_MESSAGE "::UpdateTexture( %lu, %lu): %lu\n", pSourceTexture, pDestinationTexture, this); + Message(PRE_MESSAGE "::UpdateTexture( %p, %p): %p\n", pSourceTexture, pDestinationTexture, this); // we must pass the real texture objects diff --git a/source/uMod_IDirect3DTexture9.cpp b/source/uMod_IDirect3DTexture9.cpp index d54c1e5..566b514 100644 --- a/source/uMod_IDirect3DTexture9.cpp +++ b/source/uMod_IDirect3DTexture9.cpp @@ -44,7 +44,7 @@ ULONG APIENTRY uMod_IDirect3DTexture9::AddRef() //this function yields for the non switched texture object ULONG APIENTRY uMod_IDirect3DTexture9::Release() { - Message("uMod_IDirect3DTexture9::Release(): %lu\n", this); + Message("uMod_IDirect3DTexture9::Release(): %p\n", this); void* cpy; const long ret = m_D3Ddev->QueryInterface(IID_IDirect3DTexture9, &cpy); @@ -103,7 +103,7 @@ ULONG APIENTRY uMod_IDirect3DTexture9::Release() delete(this); } - Message("uMod_IDirect3DTexture9::Release() end: %lu\n", this); + Message("uMod_IDirect3DTexture9::Release() end: %p\n", this); return count; } diff --git a/source/uMod_IDirect3DVolumeTexture9.cpp b/source/uMod_IDirect3DVolumeTexture9.cpp index 6c5252e..0cb9b22 100644 --- a/source/uMod_IDirect3DVolumeTexture9.cpp +++ b/source/uMod_IDirect3DVolumeTexture9.cpp @@ -43,7 +43,7 @@ ULONG APIENTRY uMod_IDirect3DVolumeTexture9::AddRef() //this function yields for the non switched texture object ULONG APIENTRY uMod_IDirect3DVolumeTexture9::Release() { - Message("uMod_IDirect3DVolumeTexture9::Release(): %lu\n", this); + Message("uMod_IDirect3DVolumeTexture9::Release(): %p\n", this); void* cpy; const long ret = m_D3Ddev->QueryInterface(IID_IDirect3DTexture9, &cpy); diff --git a/source/uMod_TextureClient.cpp b/source/uMod_TextureClient.cpp index 94df35c..edd1782 100644 --- a/source/uMod_TextureClient.cpp +++ b/source/uMod_TextureClient.cpp @@ -2,7 +2,7 @@ uMod_TextureClient::uMod_TextureClient(uMod_TextureServer* server, IDirect3DDevice9* device) { - Message("uMod_TextureClient::uMod_TextureClient(): %lu\n", this); + Message("uMod_TextureClient::uMod_TextureClient(): %p\n", this); Server = server; D3D9Device = device; BoolSaveAllTextures = false; @@ -39,7 +39,7 @@ uMod_TextureClient::uMod_TextureClient(uMod_TextureServer* server, IDirect3DDevi uMod_TextureClient::~uMod_TextureClient() { - Message("uMod_TextureClient::~uMod_TextureClient(): %lu\n", this); + Message("uMod_TextureClient::~uMod_TextureClient(): %p\n", this); if (Server != nullptr) { Server->RemoveClient(this); } @@ -76,7 +76,7 @@ int uMod_TextureClient::AddTexture(uMod_IDirect3DTexture9* pTexture) return RETURN_OK; // this is a fake texture } - Message("uMod_TextureClient::AddTexture( %lu): %lu (thread: %lu)\n", pTexture, this, GetCurrentThreadId()); + Message("uMod_TextureClient::AddTexture( %p): %p (thread: %p)\n", pTexture, this, GetCurrentThreadId()); MyTypeHash hash; if (const int ret = pTexture->GetHash(hash)) { @@ -113,7 +113,7 @@ int uMod_TextureClient::AddTexture(uMod_IDirect3DVolumeTexture9* pTexture) return RETURN_OK; // this is a fake texture } - Message("uMod_TextureClient::AddTexture( Volume: %lu): %lu (thread: %lu)\n", pTexture, this, GetCurrentThreadId()); + Message("uMod_TextureClient::AddTexture( Volume: %p): %p (thread: %p)\n", pTexture, this, GetCurrentThreadId()); MyTypeHash hash; if (const int ret = pTexture->GetHash(hash)) { @@ -150,7 +150,7 @@ int uMod_TextureClient::AddTexture(uMod_IDirect3DCubeTexture9* pTexture) return RETURN_OK; // this is a fake texture } - Message("uMod_TextureClient::AddTexture( Cube: %lu): %lu (thread: %lu)\n", pTexture, this, GetCurrentThreadId()); + Message("uMod_TextureClient::AddTexture( Cube: %p): %p (thread: %p)\n", pTexture, this, GetCurrentThreadId()); MyTypeHash hash; if (const int ret = pTexture->GetHash(hash)) { @@ -176,7 +176,7 @@ int uMod_TextureClient::AddTexture(uMod_IDirect3DCubeTexture9* pTexture) int uMod_TextureClient::RemoveTexture(uMod_IDirect3DTexture9* pTexture) // is called from a texture, if it is finally released { - Message("uMod_TextureClient::RemoveTexture( %lu, %#lX): %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::RemoveTexture( %p, %#lX): %p\n", pTexture, pTexture->Hash, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; @@ -205,7 +205,7 @@ int uMod_TextureClient::RemoveTexture(uMod_IDirect3DTexture9* pTexture) // is ca int uMod_TextureClient::RemoveTexture(uMod_IDirect3DVolumeTexture9* pTexture) // is called from a texture, if it is finally released { - Message("uMod_TextureClient::RemoveTexture( Volume %lu, %#lX): %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::RemoveTexture( Volume %p, %#lX): %p\n", pTexture, pTexture->Hash, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; @@ -234,7 +234,7 @@ int uMod_TextureClient::RemoveTexture(uMod_IDirect3DVolumeTexture9* pTexture) // int uMod_TextureClient::RemoveTexture(uMod_IDirect3DCubeTexture9* pTexture) // is called from a texture, if it is finally released { - Message("uMod_TextureClient::RemoveTexture( Cube %lu, %#lX): %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::RemoveTexture( Cube %p, %#lX): %p\n", pTexture, pTexture->Hash, this); if (gl_ErrorState & uMod_ERROR_FATAL) { return RETURN_FATAL_ERROR; @@ -264,14 +264,14 @@ int uMod_TextureClient::RemoveTexture(uMod_IDirect3DCubeTexture9* pTexture) // i int uMod_TextureClient::SaveAllTextures(bool val) { - Message("uMod_TextureClient::SaveAllTextures( %d): %lu\n", val, this); + Message("uMod_TextureClient::SaveAllTextures( %d): %p\n", val, this); BoolSaveAllTextures = val; return RETURN_OK; } int uMod_TextureClient::SaveSingleTexture(bool val) { - Message("uMod_TextureClient::SaveSingleTexture( %d): %lu\n", val, this); + Message("uMod_TextureClient::SaveSingleTexture( %d): %p\n", val, this); if (BoolSaveSingleTexture && !val) //if BoolSaveSingleTexture is set to false and was previously true we switch the SingleTexture back { uMod_IDirect3DTexture9* pTexture; @@ -295,7 +295,7 @@ int uMod_TextureClient::SaveSingleTexture(bool val) int uMod_TextureClient::SetSaveDirectory(wchar_t* dir) { - Message("uMod_TextureClient::SetSaveDirectory( %ls): %lu\n", dir, this); + Message("uMod_TextureClient::SetSaveDirectory( %ls): %p\n", dir, this); int i = 0; for (i = 0; i < MAX_PATH && (dir[i]); i++) { SavePath[i] = dir[i]; @@ -310,7 +310,7 @@ int uMod_TextureClient::SetSaveDirectory(wchar_t* dir) int uMod_TextureClient::SetGameName(wchar_t* name) { - Message("uMod_TextureClient::SetGameName( %ls): %lu\n", name, this); + Message("uMod_TextureClient::SetGameName( %ls): %p\n", name, this); int i = 0; for (i = 0; i < MAX_PATH && (name[i]); i++) { GameName[i] = name[i]; @@ -331,7 +331,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DTexture9* pTexture) return RETURN_BAD_ARGUMENT; } if (SavePath[0] == 0) { - Message("uMod_TextureClient::SaveTexture( %#lX, %lu): %lu, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); + Message("uMod_TextureClient::SaveTexture( %#lX, %p): %p, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); return RETURN_TEXTURE_NOT_SAVED; } @@ -342,7 +342,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DTexture9* pTexture) else { swprintf_s(file, MAX_PATH, L"%ls\\T_%#lX.dds", SavePath, pTexture->Hash); } - Message("uMod_TextureClient::SaveTexture( %ls): %lu\n", file, this); + Message("uMod_TextureClient::SaveTexture( %ls): %p\n", file, this); if (D3D_OK != D3DXSaveTextureToFileW(file, D3DXIFF_DDS, pTexture->m_D3Dtex, nullptr)) { return RETURN_TEXTURE_NOT_SAVED; @@ -356,7 +356,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DVolumeTexture9* pTexture) return RETURN_BAD_ARGUMENT; } if (SavePath[0] == 0) { - Message("uMod_TextureClient::SaveTexture( %#lX, %lu): %lu, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); + Message("uMod_TextureClient::SaveTexture( %#lX, %p): %p, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); return RETURN_TEXTURE_NOT_SAVED; } @@ -367,7 +367,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DVolumeTexture9* pTexture) else { swprintf_s(file, MAX_PATH, L"%ls\\V_%#lX.dds", SavePath, pTexture->Hash); } - Message("uMod_TextureClient::SaveTexture( %ls): %lu\n", file, this); + Message("uMod_TextureClient::SaveTexture( %ls): %p\n", file, this); if (D3D_OK != D3DXSaveTextureToFileW(file, D3DXIFF_DDS, pTexture->m_D3Dtex, nullptr)) { return RETURN_TEXTURE_NOT_SAVED; @@ -381,7 +381,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DCubeTexture9* pTexture) return RETURN_BAD_ARGUMENT; } if (SavePath[0] == 0) { - Message("uMod_TextureClient::SaveTexture( %#lX, %lu): %lu, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); + Message("uMod_TextureClient::SaveTexture( %#lX, %p): %p, SavePath not set\n", pTexture->Hash, pTexture->m_D3Dtex, this); return RETURN_TEXTURE_NOT_SAVED; } @@ -392,7 +392,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DCubeTexture9* pTexture) else { swprintf_s(file, MAX_PATH, L"%ls\\C_%#lX.dds", SavePath, pTexture->Hash); } - Message("uMod_TextureClient::SaveTexture( %ls): %lu\n", file, this); + Message("uMod_TextureClient::SaveTexture( %ls): %p\n", file, this); if (D3D_OK != D3DXSaveTextureToFileW(file, D3DXIFF_DDS, pTexture->m_D3Dtex, nullptr)) { return RETURN_TEXTURE_NOT_SAVED; @@ -405,7 +405,7 @@ int uMod_TextureClient::SaveTexture(uMod_IDirect3DCubeTexture9* pTexture) int uMod_TextureClient::AddUpdate(TextureFileStruct* update, int number) //client must delete the update array { - Message("AddUpdate( %lu, %d): %lu\n", update, number, this); + Message("AddUpdate( %p, %d): %p\n", update, number, this); if (const int ret = LockMutex()) { gl_ErrorState |= uMod_ERROR_TEXTURE; return ret; @@ -428,7 +428,7 @@ int uMod_TextureClient::MergeUpdate() return ret; } - Message("MergeUpdate(): %lu\n", this); + Message("MergeUpdate(): %p\n", this); for (int i = 0; i < NumberOfUpdate; i++) { Update[i].NumberOfTextures = 0; @@ -822,7 +822,7 @@ int uMod_TextureClient::LookUpToMod(MyTypeHash hash, int num_index_list, int* in int uMod_TextureClient::LookUpToMod(uMod_IDirect3DTexture9* pTexture, int num_index_list, int* index_list) // should only be called for original textures { - Message("uMod_TextureClient::LookUpToMod( %lu): hash: %#lX, %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::LookUpToMod( %p): hash: %#lX, %p\n", pTexture, pTexture->Hash, this); if (pTexture->CrossRef_D3Dtex != nullptr) { return RETURN_OK; // bug, this texture is already switched } @@ -855,7 +855,7 @@ int uMod_TextureClient::LookUpToMod(uMod_IDirect3DTexture9* pTexture, int num_in int uMod_TextureClient::LookUpToMod(uMod_IDirect3DVolumeTexture9* pTexture, int num_index_list, int* index_list) // should only be called for original textures { - Message("uMod_TextureClient::LookUpToMod( Volume %lu): hash: %#lX, %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::LookUpToMod( Volume %p): hash: %#lX, %p\n", pTexture, pTexture->Hash, this); if (pTexture->CrossRef_D3Dtex != nullptr) { return RETURN_OK; // bug, this texture is already switched } @@ -888,7 +888,7 @@ int uMod_TextureClient::LookUpToMod(uMod_IDirect3DVolumeTexture9* pTexture, int int uMod_TextureClient::LookUpToMod(uMod_IDirect3DCubeTexture9* pTexture, int num_index_list, int* index_list) // should only be called for original textures { - Message("uMod_TextureClient::LookUpToMod( Cube %lu): hash: %#lX, %lu\n", pTexture, pTexture->Hash, this); + Message("uMod_TextureClient::LookUpToMod( Cube %p): hash: %#lX, %p\n", pTexture, pTexture->Hash, this); if (pTexture->CrossRef_D3Dtex != nullptr) { return RETURN_OK; // bug, this texture is already switched } @@ -920,7 +920,7 @@ int uMod_TextureClient::LookUpToMod(uMod_IDirect3DCubeTexture9* pTexture, int nu int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDirect3DTexture9** ppTexture) // to load fake texture from a file in memory { - Message("LoadTexture( %lu, %lu, %#lX): %lu\n", file_in_memory, ppTexture, file_in_memory->Hash, this); + Message("LoadTexture( %p, %p, %#lX): %p\n", file_in_memory, ppTexture, file_in_memory->Hash, this); if (D3D_OK != D3DXCreateTextureFromFileInMemoryEx(D3D9Device, file_in_memory->pData, file_in_memory->Size, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, nullptr, nullptr, (IDirect3DTexture9**)ppTexture)) //if (D3D_OK != D3DXCreateTextureFromFileInMemory( D3D9Device, file_in_memory->pData, file_in_memory->Size, (IDirect3DTexture9 **) ppTexture)) @@ -939,13 +939,13 @@ int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDir static_cast(D3D9Device)->SetLastCreatedTexture(nullptr); //this texture must no be added twice } - Message("LoadTexture( %lu, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); + Message("LoadTexture( %p, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); return RETURN_OK; } int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDirect3DVolumeTexture9** ppTexture) // to load fake texture from a file in memory { - Message("LoadTexture( Volume %lu, %lu, %#lX): %lu\n", file_in_memory, ppTexture, file_in_memory->Hash, this); + Message("LoadTexture( Volume %p, %p, %#lX): %p\n", file_in_memory, ppTexture, file_in_memory->Hash, this); if (D3D_OK != D3DXCreateVolumeTextureFromFileInMemoryEx(D3D9Device, file_in_memory->pData, file_in_memory->Size, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, nullptr, nullptr, (IDirect3DVolumeTexture9**)ppTexture)) @@ -965,13 +965,13 @@ int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDir static_cast(D3D9Device)->SetLastCreatedVolumeTexture(nullptr); //this texture must no be added twice } - Message("LoadTexture( Volume %lu, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); + Message("LoadTexture( Volume %p, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); return RETURN_OK; } int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDirect3DCubeTexture9** ppTexture) // to load fake texture from a file in memory { - Message("LoadTexture( Cube %lu, %lu, %#lX): %lu\n", file_in_memory, ppTexture, file_in_memory->Hash, this); + Message("LoadTexture( Cube %p, %p, %#lX): %p\n", file_in_memory, ppTexture, file_in_memory->Hash, this); if (D3D_OK != D3DXCreateCubeTextureFromFileInMemoryEx(D3D9Device, file_in_memory->pData, file_in_memory->Size, D3DX_DEFAULT, D3DX_DEFAULT, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DX_DEFAULT, D3DX_DEFAULT, 0, nullptr, nullptr, (IDirect3DCubeTexture9**)ppTexture)) //if (D3D_OK != D3DXCreateCubeTextureFromFileInMemory( D3D9Device, file_in_memory->pData, file_in_memory->Size, (IDirect3DCubeTexture9 **) ppTexture)) @@ -990,6 +990,6 @@ int uMod_TextureClient::LoadTexture(TextureFileStruct* file_in_memory, uMod_IDir static_cast(D3D9Device)->SetLastCreatedCubeTexture(nullptr); //this texture must no be added twice } - Message("LoadTexture( Cube %lu, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); + Message("LoadTexture( Cube %p, %#lX): DONE\n", *ppTexture, file_in_memory->Hash); return RETURN_OK; } diff --git a/source/uMod_TextureServer.cpp b/source/uMod_TextureServer.cpp index 1ad6709..c578363 100644 --- a/source/uMod_TextureServer.cpp +++ b/source/uMod_TextureServer.cpp @@ -3,7 +3,7 @@ uMod_TextureServer::uMod_TextureServer(char* game, char* uModName) { - Message("uMod_TextureServer(): %lu\n", this); + Message("uMod_TextureServer(): %p\n", this); Mutex = CreateMutex(nullptr, false, nullptr); @@ -61,7 +61,7 @@ uMod_TextureServer::uMod_TextureServer(char* game, char* uModName) uMod_TextureServer::~uMod_TextureServer() { - Message("~uMod_TextureServer(): %lu\n", this); + Message("~uMod_TextureServer(): %p\n", this); if (Mutex != nullptr) { CloseHandle(Mutex); } @@ -89,7 +89,7 @@ uMod_TextureServer::~uMod_TextureServer() int uMod_TextureServer::AddClient(uMod_TextureClient* client, TextureFileStruct** update, int* number) // called from a client { - Message("AddClient(%lu): %lu\n", client, this); + Message("AddClient(%p): %p\n", client, this); if (const int ret = LockMutex()) { gl_ErrorState |= uMod_ERROR_SERVER; return ret; @@ -158,7 +158,7 @@ int uMod_TextureServer::AddClient(uMod_TextureClient* client, TextureFileStruct* int uMod_TextureServer::RemoveClient(uMod_TextureClient* client) // called from a client { - Message("RemoveClient(): %lu\n", client); + Message("RemoveClient(): %p\n", client); if (const int ret = LockMutex()) { gl_ErrorState |= uMod_ERROR_SERVER; return ret; @@ -176,7 +176,7 @@ int uMod_TextureServer::RemoveClient(uMod_TextureClient* client) // called from int uMod_TextureServer::AddFile(char* dataPtr, unsigned int size, MyTypeHash hash, bool force) // called from Mainloop() { - Message("uMod_TextureServer::AddFile( %lu %lu, %#lX, %d): %lu\n", dataPtr, size, hash, force, this); + Message("uMod_TextureServer::AddFile( %p %p, %#lX, %d): %p\n", dataPtr, size, hash, force, this); TextureFileStruct* temp = nullptr; @@ -242,7 +242,7 @@ int uMod_TextureServer::AddFile(char* dataPtr, unsigned int size, MyTypeHash has int uMod_TextureServer::RemoveFile(MyTypeHash hash) // called from Mainloop() { - Message("RemoveFile( %lu): %lu\n", hash, this); + Message("RemoveFile( %p): %p\n", hash, this); const int num = CurrentMod.GetNumber(); for (int i = 0; i < num; i++) { @@ -291,7 +291,7 @@ int uMod_TextureServer::SaveSingleTexture(bool val) // called from Mainloop() int uMod_TextureServer::SetSaveDirectory(wchar_t* dir) // called from Mainloop() { - Message("uMod_TextureServer::SetSaveDirectory( %ls): %lu\n", dir, this); + Message("uMod_TextureServer::SetSaveDirectory( %ls): %p\n", dir, this); int i = 0; for (i = 0; i < MAX_PATH && dir[i]; i++) { SavePath[i] = dir[i]; @@ -373,7 +373,7 @@ int uMod_TextureServer::SetFontColour(DWORD colour) // called from Mainloop() const DWORD r = (FontColour >> 16) & 0xFF; const DWORD g = (FontColour >> 8) & 0xFF; const DWORD b = (FontColour) & 0xFF; - Message("uMod_TextureServer::SetFontColour( %u %u %u): %lu\n", r, g, b, this); + Message("uMod_TextureServer::SetFontColour( %u %u %u): %p\n", r, g, b, this); for (int i = 0; i < NumberOfClients; i++) { Clients[i]->SetFontColour(r, g, b); } @@ -393,7 +393,7 @@ int uMod_TextureServer::SetTextureColour(DWORD colour) // called from Mainloop() const DWORD r = (TextureColour >> 16) & 0xFF; const DWORD g = (TextureColour >> 8) & 0xFF; const DWORD b = (TextureColour) & 0xFF; - Message("uMod_TextureServer::SetTextureColour( %u %u %u): %lu\n", r, g, b, this); + Message("uMod_TextureServer::SetTextureColour( %u %u %u): %p\n", r, g, b, this); for (int i = 0; i < NumberOfClients; i++) { Clients[i]->SetTextureColour(r, g, b); } @@ -402,7 +402,7 @@ int uMod_TextureServer::SetTextureColour(DWORD colour) // called from Mainloop() int uMod_TextureServer::PropagateUpdate(uMod_TextureClient* client) // called from Mainloop(), send the update to all clients { - Message("PropagateUpdate(%lu): %lu\n", client, this); + Message("PropagateUpdate(%p): %p\n", client, this); if (const int ret = LockMutex()) { gl_ErrorState |= uMod_ERROR_TEXTURE; return ret; @@ -454,7 +454,7 @@ int TextureFileStruct_Compare(const void* elem1, const void* elem2) int uMod_TextureServer::PrepareUpdate(TextureFileStruct** update, int* number) // called from the PropagateUpdate() and AddClient. // Prepare an update for one client. The allocated memory must deleted by the client. { - Message("PrepareUpdate(%lu, %d): %lu\n", update, number, this); + Message("PrepareUpdate(%p, %d): %p\n", update, number, this); TextureFileStruct* temp = nullptr; const int num = CurrentMod.GetNumber();