May 2009 - Wine-commits - list.winehq.org

Joris Huizer : msctf: ITfContext::RequestEditSession: dwLockFlags logic corrected.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: e11935a14b1a1a40c98b3efe2fe0461fe50ca61e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e11935a14b1a1a40c98b3efe2… Author: Joris Huizer <joris_huizer(a)yahoo.com> Date: Tue May 19 19:50:03 2009 +0200 msctf: ITfContext::RequestEditSession: dwLockFlags logic corrected. --- dlls/msctf/context.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6a2bed6..d312574 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -228,12 +228,12 @@ static HRESULT WINAPI Context_RequestEditSession (ITfContext *iface, } if (!(dwFlags & TF_ES_ASYNC)) - dwLockFlags &= TS_LF_SYNC; + dwLockFlags |= TS_LF_SYNC; if (dwFlags & TF_ES_READ) - dwLockFlags &= TS_LF_READ; + dwLockFlags |= TS_LF_READ; else if ((dwFlags & TF_ES_READWRITE) == TF_ES_READWRITE) - dwLockFlags &= TS_LF_READWRITE; + dwLockFlags |= TS_LF_READWRITE; /* TODO: cache this */ ITextStoreACP_GetStatus(This->pITextStoreACP, &status);

1 0

Jacek Caban : urlmon: Added IUriContainer declaration.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: e0c18d1e21b06f0d1211269e03272e2588932a7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0c18d1e21b06f0d1211269e0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 20 11:53:28 2009 +0200 urlmon: Added IUriContainer declaration. --- include/urlmon.idl | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/include/urlmon.idl b/include/urlmon.idl index 20bf28e..13c09be 100644 --- a/include/urlmon.idl +++ b/include/urlmon.idl @@ -1500,6 +1500,20 @@ interface IUri : IUnknown } /***************************************************************************** + * IUriContainer interface + */ +[ + local, + object, + uuid(a158a630-ed6f-45fb-b987-f68676f57752), + pointer_default(unique) +] +interface IUriContainer : IUnknown +{ + HRESULT GetIUri([out] IUri **ppIUri); +} + +/***************************************************************************** * IInternetProtocolEx interface */ [

1 0

Nikolay Sivov : comctl32/listview: Fix hittesting for LVS_REPORT subitems.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 8f334205f921737de3b71c58f37081442c262a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f334205f921737de3b71c58f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed May 20 16:44:27 2009 +0400 comctl32/listview: Fix hittesting for LVS_REPORT subitems. --- dlls/comctl32/listview.c | 54 +++++++++++++++++++++++++++++---------------- 1 files changed, 35 insertions(+), 19 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index ce78224..7010a53 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6536,12 +6536,36 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, TRACE("lpht->iItem=%d\n", iItem); if (iItem == -1) return -1; + if (uView == LVS_REPORT && subitem) + { + RECT bounds, *pRect; + INT j; + + /* for top/bottom only */ + bounds.left = 0; + LISTVIEW_GetItemRect(infoPtr, iItem, &bounds); + + for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) + { + pRect = &LISTVIEW_GetColumnInfo(infoPtr, j)->rcHeader; + bounds.left = pRect->left; + bounds.right = pRect->right; + + if (PtInRect(&bounds, lpht->pt)) + { + lpht->iSubItem = j; + break; + } + } + TRACE("lpht->iSubItem=%d\n", lpht->iSubItem); + } + lvItem.mask = LVIF_STATE | LVIF_TEXT; if (uView == LVS_REPORT) lvItem.mask |= LVIF_INDENT; lvItem.stateMask = LVIS_STATEIMAGEMASK; if (uView == LVS_ICON) lvItem.stateMask |= LVIS_FOCUSED; lvItem.iItem = iItem; - lvItem.iSubItem = 0; + lvItem.iSubItem = lpht->iSubItem; lvItem.pszText = szDispText; lvItem.cchTextMax = DISP_TEXT_SIZE; if (!LISTVIEW_GetItemW(infoPtr, &lvItem)) return -1; @@ -6568,26 +6592,15 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, lpht->flags |= LVHT_ONITEMLABEL; else if (infoPtr->himlState && STATEIMAGEINDEX(lvItem.state) && PtInRect(&rcState, opt)) lpht->flags |= LVHT_ONITEMSTATEICON; + /* special case for LVS_EX_FULLROWSELECT */ + if (uView == LVS_REPORT && infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT && + !(lpht->flags & LVHT_ONITEM)) + { + lpht->flags = LVHT_ONITEM | LVHT_ABOVE; + } if (lpht->flags & LVHT_ONITEM) lpht->flags &= ~LVHT_NOWHERE; - TRACE("lpht->flags=0x%x\n", lpht->flags); - if (uView == LVS_REPORT && subitem) - { - INT j; - - rcBounds.right = rcBounds.left; - for (j = 0; j < DPA_GetPtrCount(infoPtr->hdpaColumns); j++) - { - rcBounds.left = rcBounds.right; - rcBounds.right += LISTVIEW_GetColumnWidth(infoPtr, j); - if (PtInRect(&rcBounds, opt)) - { - lpht->iSubItem = j; - break; - } - } - } if (select && !(uView == LVS_REPORT && ((infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT) || @@ -6595,6 +6608,9 @@ static INT LISTVIEW_HitTest(const LISTVIEW_INFO *infoPtr, LPLVHITTESTINFO lpht, { if (uView == LVS_REPORT) { + /* get main item bounds */ + lvItem.iSubItem = 0; + LISTVIEW_GetItemMetrics(infoPtr, &lvItem, &rcBox, NULL, &rcIcon, &rcState, &rcLabel); UnionRect(&rcBounds, &rcIcon, &rcLabel); UnionRect(&rcBounds, &rcBounds, &rcState); } @@ -10054,7 +10070,7 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_HASGROUP: */ case LVM_HITTEST: - return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, FALSE, FALSE); + return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, FALSE, TRUE); case LVM_INSERTCOLUMNA: return LISTVIEW_InsertColumnT(infoPtr, (INT)wParam, (LPLVCOLUMNW)lParam, FALSE);

1 0

Paul Vriens : urlmon/tests: Fix some test failures on IE8.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 8a3d9ccb4410fafa75fc0d15e01ad0a1144c0cf3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a3d9ccb4410fafa75fc0d15e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue May 19 20:55:36 2009 +0200 urlmon/tests: Fix some test failures on IE8. --- dlls/urlmon/tests/misc.c | 48 +++++++++++++++++++++++---------------------- 1 files changed, 25 insertions(+), 23 deletions(-) diff --git a/dlls/urlmon/tests/misc.c b/dlls/urlmon/tests/misc.c index 64ed937..62df788 100644 --- a/dlls/urlmon/tests/misc.c +++ b/dlls/urlmon/tests/misc.c @@ -527,7 +527,7 @@ static BYTE data85[] = {'.','S','N','D',0}; static const struct { BYTE *data; DWORD size; - LPCWSTR mime; + LPCWSTR mime, mime_alt; } mime_tests2[] = { {data1, sizeof(data1), mimeTextPlain}, {data2, sizeof(data2), mimeAppOctetStream}, @@ -535,12 +535,12 @@ static const struct { {data4, sizeof(data4), mimeAppOctetStream}, {data5, sizeof(data5), mimeTextPlain}, {data6, sizeof(data6), mimeTextPlain}, - {data7, sizeof(data7), mimeTextHtml}, - {data8, sizeof(data8), mimeTextHtml}, - {data9, sizeof(data9), mimeTextHtml}, - {data10, sizeof(data10), mimeTextHtml}, - {data11, sizeof(data11), mimeTextHtml}, - {data12, sizeof(data12), mimeTextHtml}, + {data7, sizeof(data7), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data8, sizeof(data8), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data9, sizeof(data9), mimeTextHtml, mimeImagePjpeg /* IE8 */}, + {data10, sizeof(data10), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data11, sizeof(data11), mimeTextHtml, mimeTextPlain /* IE8 */}, + {data12, sizeof(data12), mimeTextHtml, mimeTextPlain /* IE8 */}, {data13, sizeof(data13), mimeTextPlain}, {data14, sizeof(data14), mimeTextPlain}, {data15, sizeof(data15), mimeTextPlain}, @@ -554,21 +554,21 @@ static const struct { {data23, sizeof(data23), mimeTextPlain}, {data24, sizeof(data24), mimeImageGif}, {data25, sizeof(data25), mimeImageGif}, - {data26, sizeof(data26), mimeTextHtml}, + {data26, sizeof(data26), mimeTextHtml, mimeImageGif /* IE8 */}, {data27, sizeof(data27), mimeTextPlain}, {data28, sizeof(data28), mimeImageBmp}, {data29, sizeof(data29), mimeImageBmp}, {data30, sizeof(data30), mimeAppOctetStream}, - {data31, sizeof(data31), mimeTextHtml}, + {data31, sizeof(data31), mimeTextHtml, mimeImageBmp /* IE8 */}, {data32, sizeof(data32), mimeAppOctetStream}, {data33, sizeof(data33), mimeAppOctetStream}, {data34, sizeof(data34), mimeImageXPng}, {data35, sizeof(data35), mimeImageXPng}, {data36, sizeof(data36), mimeAppOctetStream}, - {data37, sizeof(data37), mimeTextHtml}, + {data37, sizeof(data37), mimeTextHtml, mimeImageXPng /* IE8 */}, {data38, sizeof(data38), mimeAppOctetStream}, {data39, sizeof(data39), mimeImageTiff}, - {data40, sizeof(data40), mimeTextHtml}, + {data40, sizeof(data40), mimeTextHtml, mimeImageTiff /* IE8 */}, {data41, sizeof(data41), mimeImageTiff}, {data42, sizeof(data42), mimeTextPlain}, {data43, sizeof(data43), mimeAppOctetStream}, @@ -576,43 +576,43 @@ static const struct { {data45, sizeof(data45), mimeTextPlain}, {data46, sizeof(data46), mimeTextPlain}, {data47, sizeof(data47), mimeTextPlain}, - {data48, sizeof(data48), mimeTextHtml}, + {data48, sizeof(data48), mimeTextHtml, mimeVideoAvi /* IE8 */}, {data49, sizeof(data49), mimeVideoAvi}, {data50, sizeof(data50), mimeVideoMpeg}, {data51, sizeof(data51), mimeVideoMpeg}, {data52, sizeof(data52), mimeAppOctetStream}, {data53, sizeof(data53), mimeAppOctetStream}, - {data54, sizeof(data54), mimeTextHtml}, + {data54, sizeof(data54), mimeTextHtml, mimeVideoMpeg /* IE8 */}, {data55, sizeof(data55), mimeAppXGzip}, {data56, sizeof(data56), mimeTextPlain}, - {data57, sizeof(data57), mimeTextHtml}, + {data57, sizeof(data57), mimeTextHtml, mimeAppXGzip /* IE8 */}, {data58, sizeof(data58), mimeAppOctetStream}, {data59, sizeof(data59), mimeAppXZip}, {data60, sizeof(data60), mimeTextPlain}, - {data61, sizeof(data61), mimeTextHtml}, + {data61, sizeof(data61), mimeTextHtml, mimeAppXZip /* IE8 */}, {data62, sizeof(data62), mimeAppJava}, {data63, sizeof(data63), mimeTextPlain}, - {data64, sizeof(data64), mimeTextHtml}, + {data64, sizeof(data64), mimeTextHtml, mimeAppJava /* IE8 */}, {data65, sizeof(data65), mimeAppPdf}, {data66, sizeof(data66), mimeTextPlain}, - {data67, sizeof(data67), mimeTextHtml}, + {data67, sizeof(data67), mimeTextHtml, mimeAppPdf /* IE8 */}, {data68, sizeof(data68), mimeAppXMSDownload}, {data69, sizeof(data69), mimeTextPlain}, - {data70, sizeof(data70), mimeTextHtml}, + {data70, sizeof(data70), mimeTextHtml, mimeAppXMSDownload /* IE8 */}, {data71, sizeof(data71), mimeTextRichtext}, {data72, sizeof(data72), mimeTextPlain}, {data73, sizeof(data73), mimeTextPlain}, - {data74, sizeof(data74), mimeTextHtml}, + {data74, sizeof(data74), mimeTextHtml, mimeTextRichtext /* IE8 */}, {data75, sizeof(data75), mimeAudioWav}, {data76, sizeof(data76), mimeTextPlain}, {data77, sizeof(data77), mimeTextPlain}, - {data78, sizeof(data78), mimeTextHtml}, + {data78, sizeof(data78), mimeTextHtml, mimeTextPlain /* IE8 */}, {data79, sizeof(data79), mimeAppPostscript}, {data80, sizeof(data80), mimeTextPlain}, - {data81, sizeof(data81), mimeTextHtml}, + {data81, sizeof(data81), mimeTextHtml, mimeAppPostscript /* IE8 */}, {data82, sizeof(data82), mimeAudioBasic}, {data83, sizeof(data83), mimeTextPlain}, - {data84, sizeof(data84), mimeTextHtml}, + {data84, sizeof(data84), mimeTextHtml, mimeAudioBasic /* IE8 */}, {data85, sizeof(data85), mimeTextPlain} }; @@ -672,7 +672,9 @@ static void test_FindMimeFromData(void) if(!lstrcmpW(mimeAppOctetStream, mime_tests2[i].mime) || i == 17) ok(!lstrcmpW(mime, mimeImagePjpeg), "[%d] wrong mime\n", i); else - ok(!lstrcmpW(mime, mime_tests2[i].mime), "[%d] wrong mime\n", i); + ok(!lstrcmpW(mime, mime_tests2[i].mime) || + (mime_tests2[i].mime_alt && !lstrcmpW(mime, mime_tests2[i].mime_alt)), + "[%d] wrong mime, got '%s'\n", i, debugstr_w(mime)); CoTaskMemFree(mime); }

1 0

Roderick Colenbrander : wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED .
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: d66ded939c4c21fbc3bd21e9e48a30a41303e9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66ded939c4c21fbc3bd21e9e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 21:42:09 2009 +0200 wgl: Set PFD_GENERIC_FORMAT on bitmap formats instead of PFD_GENERIC_ACCELERATED. --- dlls/winex11.drv/opengl.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 3d7c456..b15b4e2 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -939,7 +939,7 @@ static WineGLPixelFormat *get_formats(Display *display, int *size_ret, int *onsc list[size].fmt_id = fmt_id; list[size].render_type = get_render_type_from_fbconfig(display, cfgs[i]); list[size].offscreenOnly = FALSE; - list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_ACCELERATED; + list[size].dwFlags = PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI | PFD_GENERIC_FORMAT; size++; onscreen_size++; } @@ -1411,11 +1411,11 @@ int CDECL X11DRV_DescribePixelFormat(X11DRV_PDEVICE *physDev, ppfd->dwFlags |= fmt->dwFlags & (PFD_DRAW_TO_BITMAP | PFD_SUPPORT_GDI); /* PFD_GENERIC_FORMAT - gdi software rendering - * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (ICD or MCD) + * PFD_GENERIC_ACCELERATED - some parts are accelerated by a display driver (MCD e.g. 3dfx minigl) * none set - full hardware accelerated by a ICD * - * We only set PFD_GENERIC_ACCELERATED on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ - ppfd->dwFlags |= fmt->dwFlags & PFD_GENERIC_ACCELERATED; + * We only set PFD_GENERIC_FORMAT on bitmap formats (see get_formats) as that's what ATI and Nvidia Windows drivers do */ + ppfd->dwFlags |= fmt->dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED); pglXGetFBConfigAttrib(gdi_display, fmt->fbconfig, GLX_DOUBLEBUFFER, &value); if (value) {

1 0

Roderick Colenbrander : wgl: Add a test for WGL_ACCELERATION_ARB and the PFD_GENERIC_* flags.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 2bec5b14d2cc9f030d6ad2ab3bd92de8d91e2975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bec5b14d2cc9f030d6ad2ab3… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Tue May 19 21:16:58 2009 +0200 wgl: Add a test for WGL_ACCELERATION_ARB and the PFD_GENERIC_* flags. --- dlls/opengl32/tests/opengl.c | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 48a75f8..3078b79 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -51,6 +51,7 @@ static BOOL (WINAPI *pwglMakeContextCurrentARB)(HDC hdraw, HDC hread, HGLRC hglr static HDC (WINAPI *pwglGetCurrentReadDCARB)(); /* WGL_ARB_pixel_format */ +#define WGL_ACCELERATION_ARB 0x2003 #define WGL_COLOR_BITS_ARB 0x2014 #define WGL_RED_BITS_ARB 0x2015 #define WGL_GREEN_BITS_ARB 0x2017 @@ -58,6 +59,9 @@ static HDC (WINAPI *pwglGetCurrentReadDCARB)(); #define WGL_ALPHA_BITS_ARB 0x201B #define WGL_SUPPORT_GDI_ARB 0x200F #define WGL_DOUBLE_BUFFER_ARB 0x2011 +#define WGL_NO_ACCELERATION_ARB 0x2025 +#define WGL_GENERIC_ACCELERATION_ARB 0x2026 +#define WGL_FULL_ACCELERATION_ARB 0x2027 static BOOL (WINAPI *pwglChoosePixelFormatARB)(HDC, const int *, const FLOAT *, UINT, int *, UINT *); static BOOL (WINAPI *pwglGetPixelFormatAttribivARB)(HDC, int, int, UINT, const int *, int *); @@ -416,6 +420,49 @@ static void test_gdi_dbuf(HDC hdc) } } +static void test_acceleration(HDC hdc) +{ + const int iAttribList[] = { WGL_ACCELERATION_ARB }; + int iAttribRet[sizeof(iAttribList)/sizeof(iAttribList[0])]; + unsigned int nFormats; + int iPixelFormat; + int res; + PIXELFORMATDESCRIPTOR pfd; + + if (!pwglGetPixelFormatAttribivARB) + { + win_skip("wglGetPixelFormatAttribivARB is not available\n"); + return; + } + + nFormats = DescribePixelFormat(hdc, 0, 0, NULL); + for(iPixelFormat = 1; iPixelFormat <= nFormats; iPixelFormat++) + { + res = pwglGetPixelFormatAttribivARB(hdc, iPixelFormat, 0, + sizeof(iAttribList)/sizeof(iAttribList[0]), iAttribList, + iAttribRet); + ok(res!=FALSE, "wglGetPixelFormatAttribivARB failed for pixel format %d\n", iPixelFormat); + if(res == FALSE) + continue; + + memset(&pfd, 0, sizeof(PIXELFORMATDESCRIPTOR)); + DescribePixelFormat(hdc, iPixelFormat, sizeof(PIXELFORMATDESCRIPTOR), &pfd); + + switch(iAttribRet[0]) + { + case WGL_NO_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == PFD_GENERIC_FORMAT , "Expected only PFD_GENERIC_FORMAT to be set for WGL_NO_ACCELERATION_ARB!: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_GENERIC_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED), "Expected both PFD_GENERIC_FORMAT and PFD_GENERIC_ACCELERATION to be set for WGL_GENERIC_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + case WGL_FULL_ACCELERATION_ARB: + ok( (pfd.dwFlags & (PFD_GENERIC_FORMAT | PFD_GENERIC_ACCELERATED)) == 0, "Expected no PFD_GENERIC_FORMAT/_ACCELERATION to be set for WGL_FULL_ACCELERATION_ARB: iPixelFormat=%d, dwFlags=%x!\n", iPixelFormat, pfd.dwFlags); + break; + } + } +} + static void test_make_current_read(HDC hdc) { int res; @@ -657,6 +704,7 @@ START_TEST(opengl) test_sharelists(hdc); test_colorbits(hdc); test_gdi_dbuf(hdc); + test_acceleration(hdc); wgl_extensions = pwglGetExtensionsStringARB(hdc); if(wgl_extensions == NULL) skip("Skipping opengl32 tests because this OpenGL implementation doesn't support WGL extensions!\n");

1 0

Vincent Povirk : gdiplus: Implement GdipTransformPoints.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 2af29ed916ece18ff0e0fdab75f6ee8b9b88b80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af29ed916ece18ff0e0fdab7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 16:34:12 2009 -0500 gdiplus: Implement GdipTransformPoints. --- dlls/gdiplus/graphics.c | 60 +++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 94 +++++++++++++++++++++++++++++++++++++--- 2 files changed, 145 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5e5883f..4762669 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3592,15 +3592,71 @@ GpStatus WINGDIPAPI GdipGetClip(GpGraphics *graphics, GpRegion *region) GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPointF *points, INT count) { + GpMatrix *matrix; + GpStatus stat; + REAL unitscale; + if(!graphics || !points || count <= 0) return InvalidParameter; if(graphics->busy) return ObjectBusy; - FIXME("(%p, %d, %d, %p, %d): stub\n", graphics, dst_space, src_space, points, count); + TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); - return NotImplemented; + if (src_space == dst_space) return Ok; + + stat = GdipCreateMatrix(&matrix); + if (stat == Ok) + { + unitscale = convert_unit(graphics->hdc, graphics->unit); + + if(graphics->unit != UnitDisplay) + unitscale *= graphics->scale; + + /* transform from src_space to CoordinateSpacePage */ + switch (src_space) + { + case CoordinateSpaceWorld: + GdipMultiplyMatrix(matrix, graphics->worldtrans, MatrixOrderAppend); + break; + case CoordinateSpacePage: + break; + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, 1.0/unitscale, 1.0/unitscale, MatrixOrderAppend); + break; + } + + /* transform from CoordinateSpacePage to dst_space */ + switch (dst_space) + { + case CoordinateSpaceWorld: + { + GpMatrix *inverted_transform; + stat = GdipCloneMatrix(graphics->worldtrans, &inverted_transform); + if (stat == Ok) + { + stat = GdipInvertMatrix(inverted_transform); + if (stat == Ok) + GdipMultiplyMatrix(matrix, inverted_transform, MatrixOrderAppend); + GdipDeleteMatrix(inverted_transform); + } + break; + } + case CoordinateSpacePage: + break; + case CoordinateSpaceDevice: + GdipScaleMatrix(matrix, unitscale, unitscale, MatrixOrderAppend); + break; + } + + if (stat == Ok) + stat = GdipTransformMatrixPoints(matrix, points, count); + + GdipDeleteMatrix(matrix); + } + + return stat; } GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space, diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 7199151..510a148 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -22,8 +22,10 @@ #include "gdiplus.h" #include "wingdi.h" #include "wine/test.h" +#include <math.h> #define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) #define TABLE_LEN (23) static void test_constructor_destructor(void) @@ -767,17 +769,11 @@ static void test_transformpoints(void) GpStatus status; GpGraphics *graphics = NULL; HDC hdc = GetDC(0); - GpPointF ptf[5]; - INT i; + GpPointF ptf[2]; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); - for(i = 0; i < 5; i++){ - ptf[i].X = 200.0 + i * 50.0 * (i % 2); - ptf[i].Y = 200.0 + i * 50.0 * !(i % 2); - } - /* NULL arguments */ status = GdipTransformPoints(NULL, CoordinateSpacePage, CoordinateSpaceWorld, NULL, 0); expect(InvalidParameter, status); @@ -788,6 +784,90 @@ static void test_transformpoints(void) status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, -1); expect(InvalidParameter, status); + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + status = GdipTranslateWorldTransform(graphics, 5.0, 5.0, MatrixOrderAppend); + expect(Ok, status); + status = GdipSetPageUnit(graphics, UnitPixel); + expect(Ok, status); + status = GdipSetPageScale(graphics, 3.0); + expect(Ok, status); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(18.0, ptf[0].X); + expectf(15.0, ptf[0].Y); + expectf(15.0, ptf[1].X); + expectf(18.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceWorld, ptf, 2); + expect(Ok, status); + expectf(6.0, ptf[0].X); + expectf(5.0, ptf[0].Y); + expectf(5.0, ptf[1].X); + expectf(6.0, ptf[1].Y); + + ptf[0].X = 1.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 1.0; + status = GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(3.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(3.0, ptf[1].Y); + + ptf[0].X = 18.0; + ptf[0].Y = 15.0; + ptf[1].X = 15.0; + ptf[1].Y = 18.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 6.0; + ptf[0].Y = 5.0; + ptf[1].X = 5.0; + ptf[1].Y = 6.0; + status = GdipTransformPoints(graphics, CoordinateSpaceWorld, CoordinateSpacePage, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + + ptf[0].X = 3.0; + ptf[0].Y = 0.0; + ptf[1].X = 0.0; + ptf[1].Y = 3.0; + status = GdipTransformPoints(graphics, CoordinateSpacePage, CoordinateSpaceDevice, ptf, 2); + expect(Ok, status); + expectf(1.0, ptf[0].X); + expectf(0.0, ptf[0].Y); + expectf(0.0, ptf[1].X); + expectf(1.0, ptf[1].Y); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); }

1 0

Vincent Povirk : gdiplus: Implement GdipTransformPointsI.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: c486e8147d7906217a71986b762dbe8de9e758df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c486e8147d7906217a71986b7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue May 19 15:40:43 2009 -0500 gdiplus: Implement GdipTransformPointsI. --- dlls/gdiplus/graphics.c | 29 +++++++++++++++++++++++++++-- dlls/gdiplus/tests/graphics.c | 12 ++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 4762669..78700ea 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3662,9 +3662,34 @@ GpStatus WINGDIPAPI GdipTransformPoints(GpGraphics *graphics, GpCoordinateSpace GpStatus WINGDIPAPI GdipTransformPointsI(GpGraphics *graphics, GpCoordinateSpace dst_space, GpCoordinateSpace src_space, GpPoint *points, INT count) { - FIXME("(%p, %d, %d, %p, %d): stub\n", graphics, dst_space, src_space, points, count); + GpPointF *pointsF; + GpStatus ret; + INT i; - return NotImplemented; + TRACE("(%p, %d, %d, %p, %d)\n", graphics, dst_space, src_space, points, count); + + if(count <= 0) + return InvalidParameter; + + pointsF = GdipAlloc(sizeof(GpPointF) * count); + if(!pointsF) + return OutOfMemory; + + for(i = 0; i < count; i++){ + pointsF[i].X = (REAL)points[i].X; + pointsF[i].Y = (REAL)points[i].Y; + } + + ret = GdipTransformPoints(graphics, dst_space, src_space, pointsF, count); + + if(ret == Ok) + for(i = 0; i < count; i++){ + points[i].X = roundr(pointsF[i].X); + points[i].Y = roundr(pointsF[i].Y); + } + GdipFree(pointsF); + + return ret; } HPALETTE WINGDIPAPI GdipCreateHalftonePalette(void) diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 510a148..61143c6 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -770,6 +770,7 @@ static void test_transformpoints(void) GpGraphics *graphics = NULL; HDC hdc = GetDC(0); GpPointF ptf[2]; + GpPoint pt[2]; status = GdipCreateFromHDC(hdc, &graphics); expect(Ok, status); @@ -868,6 +869,17 @@ static void test_transformpoints(void) expectf(0.0, ptf[1].X); expectf(1.0, ptf[1].Y); + pt[0].X = 1; + pt[0].Y = 0; + pt[1].X = 0; + pt[1].Y = 1; + status = GdipTransformPointsI(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 2); + expect(Ok, status); + expect(18, pt[0].X); + expect(15, pt[0].Y); + expect(15, pt[1].X); + expect(18, pt[1].Y); + GdipDeleteGraphics(graphics); ReleaseDC(0, hdc); }

1 0

Vincent Povirk : ole32: Process sent and DDE messages in CoWaitForMultipleHandles.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: b49d541cb5cac205670c9baefb0672bd92ae1a88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b49d541cb5cac205670c9baef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri May 15 13:35:25 2009 -0500 ole32: Process sent and DDE messages in CoWaitForMultipleHandles. --- dlls/ole32/compobj.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 4440d77..154c18d 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -56,6 +56,7 @@ #include "ole2.h" #include "ole2ver.h" #include "ctxtcall.h" +#include "dde.h" #include "compobj_private.h" @@ -3525,7 +3526,8 @@ static BOOL COM_PeekMessage(struct apartment *apt, MSG *msg) /* first try to retrieve messages for incoming COM calls to the apartment window */ return PeekMessageW(msg, apt->win, WM_USER, WM_APP - 1, PM_REMOVE|PM_NOYIELD) || /* next retrieve other messages necessary for the app to remain responsive */ - PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_POSTMESSAGE|PM_REMOVE|PM_NOYIELD); + PeekMessageW(msg, NULL, WM_DDE_FIRST, WM_DDE_LAST, PM_REMOVE|PM_NOYIELD) || + PeekMessageW(msg, NULL, 0, 0, PM_QS_PAINT|PM_QS_SENDMESSAGE|PM_REMOVE|PM_NOYIELD); } /***********************************************************************

1 0

Michael Stefaniuc : msctf: Use FAILED instead of !SUCCEDED.
by Alexandre Julliard 20 May '09

20 May '09

Module: wine Branch: master Commit: 2a11f2df4786a544b51fab700384d77778150bbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a11f2df4786a544b51fab700… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 19 23:46:30 2009 +0200 msctf: Use FAILED instead of !SUCCEDED. --- dlls/msctf/context.c | 2 +- dlls/msctf/inputprocessor.c | 2 +- dlls/msctf/tests/inputprocessor.c | 4 ++-- dlls/msctf/threadmgr.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 1f255c8..6a2bed6 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -430,7 +430,7 @@ static WINAPI HRESULT ContextSource_AdviseSink(ITfSource *iface, es = HeapAlloc(GetProcessHeap(),0,sizeof(ContextSink)); if (!es) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&es->interfaces.pITfTextEditSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&es->interfaces.pITfTextEditSink))) { HeapFree(GetProcessHeap(),0,es); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 90daa2f..a904a68 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -615,7 +615,7 @@ static WINAPI HRESULT IPPSource_AdviseSink(ITfSource *iface, ipps = HeapAlloc(GetProcessHeap(),0,sizeof(InputProcessorProfilesSink)); if (!ipps) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&ipps->interfaces.pITfLanguageProfileNotifySink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&ipps->interfaces.pITfLanguageProfileNotifySink))) { HeapFree(GetProcessHeap(),0,ipps); return CONNECT_E_CANNOTCONNECT; diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 318149b..11e7233 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1186,7 +1186,7 @@ static void test_startSession(void) cnt = check_context_refcount(cxt3); hr = ITfDocumentMgr_Push(g_dm, cxt3); - ok(!SUCCEEDED(hr),"Push Succeeded\n"); + ok(FAILED(hr),"Push Succeeded\n"); ok(check_context_refcount(cxt3) == cnt, "Ref changed\n"); cnt = check_context_refcount(cxt2); @@ -1221,7 +1221,7 @@ static void test_startSession(void) ITfContext_Release(cxtTest); hr = ITfDocumentMgr_Pop(g_dm, 0); - ok(!SUCCEEDED(hr),"Pop Succeeded\n"); + ok(FAILED(hr),"Pop Succeeded\n"); hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index c91e536..9b887f0 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -442,7 +442,7 @@ static WINAPI HRESULT ThreadMgrSource_AdviseSink(ITfSource *iface, tms = HeapAlloc(GetProcessHeap(),0,sizeof(ThreadMgrSink)); if (!tms) return E_OUTOFMEMORY; - if (!SUCCEEDED(IUnknown_QueryInterface(punk, riid, (LPVOID*)&tms->interfaces.pITfThreadMgrEventSink))) + if (FAILED(IUnknown_QueryInterface(punk, riid, (LPVOID *)&tms->interfaces.pITfThreadMgrEventSink))) { HeapFree(GetProcessHeap(),0,tms); return CONNECT_E_CANNOTCONNECT;

1 0