Eric Pouech : gameux: Enable compilation with long types.
Alexandre Julliard
julliard at winehq.org
Thu Feb 10 16:10:29 CST 2022
Module: wine
Branch: master
Commit: e443ee51f75621464e8ca8d03e0b49aaa017da62
URL: https://source.winehq.org/git/wine.git/?a=commit;h=e443ee51f75621464e8ca8d03e0b49aaa017da62
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Thu Feb 10 08:42:55 2022 +0100
gameux: Enable compilation with long types.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/gameux/Makefile.in | 1 -
dlls/gameux/gameexplorer.c | 14 +++++++-------
dlls/gameux/gamestatistics.c | 16 ++++++++--------
3 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/dlls/gameux/Makefile.in b/dlls/gameux/Makefile.in
index 1edc4213a6e..b541ae9470b 100644
--- a/dlls/gameux/Makefile.in
+++ b/dlls/gameux/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = gameux.dll
IMPORTS = uuid shell32 oleaut32 ole32 user32 advapi32 shlwapi
diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c
index 5fdacacf4b2..a356a693ee3 100644
--- a/dlls/gameux/gameexplorer.c
+++ b/dlls/gameux/gameexplorer.c
@@ -161,7 +161,7 @@ HRESULT GAMEUX_buildGameRegistryPath(GAME_INSTALL_SCOPE installScope,
if(SUCCEEDED(hr))
lstrcpyW(*lpRegistryPath, sRegistryPath);
- TRACE("result: 0x%x, path: %s\n", hr, debugstr_w(*lpRegistryPath));
+ TRACE("result: 0x%lx, path: %s\n", hr, debugstr_w(*lpRegistryPath));
return hr;
}
/*******************************************************************************
@@ -247,7 +247,7 @@ static HRESULT GAMEUX_WriteRegistryRecord(struct GAMEUX_GAME_DATA *GameData)
}
HeapFree(GetProcessHeap(), 0, lpRegistryKey);
- TRACE("returning 0x%x\n", hr);
+ TRACE("returning 0x%lx\n", hr);
return hr;
}
/*******************************************************************************
@@ -536,7 +536,7 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath,
CloseHandle(thread);
if(ret != WAIT_OBJECT_0)
{
- ERR("Wait failed (%#x).\n", ret);
+ ERR("Wait failed (%#lx).\n", ret);
hr = E_FAIL;
goto done;
}
@@ -549,7 +549,7 @@ static HRESULT GAMEUX_RegisterGame(LPCWSTR sGDFBinaryPath,
done:
GAMEUX_uninitGameData(&GameData);
- TRACE("returning 0x%08x\n", hr);
+ TRACE("returning 0x%08lx\n", hr);
return hr;
}
/*******************************************************************************
@@ -685,7 +685,7 @@ static HRESULT GAMEUX_UpdateGame(LPGUID InstanceID) {
}
HeapFree(GetProcessHeap(), 0, lpRegistryPath);
- TRACE("returning 0x%x\n", hr);
+ TRACE("returning 0x%lx\n", hr);
return hr;
}
/*******************************************************************************
@@ -818,7 +818,7 @@ static ULONG WINAPI GameExplorerImpl_AddRef(IGameExplorer *iface)
ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
return ref;
}
@@ -828,7 +828,7 @@ static ULONG WINAPI GameExplorerImpl_Release(IGameExplorer *iface)
LONG ref;
ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
if(ref == 0)
{
diff --git a/dlls/gameux/gamestatistics.c b/dlls/gameux/gamestatistics.c
index 1696ee1e76a..6d62b67e36f 100644
--- a/dlls/gameux/gamestatistics.c
+++ b/dlls/gameux/gamestatistics.c
@@ -293,7 +293,7 @@ static HRESULT GAMEUX_updateStatisticsFile(struct GAMEUX_STATS *stats)
SysFreeString(bstrCategory);
SysFreeString(bstrStatistics);
SysFreeString(V_BSTR(&vStatsFilePath));
- TRACE("ret=0x%x\n", hr);
+ TRACE("ret=0x%lx\n", hr);
return hr;
}
/*******************************************************************************
@@ -384,7 +384,7 @@ static HRESULT GAMEUX_getAppIdFromGDFPath(
HeapFree(GetProcessHeap(), 0, lpRegistryPath);
- TRACE("found app id: %s, return: %#x\n", debugstr_w(lpApplicationId), hr);
+ TRACE("found app id: %s, return: %#lx\n", debugstr_w(lpApplicationId), hr);
return hr;
}
/*******************************************************************
@@ -606,7 +606,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats,
if (FAILED(hr)) return hr;
hr = GAMEUX_loadStatisticsFromFile(pStats);
- TRACE("ldstats finished, res: %#x\n", hr);
+ TRACE("ldstats finished, res: %#lx\n", hr);
if(hr == S_OK)
{
*pOpenResult = GAMESTATS_OPEN_OPENED;
@@ -621,7 +621,7 @@ static HRESULT GAMEUX_loadGameStatistics(struct GAMEUX_STATS *pStats,
else
hr = HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND);
- TRACE("openResult=%#x ret=%#x\n", *pOpenResult, hr);
+ TRACE("openResult=%#x ret=%#lx\n", *pOpenResult, hr);
return hr;
}
/*******************************************************************
@@ -672,7 +672,7 @@ static ULONG WINAPI GameStatisticsImpl_AddRef(IGameStatistics *iface)
ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
return ref;
}
@@ -682,7 +682,7 @@ static ULONG WINAPI GameStatisticsImpl_Release(IGameStatistics *iface)
LONG ref;
ref = InterlockedDecrement( &This->ref );
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
if ( ref == 0 )
{
@@ -1028,7 +1028,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_AddRef(IGameStatisticsMgr *iface)
ref = InterlockedIncrement(&This->ref);
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
return ref;
}
@@ -1038,7 +1038,7 @@ static ULONG WINAPI GameStatisticsMgrImpl_Release(IGameStatisticsMgr *iface)
LONG ref;
ref = InterlockedDecrement(&This->ref);
- TRACE("(%p): ref=%d\n", This, ref);
+ TRACE("(%p): ref=%ld\n", This, ref);
if ( ref == 0 )
{
More information about the wine-cvs
mailing list