September 2008 - Wine-commits

Lei Zhang : gdiplus: Allocate enough space for BITMAPINFO in GdipCreateTextureIA.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 8d53fc56fee3da2eacaf8a7fc9cfe46dead8da2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d53fc56fee3da2eacaf8a7fc… Author: Lei Zhang <thestig(a)google.com> Date: Sun Sep 28 12:11:41 2008 -0700 gdiplus: Allocate enough space for BITMAPINFO in GdipCreateTextureIA. --- dlls/gdiplus/brush.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d08fdab..efa370f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -480,7 +480,7 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, HDC hdc; OLE_HANDLE hbm; HBITMAP old = NULL; - BITMAPINFO bmi; + BITMAPINFO *pbmi; BITMAPINFOHEADER *bmih; INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; BOOL bm_is_selected; @@ -512,8 +512,11 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, IPicture_get_CurDC(image->picture, &hdc); bm_is_selected = (hdc != 0); - bmi.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - bmi.bmiHeader.biBitCount = 0; + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = 0; if(!bm_is_selected){ hdc = CreateCompatibleDC(0); @@ -521,32 +524,37 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, } /* fill out bmi */ - GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - bytespp = bmi.bmiHeader.biBitCount / 8; - abs_height = abs(bmi.bmiHeader.biHeight); + bytespp = pbmi->bmiHeader.biBitCount / 8; + abs_height = abs(pbmi->bmiHeader.biHeight); - if(n_x > bmi.bmiHeader.biWidth || n_x + n_width > bmi.bmiHeader.biWidth || - n_y > abs_height || n_y + n_height > abs_height) + if(n_x > pbmi->bmiHeader.biWidth || n_x + n_width > pbmi->bmiHeader.biWidth || + n_y > abs_height || n_y + n_height > abs_height){ + GdipFree(pbmi); return InvalidParameter; + } - dibits = GdipAlloc(bmi.bmiHeader.biSizeImage); + dibits = GdipAlloc(pbmi->bmiHeader.biSizeImage); if(dibits) /* this is not a good place to error out */ - GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, dibits, &bmi, DIB_RGB_COLORS); + GetDIBits(hdc, (HBITMAP)hbm, 0, abs_height, dibits, pbmi, DIB_RGB_COLORS); if(!bm_is_selected){ SelectObject(hdc, old); DeleteDC(hdc); } - if(!dibits) + if(!dibits){ + GdipFree(pbmi); return OutOfMemory; + } - image_stride = (bmi.bmiHeader.biWidth * bytespp + 3) & ~3; + image_stride = (pbmi->bmiHeader.biWidth * bytespp + 3) & ~3; stride = (n_width * bytespp + 3) & ~3; buff = GdipAlloc(sizeof(BITMAPINFOHEADER) + stride * n_height); if(!buff){ + GdipFree(pbmi); GdipFree(dibits); return OutOfMemory; } @@ -558,18 +566,20 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, bmih->biHeight = n_height; bmih->biCompression = BI_RGB; bmih->biSizeImage = stride * n_height; - bmih->biBitCount = bmi.bmiHeader.biBitCount; + bmih->biBitCount = pbmi->bmiHeader.biBitCount; bmih->biClrUsed = 0; bmih->biPlanes = 1; /* image is flipped */ - if(bmi.bmiHeader.biHeight > 0){ - dibits += bmi.bmiHeader.biSizeImage; + if(pbmi->bmiHeader.biHeight > 0){ + dibits += pbmi->bmiHeader.biSizeImage; image_stride *= -1; textbits += stride * (n_height - 1); stride *= -1; } + GdipFree(pbmi); + for(i = 0; i < n_height; i++) memcpy(&textbits[i * stride], &dibits[n_x * bytespp + (n_y + i) * image_stride],

1 0

Vitaliy Margolen : user32/tests: Move shell test to the end - killing explorer affects lots of tests.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: d83fc43e5e0155d1d00e54425c2af0a14dd2d40b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d83fc43e5e0155d1d00e54425… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Sun Sep 28 13:13:33 2008 -0600 user32/tests: Move shell test to the end - killing explorer affects lots of tests. --- dlls/user32/tests/win.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 3954b07..fac40fe 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4935,7 +4935,6 @@ START_TEST(win) test_CreateWindow(); test_parent_owner(); test_SetParent(); - test_shell_window(); test_mdi(); test_icons(); @@ -4968,6 +4967,8 @@ START_TEST(win) test_Expose(); test_layered_window(); + test_shell_window(); + /* add the tests above this line */ UnhookWindowsHookEx(hhook); }

1 0

Jacek Caban : mshtml: Fixed tests on IE7.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 47ef2acc3be5a72186c4185e379da388d73337af URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ef2acc3be5a72186c4185e3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 28 16:42:22 2008 +0200 mshtml: Fixed tests on IE7. --- dlls/mshtml/task.c | 2 ++ dlls/mshtml/tests/htmldoc.c | 34 ++++++++++++++++++++++++++++++---- 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 93edd65..a1c8da9 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -261,6 +261,8 @@ static void set_parsecomplete(HTMLDocument *doc) call_property_onchanged(&doc->cp_propnotif, 1005); call_explorer_69(doc); + /* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */ + doc->readystate = READYSTATE_INTERACTIVE; call_property_onchanged(&doc->cp_propnotif, DISPID_READYSTATE); diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index 6655764..a8f1e30 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -139,6 +139,10 @@ DEFINE_EXPECT(RequestUIActivate); DEFINE_EXPECT(InPlaceFrame_SetBorderSpace); DEFINE_EXPECT(InPlaceUIWindow_SetActiveObject); DEFINE_EXPECT(GetExternal); +DEFINE_EXPECT(EnableModeless_TRUE); +DEFINE_EXPECT(EnableModeless_FALSE); +DEFINE_EXPECT(Frame_EnableModeless_TRUE); +DEFINE_EXPECT(Frame_EnableModeless_FALSE); static IUnknown *doc_unk; static BOOL expect_LockContainer_fLock; @@ -652,11 +656,13 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D readystate_set_loading = FALSE; load_state = LD_LOADING; } - test_readyState(NULL); + if(!editmode || load_state != LD_LOADING || !called_Exec_Explorer_69) + test_readyState(NULL); return S_OK; case 1005: CHECK_EXPECT(OnChanged_1005); - test_readyState(NULL); + if(!editmode) + test_readyState(NULL); load_state = LD_INTERACTIVE; return S_OK; } @@ -1309,7 +1315,10 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLE static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) { - ok(0, "unexpected call\n"); + if(fEnable) + CHECK_EXPECT(Frame_EnableModeless_TRUE); + else + CHECK_EXPECT(Frame_EnableModeless_FALSE); return E_NOTIMPL; } @@ -1931,7 +1940,10 @@ static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface) static HRESULT WINAPI DocHostUIHandler_EnableModeless(IDocHostUIHandler2 *iface, BOOL fEnable) { - ok(0, "unexpected call\n"); + if(fEnable) + CHECK_EXPECT(EnableModeless_TRUE); + else + CHECK_EXPECT(EnableModeless_FALSE); return E_NOTIMPL; } @@ -2734,6 +2746,10 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(UnlockRequest); } SET_EXPECT(Exec_Explorer_69); + SET_EXPECT(EnableModeless_TRUE); /* IE7 */ + SET_EXPECT(Frame_EnableModeless_TRUE); /* IE7 */ + SET_EXPECT(EnableModeless_FALSE); /* IE7 */ + SET_EXPECT(Frame_EnableModeless_FALSE); /* IE7 */ SET_EXPECT(OnChanged_1005); SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Exec_SETPROGRESSPOS); @@ -2741,6 +2757,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_EXPECT(Exec_ShellDocView_103); SET_EXPECT(Exec_MSHTML_PARSECOMPLETE); SET_EXPECT(Exec_HTTPEQUIV_DONE); + SET_EXPECT(SetStatusText); expect_status_text = (LPWSTR)0xdeadbeef; /* TODO */ while(!called_Exec_HTTPEQUIV_DONE && GetMessage(&msg, NULL, 0, 0)) { @@ -2781,6 +2798,10 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) } } SET_CALLED(Exec_Explorer_69); + SET_CALLED(EnableModeless_TRUE); /* IE7 */ + SET_CALLED(Frame_EnableModeless_TRUE); /* IE7 */ + SET_CALLED(EnableModeless_FALSE); /* IE7 */ + SET_CALLED(Frame_EnableModeless_FALSE); /* IE7 */ CHECK_CALLED(OnChanged_1005); CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Exec_SETPROGRESSPOS); @@ -2788,6 +2809,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl) SET_CALLED(Exec_ShellDocView_103); CHECK_CALLED(Exec_MSHTML_PARSECOMPLETE); CHECK_CALLED(Exec_HTTPEQUIV_DONE); + SET_CALLED(SetStatusText); load_state = LD_COMPLETE; @@ -4030,7 +4052,11 @@ static void test_editing_mode(BOOL do_load) test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED); test_download(TRUE, do_load, do_load); + + SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI); + SET_CALLED(SetStatusText); + test_MSHTML_QueryStatus(unk, OLECMDF_SUPPORTED|OLECMDF_ENABLED); if(!do_load) {

1 0

Roderick Colenbrander : opengl32: Remove some tests which cause issues on win9x.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: b09a9ebc764ad3752c4a38ac1a4a1b15bbd5c0c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b09a9ebc764ad3752c4a38ac1… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 28 18:10:09 2008 +0200 opengl32: Remove some tests which cause issues on win9x. --- dlls/opengl32/tests/opengl.c | 13 ------------- 1 files changed, 0 insertions(+), 13 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 808b6c7..65c47c6 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -274,10 +274,6 @@ static void test_makecurrent(HDC winhdc) { BOOL ret; HGLRC hglrc; - HDC hdc; - - hdc = GetDC(0); - ok( hdc != 0, "GetDC(0) failed\n" ); hglrc = wglCreateContext(winhdc); ok( hglrc != 0, "wglCreateContext failed\n" ); @@ -286,15 +282,6 @@ static void test_makecurrent(HDC winhdc) ok( ret, "wglMakeCurrent failed\n" ); ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); - - SetLastError( 0xdeadbeef ); - ret = wglMakeCurrent( hdc, hglrc ); - ok( !ret, "wglMakeCurrent succeeded\n" ); - ok( GetLastError() == ERROR_INVALID_PIXEL_FORMAT, "last error %u\n", GetLastError() ); - - ok( wglGetCurrentContext() == hglrc, "wrong context\n" ); - - ReleaseDC( 0, hdc ); } static void test_colorbits(HDC hdc)

1 0

Nikolay Sivov : gdiplus: Stubs for GdipIsVisiblePoint/GdipIsVisiblePointI.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 3ecb8bdd610d6c05bc9e1c94ecb7b74ab334e5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ecb8bdd610d6c05bc9e1c94e… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 26 22:34:39 2008 +0400 gdiplus: Stubs for GdipIsVisiblePoint/GdipIsVisiblePointI. --- dlls/gdiplus/gdiplus.spec | 4 ++-- dlls/gdiplus/graphics.c | 26 ++++++++++++++++++++++++++ dlls/gdiplus/tests/graphics.c | 5 +++++ include/gdiplusflat.h | 2 ++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7244a81..8d13a19 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -427,8 +427,8 @@ @ stub GdipIsVisibleClipEmpty @ stdcall GdipIsVisiblePathPoint(ptr long long ptr ptr) @ stdcall GdipIsVisiblePathPointI(ptr long long ptr ptr) -@ stub GdipIsVisiblePoint -@ stub GdipIsVisiblePointI +@ stdcall GdipIsVisiblePoint(ptr long long ptr) +@ stdcall GdipIsVisiblePointI(ptr long long ptr) @ stub GdipIsVisibleRect @ stub GdipIsVisibleRectI @ stub GdipIsVisibleRegionPoint diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3b5d8f0..03b0994 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2583,6 +2583,32 @@ GpStatus WINGDIPAPI GdipIsClipEmpty(GpGraphics *graphics, BOOL *res) return GdipIsEmptyRegion(graphics->clip, graphics, res); } +GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics *graphics, REAL x, REAL y, BOOL *result) +{ + FIXME("(%p, %.2f, %.2f, %p) stub\n", graphics, x, y, result); + + if(!graphics || !result) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics *graphics, INT x, INT y, BOOL *result) +{ + FIXME("(%p, %d, %d, %p) stub\n", graphics, x, y, result); + + if(!graphics || !result) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, GDIPCONST WCHAR* string, INT length, GDIPCONST GpFont* font, GDIPCONST RectF* layoutRect, GDIPCONST GpStringFormat *stringFormat, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 6f38446..1b4e310 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -487,6 +487,7 @@ static void test_Get_Release_DC(void) GpRect rect[2]; GpRegion *clip; INT i; + BOOL res; pt[0].X = 10; pt[0].Y = 10; @@ -674,6 +675,10 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipGraphicsClear(graphics, 0xdeadbeef); expect(ObjectBusy, status); status = Ok; + status = GdipIsVisiblePoint(graphics, 0.0, 0.0, &res); + expect(ObjectBusy, status); status = Ok; + status = GdipIsVisiblePointI(graphics, 0, 0, &res); + expect(ObjectBusy, status); status = Ok; /* GdipMeasureCharacterRanges */ /* GdipMeasureString */ status = GdipResetClip(graphics); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 7b36a73..8df65f4 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -537,6 +537,8 @@ GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode); GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*); +GpStatus WINGDIPAPI GdipIsVisiblePoint(GpGraphics*,REAL,REAL,BOOL*); +GpStatus WINGDIPAPI GdipIsVisiblePointI(GpGraphics*,INT,INT,BOOL*); GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL,REAL,BOOL,GpAdjustableArrowCap**); GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL*);

1 0

Roderick Colenbrander : opengl32: Add some driver traces to the tests.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 23b1988f1a58f95738ff41b5c092733e1dc0393a URL: http://source.winehq.org/git/wine.git/?a=commit;h=23b1988f1a58f95738ff41b5c… Author: Roderick Colenbrander <thunderbird2k(a)gmx.net> Date: Sun Sep 28 17:56:30 2008 +0200 opengl32: Add some driver traces to the tests. --- dlls/opengl32/tests/opengl.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 036b058..808b6c7 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -22,6 +22,11 @@ #include <wingdi.h> #include "wine/test.h" +const unsigned char * WINAPI glGetString(unsigned int); +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 + #define MAX_FORMATS 256 typedef void* HPBUFFERARB; @@ -470,6 +475,12 @@ START_TEST(opengl) hglrc = wglCreateContext(hdc); res = wglMakeCurrent(hdc, hglrc); ok(res, "wglMakeCurrent failed!\n"); + if(res) + { + trace("OpenGL renderer: %s\n", glGetString(GL_RENDERER)); + trace("OpenGL driver version: %s\n", glGetString(GL_VERSION)); + trace("OpenGL vendor: %s\n", glGetString(GL_VENDOR)); + } test_makecurrent(hdc); test_setpixelformat(hdc);

1 0

Nikolay Sivov : gdiplus: Implemented GdipSetClipPath.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: e2817e59b1545f8f9e813b9aab082e58a2cdc66e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2817e59b1545f8f9e813b9aa… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 26 22:18:09 2008 +0400 gdiplus: Implemented GdipSetClipPath. --- dlls/gdiplus/gdiplus.spec | 2 +- dlls/gdiplus/graphics.c | 13 +++++++++++++ dlls/gdiplus/tests/graphics.c | 7 +++++++ include/gdiplusflat.h | 1 + 4 files changed, 22 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 0faf01b..7244a81 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -508,7 +508,7 @@ @ stdcall GdipSetAdjustableArrowCapWidth(ptr long) @ stub GdipSetClipGraphics @ stub GdipSetClipHrgn -@ stub GdipSetClipPath +@ stdcall GdipSetClipPath(ptr ptr long) @ stdcall GdipSetClipRect(ptr long long long long long) @ stdcall GdipSetClipRectI(ptr long long long long long) @ stdcall GdipSetClipRegion(ptr ptr long) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b36e31c..3b5d8f0 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2948,6 +2948,19 @@ GpStatus WINGDIPAPI GdipTranslateWorldTransform(GpGraphics *graphics, REAL dx, return GdipTranslateMatrix(graphics->worldtrans, dx, dy, order); } +GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics *graphics, GpPath *path, CombineMode mode) +{ + TRACE("(%p, %p, %d)\n", graphics, path, mode); + + if(!graphics) + return InvalidParameter; + + if(graphics->busy) + return ObjectBusy; + + return GdipCombineRegionPath(graphics->clip, path, mode); +} + GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics *graphics, REAL x, REAL y, REAL width, REAL height, CombineMode mode) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index c000843..6f38446 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -706,6 +706,8 @@ static void test_Get_Release_DC(void) expect(ObjectBusy, status); status = Ok; status = GdipTranslateWorldTransform(graphics, 0.0, 0.0, MatrixOrderPrepend); expect(ObjectBusy, status); status = Ok; + status = GdipSetClipPath(graphics, path, CombineModeReplace); + expect(ObjectBusy, status); status = Ok; status = GdipSetClipRect(graphics, 0.0, 0.0, 10.0, 10.0, CombineModeReplace); expect(ObjectBusy, status); status = Ok; status = GdipSetClipRectI(graphics, 0, 0, 10, 10, CombineModeReplace); @@ -804,6 +806,11 @@ static void test_get_set_clip(void) status = GdipSetClipRegion(graphics, NULL, CombineModeReplace); expect(InvalidParameter, status); + status = GdipSetClipPath(NULL, NULL, CombineModeReplace); + expect(InvalidParameter, status); + status = GdipSetClipPath(graphics, NULL, CombineModeReplace); + expect(InvalidParameter, status); + res = FALSE; status = GdipGetClip(graphics, clip); expect(Ok, status); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index efef67c..7b36a73 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -533,6 +533,7 @@ GpStatus WINGDIPAPI GdipTranslateRegionI(GpRegion *, INT, INT); GpStatus WINGDIPAPI GdipFlush(GpGraphics*, GpFlushIntention); GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT); +GpStatus WINGDIPAPI GdipSetClipPath(GpGraphics*,GpPath*,CombineMode); GpStatus WINGDIPAPI GdipSetClipRect(GpGraphics*,REAL,REAL,REAL,REAL,CombineMode); GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*);

1 0

Vitaliy Margolen : user32/tests: Make it easier to identify failed tests.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: cc5ff833b30db56115e0c270ed578c95de56c851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc5ff833b30db56115e0c270e… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Sep 25 08:26:15 2008 -0600 user32/tests: Make it easier to identify failed tests. --- dlls/user32/tests/input.c | 77 ++++++++++++++++++++++++++++---------------- 1 files changed, 49 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cc5ff833b30db56115e0c…

1 0

Vitaliy Margolen : user32/tests: Use empty_message_queue with timeouts.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 311fea4ec45e4ddc5776526308e68e83a3e010d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=311fea4ec45e4ddc577652630… Author: Vitaliy Margolen <wine-patches(a)kievinfo.com> Date: Thu Sep 25 08:26:09 2008 -0600 user32/tests: Use empty_message_queue with timeouts. --- dlls/user32/tests/input.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index aac6d61..c5a15cd 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -360,11 +360,24 @@ static void test_Input_whitebox(void) DestroyWindow(hWndTest); } -static void empty_message_queue(void) { +/* try to make sure pending X events have been processed before continuing */ +static void empty_message_queue(void) +{ MSG msg; - while(PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { - TranslateMessage(&msg); - DispatchMessage(&msg); + int diff = 200; + int min_timeout = 50; + DWORD time = GetTickCount() + diff; + + while (diff > 0) + { + if (MsgWaitForMultipleObjects(0, NULL, FALSE, min_timeout, QS_ALLINPUT) == WAIT_TIMEOUT) break; + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessage(&msg); + } + diff = time - GetTickCount(); + min_timeout = 20; } }

1 0

Jacek Caban : urlmon: Fixed file protocol tests on win9x.
by Alexandre Julliard 30 Sep '08

30 Sep '08

Module: wine Branch: master Commit: 9b81945aebaed826a08334c6c502a7ad797177e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b81945aebaed826a08334c6c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Sep 28 23:00:59 2008 +0200 urlmon: Fixed file protocol tests on win9x. --- dlls/urlmon/tests/protocol.c | 88 +++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 39 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index 159af5d..f636226 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -1194,7 +1194,7 @@ static void test_priority(IInternetProtocol *protocol) IInternetPriority_Release(priority); } -static void file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL is_first) +static BOOL file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL is_first) { HRESULT hres; @@ -1216,6 +1216,10 @@ static void file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL i expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, url, &protocol_sink, &bind_info, 0, 0); + if(hres == INET_E_RESOURCE_NOT_FOUND) { + win_skip("Start failed\n"); + return FALSE; + } ok(hres == S_OK, "Start failed: %08x\n", hres); CHECK_CALLED(GetBindInfo); @@ -1232,6 +1236,8 @@ static void file_protocol_start(IInternetProtocol *protocol, LPCWSTR url, BOOL i CHECK_CALLED(ReportData); if(is_first) CHECK_CALLED(ReportResult); + + return TRUE; } static void test_file_protocol_url(LPCWSTR url) @@ -1261,25 +1267,27 @@ static void test_file_protocol_url(LPCWSTR url) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { - file_protocol_start(protocol, url, TRUE); - hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == 2, "cb=%u expected 2\n", cb); - hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_FALSE, "Read failed: %08x\n", hres); - hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); - ok(hres == S_FALSE, "Read failed: %08x expected S_FALSE\n", hres); - ok(cb == 0, "cb=%u expected 0\n", cb); - hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); - - file_protocol_start(protocol, url, FALSE); - hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_FALSE, "Read failed: %08x\n", hres); - hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); - hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + if(file_protocol_start(protocol, url, TRUE)) { + hres = IInternetProtocol_Read(protocol, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(cb == 2, "cb=%u expected 2\n", cb); + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &cb); + ok(hres == S_FALSE, "Read failed: %08x expected S_FALSE\n", hres); + ok(cb == 0, "cb=%u expected 0\n", cb); + hres = IInternetProtocol_UnlockRequest(protocol); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + } + + if(file_protocol_start(protocol, url, FALSE)) { + hres = IInternetProtocol_Read(protocol, buf, 2, &cb); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); + hres = IInternetProtocol_LockRequest(protocol, 0); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + hres = IInternetProtocol_UnlockRequest(protocol); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + } IInternetProtocol_Release(protocol); } @@ -1288,19 +1296,20 @@ static void test_file_protocol_url(LPCWSTR url) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { - file_protocol_start(protocol, url, TRUE); - hres = IInternetProtocol_LockRequest(protocol, 0); - ok(hres == S_OK, "LockRequest failed: %08x\n", hres); - hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); - hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n\n", hres); - hres = IInternetProtocol_UnlockRequest(protocol); - ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); - hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); + if(file_protocol_start(protocol, url, TRUE)) { + hres = IInternetProtocol_LockRequest(protocol, 0); + ok(hres == S_OK, "LockRequest failed: %08x\n", hres); + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + hres = IInternetProtocol_Read(protocol, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n\n", hres); + hres = IInternetProtocol_UnlockRequest(protocol); + ok(hres == S_OK, "UnlockRequest failed: %08x\n", hres); + hres = IInternetProtocol_Read(protocol, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + } IInternetProtocol_Release(protocol); } @@ -1309,12 +1318,13 @@ static void test_file_protocol_url(LPCWSTR url) ok(hres == S_OK, "Could not get IInternetProtocol: %08x\n", hres); if(SUCCEEDED(hres)) { - file_protocol_start(protocol, url, TRUE); - hres = IInternetProtocol_Terminate(protocol, 0); - ok(hres == S_OK, "Terminate failed: %08x\n", hres); - hres = IInternetProtocol_Read(protocol, buf, 2, &cb); - ok(hres == S_OK, "Read failed: %08x\n", hres); - ok(cb == 2, "cb=%u expected 2\n", cb); + if(file_protocol_start(protocol, url, TRUE)) { + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + hres = IInternetProtocol_Read(protocol, buf, 2, &cb); + ok(hres == S_OK, "Read failed: %08x\n", hres); + ok(cb == 2, "cb=%u expected 2\n", cb); + } IInternetProtocol_Release(protocol); }

1 0