Skip to content

W
wine-winehq
Commit 652aef30 authored by Nikolay Sivov's avatar Nikolay Sivov Committed by Alexandre Julliard
Browse files
Options

combase: Build without WINE_NO_LONG_TYPES.

Signed-off-by: 's avatarNikolay Sivov <nsivov@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 1e72b622
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 104 deletions
dlls/combase/Makefile.in
View file @ 652aef30
EXTRADEFS = -DWINE_NO_LONG_TYPES
MODULE = combase.dll
IMPORTLIB = combase
IMPORTS = advapi32 ole32 user32 gdi32 uuid rpcrt4
......
dlls/combase/apartment.c
View file @ 652aef30
......@@ -264,7 +264,7 @@ static ULONG WINAPI local_server_AddRef(IServiceProvider *iface)
struct local_server *local_server = impl_from_IServiceProvider(iface);
LONG refcount = InterlockedIncrement(&local_server->refcount);
TRACE("%p, refcount %d\n", iface, refcount);
TRACE("%p, refcount %ld\n", iface, refcount);
return refcount;
}
......@@ -274,7 +274,7 @@ static ULONG WINAPI local_server_Release(IServiceProvider *iface)
struct local_server *local_server = impl_from_IServiceProvider(iface);
LONG refcount = InterlockedDecrement(&local_server->refcount);
TRACE("%p, refcount %d\n", iface, refcount);
TRACE("%p, refcount %ld\n", iface, refcount);
if (!refcount)
{
......@@ -355,7 +355,7 @@ HRESULT apartment_get_local_server_stream(struct apartment *apt, IStream **ret)
LeaveCriticalSection(&apt->cs);
if (FAILED(hr))
ERR("Failed: %#x\n", hr);
ERR("Failed: %#lx\n", hr);
return hr;
}
......@@ -365,7 +365,7 @@ static struct apartment *apartment_construct(DWORD model)
{
struct apartment *apt;
TRACE("creating new apartment, model %d\n", model);
TRACE("creating new apartment, model %ld\n", model);
apt = heap_alloc_zero(sizeof(*apt));
apt->tid = GetCurrentThreadId();
......@@ -450,7 +450,7 @@ void apartment_release(struct apartment *apt)
EnterCriticalSection(&apt_cs);
refcount = InterlockedDecrement(&apt->refs);
TRACE("%s: after = %d\n", wine_dbgstr_longlong(apt->oxid), refcount);
TRACE("%s: after = %ld\n", wine_dbgstr_longlong(apt->oxid), refcount);
if (apt->being_destroyed)
{
......@@ -544,7 +544,7 @@ void apartment_release(struct apartment *apt)
static DWORD apartment_addref(struct apartment *apt)
{
DWORD refs = InterlockedIncrement(&apt->refs);
TRACE("%s: before = %d\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
TRACE("%s: before = %ld\n", wine_dbgstr_longlong(apt->oxid), refs - 1);
return refs;
}
......@@ -779,7 +779,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath,
hr = p_ole32_DllGetClassObject(rclsid, riid, ppv);
if (hr != S_OK)
ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath));
return hr;
}
......@@ -828,7 +828,7 @@ static HRESULT apartment_getclassobject(struct apartment *apt, LPCWSTR dllpath,
hr = apartment_loaded_dll->dll->DllGetClassObject(rclsid, riid, ppv);
if (hr != S_OK)
ERR("DllGetClassObject returned error 0x%08x for dll %s\n", hr, debugstr_w(dllpath));
ERR("DllGetClassObject returned error %#lx for dll %s\n", hr, debugstr_w(dllpath));
}
return hr;
......@@ -1260,7 +1260,7 @@ HRESULT apartment_createwindowifneeded(struct apartment *apt)
hwnd = CreateWindowW(aptwinclassW, NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, 0, hProxyDll, NULL);
if (!hwnd)
{
ERR("CreateWindow failed with error %d\n", GetLastError());
ERR("CreateWindow failed with error %ld\n", GetLastError());
return HRESULT_FROM_WIN32(GetLastError());
}
if (InterlockedCompareExchangePointer((void **)&apt->win, hwnd, NULL))
......
dlls/combase/errorinfo.c
View file @ 652aef30
......@@ -111,7 +111,7 @@ static ULONG WINAPI errorinfo_AddRef(IErrorInfo *iface)
struct error_info *error_info = impl_from_IErrorInfo(iface);
ULONG refcount = InterlockedIncrement(&error_info->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
return refcount;
}
......@@ -121,7 +121,7 @@ static ULONG WINAPI errorinfo_Release(IErrorInfo *iface)
struct error_info *error_info = impl_from_IErrorInfo(iface);
ULONG refcount = InterlockedDecrement(&error_info->refcount);
TRACE("%p, refcount %u.\n", iface, refcount);
TRACE("%p, refcount %lu.\n", iface, refcount);
if (!refcount)
{
......@@ -275,7 +275,7 @@ static HRESULT WINAPI create_errorinfo_SetHelpContext(ICreateErrorInfo *iface, D
{
struct error_info *error_info = impl_from_ICreateErrorInfo(iface);
TRACE("%p, %#x.\n", iface, help_context);
TRACE("%p, %#lx.\n", iface, help_context);
error_info->help_context = help_context;
......@@ -365,7 +365,7 @@ HRESULT WINAPI GetErrorInfo(ULONG reserved, IErrorInfo **error_info)
struct tlsdata *tlsdata;
HRESULT hr;
TRACE("%u, %p\n", reserved, error_info);
TRACE("%lu, %p\n", reserved, error_info);
if (reserved || !error_info)
return E_INVALIDARG;
......@@ -393,7 +393,7 @@ HRESULT WINAPI SetErrorInfo(ULONG reserved, IErrorInfo *error_info)
struct tlsdata *tlsdata;
HRESULT hr;
TRACE("%u, %p\n", reserved, error_info);
TRACE("%lu, %p\n", reserved, error_info);
if (reserved)
return E_INVALIDARG;
......
dlls/combase/hglobalstream.c
View file @ 652aef30
......@@ -146,7 +146,7 @@ static HRESULT WINAPI stream_Read(IStream *iface, void *pv, ULONG cb, ULONG *rea
ULONG dummy, len;
char *buffer;
TRACE("%p, %p, %d, %p\n", iface, pv, cb, read_len);
TRACE("%p, %p, %ld, %p\n", iface, pv, cb, read_len);
if (!read_len)
read_len = &dummy;
......@@ -178,7 +178,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
ULONG dummy = 0;
char *buffer;
TRACE("%p, %p, %d, %p\n", iface, pv, cb, written);
TRACE("%p, %p, %ld, %p\n", iface, pv, cb, written);
if (!written)
written = &dummy;
......@@ -197,7 +197,7 @@ static HRESULT WINAPI stream_Write(IStream *iface, const void *pv, ULONG cb, ULO
HRESULT hr = IStream_SetSize(iface, size);
if (FAILED(hr))
{
ERR("IStream_SetSize failed with error 0x%08x\n", hr);
ERR("IStream_SetSize failed with error %#lx\n", hr);
return hr;
}
}
......@@ -227,7 +227,7 @@ static HRESULT WINAPI stream_Seek(IStream *iface, LARGE_INTEGER move, DWORD orig
ULARGE_INTEGER position = stream->position;
HRESULT hr = S_OK;
TRACE("%p, %s, %d, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos);
TRACE("%p, %s, %ld, %p\n", iface, wine_dbgstr_longlong(move.QuadPart), origin, pos);
switch (origin)
{
......@@ -289,7 +289,7 @@ static HRESULT WINAPI stream_CopyTo(IStream *iface, IStream *dest, ULARGE_INTEGE
HRESULT hr = S_OK;
BYTE buffer[128];
TRACE("%p, %p, %d, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written);
TRACE("%p, %p, %ld, %p, %p\n", iface, dest, cb.u.LowPart, read_len, written);
if (!dest)
return STG_E_INVALIDPOINTER;
......
dlls/combase/malloc.c
View file @ 652aef30
......@@ -144,7 +144,7 @@ static void * WINAPI allocator_Alloc(IMalloc *iface, SIZE_T cb)
{
void *addr;
TRACE("%ld.\n", cb);
TRACE("%Id.\n", cb);
if (allocator.spy)
{
......@@ -178,7 +178,7 @@ static void * WINAPI allocator_Realloc(IMalloc *iface, void *pv, SIZE_T cb)
{
void *addr;
TRACE("%p, %ld.\n",pv,cb);
TRACE("%p, %Id.\n", pv, cb);
if (allocator.spy)
{
......
dlls/combase/roapi.c
View file @ 652aef30
......@@ -286,7 +286,7 @@ HRESULT WINAPI GetRestrictedErrorInfo(IRestrictedErrorInfo **info)
*/
BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknown *language_exception)
{
FIXME("(%x %s %p) stub\n", error, debugstr_hstring(message), language_exception);
FIXME("%#lx, %s, %p: stub\n", error, debugstr_hstring(message), language_exception);
return FALSE;
}
......@@ -295,7 +295,7 @@ BOOL WINAPI RoOriginateLanguageException(HRESULT error, HSTRING message, IUnknow
*/
BOOL WINAPI RoOriginateError(HRESULT error, HSTRING message)
{
FIXME("(%x %s) stub\n", error, debugstr_hstring(message));
FIXME("%#lx, %s: stub\n", error, debugstr_hstring(message));
return FALSE;
}
......
dlls/combase/stubmanager.c
View file @ 652aef30
......@@ -74,7 +74,7 @@ struct ifstub * stub_manager_new_ifstub(struct stub_manager *m, IRpcStubBuffer *
struct ifstub *stub;
HRESULT hr;
TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%x\n", wine_dbgstr_longlong(m->oid), sb,
TRACE("oid=%s, stubbuffer=%p, iid=%s, dest_context=%lx\n", wine_dbgstr_longlong(m->oid), sb,
debugstr_guid(iid), dest_context);
stub = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct ifstub));
......@@ -300,7 +300,7 @@ static ULONG stub_manager_int_addref(struct stub_manager *m)
refs = ++m->refs;
LeaveCriticalSection(&m->apt->cs);
TRACE("before %d\n", refs - 1);
TRACE("before %ld\n", refs - 1);
return refs;
}
......@@ -314,7 +314,7 @@ ULONG stub_manager_int_release(struct stub_manager *m)
EnterCriticalSection(&apt->cs);
refs = --m->refs;
TRACE("after %d\n", refs);
TRACE("after %ld\n", refs);
/* remove from apartment so no other thread can access it... */
if (!refs)
......@@ -341,7 +341,7 @@ struct stub_manager * get_stub_manager_from_object(struct apartment *apt, IUnkno
hres = IUnknown_QueryInterface(obj, &IID_IUnknown, (void**)&object);
if (FAILED(hres))
{
ERR("QueryInterface(IID_IUnknown failed): %08x\n", hres);
ERR("QueryInterface(IID_IUnknown failed): %#lx\n", hres);
return NULL;
}
......@@ -421,7 +421,7 @@ ULONG stub_manager_ext_addref(struct stub_manager *m, ULONG refs, BOOL tableweak
LeaveCriticalSection(&m->lock);
TRACE("added %u refs to %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
TRACE("added %lu refs to %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
/*
* NOTE: According to tests, creating a stub causes two AddConnection calls followed by
......@@ -454,7 +454,7 @@ ULONG stub_manager_ext_release(struct stub_manager *m, ULONG refs, BOOL tablewea
LeaveCriticalSection(&m->lock);
TRACE("removed %u refs from %p (oid %s), rc is now %u\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
TRACE("removed %lu refs from %p (oid %s), rc is now %lu\n", refs, m, wine_dbgstr_longlong(m->oid), rc);
if (last_extern_ref && m->extern_conn)
IExternalConnection_ReleaseConnection(m->extern_conn, EXTCONN_STRONG, 0, last_unlock_releases);
......@@ -672,7 +672,7 @@ static ULONG WINAPI RemUnknown_AddRef(IRemUnknown *iface)
refs = InterlockedIncrement(&remunk->refs);
TRACE("%p before: %d\n", iface, refs-1);
TRACE("%p before: %ld\n", iface, refs-1);
return refs;
}
......@@ -685,7 +685,7 @@ static ULONG WINAPI RemUnknown_Release(IRemUnknown *iface)
if (!refs)
HeapFree(GetProcessHeap(), 0, remunk);
TRACE("%p after: %d\n", iface, refs);
TRACE("%p after: %ld\n", iface, refs);
return refs;
}
......@@ -702,7 +702,7 @@ static HRESULT WINAPI RemUnknown_RemQueryInterface(IRemUnknown *iface,
DWORD dest_context;
void *dest_context_data;
TRACE("%p, %s, %d, %d, %p, %p\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults);
TRACE("%p, %s, %ld, %d, %p, %p.\n", iface, debugstr_guid(ripid), cRefs, cIids, iids, ppQIResults);
hr = ipid_to_ifstub(ripid, &apt, &stubmgr, &ifstub);
if (hr != S_OK) return hr;
......@@ -755,7 +755,7 @@ static HRESULT WINAPI RemUnknown_RemAddRef(IRemUnknown *iface,
stub_manager_ext_addref(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE);
if (InterfaceRefs[i].cPrivateRefs)
FIXME("Adding %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
FIXME("Adding %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
stub_manager_int_release(stubmgr);
apartment_release(apt);
......@@ -788,7 +788,7 @@ static HRESULT WINAPI RemUnknown_RemRelease(IRemUnknown *iface,
stub_manager_ext_release(stubmgr, InterfaceRefs[i].cPublicRefs, FALSE, TRUE);
if (InterfaceRefs[i].cPrivateRefs)
FIXME("Releasing %d refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
FIXME("Releasing %ld refs securely not implemented\n", InterfaceRefs[i].cPrivateRefs);
stub_manager_int_release(stubmgr);
apartment_release(apt);
......
dlls/combase/usrmarshal.c
View file @ 652aef30
......@@ -112,25 +112,25 @@ static void handle_UserFree(ULONG *pFlags, HANDLE *handle)
#define IMPL_WIREM_HANDLE(type) \
ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \
{ \
TRACE("(%s, %d, %p\n", debugstr_user_flags(pFlags), StartingSize, handle); \
TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, handle); \
return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \
} \
\
unsigned char * __RPC_USER type##_UserMarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \
{ \
TRACE("(%s, %p, &%p\n", debugstr_user_flags(pFlags), pBuffer, *handle); \
TRACE("%s, %p, &%p.\n", debugstr_user_flags(pFlags), pBuffer, *handle); \
return handle_UserMarshal(pFlags, pBuffer, (HANDLE *)handle); \
} \
\
unsigned char * __RPC_USER type##_UserUnmarshal(ULONG *pFlags, unsigned char *pBuffer, type *handle) \
{ \
TRACE("(%s, %p, %p\n", debugstr_user_flags(pFlags), pBuffer, handle); \
TRACE("%s, %p, %p.\n", debugstr_user_flags(pFlags), pBuffer, handle); \
return handle_UserUnmarshal(pFlags, pBuffer, (HANDLE *)handle); \
} \
\
void __RPC_USER type##_UserFree(ULONG *pFlags, type *handle) \
{ \
TRACE("(%s, &%p\n", debugstr_user_flags(pFlags), *handle); \
TRACE("%s, &%p.\n", debugstr_user_flags(pFlags), *handle); \
handle_UserFree(pFlags, (HANDLE *)handle); \
}
......@@ -163,7 +163,7 @@ IMPL_WIREM_HANDLE(HWND)
*/
ULONG __RPC_USER CLIPFORMAT_UserSize(ULONG *pFlags, ULONG size, CLIPFORMAT *pCF)
{
TRACE("%s, %u, %p\n", debugstr_user_flags(pFlags), size, pCF);
TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), size, pCF);
ALIGN_LENGTH(size, 3);
......@@ -363,7 +363,7 @@ void __RPC_USER CLIPFORMAT_UserFree(ULONG *pFlags, CLIPFORMAT *pCF)
*/
ULONG __RPC_USER HBITMAP_UserSize(ULONG *flags, ULONG size, HBITMAP *bmp)
{
TRACE("(%s, %d, %p)\n", debugstr_user_flags(flags), size, *bmp);
TRACE("%s, %lu, %p.\n", debugstr_user_flags(flags), size, *bmp);
ALIGN_LENGTH(size, 3);
......@@ -642,7 +642,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG *pFlags, ULONG StartingSize, HGLOBAL *ph
{
ULONG size = StartingSize;
TRACE("%s, %u, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal);
TRACE("%s, %lu, %p.\n", debugstr_user_flags(pFlags), StartingSize, phGlobal);
ALIGN_LENGTH(size, 3);
......@@ -886,7 +886,7 @@ ULONG __RPC_USER WdtpInterfacePointer_UserSize(ULONG *pFlags, ULONG RealFlags, U
DWORD marshal_size = 0;
HRESULT hr;
TRACE("%s, %#x, %u, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid));
TRACE("%s, %#lx, %lu, %p, %s.\n", debugstr_user_flags(pFlags), RealFlags, StartingSize, punk, debugstr_guid(riid));
hr = CoGetMarshalSizeMax(&marshal_size, riid, punk, LOWORD(RealFlags), NULL, MSHLFLAGS_NORMAL);
if (FAILED(hr)) return StartingSize;
......@@ -923,7 +923,7 @@ unsigned char * WINAPI WdtpInterfacePointer_UserMarshal(ULONG *pFlags, ULONG Rea
DWORD size;
void *ptr;
TRACE("%s, %#x, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid));
TRACE("%s, %#lx, %p, &%p, %s.\n", debugstr_user_flags(pFlags), RealFlags, pBuffer, punk, debugstr_guid(riid));
if (!h) return NULL;
if (CreateStreamOnHGlobal(h, TRUE, &stm) != S_OK)
......
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