February 2018 - Wine-commits

Nikolay Sivov : ntdll: Allow closing tags for 'supportedOS' elements.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: f8cca445fb103812ff77bf47d6d46c454786e007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8cca445fb103812ff77bf47… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 20 15:57:47 2018 +0300 ntdll: Allow closing tags for 'supportedOS' elements. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 4 +-- dlls/ntdll/actctx.c | 70 ++++++++++++++++++++++++++------------------ 2 files changed, 44 insertions(+), 30 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index cef11a5..263fe39 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -426,9 +426,9 @@ static const char compat_manifest_vista_7_8_10_81[] = " <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" " <compatibility xmlns=\"urn:schemas-microsoft-com:compatibility.v1\">" " <application>" -" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" />" /* Windows Vista */ +" <supportedOS Id=\"{e2011457-1546-43c5-a5fe-008deee3d3f0}\" ></supportedOS>" /* Windows Vista */ " <supportedOS Id=\"{35138b9a-5d96-4fbd-8e2d-a2440225f93a}\" />" /* Windows 7 */ -" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" />" /* Windows 8 */ +" <supportedOS Id=\"{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}\" ></supportedOS>" /* Windows 8 */ " <supportedOS Id=\"{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}\" />" /* Windows 10 */ " <supportedOS Id=\"{1f676c76-80e1-4239-95bb-83d0f6d0da78}\" />" /* Windows 8.1 */ " </application>" diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 4a33700..27d6ad8 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2245,11 +2245,50 @@ static BOOL parse_file_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct return ret; } +static BOOL parse_supportedos_elem(xmlbuf_t *xmlbuf, struct assembly *assembly, struct actctx_loader *acl) +{ + xmlstr_t attr_name, attr_value; + BOOL end = FALSE, error; + + while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) + { + if (xmlstr_cmp(&attr_name, IdW)) + { + COMPATIBILITY_CONTEXT_ELEMENT *compat; + UNICODE_STRING str; + GUID compat_id; + + str.Buffer = (PWSTR)attr_value.ptr; + str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); + if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) + { + if (!(compat = add_compat_context(assembly))) return FALSE; + compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Id = compat_id; + } + else + { + WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); + } + } + else + { + WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), + debugstr_xmlstr(&attr_value)); + } + } + + if (error) return FALSE; + if (end) return TRUE; + + return parse_expect_end_elem(xmlbuf, supportedOSW, asmv1W); +} + static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assembly* assembly, struct actctx_loader* acl) { - xmlstr_t attr_name, attr_value, elem; - BOOL end = FALSE, ret = TRUE, error; + BOOL ret = TRUE; + xmlstr_t elem; while (ret && (ret = next_xml_elem(xmlbuf, &elem))) { @@ -2260,32 +2299,7 @@ static BOOL parse_compatibility_application_elem(xmlbuf_t* xmlbuf, struct assemb } else if (xmlstr_cmp(&elem, supportedOSW)) { - while (next_xml_attr(xmlbuf, &attr_name, &attr_value, &error, &end)) - { - if (xmlstr_cmp(&attr_name, IdW)) - { - UNICODE_STRING str; - COMPATIBILITY_CONTEXT_ELEMENT* compat; - GUID compat_id; - str.Buffer = (PWSTR)attr_value.ptr; - str.Length = str.MaximumLength = (USHORT)attr_value.len * sizeof(WCHAR); - if (RtlGUIDFromString(&str, &compat_id) == STATUS_SUCCESS) - { - if (!(compat = add_compat_context(assembly))) return FALSE; - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; - compat->Id = compat_id; - } - else - { - WARN("Invalid guid %s\n", debugstr_xmlstr(&attr_value)); - } - } - else - { - WARN("unknown attr %s=%s\n", debugstr_xmlstr(&attr_name), - debugstr_xmlstr(&attr_value)); - } - } + ret = parse_supportedos_elem(xmlbuf, assembly, acl); } else {

1 0

Henri Verbeet : usp10: Make "pair_count" unsigned in computeBracketPairs() .
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 24f64acc357a4682b3caa6e6a97db2ba9875dfad URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f64acc357a4682b3caa6e6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:21:59 2018 +0330 usp10: Make "pair_count" unsigned in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 8f94ede..2277190 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -692,8 +692,8 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) WCHAR *open_stack; int *stack_index; int stack_top = iso_run->length; + unsigned int pair_count = 0; BracketPair *out = NULL; - int pair_count = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -745,13 +745,13 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(open_stack); heap_free(stack_index); - if (pair_count == 0) + if (!pair_count) { heap_free(out); - out = NULL; + return NULL; } - else if (pair_count > 1) - qsort(out, pair_count, sizeof(BracketPair), compr); + + qsort(out, pair_count, sizeof(*out), compr); return out; }

1 0

Henri Verbeet : usp10: Use usp10_array_reserve() in computeBracketPairs().
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: d48dd7efbf5e7e78e5b42c893341256b5054b4ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=d48dd7efbf5e7e78e5b42c89… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:00 2018 +0330 usp10: Use usp10_array_reserve() in computeBracketPairs(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/bidi.c | 71 +++++++++++++++++++++++++++---------------------------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/dlls/usp10/bidi.c b/dlls/usp10/bidi.c index 2277190..b0df781 100644 --- a/dlls/usp10/bidi.c +++ b/dlls/usp10/bidi.c @@ -694,6 +694,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) int stack_top = iso_run->length; unsigned int pair_count = 0; BracketPair *out = NULL; + SIZE_T out_size = 0; int i; open_stack = heap_alloc(iso_run->length * sizeof(*open_stack)); @@ -702,42 +703,43 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) for (i = 0; i < iso_run->length; i++) { unsigned short ubv = get_table_entry(bidi_bracket_table, iso_run->item[i].ch); - if (ubv) + + if (!ubv) + continue; + + if ((ubv >> 8) == 0) { - if (!out) - { - out = heap_alloc(sizeof(*out)); - out[0].start = -1; - } + --stack_top; + open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); + /* Deal with canonical equivalent U+2329/232A and U+3008/3009. */ + if (open_stack[stack_top] == 0x232a) + open_stack[stack_top] = 0x3009; + stack_index[stack_top] = i; + } + else if ((ubv >> 8) == 1) + { + unsigned int j; - if ((ubv >> 8) == 0) - { - stack_top --; - open_stack[stack_top] = iso_run->item[i].ch + (signed char)(ubv & 0xff); - /* deal with canonical equivalent U+2329/232A and U+3008/3009 */ - if (open_stack[stack_top] == 0x232A) - open_stack[stack_top] = 0x3009; - stack_index[stack_top] = i; - } - else if ((ubv >> 8) == 1) + for (j = stack_top; j < iso_run->length; ++j) { - int j; - if (stack_top == iso_run->length) continue; - for (j = stack_top; j < iso_run->length; j++) - { - WCHAR c = iso_run->item[i].ch; - if (c == 0x232A) c = 0x3009; - if (c == open_stack[j]) - { - out[pair_count].start = stack_index[j]; - out[pair_count].end = i; - pair_count++; - out = HeapReAlloc(GetProcessHeap(), 0, out, sizeof(BracketPair) * (pair_count+1)); - out[pair_count].start = -1; - stack_top = j+1; - break; - } - } + WCHAR c = iso_run->item[i].ch; + + if (c == 0x232a) + c = 0x3009; + + if (c != open_stack[j]) + continue; + + if (!(usp10_array_reserve((void **)&out, &out_size, pair_count + 2, sizeof(*out)))) + ERR("Failed to grow output array.\n"); + + out[pair_count].start = stack_index[j]; + out[pair_count].end = i; + ++pair_count; + + out[pair_count].start = -1; + stack_top = j + 1; + break; } } } @@ -746,10 +748,7 @@ static BracketPair *computeBracketPairs(IsolatedRun *iso_run) heap_free(stack_index); if (!pair_count) - { - heap_free(out); return NULL; - } qsort(out, pair_count, sizeof(*out), compr);

1 0

Henri Verbeet : usp10/tests: Introduce an ARRAY_SIZE macro.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 3630703ae8faec522ff7b4e7f16f3b56f2ac2915 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3630703ae8faec522ff7b4e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:01 2018 +0330 usp10/tests: Introduce an ARRAY_SIZE macro. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 112 +++++++++++++++++++++-------------------------- 1 file changed, 50 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3630703ae8faec522ff7…

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptItemIzeShapePlace().
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 5956b53f295cca5b7609e6162ffbb8d3aa8c3f0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5956b53f295cca5b7609e616… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:02 2018 +0330 usp10/tests: Cleanup test_ScriptItemIzeShapePlace(). This mostly just removes redundant branches and variables. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 256 +++++++++++++++++++---------------------------- 1 file changed, 103 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=5956b53f295cca5b7609…

1 0

Henri Verbeet : usp10/tests: Cleanup test_ScriptTextOut().
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 467bf31eef4f2bf95c54f11588ffa855cef812ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=467bf31eef4f2bf95c54f115… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 20 10:22:03 2018 +0330 usp10/tests: Cleanup test_ScriptTextOut(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 129 +++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 78 deletions(-) diff --git a/dlls/usp10/tests/usp10.c b/dlls/usp10/tests/usp10.c index d9feb7f..0cfe0a9 100644 --- a/dlls/usp10/tests/usp10.c +++ b/dlls/usp10/tests/usp10.c @@ -2638,14 +2638,11 @@ static void test_ScriptTextOut(HDC hdc) HRESULT hr; int cInChars; - int cMaxItems; SCRIPT_ITEM pItem[255]; int pcItems; WCHAR TestItem1[] = {'T', 'e', 's', 't', 'a', 0}; SCRIPT_CACHE psc; - int cChars; - int cMaxGlyphs; unsigned short pwOutGlyphs1[256]; WORD pwLogClust[256]; SCRIPT_VISATTR psva[256]; @@ -2655,93 +2652,69 @@ static void test_ScriptTextOut(HDC hdc) ABC pABC[256]; RECT rect; int piX; - int iCP = 1; - BOOL fTrailing = FALSE; - SCRIPT_LOGATTR *psla; SCRIPT_LOGATTR sla[256]; - /* This is a valid test that will cause parsing to take place */ - cInChars = 5; - cMaxItems = 255; - hr = ScriptItemize(TestItem1, cInChars, cMaxItems, NULL, NULL, pItem, &pcItems); - ok (hr == S_OK, "ScriptItemize should return S_OK, returned %08x\n", hr); - /* This test is for the interim operation of ScriptItemize where only one SCRIPT_ITEM is * - * returned. */ - ok (pcItems > 0, "The number of SCRIPT_ITEMS should be greater than 0\n"); - if (pcItems > 0) - ok (pItem[0].iCharPos == 0 && pItem[1].iCharPos == cInChars, - "Start pos not = 0 (%d) or end pos not = %d (%d)\n", - pItem[0].iCharPos, cInChars, pItem[1].iCharPos); + /* This is a valid test that will cause parsing to take place. */ + cInChars = lstrlenW(TestItem1); + hr = ScriptItemize(TestItem1, cInChars, ARRAY_SIZE(pItem), NULL, NULL, pItem, &pcItems); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* This test is for the interim operation of ScriptItemize() where only + * one SCRIPT_ITEM is returned. */ + ok(pcItems == 1, "Got unexpected item count %d.\n", pcItems); + ok(pItem[0].iCharPos == 0, "Got unexpected character position %d.\n", pItem[0].iCharPos); + ok(pItem[1].iCharPos == cInChars, "Got unexpected character position %d, expected %d.\n", + pItem[1].iCharPos, cInChars); - /* It would appear that we have a valid SCRIPT_ANALYSIS and can continue - * ie. ScriptItemize has succeeded and that pItem has been set */ + psc = NULL; cInChars = 5; - if (hr == S_OK) { - psc = NULL; /* must be null on first call */ - cChars = cInChars; - cMaxGlyphs = 256; - hr = ScriptShape(hdc, &psc, TestItem1, cChars, - cMaxGlyphs, &pItem[0].a, - pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); - ok (hr == S_OK, "ScriptShape should return S_OK not (%08x)\n", hr); - ok (psc != NULL, "psc should not be null and have SCRIPT_CACHE buffer address\n"); - ok (pcGlyphs == cChars, "Chars in (%d) should equal Glyphs out (%d)\n", cChars, pcGlyphs); - if (hr == S_OK) { - /* Note hdc is needed as glyph info is not yet in psc */ - hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, psva, &pItem[0].a, piAdvance, - pGoffset, pABC); - ok (hr == S_OK, "Should return S_OK not (%08x)\n", hr); - ScriptFreeCache(&psc); /* Get rid of psc for next test set */ - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptShape(hdc, &psc, TestItem1, cInChars, ARRAY_SIZE(pwOutGlyphs1), + &pItem[0].a, pwOutGlyphs1, pwLogClust, psva, &pcGlyphs); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!!psc, "Got unexpected psc %p.\n", psc); + ok(pcGlyphs == cInChars, "Got unexpected glyph count %d, expected %d.\n", pcGlyphs, cInChars); - hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); - ok (hr == E_INVALIDARG, "Should return 0 not (%08x)\n", hr); + /* Note hdc is needed as glyph info is not yet in psc. */ + hr = ScriptPlace(hdc, &psc, pwOutGlyphs1, pcGlyphs, + psva, &pItem[0].a, piAdvance, pGoffset, pABC); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + /* Get rid of psc for next test set. */ + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); - hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok( hr == E_INVALIDARG, "(NULL,NULL,TestItem1, cInChars, dwFlags, pwOutGlyphs3), " - "expected E_INVALIDARG, got %08x\n", hr); - - /* Set psc to NULL, to be able to check if a pointer is returned in psc */ - psc = NULL; - hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, - NULL, NULL, NULL); - ok( hr == E_INVALIDARG, "(NULL,&psc,NULL,0,0,0,NULL,), expected E_INVALIDARG, " - "got %08x\n", hr); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* hdc is required for this one rather than the usual optional */ - psc = NULL; - hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok( hr == E_INVALIDARG, "(NULL,&psc,), expected E_INVALIDARG, got %08x\n", hr); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); + hr = ScriptTextOut(NULL, NULL, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - /* Set that it returns 0 status */ - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, NULL, NULL, 0, NULL, 0, NULL, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!psc, "Got unexpected psc %p.\n", psc); - /* Test Rect Rgn is acceptable */ - SetRect(&rect, 10, 10, 40, 20); - hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, pwOutGlyphs1, pcGlyphs, - piAdvance, NULL, pGoffset); - ok (hr == S_OK, "ScriptTextOut should return S_OK not (%08x)\n", hr); + /* hdc is required. */ + hr = ScriptTextOut(NULL, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(!psc, "Got unexpected psc %p.\n", psc); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, NULL, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - iCP = 1; - hr = ScriptCPtoX(iCP, fTrailing, cChars, pcGlyphs, (const WORD *) &pwLogClust, - (const SCRIPT_VISATTR *) &psva, (const int *)&piAdvance, &pItem[0].a, &piX); - ok(hr == S_OK, "ScriptCPtoX Stub should return S_OK not %08x\n", hr); + /* Test Rect Rgn is acceptable. */ + SetRect(&rect, 10, 10, 40, 20); + hr = ScriptTextOut(hdc, &psc, 0, 0, 0, &rect, &pItem[0].a, NULL, 0, + pwOutGlyphs1, pcGlyphs, piAdvance, NULL, pGoffset); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - psla = (SCRIPT_LOGATTR *)&sla; - hr = ScriptBreak(TestItem1, cChars, &pItem[0].a, psla); - ok(hr == S_OK, "ScriptBreak Stub should return S_OK not %08x\n", hr); + hr = ScriptCPtoX(1, FALSE, cInChars, pcGlyphs, pwLogClust, psva, piAdvance, &pItem[0].a, &piX); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Clean up and go */ - ScriptFreeCache(&psc); - ok( psc == NULL, "Expected psc to be NULL, got %p\n", psc); - } - } + hr = ScriptBreak(TestItem1, cInChars, &pItem[0].a, sla); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + ScriptFreeCache(&psc); + ok(!psc, "Got unexpected psc %p.\n", psc); } static void test_ScriptTextOut2(HDC hdc)

1 0

Dmitry Timoshkov : adsldp: Add initial tests for ADSystemInfo.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: c3beca6c8fc8c07ecd992e64f8f8d0dda3a10ac8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3beca6c8fc8c07ecd992e64… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 19 19:02:42 2018 +0800 adsldp: Add initial tests for ADSystemInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/adsldp/tests/Makefile.in | 5 + dlls/adsldp/tests/sysinfo.c | 220 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 227 insertions(+) diff --git a/configure b/configure index 3b6dbf0..657a557 100755 --- a/configure +++ b/configure @@ -18267,6 +18267,7 @@ wine_fn_config_dll activeds enable_activeds implib wine_fn_config_dll actxprxy enable_actxprxy wine_fn_config_lib adsiid wine_fn_config_dll adsldp enable_adsldp +wine_fn_config_test dlls/adsldp/tests adsldp_test wine_fn_config_dll adsldpc enable_adsldpc wine_fn_config_dll advapi32 enable_advapi32 implib wine_fn_config_test dlls/advapi32/tests advapi32_test diff --git a/configure.ac b/configure.ac index 5acd5c3..2996010 100644 --- a/configure.ac +++ b/configure.ac @@ -2792,6 +2792,7 @@ WINE_CONFIG_DLL(activeds,,[implib]) WINE_CONFIG_DLL(actxprxy) WINE_CONFIG_LIB(adsiid) WINE_CONFIG_DLL(adsldp) +WINE_CONFIG_TEST(dlls/adsldp/tests) WINE_CONFIG_DLL(adsldpc) WINE_CONFIG_DLL(advapi32,,[implib]) WINE_CONFIG_TEST(dlls/advapi32/tests) diff --git a/dlls/adsldp/tests/Makefile.in b/dlls/adsldp/tests/Makefile.in new file mode 100644 index 0000000..777d2aa --- /dev/null +++ b/dlls/adsldp/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = adsldp.dll +IMPORTS = ole32 oleaut32 secur32 advapi32 uuid + +C_SRCS = \ + sysinfo.c diff --git a/dlls/adsldp/tests/sysinfo.c b/dlls/adsldp/tests/sysinfo.c new file mode 100644 index 0000000..73435a6 --- /dev/null +++ b/dlls/adsldp/tests/sysinfo.c @@ -0,0 +1,220 @@ +/* + * ADSystemInfo Tests + * + * Copyright 2018 Dmitry Timoshkov + * + * 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 + */ + +#include <stdarg.h> +#include <stdio.h> + +#define COBJMACROS + +#include "windef.h" +#include "winbase.h" +#include "objbase.h" +#include "initguid.h" +#include "iads.h" +#define SECURITY_WIN32 +#include "security.h" + +#include "wine/test.h" + +static WCHAR *strchrW(const WCHAR *str, WCHAR ch) +{ + do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); + return NULL; +} + +static void test_ComputerName(void) +{ + static const WCHAR cnW[] = { 'C','N','=' }; + static const WCHAR ComputersW[] = { 'C','N','=','C','o','m','p','u','t','e','r','s' }; + BOOL ret; + ULONG size, name_size; + WCHAR name[MAX_COMPUTERNAME_LENGTH + 1]; + WCHAR buf[1024]; + IADsADSystemInfo *sysinfo; + BSTR bstr; + HRESULT hr; + + name_size = MAX_COMPUTERNAME_LENGTH + 1; + SetLastError(0xdeadbeef); + ret = GetComputerNameW(name, &name_size); + ok(ret, "GetComputerName error %u\n", GetLastError()); + + /* Distinguished name (rfc1779) is supposed to look like this: + * "CN=COMPNAME,CN=Computers,DC=domain,DC=com" + */ + + size = 1024; + SetLastError(0xdeadbeef); + ret = GetComputerObjectNameW(NameFullyQualifiedDN, buf, &size); + ok(ret || GetLastError() == ERROR_CANT_ACCESS_DOMAIN_INFO, "GetComputerObjectName error %u\n", GetLastError()); + if (ret) + { + const WCHAR *p; + ok(size == lstrlenW(buf) + 1, "got %u, expected %u\n", size, lstrlenW(buf) + 1); + ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); + ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); + p = strchrW(buf, ','); + ok(p != NULL, "delimiter was not found\n"); + ok(p && !memcmp(p + 1, ComputersW, sizeof(ComputersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); + } + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + 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) + { + ok(!lstrcmpW(bstr, buf), "got %s, expected %s\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); + SysFreeString(bstr); + } + + IADsADSystemInfo_Release(sysinfo); +} + +static void test_UserName(void) +{ + static const WCHAR cnW[] = { 'C','N','=' }; + static const WCHAR UsersW[] = { 'C','N','=','U','s','e','r','s' }; + BOOL ret; + ULONG size, name_size; + WCHAR name[256]; + WCHAR buf[1024]; + IADsADSystemInfo *sysinfo; + BSTR bstr; + HRESULT hr; + + name_size = 256; + SetLastError(0xdeadbeef); + ret = GetUserNameW(name, &name_size); + ok(ret, "GetUserName error %u\n", GetLastError()); + + /* Distinguished name (rfc1779) is supposed to look like this: + * "CN=username,CN=Users,DC=domain,DC=com" + */ + + size = 1024; + SetLastError(0xdeadbeef); + ret = GetUserNameExW(NameFullyQualifiedDN, buf, &size); + ok(ret || GetLastError() == ERROR_NONE_MAPPED, "GetUserNameEx error %u\n", GetLastError()); + if (ret) + { + const WCHAR *p; + ok(size == lstrlenW(buf), "got %u, expected %u\n", size, lstrlenW(buf)); + ok(!memcmp(buf, cnW, sizeof(cnW)), "got %s\n", wine_dbgstr_w(buf)); + ok(!memcmp(buf + 3, name, name_size), "got %s (name_size = %u)\n", wine_dbgstr_w(buf), name_size); + p = strchrW(buf, ','); + ok(p != NULL, "delimiter was not found\n"); + ok(p && !memcmp(p + 1, UsersW, sizeof(UsersW)), "got %s\n", p ? wine_dbgstr_w(p + 1) : wine_dbgstr_w(buf)); + } + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr == S_OK) + { + ok(!lstrcmpW(bstr, buf), "got %s, expected %s\n", wine_dbgstr_w(bstr), wine_dbgstr_w(buf)); + SysFreeString(bstr); + } + + IADsADSystemInfo_Release(sysinfo); +} + +static void test_sysinfo(void) +{ + + IADsADSystemInfo *sysinfo; + IDispatch *dispatch; + BSTR bstr; + VARIANT_BOOL value; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IUnknown, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + IADsADSystemInfo_Release(sysinfo); + + hr = CoCreateInstance(&CLSID_ADSystemInfo, 0, CLSCTX_ALL, &IID_IADsADSystemInfo, (void **)&sysinfo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IADsADSystemInfo_QueryInterface(sysinfo, &IID_IDispatch, (void **)&dispatch); + ok(hr == S_OK, "got %#x\n", hr); + IDispatch_Release(dispatch); + + hr = IADsADSystemInfo_get_UserName(sysinfo, &bstr); +todo_wine + ok(hr == S_OK || hr == HRESULT_FROM_WIN32(ERROR_NONE_MAPPED), "got %#x\n", hr); + if (hr != S_OK) + { + skip("Computer is not part of a domain, skipping the tests\n"); + IADsADSystemInfo_Release(sysinfo); + return; + } + SysFreeString(bstr); + + hr = IADsADSystemInfo_get_ComputerName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_SiteName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_DomainShortName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_DomainDNSName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_ForestDNSName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_PDCRoleOwner(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + hr = IADsADSystemInfo_get_IsNativeMode(sysinfo, &value); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) ok(value == VARIANT_TRUE, "IsNativeMode: %s\n", value == VARIANT_TRUE ? "yes" : "no"); + + hr = IADsADSystemInfo_GetAnyDCName(sysinfo, &bstr); + ok(hr == S_OK, "got %#x\n", hr); + if (hr == S_OK) SysFreeString(bstr); + + IADsADSystemInfo_Release(sysinfo); +} + +START_TEST(sysinfo) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "got %#x\n", hr); + + test_ComputerName(); + test_UserName(); + test_sysinfo(); +}

1 0

Alexandre Julliard : makefiles: Generate rules for installing l_intl.nls and wine.desktop.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 1a49f2e044b525c40a27af63d653a9631af0c80f URL: https://source.winehq.org/git/wine.git/?a=commit;h=1a49f2e044b525c40a27af63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 20:57:15 2018 +0100 makefiles: Generate rules for installing l_intl.nls and wine.desktop. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 15 +++------------ configure.ac | 15 ++------------- loader/Makefile.in | 14 ++++++-------- tools/make_makefiles | 2 +- tools/makedep.c | 22 ++++++++++++++++++++++ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/configure b/configure index ff10f67..74935d8 100755 --- a/configure +++ b/configure @@ -19463,20 +19463,11 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader" else - WINELOADER_INSTALL="wine.inf" - - wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall" + WINELOADER_INSTALL="wine.inf l_intl.nls" + case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) wine_fn_append_rule "install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop" ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/configure.ac b/configure.ac index d06476e..41a020b 100644 --- a/configure.ac +++ b/configure.ac @@ -3957,21 +3957,10 @@ $with_wine64/loader/wine-preloader: clean:: \$(RM) fonts server $with_wine64/loader/wine $with_wine64/loader/wine-preloader]) else - AC_SUBST(WINELOADER_INSTALL,"wine.inf") - WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/l_intl.nls \$(DESTDIR)\$(datadir)/wine/l_intl.nls -.PHONY: l_intl.nls/uninstall -l_intl.nls/uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/wine/l_intl.nls -__uninstall__: l_intl.nls/uninstall]) + AC_SUBST(WINELOADER_INSTALL,"wine.inf l_intl.nls") case $host_os in cygwin*|mingw32*|darwin*|macosx*|linux-android*) ;; - *) WINE_APPEND_RULE( -[install install-lib:: - \$(INSTALL_DATA) $srcdir/loader/wine.desktop \$(DESTDIR)\$(datadir)/applications/wine.desktop -uninstall:: - \$(RM) \$(DESTDIR)\$(datadir)/applications/wine.desktop]) ;; + *) WINELOADER_INSTALL="$WINELOADER_INSTALL wine.desktop" ;; esac fi diff --git a/loader/Makefile.in b/loader/Makefile.in index 4fb91ff..b1eafd1 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -1,15 +1,13 @@ -C_SRCS = \ +SOURCES = \ + l_intl.nls \ main.c \ - preloader.c - -MANPAGES = \ + preloader.c \ wine.de.UTF-8.man.in \ + wine.desktop \ wine.fr.UTF-8.man.in \ - wine.man.in \ - wine.pl.UTF-8.man.in - -IN_SRCS = \ wine.inf.in \ + wine.man.in \ + wine.pl.UTF-8.man.in \ wine_info.plist.in PROGRAMS = $(WINELOADER_PROGRAMS) diff --git a/tools/make_makefiles b/tools/make_makefiles index 0cf2344..df41356 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -435,7 +435,7 @@ sub assign_sources_to_makefiles(@) { next unless defined ${$make}{"TESTDLL"}; } - else + elsif ($dir ne "loader") # loader dir contains misc files { next; } diff --git a/tools/makedep.c b/tools/makedep.c index 0083661..8cd3559 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2636,6 +2636,26 @@ static void output_source_svg( struct makefile *make, struct incl_file *source, /******************************************************************* + * output_source_nls + */ +static void output_source_nls( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/wine/%s", source->name )); +} + + +/******************************************************************* + * output_source_desktop + */ +static void output_source_desktop( struct makefile *make, struct incl_file *source, const char *obj ) +{ + add_install_rule( make, source->name, source->name, + strmake( "D$(datadir)/applications/%s", source->name )); +} + + +/******************************************************************* * output_source_po */ static void output_source_po( struct makefile *make, struct incl_file *source, const char *obj ) @@ -2843,6 +2863,8 @@ static const struct { "tlb", output_source_tlb }, { "sfd", output_source_sfd }, { "svg", output_source_svg }, + { "nls", output_source_nls }, + { "desktop", output_source_desktop }, { "po", output_source_po }, { "in", output_source_in }, { "x", output_source_x },

1 0

Alexandre Julliard : makefiles: Add a helper to split large file remove commands.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: fcc0e7621575caed5844b80074a7884805ae0cb4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fcc0e7621575caed5844b800… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 21:18:38 2018 +0100 makefiles: Add a helper to split large file remove commands. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8cd3559..779d60a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -498,6 +498,31 @@ static void output_filenames( struct strarray array ) /******************************************************************* + * output_rm_filenames + */ +static void output_rm_filenames( struct strarray array ) +{ + static const unsigned int max_cmdline = 30000; /* to be on the safe side */ + unsigned int i, len; + + if (!array.count) return; + output( "\trm -f" ); + for (i = len = 0; i < array.count; i++) + { + if (len > max_cmdline) + { + output( "\n" ); + output( "\trm -f" ); + len = 0; + } + output_filename( array.str[i] ); + len += strlen( array.str[i] ) + 1; + } + output( "\n" ); +} + + +/******************************************************************* * get_extension */ static char *get_extension( char *filename ) @@ -3323,9 +3348,7 @@ static void output_subdirs( struct makefile *make ) output_filenames( makefile_deps ); output( ":\n" ); output( "distclean::\n"); - output( "\trm -f" ); - output_filenames( distclean_files ); - output( "\n" ); + output_rm_filenames( distclean_files ); strarray_add( &make->phony_targets, "distclean" ); if (build_deps.count)

1 0

Alexandre Julliard : makefiles: Generate the testclean rule using the subdirs file lists.
by Alexandre Julliard 20 Feb '18

20 Feb '18

Module: wine Branch: master Commit: 3e6c12e7a9ce9e703cf321f7b4b17ebe0a6ef4e4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e6c12e7a9ce9e703cf321f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 19 21:10:14 2018 +0100 makefiles: Generate the testclean rule using the subdirs file lists. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- aclocal.m4 | 4 +--- configure | 4 +--- tools/makedep.c | 13 +++++++++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 2c11de0..0c4356a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -542,9 +542,7 @@ programs/winetest: $ac_dir check test: $ac_dir/test .PHONY: $ac_dir/test $ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test -testclean:: - \$(RM) $ac_dir/*.ok" + @cd $ac_dir && \$(MAKE) test" if test -n "$CROSSTARGET" then diff --git a/configure b/configure index 74935d8..cbd451f 100755 --- a/configure +++ b/configure @@ -8037,9 +8037,7 @@ programs/winetest: $ac_dir check test: $ac_dir/test .PHONY: $ac_dir/test $ac_dir/test: dummy - @cd $ac_dir && \$(MAKE) test -testclean:: - \$(RM) $ac_dir/*.ok" + @cd $ac_dir && \$(MAKE) test" if test -n "$CROSSTARGET" then diff --git a/tools/makedep.c b/tools/makedep.c index 779d60a..e2e24b9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -3326,8 +3326,9 @@ static void output_subdirs( struct makefile *make ) { struct strarray build_deps = empty_strarray; struct strarray makefile_deps = empty_strarray; + struct strarray testclean_files = empty_strarray; struct strarray distclean_files = get_expanded_make_var_array( make, "CONFIGURE_TARGETS" ); - unsigned int i; + unsigned int i, j; strarray_add( &distclean_files, obj_dir_path( make, output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, obj_dir_path( make, ".gitignore" )); @@ -3339,7 +3340,12 @@ static void output_subdirs( struct makefile *make ) strmake ( "%s.in", output_makefile_name )))); strarray_add( &distclean_files, base_dir_path( submake, output_makefile_name )); if (!make->src_dir) strarray_add( &distclean_files, base_dir_path( submake, ".gitignore" )); - if (submake->testdll) strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); + if (submake->testdll) + { + for (j = 0; j < submake->ok_files.count; j++) + strarray_add( &testclean_files, base_dir_path( submake, submake->ok_files.str[j] )); + strarray_add( &distclean_files, base_dir_path( submake, "testlist.c" )); + } strarray_addall( &build_deps, output_importlib_symlinks( make, submake )); } output( "Makefile:" ); @@ -3347,9 +3353,12 @@ static void output_subdirs( struct makefile *make ) output( "\n" ); output_filenames( makefile_deps ); output( ":\n" ); + output( "testclean::\n"); + output_rm_filenames( testclean_files ); output( "distclean::\n"); output_rm_filenames( distclean_files ); strarray_add( &make->phony_targets, "distclean" ); + strarray_add( &make->phony_targets, "testclean" ); if (build_deps.count) {

1 0