Michael Stefaniuc : ole32: Fix the warnings introduced by the "
unsigned long" to "ULONG" header changes.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Nov 9 06:08:44 CST 2006
Module: wine
Branch: master
Commit: 22befac97eae75bff3ba8a53955e6e6a59d1c769
URL: http://source.winehq.org/git/wine.git/?a=commit;h=22befac97eae75bff3ba8a53955e6e6a59d1c769
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Wed Nov 8 23:46:01 2006 +0100
ole32: Fix the warnings introduced by the "unsigned long" to "ULONG" header changes.
---
dlls/ole32/tests/marshal.c | 28 ++++++++++++++--------------
dlls/ole32/usrmarshal.c | 10 +++++-----
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c
index d4f6b78..4d0c5cd 100644
--- a/dlls/ole32/tests/marshal.c
+++ b/dlls/ole32/tests/marshal.c
@@ -2084,14 +2084,14 @@ static const char cf_marshaled[] =
static void test_marshal_CLIPFORMAT(void)
{
unsigned char *buffer;
- unsigned long size;
- unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
+ ULONG size;
+ ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
wireCLIPFORMAT wirecf;
CLIPFORMAT cf = RegisterClipboardFormatA("MyFormat");
CLIPFORMAT cf2;
size = CLIPFORMAT_UserSize(&flags, 0, &cf);
- ok(size == sizeof(*wirecf) + sizeof(cf_marshaled), "Wrong size %ld\n", size);
+ ok(size == sizeof(*wirecf) + sizeof(cf_marshaled), "Wrong size %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
CLIPFORMAT_UserMarshal(&flags, buffer, &cf);
@@ -2110,14 +2110,14 @@ static void test_marshal_CLIPFORMAT(void
static void test_marshal_HWND(void)
{
unsigned char *buffer;
- unsigned long size;
- unsigned long flags = MAKELONG(MSHCTX_LOCAL, NDR_LOCAL_DATA_REPRESENTATION);
+ ULONG size;
+ ULONG flags = MAKELONG(MSHCTX_LOCAL, NDR_LOCAL_DATA_REPRESENTATION);
HWND hwnd = GetDesktopWindow();
HWND hwnd2;
wireHWND wirehwnd;
size = HWND_UserSize(&flags, 0, &hwnd);
- ok(size == sizeof(*wirehwnd), "Wrong size %ld\n", size);
+ ok(size == sizeof(*wirehwnd), "Wrong size %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
HWND_UserMarshal(&flags, buffer, &hwnd);
@@ -2135,8 +2135,8 @@ static void test_marshal_HWND(void)
static void test_marshal_HGLOBAL(void)
{
unsigned char *buffer;
- unsigned long size;
- unsigned long flags = MAKELONG(MSHCTX_LOCAL, NDR_LOCAL_DATA_REPRESENTATION);
+ ULONG size;
+ ULONG flags = MAKELONG(MSHCTX_LOCAL, NDR_LOCAL_DATA_REPRESENTATION);
HGLOBAL hglobal;
HGLOBAL hglobal2;
unsigned char *wirehglobal;
@@ -2147,7 +2147,7 @@ static void test_marshal_HGLOBAL(void)
size = HGLOBAL_UserSize(&flags, 0, &hglobal);
/* native is poorly programmed and allocates 4 bytes more than it needs to
* here - Wine doesn't have to emulate that */
- ok((size == 8) || (size == 12), "Size should be 12, instead of %ld\n", size);
+ ok((size == 8) || (size == 12), "Size should be 12, instead of %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
HGLOBAL_UserMarshal(&flags, buffer, &hglobal);
wirehglobal = buffer;
@@ -2168,7 +2168,7 @@ static void test_marshal_HGLOBAL(void)
size = HGLOBAL_UserSize(&flags, 0, &hglobal);
/* native is poorly programmed and allocates 4 bytes more than it needs to
* here - Wine doesn't have to emulate that */
- ok((size == 24) || (size == 28), "Size should be 24 or 28, instead of %ld\n", size);
+ ok((size == 24) || (size == 28), "Size should be 24 or 28, instead of %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
HGLOBAL_UserMarshal(&flags, buffer, &hglobal);
wirehglobal = buffer;
@@ -2202,8 +2202,8 @@ static HENHMETAFILE create_emf(void)
static void test_marshal_HENHMETAFILE(void)
{
unsigned char *buffer;
- unsigned long size;
- unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
+ ULONG size;
+ ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION);
HENHMETAFILE hemf;
HENHMETAFILE hemf2 = NULL;
unsigned char *wirehemf;
@@ -2211,7 +2211,7 @@ static void test_marshal_HENHMETAFILE(vo
hemf = create_emf();
size = HENHMETAFILE_UserSize(&flags, 0, &hemf);
- ok(size > 20, "size should be at least 20 bytes, not %ld\n", size);
+ ok(size > 20, "size should be at least 20 bytes, not %d\n", size);
buffer = HeapAlloc(GetProcessHeap(), 0, size);
HENHMETAFILE_UserMarshal(&flags, buffer, &hemf);
wirehemf = buffer;
@@ -2238,7 +2238,7 @@ static void test_marshal_HENHMETAFILE(vo
hemf = NULL;
size = HENHMETAFILE_UserSize(&flags, 0, &hemf);
- ok(size == 8, "size should be 8 bytes, not %ld\n", size);
+ ok(size == 8, "size should be 8 bytes, not %d\n", size);
buffer = (unsigned char *)HeapAlloc(GetProcessHeap(), 0, size);
HENHMETAFILE_UserMarshal(&flags, buffer, &hemf);
wirehemf = buffer;
diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c
index 4d39775..a92dfa0 100644
--- a/dlls/ole32/usrmarshal.c
+++ b/dlls/ole32/usrmarshal.c
@@ -83,7 +83,7 @@ ULONG __RPC_USER CLIPFORMAT_UserSize(ULO
{
ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, pCF);
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, pCF);
size += sizeof(userCLIPFORMAT);
@@ -282,7 +282,7 @@ static void __RPC_USER handle_UserFree(U
#define IMPL_WIREM_HANDLE(type) \
ULONG __RPC_USER type##_UserSize(ULONG *pFlags, ULONG StartingSize, type *handle) \
{ \
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, handle); \
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, handle); \
return handle_UserSize(pFlags, StartingSize, (HANDLE *)handle); \
} \
\
@@ -315,7 +315,7 @@ ULONG __RPC_USER HGLOBAL_UserSize(ULONG
{
ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, phGlobal);
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, phGlobal);
ALIGN_LENGTH(size, 3);
@@ -531,7 +531,7 @@ ULONG __RPC_USER HENHMETAFILE_UserSize(U
{
ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *phEmf);
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *phEmf);
size += sizeof(ULONG);
if (LOWORD(*pFlags) == MSHCTX_INPROC)
@@ -647,7 +647,7 @@ ULONG __RPC_USER STGMEDIUM_UserSize(ULON
{
ULONG size = StartingSize;
- TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, pStgMedium);
+ TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, pStgMedium);
ALIGN_LENGTH(size, 3);
More information about the wine-cvs
mailing list