Commit 40c6c18b authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard

include: Update another HRESULT definition.

parent 73a05ffb
......@@ -107,7 +107,7 @@ HRESULT WINAPI DllCanUnloadNow(void)
* as well?
*/
TRACE( ": returning 0x%08x\n", hr );
TRACE( ": returning %#lx\n", hr );
return hr;
}
......@@ -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);
......
......@@ -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
#if !defined(__LP64__) && !defined(WINE_NO_LONG_TYPES)
typedef long HRESULT;
# else
#else
typedef int HRESULT;
# endif
#endif
#endif
static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment