November 2006 - Wine-Commits

Eric Pouech : comctl32: header: fix bug found out by running valgrind on the regression tests.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6e022a3a280d2aa4bc5256332c7e8d75bc59b673 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e022a3a280d2aa4bc5256332… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 21:46:42 2006 +0100 comctl32: header: fix bug found out by running valgrind on the regression tests. --- dlls/comctl32/header.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index b71c9e1..5b62dda 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -402,6 +402,7 @@ HEADER_DrawItem (HWND hwnd, HDC hdc, INT if (phdi->fmt & HDF_STRING) { RECT textRect; + SetRectEmpty(&textRect); DrawTextW (hdc, phdi->pszText, -1, &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); cw = textRect.right - textRect.left + 2 * infoPtr->iMargin;

1 0

Alexandre Julliard : kernel32: Fixed buffer overrun in get_registry_locale_info.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 63ca94c4199d17b28b82a3f7165bb223703fafc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63ca94c4199d17b28b82a3f71… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 12:03:21 2006 +0100 kernel32: Fixed buffer overrun in get_registry_locale_info. --- dlls/kernel32/locale.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index dd687ed..9a72a4c 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -804,7 +804,6 @@ static INT get_registry_locale_info( LPC } status = NtQueryValueKey( hkey, &nameW, KeyValuePartialInformation, info, size, &size ); - if (status == STATUS_BUFFER_OVERFLOW && !buffer) status = 0; if (!status) { @@ -825,14 +824,18 @@ static INT get_registry_locale_info( LPC buffer[ret-1] = 0; } } + else if (status == STATUS_BUFFER_OVERFLOW && !buffer) + { + ret = (size - info_size) / sizeof(WCHAR) + 1; + } + else if (status == STATUS_OBJECT_NAME_NOT_FOUND) + { + ret = -1; + } else { - if (status == STATUS_OBJECT_NAME_NOT_FOUND) ret = -1; - else - { - SetLastError( RtlNtStatusToDosError(status) ); - ret = 0; - } + SetLastError( RtlNtStatusToDosError(status) ); + ret = 0; } NtClose( hkey ); HeapFree( GetProcessHeap(), 0, info );

1 0

Mike McCormack : user32: Downgrade a FIXME to a WARN.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6987a4b453bfa67835e858dae186b88dba73a420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6987a4b453bfa67835e858dae… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 9 13:24:45 2006 +0900 user32: Downgrade a FIXME to a WARN. --- dlls/user/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user/win.c b/dlls/user/win.c index d355a13..5e938e4 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -2318,7 +2318,7 @@ BOOL WINAPI SetWindowTextA( HWND hwnd, L return FALSE; } if (!WIN_IsCurrentProcess( hwnd )) - FIXME( "setting text %s of other process window %p should not use SendMessage\n", + WARN( "setting text %s of other process window %p should not use SendMessage\n", debugstr_a(lpString), hwnd ); return (BOOL)SendMessageA( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); } @@ -2335,7 +2335,7 @@ BOOL WINAPI SetWindowTextW( HWND hwnd, L return FALSE; } if (!WIN_IsCurrentProcess( hwnd )) - FIXME( "setting text %s of other process window %p should not use SendMessage\n", + WARN( "setting text %s of other process window %p should not use SendMessage\n", debugstr_w(lpString), hwnd ); return (BOOL)SendMessageW( hwnd, WM_SETTEXT, 0, (LPARAM)lpString ); }

1 0

Mike McCormack : comctl32: Downgrade an ERR to a WARN.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: f23ab81738fb861ff45e21639eb5ead31f706384 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f23ab81738fb861ff45e21639… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 9 13:16:38 2006 +0900 comctl32: Downgrade an ERR to a WARN. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 8875ca0..bda17e9 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -5205,7 +5205,7 @@ TOOLBAR_GetStringA (HWND hwnd, WPARAM wP TRACE("returning %s\n", debugstr_a(str)); } else - ERR("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1); + WARN("String index %d out of range (largest is %d)\n", iString, infoPtr->nNumStrings - 1); return ret; }

1 0

Mike McCormack : gdi32: Downgrade a FIXME to a WARN.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: f76d3c259cfa786e04027f379818aa2dfcb73f24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f76d3c259cfa786e04027f379… Author: Mike McCormack <mike(a)codeweavers.com> Date: Thu Nov 9 13:15:16 2006 +0900 gdi32: Downgrade a FIXME to a WARN. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 53ebd19..f7bc28f 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2426,7 +2426,7 @@ GdiFont *WineEngCreateFontInstance(DC *d face = LIST_ENTRY(face_elem_ptr, Face, entry); if(face->scalable) { csi.fs.fsCsb[0] = 0; - FIXME("just using first face for now\n"); + WARN("just using first face for now\n"); goto found; } if(can_use_bitmap && !last_resort_family)

1 0

Eric Pouech : winmm: Remove WINE_NO_LONG_AS_INT.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 2f540b8602614807874d06c49eb0adabcc6aa981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f540b8602614807874d06c49… Author: Eric Pouech <eric.pouech(a)wanadoo.fr> Date: Wed Nov 8 22:24:36 2006 +0100 winmm: Remove WINE_NO_LONG_AS_INT. --- dlls/winmm/Makefile.in | 2 +- dlls/winmm/driver.c | 10 ++-- dlls/winmm/lolvldrv.c | 16 +++--- dlls/winmm/mci.c | 46 ++++++++++---------- dlls/winmm/message16.c | 112 +++++++++++++++++++++++------------------------ dlls/winmm/mmio.c | 42 +++++++++--------- dlls/winmm/mmsystem.c | 66 ++++++++++++++-------------- dlls/winmm/playsound.c | 14 +++--- dlls/winmm/sound16.c | 6 +-- dlls/winmm/time.c | 6 +- dlls/winmm/winemm.h | 12 +++--- dlls/winmm/winmm.c | 92 ++++++++++++++++++++-------------------- 12 files changed, 209 insertions(+), 215 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f540b8602614807874d0…

1 0

Alex Villacís Lasso : oleaut32: typelib - fix regression in MSFT typelib parsing.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 64410e5907443ef8f8e0d4a1f96b6098101ac2af URL: http://source.winehq.org/git/wine.git/?a=commit;h=64410e5907443ef8f8e0d4a1f… Author: Alex Villacís Lasso <a_villacis(a)palosanto.com> Date: Wed Nov 8 19:33:46 2006 -0500 oleaut32: typelib - fix regression in MSFT typelib parsing. --- dlls/oleaut32/typelib.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 92532f5..a12deb1 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1173,7 +1173,7 @@ static void dump_TLBFuncDescOne(const TL dump_FUNCDESC(&(pfd->funcdesc)); MESSAGE("\thelpstring: %s\n", debugstr_w(pfd->HelpString)); - MESSAGE("\tentry: %s\n", debugstr_w(pfd->Entry)); + MESSAGE("\tentry: %s\n", (pfd->Entry == (void *)-1) ? "invalid" : debugstr_w(pfd->Entry)); } static void dump_TLBFuncDesc(const TLBFuncDesc * pfd) { @@ -1813,7 +1813,9 @@ MSFT_DoFuncs(TLBContext* pcx, { if ( pFuncRec->FKCCIC & 0x2000 ) { - (*pptfd)->Entry = SysAllocString((WCHAR*)pFuncRec->OptAttr[2]); + if (HIWORD(pFuncRec->OptAttr[2]) != 0) + ERR("ordinal 0x%08x invalid, HIWORD != 0\n", pFuncRec->OptAttr[2]); + (*pptfd)->Entry = (BSTR)pFuncRec->OptAttr[2]; } else { @@ -1832,6 +1834,10 @@ MSFT_DoFuncs(TLBContext* pcx, } } } + else + { + (*pptfd)->Entry = (BSTR)-1; + } } } @@ -4437,7 +4443,8 @@ static ULONG WINAPI ITypeInfo_fnRelease( pCustDataNext = pCustData->next; TLB_Free(pCustData); } - SysFreeString(pFInfo->Entry); + if (HIWORD(pFInfo->Entry) != 0 && pFInfo->Entry != (BSTR)-1) + SysFreeString(pFInfo->Entry); SysFreeString(pFInfo->HelpString); SysFreeString(pFInfo->Name);

1 0

Michael Stefaniuc : rpcrt4/tests: Fix the warnings introduced by the " unsigned long" to "ULONG" header changes.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 6bf97313bc9c7c010d5757a958b7ae61a4767f3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bf97313bc9c7c010d5757a95… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 8 23:46:24 2006 +0100 rpcrt4/tests: Fix the warnings introduced by the "unsigned long" to "ULONG" header changes. --- dlls/rpcrt4/tests/ndr_marshall.c | 59 +++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 29 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6bf97313bc9c7c010d575…

1 0

Michael Stefaniuc : oleaut32: Fix the warnings introduced by the " unsigned long" to "ULONG" header changes.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 9d625ad0e433700ac9fa4e2a2739dfe1b1c2363e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d625ad0e433700ac9fa4e2a2… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 8 23:46:13 2006 +0100 oleaut32: Fix the warnings introduced by the "unsigned long" to "ULONG" header changes. --- dlls/oleaut32/tmarshal.c | 6 +++--- dlls/oleaut32/usrmarshal.c | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index ee35076..f3e93a7 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -804,8 +804,8 @@ serialize_param( case VT_SAFEARRAY: { if (writeit) { - unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); - unsigned long size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg); + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG size = LPSAFEARRAY_UserSize(&flags, buf->curoff, (LPSAFEARRAY *)arg); xbuf_resize(buf, size); LPSAFEARRAY_UserMarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = size; @@ -1149,7 +1149,7 @@ deserialize_param( case VT_SAFEARRAY: { if (readit) { - unsigned long flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); + ULONG flags = MAKELONG(MSHCTX_DIFFERENTMACHINE, NDR_LOCAL_DATA_REPRESENTATION); unsigned char *buffer; buffer = LPSAFEARRAY_UserUnmarshal(&flags, buf->base + buf->curoff, (LPSAFEARRAY *)arg); buf->curoff = buffer - buf->base; diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 07000a1..c940f80 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -144,11 +144,11 @@ typedef struct ULONG WINAPI BSTR_UserSize(ULONG *pFlags, ULONG Start, BSTR *pstr) { - TRACE("(%lx,%ld,%p) => %p\n", *pFlags, Start, pstr, *pstr); + TRACE("(%x,%d,%p) => %p\n", *pFlags, Start, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_LENGTH(Start, 3); Start += sizeof(bstr_wire_t) + ((SysStringByteLen(*pstr) + 1) & ~1); - TRACE("returning %ld\n", Start); + TRACE("returning %d\n", Start); return Start; } @@ -157,7 +157,7 @@ unsigned char * WINAPI BSTR_UserMarshal( bstr_wire_t *header; DWORD len = SysStringByteLen(*pstr); - TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); if (*pstr) TRACE("string=%s\n", debugstr_w(*pstr)); ALIGN_POINTER(Buffer, 3); @@ -177,7 +177,7 @@ unsigned char * WINAPI BSTR_UserMarshal( unsigned char * WINAPI BSTR_UserUnmarshal(ULONG *pFlags, unsigned char *Buffer, BSTR *pstr) { bstr_wire_t *header; - TRACE("(%lx,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); + TRACE("(%x,%p,%p) => %p\n", *pFlags, Buffer, pstr, *pstr); ALIGN_POINTER(Buffer, 3); header = (bstr_wire_t*)Buffer; @@ -199,7 +199,7 @@ unsigned char * WINAPI BSTR_UserUnmarsha void WINAPI BSTR_UserFree(ULONG *pFlags, BSTR *pstr) { - TRACE("(%lx,%p) => %p\n", *pFlags, pstr, *pstr); + TRACE("(%x,%p) => %p\n", *pFlags, pstr, *pstr); if (*pstr) { SysFreeString(*pstr); @@ -338,7 +338,7 @@ static unsigned char* interface_variant_ ULONG size; HRESULT hr; - TRACE("pFlags=%ld, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); + TRACE("pFlags=%d, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); oldpos = Buffer; @@ -387,7 +387,7 @@ static unsigned char *interface_variant_ ULONG size; HRESULT hr; - TRACE("pFlags=%ld, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); + TRACE("pFlags=%d, Buffer=%p, pvar=%p\n", *pFlags, Buffer, pvar); oldpos = Buffer; @@ -427,7 +427,7 @@ static unsigned char *interface_variant_ ULONG WINAPI VARIANT_UserSize(ULONG *pFlags, ULONG Start, VARIANT *pvar) { int align; - TRACE("(%lx,%ld,%p)\n", *pFlags, Start, pvar); + TRACE("(%x,%d,%p)\n", *pFlags, Start, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_LENGTH(Start, 7); @@ -443,7 +443,7 @@ ULONG WINAPI VARIANT_UserSize(ULONG *pFl Start += get_type_size(pFlags, pvar); Start = wire_extra_user_size(pFlags, Start, pvar); - TRACE("returning %ld\n", Start); + TRACE("returning %d\n", Start); return Start; } @@ -454,7 +454,7 @@ unsigned char * WINAPI VARIANT_UserMarsh int align; unsigned char *Pos; - TRACE("(%lx,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); TRACE("vt=%04x\n", V_VT(pvar)); ALIGN_POINTER(Buffer, 7); @@ -551,7 +551,7 @@ unsigned char * WINAPI VARIANT_UserUnmar int align; unsigned char *Pos; - TRACE("(%lx,%p,%p)\n", *pFlags, Buffer, pvar); + TRACE("(%x,%p,%p)\n", *pFlags, Buffer, pvar); ALIGN_POINTER(Buffer, 7); VariantInit(pvar); @@ -636,7 +636,7 @@ void WINAPI VARIANT_UserFree(ULONG *pFla VARTYPE vt = V_VT(pvar); PVOID ref = NULL; - TRACE("(%lx,%p)\n", *pFlags, pvar); + TRACE("(%x,%p)\n", *pFlags, pvar); TRACE("vt=%04x\n", V_VT(pvar)); if (vt & VT_BYREF) ref = pvar->n1.n2.n3.byref; @@ -736,7 +736,7 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG { ULONG size = StartingSize; - TRACE("("); dump_user_flags(pFlags); TRACE(", %ld, %p\n", StartingSize, *ppsa); + TRACE("("); dump_user_flags(pFlags); TRACE(", %d, %p\n", StartingSize, *ppsa); ALIGN_LENGTH(size, 3); size += sizeof(ULONG_PTR);

1 0

Michael Stefaniuc : ole32: Fix the warnings introduced by the " unsigned long" to "ULONG" header changes.
by Alexandre Julliard Nov. 9, 2006

Nov. 9, 2006

Module: wine Branch: master Commit: 22befac97eae75bff3ba8a53955e6e6a59d1c769 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22befac97eae75bff3ba8a539… Author: Michael Stefaniuc <mstefani(a)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);

1 0