March 2014 - Wine-Commits - list.winehq.org

Nikolay Sivov : oleaut32/tests: Some tests for propputref invocation.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: 05c970c484f1379e33135afef2f28a075d965c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=05c970c484f1379e33135afef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 6 12:16:03 2014 +0400 oleaut32/tests: Some tests for propputref invocation. --- dlls/oleaut32/tests/test_reg.idl | 4 +++ dlls/oleaut32/tests/typelib.c | 59 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/test_reg.idl b/dlls/oleaut32/tests/test_reg.idl index 385ac60..ff32a1c 100644 --- a/dlls/oleaut32/tests/test_reg.idl +++ b/dlls/oleaut32/tests/test_reg.idl @@ -137,5 +137,9 @@ library register_test { [propget, id(DISPID_VALUE)] LONG test([in] LONG i); + [propputref, id(1)] + LONG testprop([in] LONG *i); + [propputref, id(2)] + LONG testprop2([in] IUnknown *i); } } diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index f27a67f..a7e7c96 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -136,6 +136,16 @@ static LONG WINAPI invoketest_get_test(IInvokeTest *iface, LONG i) return i+1; } +static LONG WINAPI invoketest_putref_testprop(IInvokeTest *iface, LONG *i) +{ + return *i+2; +} + +static LONG WINAPI invoketest_putref_testprop2(IInvokeTest *iface, IUnknown *i) +{ + return 6; +} + static const IInvokeTestVtbl invoketestvtbl = { invoketest_QueryInterface, invoketest_AddRef, @@ -144,7 +154,9 @@ static const IInvokeTestVtbl invoketestvtbl = { invoketest_GetTypeInfo, invoketest_GetIDsOfNames, invoketest_Invoke, - invoketest_get_test + invoketest_get_test, + invoketest_putref_testprop, + invoketest_putref_testprop2 }; static IInvokeTest invoketest = { &invoketestvtbl }; @@ -672,6 +684,7 @@ static void test_TypeInfo(void) const char *filenameA; WCHAR filename[MAX_PATH]; TYPEATTR *attr; + LONG l; hr = LoadTypeLib(wszStdOle2, &pTypeLib); ok_ole_success(hr, LoadTypeLib); @@ -866,8 +879,6 @@ static void test_TypeInfo(void) V_VT(&args[0]) = VT_I4; V_I4(&args[0]) = 0; - V_VT(&res) = VT_EMPTY; - i = 0; V_VT(&res) = VT_EMPTY; V_I4(&res) = 0; @@ -893,6 +904,48 @@ static void test_TypeInfo(void) ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); ok(V_I4(&res) == 1, "got %d\n", V_I4(&res)); + /* DISPATCH_PROPERTYPUTREF */ + l = 1; + V_VT(&args[0]) = VT_I4|VT_BYREF; + V_I4REF(&args[0]) = &l; + + dispidMember = DISPID_PROPERTYPUT; + dispparams.cArgs = 1; + dispparams.cNamedArgs = 1; + dispparams.rgdispidNamedArgs = &dispidMember; + dispparams.rgvarg = args; + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 1, DISPATCH_PROPERTYPUTREF, &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 3, "got %d\n", V_I4(&res)); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 1, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + + i = 0; + V_VT(&args[0]) = VT_UNKNOWN; + V_UNKNOWN(&args[0]) = NULL; + + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUTREF, &dispparams, &res, NULL, &i); + ok(hr == S_OK, "got 0x%08x, %d\n", hr, i); + ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res)); + ok(V_I4(&res) == 6, "got %d\n", V_I4(&res)); + + i = 0; + V_VT(&res) = VT_EMPTY; + V_I4(&res) = 0; + hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 2, DISPATCH_PROPERTYPUT, &dispparams, &res, NULL, &i); + ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x, %d\n", hr, i); + ITypeInfo_Release(pTypeInfo); ITypeLib_Release(pTypeLib); DeleteFileA(filenameA);

1 0

Henri Verbeet : ddraw/tests: Verify that creating a ddraw object works before running any real tests.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: 0b547ee750f7fb5dfc61a7f66e73511ca03726b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b547ee750f7fb5dfc61a7f66… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 6 11:06:06 2014 +0100 ddraw/tests: Verify that creating a ddraw object works before running any real tests. --- dlls/ddraw/tests/ddraw1.c | 272 ++++++++++-------------------------- dlls/ddraw/tests/ddraw2.c | 335 +++++++++++++-------------------------------- dlls/ddraw/tests/ddraw4.c | 254 ++++++++++------------------------ dlls/ddraw/tests/ddraw7.c | 244 ++++++++++----------------------- 4 files changed, 320 insertions(+), 785 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b547ee750f7fb5dfc61a…

1 0

Dmitry Timoshkov : taskschd/tests: Add more ITaskFolder:: RegisterTask tests.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: e06bac6ad8a97e548e58656b95b3be8bf20c2371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06bac6ad8a97e548e58656b9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Mar 6 14:25:36 2014 +0900 taskschd/tests: Add more ITaskFolder::RegisterTask tests. --- dlls/taskschd/tests/scheduler.c | 53 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index d554779..0f89021 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -702,6 +702,26 @@ static void test_GetTask(void) " </Exec>\n" " </Actions>\n" "</Task>\n"; + static const struct + { + DWORD flags, hr; + } create_new_task[] = + { + { 0, S_OK }, + { TASK_CREATE, S_OK }, + { TASK_UPDATE, 0x80070002 /* HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) */ }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; + static const struct + { + DWORD flags, hr; + } open_existing_task[] = + { + { 0, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_CREATE, 0x800700b7 /* HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS) */ }, + { TASK_UPDATE, S_OK }, + { TASK_CREATE | TASK_UPDATE, S_OK } + }; WCHAR xmlW[sizeof(xml1)]; HRESULT hr; BSTR bstr; @@ -712,6 +732,7 @@ static void test_GetTask(void) ITaskFolder *root, *folder; IRegisteredTask *task1, *task2; IID iid; + int i; hr = CoCreateInstance(&CLSID_TaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskService, (void **)&service); if (hr != S_OK) @@ -746,14 +767,34 @@ static void test_GetTask(void) hr = ITaskFolder_GetTask(root, Wine, &task1); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "expected ERROR_PATH_NOT_FOUND, got %#x\n", hr); } + MultiByteToWideChar(CP_ACP, 0, xml1, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); + for (i = 0; i < sizeof(create_new_task)/sizeof(create_new_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, create_new_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (create_new_task[i].hr != S_OK) todo_wine + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); +else + ok(hr == create_new_task[i].hr, "%d: expected %#x, got %#x\n", i, create_new_task[i].hr, hr); + if (hr == S_OK) + { + hr = ITaskFolder_DeleteTask(root, Wine_Task1, 0); +todo_wine + ok(hr == S_OK, "DeleteTask error %#x\n", hr); + } + } + hr = ITaskFolder_RegisterTask(root, Wine_Task1, NULL, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "expected RPC_X_NULL_REF_POINTER, got %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_VALIDATE_ONLY, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); + ok(hr == S_OK, "RegisterTask error %#x\n", hr); + hr = ITaskFolder_RegisterTask(root, Wine, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); todo_wine - ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED), "expected ERROR_ACCESS_DENIED, got %#x\n", hr); + ok(hr == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || broken(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS)) /* Vista */, "expected ERROR_ACCESS_DENIED, got %#x\n", hr); hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE, v_null, v_null, TASK_LOGON_NONE, v_null, NULL); ok(hr == S_OK, "RegisterTask error %#x\n", hr); @@ -769,6 +810,16 @@ todo_wine hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, TASK_CREATE_OR_UPDATE, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); ok(hr == S_OK, "RegisterTask error %#x\n", hr); + for (i = 0; i < sizeof(open_existing_task)/sizeof(open_existing_task[0]); i++) + { + hr = ITaskFolder_RegisterTask(root, Wine_Task1, xmlW, open_existing_task[i].flags, v_null, v_null, TASK_LOGON_NONE, v_null, &task1); +/* FIXME: Remove once Wine is fixed */ +if (open_existing_task[i].hr != S_OK) todo_wine + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); +else + ok(hr == open_existing_task[i].hr, "%d: expected %#x, got %#x\n", i, open_existing_task[i].hr, hr); + } + hr = IRegisteredTask_get_Name(task1, NULL); todo_wine ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr);

1 0

Nikolay Sivov : msxml3: Implement endElement() for writer' s IVBSAXContentHandler.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: 87fb169f9cdf18c9cd38c313d82689ddf18659c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87fb169f9cdf18c9cd38c313d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 6 09:22:38 2014 +0400 msxml3: Implement endElement() for writer's IVBSAXContentHandler. --- dlls/msxml3/mxwriter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index b0765c0..01e21a7 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -2112,8 +2112,16 @@ static HRESULT WINAPI VBSAXContentHandler_endElement(IVBSAXContentHandler *iface BSTR *localName, BSTR *QName) { mxwriter *This = impl_from_IVBSAXContentHandler( iface ); - FIXME("(%p)->(%p %p %p): stub\n", This, namespaceURI, localName, QName); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p)\n", This, namespaceURI, localName, QName); + + if (!namespaceURI || !localName || !QName) + return E_POINTER; + + return ISAXContentHandler_endElement(&This->ISAXContentHandler_iface, + *namespaceURI, SysStringLen(*namespaceURI), + *localName, SysStringLen(*localName), + *QName, SysStringLen(*QName)); } static HRESULT WINAPI VBSAXContentHandler_characters(IVBSAXContentHandler *iface, BSTR *chars)

1 0

Bruno Jesus : po: Update Portuguese translation.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: 91108addef699440924cc791f7712c618ebbdbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=91108addef699440924cc791f… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 5 21:48:16 2014 -0300 po: Update Portuguese translation. --- po/pt_PT.po | 88 ++++++++++++++--------------------------------------------- 1 file changed, 20 insertions(+), 68 deletions(-) diff --git a/po/pt_PT.po b/po/pt_PT.po index 93937e4..a754e68 100644 --- a/po/pt_PT.po +++ b/po/pt_PT.po @@ -30,11 +30,6 @@ msgid "&Install..." msgstr "&Instalar..." #: appwiz.rc:65 -#, fuzzy -#| msgid "" -#| "The following software can be automatically removed. To remove a program " -#| "or to modify its installed components, select it from the list and click " -#| "Change/Remove." msgid "" "The following software can be automatically removed. To remove a program or " "to modify its installed components, select it from the list and click Modify/" @@ -163,21 +158,10 @@ msgid "Cancel" msgstr "Cancelar" #: appwiz.rc:115 -#, fuzzy -#| msgid "Wine Gecko Installer" msgid "Wine Mono Installer" -msgstr "Instalador Wine Gecko" +msgstr "Instalador Wine Mono" #: appwiz.rc:118 -#, fuzzy -#| msgid "" -#| "Wine could not find a Gecko package which is needed for applications " -#| "embedding HTML to work correctly. Wine can automatically download and " -#| "install it for you.\n" -#| "\n" -#| "Note: it is recommended to use your distribution's packages instead. See " -#| "<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -#| "for details." msgid "" "Wine could not find a Mono package which is needed for .NET applications to " "work correctly. Wine can automatically download and install it for you.\n" @@ -186,13 +170,13 @@ msgid "" "href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> for " "details." msgstr "" -"O Wine não conseguiu encontrar o pacote Gecko que é necessário para " +"O Wine não conseguiu encontrar o pacote Mono que é necessário para " "aplicações com HTML embutido funcionarem corretamente. O Wine pode " "automaticamente efetuar o download e instalá-lo por si.\n" "\n" "Nota: é recomendável usar os pacotes da sua distribuição em vez disso. Veja " -"<a href=\"http://wiki.winehq.org/Gecko\">http://wiki.winehq.org/Gecko</a> " -"para mais detalhes." +"<a href=\"http://wiki.winehq.org/Mono\">http://wiki.winehq.org/Mono</a> para " +"mais detalhes." #: appwiz.rc:31 msgid "Add/Remove Programs" @@ -2228,16 +2212,12 @@ msgstr "" "confiáveis:" #: cryptui.rc:299 -#, fuzzy -#| msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (.p7b)" msgid "Cryptographic Message Syntax Standard/PKCS #7 Messages (*.p7b)" -msgstr "Norma de Sintaxe de Mensagens Cifradas/PKCS #7 Mensagens (.p7b)" +msgstr "Norma de Sintaxe de Mensagens Cifradas/PKCS #7 Mensagens (*.p7b)" #: cryptui.rc:301 -#, fuzzy -#| msgid "Personal Information Exchange/PKCS #12 (.pfx, .p12)" msgid "Personal Information Exchange/PKCS #12 (*.pfx; *.p12)" -msgstr "Troca de Informações Pessoais/PKCS #12 (.pfx, .p12)" +msgstr "Troca de Informações Pessoais/PKCS #12 (*.pfx, *.p12)" #: cryptui.rc:303 cryptui.rc:81 cryptui.rc:162 msgid "Microsoft Serialized Certificate Store (*.sst)" @@ -2381,32 +2361,24 @@ msgid "Select the format you want to use:" msgstr "Seleccione o formato que deseja utilizar:" #: cryptui.rc:408 -#, fuzzy -#| msgid "&DER-encoded X.509 (.cer)" msgid "&DER-encoded X.509 (*.cer)" -msgstr "X.509 codificado em &DER (.cer)" +msgstr "X.509 codificado em &DER (*.cer)" #: cryptui.rc:410 -#, fuzzy -#| msgid "Ba&se64-encoded X.509 (.cer):" msgid "Ba&se64-encoded X.509 (*.cer):" -msgstr "X509 codificado em Base64 (.cer)" +msgstr "X509 codificado em Base64 (*.cer)" #: cryptui.rc:412 -#, fuzzy -#| msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (.p7b)" msgid "&Cryptographic Message Syntax Standard/PKCS #7 Message (*.p7b)" -msgstr "Norma de Sintaxe de Mensagens &Cifradas/PKCS #7 Message (.p7b)" +msgstr "Norma de Sintaxe de Mensagens &Cifradas/PKCS #7 Message (*.p7b)" #: cryptui.rc:414 msgid "&Include all certificates in the certification path if possible" msgstr "&Incluir todos os certificados no caminho de certificação se possível" #: cryptui.rc:416 -#, fuzzy -#| msgid "&Personal Information Exchange/PKCS #12 (.pfx)" msgid "&Personal Information Exchange/PKCS #12 (*.pfx)" -msgstr "Troca de Informações &Pessoais/PKCS #12 (.pfx)" +msgstr "Troca de Informações &Pessoais/PKCS #12 (*.pfx)" #: cryptui.rc:418 msgid "Incl&ude all certificates in the certification path if possible" @@ -3475,22 +3447,16 @@ msgid "&Disable" msgstr "&Desactivar" #: joy.rc:40 -#, fuzzy -#| msgid "&enable" msgid "&Enable" -msgstr "&activar" +msgstr "&Activar" #: joy.rc:41 -#, fuzzy -#| msgid "Disconnected" msgid "Connected" -msgstr "Desligado" +msgstr "Conectado" #: joy.rc:43 -#, fuzzy -#| msgid "&Disable" msgid "Disabled" -msgstr "&Desactivar" +msgstr "Desactivado" #: joy.rc:45 msgid "" @@ -3511,10 +3477,8 @@ msgid "Test Force Feedback" msgstr "" #: joy.rc:67 -#, fuzzy -#| msgid "Available formats" msgid "Available Effects" -msgstr "Formatos Disponíveis" +msgstr "Efeitos Disponíveis" #: joy.rc:69 msgid "" @@ -3577,10 +3541,8 @@ msgid "Expected ')'" msgstr "')' esperado" #: jscript.rc:40 -#, fuzzy -#| msgid "Invalid parameter.\n" msgid "Invalid character" -msgstr "Parâmetro inválido.\n" +msgstr "Caractere inválido" #: jscript.rc:41 msgid "Unterminated string constant" @@ -3669,10 +3631,8 @@ msgid "Number of fraction digits is out of range" msgstr "Valor de enumeração fora dos limites.\n" #: jscript.rc:62 -#, fuzzy -#| msgid "Subscript out of range" msgid "Precision is out of range" -msgstr "Subscripto fora de alcance" +msgstr "Precisão fora de alcance" #: jscript.rc:63 msgid "Array length must be a finite positive integer" @@ -4747,8 +4707,6 @@ msgid "No Unicode translation.\n" msgstr "Sem tradução Unicode.\n" #: winerror.mc:1366 -#, fuzzy -#| msgid "DLL init failed.\n" msgid "DLL initialization failed.\n" msgstr "Arranque do DLL falhou.\n" @@ -6637,10 +6595,8 @@ msgid "The username could not be found.\n" msgstr "O nome de utilizador não foi encontrado.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "O sítio não existe.\n" +msgstr "Esta conexão de rede não existe.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port" @@ -8326,19 +8282,15 @@ msgstr "" #, fuzzy #| msgid "Installation transform failed to apply.\n" msgid "Installation of component failed: %08x" -msgstr "Falha na aplicação da operaçao de instalação.\n" +msgstr "Instalação do componente falhou: %08x" #: urlmon.rc:52 -#, fuzzy -#| msgid "&Install" msgid "Install (%d)" -msgstr "&Instalar" +msgstr "Instalar (%d)" #: urlmon.rc:53 -#, fuzzy -#| msgid "&Install" msgid "Install" -msgstr "&Instalar" +msgstr "Instalar" #: user32.rc:30 user32.rc:43 taskmgr.rc:138 msgctxt "window"

1 0

Nikolay Sivov : msxml3: Implement startElement() for writer' s IVBSAXContentHandler.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: dc37ed1f7a176c794cf2f4d4ae02588d623a640d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc37ed1f7a176c794cf2f4d4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 6 09:22:19 2014 +0400 msxml3: Implement startElement() for writer's IVBSAXContentHandler. --- dlls/msxml3/mxwriter.c | 119 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 86 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 6fc3631..b0765c0 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -398,11 +398,14 @@ static void close_output_buffer(mxwriter *This) get_code_page(This->xml_enc, &This->buffer->code_page); } -/* escapes special characters like: +/* Escapes special characters like: '<' -> "<" '&' -> "&" '"' -> """ '>' -> ">" + + On call 'len' contains a length of 'str' in chars or -1 if it's null terminated. + After a call it's updated with actual new length if it wasn't -1 initially. */ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) { @@ -1169,6 +1172,40 @@ static HRESULT WINAPI SAXContentHandler_endPrefixMapping( return S_OK; } +static void mxwriter_write_attribute(mxwriter *writer, const WCHAR *qname, int qname_len, + const WCHAR *value, int value_len, BOOL escape) +{ + static const WCHAR eqW[] = {'='}; + + /* space separator in front of every attribute */ + write_output_buffer(writer->buffer, spaceW, 1); + write_output_buffer(writer->buffer, qname, qname_len); + write_output_buffer(writer->buffer, eqW, 1); + + if (escape) + { + WCHAR *escaped = get_escaped_string(value, EscapeValue, &value_len); + write_output_buffer_quoted(writer->buffer, escaped, value_len); + heap_free(escaped); + } + else + write_output_buffer_quoted(writer->buffer, value, value_len); +} + +static void mxwriter_write_starttag(mxwriter *writer, const WCHAR *qname, int len) +{ + static const WCHAR ltW[] = {'<'}; + + close_element_starttag(writer); + set_element_name(writer, qname ? qname : emptyW, qname ? len : 0); + + write_node_indent(writer); + + write_output_buffer(writer->buffer, ltW, 1); + write_output_buffer(writer->buffer, qname, len); + writer_inc_indent(writer); +} + static HRESULT WINAPI SAXContentHandler_startElement( ISAXContentHandler *iface, const WCHAR *namespaceUri, @@ -1180,7 +1217,6 @@ static HRESULT WINAPI SAXContentHandler_startElement( ISAXAttributes *attr) { mxwriter *This = impl_from_ISAXContentHandler( iface ); - static const WCHAR ltW[] = {'<'}; TRACE("(%p)->(%s %s %s %p)\n", This, debugstr_wn(namespaceUri, nnamespaceUri), debugstr_wn(local_name, nlocal_name), debugstr_wn(QName, nQName), attr); @@ -1189,15 +1225,7 @@ static HRESULT WINAPI SAXContentHandler_startElement( (nQName == -1 && This->class_version == MSXML6)) return E_INVALIDARG; - close_element_starttag(This); - set_element_name(This, QName ? QName : emptyW, - QName ? nQName : 0); - - write_node_indent(This); - - write_output_buffer(This->buffer, ltW, 1); - write_output_buffer(This->buffer, QName, nQName); - writer_inc_indent(This); + mxwriter_write_starttag(This, QName, nQName); if (attr) { @@ -1212,31 +1240,16 @@ static HRESULT WINAPI SAXContentHandler_startElement( for (i = 0; i < length; i++) { - static const WCHAR eqW[] = {'='}; - const WCHAR *str; - int len = 0; + int qname_len = 0, value_len = 0; + const WCHAR *qname, *value; - hr = ISAXAttributes_getQName(attr, i, &str, &len); + hr = ISAXAttributes_getQName(attr, i, &qname, &qname_len); if (FAILED(hr)) return hr; - /* space separator in front of every attribute */ - write_output_buffer(This->buffer, spaceW, 1); - write_output_buffer(This->buffer, str, len); - - write_output_buffer(This->buffer, eqW, 1); - - len = 0; - hr = ISAXAttributes_getValue(attr, i, &str, &len); + hr = ISAXAttributes_getValue(attr, i, &value, &value_len); if (FAILED(hr)) return hr; - if (escape) - { - WCHAR *escaped = get_escaped_string(str, EscapeValue, &len); - write_output_buffer_quoted(This->buffer, escaped, len); - heap_free(escaped); - } - else - write_output_buffer_quoted(This->buffer, str, len); + mxwriter_write_attribute(This, qname, qname_len, value, value_len, escape); } } @@ -2051,8 +2064,48 @@ static HRESULT WINAPI VBSAXContentHandler_startElement(IVBSAXContentHandler *ifa BSTR *namespaceURI, BSTR *localName, BSTR *QName, IVBSAXAttributes *attrs) { mxwriter *This = impl_from_IVBSAXContentHandler( iface ); - FIXME("(%p)->(%p %p %p %p): stub\n", This, namespaceURI, localName, QName, attrs); - return E_NOTIMPL; + + TRACE("(%p)->(%p %p %p %p)\n", This, namespaceURI, localName, QName, attrs); + + if (!namespaceURI || !localName || !QName) + return E_POINTER; + + TRACE("(%s %s %s)\n", debugstr_w(*namespaceURI), debugstr_w(*localName), debugstr_w(*QName)); + + mxwriter_write_starttag(This, *QName, SysStringLen(*QName)); + + if (attrs) + { + int length, i, escape; + HRESULT hr; + + hr = IVBSAXAttributes_get_length(attrs, &length); + if (FAILED(hr)) return hr; + + escape = This->props[MXWriter_DisableEscaping] == VARIANT_FALSE || + (This->class_version == MSXML4 || This->class_version == MSXML6); + + for (i = 0; i < length; i++) + { + BSTR qname, value; + + hr = IVBSAXAttributes_getQName(attrs, i, &qname); + if (FAILED(hr)) return hr; + + hr = IVBSAXAttributes_getValue(attrs, i, &value); + if (FAILED(hr)) + { + SysFreeString(qname); + return hr; + } + + mxwriter_write_attribute(This, qname, SysStringLen(qname), value, SysStringLen(value), escape); + SysFreeString(qname); + SysFreeString(value); + } + } + + return S_OK; } static HRESULT WINAPI VBSAXContentHandler_endElement(IVBSAXContentHandler *iface, BSTR *namespaceURI,

1 0

Bruno Jesus : po: Update Brazilian Portuguese translation.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: wine Branch: master Commit: 4f8023a73f9e1a264a86d7bab428bc8d1f65ecd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f8023a73f9e1a264a86d7bab… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Wed Mar 5 21:48:14 2014 -0300 po: Update Brazilian Portuguese translation. --- po/pt_BR.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 78d09d0..cebd394 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6597,10 +6597,8 @@ msgid "The username could not be found.\n" msgstr "O nome de usuário não foi encontrado.\n" #: winerror.mc:3741 -#, fuzzy -#| msgid "The site does not exist.\n" msgid "This network connection does not exist.\n" -msgstr "O site não existe.\n" +msgstr "Esta conexão de rede não existe.\n" #: localspl.rc:31 localui.rc:31 winspool.rc:30 msgid "Local Port"

1 0

Francois Gouget : testbot/testagentd: Add an RPC to set the remote host' s system time.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: tools Branch: master Commit: df9f82b2f5e8040085f97e116f93f60187825ec7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=df9f82b2f5e8040085f97e11… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 15:24:05 2014 +0100 testbot/testagentd: Add an RPC to set the remote host's system time. --- testbot/lib/WineTestBot/TestAgent.pm | 23 ++++++++++++++++++ testbot/scripts/TestAgent | 8 ++++++- testbot/src/testagentd/platform.h | 6 +++++ testbot/src/testagentd/platform_unix.c | 24 +++++++++++++++++++ testbot/src/testagentd/platform_windows.c | 37 +++++++++++++++++++++++++++++ testbot/src/testagentd/testagentd.c | 25 ++++++++++++++++++- 6 files changed, 121 insertions(+), 2 deletions(-) diff --git a/testbot/lib/WineTestBot/TestAgent.pm b/testbot/lib/WineTestBot/TestAgent.pm index dfc86e3..299f63e 100644 --- a/testbot/lib/WineTestBot/TestAgent.pm +++ b/testbot/lib/WineTestBot/TestAgent.pm @@ -36,6 +36,7 @@ my $RPC_RUN = 3; my $RPC_WAIT = 4; my $RPC_RM = 5; my $RPC_WAIT2 = 6; +my $RPC_SETTIME = 7; my %RpcNames=( $RPC_PING => 'ping', @@ -45,6 +46,7 @@ my %RpcNames=( $RPC_WAIT => 'wait', $RPC_RM => 'rm', $RPC_WAIT2 => 'wait2', + $RPC_SETTIME => 'settime', ); my $Debug = 0; @@ -1155,4 +1157,25 @@ sub Rm($@) return $self->_RecvErrorList(); } +sub SetTime($) +{ + my ($self) = @_; + debug("SetTime\n"); + + # Make sure we have the server version + return undef if (!$self->{agentversion} and !$self->_Connect()); + + # Send the command + if (!$self->_StartRPC($RPC_SETTIME) or + !$self->_SendListSize(2) or + !$self->_SendUInt64(time()) or + !$self->_SendUInt32(30)) + { + return undef; + } + + # Get the reply + return $self->_RecvList(''); +} + 1; diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index bb7dd14..30e2fbc 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -187,7 +187,7 @@ while (@ARGV) { $Cmd = $arg; } - elsif ($arg eq "ping") + elsif ($arg eq "ping" or $arg eq "settime") { $Cmd = $arg; } @@ -268,6 +268,7 @@ if (defined $Usage) print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> run <command> <arguments>\n"; print "or $name0 [options] <hostname> wait <pid>\n"; + print "or $name0 [options] <hostname> settime\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; print "or $name0 [options] <hostname> [ping|version]\n"; print "\n"; @@ -290,6 +291,7 @@ if (defined $Usage) print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; print " wait Waits for the specified child process on the server.\n"; + print " settime Set the system time of the remote host.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; @@ -370,6 +372,10 @@ elsif ($Cmd eq "rm") $Result = 1; } } +elsif ($Cmd eq "settime") +{ + $Result = $TA->SetTime(); +} elsif ($Cmd eq "getversion") { $Result = $TA->GetVersion(); diff --git a/testbot/src/testagentd/platform.h b/testbot/src/testagentd/platform.h index fffaa4b..785b3b5 100644 --- a/testbot/src/testagentd/platform.h +++ b/testbot/src/testagentd/platform.h @@ -79,6 +79,12 @@ uint64_t platform_run(char** argv, uint32_t flags, char** redirects); */ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *childstatus); +/* Sets the system time to the specified Unix epoch. If the system time is + * already within leeway seconds of the specified time, then consider that + * the system clock is already correct. + */ +int platform_settime(uint64_t epoch, uint32_t leeway); + /* Returns a string describing the last socket-related error */ int sockeintr(void); const char* sockerror(void); diff --git a/testbot/src/testagentd/platform_unix.c b/testbot/src/testagentd/platform_unix.c index e003135..c9fc7fd 100644 --- a/testbot/src/testagentd/platform_unix.c +++ b/testbot/src/testagentd/platform_unix.c @@ -29,6 +29,7 @@ #include <sys/wait.h> #include <signal.h> #include <time.h> +#include <sys/time.h> #include "platform.h" #include "list.h" @@ -198,6 +199,29 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return 1; } +int platform_settime(uint64_t epoch, uint32_t leeway) +{ + struct timeval tv; + + if (leeway) + { + uint64_t offset; + gettimeofday(&tv, NULL); + offset = llabs(tv.tv_sec-epoch); + if (offset <= leeway) + return 2; + } + + tv.tv_sec = epoch; + tv.tv_usec = 0; + if (!settimeofday(&tv, NULL)) + { + set_status(ST_ERROR, "failed to set the time: %s", strerror(errno)); + return 0; + } + return 1; +} + int sockeintr(void) { return errno == EINTR; diff --git a/testbot/src/testagentd/platform_windows.c b/testbot/src/testagentd/platform_windows.c index a0dccfa..9dda56a 100644 --- a/testbot/src/testagentd/platform_windows.c +++ b/testbot/src/testagentd/platform_windows.c @@ -221,6 +221,43 @@ int platform_wait(SOCKET client, uint64_t pid, uint32_t timeout, uint32_t *child return success; } +int platform_settime(uint64_t epoch, uint32_t leeway) +{ + FILETIME filetime; + SYSTEMTIME systemtime; + + /* Where 134774 is the number of days from 1601/1/1 to 1970/1/1 */ + epoch = (epoch + ((uint64_t)134774) * 24 * 3600 ) * 10000000; + + if (leeway) + { + ULARGE_INTEGER ul; + GetSystemTime(&systemtime); + /* in case of an error set the time unconditionally */ + if (SystemTimeToFileTime(&systemtime, &filetime)) + { + ul.LowPart = filetime.dwLowDateTime; + ul.HighPart = filetime.dwHighDateTime; + if (llabs(ul.QuadPart-epoch)/10000000 < leeway) + return 1; + } + } + + filetime.dwLowDateTime = (DWORD)epoch; + filetime.dwHighDateTime = epoch >> 32; + if (!FileTimeToSystemTime(&filetime, &systemtime)) + { + set_status(ST_ERROR, "failed to oconvert the time (%lu)", GetLastError()); + return 0; + } + if (!SetSystemTime(&systemtime)) + { + set_status(ST_ERROR, "failed to set the time (%lu)", GetLastError()); + return 0; + } + return 1; +} + int sockretry(void) { return (WSAGetLastError() == WSAEINTR); diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index e99dcb4..35b42f3 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -35,8 +35,9 @@ * 1.1: Added the wait2 RPC. * 1.2: Add more redirection options to the run RPC. * 1.3: Fix the zero / infinite timeouts in the wait2 RPC. + * 1.4: Add the settime RPC. */ -#define PROTOCOL_VERSION "testagentd 1.3" +#define PROTOCOL_VERSION "testagentd 1.4" #define BLOCK_SIZE 65536 @@ -82,6 +83,7 @@ enum rpc_ids_t RPCID_WAIT, RPCID_RM, RPCID_WAIT2, + RPCID_SETTIME, }; /* This is the RPC currently being processed */ @@ -891,6 +893,24 @@ static void do_rm(SOCKET client) } } +static void do_settime(SOCKET client) +{ + uint64_t epoch; + uint32_t leeway; + + if (!expect_list_size(client, 2) || + !recv_uint64(client, &epoch) || + !recv_uint32(client, &leeway)) + { + send_error(client); + return; + } + if (platform_settime(epoch, leeway)) + send_list_size(client, 0); + else + send_error(client); +} + static void do_unknown(SOCKET client, uint32_t id) { uint32_t argc; @@ -952,6 +972,9 @@ static void process_rpc(SOCKET client) case RPCID_RM: do_rm(client); break; + case RPCID_SETTIME: + do_settime(client); + break; default: do_unknown(client, rpcid); }

1 0

Francois Gouget : testbot: The $OverheadTimeout configuration variable is unused so remove it.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: tools Branch: master Commit: 86133b084a765c00e036a20b89717641066f9d1a URL: http://source.winehq.org/git/tools.git/?a=commit;h=86133b084a765c00e036a20b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 15:26:58 2014 +0100 testbot: The $OverheadTimeout configuration variable is unused so remove it. --- testbot/lib/WineTestBot/Config.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 48eb3f0..fbf2b0b 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -29,7 +29,7 @@ use vars qw (@ISA @EXPORT @EXPORT_OK $UseSSL $LogDir $DataDir $BinDir $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout $SingleTimeout - $BuildTimeout $ReconfigTimeout $OverheadTimeout $TagPrefix + $BuildTimeout $ReconfigTimeout $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel @@ -41,7 +41,7 @@ require Exporter; $MaxRevertingVMs $MaxRevertsWhileRunningVMs $MaxActiveVMs $MaxVMsWhenIdle $SleepAfterRevert $WaitForToolsInVM $AdminEMail $RobotEMail $WinePatchToOverride $WinePatchCc $SuiteTimeout - $SingleTimeout $BuildTimeout $ReconfigTimeout $OverheadTimeout + $SingleTimeout $BuildTimeout $ReconfigTimeout $TagPrefix $ProjectName $PatchesMailingList $LDAPServer $LDAPBindDN $LDAPSearchBase $LDAPSearchFilter $LDAPRealNameAttribute $LDAPEMailAttribute $AgentPort $Tunnel @@ -71,7 +71,6 @@ $SuiteTimeout = 30 * 60; $SingleTimeout = 2 * 60; $BuildTimeout = 5 * 60; $ReconfigTimeout = 45 * 60; -$OverheadTimeout = 3 * 60; $ProjectName = "Wine"; $PatchesMailingList = "wine-patches";

1 0

Francois Gouget : testbot/WineRunTask: Set the system time on the Windows VM before running the tests.
by Alexandre Julliard March 6, 2014

March 6, 2014

Module: tools Branch: master Commit: 28e77b884077e52aba213a079a320672e404881a URL: http://source.winehq.org/git/tools.git/?a=commit;h=28e77b884077e52aba213a07… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 6 15:26:34 2014 +0100 testbot/WineRunTask: Set the system time on the Windows VM before running the tests. --- testbot/bin/WineRunTask.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/testbot/bin/WineRunTask.pl b/testbot/bin/WineRunTask.pl index 3caa673..3b5c17e 100755 --- a/testbot/bin/WineRunTask.pl +++ b/testbot/bin/WineRunTask.pl @@ -228,6 +228,11 @@ if (defined $ErrMessage) FatalError "Can't set VM status to running: $ErrMessage\n", $FullErrFileName, $Job, $Step, $Task; } +if (!$TA->SetTime()) +{ + # Not a fatal error + LogTaskError("Unable to set the VM system time (". $TA->GetVersion() ."): ". $TA->GetLastError() ."\n", $FullErrFileName); +} my $FileType = $Step->FileType; if ($FileType ne "exe32" && $FileType ne "exe64")

1 0