August 2011 - Wine-Commits - list.winehq.org

Ričardas Barkauskas : ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 5c8ad267572d36ed006e63e795f314fd3f382240 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c8ad267572d36ed006e63e79… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:26:08 2011 +0300 ddraw: Do not AddRef IDirectDraw7 iface in CreateSurface helper. --- dlls/ddraw/ddraw.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index daea1ca..fc0dd93 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -3471,10 +3471,6 @@ static HRESULT CreateSurface(IDirectDrawImpl *ddraw, DDSURFACEDESC2 *DDSD, ddraw_create_gdi_swapchain(ddraw, object); } - /* Addref the ddraw interface to keep an reference for each surface */ - IDirectDraw7_AddRef(&ddraw->IDirectDraw7_iface); - object->ifaceToRelease = (IUnknown *)&ddraw->IDirectDraw7_iface; - /* Create a WineD3DTexture if a texture was requested */ if (desc2.ddsCaps.dwCaps & DDSCAPS_TEXTURE) { @@ -3523,6 +3519,8 @@ static HRESULT WINAPI ddraw7_CreateSurface(IDirectDraw7 *iface, DDSURFACEDESC2 * } *surface = &impl->IDirectDrawSurface7_iface; + IDirectDraw7_AddRef(iface); + impl->ifaceToRelease = (IUnknown *)iface; return hr; } @@ -3563,7 +3561,6 @@ static HRESULT WINAPI ddraw4_CreateSurface(IDirectDraw4 *iface, } *surface = &impl->IDirectDrawSurface4_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw4_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3606,7 +3603,6 @@ static HRESULT WINAPI ddraw3_CreateSurface(IDirectDraw3 *iface, DDSURFACEDESC *s } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); IDirectDraw3_AddRef(iface); impl->ifaceToRelease = (IUnknown *)iface; @@ -3649,7 +3645,6 @@ static HRESULT WINAPI ddraw2_CreateSurface(IDirectDraw2 *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr; @@ -3682,7 +3677,6 @@ static HRESULT WINAPI ddraw1_CreateSurface(IDirectDraw *iface, } *surface = &impl->IDirectDrawSurface_iface; - IDirectDraw7_Release(&This->IDirectDraw7_iface); impl->ifaceToRelease = NULL; return hr;

1 0

Thomas Faber : riched20: Fix uninitialized variable usage.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 73876d6ccd22172d56d6338328f639365fd48554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73876d6ccd22172d56d633832… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Aug 6 01:48:38 2011 +0200 riched20: Fix uninitialized variable usage. --- dlls/riched20/paint.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index cd85139..0655010 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -957,7 +957,7 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph) rc.left = c->pt.x + run->pt.x; rc.right = rc.left + run->nWidth; rc.top = c->pt.y + para->pt.y + run->pt.y; - rc.bottom = rc.bottom + height; + rc.bottom = rc.top + height; TRACE("rc = (%d, %d, %d, %d)\n", rc.left, rc.top, rc.right, rc.bottom); FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT)); }

1 0

Ričardas Barkauskas : ddraw/tests: Properly release no longer used interfaces.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 1a609ecab81bfa90d1aa3afbae0711e728f4e643 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a609ecab81bfa90d1aa3afba… Author: Ričardas Barkauskas <rbarkauskas(a)codeweavers.com> Date: Mon Aug 8 01:25:54 2011 +0300 ddraw/tests: Properly release no longer used interfaces. --- dlls/ddraw/tests/d3d.c | 4 ++-- dlls/ddraw/tests/dsurface.c | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index 0df3780..2197c64 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -1365,8 +1365,8 @@ static void Direct3D1Test(void) /* Interface consistency check. */ hr = IDirect3DDevice_GetDirect3D(Direct3DDevice1, &Direct3D_alt); ok(hr == D3D_OK, "IDirect3DDevice_GetDirect3D failed: %08x\n", hr); - if (hr == D3D_OK) - ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); + ok(Direct3D_alt == Direct3D1, "Direct3D1 struct pointer missmatch: %p != %p\n", Direct3D_alt, Direct3D1); + IDirect3D_Release(Direct3D_alt); memset(&desc, 0, sizeof(desc)); desc.dwSize = sizeof(desc); diff --git a/dlls/ddraw/tests/dsurface.c b/dlls/ddraw/tests/dsurface.c index b1a2940..1bbf5cc 100644 --- a/dlls/ddraw/tests/dsurface.c +++ b/dlls/ddraw/tests/dsurface.c @@ -3159,6 +3159,8 @@ static void GetDCTest(void) hr = IDirectDrawSurface4_ReleaseDC(surf4, dc); ok(SUCCEEDED(hr), "ReleaseDC failed, hr %#x.\n", hr); + IDirectDrawSurface_Release(tmp); + dc = CreateCompatibleDC(NULL); ok(!!dc, "CreateCompatibleDC failed.\n"); @@ -3175,11 +3177,12 @@ static void GetDCTest(void) ok(!tmp, "Expected surface NULL, got %p.\n", tmp); IDirectDrawSurface4_Release(surf4); + IDirectDrawSurface_Release(surf); IDirectDraw4_Release(dd4); hr = IDirectDraw_QueryInterface(lpDD, &IID_IDirectDraw7, (void **) &dd7); ok(hr == DD_OK, "IDirectDraw_QueryInterface failed: 0x%08x\n", hr); - surf = NULL; + hr = IDirectDraw7_CreateSurface(dd7, &ddsd2, &surf7, NULL); ok(hr == DD_OK, "IDirectDraw7_CreateSurface failed: 0x%08x\n", hr); dctest_surf((IDirectDrawSurface *) surf7, 2);

1 0

Nikolay Sivov : oleaut32: Use strdupW to duplicate strings.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 1a7d52c907c68d205957a7eab7e0e1b9eda30b61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a7d52c907c68d205957a7eab… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 18:13:47 2011 +0400 oleaut32: Use strdupW to duplicate strings. --- dlls/oleaut32/olefont.c | 48 +++++++++++----------------------------------- 1 files changed, 12 insertions(+), 36 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 222e20d..be88f51 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -697,32 +697,18 @@ static HRESULT WINAPI OLEFontImpl_put_Name( IFont* iface, BSTR name) { - OLEFontImpl *this = impl_from_IFont(iface); - TRACE("(%p)->(%p)\n", this, name); + OLEFontImpl *This = impl_from_IFont(iface); + TRACE("(%p)->(%p)\n", This, name); if (!name) return CTL_E_INVALIDPROPERTYVALUE; - if (this->description.lpstrName==0) - { - this->description.lpstrName = HeapAlloc(GetProcessHeap(), - 0, - (lstrlenW(name)+1) * sizeof(WCHAR)); - } - else - { - this->description.lpstrName = HeapReAlloc(GetProcessHeap(), - 0, - this->description.lpstrName, - (lstrlenW(name)+1) * sizeof(WCHAR)); - } - - if (this->description.lpstrName==0) - return E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, This->description.lpstrName); + This->description.lpstrName = strdupW(name); + if (!This->description.lpstrName) return E_OUTOFMEMORY; - strcpyW(this->description.lpstrName, name); - TRACE("new name %s\n", debugstr_w(this->description.lpstrName)); - OLEFont_SendNotify(this, DISPID_FONT_NAME); + TRACE("new name %s\n", debugstr_w(This->description.lpstrName)); + OLEFont_SendNotify(This, DISPID_FONT_NAME); return S_OK; } @@ -1025,15 +1011,8 @@ static HRESULT WINAPI OLEFontImpl_Clone( return E_OUTOFMEMORY; *newObject = *this; - - /* We need to alloc new memory for the string, otherwise - * we free memory twice. - */ - newObject->description.lpstrName = HeapAlloc( - GetProcessHeap(),0, - (1+strlenW(this->description.lpstrName))*2 - ); - strcpyW(newObject->description.lpstrName, this->description.lpstrName); + /* allocate separate buffer */ + newObject->description.lpstrName = strdupW(this->description.lpstrName); /* Increment internal ref in hfont item list */ if(newObject->gdiFont) inc_int_ref(newObject->gdiFont); @@ -2246,10 +2225,7 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->ref = 1; newObject->description.cbSizeofstruct = sizeof(FONTDESC); - newObject->description.lpstrName = HeapAlloc(GetProcessHeap(), - 0, - (lstrlenW(fontDesc->lpstrName)+1) * sizeof(WCHAR)); - strcpyW(newObject->description.lpstrName, fontDesc->lpstrName); + newObject->description.lpstrName = strdupW(fontDesc->lpstrName); newObject->description.cySize = fontDesc->cySize; newObject->description.sWeight = fontDesc->sWeight; newObject->description.sCharset = fontDesc->sCharset; @@ -2264,8 +2240,8 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->pPropertyNotifyCP = NULL; newObject->pFontEventsCP = NULL; - CreateConnectionPoint((IUnknown*)newObject, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); - CreateConnectionPoint((IUnknown*)newObject, &IID_IFontEventsDisp, &newObject->pFontEventsCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IPropertyNotifySink, &newObject->pPropertyNotifyCP); + CreateConnectionPoint((IUnknown*)&newObject->IFont_iface, &IID_IFontEventsDisp, &newObject->pFontEventsCP); if (!newObject->pPropertyNotifyCP || !newObject->pFontEventsCP) {

1 0

Nikolay Sivov : oleaut32/tests: Clean result value checks.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 78ca68c85426f12dae2a0a319ec62cf8d5149473 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78ca68c85426f12dae2a0a319… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 17:45:49 2011 +0400 oleaut32/tests: Clean result value checks. --- dlls/oleaut32/tests/olefont.c | 203 ++++++++++++++++++++--------------------- 1 files changed, 97 insertions(+), 106 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=78ca68c85426f12dae2a0…

1 0

Nikolay Sivov : oleaut32: FONTDESC size field value is not important for OleCreateFontIndirect.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 08f578a6c5e415a7f937d42f93a5e245907934a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f578a6c5e415a7f937d42f9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 17:53:12 2011 +0400 oleaut32: FONTDESC size field value is not important for OleCreateFontIndirect. --- dlls/oleaut32/olefont.c | 5 ----- dlls/oleaut32/tests/olefont.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index fa60da6..222e20d 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -2245,11 +2245,6 @@ static OLEFontImpl* OLEFontImpl_Construct(const FONTDESC *fontDesc) newObject->ref = 1; - /* - * Copy the description of the font in the object. - */ - assert(fontDesc->cbSizeofstruct >= sizeof(FONTDESC)); - newObject->description.cbSizeofstruct = sizeof(FONTDESC); newObject->description.lpstrName = HeapAlloc(GetProcessHeap(), 0, diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 65589b3..6fc1520 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -1104,6 +1104,42 @@ static void test_realization(void) IFont_Release(font); } +static void test_OleCreateFontIndirect(void) +{ + FONTDESC fontdesc; + IFont *font; + HRESULT hr; + + fontdesc.cbSizeofstruct = sizeof(fontdesc); + fontdesc.lpstrName = arial_font; + fontdesc.cySize.int64 = 12 * 10000; /* 12 pt */ + fontdesc.sWeight = FW_NORMAL; + fontdesc.sCharset = ANSI_CHARSET; + fontdesc.fItalic = FALSE; + fontdesc.fUnderline = FALSE; + fontdesc.fStrikethrough = FALSE; + + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + /* play with cbSizeofstruct value */ + fontdesc.cbSizeofstruct = sizeof(fontdesc)-1; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + fontdesc.cbSizeofstruct = sizeof(fontdesc)+1; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); + + fontdesc.cbSizeofstruct = 0; + hr = pOleCreateFontIndirect(&fontdesc, &IID_IFont, (void**)&font); + EXPECT_HR(hr, S_OK); + IFont_Release(font); +} + START_TEST(olefont) { hOleaut32 = GetModuleHandleA("oleaut32.dll"); @@ -1126,4 +1162,5 @@ START_TEST(olefont) test_returns(); test_hfont_lifetime(); test_realization(); + test_OleCreateFontIndirect(); }

1 0

Nikolay Sivov : oleaut32: Get rid of duplicated condition check.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: e800158ab0e0b33577c2c063f2bd145c1beb2adb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e800158ab0e0b33577c2c063f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 13:40:32 2011 +0400 oleaut32: Get rid of duplicated condition check. --- dlls/oleaut32/olefont.c | 171 +++++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 87 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index c986f0e..fa60da6 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -584,88 +584,85 @@ static int CALLBACK font_enum_proc(const LOGFONTW *elf, const TEXTMETRICW *ntm, static void realize_font(OLEFontImpl *This) { - if (This->dirty) - { - LOGFONTW logFont; - INT fontHeight; - WCHAR text_face[LF_FACESIZE]; - HDC hdc = get_dc(); - HFONT old_font; - TEXTMETRICW tm; + LOGFONTW logFont; + INT fontHeight; + WCHAR text_face[LF_FACESIZE]; + HDC hdc = get_dc(); + HFONT old_font; + TEXTMETRICW tm; - text_face[0] = 0; + if (!This->dirty) return; - if(This->gdiFont) - { - old_font = SelectObject(hdc, This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); - SelectObject(hdc, old_font); - dec_int_ref(This->gdiFont); - This->gdiFont = 0; - } + text_face[0] = 0; - memset(&logFont, 0, sizeof(LOGFONTW)); + if(This->gdiFont) + { + old_font = SelectObject(hdc, This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + SelectObject(hdc, old_font); + dec_int_ref(This->gdiFont); + This->gdiFont = 0; + } - lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); - logFont.lfCharSet = This->description.sCharset; + memset(&logFont, 0, sizeof(LOGFONTW)); - /* If the font name has been changed then enumerate all charsets - and pick one that'll result in the font specified being selected */ - if(text_face[0] && lstrcmpiW(text_face, This->description.lpstrName)) - { - enum_data data; - data.orig_cs = This->description.sCharset; - data.avail_cs = -1; - logFont.lfCharSet = DEFAULT_CHARSET; - EnumFontFamiliesExW(get_dc(), &logFont, font_enum_proc, (LPARAM)&data, 0); - if(data.avail_cs != -1) logFont.lfCharSet = data.avail_cs; - } + lstrcpynW(logFont.lfFaceName, This->description.lpstrName, LF_FACESIZE); + logFont.lfCharSet = This->description.sCharset; + /* If the font name has been changed then enumerate all charsets + and pick one that'll result in the font specified being selected */ + if(text_face[0] && lstrcmpiW(text_face, This->description.lpstrName)) + { + enum_data data; + data.orig_cs = This->description.sCharset; + data.avail_cs = -1; + logFont.lfCharSet = DEFAULT_CHARSET; + EnumFontFamiliesExW(get_dc(), &logFont, font_enum_proc, (LPARAM)&data, 0); + if(data.avail_cs != -1) logFont.lfCharSet = data.avail_cs; + } - /* - * The height of the font returned by the get_Size property is the - * height of the font in points multiplied by 10000... Using some - * simple conversions and the ratio given by the application, it can - * be converted to a height in pixels. - * - * Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. - * Ratio is applied here relative to the standard. - */ - - fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); + /* + * The height of the font returned by the get_Size property is the + * height of the font in points multiplied by 10000... Using some + * simple conversions and the ratio given by the application, it can + * be converted to a height in pixels. + * + * Standard ratio is 72 / 2540, or 18 / 635 in lowest terms. + * Ratio is applied here relative to the standard. + */ + fontHeight = MulDiv( This->description.cySize.s.Lo, This->cyLogical*635, This->cyHimetric*18 ); - logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : + logFont.lfHeight = ((fontHeight%10000L)>5000L) ? (-fontHeight/10000L) - 1 : (-fontHeight/10000L); - logFont.lfItalic = This->description.fItalic; - logFont.lfUnderline = This->description.fUnderline; - logFont.lfStrikeOut = This->description.fStrikethrough; - logFont.lfWeight = This->description.sWeight; - logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; - logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; - logFont.lfQuality = DEFAULT_QUALITY; - logFont.lfPitchAndFamily = DEFAULT_PITCH; - - This->gdiFont = CreateFontIndirectW(&logFont); - This->dirty = FALSE; - - add_hfontitem(This->gdiFont); - - /* Fixup the name and charset properties so that they match the - selected font */ - old_font = SelectObject(get_dc(), This->gdiFont); - GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); - if(lstrcmpiW(text_face, This->description.lpstrName)) - { - HeapFree(GetProcessHeap(), 0, This->description.lpstrName); - This->description.lpstrName = strdupW(text_face); - } - GetTextMetricsW(hdc, &tm); - This->description.sCharset = tm.tmCharSet; - /* While we have it handy, stash the realized font height for use by get_Size() */ - This->nRealHeight = tm.tmHeight - tm.tmInternalLeading; /* corresponds to LOGFONT lfHeight */ - SelectObject(hdc, old_font); + logFont.lfItalic = This->description.fItalic; + logFont.lfUnderline = This->description.fUnderline; + logFont.lfStrikeOut = This->description.fStrikethrough; + logFont.lfWeight = This->description.sWeight; + logFont.lfOutPrecision = OUT_CHARACTER_PRECIS; + logFont.lfClipPrecision = CLIP_DEFAULT_PRECIS; + logFont.lfQuality = DEFAULT_QUALITY; + logFont.lfPitchAndFamily = DEFAULT_PITCH; + + This->gdiFont = CreateFontIndirectW(&logFont); + This->dirty = FALSE; + + add_hfontitem(This->gdiFont); + + /* Fixup the name and charset properties so that they match the + selected font */ + old_font = SelectObject(get_dc(), This->gdiFont); + GetTextFaceW(hdc, sizeof(text_face) / sizeof(text_face[0]), text_face); + if(lstrcmpiW(text_face, This->description.lpstrName)) + { + HeapFree(GetProcessHeap(), 0, This->description.lpstrName); + This->description.lpstrName = strdupW(text_face); } + GetTextMetricsW(hdc, &tm); + This->description.sCharset = tm.tmCharSet; + /* While we have it handy, stash the realized font height for use by get_Size() */ + This->nRealHeight = tm.tmHeight - tm.tmInternalLeading; /* corresponds to LOGFONT lfHeight */ + SelectObject(hdc, old_font); } /************************************************************************ @@ -683,7 +680,7 @@ static HRESULT WINAPI OLEFontImpl_get_Name( if (pname==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); if (this->description.lpstrName!=0) *pname = SysAllocString(this->description.lpstrName); @@ -741,7 +738,7 @@ static HRESULT WINAPI OLEFontImpl_get_Size( if (!psize) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); /* * Convert realized font height in pixels to points descaled by current @@ -785,7 +782,7 @@ static HRESULT WINAPI OLEFontImpl_get_Bold( if (!pbold) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pbold = this->description.sWeight > 550; @@ -820,7 +817,7 @@ static HRESULT WINAPI OLEFontImpl_get_Italic( if (pitalic==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pitalic = this->description.fItalic; @@ -856,7 +853,7 @@ static HRESULT WINAPI OLEFontImpl_get_Underline( if (punderline==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *punderline = this->description.fUnderline; @@ -892,7 +889,7 @@ static HRESULT WINAPI OLEFontImpl_get_Strikethrough( if (pstrikethrough==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pstrikethrough = this->description.fStrikethrough; @@ -928,7 +925,7 @@ static HRESULT WINAPI OLEFontImpl_get_Weight( if (pweight==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pweight = this->description.sWeight; @@ -964,7 +961,7 @@ static HRESULT WINAPI OLEFontImpl_get_Charset( if (pcharset==0) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *pcharset = this->description.sCharset; @@ -999,7 +996,7 @@ static HRESULT WINAPI OLEFontImpl_get_hFont( if (phfont==NULL) return E_POINTER; - if(this->dirty) realize_font(this); + realize_font(this); *phfont = this->gdiFont; TRACE("Returning %p\n", *phfont);

1 0

Huw Davies : gdi32: Implement Polyline and PolyPolyline in the dib driver.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: c6f6c3f727556734905a5bbf4fe1b59079e37bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f6c3f727556734905a5bbf4… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Aug 19 16:26:19 2011 +0100 gdi32: Implement Polyline and PolyPolyline in the dib driver. --- dlls/gdi32/dibdrv/dc.c | 4 +- dlls/gdi32/dibdrv/dibdrv.h | 3 ++ dlls/gdi32/dibdrv/graphics.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 64769be..03e3f65 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -773,9 +773,9 @@ const DC_FUNCTIONS dib_driver = NULL, /* pPolyBezierTo */ NULL, /* pPolyDraw */ NULL, /* pPolyPolygon */ - NULL, /* pPolyPolyline */ + dibdrv_PolyPolyline, /* pPolyPolyline */ NULL, /* pPolygon */ - NULL, /* pPolyline */ + dibdrv_Polyline, /* pPolyline */ NULL, /* pPolylineTo */ dibdrv_PutImage, /* pPutImage */ NULL, /* pRealizeDefaultPalette */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index bab52cd..760c02e 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -21,6 +21,9 @@ extern BOOL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PatBlt( PHYSDEV dev, struct bitblt_coords *dst, DWORD rop ) DECLSPEC_HIDDEN; extern BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, + DWORD polylines ) DECLSPEC_HIDDEN; +extern BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) DECLSPEC_HIDDEN; extern BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern HBRUSH dibdrv_SelectBrush( PHYSDEV dev, HBRUSH hbrush ) DECLSPEC_HIDDEN; extern HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index ff83d1a..b2e9f2c 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -147,6 +147,61 @@ BOOL dibdrv_PaintRgn( PHYSDEV dev, HRGN rgn ) } /*********************************************************************** + * dibdrv_PolyPolyline + */ +BOOL dibdrv_PolyPolyline( PHYSDEV dev, const POINT* pt, const DWORD* counts, DWORD polylines ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyPolyline ); + DWORD max_points = 0, i; + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyPolyline( next, pt, counts, polylines ); + + for (i = 0; i < polylines; i++) max_points = max( counts[i], max_points ); + + points = HeapAlloc( GetProcessHeap(), 0, max_points * sizeof(*pt) ); + if (!points) return FALSE; + + for (i = 0; i < polylines; i++) + { + memcpy( points, pt, counts[i] * sizeof(*pt) ); + pt += counts[i]; + LPtoDP( dev->hdc, points, counts[i] ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, counts[i], points ); + } + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** + * dibdrv_Polyline + */ +BOOL dibdrv_Polyline( PHYSDEV dev, const POINT* pt, INT count ) +{ + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pPolyline ); + POINT *points; + + if (defer_pen( pdev )) return next->funcs->pPolyline( next, pt, count ); + + points = HeapAlloc( GetProcessHeap(), 0, count * sizeof(*pt) ); + if (!points) return FALSE; + + memcpy( points, pt, count * sizeof(*pt) ); + LPtoDP( dev->hdc, points, count ); + + reset_dash_origin( pdev ); + pdev->pen_lines( pdev, count, points ); + + HeapFree( GetProcessHeap(), 0, points ); + return TRUE; +} + +/*********************************************************************** * dibdrv_Rectangle */ BOOL dibdrv_Rectangle( PHYSDEV dev, INT left, INT top, INT right, INT bottom )

1 0

Nikolay Sivov : oleaut32: Clean QueryInterface() method, turn impl. calls to interface calls.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: c69be3bfb9e0ea749b5e6185be380ba925c50541 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c69be3bfb9e0ea749b5e6185b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 12:27:53 2011 +0400 oleaut32: Clean QueryInterface() method, turn impl. calls to interface calls. --- dlls/oleaut32/olefont.c | 50 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 019132f..c986f0e 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -476,32 +476,42 @@ static HRESULT WINAPI OLEFontImpl_QueryInterface( *ppvObject = 0; - if (IsEqualGUID(&IID_IUnknown, riid)) - *ppvObject = this; - if (IsEqualGUID(&IID_IFont, riid)) + if (IsEqualGUID(&IID_IUnknown, riid) || + IsEqualGUID(&IID_IFont, riid)) + { *ppvObject = this; - if (IsEqualGUID(&IID_IDispatch, riid)) - *ppvObject = &this->IDispatch_iface; - if (IsEqualGUID(&IID_IFontDisp, riid)) + } + else if (IsEqualGUID(&IID_IDispatch, riid) || + IsEqualGUID(&IID_IFontDisp, riid)) + { *ppvObject = &this->IDispatch_iface; - if (IsEqualIID(&IID_IPersist, riid) || IsEqualGUID(&IID_IPersistStream, riid)) + } + else if (IsEqualGUID(&IID_IPersist, riid) || + IsEqualGUID(&IID_IPersistStream, riid)) + { *ppvObject = &this->IPersistStream_iface; - if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) + } + else if (IsEqualGUID(&IID_IConnectionPointContainer, riid)) + { *ppvObject = &this->IConnectionPointContainer_iface; - if (IsEqualGUID(&IID_IPersistPropertyBag, riid)) + } + else if (IsEqualGUID(&IID_IPersistPropertyBag, riid)) + { *ppvObject = &this->IPersistPropertyBag_iface; - if (IsEqualGUID(&IID_IPersistStreamInit, riid)) + } + else if (IsEqualGUID(&IID_IPersistStreamInit, riid)) + { *ppvObject = &this->IPersistStreamInit_iface; + } - /* - * Check that we obtained an interface. - */ - if ((*ppvObject)==0) + if (!*ppvObject) { - FIXME("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + FIXME("() : asking for unsupported interface %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } - OLEFontImpl_AddRef(&this->IFont_iface); + + IFont_AddRef(iface); + return S_OK; } @@ -1124,7 +1134,7 @@ static HRESULT WINAPI OLEFontImpl_QueryTextMetrics( HFONT hOldFont, hNewFont; hdcRef = GetDC(0); - OLEFontImpl_get_hFont(iface, &hNewFont); + IFont_get_hFont(iface, &hNewFont); hOldFont = SelectObject(hdcRef, hNewFont); GetTextMetricsW(hdcRef, ptm); SelectObject(hdcRef, hOldFont); @@ -1304,7 +1314,7 @@ static HRESULT WINAPI OLEFontImpl_GetIDsOfNames( if (cNames == 0) return E_INVALIDARG; - hres = OLEFontImpl_GetTypeInfo(iface, 0, lcid, &pTInfo); + hres = IDispatch_GetTypeInfo(iface, 0, lcid, &pTInfo); if (FAILED(hres)) { ERR("GetTypeInfo failed.\n"); @@ -1484,7 +1494,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( case DISPID_FONT_SIZE: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_CY; - return OLEFontImpl_get_Size(&this->IFont_iface, &V_CY(pVarResult)); + return IFont_get_Size(&this->IFont_iface, &V_CY(pVarResult)); } else { VARIANTARG vararg; @@ -1502,7 +1512,7 @@ static HRESULT WINAPI OLEFontImpl_Invoke( case DISPID_FONT_WEIGHT: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_I2; - return OLEFontImpl_get_Weight(&this->IFont_iface, &V_I2(pVarResult)); + return IFont_get_Weight(&this->IFont_iface, &V_I2(pVarResult)); } else { VARIANTARG vararg;

1 0

Nikolay Sivov : oleaut32: Remove some useless comments and initializers.
by Alexandre Julliard Aug. 22, 2011

Aug. 22, 2011

Module: wine Branch: master Commit: 92054ef01ca0f2b74427473ce1b6ccf253d7202c URL: http://source.winehq.org/git/wine.git/?a=commit;h=92054ef01ca0f2b74427473ce… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 12:16:28 2011 +0400 oleaut32: Remove some useless comments and initializers. --- dlls/oleaut32/olefont.c | 221 +++++++---------------------------------------- 1 files changed, 30 insertions(+), 191 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=92054ef01ca0f2b744274…

1 0