Hello, the components of this patch were sent before to wine-patches but didn't got applied. Here they are again. License: LGPL, X11 Changelog: Michael Stefaniuc <mstefani@redhat.com> - some small cleanups bye michael -- Michael Stefaniuc Tel.: +49-711-96437-199 System Administration Fax.: +49-711-96437-111 Red Hat GmbH Email: mstefani@redhat.com Hauptstaetterstr. 58 http://www.redhat.de/ D-70178 Stuttgart
Index: dlls/commdlg/filedlgbrowser.c
===================================================================
RCS file: /home/wine/wine/dlls/commdlg/filedlgbrowser.c,v
retrieving revision 1.36
diff -u -r1.36 filedlgbrowser.c
--- dlls/commdlg/filedlgbrowser.c 16 Jul 2002 01:18:35 -0000 1.36
+++ dlls/commdlg/filedlgbrowser.c 24 Oct 2002 17:50:38 -0000
@@ -102,7 +102,7 @@
/* 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)
{
Index: dlls/shell32/shellstring.c
===================================================================
RCS file: /home/wine/wine/dlls/shell32/shellstring.c,v
retrieving revision 1.23
diff -u -r1.23 shellstring.c
--- dlls/shell32/shellstring.c 24 Jul 2002 01:56:03 -0000 1.23
+++ dlls/shell32/shellstring.c 24 Oct 2002 17:50:39 -0000
@@ -47,7 +47,7 @@
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 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" :
Index: dlls/twain/ds_image.c
===================================================================
RCS file: /home/wine/wine/dlls/twain/ds_image.c,v
retrieving revision 1.2
diff -u -r1.2 ds_image.c
--- dlls/twain/ds_image.c 31 May 2002 23:40:53 -0000 1.2
+++ dlls/twain/ds_image.c 24 Oct 2002 17:50:39 -0000
@@ -276,7 +276,7 @@
sane_cancel (pSource->deviceHandle);
ReleaseDC (pSource->hwndOwner, dc);
- *pHandle = hDIB;
+ *pHandle = (TW_UINT32)hDIB;
twRC = TWRC_XFERDONE;
pSource->twCC = TWCC_SUCCESS;
pSource->currentState = 7;
Attachment:
pgp00073.pgp
Description: PGP signature
