- wine-devel - winehq.org

[PATCH 5/5] usp10/tests: Cleanup test_ScriptGetFontFunctions().
by Henri Verbeet 28 Feb '18

28 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/usp10/tests/usp10.c | 205 ++++++++++++++++++++++++----------------------- 1 file changed, 103 insertions(+), 102 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index cd2c129..f548b57 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -3701,116 +3701,117 @@ static void test_newlines(void) static void test_ScriptGetFontFunctions(HDC hdc) { + static const WCHAR test_phagspa[] = {0xa84f, 0xa861, 0xa843, 0x0020, 0xa863, 0xa861, 0xa859, + 0x0020, 0xa850, 0xa85c, 0xa85e}; + SCRIPT_CONTROL control; + SCRIPT_CACHE sc = NULL; + SCRIPT_ITEM items[15]; + OPENTYPE_TAG tags[5]; + SCRIPT_STATE state; + int count = 0; HRESULT hr; + if (!pScriptGetFontScriptTags || !pScriptGetFontLanguageTags || !pScriptGetFontFeatureTags) { - win_skip("ScriptGetFontScriptTags,ScriptGetFontLanguageTags or ScriptGetFontFeatureTags not available on this platform\n"); + win_skip("ScriptGetFontScriptTags, ScriptGetFontLanguageTags or " + "ScriptGetFontFeatureTags not available on this platform.\n"); + return; } + + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, ARRAY_SIZE(tags), tags, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontScriptTags(NULL, &sc, NULL, ARRAY_SIZE(tags), tags, &count); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontScriptTags(hdc, &sc, NULL, ARRAY_SIZE(tags), tags, &count); + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(count <= 5, "Got unexpected count %d.\n", count); else - { - SCRIPT_CACHE sc = NULL; - OPENTYPE_TAG tags[5]; - int count = 0; - int outnItems=0; - SCRIPT_ITEM outpItems[15]; - SCRIPT_CONTROL Control; - SCRIPT_STATE State; - static const WCHAR test_phagspa[] = {0xa84f, 0xa861, 0xa843, 0x0020, 0xa863, 0xa861, 0xa859, 0x0020, 0xa850, 0xa85c, 0xa85e}; - - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, NULL, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 0, tags, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontScriptTags(NULL, &sc, NULL, 5, tags, &count); - ok(hr == E_PENDING,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontScriptTags(hdc, &sc, NULL, 5, tags, &count); - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); - if (hr == S_OK) - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); - else if (hr == E_OUTOFMEMORY) - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); - ok(sc != NULL, "ScriptCache should be initialized\n"); + ok(!count, "Got unexpected count %d.\n", count); + ok(!!sc, "Got unexpected script cache %p.\n", sc); - ScriptFreeCache(&sc); - sc = NULL; - - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 5, tags, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, tags, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontLanguageTags(NULL, &sc, NULL, latn_tag, 5, tags, &count); - ok(hr == E_PENDING,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 5, tags, &count); - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); - if (hr == S_OK) - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); - else if (hr == E_OUTOFMEMORY) - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); + ScriptFreeCache(&sc); + sc = NULL; - ScriptFreeCache(&sc); - sc = NULL; - - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 5, tags, NULL); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, tags, &count); - ok(hr == E_INVALIDARG,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontFeatureTags(NULL, &sc, NULL, latn_tag, 0x0, 5, tags, &count); - ok(hr == E_PENDING,"Incorrect return code\n"); - ok(sc == NULL, "ScriptCache should remain uninitialized\n"); - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 5, tags, &count); - ok((hr == S_OK || hr == E_OUTOFMEMORY),"Incorrect return code\n"); - if (hr == S_OK) - ok(count <= 5, "Count should be less or equal to 5 with S_OK return\n"); - else if (hr == E_OUTOFMEMORY) - ok(count == 0, "Count should be 0 with E_OUTOFMEMORY return\n"); - - memset(&Control, 0, sizeof(Control)); - memset(&State, 0, sizeof(State)); - - hr = ScriptItemize(test_phagspa, 10, 15, &Control, &State, outpItems, &outnItems); - ok(hr == S_OK, "ScriptItemize failed: 0x%08x\n", hr); - memset(tags,0,sizeof(tags)); - hr = pScriptGetFontScriptTags(hdc, &sc, &outpItems[0].a, 5, tags, &count); - ok( hr == USP_E_SCRIPT_NOT_IN_FONT || broken(hr == S_OK), "wrong return code\n"); - - hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, dsrt_tag, 5, tags, &count); - ok( hr == S_OK, "wrong return code\n"); - hr = pScriptGetFontLanguageTags(hdc, &sc, &outpItems[0].a, dsrt_tag, 5, tags, &count); - ok( hr == E_INVALIDARG || broken(hr == S_OK), "wrong return code\n"); - - hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, dsrt_tag, 0x0, 5, tags, &count); - ok( hr == S_OK, "wrong return code\n"); - hr = pScriptGetFontFeatureTags(hdc, &sc, &outpItems[0].a, dsrt_tag, 0x0, 5, tags, &count); - ok( hr == E_INVALIDARG || broken(hr == S_OK), "wrong return code\n"); + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, NULL, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, 0, tags, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontLanguageTags(NULL, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, &count); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, latn_tag, ARRAY_SIZE(tags), tags, &count); + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(count <= 5, "Got unexpected count %d.\n", count); + else + ok(!count, "Got unexpected count %d.\n", count); - ScriptFreeCache(&sc); - } + ScriptFreeCache(&sc); + sc = NULL; + + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, NULL, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, 0, tags, &count); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontFeatureTags(NULL, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, &count); + ok(hr == E_PENDING, "Got unexpected hr %#x.\n", hr); + ok(!sc, "Got unexpected script cache %p.\n", sc); + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, latn_tag, 0x0, ARRAY_SIZE(tags), tags, &count); + ok(hr == S_OK || hr == E_OUTOFMEMORY, "Got unexpected hr %#x.\n", hr); + if (hr == S_OK) + ok(count <= 5, "Got unexpected count %d.\n", count); + else + ok(!count, "Got unexpected count %d.\n", count); + + memset(&control, 0, sizeof(control)); + memset(&state, 0, sizeof(state)); + + hr = ScriptItemize(test_phagspa, ARRAY_SIZE(test_phagspa), ARRAY_SIZE(items), + &control, &state, items, &count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + memset(tags, 0, sizeof(tags)); + hr = pScriptGetFontScriptTags(hdc, &sc, &items[0].a, ARRAY_SIZE(tags), tags, &count); + ok(hr == USP_E_SCRIPT_NOT_IN_FONT || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + + hr = pScriptGetFontLanguageTags(hdc, &sc, NULL, dsrt_tag, ARRAY_SIZE(tags), tags, &count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = pScriptGetFontLanguageTags(hdc, &sc, &items[0].a, dsrt_tag, ARRAY_SIZE(tags), tags, &count); + ok(hr == E_INVALIDARG || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + + hr = pScriptGetFontFeatureTags(hdc, &sc, NULL, dsrt_tag, 0x0, ARRAY_SIZE(tags), tags, &count); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = pScriptGetFontFeatureTags(hdc, &sc, &items[0].a, dsrt_tag, 0x0, ARRAY_SIZE(tags), tags, &count); + ok(hr == E_INVALIDARG || broken(hr == S_OK), "Got unexpected hr %#x.\n", hr); + + ScriptFreeCache(&sc); } struct logical_width_test -- 2.1.4

2 1

[PATCH] usp10: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 28 Feb '18

28 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/usp10/usp10.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 5f50332712..4daba34350 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1155,7 +1155,7 @@ HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num) if (!props && !num) return E_INVALIDARG; - if (num) *num = sizeof(script_props)/sizeof(script_props[0]); + if (num) *num = ARRAY_SIZE(script_props); if (props) *props = script_props; return S_OK; -- 2.14.3

3 2

[PATCH 3/4 v2] comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message
by Piotr Caban 28 Feb '18

28 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH] gdiplus: Silently ignore empty rectangles in GdipAddPathRectangles.
by Vincent Povirk 28 Feb '18

28 Feb '18

Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> --- dlls/gdiplus/graphicspath.c | 3 +++ dlls/gdiplus/tests/graphicspath.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 8b13fc5b2a0..76ef1c248e2 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -2306,6 +2306,9 @@ GpStatus WINGDIPAPI GdipAddPathRectangle(GpPath *path, REAL x, REAL y, if(!path) return InvalidParameter; + if (width <= 0.0 || height <= 0.0) + return Ok; + /* make a backup copy of path data */ if((retstat = GdipClonePath(path, &backup)) != Ok) return retstat; diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index 9a6dde3bd85..102c33c902a 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -1301,6 +1301,7 @@ static void test_empty_rect(void) { GpPath *path; GpStatus status; + INT count; BOOL result; status = GdipCreatePath(FillModeAlternate, &path); @@ -1309,6 +1310,10 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, -5.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipIsVisiblePathPoint(path, -2.0, 2.0, NULL, &result); expect(Ok, status); expect(FALSE, status); @@ -1316,12 +1321,31 @@ static void test_empty_rect(void) status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, -5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 0.0, 5.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.0); expect(Ok, status); + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(0, count); + + status = GdipAddPathRectangle(path, 0.0, 0.0, 5.0, 0.1); + expect(Ok, status); + + status = GdipGetPointCount(path, &count); + expect(Ok, status); + expect(4, count); + GdipDeletePath(path); } -- 2.14.1

1 0

[PATCH 6/6] mshtml: Merge propbag.c into pluginhost.c
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/pluginhost.c | 321 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 2 - dlls/mshtml/propbag.c | 357 ----------------------------------------------- 4 files changed, 321 insertions(+), 360 deletions(-) delete mode 100644 dlls/mshtml/propbag.c

1 0

[PATCH 5/6] mshtml: Merge ipwindow.c into pluginhost.c.
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/ipwindow.c | 347 ----------------------------------------------- dlls/mshtml/pluginhost.c | 311 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.h | 3 - 4 files changed, 311 insertions(+), 351 deletions(-) delete mode 100644 dlls/mshtml/ipwindow.c

1 0

[PATCH 3/6] mshtml: Implement IOleDocumentView and IViewObjectEx interfaces in HTMLDocumentObj object instead of HTMLDocument.
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmldoc.c | 21 ++-- dlls/mshtml/mshtml_private.h | 7 +- dlls/mshtml/oleobj.c | 16 +-- dlls/mshtml/view.c | 245 ++++++++++++++++++++----------------------- 4 files changed, 136 insertions(+), 153 deletions(-)

1 0

[PATCH 4/6] mshtml: Merge htmlscreen.c into imnavigator.c
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlscreen.c | 263 ---------------------------------------------- dlls/mshtml/omnavigator.c | 233 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 232 insertions(+), 265 deletions(-) delete mode 100644 dlls/mshtml/htmlscreen.c

1 0

[PATCH 2/6] mshtml: Implement IHTMLTextContainer interface directly in HTMLBodyElement object.
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlbody.c | 113 +++++++++++++++++++++---------------------------- 1 file changed, 49 insertions(+), 64 deletions(-)

1 0

[PATCH 4/4] comctl32: Add listbox WM_MEASUREITEM tests
by Piotr Caban 28 Feb '18

28 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/listbox.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)

2 1

[PATCH 1/6] mshtml: Merge htmltextcont.c into htmlbody.c.
by Jacek Caban 28 Feb '18

28 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlbody.c | 165 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmltextcont.c | 194 ------------------------------------------- dlls/mshtml/mshtml_private.h | 7 -- 4 files changed, 165 insertions(+), 202 deletions(-) delete mode 100644 dlls/mshtml/htmltextcont.c

1 0

[PATCH 2/4] user32: Add listbox WM_MEASUREITEM tests
by Piotr Caban 28 Feb '18

28 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/tests/listbox.c | 54 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+)

2 1

[PATCH 1/2] gdiplus: Fix argument check in GdipLoadImageFromStream()
by Nikolay Sivov 28 Feb '18

28 Feb '18

From: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=42851 dlls/gdiplus/image.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index c0b54d04d8..b03630c55c 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -4314,6 +4314,11 @@ GpStatus WINGDIPAPI GdipLoadImageFromStream(IStream *stream, GpImage **image) HRESULT hr; const struct image_codec *codec=NULL; + TRACE("%p %p\n", stream, image); + + if (!stream || !image) + return InvalidParameter; + /* choose an appropriate image decoder */ stat = get_decoder_info(stream, &codec); if (stat != Ok) return stat; -- 2.16.1

2 3

[PATCH 3/4] comctl32: Fix itemData passed in ListBox WM_MEASUREITEM message
by Piotr Caban 28 Feb '18

28 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH 1/4] user32: Fix itemData passed in ListBox WM_MEASUREITEM message
by Piotr Caban 28 Feb '18

28 Feb '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/user32/listbox.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)

1 0

[PATCH 1/2] include: Add PathCchCombineEx() definition
by Nikolay Sivov 28 Feb '18

28 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/pathcch.h | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 include/pathcch.h diff --git a/include/Makefile.in b/include/Makefile.in index f1bcba35ed..72304d6f91 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -494,6 +494,7 @@ SOURCES = \ opnrst.idl \ optary.idl \ patchapi.h \ + pathcch.h \ pdh.h \ pdhmsg.h \ perflib.h \ diff --git a/include/pathcch.h b/include/pathcch.h new file mode 100644 index 0000000000..8831c5238d --- /dev/null +++ b/include/pathcch.h @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Michael Müller + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define PATHCCH_NONE 0x00 +#define PATHCCH_ALLOW_LONG_PATHS 0x01 +#define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS 0x02 +#define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04 +#define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 +#define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 + +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); -- 2.16.1

4 4

[PATCH] bcrypt: Partial implementation of BCryptImportKey and BCryptExportKey.
by Hans Leidekker 28 Feb '18

28 Feb '18

Based on a patch by Michael Müller. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/bcrypt/bcrypt.spec | 4 +- dlls/bcrypt/bcrypt_main.c | 143 ++++++++++++++++++++++++++++++++++++--------- dlls/bcrypt/tests/bcrypt.c | 51 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 +- include/bcrypt.h | 14 +++++ 5 files changed, 186 insertions(+), 30 deletions(-) diff --git a/dlls/bcrypt/bcrypt.spec b/dlls/bcrypt/bcrypt.spec index f00f55c306..21b54b4934 100644 --- a/dlls/bcrypt/bcrypt.spec +++ b/dlls/bcrypt/bcrypt.spec @@ -20,7 +20,7 @@ @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders -@ stub BCryptExportKey +@ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) @ stub BCryptFinalizeKeyPair @ stdcall BCryptFinishHash(ptr ptr long long) @ stub BCryptFreeBuffer @@ -31,7 +31,7 @@ @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) @ stdcall BCryptHash(ptr ptr long ptr long ptr long) @ stdcall BCryptHashData(ptr ptr long long) -@ stub BCryptImportKey +@ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) @ stub BCryptImportKeyPair @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) @ stub BCryptQueryContextConfiguration diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72b5df225a..ab9bdf854d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -768,15 +768,6 @@ NTSTATUS WINAPI BCryptHash( BCRYPT_ALG_HANDLE algorithm, UCHAR *secret, ULONG se return BCryptDestroyHash( handle ); } -#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -static ULONG get_block_size( enum alg_id alg ) -{ - ULONG ret = 0, size = sizeof(ret); - get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); - return ret; -} -#endif - #if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) struct key { @@ -787,7 +778,55 @@ struct key UCHAR *secret; ULONG secret_len; }; +#elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +struct key +{ + struct object hdr; + enum alg_id alg_id; + ULONG block_size; + CCCryptorRef ref_encrypt; + CCCryptorRef ref_decrypt; + UCHAR *secret; + ULONG secret_len; +}; +#else +struct key +{ + struct object hdr; + ULONG block_size; +}; +#endif +#if defined(HAVE_GNUTLS_CIPHER_INIT) || defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 +static ULONG get_block_size( enum alg_id alg ) +{ + ULONG ret = 0, size = sizeof(ret); + get_alg_property( alg, BCRYPT_BLOCK_LENGTH, (UCHAR *)&ret, sizeof(ret), &size ); + return ret; +} +static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) +{ + if (!strcmpW( type, BCRYPT_KEY_DATA_BLOB )) + { + BCRYPT_KEY_DATA_BLOB_HEADER *header = (BCRYPT_KEY_DATA_BLOB_HEADER *)output; + ULONG req_size = sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + key->secret_len; + + *size = req_size; + if (output_len < req_size) return STATUS_BUFFER_TOO_SMALL; + + header->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + header->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + header->cbKeyData = key->secret_len; + memcpy( &header[1], key->secret, key->secret_len ); + return STATUS_SUCCESS; + } + + FIXME( "unsupported key type %s\n", debugstr_w(type) ); + return STATUS_NOT_IMPLEMENTED; +} +#endif + +#if defined(HAVE_GNUTLS_CIPHER_INIT) && !defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -898,17 +937,6 @@ static NTSTATUS key_destroy( struct key *key ) return STATUS_SUCCESS; } #elif defined(HAVE_COMMONCRYPTO_COMMONCRYPTOR_H) && MAC_OS_X_VERSION_MAX_ALLOWED >= 1080 -struct key -{ - struct object hdr; - enum alg_id alg_id; - ULONG block_size; - CCCryptorRef ref_encrypt; - CCCryptorRef ref_decrypt; - UCHAR *secret; - ULONG secret_len; -}; - static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { UCHAR *buffer; @@ -1006,12 +1034,6 @@ static NTSTATUS key_destroy( struct key *key ) return STATUS_SUCCESS; } #else -struct key -{ - struct object hdr; - ULONG block_size; -}; - static NTSTATUS key_init( struct key *key, enum alg_id id, const UCHAR *secret, ULONG secret_len ) { ERR( "support for keys not available at build time\n" ); @@ -1043,6 +1065,12 @@ static NTSTATUS key_destroy( struct key *key ) ERR( "support for keys not available at build time\n" ); return STATUS_NOT_IMPLEMENTED; } + +static NTSTATUS key_export( struct key *key, const WCHAR *type, UCHAR *output, ULONG output_len, ULONG *size ) +{ + ERR( "support for keys not available at build time\n" ); + return STATUS_NOT_IMPLEMENTED; +} #endif NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE *handle, @@ -1071,6 +1099,69 @@ NTSTATUS WINAPI BCryptGenerateSymmetricKey( BCRYPT_ALG_HANDLE algorithm, BCRYPT_ return STATUS_SUCCESS; } +NTSTATUS WINAPI BCryptImportKey(BCRYPT_ALG_HANDLE algorithm, BCRYPT_KEY_HANDLE decrypt_key, LPCWSTR type, + BCRYPT_KEY_HANDLE *key, PUCHAR object, ULONG object_len, PUCHAR input, + ULONG input_len, ULONG flags) +{ + struct algorithm *alg = algorithm; + + TRACE("%p, %p, %s, %p, %p, %u, %p, %u, %u\n", algorithm, decrypt_key, debugstr_w(type), key, object, + object_len, input, input_len, flags); + + if (!alg || alg->hdr.magic != MAGIC_ALG) return STATUS_INVALID_HANDLE; + if (!key || !type || !input) return STATUS_INVALID_PARAMETER; + + if (decrypt_key) + { + FIXME("Decrypting of key not yet supported\n"); + return STATUS_NO_MEMORY; + } + + if (!strcmpW(type, BCRYPT_KEY_DATA_BLOB)) + { + BCRYPT_KEY_DATA_BLOB_HEADER *key_header = (BCRYPT_KEY_DATA_BLOB_HEADER*)input; + + if (input_len < sizeof(BCRYPT_KEY_DATA_BLOB_HEADER)) + return STATUS_BUFFER_TOO_SMALL; + + if (key_header->dwMagic != BCRYPT_KEY_DATA_BLOB_MAGIC) + return STATUS_INVALID_PARAMETER; + + if (key_header->dwVersion != BCRYPT_KEY_DATA_BLOB_VERSION1) + { + FIXME("Unknown key data blob version: %d\n", key_header->dwVersion); + return STATUS_INVALID_PARAMETER; + } + + if (key_header->cbKeyData + sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) > input_len) + return STATUS_INVALID_PARAMETER; + + return BCryptGenerateSymmetricKey(algorithm, key, object, object_len, (UCHAR*)&key_header[1], key_header->cbKeyData, 0); + } + + FIXME("Unsupported key type: %s\n", debugstr_w(type)); + return STATUS_INVALID_PARAMETER; +} + +NTSTATUS WINAPI BCryptExportKey(BCRYPT_KEY_HANDLE export_key, BCRYPT_KEY_HANDLE encrypt_key, LPCWSTR type, + PUCHAR output, ULONG output_len, ULONG *size, ULONG flags) +{ + struct key *key = export_key; + + TRACE("%p, %p, %s, %p, %u, %p, %u\n", key, encrypt_key, debugstr_w(type), output, output_len, size, flags); + + if (!key || key->hdr.magic != MAGIC_KEY) return STATUS_INVALID_HANDLE; + if (!output || !output_len || !size) return STATUS_INVALID_PARAMETER; + + if (encrypt_key) + { + FIXME("Encryption of key not yet supported\n"); + return STATUS_NO_MEMORY; + } + + return key_export( key, type, output, output_len, size ); +} + NTSTATUS WINAPI BCryptDestroyKey( BCRYPT_KEY_HANDLE handle ) { struct key *key = handle; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6fa04b099a..1c155812d8 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -46,6 +46,9 @@ static NTSTATUS (WINAPI *pBCryptEncrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID static NTSTATUS (WINAPI *pBCryptDecrypt)(BCRYPT_KEY_HANDLE, PUCHAR, ULONG, VOID *, PUCHAR, ULONG, PUCHAR, ULONG, ULONG *, ULONG); static NTSTATUS (WINAPI *pBCryptDestroyKey)(BCRYPT_KEY_HANDLE); +static NTSTATUS (WINAPI *pBCryptImportKey)(BCRYPT_ALG_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, BCRYPT_KEY_HANDLE *, + PUCHAR, ULONG, PUCHAR, ULONG, ULONG); +static NTSTATUS (WINAPI *pBCryptExportKey)(BCRYPT_KEY_HANDLE, BCRYPT_KEY_HANDLE, LPCWSTR, PUCHAR, ULONG, ULONG *, ULONG); static void test_BCryptGenRandom(void) { @@ -815,6 +818,51 @@ static void test_BCryptDecrypt(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); } +static void test_key_import_export(void) +{ + UCHAR buffer1[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; + UCHAR buffer2[sizeof(BCRYPT_KEY_DATA_BLOB_HEADER) + 16]; + BCRYPT_KEY_DATA_BLOB_HEADER *key_data1 = (void*)buffer1; + BCRYPT_ALG_HANDLE aes; + BCRYPT_KEY_HANDLE key; + NTSTATUS ret; + ULONG size; + + ret = pBCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + key_data1->dwMagic = BCRYPT_KEY_DATA_BLOB_MAGIC; + key_data1->dwVersion = BCRYPT_KEY_DATA_BLOB_VERSION1; + key_data1->cbKeyData = 16; + memset(&key_data1[1], 0x11, 16); + + ret = pBCryptImportKey(aes, NULL, BCRYPT_KEY_DATA_BLOB, &key, NULL, 0, buffer1, sizeof(buffer1), 0); + ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* vista */, "got %08x\n", ret); + if (ret == STATUS_INVALID_PARAMETER) + { + win_skip("broken BCryptImportKey\n"); + return; + } + + size = 0; + ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == sizeof(buffer2), "Expected size %u, got %u\n", sizeof(buffer2), size); + + size = 0; + memset(buffer2, 0xff, sizeof(buffer2)); + ret = pBCryptExportKey(key, NULL, BCRYPT_KEY_DATA_BLOB, buffer2, sizeof(buffer2), &size, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ok(size == sizeof(buffer2), "Expected size %u, got %u\n", sizeof(buffer2), size); + ok(!memcmp(buffer1, buffer2, sizeof(buffer1)), "Expected exported key to match imported key\n"); + + ret = pBCryptDestroyKey(key); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + + ret = pBCryptCloseAlgorithmProvider(aes, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); +} + START_TEST(bcrypt) { HMODULE module; @@ -842,6 +890,8 @@ START_TEST(bcrypt) pBCryptEncrypt = (void *)GetProcAddress(module, "BCryptEncrypt"); pBCryptDecrypt = (void *)GetProcAddress(module, "BCryptDecrypt"); pBCryptDestroyKey = (void *)GetProcAddress(module, "BCryptDestroyKey"); + pBCryptImportKey = (void *)GetProcAddress(module, "BCryptImportKey"); + pBCryptExportKey = (void *)GetProcAddress(module, "BCryptExportKey"); test_BCryptGenRandom(); test_BCryptGetFipsAlgorithmMode(); @@ -851,6 +901,7 @@ START_TEST(bcrypt) test_BCryptGenerateSymmetricKey(); test_BCryptEncrypt(); test_BCryptDecrypt(); + test_key_import_export(); if (pBCryptHash) /* >= Win 10 */ test_BcryptHash(); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 5d371210d9..5d5fae0b5c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -22,7 +22,7 @@ @ stub BCryptEnumContexts @ stub BCryptEnumProviders @ stub BCryptEnumRegisteredProviders -@ stub BCryptExportKey +@ stdcall BCryptExportKey(ptr ptr wstr ptr long ptr long) bcrypt.BCryptExportKey @ stub BCryptFinalizeKeyPair @ stdcall BCryptFinishHash(ptr ptr long long) bcrypt.BCryptFinishHash @ stub BCryptFreeBuffer @@ -33,7 +33,7 @@ @ stdcall BCryptGetProperty(ptr wstr ptr long ptr long) bcrypt.BCryptGetProperty @ stdcall BCryptHash(ptr ptr long ptr long ptr long) bcrypt.BCryptHash @ stdcall BCryptHashData(ptr ptr long long) bcrypt.BCryptHashData -@ stub BCryptImportKey +@ stdcall BCryptImportKey(ptr ptr wstr ptr ptr long ptr long long) bcrypt.BCryptImportKey @ stub BCryptImportKeyPair @ stub BCryptKeyDerivation @ stdcall BCryptOpenAlgorithmProvider(ptr wstr wstr long) bcrypt.BCryptOpenAlgorithmProvider diff --git a/include/bcrypt.h b/include/bcrypt.h index 1f7093c25a..1be9b8533e 100644 --- a/include/bcrypt.h +++ b/include/bcrypt.h @@ -58,6 +58,10 @@ typedef LONG NTSTATUS; #define BCRYPT_PROVIDER_HANDLE (const WCHAR []){'P','r','o','v','i','d','e','r','H','a','n','d','l','e',0} #define BCRYPT_SIGNATURE_LENGTH (const WCHAR []){'S','i','g','n','a','t','u','r','e','L','e','n','g','t','h',0} +#define BCRYPT_OPAQUE_KEY_BLOB (const WCHAR []){'O','p','a','q','u','e','K','e','y','B','l','o','b',0} +#define BCRYPT_KEY_DATA_BLOB (const WCHAR []){'K','e','y','D','a','t','a','B','l','o','b',0} +#define BCRYPT_AES_WRAP_KEY_BLOB (const WCHAR []){'R','f','c','3','5','6','5','K','e','y','W','r','a','p','B','l','o','b',0} + #define MS_PRIMITIVE_PROVIDER (const WCHAR [])\ {'M','i','c','r','o','s','o','f','t',' ','P','r','i','m','i','t','i','v','e',' ','P','r','o','v','i','d','e','r',0} #define MS_PLATFORM_CRYPTO_PROVIDER (const WCHAR [])\ @@ -117,6 +121,16 @@ typedef struct _CRYPT_PROVIDER_REG PCRYPT_IMAGE_REG pKM; } CRYPT_PROVIDER_REG, *PCRYPT_PROVIDER_REG; +typedef struct _BCRYPT_KEY_DATA_BLOB_HEADER +{ + ULONG dwMagic; + ULONG dwVersion; + ULONG cbKeyData; +} BCRYPT_KEY_DATA_BLOB_HEADER, *PBCRYPT_KEY_DATA_BLOB_HEADER; + +#define BCRYPT_KEY_DATA_BLOB_MAGIC 0x4d42444b +#define BCRYPT_KEY_DATA_BLOB_VERSION1 1 + typedef PVOID BCRYPT_ALG_HANDLE; typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HANDLE; -- 2.11.0

1 0

[PATCH] msxml3: Don't set properties directly
by André Hentschel 28 Feb '18

28 Feb '18

Fixes https://bugs.winehq.org/show_bug.cgi?id=43377 and thus the test crash in msxml3:domdoc Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- dlls/msxml3/domdoc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ddd7565..ea30ae1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -683,7 +683,7 @@ static HRESULT attach_xmldoc(domdoc *This, xmlDocPtr xml ) if(This->node.node) { xmldoc_add_ref(get_doc(This)); - priv_from_xmlDocPtr(get_doc(This))->properties = This->properties; + priv_from_xmlDocPtr(get_doc(This))->properties = copy_properties(This->properties); } return S_OK; -- 2.7.4

4 3

[PATCH] bcrypt/tests: Correctly check the size in BCryptGetProperty.
by Alistair Leslie-Hughes 28 Feb '18

28 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Updated to make the test pass. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 72b5df2..28cf2d8 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -532,7 +532,7 @@ static NTSTATUS get_alg_property( enum alg_id id, const WCHAR *prop, UCHAR *buf, } if (!strcmpW( prop, BCRYPT_CHAINING_MODE )) { - if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC)) + if (size >= sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR)) { memcpy(buf, BCRYPT_CHAIN_MODE_CBC, sizeof(BCRYPT_CHAIN_MODE_CBC)); *ret_size = sizeof(BCRYPT_CHAIN_MODE_CBC) * sizeof(WCHAR); diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 6fa04b0..b716688 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -452,6 +452,12 @@ static void test_aes(void) ok(size == 64, "got %u\n", size); size = 0; + ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode) - 1, &size, 0); + ok(ret == STATUS_BUFFER_TOO_SMALL, "got %08x\n", ret); + ok(size == 64, "got %u\n", size); + + size = 0; + memset(mode, 0, sizeof(mode)); ret = pBCryptGetProperty(alg, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(!lstrcmpW((const WCHAR *)mode, BCRYPT_CHAIN_MODE_CBC), "got %s\n", mode); -- 1.9.1

2 1

[PATCH] dwmapi: Add DwmSetIconicThumbnail() stub
by Nikolay Sivov 28 Feb '18

28 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- For https://bugs.winehq.org/show_bug.cgi?id=44628 dlls/dwmapi/dwmapi.spec | 2 +- dlls/dwmapi/dwmapi_main.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi.spec b/dlls/dwmapi/dwmapi.spec index d81df3d841..697cefc071 100644 --- a/dlls/dwmapi/dwmapi.spec +++ b/dlls/dwmapi/dwmapi.spec @@ -81,7 +81,7 @@ # @ stub DwmRenderGesture @ stub DwmSetDxFrameDuration @ stub DwmSetIconicLivePreviewBitmap -@ stub DwmSetIconicThumbnail +@ stdcall DwmSetIconicThumbnail(long long long) @ stdcall DwmSetPresentParameters(ptr ptr) @ stdcall DwmSetWindowAttribute(long long ptr long) # @ stub DwmShowContact diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 8c3472a529..7ac0b2b790 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -268,3 +268,12 @@ HRESULT WINAPI DwmSetPresentParameters(HWND hwnd, DWM_PRESENT_PARAMETERS *params FIXME("(%p %p) stub\n", hwnd, params); return S_OK; }; + +/********************************************************************** + * DwmSetIconicThumbnail (DWMAPI.@) + */ +HRESULT WINAPI DwmSetIconicThumbnail(HWND hwnd, HBITMAP hbmp, DWORD flags) +{ + FIXME("(%p %p %x) stub\n", hwnd, hbmp, flags); + return S_OK; +}; -- 2.16.1

1 0

[PATCH 4/5] wined3d: Explicitly calculate the sub-resource level in fb_copy_to_texture_direct().
by Henri Verbeet 28 Feb '18

28 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 36ecfaf..12370ed 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1607,12 +1607,12 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc struct wined3d_texture *src_texture = src_surface->container; struct wined3d_texture *dst_texture = dst_surface->container; struct wined3d_device *device = dst_texture->resource.device; + unsigned int src_height, src_level, dst_level; const struct wined3d_gl_info *gl_info; float xrel, yrel; struct wined3d_context *context; BOOL upsidedown = FALSE; RECT dst_rect = *dst_rect_in; - unsigned int src_height; GLenum dst_target; /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag @@ -1660,14 +1660,17 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc ERR("Texture filtering not supported in direct blit\n"); } - src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + src_level = src_sub_resource_idx % src_texture->level_count; + dst_level = dst_sub_resource_idx % dst_texture->level_count; + + src_height = wined3d_texture_get_level_height(src_texture, src_level); dst_target = wined3d_texture_get_sub_resource_target(dst_texture, dst_sub_resource_idx); if (upsidedown && !((xrel - 1.0f < -eps) || (xrel - 1.0f > eps)) && !((yrel - 1.0f < -eps) || (yrel - 1.0f > eps))) { /* Upside down copy without stretching is nice, one glCopyTexSubImage call will do. */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left /*xoffset */, dst_rect.top /* y offset */, src_rect->left, src_height - src_rect->bottom, dst_rect.right - dst_rect.left, dst_rect.bottom - dst_rect.top); @@ -1692,14 +1695,14 @@ static void fb_copy_to_texture_direct(struct wined3d_surface *dst_surface, struc for (col = dst_rect.left; col < dst_rect.right; ++col) { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left + col /* x offset */, row /* y offset */, src_rect->left + col * xrel, yoffset - (int) (row * yrel), 1, 1); } } else { - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_surface->texture_level, + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(dst_target, dst_level, dst_rect.left /* x offset */, row /* y offset */, src_rect->left, yoffset - (int) (row * yrel), dst_rect.right - dst_rect.left, 1); } -- 2.1.4

1 0

[PATCH 3/5] wined3d: Explicitly calculate the sub-resource level in surface_load_fb_texture().
by Henri Verbeet 28 Feb '18

28 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 751424d..36ecfaf 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1563,6 +1563,7 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct const struct wined3d_gl_info *gl_info; struct wined3d_context *context = old_ctx; struct wined3d_surface *restore_rt = NULL; + unsigned int level; GLenum target; restore_rt = context_get_rt_surface(old_ctx); @@ -1585,10 +1586,11 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct gl_info->gl_ops.gl.p_glReadBuffer(wined3d_texture_get_gl_buffer(texture)); checkGLcall("glReadBuffer"); + level = sub_resource_idx % texture->level_count; target = wined3d_texture_get_sub_resource_target(texture, sub_resource_idx); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, surface->texture_level, - 0, 0, 0, 0, wined3d_texture_get_level_width(texture, surface->texture_level), - wined3d_texture_get_level_height(texture, surface->texture_level)); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(target, level, 0, 0, 0, 0, + wined3d_texture_get_level_width(texture, level), + wined3d_texture_get_level_height(texture, level)); checkGLcall("glCopyTexSubImage2D"); if (restore_rt) -- 2.1.4

1 0

[PATCH 2/5] wined3d: Explicitly calculate the sub-resource level in read_from_framebuffer().
by Henri Verbeet 28 Feb '18

28 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 22156b6..751424d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1433,8 +1433,8 @@ static void read_from_framebuffer(struct wined3d_surface *surface, struct wined3d_surface *restore_rt = NULL; const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; + unsigned int width, height, level; struct wined3d_bo_address data; - unsigned int width, height; BYTE *row, *top, *bottom; BOOL src_is_upside_down; unsigned int i; @@ -1488,14 +1488,15 @@ static void read_from_framebuffer(struct wined3d_surface *surface, checkGLcall("glBindBuffer"); } - wined3d_texture_get_pitch(texture, surface->texture_level, &row_pitch, &slice_pitch); + level = sub_resource_idx % texture->level_count; + wined3d_texture_get_pitch(texture, level, &row_pitch, &slice_pitch); /* Setup pixel store pack state -- to glReadPixels into the correct place */ gl_info->gl_ops.gl.p_glPixelStorei(GL_PACK_ROW_LENGTH, row_pitch / texture->resource.format->byte_count); checkGLcall("glPixelStorei"); - width = wined3d_texture_get_level_width(texture, surface->texture_level); - height = wined3d_texture_get_level_height(texture, surface->texture_level); + width = wined3d_texture_get_level_width(texture, level); + height = wined3d_texture_get_level_height(texture, level); gl_info->gl_ops.gl.p_glReadPixels(0, 0, width, height, texture->resource.format->glFormat, texture->resource.format->glType, data.addr); -- 2.1.4

1 0

[PATCH 1/5] wined3d: Explicitly calculate the sub-resource level in surface_set_compatible_renderbuffer().
by Henri Verbeet 28 Feb '18

28 Feb '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/surface.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ada7193..22156b6 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -981,36 +981,42 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, /* Context activation is done by the caller. */ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_rendertarget_info *rt) { - const struct wined3d_gl_info *gl_info = &surface->container->resource.device->adapter->gl_info; + unsigned int sub_resource_idx, width, height, level; struct wined3d_renderbuffer_entry *entry; + const struct wined3d_texture *texture; + const struct wined3d_gl_info *gl_info; unsigned int src_width, src_height; - unsigned int width, height; GLuint renderbuffer = 0; + texture = surface->container; + gl_info = &texture->resource.device->adapter->gl_info; + sub_resource_idx = surface_get_sub_resource_idx(surface); + level = sub_resource_idx % texture->level_count; + if (rt && rt->resource->format->id != WINED3DFMT_NULL) { - struct wined3d_texture *texture; - unsigned int level; + struct wined3d_texture *rt_texture; + unsigned int rt_level; if (rt->resource->type == WINED3D_RTYPE_BUFFER) { FIXME("Unsupported resource type %s.\n", debug_d3dresourcetype(rt->resource->type)); return; } - texture = wined3d_texture_from_resource(rt->resource); - level = rt->sub_resource_idx % texture->level_count; + rt_texture = wined3d_texture_from_resource(rt->resource); + rt_level = rt->sub_resource_idx % rt_texture->level_count; - width = wined3d_texture_get_level_pow2_width(texture, level); - height = wined3d_texture_get_level_pow2_height(texture, level); + width = wined3d_texture_get_level_pow2_width(rt_texture, rt_level); + height = wined3d_texture_get_level_pow2_height(rt_texture, rt_level); } else { - width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); - height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); + width = wined3d_texture_get_level_pow2_width(texture, level); + height = wined3d_texture_get_level_pow2_height(texture, level); } - src_width = wined3d_texture_get_level_pow2_width(surface->container, surface->texture_level); - src_height = wined3d_texture_get_level_pow2_height(surface->container, surface->texture_level); + src_width = wined3d_texture_get_level_pow2_width(texture, level); + src_height = wined3d_texture_get_level_pow2_height(texture, level); /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return; @@ -1039,7 +1045,7 @@ void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - surface->container->resource.format->glInternal, width, height); + texture->resource.format->glInternal, width, height); entry = heap_alloc(sizeof(*entry)); entry->width = width; -- 2.1.4

1 0

[PATCH] user32/tests: Remove commented out traces, use test calls instead of traces
by Nikolay Sivov 28 Feb '18

28 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/win.c | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 96a2467da0..ab39ee84a4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2786,7 +2786,6 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, UlongToHandle(GetWindowLongPtrA(test, GWLP_HINSTANCE)) != GetModuleHandleA(NULL) || GetWindow(test, GW_OWNER) == next)) { - /*trace("skipping next %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDNEXT); } ok_(file, line)(next == test, "%p: expected next %p, got %p\n", hwnd, next, test); @@ -2798,7 +2797,6 @@ static void check_z_order_debug(HWND hwnd, HWND next, HWND prev, HWND owner, UlongToHandle(GetWindowLongPtrA(test, GWLP_HINSTANCE)) != GetModuleHandleA(NULL) || GetWindow(test, GW_OWNER) == hwnd)) { - /*trace("skipping prev %p (%p)\n", test, UlongToHandle(GetWindowLongPtr(test, GWLP_HINSTANCE)));*/ test = GetWindow(test, GW_HWNDPREV); } ok_(file, line)(prev == test, "%p: expected prev %p, got %p\n", hwnd, prev, test); @@ -3060,8 +3058,6 @@ static void test_SetActiveWindow(HWND hwnd) SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow %p\n", hwnd);*/ - ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3084,7 +3080,7 @@ static void test_SetActiveWindow(HWND hwnd) ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetActiveWindow on an invisible window %p\n", hwnd);*/ + /* Invisible window. */ SetActiveWindow(hwnd); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3176,8 +3172,6 @@ static void test_SetForegroundWindow(HWND hwnd) SetActiveWindow(0); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetForegroundWindow %p\n", hwnd);*/ - ShowWindow(hwnd, SW_SHOW); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -3219,7 +3213,7 @@ static void test_SetForegroundWindow(HWND hwnd) ShowWindow(hwnd, SW_HIDE); check_wnd_state(0, 0, 0, 0); - /*trace("testing SetForegroundWindow on an invisible window %p\n", hwnd);*/ + /* Invisible window. */ ret = SetForegroundWindow(hwnd); ok(ret, "SetForegroundWindow returned FALSE instead of TRUE\n"); check_wnd_state(hwnd, hwnd, hwnd, 0); @@ -5206,10 +5200,8 @@ static void test_AWRwindow(LPCSTR class, LONG style, LONG exStyle, BOOL menu) 0, menu ? hmenu : 0, 0, 0); - if (!hwnd) { - trace("Failed to create window class=%s, style=0x%08x, exStyle=0x%08x\n", class, style, exStyle); - return; - } + ok(hwnd != NULL, "Failed to create window class=%s, style=0x%08x, exStyle=0x%08x\n", class, style, exStyle); + ShowWindow(hwnd, SW_SHOW); test_nonclient_area(hwnd); @@ -5354,6 +5346,7 @@ static void test_redrawnow(void) { WNDCLASSA cls; HWND hwndMain; + BOOL ret; cls.style = CS_DBLCLKS; cls.lpfnWndProc = redraw_window_procA; @@ -5365,11 +5358,8 @@ static void test_redrawnow(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "RedrawWindowClass"; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); hwndMain = CreateWindowA("RedrawWindowClass", "Main Window", WS_OVERLAPPEDWINDOW, CW_USEDEFAULT, 0, 100, 100, NULL, NULL, 0, NULL); @@ -5471,6 +5461,7 @@ static void test_csparentdc(void) { WNDCLASSA clsMain, cls; HWND hwndMain, hwnd1, hwnd2; + BOOL ret; RECT rc; struct parentdc_test test_answer; @@ -5536,11 +5527,8 @@ static void test_csparentdc(void) clsMain.hbrBackground = GetStockObject(WHITE_BRUSH); clsMain.lpszMenuName = NULL; clsMain.lpszClassName = "ParentDcMainWindowClass"; - - if(!RegisterClassA(&clsMain)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&clsMain); + ok(ret, "Failed to register a test class.\n"); cls.style = CS_DBLCLKS | CS_PARENTDC; cls.lpfnWndProc = parentdc_window_procA; @@ -5552,11 +5540,8 @@ static void test_csparentdc(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = "ParentDcWindowClass"; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); SetRect(&rc, 0, 0, 150, 150); AdjustWindowRectEx(&rc, WS_OVERLAPPEDWINDOW, FALSE, 0); @@ -7041,11 +7026,8 @@ static void test_GetUpdateRect(void) cls.hbrBackground = GetStockObject(WHITE_BRUSH); cls.lpszMenuName = NULL; cls.lpszClassName = classNameA; - - if(!RegisterClassA(&cls)) { - trace("Register failed %d\n", GetLastError()); - return; - } + ret = RegisterClassA(&cls); + ok(ret, "Failed to register a test class.\n"); hgrandparent = CreateWindowA(classNameA, "grandparent", WS_OVERLAPPEDWINDOW, 0, 0, 100, 100, NULL, NULL, 0, NULL); -- 2.16.1

1 0

[resend PATCH] comctl32/tooltips: Set window size before TTN_SHOW and preserve it after
by Nikolay Sivov 28 Feb '18

28 Feb '18

From: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Resending so bot can pick it up this time. dlls/comctl32/tests/tooltips.c | 1 - dlls/comctl32/tooltips.c | 27 +++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 7f37d5fc97..af95a569bb 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -304,7 +304,6 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP break; case TTN_SHOW: GetWindowRect(hdr->hwndFrom, &rect); - todo_wine ok(!EqualRect(&g_ttip_rect, &rect), "Unexpected window rectangle.\n"); break; } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index e5b966a004..54601017d6 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -624,18 +624,10 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } toolPtr = &infoPtr->tools[nTool]; - - TRACE("Show tooltip %d\n", nTool); - - hdr.hwndFrom = infoPtr->hwndSelf; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); - - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); - TOOLTIPS_CalcTipSize (infoPtr, &size); - TRACE("size %d x %d\n", size.cx, size.cy); + + TRACE("Show tooltip %d, %s, size %d x %d\n", nTool, debugstr_w(infoPtr->szTipText), + size.cx, size.cy); if (track_activate && (toolPtr->uFlags & TTF_TRACK)) { @@ -824,9 +816,16 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + SetWindowPos (infoPtr->hwndSelf, NULL, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, SWP_NOZORDER | SWP_NOACTIVATE); + + hdr.hwndFrom = infoPtr->hwndSelf; + hdr.idFrom = toolPtr->uId; + hdr.code = TTN_SHOW; + SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); + + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, 0, 0, 0, 0, + SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOACTIVATE); /* repaint the tooltip */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); -- 2.16.1

1 0

[PATCH] comctl32/tests: Run some Progress control tests on version 6
by Nikolay Sivov 28 Feb '18

28 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/comctl32/tests/progress.c | 49 +++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/tests/progress.c b/dlls/comctl32/tests/progress.c index d3b219ccca..b911021be0 100644 --- a/dlls/comctl32/tests/progress.c +++ b/dlls/comctl32/tests/progress.c @@ -27,8 +27,9 @@ #include "wine/test.h" +#include "v6util.h" -static HWND hProgressParentWnd, hProgressWnd; +static HWND hProgressParentWnd; static const char progressTestClass[] = "ProgressBarTestClass"; static BOOL (WINAPI *pInitCommonControlsEx)(const INITCOMMONCONTROLSEX*); @@ -119,16 +120,6 @@ static void init(void) CW_USEDEFAULT, CW_USEDEFAULT, rect.right - rect.left, rect.bottom - rect.top, NULL, NULL, GetModuleHandleA(NULL), 0); ok(hProgressParentWnd != NULL, "failed to create parent wnd\n"); - GetClientRect(hProgressParentWnd, &rect); - hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, - 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); - ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); - progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); - - ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); - ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); - flush_events(); - update_window(hProgressParentWnd); } static void cleanup(void) @@ -151,9 +142,21 @@ static void cleanup(void) */ static void test_redraw(void) { - RECT client_rect; + RECT client_rect, rect; + HWND hProgressWnd; LRESULT ret; + GetClientRect(hProgressParentWnd, &rect); + hProgressWnd = CreateWindowExA(0, PROGRESS_CLASSA, "", WS_CHILD | WS_VISIBLE, + 0, 0, rect.right, rect.bottom, hProgressParentWnd, NULL, GetModuleHandleA(NULL), 0); + ok(hProgressWnd != NULL, "Failed to create progress bar.\n"); + progress_wndproc = (WNDPROC)SetWindowLongPtrA(hProgressWnd, GWLP_WNDPROC, (LPARAM)progress_subclass_proc); + + ShowWindow(hProgressParentWnd, SW_SHOWNORMAL); + ok(GetUpdateRect(hProgressParentWnd, NULL, FALSE), "GetUpdateRect: There should be a region that needs to be updated\n"); + flush_events(); + update_window(hProgressParentWnd); + SendMessageA(hProgressWnd, PBM_SETRANGE, 0, MAKELPARAM(0, 100)); SendMessageA(hProgressWnd, PBM_SETPOS, 10, 0); SendMessageA(hProgressWnd, PBM_SETSTEP, 20, 0); @@ -162,15 +165,15 @@ static void test_redraw(void) /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 50, 0) == 10, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_DELTAPOS */ ok(SendMessageA(hProgressWnd, PBM_DELTAPOS, 15, 0) == 50, "PBM_DELTAPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_DELTAPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_SETPOS */ ok(SendMessageA(hProgressWnd, PBM_SETPOS, 80, 0) == 65, "PBM_SETPOS must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_SETPOS: The progress bar should be redrawn immediately\n"); - + /* PBM_STEPIT */ ok(SendMessageA(hProgressWnd, PBM_STEPIT, 0, 0) == 80, "PBM_STEPIT must return the previous position\n"); ok(!GetUpdateRect(hProgressWnd, NULL, FALSE), "PBM_STEPIT: The progress bar should be redrawn immediately\n"); @@ -179,7 +182,7 @@ static void test_redraw(void) win_skip("PBM_GETPOS needs comctl32 > 4.70\n"); else ok(ret == 100, "PBM_GETPOS returned a wrong position : %d\n", (UINT)ret); - + /* PBM_SETRANGE and PBM_SETRANGE32: Usually the progress bar doesn't repaint itself immediately. If the position is not in the new range, it does. @@ -207,6 +210,8 @@ static void test_redraw(void) wine_dbgstr_rect(&last_paint_rect), wine_dbgstr_rect(&client_rect)); update_window(hProgressWnd); ok(erased, "Progress bar should have erased the background\n"); + + DestroyWindow(hProgressWnd); } static void test_setcolors(void) @@ -299,6 +304,8 @@ static void init_functions(void) START_TEST(progress) { INITCOMMONCONTROLSEX iccex; + ULONG_PTR ctx_cookie; + HANDLE hCtx; init_functions(); @@ -307,10 +314,18 @@ START_TEST(progress) pInitCommonControlsEx(&iccex); init(); - + test_redraw(); test_setcolors(); test_PBM_STEPIT(); + if (!load_v6_module(&ctx_cookie, &hCtx)) + return; + + test_setcolors(); + test_PBM_STEPIT(); + + unload_v6_module(ctx_cookie, hCtx); + cleanup(); } -- 2.16.1

1 0

[PATCH] wshom: Use global memory allocation helpers
by Nikolay Sivov 28 Feb '18

28 Feb '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/shell.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index d7b36cf6c7..1aa353a17a 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -24,6 +24,7 @@ #include "dispex.h" #include "wine/debug.h" +#include "wine/heap.h" #include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(wshom); @@ -130,7 +131,7 @@ static ULONG WINAPI WshExec_Release(IWshExec *iface) if (!ref) { CloseHandle(This->info.hThread); CloseHandle(This->info.hProcess); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -325,7 +326,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) *ret = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; @@ -333,7 +334,7 @@ static HRESULT WshExec_create(BSTR command, IWshExec **ret) This->ref = 1; if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &si, &This->info)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return HRESULT_FROM_WIN32(GetLastError()); } @@ -383,7 +384,7 @@ static ULONG WINAPI WshEnvironment_Release(IWshEnvironment *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -519,7 +520,7 @@ static HRESULT WshEnvironment_Create(IWshEnvironment **env) { WshEnvironment *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshEnvironment_iface.lpVtbl = &WshEnvironmentVtbl; @@ -572,7 +573,7 @@ static ULONG WINAPI WshCollection_Release(IWshCollection *iface) TRACE("(%p) ref = %d\n", This, ref); if (!ref) - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return ref; } @@ -721,7 +722,7 @@ static HRESULT WshCollection_Create(IWshCollection **collection) { WshCollection *This; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshCollection_iface.lpVtbl = &WshCollectionVtbl; @@ -778,7 +779,7 @@ static ULONG WINAPI WshShortcut_Release(IWshShortcut *iface) { SysFreeString(This->path_link); IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); } return ref; @@ -1077,7 +1078,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) *shortcut = NULL; - This = HeapAlloc(GetProcessHeap(), 0, sizeof(*This)); + This = heap_alloc(sizeof(*This)); if (!This) return E_OUTOFMEMORY; This->IWshShortcut_iface.lpVtbl = &WshShortcutVtbl; @@ -1087,7 +1088,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) &IID_IShellLinkW, (void**)&This->link); if (FAILED(hr)) { - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return hr; } @@ -1095,7 +1096,7 @@ static HRESULT WshShortcut_Create(const WCHAR *path, IDispatch **shortcut) if (!This->path_link) { IShellLinkW_Release(This->link); - HeapFree(GetProcessHeap(), 0, This); + heap_free(This); return E_OUTOFMEMORY; } @@ -1426,7 +1427,7 @@ static HRESULT split_reg_path(const WCHAR *path, WCHAR **subkey, WCHAR **value) unsigned int len = *value - *subkey - 1; WCHAR *ret; - ret = HeapAlloc(GetProcessHeap(), 0, (len+1)*sizeof(WCHAR)); + ret = heap_alloc((len + 1)*sizeof(WCHAR)); if (!ret) return E_OUTOFMEMORY; @@ -1466,7 +1467,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v if (ret == ERROR_SUCCESS) { void *data; - data = HeapAlloc(GetProcessHeap(), 0, datalen); + data = heap_alloc(datalen); if (!data) { hr = E_OUTOFMEMORY; goto fail; @@ -1474,7 +1475,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v ret = RegGetValueW(root, subkey, val, RRF_RT_ANY, &type, data, &datalen); if (ret) { - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); hr = HRESULT_FROM_WIN32(ret); goto fail; } @@ -1564,7 +1565,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v hr = E_FAIL; }; - HeapFree(GetProcessHeap(), 0, data); + heap_free(data); if (FAILED(hr)) VariantInit(value); } @@ -1573,7 +1574,7 @@ static HRESULT WINAPI WshShell3_RegRead(IWshShell3 *iface, BSTR name, VARIANT *v fail: if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; } @@ -1661,7 +1662,7 @@ static HRESULT WINAPI WshShell3_RegWrite(IWshShell3 *iface, BSTR name, VARIANT * fail: VariantClear(&v); if (val) - HeapFree(GetProcessHeap(), 0, subkey); + heap_free(subkey); return hr; } -- 2.16.1

1 0

[PATCH] adsldp: Implement IADsADSystemInfo::get_ComputerName(). (v2)
by Dmitry Timoshkov 28 Feb '18

28 Feb '18

v2: fixed a typo ('==' vs. '!='). Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 1 + dlls/adsldp/adsldp.c | 25 +++++++++++++++++++++++-- dlls/adsldp/tests/sysinfo.c | 1 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index e033d91a7e..c96e264666 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,4 +1,5 @@ MODULE = adsldp.dll +IMPORTS = oleaut32 secur32 C_SRCS = \ adsldp.c diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 15f1d23acd..4fc0de41eb 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,6 +28,8 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#define SECURITY_WIN32 +#include "security.h" #include "wine/debug.h" @@ -120,8 +122,27 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - FIXME("%p,%p: stub\n", iface, retval); - return E_NOTIMPL; + UINT size; + WCHAR *name; + + TRACE("%p,%p\n", iface, retval); + + size = 0; + GetComputerObjectNameW(NameFullyQualifiedDN, NULL, &size); + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + name = SysAllocStringLen(NULL, size); + if (!name) return E_OUTOFMEMORY; + + if (!GetComputerObjectNameW(NameFullyQualifiedDN, name, &size)) + { + SysFreeString(name); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *retval = name; + return S_OK; } static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 73435a6129..1e3939f0db 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -79,7 +79,6 @@ static void test_ComputerName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); -todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr == S_OK) { -- 2.16.2

1 0

[PATCH] secur32: Make GetComputerObjectName() tests pass when computer is part of a domain.
by Dmitry Timoshkov 28 Feb '18

28 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/secur32/tests/secur32.c | 91 +++++++++++++++++++++++++++++++------------- 1 file changed, 65 insertions(+), 26 deletions(-) diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c index df9e627f8e..40c272ada3 100644 --- a/dlls/secur32/tests/secur32.c +++ b/dlls/secur32/tests/secur32.c @@ -28,6 +28,7 @@ #include <security.h> #include <schannel.h> #include <wincred.h> +#include <winsock2.h> #include "wine/test.h" @@ -67,20 +68,40 @@ static void testGetComputerObjectNameA(void) UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = 0; + SetLastError(0xdeadbeef); + rc = pGetComputerObjectNameA(formats[i], NULL, &size); + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + switch (formats[i]) + { + case NameUnknown: + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(GetLastError() == ERROR_NONE_MAPPED || + GetLastError() == ERROR_NO_SUCH_USER || + GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%u: got %u\n", formats[i], GetLastError()); + break; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; + size = sizeof(name); - ZeroMemory(name, sizeof(name)); + SetLastError(0xdeadbeef); rc = pGetComputerObjectNameA(formats[i], name, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), - "GetComputerObjectNameA(%d) failed: %d\n", - formats[i], GetLastError()); - if (rc) - trace("GetComputerObjectNameA() returned %s\n", name); + switch (formats[i]) + { + case NameUnknown: + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(rc, "GetComputerObjectName(%u) error %u\n", formats[i], GetLastError()); + trace("GetComputerObjectName(%u) returned %s\n", formats[i], name); + break; + } } } @@ -92,22 +113,40 @@ static void testGetComputerObjectNameW(void) UINT i; for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); i++) { + size = 0; + SetLastError(0xdeadbeef); + rc = pGetComputerObjectNameW(formats[i], NULL, &size); + ok(!rc || broken(rc) /* win10 */, "GetComputerObjectName(%u) should fail\n", formats[i]); + switch (formats[i]) + { + case NameUnknown: + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(GetLastError() == ERROR_NONE_MAPPED || + GetLastError() == ERROR_NO_SUCH_USER || + GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO || + GetLastError() == WSAHOST_NOT_FOUND || + GetLastError() == ERROR_INSUFFICIENT_BUFFER, + "%u: got %u\n", formats[i], GetLastError()); + break; + } + + if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) continue; + size = sizeof(nameW)/sizeof(nameW[0]); - ZeroMemory(nameW, sizeof(nameW)); + SetLastError(0xdeadbeef); rc = pGetComputerObjectNameW(formats[i], nameW, &size); - ok(rc || ((formats[i] == NameUnknown) && - (GetLastError() == ERROR_INVALID_PARAMETER)) || - (GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO) || - (GetLastError() == ERROR_NO_SUCH_DOMAIN) || - (GetLastError() == ERROR_NO_SUCH_USER) || - (GetLastError() == ERROR_NONE_MAPPED) || - (GetLastError() == ERROR_ACCESS_DENIED), - "GetComputerObjectNameW(%d) failed: %d\n", - formats[i], GetLastError()); - if (rc) { - char name[256]; - WideCharToMultiByte( CP_ACP, 0, nameW, -1, name, sizeof(name), NULL, NULL ); - trace("GetComputerObjectNameW() returned %s\n", name); + switch (formats[i]) + { + case NameUnknown: + ok(!rc, "GetComputerObjectName(%u) should fail\n", formats[i]); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "%u: got %u\n", formats[i], GetLastError()); + break; + default: + ok(rc, "GetComputerObjectName(%u) error %u\n", formats[i], GetLastError()); + trace("GetComputerObjectName(%u) returned %s\n", formats[i], wine_dbgstr_w(nameW)); + break; } } } -- 2.16.2

1 0

[PATCH] adsldp: Implement IADsADSystemInfo::get_ComputerName().
by Dmitry Timoshkov 28 Feb '18

28 Feb '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/adsldp/Makefile.in | 1 + dlls/adsldp/adsldp.c | 25 +++++++++++++++++++++++-- dlls/adsldp/tests/sysinfo.c | 1 - 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/adsldp/Makefile.in b/dlls/adsldp/Makefile.in index e033d91a7e..c96e264666 100644 --- a/dlls/adsldp/Makefile.in +++ b/dlls/adsldp/Makefile.in @@ -1,4 +1,5 @@ MODULE = adsldp.dll +IMPORTS = oleaut32 secur32 C_SRCS = \ adsldp.c diff --git a/dlls/adsldp/adsldp.c b/dlls/adsldp/adsldp.c index 15f1d23acd..6f118ec88d 100644 --- a/dlls/adsldp/adsldp.c +++ b/dlls/adsldp/adsldp.c @@ -28,6 +28,8 @@ #include "objbase.h" #include "rpcproxy.h" #include "iads.h" +#define SECURITY_WIN32 +#include "security.h" #include "wine/debug.h" @@ -120,8 +122,27 @@ static HRESULT WINAPI sysinfo_get_UserName(IADsADSystemInfo *iface, BSTR *retval static HRESULT WINAPI sysinfo_get_ComputerName(IADsADSystemInfo *iface, BSTR *retval) { - FIXME("%p,%p: stub\n", iface, retval); - return E_NOTIMPL; + UINT size; + WCHAR *name; + + TRACE("%p,%p\n", iface, retval); + + size = 0; + GetComputerObjectNameW(NameFullyQualifiedDN, NULL, &size); + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) + return HRESULT_FROM_WIN32(GetLastError()); + + name = SysAllocStringLen(NULL, size); + if (!name) return E_OUTOFMEMORY; + + if (!GetComputerObjectNameW(NameFullyQualifiedDN, name, &size)) + { + SysFreeString(name); + return HRESULT_FROM_WIN32(GetLastError()); + } + + *retval = name; + return S_OK; } static HRESULT WINAPI sysinfo_get_SiteName(IADsADSystemInfo *iface, BSTR *retval) diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c index 73435a6129..1e3939f0db 100644 --- a/dlls/adsldp/tests/sysinfo.c +++ b/dlls/adsldp/tests/sysinfo.c @@ -79,7 +79,6 @@ static void test_ComputerName(void) ok(hr == S_OK, "got %#x\n", hr); hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); -todo_wine ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_CANT_ACCESS_DOMAIN_INFO), "got %#x\n", hr); if (hr == S_OK) { -- 2.16.2

1 0

[PATCH 4/4] testbot: Avoid race conditions between LibvirtTool monitor and other tools.
by Francois Gouget 28 Feb '18

28 Feb '18

If another tool was trying to connect to the VM's TestAgent server when 'LibvirtTool monitor' powered off the VM, that other tool may mark the VM as offline right after it has been put back online. So wait for other tools to time out after monitor powers off a VM. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This last patch is not related to snapshot support but since it touches LibvirtTool.pl I'm sending it with that series. testbot/bin/LibvirtTool.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 76ea70713..c0288e75a 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -285,7 +285,12 @@ sub Monitor() else { my $IsPoweredOn; - if (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) + if (!defined $SnapshotName) + { + Debug("$VMKey has no snapshot (reverting?)\n"); + $IsPoweredOn = undef; + } + elsif (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) { $IsPoweredOn = 0; } @@ -298,8 +303,16 @@ sub Monitor() if (defined $ErrMessage) { Error "$ErrMessage\n"; - $IsPoweredOn = undef; } + else + { + # Another process might have been trying to connect to the VM's + # TestAgent server. Wait for it to time out so it does not set the + # VM offline right after we have put it back online. + LogMsg "Powered off $VMKey. Sleep until all other processes accessing it are gone.\n"; + sleep(3 * $WaitForToolsInVM); + } + $IsPoweredOn = undef; } } if (defined $IsPoweredOn) -- 2.16.1

1 0

[PATCH 3/4] testbot: Replace poweroff with checkoff in the Engine's Cleanup().
by Francois Gouget 28 Feb '18

28 Feb '18

checkoff verifies that the hypervisor domain state matches that of the current VM instance before powering it off. If the state does not match then the VM is just marked off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Engine.pl | 8 ++++---- testbot/bin/LibvirtTool.pl | 28 ++++++++++++++++++++++++++-- testbot/lib/WineTestBot/VMs.pm | 20 ++++++++++++++++++++ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 2e62c660c..a03fa06b9 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -206,8 +206,8 @@ sub Cleanup($;$$) { # The VM should not have a process. $VM->KillChild(); - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff (unexpected process)"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check (unexpected process)"); } elsif ($Starting) { @@ -228,8 +228,8 @@ sub Cleanup($;$$) # Power off the VM, even if its status is already off. # This is the simplest way to resync the VM status field. # Also powering off a powered off VM will detect offline VMs. - $VM->RunPowerOff(); - $VM->RecordStatus($Records, "dirty poweroff"); + $VM->RunCheckOff(); + $VM->RecordStatus($Records, "dirty off check"); } } # $KillVMs is normally used on shutdown so don't start a process that diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 0293baeb7..76ea70713 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -104,7 +104,7 @@ while (@ARGV) { $LogOnly = 1; } - elsif ($Arg =~ /^(?:checkidle|monitor|poweroff|revert)$/) + elsif ($Arg =~ /^(?:checkidle|checkoff|monitor|poweroff|revert)$/) { $Action = $Arg; } @@ -163,7 +163,7 @@ if (!defined $Usage) } if (defined $Usage) { - print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|monitor|poweroff|revert) VMName\n"; + print "Usage: $Name0 [--debug] [--log-only] [--help] (checkidle|checkoff|monitor|poweroff|revert) VMName\n"; exit $Usage; } @@ -344,6 +344,26 @@ sub CheckIdle() return ChangeStatus("dirty", $NewStatus, "done"); } +sub CheckOff() +{ + $CurrentStatus = "dirty"; + my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + return ChangeStatus("dirty", "offline", "done") if (!defined $IsPoweredOn); + + if ($IsPoweredOn) + { + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + if ($SnapshotName eq $VM->IdleSnapshot) + { + my $ErrMessage = $VM->GetDomain()->PowerOff(); + FatalError("$ErrMessage\n") if (defined $ErrMessage); + } + } + + return ChangeStatus("dirty", "off", "done"); +} + sub Revert() { my $VM = CreateVMs()->GetItem($VMKey); @@ -405,6 +425,10 @@ if ($Action eq "checkidle") { $Rc = CheckIdle(); } +elsif ($Action eq "checkoff") +{ + $Rc = CheckOff(); +} elsif ($Action eq "monitor") { $Rc = Monitor(); diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index f09863996..afc7af985 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -451,6 +451,26 @@ sub RunCheckIdle($) =pod =over 12 +=item C<RunCheckOff()> + +If the hypervisor domain state matches that of this VM instance, power if off. +If not the VM is simply marked as off. While this is happening the VM status +is set to dirty so the job scheduler does not try to use it. + +This operation can take a long time so it is performed in a separate process. + +=back +=cut + +sub RunCheckOff($) +{ + my ($self) = @_; + return $self->_RunVMTool("dirty", ["--log-only", "checkoff", $self->GetKey()]); +} + +=pod +=over 12 + =item C<RunMonitor()> Monitors an offline VM to detect when it becomes accessible again. -- 2.16.1

1 0

[PATCH 2/4] testbot: Check the current snapshot in LibvirtTool monitor.
by Francois Gouget 28 Feb '18

28 Feb '18

If the snapshot does not match when the hypervisor domain becomes accessible again, then don't try to power if off and just mark the VM instance as off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/LibvirtTool.pl | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 12eaa669f..0293baeb7 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -277,23 +277,39 @@ sub Monitor() return 0; } - my $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); - if ($IsPoweredOn) + my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); + if (defined $ErrMessage) { - my $ErrMessage = $VM->GetDomain()->PowerOff(); - if (defined $ErrMessage) - { - Error "$ErrMessage\n"; - $IsPoweredOn = undef; - } + Error "$ErrMessage\n"; } - if (defined $IsPoweredOn) + else { - return 1 if (ChangeStatus("offline", "off", "done")); - NotifyAdministrator("The $VMKey VM is working again", - "The $VMKey VM started working again after ". - Elapsed($Start) ." seconds."); - return 0; + my $IsPoweredOn; + if (!defined $SnapshotName or $SnapshotName ne $VM->IdleSnapshot) + { + $IsPoweredOn = 0; + } + else + { + $IsPoweredOn = $VM->GetDomain()->IsPoweredOn(); + if ($IsPoweredOn) + { + $ErrMessage = $VM->GetDomain()->PowerOff(); + if (defined $ErrMessage) + { + Error "$ErrMessage\n"; + $IsPoweredOn = undef; + } + } + } + if (defined $IsPoweredOn) + { + return 1 if (ChangeStatus("offline", "off", "done")); + NotifyAdministrator("The $VMKey VM is working again", + "The $VMKey VM started working again after ". + Elapsed($Start) ." seconds."); + return 0; + } } Debug(Elapsed($Start), " $VMKey is still unreachable\n"); -- 2.16.1

1 0

[PATCH 1/4] testbot: Check the current snapshot in LibvirtTool checkidle.
by Francois Gouget 28 Feb '18

28 Feb '18

If the snapshot does not match then the current VM instance is not actually using the hypervisor domain so mark it off. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- This set of patches paves the way for allowing the TestBot to use more than one snapshot per VM (i.e. more than one test configuration per VM). But they can make sense even without it. For instance here if the snapshot does not match then one can consider that maybe the administrator decided to do something with the VM so it makes sense for the TestBot to leave it alone for now. But it's definitely the administrator's fault for not setting the VM status to 'maintenance' if the TestBot later reverts the VM from under his feet. testbot/bin/LibvirtTool.pl | 7 +++++-- testbot/lib/WineTestBot/VMs.pm | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/testbot/bin/LibvirtTool.pl b/testbot/bin/LibvirtTool.pl index 670c55359..12eaa669f 100755 --- a/testbot/bin/LibvirtTool.pl +++ b/testbot/bin/LibvirtTool.pl @@ -320,9 +320,12 @@ sub CheckIdle() my ($ErrMessage, $SnapshotName) = $VM->GetDomain()->GetSnapshotName(); FatalError("$ErrMessage\n") if (defined $ErrMessage); - return PowerOff() if ($SnapshotName ne $VM->IdleSnapshot); - return ChangeStatus("dirty", "idle", "done"); + # If the snapshot does not match then the virtual machine may be used by + # another VM instance. So don't touch it. All that counts is that this + # VM instance is not running. + my $NewStatus = ($SnapshotName eq $VM->IdleSnapshot) ? "idle" : "off"; + return ChangeStatus("dirty", $NewStatus, "done"); } sub Revert() diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index d893e4966..f09863996 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -433,9 +433,9 @@ sub _RunVMTool($$$) =item C<RunCheckIdle()> -If the virtual machine state matches that of this VM instance, sets its status -to idle. If not the VM is simply marked as off. While this is happening the -VM status is set to dirty so the job scheduler does not try to use it. +If the hypervisor domain state matches that of this VM instance, sets its +status to idle. If not the VM is simply marked as off. While this is happening +the VM status is set to dirty so the job scheduler does not try to use it. This operation can take a long time so it is performed in a separate process. -- 2.16.1

1 0

[PATCH] testbot/Janitor: Remove a spurious leading 0 in a log message.
by Francois Gouget 28 Feb '18

28 Feb '18

The leading 0 is a convention only used to communicate with the Engine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/Janitor.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl index 382408d15..d8a9650f1 100755 --- a/testbot/bin/Janitor.pl +++ b/testbot/bin/Janitor.pl @@ -258,7 +258,7 @@ if (opendir(my $dh, "$DataDir/staging")) } else { - LogMsg "0Unable to open '$DataDir/staging': $!"; + LogMsg "Unable to open '$DataDir/staging': $!"; } # Delete obsolete record groups -- 2.16.1

1 0

[PATCH] hal: Implement KeQueryPerformanceCounter.
by Zebediah Figura 28 Feb '18

28 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Fixes https://bugs.winehq.org/show_bug.cgi?id=39500 dlls/hal/hal.c | 10 ++++++++++ dlls/hal/hal.spec | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/hal/hal.c b/dlls/hal/hal.c index ddd8710..51bf55d 100644 --- a/dlls/hal/hal.c +++ b/dlls/hal/hal.c @@ -177,3 +177,13 @@ void WINAPI WRITE_PORT_ULONG(ULONG *port, ULONG value) { FIXME("(%p %d) stub!\n", port, value); } + +ULONGLONG WINAPI KeQueryPerformanceCounter(LARGE_INTEGER *frequency) +{ + LARGE_INTEGER counter; + + TRACE("(%p)\n", frequency); + + NtQueryPerformanceCounter(&counter, frequency); + return counter.QuadPart; +} diff --git a/dlls/hal/hal.spec b/dlls/hal/hal.spec index ae706e0..5dc3fa8 100644 --- a/dlls/hal/hal.spec +++ b/dlls/hal/hal.spec @@ -72,7 +72,7 @@ @ stub KeFlushWriteBuffer @ stdcall KeGetCurrentIrql() @ stub KeLowerIrql -@ stub KeQueryPerformanceCounter +@ stdcall -ret64 KeQueryPerformanceCounter(ptr) @ stub KeRaiseIrql @ stub KeRaiseIrqlToDpcLevel @ stub KeRaiseIrqlToSynchLevel -- 2.7.4

1 0

[PATCH] comctl32: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 28 Feb '18

28 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/commctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index afa6b843d6..9356624a13 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1430,7 +1430,7 @@ void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark {lCentre + 1, l2 - 3}, }; hOldPen = SelectObject(hDC, hPen); - PolyPolyline(hDC, aptInsertMark, adwPolyPoints, sizeof(adwPolyPoints)/sizeof(adwPolyPoints[0])); + PolyPolyline(hDC, aptInsertMark, adwPolyPoints, ARRAY_SIZE(adwPolyPoints)); SelectObject(hDC, hOldPen); DeleteObject(hPen); } -- 2.14.3

1 0

[PATCH] scrrun: Use the available ARRAY_SIZE() macro
by Michael Stefaniuc 28 Feb '18

28 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 0527531948..aa1660085e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -1001,7 +1001,7 @@ static HRESULT WINAPI drive_get_VolumeName(IDrive *iface, BSTR *name) return E_POINTER; *name = NULL; - ret = GetVolumeInformationW(This->root, nameW, sizeof(nameW)/sizeof(WCHAR), NULL, NULL, NULL, NULL, 0); + ret = GetVolumeInformationW(This->root, nameW, ARRAY_SIZE(nameW), NULL, NULL, NULL, NULL, 0); if (ret) *name = SysAllocString(nameW); return ret ? S_OK : E_FAIL; @@ -1026,7 +1026,7 @@ static HRESULT WINAPI drive_get_FileSystem(IDrive *iface, BSTR *fs) return E_POINTER; *fs = NULL; - ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, sizeof(nameW)/sizeof(WCHAR)); + ret = GetVolumeInformationW(This->root, NULL, 0, NULL, NULL, NULL, nameW, ARRAY_SIZE(nameW)); if (ret) *fs = SysAllocString(nameW); return ret ? S_OK : E_FAIL; -- 2.14.3

1 0

[PATCH] ntdll: Fix error code when querying too large memory address.
by Zebediah Figura 27 Feb '18

27 Feb '18

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Process Hacker calls this function in a loop to determine the working set limit, and expects it to return STATUS_INVALID_PARAMETER if the given address is too high. This patch allows Process Hacker to enumerate a process's virtual mappings. Test simplified from staging version. dlls/ntdll/tests/info.c | 4 ++++ dlls/ntdll/virtual.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index b62e035..1f1c675 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -1868,6 +1868,10 @@ static void test_queryvirtualmemory(void) "mbi.Protect is 0x%x\n", mbi.Protect); } else skip( "bss is outside of module\n" ); /* this can happen on Mac OS */ + + /* check error code when addr is higher than working set limit */ + status = pNtQueryVirtualMemory(NtCurrentProcess(), (void *)~0, MemoryBasicInformation, &mbi, sizeof(mbi), &readcount); + ok(status == STATUS_INVALID_PARAMETER, "Expected STATUS_INVALID_PARAMETER, got %08x\n", status); } static void test_affinity(void) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 106dab2..befb59c 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2845,7 +2845,7 @@ NTSTATUS WINAPI NtQueryVirtualMemory( HANDLE process, LPCVOID addr, base = ROUND_ADDR( addr, page_mask ); - if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (is_beyond_limit( base, 1, working_set_limit )) return STATUS_INVALID_PARAMETER; /* Find the view containing the address */ -- 2.7.4

1 0

[PATCH] dmcompos/tests: Add IDirectMusicObject::ParseDescriptor() tests
by Michael Stefaniuc 27 Feb '18

27 Feb '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dmcompos/tests/dmcompos.c | 188 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/dmcompos/tests/dmcompos.c b/dlls/dmcompos/tests/dmcompos.c index 26c6e1f9a3..d8e4650e44 100644 --- a/dlls/dmcompos/tests/dmcompos.c +++ b/dlls/dmcompos/tests/dmcompos.c @@ -22,10 +22,14 @@ #include <windef.h> #include <initguid.h> #include <wine/test.h> +#include <ole2.h> #include <dmusici.h> +#include <dmusicf.h> #define ARRAY_SIZE(a) (sizeof(a)/sizeof((a)[0])) +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); + static BOOL missing_dmcompos(void) { IDirectMusicComposer *dmc; @@ -398,6 +402,189 @@ static void test_signposttrack(void) while (IDirectMusicTrack8_Release(dmt8)); } +struct chunk { + FOURCC id; + DWORD size; + FOURCC type; +}; + +#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD)) + +/* Generate a RIFF file format stream from an array of FOURCC ids. + RIFF and LIST need to be followed by the form type respectively list type, + followed by the chunks of the list and terminated with 0. */ +static IStream *gen_riff_stream(const FOURCC *ids) +{ + int level = -1; + DWORD *sizes[4]; /* Stack for the sizes of RIFF and LIST chunks */ + char riff[1024]; + char *p = riff; + struct chunk *ck; + IStream *stream; + LARGE_INTEGER zero = {0}; + + do { + ck = (struct chunk *)p; + ck->id = *ids++; + switch (ck->id) { + case 0: + *sizes[level] = p - (char *)sizes[level] - sizeof(DWORD); + level--; + break; + case FOURCC_LIST: + case FOURCC_RIFF: + level++; + sizes[level] = &ck->size; + ck->type = *ids++; + p += sizeof(*ck); + break; + case DMUS_FOURCC_GUID_CHUNK: + ck->size = sizeof(GUID_NULL); + p += CHUNK_HDR_SIZE; + memcpy(p, &GUID_NULL, sizeof(GUID_NULL)); + p += ck->size; + break; + case DMUS_FOURCC_VERSION_CHUNK: + { + DMUS_VERSION ver = {5, 8}; + + ck->size = sizeof(ver); + p += CHUNK_HDR_SIZE; + memcpy(p, &ver, sizeof(ver)); + p += ck->size; + break; + } + default: + { + /* Just convert the FOURCC id to a WCHAR string */ + WCHAR *s; + + ck->size = 5 * sizeof(WCHAR); + p += CHUNK_HDR_SIZE; + s = (WCHAR *)p; + s[0] = (char)(ck->id); + s[1] = (char)(ck->id >> 8); + s[2] = (char)(ck->id >> 16); + s[3] = (char)(ck->id >> 24); + s[4] = 0; + p += ck->size; + } + } + } while (level >= 0); + + ck = (struct chunk *)riff; + CreateStreamOnHGlobal(NULL, TRUE, &stream); + IStream_Write(stream, riff, ck->size + CHUNK_HDR_SIZE, NULL); + IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); + + return stream; +} + +static void test_parsedescriptor(void) +{ + IDirectMusicObject *dmo; + IStream *stream; + DMUS_OBJECTDESC desc = {0}; + HRESULT hr; + const FOURCC alldesc[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, FOURCC_LIST, + DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, DMUS_FOURCC_UCOP_CHUNK, + DMUS_FOURCC_UCMT_CHUNK, DMUS_FOURCC_USBJ_CHUNK, 0, DMUS_FOURCC_VERSION_CHUNK, + DMUS_FOURCC_GUID_CHUNK, 0 + }; + const FOURCC dupes[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, DMUS_FOURCC_CATEGORY_CHUNK, DMUS_FOURCC_CATEGORY_CHUNK, + DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_VERSION_CHUNK, DMUS_FOURCC_GUID_CHUNK, + DMUS_FOURCC_GUID_CHUNK, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, DMUS_FOURCC_UNAM_CHUNK, 0, + FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, mmioFOURCC('I','N','A','M'), 0, 0 + }; + FOURCC empty[] = {FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, 0}; + FOURCC inam[] = + { + FOURCC_RIFF, DMUS_FOURCC_CHORDMAP_FORM, FOURCC_LIST, DMUS_FOURCC_UNFO_LIST, + mmioFOURCC('I','N','A','M'), 0, 0 + }; + + hr = CoCreateInstance(&CLSID_DirectMusicChordMap, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void **)&dmo); + ok(hr == S_OK, "DirectMusicChordMap create failed: %08x, expected S_OK\n", hr); + + /* Nothing loaded */ + hr = IDirectMusicObject_GetDescriptor(dmo, &desc); + ok(hr == S_OK, "GetDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_OBJECT\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + + /* Empty RIFF stream */ + stream = gen_riff_stream(empty); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* Wrong form */ + empty[1] = DMUS_FOURCC_CONTAINER_FORM; + stream = gen_riff_stream(empty); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + todo_wine ok(hr == DMUS_E_CHUNKNOTFOUND, + "ParseDescriptor failed: %08x, expected DMUS_E_CHUNKNOTFOUND\n", hr); + + /* All desc chunks, only DMUS_OBJ_OBJECT and DMUS_OBJ_CLASS supported */ + stream = gen_riff_stream(alldesc); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + ok(IsEqualGUID(&desc.guidClass, &CLSID_DirectMusicChordMap), + "Got class guid %s, expected CLSID_DirectMusicChordMap\n", + wine_dbgstr_guid(&desc.guidClass)); + ok(IsEqualGUID(&desc.guidObject, &GUID_NULL), "Got object guid %s, expected GUID_NULL\n", + wine_dbgstr_guid(&desc.guidClass)); + IStream_Release(stream); + + /* UNFO list with INAM */ + inam[3] = DMUS_FOURCC_UNFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == DMUS_OBJ_CLASS, + "Got valid data %#x, expected DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + /* INFO list with INAM */ + inam[3] = DMUS_FOURCC_INFO_LIST; + stream = gen_riff_stream(inam); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + ok(desc.dwValidData == DMUS_OBJ_CLASS, "Got valid data %#x, expected DMUS_OBJ_CLASS\n", + desc.dwValidData); + IStream_Release(stream); + + /* Duplicated chunks */ + stream = gen_riff_stream(dupes); + memset(&desc, 0, sizeof(desc)); + hr = IDirectMusicObject_ParseDescriptor(dmo, stream, &desc); + ok(hr == S_OK, "ParseDescriptor failed: %08x, expected S_OK\n", hr); + todo_wine ok(desc.dwValidData == (DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS), + "Got valid data %#x, expected DMUS_OBJ_OBJECT | DMUS_OBJ_CLASS\n", desc.dwValidData); + IStream_Release(stream); + + IDirectMusicObject_Release(dmo); +} + START_TEST(dmcompos) { CoInitialize(NULL); @@ -415,6 +602,7 @@ START_TEST(dmcompos) test_chordmap(); test_chordmaptrack(); test_signposttrack(); + test_parsedescriptor(); CoUninitialize(); } -- 2.14.3

1 0

[PATCH v2 1/2] comctl32: Preserve tooltip size and position after TTN_SHOW correctly.
by Roman Pišl 27 Feb '18

27 Feb '18

Fixes: https://bugs.winehq.org/show_bug.cgi?id=14336 https://bugs.winehq.org/show_bug.cgi?id=29864 https://bugs.winehq.org/show_bug.cgi?id=38298 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/comctl32/tooltips.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 12f2d4b81c..f84b203f2b 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -589,6 +589,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) int ptfx = 0; DWORD style = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE); INT nTool, current; + LRESULT res; if (track_activate) { @@ -627,11 +628,6 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) TRACE("Show tooltip %d\n", nTool); - hdr.hwndFrom = infoPtr->hwndSelf; - hdr.idFrom = toolPtr->uId; - hdr.code = TTN_SHOW; - SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); - TRACE("%s\n", debugstr_w(infoPtr->szTipText)); TOOLTIPS_CalcTipSize (infoPtr, &size); @@ -824,9 +820,30 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) * it is no longer needed */ } - SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, - rect.right - rect.left, rect.bottom - rect.top, - SWP_SHOWWINDOW | SWP_NOACTIVATE); + /* set calculated windows size and position */ + SetWindowPos (infoPtr->hwndSelf, NULL, rect.left, rect.top, + rect.right - rect.left, rect.bottom - rect.top, + SWP_NOZORDER | SWP_NOACTIVATE); + + /* call TTN_SHOW, an application may adjust size and/or position */ + hdr.hwndFrom = infoPtr->hwndSelf; + hdr.idFrom = toolPtr->uId; + hdr.code = TTN_SHOW; + res = SendMessageW (toolPtr->hwnd, WM_NOTIFY, toolPtr->uId, (LPARAM)&hdr); + + if (res) + { + /* TRUE returned if position was changed */ + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, -1, -1, -1, -1, + SWP_NOSIZE | SWP_NOMOVE | SWP_SHOWWINDOW | SWP_NOACTIVATE); + } + else + { + /* FALSE returned, still the size could have been modified and we have + * to preserve it */ + SetWindowPos (infoPtr->hwndSelf, HWND_TOPMOST, rect.left, rect.top, -1, -1, + SWP_NOSIZE | SWP_SHOWWINDOW | SWP_NOACTIVATE); + } /* repaint the tooltip */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); -- 2.16.1

3 5

[PATCH 1/5] wined3d: Terminate long debug strings with ellipsis.
by Józef Kucia 27 Feb '18

27 Feb '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a9db5e072919..a54e18efd9cf 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4162,7 +4162,7 @@ static void init_debug_buffer(struct debug_buffer *buffer, const char *default_s buffer->size = ARRAY_SIZE(buffer->str); } -static BOOL debug_append(struct debug_buffer *buffer, const char *str, const char *separator) +static void debug_append(struct debug_buffer *buffer, const char *str, const char *separator) { int size; @@ -4172,12 +4172,12 @@ static BOOL debug_append(struct debug_buffer *buffer, const char *str, const cha if (size == -1 || size >= buffer->size) { buffer->size = 0; - return FALSE; + strcpy(&buffer->str[ARRAY_SIZE(buffer->str) - 4], "..."); + return; } buffer->ptr += size; buffer->size -= size; - return TRUE; } const char *wined3d_debug_resource_access(DWORD access) -- 2.16.1

3 10

[PATCH] d3d10_1: Add missing forwards to d3d10.
by Alistair Leslie-Hughes 27 Feb '18

27 Feb '18

From: Sebastian Lackner <sebastian(a)fds-team.de> Spotted by Jarkko Korpi. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/d3d10_1/d3d10_1.spec | 24 ++++++++++++------------ tools/make_specfiles | 4 ++++ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/dlls/d3d10_1/d3d10_1.spec b/dlls/d3d10_1/d3d10_1.spec index 18eb3ac..10edc3f 100644 --- a/dlls/d3d10_1/d3d10_1.spec +++ b/dlls/d3d10_1/d3d10_1.spec @@ -1,24 +1,24 @@ @ stub RevertToOldImplementation -@ stub D3D10CompileEffectFromMemory -@ stub D3D10CompileShader -@ stub D3D10CreateBlob +@ stdcall D3D10CompileEffectFromMemory(ptr long ptr ptr ptr long long ptr ptr) d3d10.D3D10CompileEffectFromMemory +@ stdcall D3D10CompileShader(ptr long str ptr ptr str str long ptr ptr) d3d10.D3D10CompileShader +@ stdcall D3D10CreateBlob(long ptr) d3d10.D3D10CreateBlob @ stdcall D3D10CreateDevice1(ptr long ptr long long long ptr) @ stdcall D3D10CreateDeviceAndSwapChain1(ptr long ptr long long long ptr ptr ptr) @ stdcall D3D10CreateEffectFromMemory(ptr long long ptr ptr ptr) d3d10.D3D10CreateEffectFromMemory @ stdcall D3D10CreateEffectPoolFromMemory(ptr long long ptr ptr) d3d10.D3D10CreateEffectPoolFromMemory @ stdcall D3D10CreateStateBlock(ptr ptr ptr) d3d10.D3D10CreateStateBlock @ stub D3D10DisassembleEffect -@ stub D3D10DisassembleShader -@ stub D3D10GetGeometryShaderProfile -@ stub D3D10GetInputAndOutputSignatureBlob -@ stub D3D10GetInputSignatureBlob -@ stub D3D10GetOutputSignatureBlob -@ stub D3D10GetPixelShaderProfile -@ stub D3D10GetShaderDebugInfo +@ stdcall D3D10DisassembleShader(ptr long long ptr ptr) d3d10.D3D10DisassembleShader +@ stdcall D3D10GetGeometryShaderProfile(ptr) d3d10.D3D10GetGeometryShaderProfile +@ stdcall D3D10GetInputAndOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputAndOutputSignatureBlob +@ stdcall D3D10GetInputSignatureBlob(ptr long ptr) d3d10.D3D10GetInputSignatureBlob +@ stdcall D3D10GetOutputSignatureBlob(ptr long ptr) d3d10.D3D10GetOutputSignatureBlob +@ stdcall D3D10GetPixelShaderProfile(ptr) d3d10.D3D10GetPixelShaderProfile +@ stdcall D3D10GetShaderDebugInfo(ptr long ptr) d3d10.D3D10GetShaderDebugInfo @ stub D3D10GetVersion -@ stub D3D10GetVertexShaderProfile +@ stdcall D3D10GetVertexShaderProfile(ptr) d3d10.D3D10GetVertexShaderProfile @ stub D3D10PreprocessShader -@ stub D3D10ReflectShader +@ stdcall D3D10ReflectShader(ptr long ptr) d3d10.D3D10ReflectShader @ stub D3D10RegisterLayers @ stdcall D3D10StateBlockMaskDifference(ptr ptr ptr) d3d10.D3D10StateBlockMaskDifference @ stdcall D3D10StateBlockMaskDisableAll(ptr) d3d10.D3D10StateBlockMaskDisableAll diff --git a/tools/make_specfiles b/tools/make_specfiles index 6b59b32..1e8a894 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -75,6 +75,10 @@ my @dll_groups = "msvcp120_app", ], [ + "d3d10", + "d3d10_1", + ], + [ "d3dx10_43", "d3dx10_42", "d3dx10_41", -- 1.9.1

2 1

[PATCH 7/7] mshtml: Merge htmltablecell.c into htmltable.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 484 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablecell.c | 515 -------------------------------------------- 3 files changed, 483 insertions(+), 517 deletions(-) delete mode 100644 dlls/mshtml/htmltablecell.c

1 0

[PATCH 6/7] mshtml: Merge htmltablerow.c into htmltable.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmltable.c | 446 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmltablerow.c | 477 --------------------------------------------- 3 files changed, 445 insertions(+), 479 deletions(-) delete mode 100644 dlls/mshtml/htmltablerow.c

1 0

[PATCH 5/7] mshtml: Merge htmloption.c into htmlselect.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmloption.c | 623 ----------------------------------------------- dlls/mshtml/htmlselect.c | 592 +++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 591 insertions(+), 625 deletions(-) delete mode 100644 dlls/mshtml/htmloption.c

1 0

[PATCH 4/7] mshtml: Merge htmlmeta.c into htmlhead.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlhead.c | 243 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlmeta.c | 273 ------------------------------------------------ 3 files changed, 242 insertions(+), 275 deletions(-) delete mode 100644 dlls/mshtml/htmlmeta.c

1 0

[PATCH 3/7] mshtml: Merge htmlembed.c into htmlobject.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlembed.c | 289 ----------------------------------------------- dlls/mshtml/htmlobject.c | 256 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 256 insertions(+), 290 deletions(-) delete mode 100644 dlls/mshtml/htmlembed.c

1 0

[PATCH 2/7] mshtml: Merge htmliframe.c into htmlframe.c.
by Jacek Caban 27 Feb '18

27 Feb '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlframe.c | 590 ++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmliframe.c | 616 ------------------------------------------- dlls/mshtml/mshtml_private.h | 4 - 4 files changed, 587 insertions(+), 624 deletions(-) delete mode 100644 dlls/mshtml/htmliframe.c

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel