From 331fb086be9d435348d1d1f7745c86d1b28bc61d Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Fri, 25 Oct 2002 03:50:14 +0000 Subject: [PATCH] Some small cleanups. --- dlls/commdlg/filedlgbrowser.c | 2 +- dlls/shell32/shellstring.c | 4 ++-- dlls/twain/ds_image.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index 4460a0ccbf3..2ef6a6c702e 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -102,7 +102,7 @@ static void COMDLG32_UpdateCurrentDir(FileOpenDlgInfos *fodInfos) /* copied from shell32 to avoid linking to it */ static HRESULT COMDLG32_StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl) { - TRACE("dest=0x%p len=0x%lx strret=0x%p pidl=%p stub\n",dest,len,src,pidl); + TRACE("dest=%p len=0x%lx strret=%p pidl=%p stub\n",dest,len,src,pidl); switch (src->uType) { diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c index 7c6ef1390ab..0be10d45562 100644 --- a/dlls/shell32/shellstring.c +++ b/dlls/shell32/shellstring.c @@ -47,7 +47,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=0x%p len=0x%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : @@ -82,7 +82,7 @@ HRESULT WINAPI StrRetToStrNA (LPVOID dest, DWORD len, LPSTRRET src, const ITEMID HRESULT WINAPI StrRetToStrNW (LPVOID dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { - TRACE("dest=0x%p len=0x%lx strret=%p(%s) pidl=%p\n", + TRACE("dest=%p len=0x%lx strret=%p(%s) pidl=%p\n", dest,len,src, (src->uType == STRRET_WSTR) ? "STRRET_WSTR" : (src->uType == STRRET_CSTR) ? "STRRET_CSTR" : diff --git a/dlls/twain/ds_image.c b/dlls/twain/ds_image.c index 29b6f00cd41..f31d9db0738 100644 --- a/dlls/twain/ds_image.c +++ b/dlls/twain/ds_image.c @@ -276,7 +276,7 @@ TW_UINT16 TWAIN_ImageNativeXferGet (pTW_IDENTITY pOrigin, pTW_IDENTITY pDest, sane_cancel (pSource->deviceHandle); ReleaseDC (pSource->hwndOwner, dc); - *pHandle = hDIB; + *pHandle = (TW_UINT32)hDIB; twRC = TWRC_XFERDONE; pSource->twCC = TWCC_SUCCESS; pSource->currentState = 7;