Hello,
License: LGPL, X11
Changelog:
Michael Stefaniuc <mstefani@redhat.com>
- compile the oleaut32 dll with -DSTRICT
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/oleaut32/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/Makefile.in,v
retrieving revision 1.37
diff -u -r1.37 Makefile.in
--- dlls/oleaut32/Makefile.in 18 Oct 2002 23:46:29 -0000 1.37
+++ dlls/oleaut32/Makefile.in 24 Oct 2002 21:14:03 -0000
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
Index: dlls/oleaut32/ole2disp.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/ole2disp.c,v
retrieving revision 1.27
diff -u -r1.27 ole2disp.c
--- dlls/oleaut32/ole2disp.c 31 May 2002 23:25:50 -0000 1.27
+++ dlls/oleaut32/ole2disp.c 24 Oct 2002 21:14:03 -0000
@@ -429,7 +429,7 @@
COLORREF colorref;
BYTE b = HIBYTE(HIWORD(clr));
- TRACE("(%08lx, %d, %p):stub\n", clr, hpal, pColorRef);
+ TRACE("(%08lx, %p, %p):stub\n", clr, hpal, pColorRef);
/*
* In case pColorRef is NULL, provide our own to simplify the code.
Index: dlls/oleaut32/olefont.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olefont.c,v
retrieving revision 1.17
diff -u -r1.17 olefont.c
--- dlls/oleaut32/olefont.c 25 Jun 2002 02:54:06 -0000 1.17
+++ dlls/oleaut32/olefont.c 24 Oct 2002 21:14:04 -0000
@@ -953,7 +953,7 @@
}
*phfont = this->gdiFont;
- TRACE("Returning %08x\n", *phfont);
+ TRACE("Returning %p\n", *phfont);
return S_OK;
}
@@ -1083,7 +1083,7 @@
HFONT hfont)
{
_ICOM_THIS(OLEFontImpl, iface);
- TRACE("(%p)->(%08x) (lock=%ld)\n", this, hfont, this->fontLock);
+ TRACE("(%p)->(%p) (lock=%ld)\n", this, hfont, this->fontLock);
if ( (hfont == 0) ||
(hfont != this->gdiFont) )
@@ -1104,7 +1104,7 @@
HFONT hfont)
{
_ICOM_THIS(OLEFontImpl, iface);
- TRACE("(%p)->(%08x) (lock=%ld)\n", this, hfont, this->fontLock);
+ TRACE("(%p)->(%p) (lock=%ld)\n", this, hfont, this->fontLock);
if ( (hfont == 0) ||
(hfont != this->gdiFont) )
@@ -1134,7 +1134,7 @@
HDC hdc)
{
_ICOM_THIS(OLEFontImpl, iface);
- FIXME("(%p)->(%08x): Stub\n", this, hdc);
+ FIXME("(%p)->(%p): Stub\n", this, hdc);
return E_NOTIMPL;
}
Index: dlls/oleaut32/olepicture.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/olepicture.c,v
retrieving revision 1.18
diff -u -r1.18 olepicture.c
--- dlls/oleaut32/olepicture.c 12 Sep 2002 17:29:12 -0000 1.18
+++ dlls/oleaut32/olepicture.c 24 Oct 2002 21:14:04 -0000
@@ -134,7 +134,7 @@
BITMAP bm;
HDC hdcRef;
- TRACE("bitmap handle %08x\n", This->desc.u.bmp.hbitmap);
+ TRACE("bitmap handle %p\n", This->desc.u.bmp.hbitmap);
if(GetObjectA(This->desc.u.bmp.hbitmap, sizeof(bm), &bm) != sizeof(bm)) {
ERR("GetObject fails\n");
return;
@@ -210,7 +210,7 @@
break;
case PICTYPE_METAFILE:
- TRACE("metafile handle %08x\n", pictDesc->u.wmf.hmeta);
+ TRACE("metafile handle %p\n", pictDesc->u.wmf.hmeta);
newObject->himetricWidth = pictDesc->u.wmf.xExt;
newObject->himetricHeight = pictDesc->u.wmf.yExt;
break;
@@ -412,13 +412,13 @@
TRACE("(%p)->(%p)\n", This, phandle);
switch(This->desc.picType) {
case PICTYPE_BITMAP:
- *phandle = This->desc.u.bmp.hbitmap;
+ *phandle = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
break;
case PICTYPE_METAFILE:
*phandle = (OLE_HANDLE)This->desc.u.wmf.hmeta;
break;
case PICTYPE_ICON:
- *phandle = This->desc.u.icon.hicon;
+ *phandle = (OLE_HANDLE)This->desc.u.icon.hicon;
break;
case PICTYPE_ENHMETAFILE:
*phandle = (OLE_HANDLE)This->desc.u.emf.hemf;
@@ -490,7 +490,7 @@
LPCRECT prcWBounds)
{
ICOM_THIS(OLEPictureImpl, iface);
- TRACE("(%p)->(%08x, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
+ TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
if(prcWBounds)
TRACE("prcWBounds (%d,%d) - (%d,%d)\n", prcWBounds->left, prcWBounds->top,
@@ -559,7 +559,7 @@
HDC *phdc)
{
ICOM_THIS(OLEPictureImpl, iface);
- TRACE("(%p), returning %x\n", This, This->hDCCur);
+ TRACE("(%p), returning %p\n", This, This->hDCCur);
if (phdc) *phdc = This->hDCCur;
return S_OK;
}
@@ -573,7 +573,7 @@
OLE_HANDLE *phbmpOut)
{
ICOM_THIS(OLEPictureImpl, iface);
- TRACE("(%p)->(%08x, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut);
+ TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut);
if (This->desc.picType == PICTYPE_BITMAP) {
SelectObject(hdcIn,This->desc.u.bmp.hbitmap);
@@ -581,7 +581,7 @@
*phdcOut = This->hDCCur;
This->hDCCur = hdcIn;
if (phbmpOut)
- *phbmpOut = This->desc.u.bmp.hbitmap;
+ *phbmpOut = (OLE_HANDLE)This->desc.u.bmp.hbitmap;
return S_OK;
} else {
FIXME("Don't know how to select picture type %d\n",This->desc.picType);
Index: dlls/oleaut32/stubs.c
===================================================================
RCS file: /home/wine/wine/dlls/oleaut32/stubs.c,v
retrieving revision 1.14
diff -u -r1.14 stubs.c
--- dlls/oleaut32/stubs.c 31 May 2002 23:25:50 -0000 1.14
+++ dlls/oleaut32/stubs.c 24 Oct 2002 21:14:04 -0000
@@ -35,7 +35,7 @@
*/
HCURSOR WINAPI OleIconToCursor( HINSTANCE hinstExe, HICON hicon)
{
- FIXME("(%x,%x), not implemented (olepro32.dll)\n",hinstExe,hicon);
+ FIXME("(%p,%p), not implemented (olepro32.dll)\n",hinstExe,hicon);
return S_OK;
}
@@ -56,7 +56,7 @@
LPUNKNOWN* ppUnk, ULONG cPages, LPCLSID pPageClsID, LCID lcid,
DWORD dwReserved, LPVOID pvReserved )
{
- FIXME("(%x,%d,%d,%s,%ld,%p,%ld,%p,%x,%ld,%p), not implemented (olepro32.dll)\n",
+ FIXME("(%p,%d,%d,%s,%ld,%p,%ld,%p,%x,%ld,%p), not implemented (olepro32.dll)\n",
hwndOwner,x,y,debugstr_w(lpszCaption),cObjects,ppUnk,cPages,
pPageClsID, (int)lcid,dwReserved,pvReserved);
return S_OK;
Attachment:
pgp00079.pgp
Description: PGP signature
