Module: wine Branch: master Commit: 40c6c18ba2d99e68a3593eebaf8cbefa605bca18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c6c18ba2d99e68a3593eeba...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Thu Feb 10 11:20:30 2022 +0300
include: Update another HRESULT definition.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dplayx/dplayx_main.c | 2 +- dlls/ole32/itemmoniker.c | 4 ++-- include/winerror.h | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dlls/dplayx/dplayx_main.c b/dlls/dplayx/dplayx_main.c index c8c2778501a..7b8fbcc48c1 100644 --- a/dlls/dplayx/dplayx_main.c +++ b/dlls/dplayx/dplayx_main.c @@ -107,7 +107,7 @@ HRESULT WINAPI DllCanUnloadNow(void) * as well? */
- TRACE( ": returning 0x%08x\n", hr ); + TRACE( ": returning %#lx\n", hr );
return hr; } diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index 112a8db4b16..5c69266fc9c 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -451,7 +451,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToObject(IMoniker* iface, if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr);
hr = IOleItemContainer_GetObject(container, This->itemName, get_bind_speed_from_bindctx(pbc), pbc, riid, ppvResult); @@ -482,7 +482,7 @@ static HRESULT WINAPI ItemMonikerImpl_BindToStorage(IMoniker *iface, IBindCtx *p if (SUCCEEDED(hr)) { if (FAILED(hr = set_container_lock(container, pbc))) - WARN("Failed to lock container, hr %#x.\n", hr); + WARN("Failed to lock container, hr %#lx.\n", hr);
hr = IOleItemContainer_GetObjectStorage(container, moniker->itemName, pbc, riid, ppvResult); IOleItemContainer_Release(container); diff --git a/include/winerror.h b/include/winerror.h index f412989a6a4..b63b74a5b18 100644 --- a/include/winerror.h +++ b/include/winerror.h @@ -89,11 +89,11 @@ #define __HRESULT_FROM_WIN32(x) ((HRESULT)(x) > 0 ? ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)) : (HRESULT)(x) ) #ifndef _HRESULT_DEFINED #define _HRESULT_DEFINED -# ifdef _MSC_VER -typedef long HRESULT; -# else -typedef int HRESULT; -# endif +#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES) +typedef long HRESULT; +#else +typedef int HRESULT; +#endif #endif static inline HRESULT HRESULT_FROM_WIN32(unsigned int x) {