March 2015 - Wine-Commits - list.winehq.org

Andrew Eikum : shell32: Allow registering knownfolders without relative paths.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: cdf6aecc22312ae1e750f1618d293c6e18256da8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf6aecc22312ae1e750f1618… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Mar 17 10:03:17 2015 -0500 shell32: Allow registering knownfolders without relative paths. --- dlls/shell32/shellpath.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c index 56ead5f..b9d9421 100644 --- a/dlls/shell32/shellpath.c +++ b/dlls/shell32/shellpath.c @@ -3946,11 +3946,8 @@ static HRESULT WINAPI foldermanager_RegisterFolder( hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szParentFolder, 0, REG_SZ, (LPBYTE)sParentGuid, sizeof(sParentGuid))); } - if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL) + if(SUCCEEDED(hr) && pKFD->category != KF_CATEGORY_VIRTUAL && pKFD->pszRelativePath) { - if(!pKFD->pszRelativePath) - hr = E_INVALIDARG; - if(SUCCEEDED(hr)) hr = HRESULT_FROM_WIN32(RegSetValueExW(hKey, szRelativePath, 0, REG_SZ, (LPBYTE)pKFD->pszRelativePath, (lstrlenW(pKFD->pszRelativePath)+1)*sizeof(WCHAR) )); }

1 0

Nikolay Sivov : dwrite/tests: Another test for cluster metrics and inline objects.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: b58528fa495809c6c24dbef74b366359eff39d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b58528fa495809c6c24dbef74… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 16 10:22:21 2015 +0300 dwrite/tests: Another test for cluster metrics and inline objects. --- dlls/dwrite/tests/layout.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 5b15c37..bbfc7bc 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -992,6 +992,8 @@ static void test_typography(void) static void test_GetClusterMetrics(void) { static const WCHAR strW[] = {'a','b','c','d',0}; + DWRITE_INLINE_OBJECT_METRICS inline_metrics; + DWRITE_CLUSTER_METRICS metrics; IDWriteInlineObject *trimm; IDWriteTextFormat *format; IDWriteTextLayout *layout; @@ -1029,6 +1031,20 @@ static void test_GetClusterMetrics(void) todo_wine ok(count == 3, "got %u\n", count); + count = 0; + memset(&metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetClusterMetrics(layout, &metrics, 1, &count); + ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); +todo_wine + ok(count == 3, "got %u\n", count); + ok(metrics.length == 2, "got %u\n", metrics.length); + + hr = IDWriteInlineObject_GetMetrics(trimm, &inline_metrics); +todo_wine { + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(inline_metrics.width == metrics.width, "got %.2f, expected %.2f\n", inline_metrics.width, + metrics.width); +} IDWriteInlineObject_Release(trimm); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Vincent Povirk : gdiplus: Do not access Bitmap bits when drawing transparent pixels.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: 08c1e6cd96064a2025f62dbc046b888b63b73b62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=08c1e6cd96064a2025f62dbc0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 17 16:09:56 2015 -0500 gdiplus: Do not access Bitmap bits when drawing transparent pixels. --- dlls/gdiplus/graphics.c | 6 +++++- dlls/gdiplus/tests/graphics.c | 21 +++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 68a4ee5..4ed25c9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -365,8 +365,12 @@ static GpStatus alpha_blend_bmp_pixels(GpGraphics *graphics, INT dst_x, INT dst_ for (y=0; y<src_height; y++) { ARGB dst_color, src_color; - GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); src_color = ((ARGB*)(src + src_stride * y))[x]; + + if (!(src_color & 0xff000000)) + continue; + + GdipBitmapGetPixel(dst_bitmap, x+dst_x, y+dst_y, &dst_color); GdipBitmapSetPixel(dst_bitmap, x+dst_x, y+dst_y, color_over(dst_color, src_color)); } } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index fd4cf80..e0bd615 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2417,6 +2417,27 @@ static void test_fromMemoryBitmap(void) GdipDeleteGraphics(graphics); GdipDisposeImage((GpImage*)bitmap); + + /* If we don't draw to the HDC, the bits are never accessed */ + status = GdipCreateBitmapFromScan0(4, 4, 12, PixelFormat24bppRGB, (BYTE*)1, &bitmap); + expect(Ok, status); + + status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); + expect(Ok, status); + + status = GdipGetDC(graphics, &hdc); + expect(Ok, status); + ok(hdc != NULL, "got NULL hdc\n"); + + color = GetPixel(hdc, 0, 0); + todo_wine expect(0x0c0b0d, color); + + status = GdipReleaseDC(graphics, hdc); + expect(Ok, status); + + GdipDeleteGraphics(graphics); + + GdipDisposeImage((GpImage*)bitmap); } static void test_GdipIsVisiblePoint(void)

1 0

Francois Gouget : printui: Remove an unneeded NONAMELESSUNION directive.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: a186ded57f7dce7137ed72e4ee6dff6beea42ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a186ded57f7dce7137ed72e4e… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:02 2015 +0100 printui: Remove an unneeded NONAMELESSUNION directive. --- dlls/printui/printui.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/printui/printui.c b/dlls/printui/printui.c index c6e610d..32e7b52 100644 --- a/dlls/printui/printui.c +++ b/dlls/printui/printui.c @@ -21,7 +21,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION #include "windef.h" #include "winbase.h"

1 0

Francois Gouget : oledlg: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 18, 2015

March 18, 2015

Module: wine Branch: master Commit: b8521dbccd1f9afcee7c8b9e18c99ffb231311a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8521dbccd1f9afcee7c8b9e1… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 08:19:10 2015 +0100 oledlg: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/oledlg/pastespl.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/oledlg/pastespl.c b/dlls/oledlg/pastespl.c index 4d31488..530c4ed 100644 --- a/dlls/oledlg/pastespl.c +++ b/dlls/oledlg/pastespl.c @@ -19,7 +19,6 @@ */ #define COBJMACROS -#define NONAMELESSSTRUCT #define NONAMELESSUNION #include <stdarg.h>

1 0

Huw Davies : riched20: Don' t resend a partial chunk to the edit stream callback.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 2a5886974d80d2c64f12d8b7816d23a6f0a702e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a5886974d80d2c64f12d8b78… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 17 09:39:38 2015 +0000 riched20: Don't resend a partial chunk to the edit stream callback. It's basically used as a boolean to terminate the writing process if it's set to zero. --- dlls/riched20/tests/editor.c | 31 +++++++++++++++++++++++++++++++ dlls/riched20/writer.c | 23 ++++++----------------- 2 files changed, 37 insertions(+), 17 deletions(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 101aec0..b15f16f 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3404,6 +3404,24 @@ static void test_WM_SETTEXT(void) #undef TEST_SETTEXTW } +/* Set *pcb to one to show that the remaining cb-1 bytes are not + resent to the callkack. */ +static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, + LPBYTE pbBuff, + LONG cb, + LONG *pcb) +{ + char** str = (char**)dwCookie; + ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + *pcb = 0; + if (cb > 0) { + memcpy(*str, pbBuff, cb); + *str += cb; + *pcb = 1; + } + return 0; +} + static void test_EM_STREAMOUT(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -3452,6 +3470,19 @@ static void test_EM_STREAMOUT(void) ok(strcmp(buf, TestItem3) == 0, "streamed text different, got %s\n", buf); + /* Use a callback that sets *pcb to one */ + p = buf; + es.dwCookie = (DWORD_PTR)&p; + es.dwError = 0; + es.pfnCallback = test_esCallback_written_1; + memset(buf, 0, sizeof(buf)); + SendMessageA(hwndRichEdit, EM_STREAMOUT, SF_TEXT, (LPARAM)&es); + r = strlen(buf); + ok(r == 14, "streamed text length is %d, expecting 14\n", r); + ok(strcmp(buf, TestItem3) == 0, + "streamed text different, got %s\n", buf); + + DestroyWindow(hwndRichEdit); } diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ea797fd..26a64a7 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -49,29 +49,18 @@ ME_StreamOutInit(ME_TextEditor *editor, EDITSTREAM *stream) static BOOL ME_StreamOutFlush(ME_OutStream *pStream) { - LONG nStart = 0; LONG nWritten = 0; - LONG nRemaining = 0; EDITSTREAM *stream = pStream->stream; - while (nStart < pStream->pos) { - TRACE("sending %u bytes\n", pStream->pos - nStart); - /* Some apps seem not to set *pcb unless a problem arises, relying - on initial random nWritten value, which is usually >STREAMOUT_BUFFER_SIZE */ - nRemaining = pStream->pos - nStart; - nWritten = 0xDEADBEEF; - stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer + nStart, - pStream->pos - nStart, &nWritten); + if (pStream->pos) { + TRACE("sending %u bytes\n", pStream->pos); + nWritten = pStream->pos; + stream->dwError = stream->pfnCallback(stream->dwCookie, (LPBYTE)pStream->buffer, + pStream->pos, &nWritten); TRACE("error=%u written=%u\n", stream->dwError, nWritten); - if (nWritten > (pStream->pos - nStart) || nWritten<0) { - FIXME("Invalid returned written size *pcb: 0x%x (%d) instead of %d\n", - (unsigned)nWritten, nWritten, nRemaining); - nWritten = nRemaining; - } if (nWritten == 0 || stream->dwError) return FALSE; - pStream->written += nWritten; - nStart += nWritten; + /* Don't resend partial chunks if nWritten < pStream->pos */ } pStream->pos = 0; return TRUE;

1 0

Aaryaman Vasishta : d3drm/tests: Add tests for querying between IDirect3DRM interfaces.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: cb1e856612381ed86d819ac91cd3001d1697b85b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb1e856612381ed86d819ac91… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 15 17:51:51 2015 +0530 d3drm/tests: Add tests for querying between IDirect3DRM interfaces. --- dlls/d3drm/tests/Makefile.in | 2 +- dlls/d3drm/tests/d3drm.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 1 deletion(-) diff --git a/dlls/d3drm/tests/Makefile.in b/dlls/d3drm/tests/Makefile.in index 7035bc6..dc6e8d1 100644 --- a/dlls/d3drm/tests/Makefile.in +++ b/dlls/d3drm/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = d3drm.dll -IMPORTS = dxguid ddraw user32 +IMPORTS = dxguid ddraw user32 uuid C_SRCS = \ d3drm.c \ diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index ee01b91..f9925ae 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -1,6 +1,7 @@ /* * Copyright 2010, 2012 Christian Costa * Copyright 2012 André Hentschel + * Copyright 2011-2014 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1726,6 +1727,83 @@ static void test_frame_mesh_materials(void) IDirect3DRM_Release(d3drm); } +struct qi_test +{ + REFIID iid; + REFIID refcount_iid; + HRESULT hr; + BOOL refcount_todo; +}; + +static void test_qi(const char *test_name, IUnknown *base_iface, + REFIID refcount_iid, const struct qi_test *tests, UINT entry_count) +{ + ULONG refcount, expected_refcount; + IUnknown *iface1, *iface2; + HRESULT hr; + UINT i, j; + + for (i = 0; i < entry_count; ++i) + { + hr = IUnknown_QueryInterface(base_iface, tests[i].iid, (void **)&iface1); + ok(hr == tests[i].hr, "Got hr %#x for test \"%s\" %u.\n", hr, test_name, i); + if (SUCCEEDED(hr)) + { + for (j = 0; j < entry_count; ++j) + { + hr = IUnknown_QueryInterface(iface1, tests[j].iid, (void **)&iface2); + ok(hr == tests[j].hr, "Got hr %#x for test \"%s\" %u, %u.\n", hr, test_name, i, j); + if (SUCCEEDED(hr)) + { + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + if (IsEqualGUID(tests[i].refcount_iid, tests[j].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface2); + if (tests[i].refcount_todo || tests[j].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, %u, expected %u.\n", + refcount, test_name, i, j, expected_refcount); + } + } + + expected_refcount = 0; + if (IsEqualGUID(refcount_iid, tests[i].refcount_iid)) + ++expected_refcount; + refcount = IUnknown_Release(iface1); + if (tests[i].refcount_todo) + todo_wine ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + else + ok(refcount == expected_refcount, "Got refcount %u for test \"%s\" %u, expected %u.\n", + refcount, test_name, i, expected_refcount); + } + } +} + +static void test_d3drm_qi(void) +{ + static const struct qi_test tests[] = + { + { &IID_IDirect3DRM3, &IID_IDirect3DRM3, S_OK, TRUE }, + { &IID_IDirect3DRM2, &IID_IDirect3DRM2, S_OK, TRUE }, + { &IID_IDirect3DRM, &IID_IDirect3DRM, S_OK, FALSE }, + { &IID_IUnknown, &IID_IDirect3DRM, S_OK, FALSE }, + }; + HRESULT hr; + IDirect3DRM *d3drm; + + hr = pDirect3DRMCreate(&d3drm); + ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); + + test_qi("d3drm_qi", (IUnknown *)d3drm, &IID_IDirect3DRM, tests, sizeof(tests) / sizeof(*tests)); + + IDirect3DRM_Release(d3drm); +} + START_TEST(d3drm) { if (!InitFunctionPtrs()) @@ -1744,6 +1822,7 @@ START_TEST(d3drm) test_frame_transform(); test_d3drm_load(); test_frame_mesh_materials(); + test_d3drm_qi(); FreeLibrary(d3drm_handle); }

1 0

Alexandre Julliard : msvcp60: Share locale functions implementation with msvcp90.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 1d965de1bcf2a7958041f2791fcf293b6d39a752 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d965de1bcf2a7958041f2791… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 17 14:23:38 2015 +0900 msvcp60: Share locale functions implementation with msvcp90. --- dlls/msvcp60/Makefile.in | 1 - dlls/msvcp60/locale.c | 8858 --------------------------------------------- dlls/msvcp60/main.c | 2 + dlls/msvcp60/msvcp60.spec | 78 +- dlls/msvcp90/locale.c | 306 +- 5 files changed, 307 insertions(+), 8938 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1d965de1bcf2a7958041f…

1 0

Nikolay Sivov : dwrite: Allow to query for IDWriteTextFormat1 from layout.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: c2c30013870711fdbc9b6aab0997766d9cb14f83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c30013870711fdbc9b6aab0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 15 02:38:32 2015 +0300 dwrite: Allow to query for IDWriteTextFormat1 from layout. --- dlls/dwrite/layout.c | 429 ++++++++++++++++++++++++++++++++++++++------- dlls/dwrite/tests/layout.c | 30 +++- 2 files changed, 392 insertions(+), 67 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c2c30013870711fdbc9b6…

1 0

Francois Gouget : oledb32: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 17, 2015

March 17, 2015

Module: wine Branch: master Commit: 11f1a21e9f63fd399f29091afcd439ef9d1264e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f1a21e9f63fd399f29091af… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Mar 16 19:08:29 2015 +0100 oledb32: Remove unneeded NONAMELESSXXX directives. --- dlls/oledb32/convert.c | 2 -- dlls/oledb32/datainit.c | 2 -- dlls/oledb32/main.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 36448d3..11d153c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/datainit.c b/dlls/oledb32/datainit.c index dfafeb1..3cd3821 100644 --- a/dlls/oledb32/datainit.c +++ b/dlls/oledb32/datainit.c @@ -18,8 +18,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h" diff --git a/dlls/oledb32/main.c b/dlls/oledb32/main.c index 48aa5a3..f28e57a 100644 --- a/dlls/oledb32/main.c +++ b/dlls/oledb32/main.c @@ -20,8 +20,6 @@ #include <stdarg.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include "windef.h" #include "winbase.h"

1 0