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

Józef Kucia : wined3d: Add support for patch list primitive type.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: c675bf4e825c80ba6b42378e674e6d7decf67055 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c675bf4e825c80ba6b42378e6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu May 18 15:20:01 2017 +0200 wined3d: Add support for patch list primitive type. 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/d3d11/d3d11_private.h | 4 ++++ dlls/d3d11/device.c | 24 ++++++++++++++++-------- dlls/d3d11/utils.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/d3d8/device.c | 12 ++++++------ dlls/d3d9/device.c | 12 ++++++------ dlls/ddraw/device.c | 12 ++++++------ dlls/ddraw/executebuffer.c | 6 +++--- dlls/wined3d/cs.c | 8 ++++++-- dlls/wined3d/device.c | 29 +++++++++++++++++------------ dlls/wined3d/drawprim.c | 6 ++++++ dlls/wined3d/stateblock.c | 1 + dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- include/wine/wined3d.h | 4 ++-- 14 files changed, 120 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c675bf4e825c80ba6b423…

1 0

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

19 May '17

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

Hugh McMaster : reg/tests: Remove two un-needed concatenation backslashes and fix some copy/ paste errors.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 2b27a98bd09e424414aa025e4cce5f90c61a21cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b27a98bd09e424414aa025e4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 19 13:19:06 2017 +0000 reg/tests: Remove two un-needed concatenation backslashes 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/reg/tests/reg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9b19ab4..393e23b 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1443,7 +1443,7 @@ static void test_import(void) "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" "5,00,65,00,00,00\n" "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" - " 5,00,65,00,00,00\\\n" + " 5,00,65,00,00,00\n" "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\\n" " 65,00,00,00\n" @@ -1465,8 +1465,8 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine43f"); todo_wine verify_reg_nonexist(hkey, "Wine43g"); todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine43k"); test_import_str("REGEDIT4\n\n" @@ -2227,7 +2227,7 @@ static void test_import(void) "\"Wine43f\"=hex(0):56,00,61,00,6c,00,7\\\n" "5,00,65,00,00,00\n" "\"Wine43g\"=hex(0):56,00,61,00,6c,00,7\\\n" - " 5,00,65,00,00,00\\\n" + " 5,00,65,00,00,00\n" "\"Wine43h\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\\n" " 65,00,00,00\n" @@ -2249,8 +2249,8 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine43f"); todo_wine verify_reg_nonexist(hkey, "Wine43g"); todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u\0e\0\0", 8, 0); + todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); todo_wine verify_reg_nonexist(hkey, "Wine43k"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"

1 0

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

19 May '17

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

Owen Rudge : wsdapi: Add initial implementation of IWSDXMLContext and WSDXMLCreateContext.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: f4d3dd2cd6492d2092ec3f08bdbe9d0ff529dc1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4d3dd2cd6492d2092ec3f08b… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:38:43 2017 +0100 wsdapi: Add initial implementation of IWSDXMLContext and WSDXMLCreateContext. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/wsdapi.spec | 2 +- dlls/wsdapi/xml.c | 131 ++++++++++++++++++++++++++++++++++++++++++++++++ include/wsdxml.idl | 2 + 3 files changed, 134 insertions(+), 1 deletion(-) diff --git a/dlls/wsdapi/wsdapi.spec b/dlls/wsdapi/wsdapi.spec index 8ee17cb..fd89be7 100644 --- a/dlls/wsdapi/wsdapi.spec +++ b/dlls/wsdapi/wsdapi.spec @@ -40,6 +40,6 @@ @ stdcall WSDXMLAddSibling(ptr ptr) @ stdcall WSDXMLBuildAnyForSingleElement(ptr ptr ptr) @ stdcall WSDXMLCleanupElement(ptr) -@ stub WSDXMLCreateContext +@ stdcall WSDXMLCreateContext(ptr) @ stub WSDXMLGetNameFromBuiltinNamespace @ stub WSDXMLGetValueFromAny diff --git a/dlls/wsdapi/xml.c b/dlls/wsdapi/xml.c index 1cc45b8..4b150d4 100644 --- a/dlls/wsdapi/xml.c +++ b/dlls/wsdapi/xml.c @@ -213,3 +213,134 @@ HRESULT WINAPI WSDXMLCleanupElement(WSDXML_ELEMENT *pAny) WSDFreeLinkedMemory(pAny); return S_OK; } + +/* IWSDXMLContext implementation */ + +typedef struct IWSDXMLContextImpl +{ + IWSDXMLContext IWSDXMLContext_iface; + LONG ref; +} IWSDXMLContextImpl; + +static inline IWSDXMLContextImpl *impl_from_IWSDXMLContext(IWSDXMLContext *iface) +{ + return CONTAINING_RECORD(iface, IWSDXMLContextImpl, IWSDXMLContext_iface); +} + +static HRESULT WINAPI IWSDXMLContextImpl_QueryInterface(IWSDXMLContext *iface, REFIID riid, void **ppv) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + + TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppv); + + if (!ppv) + { + WARN("Invalid parameter\n"); + return E_INVALIDARG; + } + + *ppv = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || + IsEqualIID(riid, &IID_IWSDXMLContext)) + { + *ppv = &This->IWSDXMLContext_iface; + } + else + { + WARN("Unknown IID %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI IWSDXMLContextImpl_AddRef(IWSDXMLContext *iface) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + ULONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + return ref; +} + +static ULONG WINAPI IWSDXMLContextImpl_Release(IWSDXMLContext *iface) +{ + IWSDXMLContextImpl *This = impl_from_IWSDXMLContext(iface); + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (ref == 0) + { + WSDFreeLinkedMemory(This); + } + + return ref; +} + +static HRESULT WINAPI IWSDXMLContextImpl_AddNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszSuggestedPrefix, WSDXML_NAMESPACE **ppNamespace) +{ + FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszSuggestedPrefix), ppNamespace); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_AddNameToNamespace(IWSDXMLContext *iface, LPCWSTR pszUri, LPCWSTR pszName, WSDXML_NAME **ppName) +{ + FIXME("(%p, %s, %s, %p)\n", iface, debugstr_w(pszUri), debugstr_w(pszName), ppName); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_SetNamespaces(IWSDXMLContext *iface, const PCWSDXML_NAMESPACE *pNamespaces, WORD wNamespacesCount, BYTE bLayerNumber) +{ + FIXME("(%p, %p, %d, %d)\n", iface, pNamespaces, wNamespacesCount, bLayerNumber); + return E_NOTIMPL; +} + +static HRESULT WINAPI IWSDXMLContextImpl_SetTypes(IWSDXMLContext *iface, const PCWSDXML_TYPE *pTypes, DWORD dwTypesCount, BYTE bLayerNumber) +{ + FIXME("(%p, %p, %d, %d)\n", iface, pTypes, dwTypesCount, bLayerNumber); + return E_NOTIMPL; +} + +static const IWSDXMLContextVtbl xmlcontext_vtbl = +{ + IWSDXMLContextImpl_QueryInterface, + IWSDXMLContextImpl_AddRef, + IWSDXMLContextImpl_Release, + IWSDXMLContextImpl_AddNamespace, + IWSDXMLContextImpl_AddNameToNamespace, + IWSDXMLContextImpl_SetNamespaces, + IWSDXMLContextImpl_SetTypes +}; + +HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext) +{ + IWSDXMLContextImpl *obj; + + TRACE("(%p)", ppContext); + + if (ppContext == NULL) + { + WARN("Invalid parameter: ppContext == NULL\n"); + return E_POINTER; + } + + *ppContext = NULL; + + obj = WSDAllocateLinkedMemory(NULL, sizeof(*obj)); + + if (!obj) + { + return E_OUTOFMEMORY; + } + + obj->IWSDXMLContext_iface.lpVtbl = &xmlcontext_vtbl; + obj->ref = 1; + + *ppContext = &obj->IWSDXMLContext_iface; + TRACE("Returning iface %p\n", *ppContext); + + return S_OK; +} diff --git a/include/wsdxml.idl b/include/wsdxml.idl index e86d54b..33bd1d9 100644 --- a/include/wsdxml.idl +++ b/include/wsdxml.idl @@ -39,3 +39,5 @@ interface IWSDXMLContext : IUnknown HRESULT SetTypes([in, size_is(dwTypesCount)] const PCWSDXML_TYPE* pTypes, [in] DWORD dwTypesCount, [in] BYTE bLayerNumber); }; + +cpp_quote("HRESULT WINAPI WSDXMLCreateContext(IWSDXMLContext **ppContext);")

1 0

Owen Rudge : wsdapi/tests: Add tests for IWSDXMLContext_AddNamespace.
by Alexandre Julliard 19 May '17

19 May '17

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

Owen Rudge : wsdapi/tests: Add tests for IWSDXMLContext_AddNameToNamespace.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 8951c03e8e575c1a240309ecf45f49348030c076 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8951c03e8e575c1a240309ecf… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu May 18 22:39:27 2017 +0100 wsdapi/tests: Add tests for IWSDXMLContext_AddNameToNamespace. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/xml.c | 106 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) diff --git a/dlls/wsdapi/tests/xml.c b/dlls/wsdapi/tests/xml.c index 22f5faf..482fe85 100644 --- a/dlls/wsdapi/tests/xml.c +++ b/dlls/wsdapi/tests/xml.c @@ -407,6 +407,111 @@ static void XMLContext_AddNamespace_tests(void) IWSDXMLContext_Release(context); } +static void XMLContext_AddNameToNamespace_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 prefix2[] = {'w','i','n','e',0}; + WCHAR unPrefix0[] = {'u','n','0',0}; + WCHAR name1Text[] = {'B','o','b',0}; + WCHAR name2Text[] = {'T','i','m',0}; + IWSDXMLContext *context; + WSDXML_NAMESPACE *ns2 = NULL; + WSDXML_NAME *name1 = NULL, *name2 = NULL; + HRESULT hr; + + hr = WSDXMLCreateContext(&context); + ok(hr == S_OK, "WSDXMLCreateContext failed with %08x\n", hr); + + /* Test calling AddNameToNamespace with invalid arguments */ + hr = IWSDXMLContext_AddNameToNamespace(context, NULL, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, NULL, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, NULL, name1Text, NULL); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + /* Test calling AddNameToNamespace without the ppName parameter */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, NULL); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Now retrieve the created name */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, name1Text, &name1); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(name1 != NULL, "name1 == NULL\n"); + + if (name1 != NULL) + { + ok(lstrcmpW(name1->LocalName, name1Text) == 0, "LocalName returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name1->LocalName)); + ok(name1->LocalName != name1Text, "LocalName has not been cloned\n"); + + ok(name1->Space != NULL, "Space returned by AddNameToNamespace is null\n"); + ok(lstrcmpW(name1->Space->Uri, ns1Uri) == 0, "URI returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name1->Space->Uri)); + ok(lstrcmpW(name1->Space->PreferredPrefix, unPrefix0) == 0, "PreferredPrefix returned by AddName is not as expected (%s)\n", wine_dbgstr_w(name1->Space->PreferredPrefix)); + ok(name1->Space->Names == NULL, "Names array is not empty\n"); + ok(name1->Space->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", name1->Space->NamesCount); + ok(name1->Space->Uri != ns1Uri, "URI has not been cloned\n"); + } + + /* Test calling AddNamespace with parameters that are too large */ + hr = IWSDXMLContext_AddNameToNamespace(context, largeText, name1Text, &name2); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + hr = IWSDXMLContext_AddNameToNamespace(context, ns1Uri, largeText, &name2); + todo_wine ok(hr == E_INVALIDARG, "AddNameToNamespace failed with %08x\n", hr); + + /* Try creating a namespace explicitly */ + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, prefix2, &ns2); + todo_wine ok(hr == S_OK, "AddNamespace failed with %08x\n", hr); + + /* Now add a name to it */ + hr = IWSDXMLContext_AddNameToNamespace(context, ns2Uri, name2Text, &name2); + todo_wine ok(hr == S_OK, "AddNameToNamespace failed with %08x\n", hr); + + /* Check the returned structure */ + todo_wine ok(name2 != NULL, "name2 == NULL\n"); + + if (name2 != NULL) + { + ok(lstrcmpW(name2->LocalName, name2Text) == 0, "LocalName returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->LocalName)); + ok(name2->LocalName != name2Text, "LocalName has not been cloned\n"); + + ok(name2->Space != NULL, "Space returned by AddNameToNamespace is null\n"); + ok(name2->Space != ns2, "Space returned by AddNameToNamespace is equal to the namespace returned by AddNamespace\n"); + ok(lstrcmpW(name2->Space->Uri, ns2Uri) == 0, "URI returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->Space->Uri)); + ok(lstrcmpW(name2->Space->PreferredPrefix, prefix2) == 0, "PreferredPrefix returned by AddNameToNamespace is not as expected (%s)\n", wine_dbgstr_w(name2->Space->PreferredPrefix)); + ok(name2->Space->Names == NULL, "Names array is not empty\n"); + ok(name2->Space->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", name2->Space->NamesCount); + ok(name2->Space->Uri != ns2Uri, "URI has not been cloned\n"); + } + + WSDFreeLinkedMemory(name1); + WSDFreeLinkedMemory(name2); + WSDFreeLinkedMemory(ns2); + + /* Now re-retrieve ns2 */ + hr = IWSDXMLContext_AddNamespace(context, ns2Uri, 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, ns2Uri) == 0, "URI returned by AddNamespace is not as expected (%s)\n", wine_dbgstr_w(ns2->Uri)); + + /* Apparently wsdapi always leaves the namespace names array as empty */ + ok(ns2->Names == NULL, "Names array is not empty\n"); + ok(ns2->NamesCount == 0, "NamesCount is not 0 (value = %d)\n", ns2->NamesCount); + } + + IWSDXMLContext_Release(context); +} + START_TEST(xml) { /* Allocate a large text buffer for use in tests */ @@ -418,6 +523,7 @@ START_TEST(xml) AddSibling_tests(); XMLContext_AddNamespace_tests(); + XMLContext_AddNameToNamespace_tests(); HeapFree(GetProcessHeap(), 0, largeText); }

1 0

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

19 May '17

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 19 May '17

19 May '17

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 19 May '17

19 May '17

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