ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compile the oleaut32 dll with -DSTRICT.

This commit is contained in:
Michael Stefaniuc 2002-10-25 03:12:50 +00:00 committed by Alexandre Julliard
parent 79404213a2
commit 9faec8a877
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/oleaut32/Makefile.in
View File

@ -1,4 +1,3 @@
EXTRADEFS = -DWINE_NO_STRICT
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@

2
dlls/oleaut32/ole2disp.c
View File

@ -429,7 +429,7 @@ HRESULT WINAPI OleTranslateColor(
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.

8
dlls/oleaut32/olefont.c
View File

@ -953,7 +953,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont(
}
*phfont = this->gdiFont;
TRACE("Returning %08x\n", *phfont);
TRACE("Returning %p\n", *phfont);
return S_OK;
}
@ -1083,7 +1083,7 @@ static HRESULT WINAPI OLEFontImpl_AddRefHfont(
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 @@ static HRESULT WINAPI OLEFontImpl_ReleaseHfont(
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 @@ static HRESULT WINAPI OLEFontImpl_SetHdc(
HDC hdc)
{
_ICOM_THIS(OLEFontImpl, iface);
FIXME("(%p)->(%08x): Stub\n", this, hdc);
FIXME("(%p)->(%p): Stub\n", this, hdc);
return E_NOTIMPL;
}

16
dlls/oleaut32/olepicture.c
View File

@ -134,7 +134,7 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl*This) {
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 @@ static OLEPictureImpl* OLEPictureImpl_Construct(LPPICTDESC pictDesc, BOOL fOwn)
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 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
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 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
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 @@ static HRESULT WINAPI OLEPictureImpl_get_CurDC(IPicture *iface,
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 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
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 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
*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);

4
dlls/oleaut32/stubs.c
View File

@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
*/
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 @@ HRESULT WINAPI OleCreatePropertyFrame(
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;