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

Jacek Caban : mshtml: Forward IHTMLWindow2::setTimeout to IHTMLWindow3:: setTimeout.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 86409551889d99775aa04c64c48188c8cc32ad68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86409551889d99775aa04c64c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:12:49 2008 +0200 mshtml: Forward IHTMLWindow2::setTimeout to IHTMLWindow3::setTimeout. --- dlls/mshtml/htmlwindow.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 43c893f..ce98f38 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -184,8 +184,14 @@ static HRESULT WINAPI HTMLWindow2_setTimeout(IHTMLWindow2 *iface, BSTR expressio long msec, VARIANT *language, long *timerID) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID); - return E_NOTIMPL; + VARIANT expr_var; + + TRACE("(%p)->(%s %ld %p %p)\n", This, debugstr_w(expression), msec, language, timerID); + + V_VT(&expr_var) = VT_BSTR; + V_BSTR(&expr_var) = expression; + + return IHTMLWindow3_setTimeout(HTMLWINDOW3(This), &expr_var, msec, language, timerID); } static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, long timerID)

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::get_document implementation.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: aeb1095b47482fdbdb46814d51a54601712837ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=aeb1095b47482fdbdb46814d5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:12:32 2008 +0200 mshtml: Added IHTMLWindow2::get_document implementation. --- dlls/mshtml/htmlwindow.c | 14 ++++++++++++-- dlls/mshtml/tests/dom.c | 21 ++++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 5ed5701..43c893f 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -467,8 +467,18 @@ static HRESULT WINAPI HTMLWindow2_get_onscroll(IHTMLWindow2 *iface, VARIANT *p) static HRESULT WINAPI HTMLWindow2_get_document(IHTMLWindow2 *iface, IHTMLDocument2 **p) { HTMLWindow *This = HTMLWINDOW2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + if(This->doc) { + /* FIXME: We should return a wrapper object here */ + *p = HTMLDOC(This->doc); + IHTMLDocument2_AddRef(*p); + }else { + *p = NULL; + } + + return S_OK; } static HRESULT WINAPI HTMLWindow2_get_event(IHTMLWindow2 *iface, IHTMLEventObj **p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 90ccd4d..59c2a17 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1081,7 +1081,6 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLDocument2_get_parentWindow(doc, &window); ok(hres == S_OK, "parentWidnow failed: %08x\n", hres); - test_ifaces((IUnknown*)window, window_iids); hres = IHTMLWindow2_get_navigator(window, &navigator); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); @@ -1187,6 +1186,25 @@ static void test_default_body(IHTMLBodyElement *body) ok(bstr == NULL, "bstr != NULL\n"); } +static void test_window(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + IHTMLDocument2 *doc2 = NULL; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentElement failed: %08x\n", hres); + test_ifaces((IUnknown*)window, window_iids); + test_disp((IUnknown*)window, &DIID_DispHTMLWindow2); + + hres = IHTMLWindow2_get_document(window, &doc2); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(doc2 != NULL, "doc2 == NULL\n"); + + IHTMLDocument_Release(doc2); + IHTMLWindow2_Release(window); +} + static void test_defaults(IHTMLDocument2 *doc) { IHTMLStyleSheetsCollection *stylesheetcol; @@ -1209,6 +1227,7 @@ static void test_defaults(IHTMLDocument2 *doc) ok(hres == S_OK, "get_style failed: %08x\n", hres); test_default_style(style); + test_window(doc); test_compatmode(doc); test_location(doc); test_navigator(doc);

1 0

Jacek Caban : mshtml: Added navigator's IDispatchEx test.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 7c63087a5c99c144567095ef65326350fcbd9b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c63087a5c99c144567095ef6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 21 18:12:10 2008 +0200 mshtml: Added navigator's IDispatchEx test. --- dlls/mshtml/tests/dom.c | 37 +++++++++++++++++++++++++++++++++++++ 1 files changed, 37 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 5e2acde..90ccd4d 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -30,6 +30,7 @@ #include "mshtmcid.h" #include "mshtmhst.h" #include "docobj.h" +#include "dispex.h" static const char doc_blank[] = "<html></html>"; static const char doc_str1[] = "<html><body>test</body></html>"; @@ -268,6 +269,41 @@ static void _test_ifaces(unsigned line, IUnknown *iface, REFIID *iids) } } +#define test_disp(u,id) _test_disp(__LINE__,u,id) +static void _test_disp(unsigned line, IUnknown *unk, const IID *diid) +{ + IDispatchEx *dispex; + ITypeInfo *typeinfo; + UINT ticnt; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + if(FAILED(hres)) + return; + + ticnt = 0xdeadbeef; + hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); + + hres = IDispatchEx_GetTypeInfo(dispex, 0, 0, &typeinfo); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfo failed: %08x\n", hres); + + if(SUCCEEDED(hres)) { + TYPEATTR *type_attr; + + hres = ITypeInfo_GetTypeAttr(typeinfo, &type_attr); + ok_(__FILE__,line) (hres == S_OK, "GetTypeAttr failed: %08x\n", hres); + ok_(__FILE__,line) (IsEqualGUID(&type_attr->guid, diid), "unexpected guid %s\n", dbgstr_guid(&type_attr->guid)); + + ITypeInfo_ReleaseTypeAttr(typeinfo, type_attr); + ITypeInfo_Release(typeinfo); + } + + IDispatchEx_Release(dispex); +} + #define test_node_name(u,n) _test_node_name(__LINE__,u,n) static void _test_node_name(unsigned line, IUnknown *unk, const char *exname) { @@ -1050,6 +1086,7 @@ static void test_navigator(IHTMLDocument2 *doc) hres = IHTMLWindow2_get_navigator(window, &navigator); ok(hres == S_OK, "get_navigator failed: %08x\n", hres); ok(navigator != NULL, "navigator == NULL\n"); + test_disp((IUnknown*)navigator, &IID_IOmNavigator); hres = IHTMLWindow2_get_navigator(window, &navigator2); ok(hres == S_OK, "get_navigator failed: %08x\n", hres);

1 0

Steven Edwards : rpcrt4: Correct the number of aguments for fill_method on unsupported architectures .
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: d0ddece843064b8acbc90bb8a5c293879abca248 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ddece843064b8acbc90bb8a… Author: Steven Edwards <winehacker(a)gmail.com> Date: Mon Apr 21 09:49:59 2008 -0400 rpcrt4: Correct the number of aguments for fill_method on unsupported architectures. --- dlls/rpcrt4/cstub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/cstub.c b/dlls/rpcrt4/cstub.c index b416a10..83a5fb2 100644 --- a/dlls/rpcrt4/cstub.c +++ b/dlls/rpcrt4/cstub.c @@ -194,7 +194,7 @@ static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) #else /* __i386__ */ typedef struct {int dummy;} vtbl_method_t; -static void fill_table(IUnknownVtbl *vtbl, DWORD num) +static void fill_table(IUnknownVtbl *vtbl, void **methods, DWORD num) { ERR("delegated stubs are not supported on this architecture\n"); }

1 0

Nikolay Sivov : gdiplus: GdipCreateLineBrushI implemented using float args version.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 0679e9770a773c166ea1ca25564d6a31748ad65b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0679e9770a773c166ea1ca255… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 21 00:45:52 2008 +0400 gdiplus: GdipCreateLineBrushI implemented using float args version. --- dlls/gdiplus/brush.c | 18 ++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 7f324f3..1c69518 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -131,6 +131,24 @@ GpStatus WINGDIPAPI GdipCreateLineBrush(GDIPCONST GpPointF* startpoint, return Ok; } +GpStatus WINGDIPAPI GdipCreateLineBrushI(GDIPCONST GpPoint* startpoint, + GDIPCONST GpPoint* endpoint, ARGB startcolor, ARGB endcolor, + GpWrapMode wrap, GpLineGradient **line) +{ + GpPointF stF; + GpPointF endF; + + if(!startpoint || !endpoint) + return InvalidParameter; + + stF.X = (REAL)startpoint->X; + stF.Y = (REAL)startpoint->Y; + endF.X = (REAL)endpoint->X; + endF.X = (REAL)endpoint->Y; + + return GdipCreateLineBrush(&stF, &endF, startcolor, endcolor, wrap, line); +} + GpStatus WINGDIPAPI GdipCreateLineBrushFromRectI(GDIPCONST GpRect* rect, ARGB startcolor, ARGB endcolor, LinearGradientMode mode, GpWrapMode wrap, GpLineGradient **line) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index fff85c1..cbea1b9 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -103,7 +103,7 @@ @ stdcall GdipCreateLineBrushFromRectI(ptr long long long long ptr) @ stub GdipCreateLineBrushFromRectWithAngle @ stub GdipCreateLineBrushFromRectWithAngleI -@ stub GdipCreateLineBrushI +@ stdcall GdipCreateLineBrushI(ptr ptr long long long ptr) @ stdcall GdipCreateMatrix2(long long long long long long ptr) @ stdcall GdipCreateMatrix3(ptr ptr ptr) @ stdcall GdipCreateMatrix3I(ptr ptr ptr)

1 0

Dmitry Timoshkov : gdi32: Add a test for EMR_EXTSELECTCLIPRGN, make it pass under Wine.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 5201c78b2e07e19158dff8d30f12ac20a2afd6cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=5201c78b2e07e19158dff8d30… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Apr 21 19:38:03 2008 +0900 gdi32: Add a test for EMR_EXTSELECTCLIPRGN, make it pass under Wine. --- dlls/gdi32/enhmetafile.c | 12 +-- dlls/gdi32/tests/metafile.c | 196 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 199 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 39b6057..a3e7aa5 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1172,17 +1172,15 @@ BOOL WINAPI PlayEnhMetaFileRecord( case EMR_EXTSELECTCLIPRGN: { - static int extselectcliprgn_cases; -#if 0 - const EMREXTSELECTCLIPRGN lpRgn = (const EMREXTSELECTCLIPRGN *)mr; - HRGN hRgn = ExtCreateRegion(NULL, lpRgn->cbRgnData, (RGNDATA *)lpRgn->RgnData); + const EMREXTSELECTCLIPRGN *lpRgn = (const EMREXTSELECTCLIPRGN *)mr; + HRGN hRgn = 0; + + if (mr->nSize >= sizeof(*lpRgn) + sizeof(RGNDATAHEADER)) + hRgn = ExtCreateRegion( &info->init_transform, 0, (RGNDATA *)lpRgn->RgnData ); ExtSelectClipRgn(hdc, hRgn, (INT)(lpRgn->iMode)); /* ExtSelectClipRgn created a copy of the region */ DeleteObject(hRgn); -#endif - if(!(extselectcliprgn_cases++)) - FIXME("ExtSelectClipRgn\n"); break; } diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 72100c8..473f7e3 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -302,8 +302,6 @@ static int CALLBACK savedc_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, ok(save_state == 0, "EOF save_state %d\n", save_state); break; } - - return 1; } @@ -1158,6 +1156,199 @@ static void test_emf_ExtTextOut_on_path(void) DestroyWindow(hwnd); } +static const unsigned char EMF_CLIPPING[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x1e, 0x00, 0x00, 0x00, 0x1d, 0x00, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xd0, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x7c, 0x01, 0x00, 0x00, 0x2c, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x60, 0xcc, 0x05, 0x00, + 0xe0, 0x93, 0x04, 0x00, 0x36, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x4b, 0x00, 0x00, 0x00, + 0x40, 0x00, 0x00, 0x00, 0x30, 0x00, 0x00, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x64, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x00, 0x04, 0x00, 0x00, 0x0e, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00 +}; + +static void translate( POINT *pt, UINT count, const XFORM *xform ) +{ + while (count--) + { + FLOAT x = (FLOAT)pt->x; + FLOAT y = (FLOAT)pt->y; + pt->x = (LONG)floor( x * xform->eM11 + y * xform->eM21 + xform->eDx + 0.5 ); + pt->y = (LONG)floor( x * xform->eM12 + y * xform->eM22 + xform->eDy + 0.5 ); + pt++; + } +} + +static int CALLBACK clip_emf_enum_proc(HDC hdc, HANDLETABLE *handle_table, + const ENHMETARECORD *emr, int n_objs, LPARAM param) +{ + if (emr->iType == EMR_EXTSELECTCLIPRGN) + { + const EMREXTSELECTCLIPRGN *clip = (const EMREXTSELECTCLIPRGN *)emr; + union _rgn + { + RGNDATA data; + char buf[sizeof(RGNDATAHEADER) + sizeof(RECT)]; + }; + const union _rgn *rgn1; + union _rgn rgn2; + RECT rect, rc_transformed; + const RECT *rc = (const RECT *)param; + HRGN hrgn; + XFORM xform; + INT ret; + BOOL is_win9x; + + trace("EMR_EXTSELECTCLIPRGN: cbRgnData %#x, iMode %u\n", + clip->cbRgnData, clip->iMode); + + ok(clip->iMode == RGN_COPY, "expected RGN_COPY, got %u\n", clip->iMode); + ok(clip->cbRgnData >= sizeof(RGNDATAHEADER) + sizeof(RECT), + "too small data block: %u bytes\n", clip->cbRgnData); + if (clip->cbRgnData < sizeof(RGNDATAHEADER) + sizeof(RECT)) + return 0; + + rgn1 = (const union _rgn *)clip->RgnData; + + trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", + rgn1->data.rdh.dwSize, rgn1->data.rdh.iType, + rgn1->data.rdh.nCount, rgn1->data.rdh.nRgnSize, + rgn1->data.rdh.rcBound.left, rgn1->data.rdh.rcBound.top, + rgn1->data.rdh.rcBound.right, rgn1->data.rdh.rcBound.bottom); + + ok(EqualRect(&rgn1->data.rdh.rcBound, rc), "rects don't match\n"); + + rect = *(const RECT *)rgn1->data.Buffer; + trace("rect (%d,%d-%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); + ok(EqualRect(&rect, rc), "rects don't match\n"); + + ok(rgn1->data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u", rgn1->data.rdh.dwSize); + ok(rgn1->data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn1->data.rdh.iType); + ok(rgn1->data.rdh.nCount == 1, "expected 1, got %u\n", rgn1->data.rdh.nCount); + ok(rgn1->data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn1->data.rdh.nRgnSize); + + hrgn = CreateRectRgn(0, 0, 0, 0); + + memset(&xform, 0, sizeof(xform)); + SetLastError(0xdeadbeef); + ret = GetWorldTransform(hdc, &xform); + is_win9x = !ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED; + if (!is_win9x) + ok(ret, "GetWorldTransform error %u\n", GetLastError()); + + trace("xform.eM11 %f, xform.eM22 %f\n", xform.eM11, xform.eM22); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 0, "GetClipRgn returned %d, expected 0\n", ret); + + PlayEnhMetaFileRecord(hdc, handle_table, emr, n_objs); + + ret = GetClipRgn(hdc, hrgn); + ok(ret == 1, "GetClipRgn returned %d, expected 0\n", ret); + + /* Win9x returns empty clipping region */ + if (is_win9x) return 1; + + ret = GetRegionData(hrgn, 0, NULL); + ok(ret == sizeof(rgn2.data.rdh) + sizeof(RECT), "expected sizeof(rgn), got %u\n", ret); + + ret = GetRegionData(hrgn, sizeof(rgn2), &rgn2.data); + + trace("size %u, type %u, count %u, rgn size %u, bound (%d,%d-%d,%d)\n", + rgn2.data.rdh.dwSize, rgn2.data.rdh.iType, + rgn2.data.rdh.nCount, rgn2.data.rdh.nRgnSize, + rgn2.data.rdh.rcBound.left, rgn2.data.rdh.rcBound.top, + rgn2.data.rdh.rcBound.right, rgn2.data.rdh.rcBound.bottom); + + rect = rgn2.data.rdh.rcBound; + rc_transformed = *rc; + translate((POINT *)&rc_transformed, 2, &xform); + ok(EqualRect(&rect, &rc_transformed), "rects don't match\n"); + + rect = *(const RECT *)rgn2.data.Buffer; + trace("rect (%d,%d-%d,%d)\n", rect.left, rect.top, rect.right, rect.bottom); + rc_transformed = *rc; + translate((POINT *)&rc_transformed, 2, &xform); + ok(EqualRect(&rect, &rc_transformed), "rects don't match\n"); + + ok(rgn2.data.rdh.dwSize == sizeof(rgn1->data.rdh), "expected sizeof(rdh), got %u", rgn2.data.rdh.dwSize); + ok(rgn2.data.rdh.iType == RDH_RECTANGLES, "expected RDH_RECTANGLES, got %u\n", rgn2.data.rdh.iType); + ok(rgn2.data.rdh.nCount == 1, "expected 1, got %u\n", rgn2.data.rdh.nCount); + ok(rgn2.data.rdh.nRgnSize == sizeof(RECT), "expected sizeof(RECT), got %u\n", rgn2.data.rdh.nRgnSize); + + DeleteObject(hrgn); + } + return 1; +} + +static void test_emf_clipping(void) +{ + static const RECT rc = { 0, 0, 100, 100 }; + RECT rc_clip = { 100, 100, 1024, 1024 }; + HWND hwnd; + HDC hdc; + HENHMETAFILE hemf; + HRGN hrgn; + INT ret; + + SetLastError(0xdeadbeef); + hdc = CreateEnhMetaFileA(0, NULL, NULL, NULL); + ok(hdc != 0, "CreateEnhMetaFileA error %d\n", GetLastError()); + + /* Need to write something to the emf, otherwise Windows won't play it back */ + LineTo(hdc, 1, 1); + + hrgn = CreateRectRgn(rc_clip.left, rc_clip.top, rc_clip.right, rc_clip.bottom); + ret = SelectClipRgn(hdc, hrgn); + ok(ret == SIMPLEREGION, "expected SIMPLEREGION, got %d\n", ret); + + SetLastError(0xdeadbeef); + hemf = CloseEnhMetaFile(hdc); + ok(hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError()); + + if (compare_emf_bits(hemf, EMF_CLIPPING, sizeof(EMF_CLIPPING), + "emf_clipping", TRUE) != 0) + { + dump_emf_bits(hemf, "emf_clipping"); + dump_emf_records(hemf, "emf_clipping"); + } + + DeleteObject(hrgn); + + /* Win9x doesn't play EMFs on invisible windows */ + hwnd = CreateWindowExA(0, "static", NULL, WS_POPUP | WS_VISIBLE, + 0, 0, 200, 200, 0, 0, 0, NULL); + ok(hwnd != 0, "CreateWindowExA error %d\n", GetLastError()); + + hdc = GetDC(hwnd); + + ret = EnumEnhMetaFile(hdc, hemf, clip_emf_enum_proc, &rc_clip, &rc); + ok(ret, "EnumEnhMetaFile error %d\n", GetLastError()); + + DeleteEnhMetaFile(hemf); + ReleaseDC(hwnd, hdc); + DestroyWindow(hwnd); +} + static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) { LPMETAFILEPICT lpMFP = (LPMETAFILEPICT)lpData; @@ -1617,6 +1808,7 @@ START_TEST(metafile) test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); test_emf_ExtTextOut_on_path(); + test_emf_clipping(); /* For metafile conversions */ test_mf_conversions();

1 0

Nikolay Sivov : gdiplus: Implemented GdipDrawRectangle.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 172389e1316dcdee488dd4e85568fcf4c65fbbab URL: http://source.winehq.org/git/wine.git/?a=commit;h=172389e1316dcdee488dd4e85… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun Apr 20 21:27:10 2008 +0400 gdiplus: Implemented GdipDrawRectangle. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 4f6b300..fff85c1 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -194,7 +194,7 @@ @ stub GdipDrawPieI @ stub GdipDrawPolygon @ stub GdipDrawPolygonI -@ stub GdipDrawRectangle +@ stdcall GdipDrawRectangle(ptr ptr long long long long) @ stdcall GdipDrawRectangleI(ptr ptr long long long long) @ stdcall GdipDrawRectangles(ptr ptr ptr long) @ stub GdipDrawRectanglesI diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7356234..4912759 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1308,8 +1308,8 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, return Ok; } -GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, - INT y, INT width, INT height) +GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, + REAL y, REAL width, REAL height) { INT save_state; GpPointF ptf[4]; @@ -1338,6 +1338,12 @@ GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, return Ok; } +GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x, + INT y, INT width, INT height) +{ + return GdipDrawRectangle(graphics,pen,(REAL)x,(REAL)y,(REAL)width,(REAL)height); +} + GpStatus WINGDIPAPI GdipDrawRectangles(GpGraphics *graphics, GpPen *pen, GDIPCONST GpRectF* rects, INT count) {

1 0

Alexandre Julliard : wineboot: Automatically update the prefix directory if wine.inf changes.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: e44dd0f8f2bdcbb113036339479ef3a66364972e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e44dd0f8f2bdcbb1130363394… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 15:39:55 2008 +0200 wineboot: Automatically update the prefix directory if wine.inf changes. --- dlls/ntdll/server.c | 31 +----------------------- programs/wineboot/wineboot.c | 54 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 33 deletions(-) diff --git a/dlls/ntdll/server.c b/dlls/ntdll/server.c index c38a023..3d8beee 100644 --- a/dlls/ntdll/server.c +++ b/dlls/ntdll/server.c @@ -737,7 +737,6 @@ static void start_server(void) static void setup_config_dir(void) { const char *p, *config_dir = wine_get_config_dir(); - pid_t pid, wret; if (chdir( config_dir ) == -1) { @@ -759,7 +758,7 @@ static void setup_config_dir(void) mkdir( config_dir, 0777 ); if (chdir( config_dir ) == -1) fatal_perror( "chdir to %s\n", config_dir ); - MESSAGE( "wine: creating configuration directory '%s'...\n", config_dir ); + MESSAGE( "wine: created the configuration directory '%s'\n", config_dir ); } if (mkdir( "dosdevices", 0777 ) == -1) @@ -773,34 +772,6 @@ static void setup_config_dir(void) mkdir( "drive_c", 0777 ); symlink( "../drive_c", "dosdevices/c:" ); symlink( "/", "dosdevices/z:" ); - - pid = fork(); - if (pid == -1) fatal_perror( "fork" ); - - if (!pid) - { - char *argv[3]; - static char argv0[] = "tools/wineprefixcreate", - argv1[] = "--quiet"; - - argv[0] = argv0; - argv[1] = argv1; - argv[2] = NULL; - wine_exec_wine_binary( argv[0], argv, NULL ); - fatal_perror( "could not exec wineprefixcreate" ); - } - else - { - int status; - - while ((wret = waitpid( pid, &status, 0 )) != pid) - { - if (wret == -1 && errno != EINTR) fatal_perror( "wait4" ); - } - if (!WIFEXITED(status) || WEXITSTATUS(status)) - fatal_error( "wineprefixcreate failed while creating '%s'.\n", config_dir ); - } - MESSAGE( "wine: '%s' created successfully.\n", config_dir ); } diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index bf1632b..a682e65 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -58,6 +58,7 @@ #define WIN32_LEAN_AND_MEAN #include <errno.h> +#include <fcntl.h> #include <stdio.h> #include <stdlib.h> #ifdef HAVE_GETOPT_H @@ -113,6 +114,49 @@ static char *get_wine_inf_path(void) return name; } +/* update the timestamp if different from the reference time */ +static BOOL update_timestamp( const char *config_dir, unsigned long timestamp, int force ) +{ + BOOL ret = FALSE; + int fd, count; + char buffer[100]; + char *file = HeapAlloc( GetProcessHeap(), 0, strlen(config_dir) + sizeof("/.update-timestamp") ); + + if (!file) return FALSE; + strcpy( file, config_dir ); + strcat( file, "/.update-timestamp" ); + + if ((fd = open( file, O_RDWR )) != -1) + { + if ((count = read( fd, buffer, sizeof(buffer) - 1 )) >= 0) + { + buffer[count] = 0; + if (!strncmp( buffer, "disable", sizeof("disable")-1 )) goto done; + if (!force && timestamp == strtoul( buffer, NULL, 10 )) goto done; + } + lseek( fd, 0, SEEK_SET ); + ftruncate( fd, 0 ); + } + else + { + if (errno != ENOENT) goto done; + if ((fd = open( file, O_WRONLY | O_CREAT | O_TRUNC, 0666 )) == -1) goto done; + } + + count = sprintf( buffer, "%lu\n", timestamp ); + if (write( fd, buffer, count ) != count) + { + WINE_WARN( "failed to update timestamp in %s\n", file ); + ftruncate( fd, 0 ); + } + else ret = TRUE; + +done: + if (fd != -1) close( fd ); + HeapFree( GetProcessHeap(), 0, file ); + return ret; +} + /* Performs the rename operations dictated in %SystemRoot%\Wininit.ini. * Returns FALSE if there was an error, or otherwise if all is ok. */ @@ -617,7 +661,7 @@ static BOOL start_services_process(void) } /* execute rundll32 on the wine.inf file if necessary */ -static void update_wineprefix(void) +static void update_wineprefix( int force ) { static const WCHAR cmdlineW[] = {'D','e','f','a','u','l','t','I','n','s','t','a','l','l',' ', '1','2','8',' ','\\','\\','?','\\','u','n','i','x' }; @@ -632,8 +676,12 @@ static void update_wineprefix(void) return; } if (stat( inf_path, &st ) == -1) + { WINE_WARN( "cannot stat wine.inf file: %s\n", strerror(errno) ); - else + goto done; + } + + if (update_timestamp( config_dir, st.st_mtime, force )) { WCHAR *buffer; DWORD len = MultiByteToWideChar( CP_UNIXCP, 0, inf_path, -1, NULL, 0 ); @@ -823,7 +871,7 @@ int main( int argc, char *argv[] ) ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNSERVICES], FALSE, FALSE ); start_services_process(); } - if (update) update_wineprefix(); + if (init || update) update_wineprefix( update ); ProcessRunKeys( HKEY_LOCAL_MACHINE, runkeys_names[RUNKEY_RUNONCE], TRUE, TRUE );

1 0

Alexandre Julliard : wineprefixcreate: Use wineboot --update to run wine. inf.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: bab67d39482b473031a483b7847b8b7bac312aab URL: http://source.winehq.org/git/wine.git/?a=commit;h=bab67d39482b473031a483b78… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 15:47:47 2008 +0200 wineprefixcreate: Use wineboot --update to run wine.inf. --- tools/wineprefixcreate.in | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-) diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in index 7eed546..e06f8b6 100644 --- a/tools/wineprefixcreate.in +++ b/tools/wineprefixcreate.in @@ -59,7 +59,6 @@ esac bindir=`cd "$bindir" && pwd` dlldir="$bindir/@bintodlldir@" -datadir="$bindir/@bintodatadir@" do_wait=0 quiet=0 @@ -79,7 +78,6 @@ then LD_LIBRARY_PATH="$topdir/libs/wine" fi export LD_LIBRARY_PATH - datadir="$topdir/tools" fi while [ $# -gt 0 ] @@ -122,33 +120,9 @@ else fi WINEPREFIX=`cd "$WINEPREFIX" && pwd` - -# Create the drive symlinks - -if [ ! -d "$WINEPREFIX/dosdevices" ] -then - mkdir "$WINEPREFIX/dosdevices" - [ -d "$WINEPREFIX/drive_c" ] || mkdir "$WINEPREFIX/drive_c" - ln -s "../drive_c" "$WINEPREFIX/dosdevices/c:" - ln -s "/" "$WINEPREFIX/dosdevices/z:" -fi - -CROOT="$WINEPREFIX/dosdevices/c:" - -# Create the directory tree - -for i in \ - "$CROOT/windows" \ - "$CROOT/windows/inf" -do - [ -d "$i" ] || mkdir "$i" -done - -# Copy the .inf script and run it - -cp "$datadir/wine.inf" "$CROOT/windows/inf/wine.inf" export WINEPREFIX -"${WINELOADER:-$bindir/wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf + +"${WINELOADER:-$bindir/wine}" wineboot.exe --update # Wait for the wineserver to finish @@ -156,8 +130,3 @@ if [ $do_wait = 1 ] then "${WINESERVER:-$bindir/wineserver}" -w fi - -if [ $quiet = 0 ] -then - echo "$WINEPREFIX updated successfully." -fi

1 0

Alexandre Julliard : libwine: Allow to specify a non-existing directory as WINEPREFIX.
by Alexandre Julliard 22 Apr '08

22 Apr '08

Module: wine Branch: master Commit: 662718160e03586424da4b49b21b99d2263273be URL: http://source.winehq.org/git/wine.git/?a=commit;h=662718160e03586424da4b49b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 21 15:48:12 2008 +0200 libwine: Allow to specify a non-existing directory as WINEPREFIX. --- libs/wine/config.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libs/wine/config.c b/libs/wine/config.c index 9e33f4e..ba89811 100644 --- a/libs/wine/config.c +++ b/libs/wine/config.c @@ -209,10 +209,8 @@ static void init_paths(void) fatal_error( "invalid directory %s in WINEPREFIX: not an absolute path\n", prefix ); if (stat( config_dir, &st ) == -1) { - if (errno != ENOENT) - fatal_perror( "cannot open %s as specified in WINEPREFIX", config_dir ); - fatal_error( "the '%s' directory specified in WINEPREFIX doesn't exist.\n" - "You may want to create it by running 'wineprefixcreate'.\n", config_dir ); + if (errno == ENOENT) return; /* will be created later on */ + fatal_perror( "cannot open %s as specified in WINEPREFIX", config_dir ); } } else

1 0