February 2011 - Wine-Commits

Nikolay Sivov : msxml3: Null pointer for schema uri should be treated as empty.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: edeff310b12072b957baf4a049408d28a22b4ccf URL: http://source.winehq.org/git/wine.git/?a=commit;h=edeff310b12072b957baf4a04… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 17 01:42:15 2011 +0300 msxml3: Null pointer for schema uri should be treated as empty. --- dlls/msxml3/schema.c | 18 ++++++++++-------- dlls/msxml3/tests/schema.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index fa4208d..9239326 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -63,11 +63,13 @@ static const xmlChar XDR_schema[] = "Schema"; static const xmlChar XDR_nsURI[] = "urn:schemas-microsoft-com:xml-data"; static const xmlChar DT_nsURI[] = "urn:schemas-microsoft-com:datatypes"; -static xmlChar const* datatypes_src = NULL; -static int datatypes_len = 0; -static HGLOBAL datatypes_handle = NULL; -static HRSRC datatypes_rsrc = NULL; -static xmlSchemaPtr datatypes_schema = NULL; +static xmlChar const* datatypes_src; +static int datatypes_len; +static HGLOBAL datatypes_handle; +static HRSRC datatypes_rsrc; +static xmlSchemaPtr datatypes_schema; + +static const WCHAR emptyW[] = {0}; /* Supported Types: * msxml3 - XDR only @@ -1057,7 +1059,7 @@ static HRESULT WINAPI schema_cache_Invoke(IXMLDOMSchemaCollection2* iface, static HRESULT WINAPI schema_cache_add(IXMLDOMSchemaCollection2* iface, BSTR uri, VARIANT var) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = xmlChar_from_wchar(uri); + xmlChar* name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); TRACE("(%p)->(%s, var(vt %x))\n", This, debugstr_w(uri), V_VT(&var)); switch (V_VT(&var)) @@ -1158,7 +1160,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri if (!node) return E_POINTER; - name = xmlChar_from_wchar(uri); + name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); entry = (cache_entry*) xmlHashLookup(This->cache, name); heap_free(name); @@ -1173,7 +1175,7 @@ static HRESULT WINAPI schema_cache_get(IXMLDOMSchemaCollection2* iface, BSTR uri static HRESULT WINAPI schema_cache_remove(IXMLDOMSchemaCollection2* iface, BSTR uri) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - xmlChar* name = xmlChar_from_wchar(uri); + xmlChar* name = uri ? xmlChar_from_wchar(uri) : xmlChar_from_wchar(emptyW); TRACE("(%p)->(%s)\n", This, wine_dbgstr_w(uri)); xmlHashRemoveEntry(This->cache, name, cache_free); diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 2b20603..56a77e6 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -493,11 +493,14 @@ static void* _create_object(const GUID *clsid, const char *name, const IID *iid, static void test_schema_refs(void) { + static const WCHAR emptyW[] = {0}; IXMLDOMDocument2 *doc; + IXMLDOMNode *node; IXMLDOMSchemaCollection *cache; VARIANT v; VARIANT_BOOL b; BSTR str; + LONG len; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) @@ -516,6 +519,39 @@ static void test_schema_refs(void) ok(b == VARIANT_TRUE, "b %04x\n", b); SysFreeString(str); + node = (void*)0xdeadbeef; + ole_check(IXMLDOMSchemaCollection_get(cache, NULL, &node)); + ok(node == NULL, "%p\n", node); + + /* NULL uri pointer, still adds a document */ + ole_check(IXMLDOMSchemaCollection_add(cache, NULL, _variantdoc_(doc))); + len = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); + ok(len == 1, "got %d\n", len); + /* read back - empty valid BSTR */ + str = NULL; + ole_check(IXMLDOMSchemaCollection_get_namespaceURI(cache, 0, &str)); + ok(str && *str == 0, "got %p\n", str); + SysFreeString(str); + + node = NULL; + ole_check(IXMLDOMSchemaCollection_get(cache, NULL, &node)); + ok(node != NULL, "%p\n", node); + IXMLDOMNode_Release(node); + + node = NULL; + str = SysAllocString(emptyW); + ole_check(IXMLDOMSchemaCollection_get(cache, str, &node)); + ok(node != NULL, "%p\n", node); + IXMLDOMNode_Release(node); + SysFreeString(str); + + /* remove with NULL uri */ + ole_check(IXMLDOMSchemaCollection_remove(cache, NULL)); + len = -1; + ole_check(IXMLDOMSchemaCollection_get_length(cache, &len)); + ok(len == 0, "got %d\n", len); + str = SysAllocString(xdr_schema_uri); ole_check(IXMLDOMSchemaCollection_add(cache, str, _variantdoc_(doc)));

1 0

Alexandre Julliard : cabinet: Create one temp file per folder and avoid an extra copy of the data.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 682d9a292926691e4f86331bbc393c69c5d6f0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=682d9a292926691e4f86331bb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 17 16:48:19 2011 +0100 cabinet: Create one temp file per folder and avoid an extra copy of the data. --- dlls/cabinet/fci.c | 673 +++++++++++++++++----------------------------------- 1 files changed, 219 insertions(+), 454 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=682d9a292926691e4f863…

1 0

Juan Lang : wintrust/tests: Fix a leak (valgrind).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 7c42297bf3a9aa922b3bfedc08dfa025fa8203ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c42297bf3a9aa922b3bfedc0… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Feb 16 10:44:45 2011 -0800 wintrust/tests: Fix a leak (valgrind). --- dlls/wintrust/tests/softpub.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 0327bf5..7ec24a9 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -734,9 +734,16 @@ static void test_wintrust(void) r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); ok(r == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", r); + wtd.dwStateAction = WTD_STATEACTION_CLOSE; + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); + wtd.dwStateAction = WTD_STATEACTION_VERIFY; hr = WinVerifyTrustEx(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); - ok(hr == TRUST_E_NOSIGNATURE || r == CRYPT_E_FILE_ERROR, + ok(hr == TRUST_E_NOSIGNATURE || hr == CRYPT_E_FILE_ERROR, "expected TRUST_E_NOSIGNATURE or CRYPT_E_FILE_ERROR, got %08x\n", hr); + wtd.dwStateAction = WTD_STATEACTION_CLOSE; + r = WinVerifyTrust(INVALID_HANDLE_VALUE, &generic_action_v2, &wtd); + ok(r == S_OK, "WinVerifyTrust failed: %08x\n", r); } static void test_get_known_usages(void)

1 0

Juan Lang : crypt32/tests: Remove an unused assignment (clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: d4748065b310458dde4cac2de89aac3a7428e4a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4748065b310458dde4cac2de… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 10:54:09 2011 -0800 crypt32/tests: Remove an unused assignment (clang). --- dlls/crypt32/tests/message.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c index 1fe9a57..be3a03b 100644 --- a/dlls/crypt32/tests/message.c +++ b/dlls/crypt32/tests/message.c @@ -124,7 +124,7 @@ static void test_verify_detached_message_hash(void) if (0) { - ret = CryptVerifyDetachedMessageHash(NULL, NULL, 0, 0, NULL, NULL, NULL, + CryptVerifyDetachedMessageHash(NULL, NULL, 0, 0, NULL, NULL, NULL, NULL); } memset(&para, 0, sizeof(para));

1 0

Juan Lang : crypt32/tests: Test a return value (clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: bcace6fb7c70034d8bbd009be809745b007d585c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcace6fb7c70034d8bbd009be… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:08:36 2011 -0800 crypt32/tests: Test a return value (clang). --- dlls/crypt32/tests/store.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 521fc48..db31190 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -2271,6 +2271,8 @@ static void testAddCertificateLink(void) { ret = CertGetCertificateContextProperty(linked, CERT_FRIENDLY_NAME_PROP_ID, buf, &size); + ok(ret, "CertGetCertificateContextProperty failed: %08x\n", + GetLastError()); ok(!lstrcmpW((LPCWSTR)buf, WineTestW), "unexpected friendly name\n"); HeapFree(GetProcessHeap(), 0, buf);

1 0

Juan Lang : crypt32/tests: Test return value (clang).
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: 04f74d7e43336afd62feb918a9c2ee7e9fab8d6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f74d7e43336afd62feb918a… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Feb 15 11:07:19 2011 -0800 crypt32/tests: Test return value (clang). --- dlls/crypt32/tests/msg.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c index de55d6b..ddb94bd 100644 --- a/dlls/crypt32/tests/msg.c +++ b/dlls/crypt32/tests/msg.c @@ -853,6 +853,8 @@ static void test_hash_msg_get_param(void) ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); ok(size == sizeof(buf), "Unexpected size %d\n", size); ret = CryptMsgGetParam(msg, CMSG_COMPUTED_HASH_PARAM, 0, buf, &size); + ok(ret, "CryptMsgGetParam failed: %08x\n", GetLastError()); + ok(size == sizeof(buf), "Unexpected size %d\n", size); if (size == sizeof(buf)) ok(!memcmp(buf, emptyHashParam, size), "Unexpected value\n"); /* By getting the hash, further updates are not allowed */

1 0

Rico Schüller : d3dcompiler/tests: Add reflection ps desc test.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: d4798d0580cae7ab195f7fdf8080127816707f9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4798d0580cae7ab195f7fdf8… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Feb 16 20:28:00 2011 +0100 d3dcompiler/tests: Add reflection ps desc test. --- dlls/d3dcompiler_43/tests/reflection.c | 301 ++++++++++++++++++++++++++++++++ 1 files changed, 301 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d4798d0580cae7ab195f7…

1 0

Rico Schüller : d3dcompiler/tests: Add reflection vs desc test.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: c7ed17ac66ae6c2a0603249ced7723e496c2fe02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ed17ac66ae6c2a0603249ce… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Feb 16 20:27:52 2011 +0100 d3dcompiler/tests: Add reflection vs desc test. --- dlls/d3dcompiler_43/tests/reflection.c | 287 ++++++++++++++++++++++++++++++++ 1 files changed, 287 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c7ed17ac66ae6c2a06032…

1 0

Alexandre Julliard : kernel32: Don' t try to initialize curses if the TERM variable is not set.
by Alexandre Julliard Feb. 17, 2011

Feb. 17, 2011

Module: wine Branch: master Commit: b0cebda36b0ad3aeacfe6a87394d024b0a6939d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0cebda36b0ad3aeacfe6a873… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 16 23:30:32 2011 +0100 kernel32: Don't try to initialize curses if the TERM variable is not set. --- dlls/kernel32/term.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/term.c b/dlls/kernel32/term.c index df0719a..18eb4b2 100644 --- a/dlls/kernel32/term.c +++ b/dlls/kernel32/term.c @@ -415,6 +415,7 @@ BOOL TERM_Init(void) { /* if we're not attached to a tty, don't fire the curses support */ if (!isatty(0) || !isatty(1)) return FALSE; + if (!getenv("TERM")) return FALSE; if (!TERM_bind_libcurses()) return FALSE; if (setupterm(NULL, 1 /* really ?? */, NULL) == -1) return FALSE; TERM_init_done = TRUE;

1 0

Jacek Caban : urlmon: Use winetest page URL for abort test.
by Alexandre Julliard Feb. 16, 2011

Feb. 16, 2011

Module: wine Branch: master Commit: 7af0b1cb4556309630534189f178132219e78a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7af0b1cb4556309630534189f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Feb 16 15:16:44 2011 +0100 urlmon: Use winetest page URL for abort test. --- dlls/urlmon/tests/protocol.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index cacad26..123fc03 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -630,7 +630,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) case STATE_STARTDOWNLOADING: if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { SET_EXPECT(OnResponse); - if(tested_protocol == HTTPS_TEST || test_redirect) + if(tested_protocol == HTTPS_TEST || test_redirect || test_abort) SET_EXPECT(ReportProgress_ACCEPTRANGES); SET_EXPECT(ReportProgress_MIMETYPEAVAILABLE); if(bindf & BINDF_NEEDFILE) @@ -661,7 +661,7 @@ static void call_continue(PROTOCOLDATA *protocol_data) state = STATE_DOWNLOADING; if(tested_protocol == HTTP_TEST || tested_protocol == HTTPS_TEST) { CHECK_CALLED(OnResponse); - if(tested_protocol == HTTPS_TEST) + if(tested_protocol == HTTPS_TEST || test_abort) CHECK_CALLED(ReportProgress_ACCEPTRANGES); else if(test_redirect) CLEAR_CALLED(ReportProgress_ACCEPTRANGES); @@ -2893,6 +2893,8 @@ static void test_http_protocol(void) static const WCHAR redirect_url[] = {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', 't','e','s','t','r','e','d','i','r','e','c','t',0}; + static const WCHAR winetest_url[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','d','a','t','a','/',0}; trace("Testing http protocol (not from urlmon)...\n"); bindf = BINDF_ASYNCHRONOUS | BINDF_ASYNCSTORAGE | BINDF_PULLDATA; @@ -2924,7 +2926,7 @@ static void test_http_protocol(void) test_http_protocol_url(redirect_url, HTTP_TEST, TEST_REDIRECT, TYMED_NULL); trace("Testing http protocol abort...\n"); - test_http_protocol_url(winehq_url, HTTP_TEST, TEST_ABORT, TYMED_NULL); + test_http_protocol_url(winetest_url, HTTP_TEST, TEST_ABORT, TYMED_NULL); test_early_abort(&CLSID_HttpProtocol); test_early_abort(&CLSID_HttpSProtocol);

1 0