April 2012 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added IHTMLDocument2::onkeypress implementation.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 1c277a26bbefb23c1d0cc38aea52c3bab2755515 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c277a26bbefb23c1d0cc38ae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:12 2012 +0200 mshtml: Added IHTMLDocument2::onkeypress implementation. --- dlls/mshtml/htmldoc.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1d483d4..a5b20bc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1103,15 +1103,19 @@ static HRESULT WINAPI HTMLDocument_get_onkeydown(IHTMLDocument2 *iface, VARIANT static HRESULT WINAPI HTMLDocument_put_onkeypress(IHTMLDocument2 *iface, VARIANT v) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_doc_event(This, EVENTID_KEYPRESS, &v); } static HRESULT WINAPI HTMLDocument_get_onkeypress(IHTMLDocument2 *iface, VARIANT *p) { HTMLDocument *This = impl_from_IHTMLDocument2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_doc_event(This, EVENTID_KEYPRESS, p); } static HRESULT WINAPI HTMLDocument_put_onmouseup(IHTMLDocument2 *iface, VARIANT v) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 7454549..2d8dc83 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -77,6 +77,9 @@ static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; static const WCHAR keydownW[] = {'k','e','y','d','o','w','n',0}; static const WCHAR onkeydownW[] = {'o','n','k','e','y','d','o','w','n',0}; +static const WCHAR keypressW[] = {'k','e','y','p','r','e','s','s',0}; +static const WCHAR onkeypressW[] = {'o','n','k','e','y','p','r','e','s','s',0}; + static const WCHAR keyupW[] = {'k','e','y','u','p',0}; static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; @@ -169,6 +172,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, + {keypressW, onkeypressW, EVENTT_KEY, DISPID_EVMETH_ONKEYPRESS, + EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {keyupW, onkeyupW, EVENTT_KEY, DISPID_EVMETH_ONKEYUP, EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 70056b3..ef39caf 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -28,6 +28,7 @@ typedef enum { EVENTID_ERROR, EVENTID_FOCUS, EVENTID_KEYDOWN, + EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, EVENTID_MOUSEDOWN,

1 0

Jacek Caban : mshtml: Added IHTMLElement2::blur implementation.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 77cdf22f8f58d0d60a44b24eb0b302bdd963d43a URL: http://source.winehq.org/git/wine.git/?a=commit;h=77cdf22f8f58d0d60a44b24eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 10 12:53:24 2012 +0200 mshtml: Added IHTMLElement2::blur implementation. --- dlls/mshtml/htmlelem2.c | 13 +++++++++++-- dlls/mshtml/tests/events.c | 23 +++++++++++++++++++++++ 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 7deda19..2538b55 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -776,8 +776,17 @@ static HRESULT WINAPI HTMLElement2_get_onresize(IHTMLElement2 *iface, VARIANT *p static HRESULT WINAPI HTMLElement2_blur(IHTMLElement2 *iface) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + nsresult nsres; + + TRACE("(%p)\n", This); + + nsres = nsIDOMHTMLElement_Blur(This->nselem); + if(NS_FAILED(nsres)) { + ERR("Blur failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLElement2_addFilter(IHTMLElement2 *iface, IUnknown *pUnk) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 82f22f4..d1f4e9b 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -74,6 +74,7 @@ DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); DEFINE_EXPECT(img_onerror); DEFINE_EXPECT(input_onfocus); +DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); @@ -950,6 +951,17 @@ static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WO EVENT_HANDLER_FUNC_OBJ(input_onfocus); +static HRESULT WINAPI input_onblur(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(input_onblur); + test_event_args(&DIID_DispHTMLInputElement, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(input_onblur); + static HRESULT WINAPI form_onsubmit(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1768,6 +1780,17 @@ static void test_focus(IHTMLDocument2 *doc) CHECK_CALLED(input_onfocus); ok(hres == S_OK, "focus failed: %08x\n", hres); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&input_onblur_obj; + hres = IHTMLElement2_put_onblur(elem2, v); + ok(hres == S_OK, "put_onblur failed: %08x\n", hres); + + SET_EXPECT(input_onblur); + hres = IHTMLElement2_blur(elem2); + pump_msgs(NULL); + CHECK_CALLED(input_onblur); + ok(hres == S_OK, "blur failed: %08x\n", hres); + if(!winetest_interactive) ShowWindow(container_hwnd, SW_HIDE);

1 0

Dmitry Timoshkov : gdi32: Add a test for bitmap fonts selected for not existing font sizes.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 31f6f48bfd7a82d7229cdd7dff812272c27ae812 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31f6f48bfd7a82d7229cdd7df… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 10 22:54:37 2012 +0900 gdi32: Add a test for bitmap fonts selected for not existing font sizes. --- dlls/gdi32/tests/font.c | 141 +++++++++++++++++++++++++++++++++++++++------- 1 files changed, 119 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=31f6f48bfd7a82d7229cd…

1 0

Alexandre Julliard : gdi32: SaveDC doesn't save the DC bounds.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 5917bd3959f39a996b87356f9ef824677bfc4b2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5917bd3959f39a996b87356f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:33:48 2012 +0200 gdi32: SaveDC doesn't save the DC bounds. --- dlls/gdi32/dc.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index e4f31814..1e0ac10 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -336,7 +336,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) DC *newdc, *dc = get_nulldrv_dc( dev ); if (!(newdc = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*newdc )))) return 0; - newdc->flags = dc->flags; newdc->layout = dc->layout; newdc->hPen = dc->hPen; newdc->hBrush = dc->hBrush; @@ -379,7 +378,6 @@ INT nulldrv_SaveDC( PHYSDEV dev ) newdc->vportExtY = dc->vportExtY; newdc->virtual_res = dc->virtual_res; newdc->virtual_size = dc->virtual_size; - newdc->BoundsRect = dc->BoundsRect; newdc->gdiFont = dc->gdiFont; /* Get/SetDCState() don't change hVisRgn field ("Undoc. Windows" p.559). */ @@ -428,7 +426,6 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) if (!PATH_RestorePath( dc, dcs )) return FALSE; - dc->flags = dcs->flags; dc->layout = dcs->layout; dc->hDevice = dcs->hDevice; dc->ROPmode = dcs->ROPmode; @@ -456,8 +453,6 @@ BOOL nulldrv_RestoreDC( PHYSDEV dev, INT level ) dc->xformWorld2Vport = dcs->xformWorld2Vport; dc->xformVport2World = dcs->xformVport2World; dc->vport2WorldValid = dcs->vport2WorldValid; - dc->BoundsRect = dcs->BoundsRect; - dc->wndOrgX = dcs->wndOrgX; dc->wndOrgY = dcs->wndOrgY; dc->wndExtX = dcs->wndExtX;

1 0

Alexandre Julliard : gdi32: Clip the returned DC bounds to the device rectangle.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: b762fcc9a751495ec247a22a5fea9eae383733da URL: http://source.winehq.org/git/wine.git/?a=commit;h=b762fcc9a751495ec247a22a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:34:25 2012 +0200 gdi32: Clip the returned DC bounds to the device rectangle. --- dlls/gdi32/dc.c | 4 ++++ dlls/gdi32/tests/dc.c | 1 - 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index 1e0ac10..aee02c4 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1318,6 +1318,10 @@ UINT WINAPI GetBoundsRect(HDC hdc, LPRECT rect, UINT flags) { *rect = dc->BoundsRect; ret = is_rect_empty( rect ) ? DCB_RESET : DCB_SET; + rect->left = max( rect->left, 0 ); + rect->top = max( rect->top, 0 ); + rect->right = min( rect->right, dc->vis_rect.right - dc->vis_rect.left ); + rect->bottom = min( rect->bottom, dc->vis_rect.bottom - dc->vis_rect.top ); DPtoLP( hdc, (POINT *)rect, 2 ); } if (flags & DCB_RESET) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index e2ec28c..5536abf 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -930,7 +930,6 @@ static void test_boundsrect(void) ret = GetBoundsRect( hdc, &rect, 0 ); ok( ret == DCB_SET, "GetBoundsRect returned %x\n", ret ); SetRect( &expect, 6, 6, 1, 1 ); - todo_wine ok( EqualRect(&rect, &expect), "Got (%d,%d)-(%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom ); SetBoundsRect( hdc, NULL, DCB_ENABLE ); LineTo( hdc, 50, 40 );

1 0

Alexandre Julliard : gdi32: Add explicit fields for the DC flags.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 2776a979315a6217217e332615d10ca11b954a83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2776a979315a6217217e33261… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 13:36:45 2012 +0200 gdi32: Add explicit fields for the DC flags. --- dlls/gdi32/dc.c | 6 +++--- dlls/gdi32/gdi_private.h | 7 +++---- dlls/gdi32/path.c | 6 +++--- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c index aee02c4..478100d 100644 --- a/dlls/gdi32/dc.c +++ b/dlls/gdi32/dc.c @@ -1347,7 +1347,7 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) if ((flags & DCB_ENABLE) && (flags & DCB_DISABLE)) return 0; if (!(dc = get_dc_ptr( hdc ))) return 0; - ret = ((dc->flags & DC_BOUNDS_ENABLE) ? DCB_ENABLE : DCB_DISABLE) | + ret = (dc->bounds_enabled ? DCB_ENABLE : DCB_DISABLE) | (is_rect_empty( &dc->BoundsRect ) ? DCB_RESET : DCB_SET); if (flags & DCB_RESET) @@ -1376,8 +1376,8 @@ UINT WINAPI SetBoundsRect(HDC hdc, const RECT* rect, UINT flags) } } - if (flags & DCB_ENABLE) dc->flags |= DC_BOUNDS_ENABLE; - if (flags & DCB_DISABLE) dc->flags &= ~DC_BOUNDS_ENABLE; + if (flags & DCB_ENABLE) dc->bounds_enabled = TRUE; + if (flags & DCB_DISABLE) dc->bounds_enabled = FALSE; release_dc_ptr( dc ); return ret; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 2053553..5728a53 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -89,6 +89,9 @@ typedef struct tagDC DWORD_PTR dwHookData; DCHOOKPROC hookProc; /* DC hook */ + BOOL bounds_enabled:1; /* bounds tracking is enabled */ + BOOL path_open:1; /* path is currently open (only for saved DCs) */ + INT wndOrgX; /* Window origin */ INT wndOrgY; INT wndExtX; /* Window extent */ @@ -149,10 +152,6 @@ typedef struct tagDC RECT BoundsRect; /* Current bounding rect */ } DC; - /* DC flags */ -#define DC_PATH_OPEN 0x0001 /* DC path is open (only set on saved DCs) */ -#define DC_BOUNDS_ENABLE 0x0008 /* Bounding rectangle tracking is enabled */ - /* Certain functions will do no further processing if the driver returns this. Used by mfdrv for example. */ #define GDI_NO_MORE_WORK 2 diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index 52f103d..058a48a 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -867,7 +867,7 @@ BOOL PATH_SavePath( DC *dst, DC *src ) else if ((physdev = find_path_physdev( src ))) { if (!(dst->path = copy_gdi_path( physdev->path ))) return FALSE; - dst->flags |= DC_PATH_OPEN; + dst->path_open = TRUE; } else dst->path = NULL; return TRUE; @@ -877,7 +877,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) { struct path_physdev *physdev = find_path_physdev( dst ); - if (src->path && (src->flags & DC_PATH_OPEN)) + if (src->path && src->path_open) { if (!physdev) { @@ -887,7 +887,7 @@ BOOL PATH_RestorePath( DC *dst, DC *src ) else free_gdi_path( physdev->path ); physdev->path = src->path; - src->flags &= ~DC_PATH_OPEN; + src->path_open = FALSE; src->path = NULL; } else if (physdev)

1 0

Alexandre Julliard : gdi32: Store the reference DC in the enhanced metafile and use it to retrieve device caps .
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 88bcd13d7f39fbb786d377de12716ef498f1bf80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88bcd13d7f39fbb786d377de1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 10 14:42:50 2012 +0200 gdi32: Store the reference DC in the enhanced metafile and use it to retrieve device caps. --- dlls/gdi32/enhmfdrv/dc.c | 40 +--------------------------------- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 11 +------- dlls/gdi32/enhmfdrv/init.c | 35 ++++++++++------------------- dlls/gdi32/tests/dc.c | 15 +++++++++--- 4 files changed, 26 insertions(+), 75 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 86ad961..817872c 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -515,43 +515,5 @@ INT EMFDRV_GetDeviceCaps(PHYSDEV dev, INT cap) { EMFDRV_PDEVICE *physDev = (EMFDRV_PDEVICE*) dev; - switch(cap) { - - case HORZRES: - return physDev->horzres; - case VERTRES: - return physDev->vertres; - case LOGPIXELSX: - return physDev->logpixelsx; - case LOGPIXELSY: - return physDev->logpixelsy; - case HORZSIZE: - return physDev->horzsize; - case VERTSIZE: - return physDev->vertsize; - case BITSPIXEL: - return physDev->bitspixel; - case TEXTCAPS: - return physDev->textcaps; - case RASTERCAPS: - return physDev->rastercaps; - case TECHNOLOGY: - return physDev->technology; - case PLANES: - return physDev->planes; - case NUMCOLORS: - return physDev->numcolors; - case CURVECAPS: - return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - case LINECAPS: - return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - case POLYGONALCAPS: - return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); - default: - FIXME("Unimplemented cap %d\n", cap); - return 0; - } + return GetDeviceCaps( physDev->ref_dc, cap ); } diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index 53d69bc..03bb829 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -39,15 +39,8 @@ typedef struct HANDLE hFile; /* Handle for disk based MetaFile */ HBRUSH dc_brush; HPEN dc_pen; - INT horzres, vertres; - INT horzsize, vertsize; - INT logpixelsx, logpixelsy; - INT bitspixel; - INT textcaps; - INT rastercaps; - INT technology; - INT planes; - INT numcolors; + HDC ref_dc; /* Reference device */ + HDC screen_dc; /* Screen DC if no reference device specified */ INT restoring; /* RestoreDC counter */ } EMFDRV_PDEVICE; diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index d254cba..883ca5a 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -317,8 +317,6 @@ HDC WINAPI CreateEnhMetaFileW( static const WCHAR displayW[] = {'D','I','S','P','L','A','Y',0}; HDC ret; DC *dc; - HDC hRefDC = hdc ? hdc : CreateDCW(displayW,NULL,NULL,NULL); - /* If no ref, use current display */ EMFDRV_PDEVICE *physDev; HANDLE hFile; DWORD size = 0, length = 0; @@ -354,19 +352,12 @@ HDC WINAPI CreateEnhMetaFileW( physDev->hFile = 0; physDev->dc_brush = 0; physDev->dc_pen = 0; - physDev->horzres = GetDeviceCaps(hRefDC, HORZRES); - physDev->vertres = GetDeviceCaps(hRefDC, VERTRES); - physDev->logpixelsx = GetDeviceCaps(hRefDC, LOGPIXELSX); - physDev->logpixelsy = GetDeviceCaps(hRefDC, LOGPIXELSY); - physDev->horzsize = GetDeviceCaps(hRefDC, HORZSIZE); - physDev->vertsize = GetDeviceCaps(hRefDC, VERTSIZE); - physDev->bitspixel = GetDeviceCaps(hRefDC, BITSPIXEL); - physDev->textcaps = GetDeviceCaps(hRefDC, TEXTCAPS); - physDev->rastercaps = GetDeviceCaps(hRefDC, RASTERCAPS); - physDev->technology = GetDeviceCaps(hRefDC, TECHNOLOGY); - physDev->planes = GetDeviceCaps(hRefDC, PLANES); - physDev->numcolors = GetDeviceCaps(hRefDC, NUMCOLORS); + physDev->screen_dc = 0; physDev->restoring = 0; + if (hdc) /* if no ref, use current display */ + physDev->ref_dc = hdc; + else + physDev->ref_dc = physDev->screen_dc = CreateDCW( displayW, NULL, NULL, NULL ); SetVirtualResolution(physDev->dev.hdc, 0, 0, 0, 0); @@ -400,16 +391,16 @@ HDC WINAPI CreateEnhMetaFileW( physDev->emh->nPalEntries = 0; /* I guess this should start at 0 */ /* Size in pixels */ - physDev->emh->szlDevice.cx = physDev->horzres; - physDev->emh->szlDevice.cy = physDev->vertres; + physDev->emh->szlDevice.cx = GetDeviceCaps( physDev->ref_dc, HORZRES ); + physDev->emh->szlDevice.cy = GetDeviceCaps( physDev->ref_dc, VERTRES ); /* Size in millimeters */ - physDev->emh->szlMillimeters.cx = physDev->horzsize; - physDev->emh->szlMillimeters.cy = physDev->vertsize; + physDev->emh->szlMillimeters.cx = GetDeviceCaps( physDev->ref_dc, HORZSIZE ); + physDev->emh->szlMillimeters.cy = GetDeviceCaps( physDev->ref_dc, VERTSIZE ); /* Size in micrometers */ - physDev->emh->szlMicrometers.cx = physDev->horzsize * 1000; - physDev->emh->szlMicrometers.cy = physDev->vertsize * 1000; + physDev->emh->szlMicrometers.cx = physDev->emh->szlMillimeters.cx * 1000; + physDev->emh->szlMicrometers.cy = physDev->emh->szlMillimeters.cy * 1000; memcpy((char *)physDev->emh + sizeof(ENHMETAHEADER), description, length); @@ -431,9 +422,6 @@ HDC WINAPI CreateEnhMetaFileW( ret = physDev->dev.hdc; release_dc_ptr( dc ); - if( !hdc ) - DeleteDC( hRefDC ); - return ret; } @@ -469,6 +457,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */ if (physDev->dc_brush) DeleteObject( physDev->dc_brush ); if (physDev->dc_pen) DeleteObject( physDev->dc_pen ); + if (physDev->screen_dc) DeleteDC( physDev->screen_dc ); emr.emr.iType = EMR_EOF; emr.emr.nSize = sizeof(emr); diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 5536abf..324e65b 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -383,7 +383,10 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef), /* nt4 */ "wrong error %u on %s\n", GetLastError(), descr ); type = GetClipBox( hdc, &rect ); - ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + if (GetObjectType( hdc ) == OBJ_ENHMETADC) + todo_wine ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); + else + ok( type == SIMPLEREGION, "GetClipBox returned %d on memdc for %s\n", type, descr ); SetBoundsRect( hdc, NULL, DCB_RESET | DCB_ENABLE ); SetMapMode( hdc, MM_TEXT ); @@ -494,8 +497,7 @@ static void test_CreateCompatibleDC(void) ok( SelectObject( hNewDC, bitmap ) != 0, "SelectObject failed\n" ); caps = GetDeviceCaps( hdcMetafile, TECHNOLOGY ); ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); - caps = GetDeviceCaps( hNewDC, TECHNOLOGY ); - ok( caps == DT_RASDISPLAY, "wrong caps %u\n", caps ); + test_device_caps( hdcMetafile, hdc, "enhmetafile dc" ); DeleteDC( hNewDC ); DeleteEnhMetaFile( CloseEnhMetaFile( hdcMetafile )); ReleaseDC( 0, hdc ); @@ -1144,7 +1146,7 @@ done: static void test_printer_dc(void) { - HDC memdc, display_memdc; + HDC memdc, display_memdc, enhmf_dc; HBITMAP orig, bmp; DWORD ret; HDC hdc = create_printer_dc(); @@ -1188,6 +1190,11 @@ static void test_printer_dc(void) ret = GetPixel( hdc, 0, 0 ); ok( ret == CLR_INVALID, "wrong pixel value %x\n", ret ); + enhmf_dc = CreateEnhMetaFileA( hdc, NULL, NULL, NULL ); + ok(enhmf_dc != 0, "CreateEnhMetaFileA failed\n"); + test_device_caps( enhmf_dc, hdc, "enhmetafile printer dc" ); + DeleteEnhMetaFile( CloseEnhMetaFile( enhmf_dc )); + DeleteDC( memdc ); DeleteDC( display_memdc ); DeleteDC( hdc );

1 0

Henri Verbeet : ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC().
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 9cb7ca004a3d9a87466485fcbc2e3df3b71fac93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb7ca004a3d9a87466485fcb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:38 2012 +0200 ddraw: Properly retrieve an interface pointer in ddraw7_GetSurfaceFromDC(). --- dlls/ddraw/ddraw.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 2ef51da..a777d35 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -2471,6 +2471,7 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, { struct ddraw *ddraw = impl_from_IDirectDraw7(iface); struct wined3d_surface *wined3d_surface; + struct ddraw_surface *surface_impl; HRESULT hr; TRACE("iface %p, dc %p, surface %p.\n", iface, hdc, Surface); @@ -2485,7 +2486,8 @@ static HRESULT WINAPI ddraw7_GetSurfaceFromDC(IDirectDraw7 *iface, HDC hdc, return DDERR_NOTFOUND; } - *Surface = wined3d_surface_get_parent(wined3d_surface); + surface_impl = wined3d_surface_get_parent(wined3d_surface); + *Surface = &surface_impl->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*Surface); TRACE("Returning surface %p.\n", Surface); return DD_OK;

1 0

Henri Verbeet : ddraw: Properly retrieve an interface pointer in IDirect3DDeviceImpl_7_GetTexture ().
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: 96fa113513e110ab1aaa56c266064b5e7a7a41d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fa113513e110ab1aaa56c26… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:39 2012 +0200 ddraw: Properly retrieve an interface pointer in IDirect3DDeviceImpl_7_GetTexture(). --- dlls/ddraw/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 47ee68a..89404ee 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4563,6 +4563,7 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, { IDirect3DDeviceImpl *This = impl_from_IDirect3DDevice7(iface); struct wined3d_texture *wined3d_texture; + struct ddraw_surface *surface; HRESULT hr; TRACE("iface %p, stage %u, texture %p.\n", iface, Stage, Texture); @@ -4582,7 +4583,8 @@ IDirect3DDeviceImpl_7_GetTexture(IDirect3DDevice7 *iface, return hr; } - *Texture = wined3d_texture_get_parent(wined3d_texture); + surface = wined3d_texture_get_parent(wined3d_texture); + *Texture = &surface->IDirectDrawSurface7_iface; IDirectDrawSurface7_AddRef(*Texture); wined3d_texture_decref(wined3d_texture); wined3d_mutex_unlock();

1 0

Henri Verbeet : ddraw: Get rid of IDirect3DDeviceImpl.
by Alexandre Julliard 10 Apr '12

10 Apr '12

Module: wine Branch: master Commit: daedd0077d3a52629df4cdf605bc453a06e964cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=daedd0077d3a52629df4cdf60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 9 20:43:40 2012 +0200 ddraw: Get rid of IDirect3DDeviceImpl. --- dlls/ddraw/ddraw.c | 6 +- dlls/ddraw/ddraw_private.h | 45 +- dlls/ddraw/device.c | 3231 +++++++++++++++++++------------------------- dlls/ddraw/executebuffer.c | 38 +- dlls/ddraw/light.c | 6 +- dlls/ddraw/material.c | 6 +- dlls/ddraw/surface.c | 12 +- dlls/ddraw/vertexbuffer.c | 6 +- dlls/ddraw/viewport.c | 2 +- 9 files changed, 1471 insertions(+), 1881 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=daedd0077d3a52629df4c…

1 0