wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

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

19 May '17

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-devices-config-l1-1-1: Sort specfile.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 23730eb39e1e8b3234449b166f2c48bd17e0be43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23730eb39e1e8b3234449b166… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:19 2017 -0500 api-ms-win-devices-config-l1-1-1: Sort specfile. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-devices-config-l1-1-1.spec | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec index 09313bb..ab2a8a9 100644 --- a/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec +++ b/dlls/api-ms-win-devices-config-l1-1-1/api-ms-win-devices-config-l1-1-1.spec @@ -1,39 +1,39 @@ @ stub CM_Delete_Class_Key -@ stub CM_Delete_Device_Interface_KeyW @ stub CM_Delete_DevNode_Key +@ stub CM_Delete_Device_Interface_KeyW @ stub CM_Disable_DevNode @ stub CM_Enable_DevNode @ stdcall CM_Get_Child(ptr long long) setupapi.CM_Get_Child -@ stub CM_Get_Class_Property_Keys @ stub CM_Get_Class_PropertyW +@ stub CM_Get_Class_Property_Keys @ stdcall CM_Get_Class_Registry_PropertyW(ptr long ptr ptr long long ptr) setupapi.CM_Get_Class_Registry_PropertyW @ stub CM_Get_Depth -@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW +@ stub CM_Get_DevNode_PropertyW +@ stub CM_Get_DevNode_Property_Keys +@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW +@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW +@ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW @ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_ListW -@ stub CM_Get_Device_Interface_Property_KeysW +@ stdcall CM_Get_Device_Interface_List_SizeW(ptr ptr wstr long) setupapi.CM_Get_Device_Interface_List_SizeW @ stub CM_Get_Device_Interface_PropertyW -@ stub CM_Get_DevNode_Property_Keys -@ stub CM_Get_DevNode_PropertyW -@ stdcall CM_Get_DevNode_Registry_PropertyW(long long ptr ptr ptr long) setupapi.CM_Get_DevNode_Registry_PropertyW -@ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status +@ stub CM_Get_Device_Interface_Property_KeysW @ stdcall CM_Get_Parent(ptr long long) setupapi.CM_Get_Parent @ stub CM_Get_Sibling @ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW @ stub CM_MapCrToWin32Err @ stub CM_Open_Class_KeyW -@ stub CM_Open_Device_Interface_KeyW @ stdcall CM_Open_DevNode_Key(long long long long ptr long) setupapi.CM_Open_DevNode_Key +@ stub CM_Open_Device_Interface_KeyW @ stub CM_Query_And_Remove_SubTreeW @ stub CM_Register_Notification @ stub CM_Set_Class_PropertyW @ stdcall CM_Set_Class_Registry_PropertyW(ptr long ptr long long ptr) setupapi.CM_Set_Class_Registry_PropertyW -@ stub CM_Set_Device_Interface_PropertyW @ stub CM_Set_DevNode_PropertyW @ stub CM_Set_DevNode_Registry_PropertyW +@ stub CM_Set_Device_Interface_PropertyW @ stub CM_Setup_DevNode @ stub CM_Uninstall_DevNode @ stub CM_Unregister_Notification

1 0

Austin English : api-ms-win-core-windowserrorreporting-l1-1-0: Sort specfile.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 97e9d2de44f581ff45da89a5e93dfcc7deaa4e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97e9d2de44f581ff45da89a5e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:18 2017 -0500 api-ms-win-core-windowserrorreporting-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-windowserrorreporting-l1-1-0.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec index e5b4a61..96511a7 100644 --- a/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec +++ b/dlls/api-ms-win-core-windowserrorreporting-l1-1-0/api-ms-win-core-windowserrorreporting-l1-1-0.spec @@ -1,10 +1,10 @@ @ stub GetApplicationRecoveryCallback @ stub GetApplicationRestartSettings -@ stub WerpNotifyLoadStringResource -@ stub WerpNotifyUseStringResource @ stdcall WerRegisterFile(wstr long long) kernel32.WerRegisterFile @ stdcall WerRegisterMemoryBlock(ptr long) kernel32.WerRegisterMemoryBlock @ stdcall WerRegisterRuntimeExceptionModule(wstr ptr) kernel32.WerRegisterRuntimeExceptionModule @ stub WerUnregisterFile @ stdcall WerUnregisterMemoryBlock(ptr) kernel32.WerUnregisterMemoryBlock @ stub WerUnregisterRuntimeExceptionModule +@ stub WerpNotifyLoadStringResource +@ stub WerpNotifyUseStringResource

1 0

Austin English : api-ms-win-core-misc-l1-1-0: Sort specfile.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 9c647ce0d7c29741eec8dceef7b8e4141f161672 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c647ce0d7c29741eec8dceef… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:14 2017 -0500 api-ms-win-core-misc-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-misc-l1-1-0.spec | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec index 0d45e0d..07d28bf 100644 --- a/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec +++ b/dlls/api-ms-win-core-misc-l1-1-0/api-ms-win-core-misc-l1-1-0.spec @@ -13,18 +13,6 @@ @ stdcall LocalLock(long) kernel32.LocalLock @ stdcall LocalReAlloc(long long long) kernel32.LocalReAlloc @ stdcall LocalUnlock(long) kernel32.LocalUnlock -@ stdcall lstrcmpA(str str) kernel32.lstrcmpA -@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA -@ stdcall lstrcmpi(str str) kernel32.lstrcmpi -@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW -@ stdcall lstrcmp(str str) kernel32.lstrcmp -@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW -@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA -@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn -@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW -@ stdcall lstrlenA(str) kernel32.lstrlenA -@ stdcall lstrlen(str) kernel32.lstrlen -@ stdcall lstrlenW(wstr) kernel32.lstrlenW @ stdcall NeedCurrentDirectoryForExePathA(str) kernel32.NeedCurrentDirectoryForExePathA @ stdcall NeedCurrentDirectoryForExePathW(wstr) kernel32.NeedCurrentDirectoryForExePathW @ stdcall PulseEvent(long) kernel32.PulseEvent @@ -32,3 +20,15 @@ @ stdcall Sleep(long) kernel32.Sleep @ stdcall Wow64DisableWow64FsRedirection(ptr) kernel32.Wow64DisableWow64FsRedirection @ stdcall Wow64RevertWow64FsRedirection(ptr) kernel32.Wow64RevertWow64FsRedirection +@ stdcall lstrcmp(str str) kernel32.lstrcmp +@ stdcall lstrcmpA(str str) kernel32.lstrcmpA +@ stdcall lstrcmpW(wstr wstr) kernel32.lstrcmpW +@ stdcall lstrcmpi(str str) kernel32.lstrcmpi +@ stdcall lstrcmpiA(str str) kernel32.lstrcmpiA +@ stdcall lstrcmpiW(wstr wstr) kernel32.lstrcmpiW +@ stdcall lstrcpyn(ptr str long) kernel32.lstrcpyn +@ stdcall lstrcpynA(ptr str long) kernel32.lstrcpynA +@ stdcall lstrcpynW(ptr wstr long) kernel32.lstrcpynW +@ stdcall lstrlen(str) kernel32.lstrlen +@ stdcall lstrlenA(str) kernel32.lstrlenA +@ stdcall lstrlenW(wstr) kernel32.lstrlenW

1 0

Austin English : api-ms-win-core-localization-private-l1-1-0: Sort specfile.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 34ce3be779f676ecc1e6a945ec15cb56ab377051 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ce3be779f676ecc1e6a945e… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:13 2017 -0500 api-ms-win-core-localization-private-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-localization-private-l1-1-0.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec index b704db6..e445dc6 100644 --- a/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-private-l1-1-0/api-ms-win-core-localization-private-l1-1-0.spec @@ -1,6 +1,3 @@ -@ stub _AddMUIStringToCache -@ stub _GetMUIStringFromCache -@ stub _OpenMuiStringCache @ stub GetCPFileNameFromRegistry @ stub LoadStringByReference @ stub NlsCheckPolicy @@ -9,3 +6,6 @@ @ stub NlsUpdateLocale @ stub NlsUpdateSystemLocale @ stub NlsWriteEtwEvent +@ stub _AddMUIStringToCache +@ stub _GetMUIStringFromCache +@ stub _OpenMuiStringCache

1 0

Austin English : api-ms-win-core-com-private-l1-1-0: Sort specfile.
by Alexandre Julliard 19 May '17

19 May '17

Module: wine Branch: master Commit: 80691eecfa2b269233b54fcaa77223b0171a810a URL: http://source.winehq.org/git/wine.git/?a=commit;h=80691eecfa2b269233b54fcaa… Author: Austin English <austinenglish(a)gmail.com> Date: Thu May 18 16:09:10 2017 -0500 api-ms-win-core-com-private-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-com-private-l1-1-0.spec | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec index 13ee601..b0f6b64 100644 --- a/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec +++ b/dlls/api-ms-win-core-com-private-l1-1-0/api-ms-win-core-com-private-l1-1-0.spec @@ -1,7 +1,7 @@ +@ stub CLSIDFromOle1Class @ stub CleanupOleStateInAllTls @ stub CleanupTlsOleState @ stub ClearCleanupFlag -@ stub CLSIDFromOle1Class @ stub CoCreateErrorInfo @ stub CoCreateObjectInContext @ stub CoDeactivateObject @@ -39,21 +39,21 @@ @ stub GetHookInterface @ stub HkOleRegisterObject @ stub InternalAppInvokeExceptionFilter -@ stub InternalCallAsProxyExceptionFilter -@ stub InternalCallerIsAppContainer -@ stub InternalCallFrameExceptionFilter -@ stub InternalCanMakeOutCall @ stub InternalCCFreeUnused @ stub InternalCCGetClassInformationForDde @ stub InternalCCGetClassInformationFromKey @ stub InternalCCSetDdeServerWindow @ stub InternalCMLSendReceive +@ stub InternalCallAsProxyExceptionFilter +@ stub InternalCallFrameExceptionFilter +@ stub InternalCallerIsAppContainer +@ stub InternalCanMakeOutCall @ stub InternalCoIsSurrogateProcess -@ stub InternalCompleteObjRef @ stub InternalCoRegisterDisconnectCallback @ stub InternalCoRegisterSurrogatedObject @ stub InternalCoStdMarshalObject @ stub InternalCoUnregisterDisconnectCallback +@ stub InternalCompleteObjRef @ stub InternalCreateCAggId @ stub InternalCreateIdentityHandler @ stub InternalDoATClassCreate @@ -74,10 +74,10 @@ @ stub InternalOleModalLoopBlockFn @ stub InternalRegisterWindowPropInterface @ stub InternalReleaseMarshalObjRef +@ stub InternalSTAInvoke @ stub InternalServerExceptionFilter @ stub InternalSetAptCallCtrlOnTlsIfRequired @ stub InternalSetOleThunkWowPtr -@ stub InternalSTAInvoke @ stub InternalStubInvoke @ stub InternalTlsAllocData @ stub InternalUnmarshalObjRef

1 0

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

19 May '17

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 : 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

← Newer
1
...
25
26
27
28
29
30
31
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017