May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : d3d10core/tests: Strip shaders bytecode.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: d5fc910e99f706c3a3cbb00fbc98c7ed44a0cf85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5fc910e99f706c3a3cbb00fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:19:55 2017 +0200 d3d10core/tests: Strip shaders bytecode. Shaders should be compiled with /Qstrip_debug and /Qstrip_reflect. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 57 +++++++++++++++---------------------------- 1 file changed, 19 insertions(+), 38 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5339ccb..6abc79a 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -3110,22 +3110,13 @@ float4 main(const float4 color : COLOR) : SV_TARGET #endif static const DWORD ps_4_0[] = { - 0x43425844, 0x4da9446f, 0xfbe1f259, 0x3fdb3009, 0x517521fa, 0x00000001, 0x000001ac, - 0x00000005, 0x00000034, 0x0000008c, 0x000000bc, 0x000000f0, 0x00000130, 0x46454452, - 0x00000050, 0x00000000, 0x00000000, 0x00000000, 0x0000001c, 0xffff0400, 0x00000100, - 0x0000001c, 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, - 0x6f432072, 0x6c69706d, 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, - 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, - 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, 0x0000002c, - 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, - 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, - 0x0000000e, 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, - 0x05000036, 0x001020f2, 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, 0x54415453, - 0x00000074, 0x00000002, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, - 0x00000000, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, + 0x43425844, 0x08c2b568, 0x17d33120, 0xb7d82948, 0x13a570fb, 0x00000001, 0x000000d0, 0x00000003, + 0x0000002c, 0x0000005c, 0x00000090, 0x4e475349, 0x00000028, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000000, 0x00000003, 0x00000000, 0x00000f0f, 0x4f4c4f43, 0xabab0052, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000038, 0x00000040, 0x0000000e, + 0x03001062, 0x001010f2, 0x00000000, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, 0x001020f2, + 0x00000000, 0x00101e46, 0x00000000, 0x0100003e, }; #if 0 @@ -8358,29 +8349,19 @@ static void test_swapchain_flip(void) return t1.Sample(s, p); } #endif - 0x43425844, 0x1733542c, 0xf74c6b6a, 0x0fb11eac, 0x76f6a999, 0x00000001, 0x000002cc, 0x00000005, - 0x00000034, 0x000000f4, 0x00000128, 0x0000015c, 0x00000250, 0x46454452, 0x000000b8, 0x00000000, - 0x00000000, 0x00000003, 0x0000001c, 0xffff0400, 0x00000100, 0x00000084, 0x0000007c, 0x00000003, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x0000007e, 0x00000002, - 0x00000005, 0x00000004, 0xffffffff, 0x00000000, 0x00000001, 0x0000000c, 0x00000081, 0x00000002, - 0x00000005, 0x00000004, 0xffffffff, 0x00000001, 0x00000001, 0x0000000c, 0x30740073, 0x00317400, - 0x7263694d, 0x666f736f, 0x52282074, 0x4c482029, 0x53204c53, 0x65646168, 0x6f432072, 0x6c69706d, - 0x39207265, 0x2e39322e, 0x2e323539, 0x31313133, 0xababab00, 0x4e475349, 0x0000002c, 0x00000001, - 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, - 0x5449534f, 0x004e4f49, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, - 0x00000000, 0x00000003, 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, - 0x000000ec, 0x00000040, 0x0000003b, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, - 0x00000000, 0x00005555, 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101012, - 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x07000031, - 0x00100012, 0x00000000, 0x0010100a, 0x00000000, 0x00004001, 0x43a00000, 0x0304001f, 0x0010000a, - 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, - 0x00000000, 0x00107e46, 0x00000000, 0x00106000, 0x00000000, 0x0100003e, 0x01000015, 0x0c000045, + 0x43425844, 0xc00961ea, 0x48558efd, 0x5eec7aed, 0xb597e6d1, 0x00000001, 0x00000188, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000010f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x000000ec, 0x00000040, + 0x0000003b, 0x0300005a, 0x00106000, 0x00000000, 0x04001858, 0x00107000, 0x00000000, 0x00005555, + 0x04001858, 0x00107000, 0x00000001, 0x00005555, 0x04002064, 0x00101012, 0x00000000, 0x00000001, + 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x07000031, 0x00100012, 0x00000000, + 0x0010100a, 0x00000000, 0x00004001, 0x43a00000, 0x0304001f, 0x0010000a, 0x00000000, 0x0c000045, 0x001020f2, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00107e46, - 0x00000001, 0x00106000, 0x00000000, 0x0100003e, 0x54415453, 0x00000074, 0x00000007, 0x00000001, - 0x00000000, 0x00000002, 0x00000001, 0x00000000, 0x00000000, 0x00000002, 0x00000001, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000002, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, - 0x00000000, 0x00000000, 0x00000000 + 0x00000000, 0x00106000, 0x00000000, 0x0100003e, 0x01000015, 0x0c000045, 0x001020f2, 0x00000000, + 0x00004002, 0x3f000000, 0x3f000000, 0x00000000, 0x00000000, 0x00107e46, 0x00000001, 0x00106000, + 0x00000000, 0x0100003e, }; static const struct vec2 quad[] = {

1 0

Hugh McMaster : regedit/tests: Re-order the REG_NONE import tests and fix some copy/paste errors.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 7ea089234348c7b7746b009b82daf3591bf4927b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea089234348c7b7746b009b8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 19 13:19:17 2017 +0000 regedit/tests: Re-order the REG_NONE import tests and fix some copy/paste errors. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index d5c6524..0bb10b7 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -325,20 +325,20 @@ static void test_basic_import(void) "\"Wine10a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine10b\"=hex(0):56,00,61,00,6c,00,\\\n" " 75,00,65,00,00,00\n" - "\"Wine10h\"=hex(0):56,00,61,00,\\;comment\n" + "\"Wine10c\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\\n" " 65,00,00,00\n" - "\"Wine10i\"=hex(0):56,00,61,00,\\;comment\n" + "\"Wine10d\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\n" " 65,00,00,00\n" - "\"Wine10j\"=hex(0):56,00,61,00,\\;comment\n" + "\"Wine10e\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,;comment\n" " 65,00,00,00\n"); verify_reg(hkey, "Wine10a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); verify_reg(hkey, "Wine10b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine10h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine10i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); - todo_wine verify_reg(hkey, "Wine10j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine10c", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + todo_wine verify_reg(hkey, "Wine10d", REG_NONE, "V\0a\0l\0u", 8, 0); + todo_wine verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Austin English : api-ms-win-downlevel-advapi32-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: 2b6e1b04678362d4be3818657dea7d3fcea3312e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b6e1b04678362d4be3818657… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:20 2017 -0500 api-ms-win-downlevel-advapi32-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index d0660eb..5bdad41 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -102,7 +102,6 @@ @ stdcall RegGetKeySecurity(long long ptr ptr) advapi32.RegGetKeySecurity @ stdcall RegGetValueA(long str str long ptr ptr ptr) advapi32.RegGetValueA @ stdcall RegGetValueW(long wstr wstr long ptr ptr ptr) advapi32.RegGetValueW -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stub RegLoadAppKeyA @ stub RegLoadAppKeyW @ stdcall RegLoadKeyA(long str str) advapi32.RegLoadKeyA @@ -127,6 +126,7 @@ @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW @ stdcall RegUnLoadKeyA(long str) advapi32.RegUnLoadKeyA @ stdcall RegUnLoadKeyW(long wstr) advapi32.RegUnLoadKeyW +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RevertToSelf() advapi32.RevertToSelf @ stdcall SetAclInformation(ptr ptr long long) advapi32.SetAclInformation @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW

1 0

Austin English : api-ms-win-core-shlwapi-obsolete-l1-1-0: Sort specfile.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: cbc35447606fbab0122571965b51aed63a8332b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbc35447606fbab0122571965… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:15 2017 -0500 api-ms-win-core-shlwapi-obsolete-l1-1-0: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-shlwapi-obsolete-l1-1-0.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec index 1b55281..4b969ee 100644 --- a/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec +++ b/dlls/api-ms-win-core-shlwapi-obsolete-l1-1-0/api-ms-win-core-shlwapi-obsolete-l1-1-0.spec @@ -1,5 +1,9 @@ @ stdcall QISearch(long long long long) shlwapi.QISearch @ stdcall SHLoadIndirectString(wstr ptr long ptr) shlwapi.SHLoadIndirectString +@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA +@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA +@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW +@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW @ stdcall StrCatBuffA(str str long) shlwapi.StrCatBuffA @ stdcall StrCatBuffW(wstr wstr long) shlwapi.StrCatBuffW @ stdcall StrCatChainW(ptr long long wstr) shlwapi.StrCatChainW @@ -27,10 +31,6 @@ @ stdcall StrCpyNW(ptr wstr long) shlwapi.StrCpyNW @ stdcall StrCpyNXA(ptr str long) shlwapi.StrCpyNXA @ stdcall StrCpyNXW(ptr wstr long) shlwapi.StrCpyNXW -@ stdcall StrCSpnA(str str) shlwapi.StrCSpnA -@ stdcall StrCSpnIA(str str) shlwapi.StrCSpnIA -@ stdcall StrCSpnIW(wstr wstr) shlwapi.StrCSpnIW -@ stdcall StrCSpnW(wstr wstr) shlwapi.StrCSpnW @ stdcall StrDupA(str) shlwapi.StrDupA @ stdcall StrDupW(wstr) shlwapi.StrDupW @ stdcall StrIsIntlEqualA(long str str long) shlwapi.StrIsIntlEqualA

1 0

Owen Rudge : wsdapi/tests: Add tests for IWSDXMLContext_AddNamespace.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: a34ec80c7575d50326e680015a937c16a7926548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a34ec80c7575d50326e680015… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:39:13 2017 +0100 wsdapi/tests: Add tests for IWSDXMLContext_AddNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 149 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 141 insertions(+), 8 deletions(-) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index fd8ac03..22f5faf 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -26,6 +26,9 @@ #include "wine/test.h" #include "wsdapi.h" +static LPWSTR largeText; +static const int largeTextSize = 10000 * sizeof(WCHAR); + static void BuildAnyForSingleElement_tests(void) { WSDXML_ELEMENT *element; @@ -35,8 +38,6 @@ static void BuildAnyForSingleElement_tests(void) WCHAR text[] = {'H','e','l','l','o',0}; static const WCHAR uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t','/',0}; static const WCHAR prefix[] = {'t',0}; - LPWSTR largeText; - const int largeTextSize = 10000 * sizeof(WCHAR); HRESULT hr; /* Populate structures */ @@ -54,9 +55,6 @@ static void BuildAnyForSingleElement_tests(void) ok(hr == E_POINTER, "BuildAnyForSingleElement failed with %08x\n", hr); /* Test calling the function with a text size that exceeds 8192 characters */ - largeText = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, largeTextSize + sizeof(WCHAR)); - memset(largeText, 'a', largeTextSize); - hr = WSDXMLBuildAnyForSingleElement(&name, largeText, &element); ok(hr == E_INVALIDARG, "BuildAnyForSingleElement failed with %08x\n", hr); @@ -68,7 +66,7 @@ static void BuildAnyForSingleElement_tests(void) ok(element->Name != &name, "element->Name has not been duplicated\n"); todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); - ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = %s, expected %s\n", wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); ok(element->FirstChild == NULL, "element->FirstChild == %p\n", element->FirstChild); ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); @@ -84,7 +82,7 @@ static void BuildAnyForSingleElement_tests(void) ok(element->Name != &name, "element->Name has not been duplicated\n"); todo_wine ok(element->Name->Space != name.Space, "element->Name->Space has not been duplicated\n"); ok(element->Name->LocalName != name.LocalName, "element->LocalName has not been duplicated\n"); - ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = '%s', expected '%s'\n", + ok(lstrcmpW(element->Name->LocalName, name.LocalName) == 0, "element->LocalName = %s, expected %s\n", wine_dbgstr_w(element->Name->LocalName), wine_dbgstr_w(name.LocalName)); ok(element->FirstChild != NULL, "element->FirstChild == %p\n", element->FirstChild); ok(element->Node.Next == NULL, "element->Node.Next == %p\n", element->Node.Next); @@ -96,7 +94,7 @@ static void BuildAnyForSingleElement_tests(void) ok(element->FirstChild->Next == NULL, "element->FirstChild.Next == %p\n", element->FirstChild->Next); ok(element->FirstChild->Type == TextType, "element->FirstChild.Type == %d\n", element->Node.Type); ok(((WSDXML_TEXT *)element->FirstChild)->Text != NULL, "element->FirstChild.Text is null\n"); - ok(lstrcmpW(((WSDXML_TEXT *)element->FirstChild)->Text, text) == 0, "element->FirstChild->Text = '%s', expected '%s'\n", + ok(lstrcmpW(((WSDXML_TEXT *)element->FirstChild)->Text, text) == 0, "element->FirstChild->Text = %s, expected %s\n", wine_dbgstr_w(((WSDXML_TEXT *)element->FirstChild)->Text), wine_dbgstr_w(text)); } @@ -282,9 +280,144 @@ static void AddSibling_tests(void) WSDFreeLinkedMemory(parent); } +static void XMLContext_AddNamespace_tests(void) +{ + WCHAR ns1Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','t','e','s','t',0}; + WCHAR ns2Uri[] = {'h','t','t','p',':','/','/','w','i','n','e','.','r','o','c','k','s',0}; + WCHAR ns3Uri[] = {'h','t','t','p',':','/','/','t','e','s','t','.','a','g','a','i','n',0}; + WCHAR ns4Uri[] = {'h','t','t','p',':','/','/','o','n','e','.','m','o','r','e',0}; + WCHAR prefix1[] = {'t','s','t',0}; + WCHAR prefix2[] = {'w','i','n','e',0}; + WCHAR unPrefix0[] = {'u','n','0',0}; + WCHAR unPrefix1[] = {'u','n','1',0}; + WCHAR unPrefix2[] = {'u','n','2',0}; + + IWSDXMLContext *context; + WSDXML_NAMESPACE *ns1 = NULL, *ns2 = NULL; + HRESULT hr; + + hr = WSDXMLCreateContext(&context); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + ok(context != NULL, "context == NULL\n"); + + /* Test calling AddNamespace with invalid arguments */ + hr = IWSDXMLContext_AddNamespace(context, NULL, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNamespace(context, ns1Uri, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNamespace(context, NULL, prefix1, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + /* Test calling AddNamespace without the ppNamespace parameter */ + hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, NULL); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Now retrieve the created namespace */ + hr = IWSDXMLContext_AddNamespace(context, ns1Uri, prefix1, &ns1); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns1 != NULL, "ns1 == NULL\n"); + + if (ns1 != NULL) + { + ok(lstrcmpW(ns1->Uri, ns1Uri) == 0, "URI returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns1->Uri)); + ok(lstrcmpW(ns1->PreferredPrefix, prefix1) == 0, "PreferredPrefix returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns1->PreferredPrefix)); + ok(ns1->Names == NULL, "Names array is not empty\n"); + ok(ns1->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns1->NamesCount); + ok(ns1->Uri != ns1Uri, "URI has not been cloned\n"); + ok(ns1->PreferredPrefix != prefix1, "URI has not been cloned\n"); + } + + /* Test calling AddNamespace with parameters that are too large */ + hr = IWSDXMLContext_AddNamespace(context, largeText, prefix2, &ns2); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, largeText, &ns2); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNamespace(context, largeText, largeText, &ns2); + todo_wine ok(hr == E_INVALIDARG, "AddNamespace failed with %08x\n", hr); + + /* Test calling AddNamespace with a conflicting prefix */ + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix1, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns2 != NULL, "ns2 == NULL\n"); + + if (ns2 != NULL) + { + ok(lstrcmpW(ns2->Uri, ns2Uri) == 0, "URI returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->Uri)); + ok(lstrcmpW(ns2->PreferredPrefix, unPrefix0) == 0, "PreferredPrefix returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->PreferredPrefix)); + ok(ns2->Names == NULL, "Names array is not empty\n"); + ok(ns2->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns2->NamesCount); + ok(ns2->Uri != ns2Uri, "URI has not been cloned\n"); + ok(ns2->PreferredPrefix != prefix2, "URI has not been cloned\n"); + } + + WSDFreeLinkedMemory(ns1); + WSDFreeLinkedMemory(ns2); + + /* Try explicitly creating a prefix called 'un1' */ + hr = IWSDXMLContext_AddNamespace(context, ns4Uri, unPrefix1, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns2 != NULL, "ns2 == NULL\n"); + + if (ns2 != NULL) + { + ok(lstrcmpW(ns2->PreferredPrefix, unPrefix1) == 0, "PreferredPrefix returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->PreferredPrefix)); + } + + WSDFreeLinkedMemory(ns2); + + /* Test with one more conflicting prefix */ + hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix1, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns2 != NULL, "ns2 == NULL\n"); + + if (ns2 != NULL) + { + ok(lstrcmpW(ns2->PreferredPrefix, unPrefix2) == 0, "PreferredPrefix returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->PreferredPrefix)); + } + + WSDFreeLinkedMemory(ns2); + + /* Try renaming a prefix */ + hr = IWSDXMLContext_AddNamespace(context, ns3Uri, prefix2, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(ns2 != NULL, "ns2 == NULL\n"); + + if (ns2 != NULL) + { + ok(lstrcmpW(ns2->Uri, ns3Uri) == 0, "Uri returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->Uri)); + ok(lstrcmpW(ns2->PreferredPrefix, prefix2) == 0, "PreferredPrefix returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->PreferredPrefix)); + } + + WSDFreeLinkedMemory(ns2); + + IWSDXMLContext_Release(context); +} + START_TEST(xml) { + /* Allocate a large text buffer for use in tests */ + largeText = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, largeTextSize + sizeof(WCHAR)); + memset(largeText, 'a', largeTextSize); + BuildAnyForSingleElement_tests(); AddChild_tests(); AddSibling_tests(); + + XMLContext_AddNamespace_tests(); + + HeapFree(GetProcessHeap(), 0, largeText); }

1 0

Nikolay Sivov : msvcp140/tests: Avoid filling value truncation in memset ( Coverity).
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: a374ff0b8610f4a0d200dbea93e87651b6235961 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a374ff0b8610f4a0d200dbea9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 19 15:30:17 2017 +0300 msvcp140/tests: Avoid filling value truncation in memset (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 1419669..c964613 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -259,7 +259,7 @@ static void test_task_continuation_context(void) { task_continuation_context tcc; - memset(&tcc, 0xdead, sizeof(tcc)); + memset(&tcc, 0xff, sizeof(tcc)); call_func1(p_task_continuation_context_ctor, &tcc); ok(!tcc.unk0, "tcc.unk0 != NULL (%p)\n", tcc.unk0); ok(!tcc.unk1, "tcc.unk1 != 0 (%x)\n", tcc.unk1);

1 0

Józef Kucia : wined3d: Change vPrim register data type to signed integer.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: e233b3424a970fb7eca83709e337125ceccc6681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e233b3424a970fb7eca83709e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:19:57 2017 +0200 wined3d: Change vPrim register data type to signed integer. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6f51939..522a30d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3002,9 +3002,9 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_PRIMID: if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) - sprintf(register_name, "uint(gl_PrimitiveIDIn)"); + sprintf(register_name, "gl_PrimitiveIDIn"); else - sprintf(register_name, "uint(gl_PrimitiveID)"); + sprintf(register_name, "gl_PrimitiveID"); break; case WINED3DSPR_IDXTEMP: @@ -3192,13 +3192,11 @@ static void shader_glsl_add_src_param_ext(const struct wined3d_shader_instructio case WINED3DSPR_IMMCONST: param_data_type = data_type; break; - case WINED3DSPR_PRIMID: - param_data_type = WINED3D_DATA_UINT; - break; case WINED3DSPR_GSINSTID: case WINED3DSPR_LOCALTHREADID: case WINED3DSPR_LOCALTHREADINDEX: case WINED3DSPR_OUTPOINTID: + case WINED3DSPR_PRIMID: case WINED3DSPR_THREADGROUPID: case WINED3DSPR_THREADID: param_data_type = WINED3D_DATA_INT;

1 0

Owen Rudge : webservices: Write empty prefix if "prefix" is NULL and "ns" is empty.
by Alexandre Julliard May 19, 2017

May 19, 2017

Module: wine Branch: master Commit: acf6b4eeec356ced33a33a77936e2780634d71d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=acf6b4eeec356ced33a33a779… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:41:50 2017 +0100 webservices: Write empty prefix if "prefix" is NULL and "ns" is empty. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 22 ++++++++++++++++++++++ dlls/webservices/writer.c | 5 ++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 4dfa1db..aa33b76 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -538,6 +538,28 @@ static void test_WsWriteStartAttribute(void) ok( hr == S_OK, "got %08x\n", hr ); check_output( writer, "<p:str len=\"\" xmlns:p=\"ns\"/>", __LINE__ ); + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, &prefix, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname2, &empty, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<p:str len=\"\" p:str=\"\" xmlns:p=\"ns\"/>", __LINE__ ); + WsFreeWriter( writer ); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 421b79d..2b5affc 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -521,12 +521,11 @@ static HRESULT write_attribute( struct writer *writer, WS_XML_ATTRIBUTE *attr ) { WS_XML_UTF8_TEXT *text = (WS_XML_UTF8_TEXT *)attr->value; unsigned char quote = attr->singleQuote ? '\'' : '"'; - const WS_XML_STRING *prefix; + const WS_XML_STRING *prefix = NULL; ULONG size; HRESULT hr; if (attr->prefix) prefix = attr->prefix; - else prefix = writer->current->hdr.prefix; /* ' prefix:attr="value"' */ @@ -930,7 +929,7 @@ static HRESULT write_add_attribute( struct writer *writer, const WS_XML_STRING * if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; - if (!prefix) prefix = elem->prefix; + if (!prefix && ns->length > 0) prefix = elem->prefix; attr->singleQuote = !!single; if (prefix && !(attr->prefix = alloc_xml_string( prefix->bytes, prefix->length )))

1 0

Rosanne DiMesio : Improve maintainerView
by Jeremy Newman May 19, 2017

May 19, 2017

Module: appdb Branch: master Commit: 537fa529f365e47cfdf2c833bc79f37b44031dea URL: http://source.winehq.org/git/appdb.git/?a=commit;h=537fa529f365e47cfdf2c833… Author: Rosanne DiMesio <dimesio(a)earthlink.net> Date: Fri May 19 14:54:05 2017 -0500 Improve maintainerView Adds back $sLimit to the previous version of the patch to avoid an out of memory issue when run against the full database. Signed-off-by: Rosanne DiMesio <dimesio(a)earthlink.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- include/maintainerView.php | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 7fe1462..19b4896 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -42,12 +42,14 @@ class maintainerView public function objectGetHeader() { $oTableRow = new TableRow(); - $oTableRow->AddTextCell('Submission date'); $oTableRow->AddTextCell('Maintainer'); + $oTableRow->AddTextCell('Login'); + $oTableRow->AddTextCell('Submission date'); + $oTableRow->AddTextCell('Last connected'); $oTableRow->AddTextCell('Application'); $oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Action'); - $oTableRow->SetClass('color4'); + $oTableRow->SetClass('color3'); $oTableRow->SetStyle('color: white;'); return $oTableRow; @@ -87,6 +89,7 @@ class maintainerView $oTable->SetCellPadding(3); $oTable->SetCellSpacing(0); + $oTable->SetWidth('100%'); $oHeader = $this->objectGetHeader(); $oTable->AddRow($oHeader); @@ -106,8 +109,16 @@ class maintainerView $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); - $oCell = new TableCell($oUser->objectMakeLink()); - $oCell->SetStyle($sStyle); + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oTableRow->AddCell($oCell); + + $oCell = new TableCell(''); + $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); @@ -128,8 +139,8 @@ class maintainerView $oTableRow->SetClass('color4'); $oTable->AddRow($oTableRow); - - /* Show all apps/versions that the user maintainers */ + + /* Show all apps/versions that the user maintains */ $hAppResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?'", $oMaintainerView->iUserId); for($i = 0; $oAppRow = query_fetch_object($hAppResult); $i++) { @@ -149,19 +160,22 @@ class maintainerView $sVersionText = $oVersion->sName; } - $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); $oTableRow->AddTextCell($oUser->objectMakeLink()); + $oTableRow->AddTextCell($oUser->sEmail); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); + $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oUser->sStamp))); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCelL($sVersionText); - $oTableRow->AddTextCell('[<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).'">delete</a>]'); + $oTableRow->AddTextCell('<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).' + "class="btn btn-default btn-sm"><i class="fa fa-trash"></i> delete</a>'); $oTable->AddRow($oTableRow); } } - echo $oTable->GetString(); - } + echo $oTable->GetString(); + } function objectGetItemsPerPage($sState = 'accepted') { @@ -177,8 +191,10 @@ class maintainerView $sLimit = objectManager::getSqlLimitClause($iRows, $iStart, 'maintainerView'); - $sQuery = "SELECT DISTINCT(userId) FROM appMaintainers WHERE state = '?'$sLimit"; - $hResult = query_parameters($sQuery, $sState); + // get available maintainers + $sQuery = "SELECT * FROM appMaintainers, user_list WHERE appMaintainers.userId = user_list.userid"; + $sQuery.= " AND state='accepted' GROUP BY appMaintainers.userid ORDER BY realname, email $sLimit"; + $hResult = query_parameters($sQuery); return $hResult; }

1 0

Jeremy Newman : Revert "Improve maintainerView"
by Jeremy Newman May 19, 2017

May 19, 2017

Module: appdb Branch: master Commit: cb3e5f55746d5c8cca947770f4d8757fd4f4cd59 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=cb3e5f55746d5c8cca947770… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Fri May 19 14:21:46 2017 -0500 Revert "Improve maintainerView" This is causing out of memory issues. This reverts commit 9182149367270c198deddae128cd9302d1bbdfb6. --- include/maintainerView.php | 40 ++++++++++++---------------------------- 1 file changed, 12 insertions(+), 28 deletions(-) diff --git a/include/maintainerView.php b/include/maintainerView.php index 8c88c3d..7fe1462 100644 --- a/include/maintainerView.php +++ b/include/maintainerView.php @@ -42,14 +42,12 @@ class maintainerView public function objectGetHeader() { $oTableRow = new TableRow(); - $oTableRow->AddTextCell('Maintainer'); - $oTableRow->AddTextCell('Login'); $oTableRow->AddTextCell('Submission date'); - $oTableRow->AddTextCell('Last connected'); + $oTableRow->AddTextCell('Maintainer'); $oTableRow->AddTextCell('Application'); $oTableRow->AddTextCell('Version'); $oTableRow->AddTextCell('Action'); - $oTableRow->SetClass('color3'); + $oTableRow->SetClass('color4'); $oTableRow->SetStyle('color: white;'); return $oTableRow; @@ -89,7 +87,6 @@ class maintainerView $oTable->SetCellPadding(3); $oTable->SetCellSpacing(0); - $oTable->SetWidth('100%'); $oHeader = $this->objectGetHeader(); $oTable->AddRow($oHeader); @@ -109,16 +106,8 @@ class maintainerView $oCell->SetStyle($sStyle.' border-left: thin solid;'); $oTableRow->AddCell($oCell); - $oCell = new TableCell(''); - $oCell->SetStyle($sStyle.' border-left: thin solid;'); - $oTableRow->AddCell($oCell); - - $oCell = new TableCell(''); - $oCell->SetStyle($sStyle.' border-left: thin solid;'); - $oTableRow->AddCell($oCell); - - $oCell = new TableCell(''); - $oCell->SetStyle($sStyle.' border-left: thin solid;'); + $oCell = new TableCell($oUser->objectMakeLink()); + $oCell->SetStyle($sStyle); $oTableRow->AddCell($oCell); $iMaintainedApps = maintainer::GetMaintainerCountForUserId($iUserId, true); @@ -139,8 +128,8 @@ class maintainerView $oTableRow->SetClass('color4'); $oTable->AddRow($oTableRow); - - /* Show all apps/versions that the user maintains */ + + /* Show all apps/versions that the user maintainers */ $hAppResult = query_parameters("SELECT * FROM appMaintainers WHERE userId = '?'", $oMaintainerView->iUserId); for($i = 0; $oAppRow = query_fetch_object($hAppResult); $i++) { @@ -160,22 +149,19 @@ class maintainerView $sVersionText = $oVersion->sName; } - $oTableRow->AddTextCell($oUser->objectMakeLink()); - $oTableRow->AddTextCell($oUser->sEmail); $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oMaintainer->aSubmitTime))); - $oTableRow->AddTextCell(print_date(mysqldatetime_to_unixtimestamp($oUser->sStamp))); + $oTableRow->AddTextCell($oUser->objectMakeLink()); $oTableRow->AddTextCell($oApp->objectMakeLink()); $oTableRow->AddTextCelL($sVersionText); - $oTableRow->AddTextCell('<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).' - "class="btn btn-default btn-sm"><i class="fa fa-trash"></i> delete</a>'); + $oTableRow->AddTextCell('[<a href="'.$oNewOM->makeUrl('delete', $oMaintainer->objectGetId()).'">delete</a>]'); $oTable->AddRow($oTableRow); } } - echo $oTable->GetString(); - } + echo $oTable->GetString(); + } function objectGetItemsPerPage($sState = 'accepted') { @@ -191,10 +177,8 @@ class maintainerView $sLimit = objectManager::getSqlLimitClause($iRows, $iStart, 'maintainerView'); - // get available maintainers - $sQuery = "SELECT * FROM appMaintainers, user_list WHERE appMaintainers.userId = user_list.userid"; - $sQuery.= " AND state='accepted' GROUP BY appMaintainers.userid ORDER BY realname, email;"; - $hResult = query_parameters($sQuery); + $sQuery = "SELECT DISTINCT(userId) FROM appMaintainers WHERE state = '?'$sLimit"; + $hResult = query_parameters($sQuery, $sState); return $hResult; }

1 0