June 2015 - Wine-commits - list.winehq.org

Huw Davies : shell32/tests: Don't leave behind open explorer windows.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: da5151fd54c2679b9cd10a7a4d2933f727266bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da5151fd54c2679b9cd10a7a4… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Jun 23 13:40:30 2015 +0100 shell32/tests: Don't leave behind open explorer windows. --- dlls/shell32/tests/progman_dde.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/shell32/tests/progman_dde.c b/dlls/shell32/tests/progman_dde.c index 5b22387..a3faa83 100644 --- a/dlls/shell32/tests/progman_dde.c +++ b/dlls/shell32/tests/progman_dde.c @@ -363,7 +363,7 @@ static void DdeExecuteCommand(DWORD instance, HCONV hConv, const char *strCmd, H * window creation happened were not encouraging (not including * SetWindowsHookEx). */ -static void CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) +static HWND CheckWindowCreated(const char *winName, BOOL closeWindow, int testParams) { HWND window = NULL; int i; @@ -381,7 +381,9 @@ static void CheckWindowCreated(const char *winName, BOOL closeWindow, int testPa if (window != NULL && closeWindow) { SendMessageA(window, WM_SYSCOMMAND, SC_CLOSE, 0); + window = NULL; } + return window; } /* Check for Existence (or non-existence) of a file or group @@ -468,11 +470,12 @@ static void CreateGroupTest(DWORD instance, HCONV hConv, const char *command, UI * if expected_result is DMLERR_NO_ERROR, test * 1. window is open */ -static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, +static HWND ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, const char *groupName, const char *windowTitle, BOOL closeAfterShowing, int testParams) { HDDEDATA hData; UINT error; + HWND hwnd = 0; DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); /* todo_wine... Is expected to fail, wine stubbed functions DO fail */ @@ -494,8 +497,9 @@ static void ShowGroupTest(DWORD instance, HCONV hConv, const char *command, UINT if (error == DMLERR_NO_ERROR) { /* Check if Window is Open (polling) */ - CheckWindowCreated(windowTitle, closeAfterShowing, testParams); + hwnd = CheckWindowCreated(windowTitle, closeAfterShowing, testParams); } + return hwnd; } /* Delete Group Test. @@ -582,12 +586,13 @@ static void DeleteItemTest(DWORD instance, HCONV hConv, const char *command, UIN * All samples I've seen using Compound were of this form (CreateGroup, * AddItems) so this covers minimum expected functionality. */ -static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, +static HWND CompoundCommandTest(DWORD instance, HCONV hConv, const char *command, UINT expected_result, const char *groupName, const char *windowTitle, const char *fileName1, const char *fileName2, int testParams) { HDDEDATA hData; UINT error; + HWND hwnd = 0; DdeExecuteCommand(instance, hConv, command, &hData, &error, testParams); todo_wine @@ -601,10 +606,11 @@ static void CompoundCommandTest(DWORD instance, HCONV hConv, const char *command { /* Check that File exists */ CheckFileExistsInProgramGroups(groupName, TRUE, TRUE, NULL, testParams); - CheckWindowCreated(windowTitle, FALSE, testParams); + hwnd = CheckWindowCreated(windowTitle, FALSE, testParams); CheckFileExistsInProgramGroups(fileName1, TRUE, FALSE, groupName, testParams); CheckFileExistsInProgramGroups(fileName2, TRUE, FALSE, groupName, testParams); } + return hwnd; } static void CreateAddItemText(char *itemtext, const char *cmdline, const char *name) @@ -626,6 +632,7 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) char f1g1[MAX_PATH], f2g1[MAX_PATH], f3g1[MAX_PATH], f1g3[MAX_PATH], f2g3[MAX_PATH]; char itemtext[MAX_PATH + 20]; char comptext[2 * (MAX_PATH + 20) + 21]; + HWND hwnd; testnum = 1; /* Invalid Command */ @@ -658,10 +665,11 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) ShowGroupTest(instance, hConv, "[ShowGroup(Group1)]", DMLERR_NOTPROCESSED, "Group1", Group1Title, TRUE, DDE_TEST_SHOWGROUP|testnum++); DeleteItemTest(instance, hConv, "[DeleteItem(f3g1Name)]", DMLERR_NO_ERROR, "f3g1Name.lnk", "Group1", DDE_TEST_DELETEITEM|testnum++); ShowGroupTest(instance, hConv, "[ShowGroup(Startup,0)]", DMLERR_NO_ERROR, "Startup", StartupTitle, TRUE, DDE_TEST_SHOWGROUP|testnum++); - ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); + hwnd = ShowGroupTest(instance, hConv, "[ShowGroup(Group1,0)]", DMLERR_NO_ERROR, "Group1", Group1Title, FALSE, DDE_TEST_SHOWGROUP|testnum++); /* DeleteGroup Test - Note that Window is Open for this test */ DeleteGroupTest(instance, hConv, "[DeleteGroup(Group1)]", DMLERR_NO_ERROR, "Group1", DDE_TEST_DELETEGROUP|testnum++); + if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); /* Compound Execute String Command */ lstrcpyA(comptext, "[CreateGroup(Group3)]"); @@ -669,9 +677,10 @@ static int DdeTestProgman(DWORD instance, HCONV hConv) lstrcatA(comptext, itemtext); CreateAddItemText(itemtext, f2g3, "f2g3Name"); lstrcatA(comptext, itemtext); - CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); + hwnd = CompoundCommandTest(instance, hConv, comptext, DMLERR_NO_ERROR, "Group3", Group3Title, "f1g3Name.lnk", "f2g3Name.lnk", DDE_TEST_COMPOUND|testnum++); DeleteGroupTest(instance, hConv, "[DeleteGroup(Group3)]", DMLERR_NO_ERROR, "Group3", DDE_TEST_DELETEGROUP|testnum++); + if (hwnd) SendMessageA(hwnd, WM_SYSCOMMAND, SC_CLOSE, 0); /* Full Parameters of Add Item */ /* AddItem(CmdLine[,Name[,IconPath[,IconIndex[,xPos,yPos[,DefDir[,HotKey[,fMinimize[fSeparateSpace]]]]]]]) */

1 0

Huw Davies : Revert "advapi32: Fix RegEnumValueW when enumerating long values.".
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 645a31474ccff7923a254aa71f862818a8cde9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=645a31474ccff7923a254aa71… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jun 22 21:23:54 2015 +0100 Revert "advapi32: Fix RegEnumValueW when enumerating long values.". This reverts commit 443ef6e7a6026f6aaa5ffcfcbc33d582da780ac5. The tests fail on all versions of Windows. --- dlls/advapi32/registry.c | 68 +++++++++++++++++++++++------------------- dlls/advapi32/tests/registry.c | 13 -------- 2 files changed, 37 insertions(+), 44 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index f8bf21a..30130b1 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -1922,47 +1922,53 @@ LSTATUS WINAPI RegEnumValueW( HKEY hkey, DWORD index, LPWSTR value, LPDWORD val_ status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, buffer, total_size, &total_size ); + if (status && status != STATUS_BUFFER_OVERFLOW) goto done; - /* retry with a dynamically allocated buffer */ - while (status == STATUS_BUFFER_OVERFLOW) - { - if (buf_ptr != buffer) heap_free( buf_ptr ); - if (!(buf_ptr = heap_alloc( total_size ))) return ERROR_NOT_ENOUGH_MEMORY; - info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; - status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, - buf_ptr, total_size, &total_size ); - } - - if (status) goto done; - - if (value) + if (value || data) { - if (info->NameLength/sizeof(WCHAR) >= *val_count) + /* retry with a dynamically allocated buffer */ + while (status == STATUS_BUFFER_OVERFLOW) { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; + if (buf_ptr != buffer) heap_free( buf_ptr ); + if (!(buf_ptr = heap_alloc( total_size ))) + return ERROR_NOT_ENOUGH_MEMORY; + info = (KEY_VALUE_FULL_INFORMATION *)buf_ptr; + status = NtEnumerateValueKey( hkey, index, KeyValueFullInformation, + buf_ptr, total_size, &total_size ); } - memcpy( value, info->Name, info->NameLength ); - *val_count = info->NameLength / sizeof(WCHAR); - value[*val_count] = 0; - } - if (data) - { - if (total_size - info->DataOffset > *count) + if (status) goto done; + + if (value) { - status = STATUS_BUFFER_OVERFLOW; - goto overflow; + if (info->NameLength/sizeof(WCHAR) >= *val_count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( value, info->Name, info->NameLength ); + *val_count = info->NameLength / sizeof(WCHAR); + value[*val_count] = 0; } - memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); - if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + + if (data) { - /* if the type is REG_SZ and data is not 0-terminated - * and there is enough space in the buffer NT appends a \0 */ - WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); - if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + if (total_size - info->DataOffset > *count) + { + status = STATUS_BUFFER_OVERFLOW; + goto overflow; + } + memcpy( data, buf_ptr + info->DataOffset, total_size - info->DataOffset ); + if (total_size - info->DataOffset <= *count-sizeof(WCHAR) && is_string(info->Type)) + { + /* if the type is REG_SZ and data is not 0-terminated + * and there is enough space in the buffer NT appends a \0 */ + WCHAR *ptr = (WCHAR *)(data + total_size - info->DataOffset); + if (ptr > (WCHAR *)data && ptr[-1]) *ptr = 0; + } } } + else status = STATUS_SUCCESS; overflow: if (type) *type = info->Type; diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 561101b..c801384 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -522,8 +522,6 @@ static void test_enum_value(void) static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; static const WCHAR testW[] = {'T','e','s','t',0}; static const WCHAR xxxW[] = {'x','x','x','x','x','x','x','x',0}; - WCHAR longW[128]; - int i; /* create the working key for new 'Test' value */ res = RegCreateKeyA( hkey_main, "TestKey", &test_key ); @@ -712,17 +710,6 @@ static void test_enum_value(void) ok( !memcmp( valueW, testW, sizeof(testW) ), "value is not 'Test'\n" ); ok( !memcmp( dataW, foobarW, sizeof(foobarW) ), "data is not 'foobar'\n" ); - /* tests the overflow case for the fixed "char buffer[]" in RegEnumValueW */ - for (i = 0; i < sizeof(longW)/sizeof(WCHAR); i++) longW[i] = 'x'; - longW[i - 1] = 0; - res = RegSetValueExW( test_key, testW, 0, REG_SZ, (const BYTE *)longW, sizeof(longW) ); - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); - data_count = 20; - type = 1234; - res = RegEnumValueW( test_key, 0, NULL, NULL, NULL, &type, NULL, &data_count); - ok( res == ERROR_SUCCESS, "expected ERROR_SUCCESS, got %d\n", res ); - ok( data_count == sizeof(longW), "data_count set to %d\n", data_count ); - cleanup: RegDeleteKeyA(test_key, ""); RegCloseKey(test_key);

1 0

Nikolay Sivov : quartz/tests: Get rid of some casts.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 9c9f8c0bb99efde296eb647b27524cb0796698b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c9f8c0bb99efde296eb647b2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 10:43:00 2015 +0300 quartz/tests: Get rid of some casts. --- dlls/quartz/tests/referenceclock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/quartz/tests/referenceclock.c b/dlls/quartz/tests/referenceclock.c index eb6fbda..4721675 100644 --- a/dlls/quartz/tests/referenceclock.c +++ b/dlls/quartz/tests/referenceclock.c @@ -28,21 +28,21 @@ static void test_IReferenceClock_query_interface(const char * clockdesc, IReferenceClock * pClock) { HRESULT hr; - void *pF; + IUnknown *pF; - hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IUnknown, (void**)&pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IUnknown_Release((IUnknown *)pF); + if (SUCCEEDED(hr)) IUnknown_Release(pF); - hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IDirectDraw, (void**)&pF); ok(hr == E_NOINTERFACE, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF == NULL, "pF is not NULL\n"); - hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, &pF); + hr = IReferenceClock_QueryInterface(pClock, &IID_IReferenceClock, (void**)&pF); ok(hr == S_OK, "IReferenceClock_QueryInterface returned %x\n", hr); ok(pF != NULL, "pF is NULL\n"); - if (SUCCEEDED(hr)) IReferenceClock_Release((IReferenceClock *)pF); + if (SUCCEEDED(hr)) IUnknown_Release(pF); } /* The following method expects a reference clock that will keep ticking for

1 0

Nikolay Sivov : dwrite: Set line baseline/height from font metrics.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 8adc6679e9750cfd0ddf5821585f1cdbfa64cbc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8adc6679e9750cfd0ddf58215… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 15:34:02 2015 +0300 dwrite: Set line baseline/height from font metrics. --- dlls/dwrite/layout.c | 61 ++++++++++++++++++++++++++++++++++++++++++---- dlls/dwrite/tests/layout.c | 3 +-- 2 files changed, 57 insertions(+), 7 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ebc6f37..ba31ec6 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -168,6 +168,8 @@ struct layout_run { struct inline_object_run object; struct regular_layout_run regular; } u; + FLOAT baseline; + FLOAT height; }; struct layout_effective_run { @@ -573,6 +575,11 @@ static inline UINT32 get_clipped_range_length(const struct dwrite_textlayout *la return layout->len - range->h.range.startPosition; } +static inline FLOAT get_scaled_font_metric(UINT32 metric, FLOAT emSize, const DWRITE_FONT_METRICS *metrics) +{ + return (FLOAT)metric * emSize / (FLOAT)metrics->designUnitsPerEm; +} + static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) { IDWriteTextAnalyzer *analyzer; @@ -639,6 +646,7 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) DWRITE_SHAPING_GLYPH_PROPERTIES *glyph_props = NULL; DWRITE_SHAPING_TEXT_PROPERTIES *text_props = NULL; struct regular_layout_run *run = &r->u.regular; + DWRITE_FONT_METRICS fontmetrics = { 0 }; IDWriteFontFamily *family; UINT32 index, max_count; IDWriteFont *font; @@ -669,6 +677,8 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) hr = S_OK; } metrics->width = inlinemetrics.width; + r->baseline = inlinemetrics.baseline; + r->height = inlinemetrics.height; /* FIXME: use resolved breakpoints in this case too */ @@ -778,6 +788,22 @@ static HRESULT layout_compute_runs(struct dwrite_textlayout *layout) run->run.glyphCount = 0; else run->run.glyphCount = run->glyphcount; + + /* baseline derived from font metrics */ + if (layout->gdicompatible) { + /* FIXME: check return value when it's actually implemented */ + IDWriteFontFace_GetGdiCompatibleMetrics(run->run.fontFace, + run->run.fontEmSize, + layout->pixels_per_dip, + &layout->transform, + &fontmetrics); + } + else + IDWriteFontFace_GetMetrics(run->run.fontFace, &fontmetrics); + + r->baseline = get_scaled_font_metric(fontmetrics.ascent, run->run.fontEmSize, &fontmetrics); + r->height = get_scaled_font_metric(fontmetrics.ascent + fontmetrics.descent, run->run.fontEmSize, &fontmetrics); + layout_set_cluster_metrics(layout, r, &cluster); continue; @@ -1059,11 +1085,15 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) layout->clustermetrics[i].isNewline || /* always wrap on new line */ i == layout->cluster_count - 1) /* end of the text */ { - UINT32 strlength, index = i; + UINT32 strlength, last_cluster = i, index; + FLOAT descent; - if (!overflow) + if (!overflow) { metrics.length += layout->clustermetrics[i].length; - strlength = metrics.length; + last_cluster = i; + } + else + last_cluster = i ? i - 1 : i; if (i >= start) { hr = layout_add_effective_run(layout, run, start, i - start + 1, origin_x, s[0]); @@ -1074,6 +1104,8 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* take a look at clusters we got for this line in reverse order to set trailing properties for current line */ + strlength = metrics.length; + index = last_cluster; while (strlength) { DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; @@ -1092,8 +1124,27 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) index--; } - metrics.height = 0.0; /* FIXME */ - metrics.baseline = 0.0; /* FIXME */ + /* look for max baseline and descent for this line */ + strlength = metrics.length; + index = last_cluster; + metrics.baseline = 0.0; + descent = 0.0; + while (strlength) { + DWRITE_CLUSTER_METRICS *cluster = &layout->clustermetrics[index]; + const struct layout_run *cur = layout->clusters[index].run; + FLOAT cur_descent = cur->height - cur->baseline; + + if (cur->baseline > metrics.baseline) + metrics.baseline = cur->baseline; + + if (cur_descent > descent) + descent = cur_descent; + + strlength -= cluster->length; + index--; + } + metrics.height = descent + metrics.baseline; + metrics.isTrimmed = width > layout->maxwidth; hr = layout_set_line_metrics(layout, &metrics, &line); if (FAILED(hr)) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 51e7f4a..505c2eb 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2767,12 +2767,11 @@ static void test_GetLineMetrics(void) ok(fontface != NULL, "got %p\n", fontface); IDWriteFontFace_GetMetrics(fontface, &fontmetrics); -todo_wine { ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, fontmetrics.ascent); ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", metrics.height, fontmetrics.ascent + fontmetrics.descent); -} + IDWriteFontFace_Release(fontface); IDWriteTextLayout_Release(layout); IDWriteTextFormat_Release(format);

1 0

Nikolay Sivov : dwrite/tests: Show that line baseline is relative to this line.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 88663caf7470ac16c9b392cc70dfae3921276815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88663caf7470ac16c9b392cc7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 21 22:43:01 2015 +0300 dwrite/tests: Show that line baseline is relative to this line. --- dlls/dwrite/tests/layout.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index 505c2eb..ecf4183 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -2730,8 +2730,9 @@ static IDWriteFontFace *get_fontface_from_format(IDWriteTextFormat *format) static void test_GetLineMetrics(void) { static const WCHAR strW[] = {'a','b','c','d',' ',0}; + static const WCHAR str2W[] = {'a','b','\r','c','d',0}; DWRITE_FONT_METRICS fontmetrics; - DWRITE_LINE_METRICS metrics; + DWRITE_LINE_METRICS metrics[2]; IDWriteTextFormat *format; IDWriteTextLayout *layout; IDWriteFontFace *fontface; @@ -2749,31 +2750,47 @@ static void test_GetLineMetrics(void) ok(hr == S_OK, "got 0x%08x\n", hr); count = 0; - hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 0, &count); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 0, &count); ok(hr == E_NOT_SUFFICIENT_BUFFER, "got 0x%08x\n", hr); ok(count == 1, "got count %u\n", count); - memset(&metrics, 0, sizeof(metrics)); - hr = IDWriteTextLayout_GetLineMetrics(layout, &metrics, 1, &count); + memset(metrics, 0, sizeof(metrics)); + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 1, &count); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(metrics.length == 5, "got %u\n", metrics.length); - ok(metrics.trailingWhitespaceLength == 1, "got %u\n", metrics.trailingWhitespaceLength); + ok(metrics[0].length == 5, "got %u\n", metrics[0].length); + ok(metrics[0].trailingWhitespaceLength == 1, "got %u\n", metrics[0].trailingWhitespaceLength); - ok(metrics.newlineLength == 0, "got %u\n", metrics.newlineLength); - ok(metrics.isTrimmed == FALSE, "got %d\n", metrics.isTrimmed); + ok(metrics[0].newlineLength == 0, "got %u\n", metrics[0].newlineLength); + ok(metrics[0].isTrimmed == FALSE, "got %d\n", metrics[0].isTrimmed); /* Tahoma doesn't provide BASE table, so baseline is calculated from font metrics */ fontface = get_fontface_from_format(format); ok(fontface != NULL, "got %p\n", fontface); IDWriteFontFace_GetMetrics(fontface, &fontmetrics); - ok(metrics.baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics.baseline, + ok(metrics[0].baseline == fontmetrics.ascent, "got %.2f, expected %d\n", metrics[0].baseline, fontmetrics.ascent); - ok(metrics.height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", - metrics.height, fontmetrics.ascent + fontmetrics.descent); + ok(metrics[0].height == fontmetrics.ascent + fontmetrics.descent, "got %.2f, expected %d\n", + metrics[0].height, fontmetrics.ascent + fontmetrics.descent); + IDWriteTextLayout_Release(layout); - IDWriteFontFace_Release(fontface); + /* force 2 lines */ + hr = IDWriteFactory_CreateTextLayout(factory, str2W, 5, format, 10000.0, 1000.0, &layout); + ok(hr == S_OK, "got 0x%08x\n", hr); + + memset(metrics, 0, sizeof(metrics)); + count = 2; + hr = IDWriteTextLayout_GetLineMetrics(layout, metrics, 2, &count); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine { + ok(count == 2, "got %u\n", count); + /* baseline is relative to a line, and is not accumulated */ + ok(metrics[0].baseline == metrics[1].baseline, "got %.2f, %.2f\n", metrics[0].baseline, + metrics[1].baseline); +} IDWriteTextLayout_Release(layout); + + IDWriteFontFace_Release(fontface); IDWriteTextFormat_Release(format); IDWriteFactory_Release(factory); }

1 0

Nikolay Sivov : dwrite: Set baseline origin Y for reported runs.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 643125e50f620137c30576a219d6e497f4d1a047 URL: http://source.winehq.org/git/wine.git/?a=commit;h=643125e50f620137c30576a21… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 11:56:25 2015 +0300 dwrite: Set baseline origin Y for reported runs. --- dlls/dwrite/layout.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 67 insertions(+), 6 deletions(-) diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c index ba31ec6..25e8eac 100644 --- a/dlls/dwrite/layout.c +++ b/dlls/dwrite/layout.c @@ -181,6 +181,7 @@ struct layout_effective_run { FLOAT origin_x; /* baseline X position */ FLOAT origin_y; /* baseline Y position */ UINT16 *clustermap; /* effective clustermap, allocated separately, is not reused from nominal map */ + UINT32 line; }; struct layout_effective_inline { @@ -191,6 +192,7 @@ struct layout_effective_inline { FLOAT origin_y; BOOL is_sideways; BOOL is_rtl; + UINT32 line; }; struct layout_strikethrough { @@ -906,7 +908,7 @@ static inline IUnknown *layout_get_effect_from_pos(struct dwrite_textlayout *lay /* Effective run is built from consecutive clusters of a single nominal run, 'first_cluster' is 0 based cluster index, 'cluster_count' indicates how many clusters to add, including first one. */ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const struct layout_run *r, UINT32 first_cluster, - UINT32 cluster_count, FLOAT origin_x, BOOL strikethrough) + UINT32 cluster_count, UINT32 line, FLOAT origin_x, BOOL strikethrough) { UINT32 i, start, length, last_cluster; struct layout_effective_run *run; @@ -926,6 +928,7 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const different ranges which differ in reading direction). */ inlineobject->is_sideways = FALSE; inlineobject->is_rtl = FALSE; + inlineobject->line = line; /* effect assigned from start position and on is used for inline objects */ inlineobject->effect = layout_get_effect_from_pos(layout, layout->clusters[first_cluster].position); @@ -954,7 +957,8 @@ static HRESULT layout_add_effective_run(struct dwrite_textlayout *layout, const run->start = start = layout->clusters[first_cluster].position; run->length = length; run->origin_x = origin_x; - run->origin_y = 0.0; /* FIXME: set after line is built */ + run->origin_y = 0.0; /* set after line is built */ + run->line = line; if (r->u.regular.run.glyphCount) { /* trim from the left */ @@ -1039,11 +1043,41 @@ static inline BOOL layout_get_strikethrough_from_pos(struct dwrite_textlayout *l return ((struct layout_range_bool*)h)->value; } +static inline struct layout_effective_run *layout_get_next_erun(struct dwrite_textlayout *layout, + const struct layout_effective_run *cur) +{ + struct list *e; + + if (!cur) + e = list_head(&layout->eruns); + else + e = list_next(&layout->eruns, &cur->entry); + if (!e) + return NULL; + return LIST_ENTRY(e, struct layout_effective_run, entry); +} + +static inline struct layout_effective_inline *layout_get_next_inline_run(struct dwrite_textlayout *layout, + const struct layout_effective_inline *cur) +{ + struct list *e; + + if (!cur) + e = list_head(&layout->inlineobjects); + else + e = list_next(&layout->inlineobjects, &cur->entry); + if (!e) + return NULL; + return LIST_ENTRY(e, struct layout_effective_inline, entry); +} + static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) { - DWRITE_LINE_METRICS metrics; + struct layout_effective_inline *inrun; + struct layout_effective_run *erun; const struct layout_run *run; - FLOAT width, origin_x; + DWRITE_LINE_METRICS metrics; + FLOAT width, origin_x, origin_y; UINT32 i, start, line, textpos; HRESULT hr; BOOL s[2]; @@ -1070,7 +1104,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) /* switched to next nominal run, at this point all previous pending clusters are already checked for layout line overflow, so new effective run will fit in current line */ if (run != layout->clusters[i].run || s[0] != s[1]) { - hr = layout_add_effective_run(layout, run, start, i - start, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, i - start, line, origin_x, s[0]); if (FAILED(hr)) return hr; origin_x += get_cluster_range_width(layout, start, i); @@ -1096,7 +1130,7 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) last_cluster = i ? i - 1 : i; if (i >= start) { - hr = layout_add_effective_run(layout, run, start, i - start + 1, origin_x, s[0]); + hr = layout_add_effective_run(layout, run, start, i - start + 1, line, origin_x, s[0]); if (FAILED(hr)) return hr; /* we don't need to update origin for next run as we're going to wrap */ @@ -1165,6 +1199,33 @@ static HRESULT layout_compute_effective_runs(struct dwrite_textlayout *layout) } layout->line_count = line; + + /* Now all line info is here, update effective runs positions in flow direction */ + erun = layout_get_next_erun(layout, NULL); + inrun = layout_get_next_inline_run(layout, NULL); + + origin_y = 0.0; + for (line = 0; line < layout->line_count; line++) { + + origin_y += layout->lines[line].baseline; + + /* For all runs on this line */ + while (erun && erun->line == line) { + erun->origin_y = origin_y; + erun = layout_get_next_erun(layout, erun); + if (!erun) + break; + } + + /* Same for inline runs */ + while (inrun && inrun->line == line) { + inrun->origin_y = origin_y; + inrun = layout_get_next_inline_run(layout, inrun); + if (!inrun) + break; + } + } + layout->recompute &= ~RECOMPUTE_EFFECTIVE_RUNS; return hr; }

1 0

Nikolay Sivov : dwrite: Call SetFillMode() once per run.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 69d5e351f97d448a7fd7cc52982d8c5a97fb24bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=69d5e351f97d448a7fd7cc529… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 17:58:40 2015 +0300 dwrite: Call SetFillMode() once per run. --- dlls/dwrite/font.c | 3 ++ dlls/dwrite/tests/font.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 8ffad31..2091867 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -523,6 +523,9 @@ static HRESULT WINAPI dwritefontface_GetGlyphRunOutline(IDWriteFontFace2 *iface, if (is_sideways) FIXME("sideways mode is not supported.\n"); + if (count) + ID2D1SimplifiedGeometrySink_SetFillMode(sink, D2D1_FILL_MODE_WINDING); + for (g = 0; g < count; g++) { FLOAT xoffset = 0.0, yoffset = 0.0; struct glyph_outline *outline; diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 846b4da..111762c 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -37,6 +37,35 @@ #define EXPECT_HR(hr,hr_exp) \ ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) +#define DEFINE_EXPECT(func) \ + static BOOL expect_ ## func = FALSE, called_ ## func = FALSE + +#define SET_EXPECT(func) \ + do { called_ ## func = FALSE; expect_ ## func = TRUE; } while(0) + +#define CHECK_EXPECT2(func) \ + do { \ + ok(expect_ ##func, "unexpected call " #func "\n"); \ + called_ ## func = TRUE; \ + }while(0) + +#define CHECK_EXPECT(func) \ + do { \ + CHECK_EXPECT2(func); \ + expect_ ## func = FALSE; \ + }while(0) + +#define CHECK_CALLED(func) \ + do { \ + ok(called_ ## func, "expected " #func "\n"); \ + expect_ ## func = called_ ## func = FALSE; \ + }while(0) + +#define CLEAR_CALLED(func) \ + expect_ ## func = called_ ## func = FALSE + +DEFINE_EXPECT(setfillmode); + #define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) static void _expect_ref(IUnknown* obj, ULONG ref, int line) { @@ -457,6 +486,7 @@ static ULONG WINAPI test_geometrysink_Release(ID2D1SimplifiedGeometrySink *iface static void WINAPI test_geometrysink_SetFillMode(ID2D1SimplifiedGeometrySink *iface, D2D1_FILL_MODE mode) { + CHECK_EXPECT(setfillmode); ok(mode == D2D1_FILL_MODE_WINDING, "fill mode %d\n", mode); } @@ -508,7 +538,44 @@ static const ID2D1SimplifiedGeometrySinkVtbl test_geometrysink_vtbl = { test_geometrysink_Close }; +static void WINAPI test_geometrysink2_BeginFigure(ID2D1SimplifiedGeometrySink *iface, + D2D1_POINT_2F startPoint, D2D1_FIGURE_BEGIN figureBegin) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_AddLines(ID2D1SimplifiedGeometrySink *iface, + const D2D1_POINT_2F *points, UINT32 count) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_AddBeziers(ID2D1SimplifiedGeometrySink *iface, + const D2D1_BEZIER_SEGMENT *beziers, UINT32 count) +{ + ok(0, "unexpected call\n"); +} + +static void WINAPI test_geometrysink2_EndFigure(ID2D1SimplifiedGeometrySink *iface, D2D1_FIGURE_END figureEnd) +{ + ok(0, "unexpected call\n"); +} + +static const ID2D1SimplifiedGeometrySinkVtbl test_geometrysink2_vtbl = { + test_geometrysink_QueryInterface, + test_geometrysink_AddRef, + test_geometrysink_Release, + test_geometrysink_SetFillMode, + test_geometrysink_SetSegmentFlags, + test_geometrysink2_BeginFigure, + test_geometrysink2_AddLines, + test_geometrysink2_AddBeziers, + test_geometrysink2_EndFigure, + test_geometrysink_Close +}; + static ID2D1SimplifiedGeometrySink test_geomsink = { &test_geometrysink_vtbl }; +static ID2D1SimplifiedGeometrySink test_geomsink2 = { &test_geometrysink2_vtbl }; static void test_CreateFontFromLOGFONT(void) { @@ -2991,6 +3058,7 @@ static void test_GetGlyphRunOutline(void) /* default advances, no offsets */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -2999,10 +3067,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 229.5 && g_startpoints[0].y == -629.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 729.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, no offsets, RTL */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 2, FALSE, TRUE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3011,10 +3081,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == -270.5 && g_startpoints[0].y == -629.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == -770.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, additional offsets */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, offsets, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3023,10 +3095,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 230.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 729.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* default advances, additional offsets, RTL */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, offsets, 2, FALSE, TRUE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3034,10 +3108,12 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == -271.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == -770.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); /* custom advances and offsets, offset turns total advance value to zero */ memset(g_startpoints, 0, sizeof(g_startpoints)); g_startpoint_count = 0; + SET_EXPECT(setfillmode); hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, advances, offsets, 2, FALSE, FALSE, &test_geomsink); ok(hr == S_OK, "got 0x%08x\n", hr); ok(g_startpoint_count == 2, "got %d\n", g_startpoint_count); @@ -3045,11 +3121,33 @@ static void test_GetGlyphRunOutline(void) ok(g_startpoints[0].x == 230.5 && g_startpoints[0].y == -630.0, "0: got (%.2f,%.2f)\n", g_startpoints[0].x, g_startpoints[0].y); ok(g_startpoints[1].x == 230.5 && g_startpoints[1].y == -629.0, "1: got (%.2f,%.2f)\n", g_startpoints[1].x, g_startpoints[1].y); } + CHECK_CALLED(setfillmode); - IDWriteFontFace_Release(face); - IDWriteFactory_Release(factory); + /* 0 glyph count */ + hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 0, FALSE, FALSE, &test_geomsink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + IDWriteFactory_Release(factory); + IDWriteFontFace_Release(face); DELETE_FONTFILE(path); + + /* space glyph */ + factory = create_factory(); + face = create_fontface(factory); + + codepoint = ' '; + glyphs[0] = 0; + hr = IDWriteFontFace_GetGlyphIndices(face, &codepoint, 1, glyphs); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(glyphs[0] > 0, "got %u\n", glyphs[0]); + + SET_EXPECT(setfillmode); + hr = IDWriteFontFace_GetGlyphRunOutline(face, 1024.0, glyphs, NULL, NULL, 1, FALSE, FALSE, &test_geomsink2); + ok(hr == S_OK, "got 0x%08x\n", hr); + CHECK_CALLED(setfillmode); + + IDWriteFactory_Release(factory); + IDWriteFontFace_Release(face); } static void test_GetEudcFontCollection(void)

1 0

Alex Henrie : user32: Send BM_SETCHECK before WM_CAPTURECHANGED and add tests.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: c68843f898da704432c391cab9e534323fec72ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=c68843f898da704432c391cab… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Jun 23 00:59:08 2015 -0600 user32: Send BM_SETCHECK before WM_CAPTURECHANGED and add tests. --- dlls/user32/button.c | 2 +- dlls/user32/tests/msg.c | 226 +++++++++++++++++++++++++++++++----------------- 2 files changed, 150 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c68843f898da704432c39…

1 0

Nikolay Sivov : amstream: Implement IDirectDrawStreamSample_GetSurface().
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 139445eb49c3f3500a1105fa7803b8f35b2bf5a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=139445eb49c3f3500a1105fa7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 22:39:41 2015 +0300 amstream: Implement IDirectDrawStreamSample_GetSurface(). --- dlls/amstream/mediastream.c | 58 ++++++++++++++++++---- dlls/amstream/tests/amstream.c | 106 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 154 insertions(+), 10 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index b457d1f..f51d4dd 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -31,7 +31,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(amstream); -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample); +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample); static HRESULT audiostreamsample_create(IAudioMediaStream *parent, IAudioData *audio_data, IAudioStreamSample **audio_stream_sample); typedef struct { @@ -388,12 +389,12 @@ static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_SetDirect } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_CreateSample(IDirectDrawMediaStream *iface, - IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags, + IDirectDrawSurface *surface, const RECT *rect, DWORD dwFlags, IDirectDrawStreamSample **ppSample) { - TRACE("(%p)->(%p,%p,%x,%p)\n", iface, pSurface, pRect, dwFlags, ppSample); + TRACE("(%p)->(%p,%s,%x,%p)\n", iface, surface, wine_dbgstr_rect(rect), dwFlags, ppSample); - return ddrawstreamsample_create(iface, ppSample); + return ddrawstreamsample_create(iface, surface, rect, ppSample); } static HRESULT WINAPI DirectDrawMediaStreamImpl_IDirectDrawMediaStream_GetTimePerFrame(IDirectDrawMediaStream *iface, @@ -854,6 +855,8 @@ typedef struct { IDirectDrawStreamSample IDirectDrawStreamSample_iface; LONG ref; IMediaStream *parent; + IDirectDrawSurface *surface; + RECT rect; } IDirectDrawStreamSampleImpl; static inline IDirectDrawStreamSampleImpl *impl_from_IDirectDrawStreamSample(IDirectDrawStreamSample *iface) @@ -900,7 +903,11 @@ static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample TRACE("(%p)->(): new ref = %u\n", iface, ref); if (!ref) + { + if (This->surface) + IDirectDrawSurface_Release(This->surface); HeapFree(GetProcessHeap(), 0, This); + } return ref; } @@ -948,9 +955,21 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawSt static HRESULT WINAPI IDirectDrawStreamSampleImpl_GetSurface(IDirectDrawStreamSample *iface, IDirectDrawSurface **ddraw_surface, RECT *rect) { - FIXME("(%p)->(%p,%p): stub\n", iface, ddraw_surface, rect); + IDirectDrawStreamSampleImpl *This = impl_from_IDirectDrawStreamSample(iface); - return E_NOTIMPL; + TRACE("(%p)->(%p,%p)\n", iface, ddraw_surface, rect); + + if (ddraw_surface) + { + *ddraw_surface = This->surface; + if (*ddraw_surface) + IDirectDrawSurface_AddRef(*ddraw_surface); + } + + if (rect) + *rect = This->rect; + + return S_OK; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_SetRect(IDirectDrawStreamSample *iface, const RECT *rect) @@ -977,19 +996,42 @@ static const struct IDirectDrawStreamSampleVtbl DirectDrawStreamSample_Vtbl = IDirectDrawStreamSampleImpl_SetRect }; -static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawStreamSample **ddraw_stream_sample) +static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectDrawSurface *surface, + const RECT *rect, IDirectDrawStreamSample **ddraw_stream_sample) { IDirectDrawStreamSampleImpl *object; + HRESULT hr; TRACE("(%p)\n", ddraw_stream_sample); - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectDrawStreamSampleImpl)); + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = (IMediaStream*)parent; + if (surface) + { + object->surface = surface; + IDirectDrawSurface_AddRef(surface); + } + else + FIXME("create ddraw surface\n"); + + if (rect) + object->rect = *rect; + else if (object->surface) + { + DDSURFACEDESC desc = { sizeof(desc) }; + hr = IDirectDrawSurface_GetSurfaceDesc(object->surface, &desc); + if (hr == S_OK) + { + object->rect.left = object->rect.top = 0; + object->rect.right = desc.dwWidth; + object->rect.bottom = desc.dwHeight; + } + } *ddraw_stream_sample = (IDirectDrawStreamSample*)&object->IDirectDrawStreamSample_iface; diff --git a/dlls/amstream/tests/amstream.c b/dlls/amstream/tests/amstream.c index f2f5723..a8986a6 100644 --- a/dlls/amstream/tests/amstream.c +++ b/dlls/amstream/tests/amstream.c @@ -26,6 +26,14 @@ #include "amstream.h" #include "vfwmsgs.h" +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) +static void _expect_ref(IUnknown* obj, ULONG ref, int line) +{ + ULONG rc = IUnknown_AddRef(obj); + IUnknown_Release(obj); + ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); +} + static const WCHAR filenameW[] = {'t','e','s','t','.','a','v','i',0}; static IDirectDraw7* pdd7; @@ -119,6 +127,8 @@ static void test_renderfile(void) IMediaStream *pvidstream = NULL; IDirectDrawMediaStream *pddstream = NULL; IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface *surface; + RECT rect; if (!(pams = create_ammultimediastream())) return; @@ -151,9 +161,23 @@ static void test_renderfile(void) hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(surface == NULL, "got %p\n", surface); + IDirectDrawStreamSample_Release(pddsample); + + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + ok(hr == S_OK, "IDirectDrawMediaStream_CreateSample returned: %x\n", hr); + EXPECT_REF(surface, 2); + IDirectDrawStreamSample_Release(pddsample); + IDirectDrawSurface_Release(surface); + error: - if (pddsample) - IDirectDrawStreamSample_Release(pddsample); if (pddstream) IDirectDrawMediaStream_Release(pddstream); if (pvidstream) @@ -426,6 +450,83 @@ static void test_media_streams(void) IAMMultiMediaStream_Release(pams); } +static void test_IDirectDrawStreamSample(void) +{ + IAMMultiMediaStream *pams; + HRESULT hr; + IMediaStream *pvidstream = NULL; + IDirectDrawMediaStream *pddstream = NULL; + IDirectDrawStreamSample *pddsample = NULL; + IDirectDrawSurface *surface, *surface2; + RECT rect; + + if (!(pams = create_ammultimediastream())) + return; + if (!create_directdraw()) + { + IAMMultiMediaStream_Release(pams); + return; + } + + hr = IAMMultiMediaStream_Initialize(pams, STREAMTYPE_READ, 0, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IAMMultiMediaStream_AddMediaStream(pams, (IUnknown*)pdd7, &MSPID_PrimaryVideo, 0, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IAMMultiMediaStream_GetMediaStream(pams, &MSPID_PrimaryVideo, &pvidstream); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) goto error; + + hr = IMediaStream_QueryInterface(pvidstream, &IID_IDirectDrawMediaStream, (LPVOID*)&pddstream); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (FAILED(hr)) goto error; + + hr = IDirectDrawMediaStream_CreateSample(pddstream, NULL, NULL, 0, &pddsample); + ok(hr == S_OK, "got 0x%08x\n", hr); + + surface = NULL; + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); +todo_wine + ok(surface != NULL, "got %p\n", surface); +if (surface) + IDirectDrawSurface_Release(surface); + IDirectDrawStreamSample_Release(pddsample); + + hr = IDirectDrawSurface7_QueryInterface(pdds7, &IID_IDirectDrawSurface, (void**)&surface); + ok(hr == S_OK, "got 0x%08x\n", hr); + + EXPECT_REF(surface, 1); + hr = IDirectDrawMediaStream_CreateSample(pddstream, surface, NULL, 0, &pddsample); + ok(hr == S_OK, "got 0x%08x\n", hr); + EXPECT_REF(surface, 2); + + surface2 = NULL; + memset(&rect, 0, sizeof(rect)); + hr = IDirectDrawStreamSample_GetSurface(pddsample, &surface2, &rect); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(surface == surface2, "got %p\n", surface2); + ok(rect.right > 0 && rect.bottom > 0, "got %d, %d\n", rect.right, rect.bottom); + EXPECT_REF(surface, 3); + IDirectDrawSurface_Release(surface2); + + hr = IDirectDrawStreamSample_GetSurface(pddsample, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + + IDirectDrawStreamSample_Release(pddsample); + IDirectDrawSurface_Release(surface); + +error: + if (pddstream) + IDirectDrawMediaStream_Release(pddstream); + if (pvidstream) + IMediaStream_Release(pvidstream); + + release_directdraw(); + IAMMultiMediaStream_Release(pams); +} + START_TEST(amstream) { HANDLE file; @@ -433,6 +534,7 @@ START_TEST(amstream) CoInitializeEx(NULL, COINIT_MULTITHREADED); test_media_streams(); + test_IDirectDrawStreamSample(); file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE)

1 0

Nikolay Sivov : amstream: Keep stream reference when creating sample.
by Alexandre Julliard 23 Jun '15

23 Jun '15

Module: wine Branch: master Commit: 17283f9be50050fb0024635fd2701e8599d97ab7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17283f9be50050fb0024635fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 22 22:56:10 2015 +0300 amstream: Keep stream reference when creating sample. --- dlls/amstream/mediastream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index f51d4dd..4a8c19b 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -906,6 +906,7 @@ static ULONG WINAPI IDirectDrawStreamSampleImpl_Release(IDirectDrawStreamSample { if (This->surface) IDirectDrawSurface_Release(This->surface); + IMediaStream_Release(This->parent); HeapFree(GetProcessHeap(), 0, This); } @@ -1011,6 +1012,8 @@ static HRESULT ddrawstreamsample_create(IDirectDrawMediaStream *parent, IDirectD object->IDirectDrawStreamSample_iface.lpVtbl = &DirectDrawStreamSample_Vtbl; object->ref = 1; object->parent = (IMediaStream*)parent; + IMediaStream_AddRef(object->parent); + if (surface) { object->surface = surface;

1 0