wine-commits October 2010

wine-commits@winehq.org

2 participants
1174 discussions

Juan Lang : wininet: Let CertVerifyCertificateChainPolicy handle certain security flags.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 9f6cd2663e53f3617656a5462fdae7a78e3975c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6cd2663e53f3617656a5462… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Sep 29 14:19:23 2010 -0700 wininet: Let CertVerifyCertificateChainPolicy handle certain security flags. --- dlls/wininet/netconnection.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index e06a253..004b213 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -282,6 +282,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, sslExtraPolicyPara.u.cbSize = sizeof(sslExtraPolicyPara); sslExtraPolicyPara.dwAuthType = AUTHTYPE_SERVER; sslExtraPolicyPara.pwszServerName = server; + sslExtraPolicyPara.fdwChecks = security_flags; policyPara.cbSize = sizeof(policyPara); policyPara.dwFlags = 0; policyPara.pvExtraPolicyPara = &sslExtraPolicyPara; @@ -293,11 +294,7 @@ static DWORD netconn_verify_cert(PCCERT_CONTEXT cert, HCERTSTORE store, if (ret && policyStatus.dwError) { if (policyStatus.dwError == CERT_E_CN_NO_MATCH) - { - if (!(security_flags & - SECURITY_FLAG_IGNORE_CERT_CN_INVALID)) - err = ERROR_INTERNET_SEC_CERT_CN_INVALID; - } + err = ERROR_INTERNET_SEC_CERT_CN_INVALID; else err = ERROR_INTERNET_SEC_INVALID_CERT; }

1 0

Alexandre Julliard : shell32/tests: Fix some test failures on Vista.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 15c1670a5cdfa6660ff284f3a875e44c75d74881 URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1670a5cdfa6660ff284f3a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 15:16:47 2010 +0200 shell32/tests: Fix some test failures on Vista. --- dlls/shell32/tests/shlview.c | 49 ++++++++++++++++++++++++------------------ 1 files changed, 28 insertions(+), 21 deletions(-) diff --git a/dlls/shell32/tests/shlview.c b/dlls/shell32/tests/shlview.c index 0992252..bfb6870 100644 --- a/dlls/shell32/tests/shlview.c +++ b/dlls/shell32/tests/shlview.c @@ -471,7 +471,7 @@ static const struct message folderview_getselectionmarked_seq[] = { }; static const struct message folderview_getfocused_seq[] = { - { LVM_GETNEXTITEM, sent|wparam|lparam, -1, LVNI_FOCUSED }, + { LVM_GETNEXTITEM, sent|wparam|lparam|optional, -1, LVNI_FOCUSED }, { 0 } }; @@ -535,7 +535,7 @@ static void test_IFolderView(void) HWND hwnd_view, hwnd_list; PITEMID_CHILD pidl; HRESULT hr; - INT ret; + INT ret, count; POINT pt; LONG ref1, ref2; RECT r; @@ -618,6 +618,19 @@ if (0) ok(pt.x == LOWORD(ret) && pt.y == HIWORD(ret), "got (%d, %d)\n", LOWORD(ret), HIWORD(ret)); } + /* IFolderView::ItemCount */ +if (0) +{ + /* crashes on XP */ + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); +} + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &count); + ok(hr == S_OK, "got (0x%08x)\n", hr); + ok_sequence(sequences, LISTVIEW_SEQ_INDEX, count ? folderview_itemcount_seq : empty_seq, + "IFolderView::ItemCount", FALSE); + /* IFolderView::GetSelectionMarkedItem */ if (0) { @@ -627,16 +640,22 @@ if (0) flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetSelectionMarkedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getselectionmarked_seq, - "IFolderView::GetSelectionMarkedItem", FALSE); + "IFolderView::GetSelectionMarkedItem", FALSE); /* IFolderView::GetFocusedItem */ flush_sequences(sequences, NUM_MSG_SEQUENCES); hr = IFolderView_GetFocusedItem(fv, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); + if (count) + ok(hr == S_OK, "got (0x%08x)\n", hr); + else + ok(hr == S_FALSE, "got (0x%08x)\n", hr); ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_getfocused_seq, - "IFolderView::GetFocusedItem", FALSE); + "IFolderView::GetFocusedItem", FALSE); /* IFolderView::GetFolder, just return pointer */ if (0) @@ -655,22 +674,10 @@ if (0) ok(hr == S_OK, "got (0x%08x)\n", hr); ref2 = IShellFolder_AddRef(desktop); IShellFolder_Release(desktop); - ok(ref1 == ref2, "expected same refcount, got %d\n", ref2); + ok(ref1 == ref2 || ref1 + 1 == ref2, /* >= vista */ + "expected same refcount, got %d\n", ref2); ok(desktop == folder, "\n"); - /* IFolderView::ItemCount */ -if (0) -{ - /* crashes on XP */ - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, NULL); -} - - flush_sequences(sequences, NUM_MSG_SEQUENCES); - hr = IFolderView_ItemCount(fv, SVGIO_ALLVIEW, &ret); - ok(hr == S_OK, "got (0x%08x)\n", hr); - ok_sequence(sequences, LISTVIEW_SEQ_INDEX, folderview_itemcount_seq, - "IFolderView::ItemCount", FALSE); - IShellBrowser_Release(browser); IFolderView_Release(fv); IShellView_Release(view); @@ -821,7 +828,7 @@ static const struct message folderview_setcurrentviewmode3_prevista[] = { static const struct message folderview_setcurrentviewmode4_prevista[] = { { LVM_GETHEADER, sent}, - { LVM_GETITEMCOUNT, sent}, + { LVM_GETITEMCOUNT, sent|optional }, { LVM_SETSELECTEDCOLUMN, sent}, { WM_NOTIFY, sent }, { WM_NOTIFY, sent },

1 0

Alexandre Julliard : wineboot: Always create the various RunOnce keys.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 0647a85dda8048f7de7a9219e7f7a3c62c38c552 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0647a85dda8048f7de7a9219e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Oct 1 14:22:40 2010 +0200 wineboot: Always create the various RunOnce keys. --- programs/wineboot/wineboot.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/programs/wineboot/wineboot.c b/programs/wineboot/wineboot.c index 90dd779..92331ee 100644 --- a/programs/wineboot/wineboot.c +++ b/programs/wineboot/wineboot.c @@ -643,7 +643,7 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, 'M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0}; HKEY hkWin, hkRun; - DWORD res; + DWORD res, dispos; DWORD i, nMaxCmdLine=0, nMaxValue=0; WCHAR *szCmdLine=NULL; WCHAR *szValue=NULL; @@ -653,15 +653,17 @@ static BOOL ProcessRunKeys( HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete, else WINE_TRACE("processing %s entries under HKCU\n",wine_dbgstr_w(szKeyName) ); - if (RegOpenKeyExW( hkRoot, WINKEY_NAME, 0, KEY_READ, &hkWin ) != ERROR_SUCCESS) + if (RegCreateKeyExW( hkRoot, WINKEY_NAME, 0, NULL, 0, KEY_READ, NULL, &hkWin, NULL ) != ERROR_SUCCESS) return TRUE; - if (RegOpenKeyExW( hkWin, szKeyName, 0, bDelete?KEY_ALL_ACCESS:KEY_READ, &hkRun ) != ERROR_SUCCESS) + if ((res = RegCreateKeyExW( hkWin, szKeyName, 0, NULL, 0, bDelete ? KEY_ALL_ACCESS : KEY_READ, + NULL, &hkRun, &dispos ) != ERROR_SUCCESS)) { RegCloseKey( hkWin ); return TRUE; } RegCloseKey( hkWin ); + if (dispos == REG_CREATED_NEW_KEY) goto end; if( (res=RegQueryInfoKeyW( hkRun, NULL, NULL, NULL, NULL, NULL, NULL, &i, &nMaxValue, &nMaxCmdLine, NULL, NULL ))!=ERROR_SUCCESS )

1 0

Austin English : wineserver: Return the version information in the same format as wine --version.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: c99609a5a025f94af4e3a5e59e404df612e4fab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99609a5a025f94af4e3a5e59… Author: Austin English <austinenglish(a)gmail.com> Date: Fri Oct 1 03:16:46 2010 -0500 wineserver: Return the version information in the same format as wine --version. --- server/main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/server/main.c b/server/main.c index a59350b..2d841e8 100644 --- a/server/main.c +++ b/server/main.c @@ -36,6 +36,7 @@ #include "file.h" #include "thread.h" #include "request.h" +#include "wine/library.h" /* command-line options */ int debug_level = 0; @@ -107,7 +108,7 @@ static void parse_args( int argc, char *argv[] ) master_socket_timeout = TIMEOUT_INFINITE; break; case 'v': - fprintf( stderr, "%s\n", PACKAGE_STRING ); + fprintf( stderr, "%s\n", wine_get_build_id()); exit(0); case 'w': wait_for_lock();

1 0

Louis Lenders : tapi32: Quiet a few noisy fixme's.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 141067fcc46d6241782dcc2f1c46826880b451f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141067fcc46d6241782dcc2f1… Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Oct 1 08:02:35 2010 +0200 tapi32: Quiet a few noisy fixme's. --- dlls/tapi32/line.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 6ccdf13..38d4510 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -471,7 +471,10 @@ DWORD WINAPI lineGetCountryA(DWORD dwCountryID, DWORD dwAPIVersion, LPLINECOUNTR DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -482,7 +485,10 @@ DWORD WINAPI lineGetDevCapsW(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVer DWORD WINAPI lineGetDevCapsA(HLINEAPP hLineApp, DWORD dwDeviceID, DWORD dwAPIVersion, DWORD dwExtVersion, LPLINEDEVCAPS lpLineDevCaps) { - FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %08x, %08x, %08x, %p): stub.\n", hLineApp, dwDeviceID, dwAPIVersion, dwExtVersion, lpLineDevCaps); return LINEERR_OPERATIONFAILED; } @@ -1079,8 +1085,11 @@ DWORD WINAPI lineNegotiateAPIVersion( LPLINEEXTENSIONID lpExtensionID ) { - FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, - dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); + static int warn_once; + + if(!warn_once++) + FIXME("(%p, %d, %d, %d, %p, %p): stub.\n", hLineApp, dwDeviceID, + dwAPILowVersion, dwAPIHighVersion, lpdwAPIVersion, lpExtensionID); *lpdwAPIVersion = dwAPIHighVersion; return 0; }

1 0

Adam Martinson : msxml3: Implement preserveWhiteSpace property.
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 49fa9de580814028e3224e9d9eb6472bf11092be URL: http://source.winehq.org/git/wine.git/?a=commit;h=49fa9de580814028e3224e9d9… Author: Adam Martinson <amartinson(a)codeweavers.com> Date: Thu Sep 30 09:49:10 2010 -0500 msxml3: Implement preserveWhiteSpace property. --- dlls/msxml3/domdoc.c | 36 ++++++++++++- dlls/msxml3/tests/domdoc.c | 129 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 156 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index ad1a858..1eed582 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -288,6 +288,38 @@ xmlNodePtr xmldoc_unlink_xmldecl(xmlDocPtr doc) return node; } +static inline BOOL strn_isspace(xmlChar const* str, int len) +{ + for (; str && len > 0 && *str; ++str, --len) + if (!isspace(*str)) + break; + + return len == 0; +} + +static void sax_characters(void *ctx, const xmlChar *ch, int len) +{ + xmlParserCtxtPtr pctx; + domdoc const* This; + + pctx = (xmlParserCtxtPtr) ctx; + This = (domdoc const*) pctx->_private; + + if (!This->preserving) + { + xmlChar* ws = xmlGetNsProp(pctx->node, BAD_CAST "space", XML_XML_NAMESPACE); + if ((!ws || xmlStrcmp(ws, BAD_CAST "preserve") != 0) && + strn_isspace(ch, len)) + { + xmlFree(ws); + return; + } + xmlFree(ws); + } + + xmlSAX2Characters(ctx, ch, len); +} + static xmlDocPtr doparse(domdoc* This, char *ptr, int len) { xmlDocPtr doc; @@ -309,8 +341,8 @@ static xmlDocPtr doparse(domdoc* This, char *ptr, int len) xmlSAX2StartElement, /* startElement */ xmlSAX2EndElement, /* endElement */ xmlSAX2Reference, /* reference */ - xmlSAX2Characters, /* characters */ - NULL, /* TODO: ignorableWhitespace */ + sax_characters, /* characters */ + sax_characters, /* ignorableWhitespace */ xmlSAX2ProcessingInstruction, /* processingInstruction */ xmlSAX2Comment, /* comment */ NULL, /* TODO: warning */ diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 012b6aa..8d7399e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -112,6 +112,9 @@ static const CHAR szExampleXML[] = " <html xmlns='http://www.w3.org/1999/xhtml'>\n" " This is a description. <bar:x/>\n" " </html>\n" +" <html xml:space='preserve' xmlns='http://www.w3.org/1999/xhtml'>\n" +" This is a description with preserved whitespace. <bar:x/>\n" +" </html>\n" " </description>\n" " </elem>\n" "\n" @@ -377,6 +380,9 @@ static void get_str_for_type(DOMNodeType type, char *buf) case NODE_DOCUMENT: strcpy(buf, "D"); break; + case NODE_TEXT: + strcpy(buf, "T"); + break; default: wsprintfA(buf, "[%d]", type); } @@ -3064,6 +3070,120 @@ static void test_IXMLDOMDocument2(void) free_bstrs(); } +static inline void check_ws_ignored(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E1.E4.E1.E2.D1 E2.E4.E1.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E1.E4.E1.E2.D1 E2.E1.E4.E1.E2.D1 E3.E1.E4.E1.E2.D1 T4.E1.E4.E1.E2.D1 E5.E1.E4.E1.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E2.E4.E1.E2.D1 E2.E2.E4.E1.E2.D1 T3.E2.E4.E1.E2.D1 E4.E2.E4.E1.E2.D1 T5.E2.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1 T7.E2.E4.E1.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static inline void check_ws_preserved(IXMLDOMDocument2* doc) +{ + IXMLDOMNode *node1, *node2; + IXMLDOMNodeList *list; + + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//*[local-name()='html']"), &list)); + ole_check(IXMLDOMNodeList_get_item(list, 0, &node1)); + ole_check(IXMLDOMNodeList_get_item(list, 1, &node2)); + ole_check(IXMLDOMNodeList_reset(list)); + expect_list_and_release(list, "E2.E8.E2.E2.D1 E4.E8.E2.E2.D1"); + + ole_check(IXMLDOMNode_get_childNodes(node1, &list)); + expect_list_and_release(list, "T1.E2.E8.E2.E2.D1 E2.E2.E8.E2.E2.D1 T3.E2.E8.E2.E2.D1 E4.E2.E8.E2.E2.D1 T5.E2.E8.E2.E2.D1 E6.E2.E8.E2.E2.D1 T7.E2.E8.E2.E2.D1"); + IXMLDOMNode_Release(node1); + ole_check(IXMLDOMNode_get_childNodes(node2, &list)); + expect_list_and_release(list, "T1.E4.E8.E2.E2.D1 E2.E4.E8.E2.E2.D1 T3.E4.E8.E2.E2.D1 E4.E4.E8.E2.E2.D1 T5.E4.E8.E2.E2.D1 E6.E4.E8.E2.E2.D1 T7.E4.E8.E2.E2.D1"); + IXMLDOMNode_Release(node2); +} + +static void test_whitespace(void) +{ + VARIANT_BOOL b; + IXMLDOMDocument2 *doc1, *doc2, *doc3, *doc4; + + doc1 = create_document(&IID_IXMLDOMDocument2); + doc2 = create_document(&IID_IXMLDOMDocument2); + if (!doc1 || !doc2) return; + + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + /* switch to XPath */ + ole_check(IXMLDOMDocument2_setProperty(doc1, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + ole_check(IXMLDOMDocument2_setProperty(doc2, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* new instances copy the property */ + ole_check(IXMLDOMDocument2_QueryInterface(doc1, &IID_IXMLDOMDocument2, (void**) &doc3)); + ole_check(IXMLDOMDocument2_QueryInterface(doc2, &IID_IXMLDOMDocument2, (void**) &doc4)); + + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + + check_ws_ignored(doc3); + check_ws_preserved(doc4); + + /* setting after loading xml does nothing */ + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc1, VARIANT_TRUE)); + ole_check(IXMLDOMDocument2_put_preserveWhiteSpace(doc2, VARIANT_FALSE)); + + check_ws_ignored(doc1); + check_ws_preserved(doc2); + + /* it takes effect on reload */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc1, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc2, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + ole_check(IXMLDOMDocument2_loadXML(doc1, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + ole_check(IXMLDOMDocument2_loadXML(doc2, _bstr_(szExampleXML), &b)); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + check_ws_preserved(doc1); + check_ws_ignored(doc2); + + /* other instances follow suit */ + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc3, &b)); + ok(b == VARIANT_TRUE, "expected true\n"); + ole_check(IXMLDOMDocument2_get_preserveWhiteSpace(doc4, &b)); + ok(b == VARIANT_FALSE, "expected false\n"); + + check_ws_preserved(doc3); + check_ws_ignored(doc4); + + IXMLDOMDocument_Release(doc1); + IXMLDOMDocument_Release(doc2); + IXMLDOMDocument_Release(doc3); + IXMLDOMDocument_Release(doc4); + free_bstrs(); +} + static void test_XPath(void) { VARIANT var; @@ -3159,13 +3279,7 @@ static void test_XPath(void) ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); - { - char *str = list_to_string(list); - /* it's the correct node, just the wrong index due to whitespace-only nodes */ - todo_wine ok(strcmp(str, "E5.E1.E4.E1.E2.D1")==0, "Invalid node list: %s, expected %s\n", str, "E5.E1.E4.E1.E2.D1"); - if (list) - IXMLDOMNodeList_Release(list); - } + expect_list_and_release(list, "E5.E1.E4.E1.E2.D1 E6.E2.E4.E1.E2.D1"); /* SelectionNamespaces syntax error - the namespaces doesn't work anymore but the value is stored */ ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), @@ -6178,6 +6292,7 @@ START_TEST(domdoc) test_replaceChild(); test_removeNamedItem(); test_IXMLDOMDocument2(); + test_whitespace(); test_XPath(); test_XSLPattern(); test_cloneNode();

1 0

Henri Verbeet : wined3d: Also pass the destination state directly to wined3d_state_record_lights().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 5fd1b5c023b10a6766a2ff9c840f043870db12b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd1b5c023b10a6766a2ff9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:49 2010 +0200 wined3d: Also pass the destination state directly to wined3d_state_record_lights(). --- dlls/wined3d/stateblock.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 5b58de9..de8ee8e 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -537,26 +537,23 @@ static ULONG WINAPI IWineD3DStateBlockImpl_Release(IWineD3DStateBlock *iface) { return refCount; } -/********************************************************** - * IWineD3DStateBlockImpl parts follows - **********************************************************/ -static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_state *state) +static void wined3d_state_record_lights(struct wined3d_state *dst_state, const struct wined3d_state *src_state) { UINT i; - /* Lights... For a recorded state block, we just had a chain of actions to perform, - * so we need to walk that chain and update any actions which differ - */ + /* Lights... For a recorded state block, we just had a chain of actions + * to perform, so we need to walk that chain and update any actions which + * differ. */ for (i = 0; i < LIGHTMAP_SIZE; ++i) { struct list *e, *f; - LIST_FOR_EACH(e, &This->state.light_map[i]) + LIST_FOR_EACH(e, &dst_state->light_map[i]) { BOOL updated = FALSE; struct wined3d_light_info *src = LIST_ENTRY(e, struct wined3d_light_info, entry), *realLight; /* Look up the light in the destination */ - LIST_FOR_EACH(f, &state->light_map[i]) + LIST_FOR_EACH(f, &src_state->light_map[i]) { realLight = LIST_ENTRY(f, struct wined3d_light_info, entry); if (realLight->OriginalIndex == src->OriginalIndex) @@ -566,12 +563,12 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta if (realLight->glIndex == -1 && src->glIndex != -1) { /* Light disabled */ - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; } else if (realLight->glIndex != -1 && src->glIndex == -1) { /* Light enabled */ - This->state.lights[realLight->glIndex] = src; + dst_state->lights[realLight->glIndex] = src; } src->glIndex = realLight->glIndex; updated = TRUE; @@ -583,13 +580,13 @@ static void record_lights(IWineD3DStateBlockImpl *This, const struct wined3d_sta { /* This can happen if the light was originally created as a * default light for SetLightEnable() while recording. */ - WARN("Light %u in stateblock %p does not exist in device state %p.\n", - src->OriginalIndex, This, state); + WARN("Light %u in dst_state %p does not exist in src_state %p.\n", + src->OriginalIndex, dst_state, src_state); src->OriginalParms = WINED3D_default_light; if (src->glIndex != -1) { - This->state.lights[src->glIndex] = NULL; + dst_state->lights[src->glIndex] = NULL; src->glIndex = -1; } } @@ -879,7 +876,7 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface) This->state.pixel_shader = src_state->pixel_shader; } - record_lights(This, src_state); + wined3d_state_record_lights(&This->state, src_state); TRACE("Captue done.\n");

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to nvts_activate_dimensions().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 545dc012cf6012fd91e47f871f48286cff919eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=545dc012cf6012fd91e47f871… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:48 2010 +0200 wined3d: Pass a wined3d_state structure to nvts_activate_dimensions(). --- dlls/wined3d/nvidia_texture_shader.c | 47 +++++++++++++++++---------------- 1 files changed, 24 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 5fd8fea..00a51f8 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -30,12 +30,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); /* GL locking for state handlers is done by the caller. */ -static void nvts_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void nvts_activate_dimensions(const struct wined3d_state *state, DWORD stage, struct wined3d_context *context) { BOOL bumpmap = FALSE; - if (stage > 0 && (stateblock->state.texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE - || stateblock->state.texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP)) + if (stage > 0 && (state->texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE + || state->texture_states[stage - 1][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP)) { bumpmap = TRUE; context->texShaderBumpMap |= (1 << stage); @@ -43,9 +43,9 @@ static void nvts_activate_dimensions(DWORD stage, IWineD3DStateBlockImpl *stateb context->texShaderBumpMap &= ~(1 << stage); } - if (stateblock->state.textures[stage]) + if (state->textures[stage]) { - switch (stateblock->state.textures[stage]->baseTexture.target) + switch (state->textures[stage]->baseTexture.target) { case GL_TEXTURE_2D: glTexEnvi(GL_TEXTURE_SHADER_NV, GL_SHADER_OPERATION_NV, bumpmap ? GL_OFFSET_TEXTURE_2D_NV : GL_TEXTURE_2D); @@ -482,16 +482,16 @@ static void nvrc_colorop(DWORD state_id, IWineD3DStateBlockImpl *stateblock, str checkGLcall("glActiveTextureARB"); } - if (stateblock->state.lowest_disabled_stage > 0) + if (state->lowest_disabled_stage > 0) { glEnable(GL_REGISTER_COMBINERS_NV); - GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, stateblock->state.lowest_disabled_stage)); + GL_EXTCALL(glCombinerParameteriNV(GL_NUM_GENERAL_COMBINERS_NV, state->lowest_disabled_stage)); } else { glDisable(GL_REGISTER_COMBINERS_NV); } - if (stage >= stateblock->state.lowest_disabled_stage) + if (stage >= state->lowest_disabled_stage) { TRACE("Stage disabled\n"); if (mapped_stage != WINED3D_UNMAPPED_STAGE) @@ -529,57 +529,58 @@ static void nvrc_colorop(DWORD state_id, IWineD3DStateBlockImpl *stateblock, str { if (gl_info->supported[NV_TEXTURE_SHADER2]) { - nvts_activate_dimensions(stage, stateblock, context); + nvts_activate_dimensions(state, stage, context); } else { - texture_activate_dimensions(stateblock->state.textures[stage], gl_info); + texture_activate_dimensions(state->textures[stage], gl_info); } } } /* Set the texture combiners */ - set_tex_op_nvrc(gl_info, &stateblock->state, FALSE, stage, - stateblock->state.texture_states[stage][WINED3DTSS_COLOROP], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG1], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG2], - stateblock->state.texture_states[stage][WINED3DTSS_COLORARG0], + set_tex_op_nvrc(gl_info, state, FALSE, stage, + state->texture_states[stage][WINED3DTSS_COLOROP], + state->texture_states[stage][WINED3DTSS_COLORARG1], + state->texture_states[stage][WINED3DTSS_COLORARG2], + state->texture_states[stage][WINED3DTSS_COLORARG0], mapped_stage, - stateblock->state.texture_states[stage][WINED3DTSS_RESULTARG]); + state->texture_states[stage][WINED3DTSS_RESULTARG]); /* In register combiners bump mapping is done in the stage AFTER the one that has the bump map operation set, * thus the texture shader may have to be updated */ if (gl_info->supported[NV_TEXTURE_SHADER2]) { - BOOL usesBump = (stateblock->state.texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE - || stateblock->state.texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP); + BOOL usesBump = (state->texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAPLUMINANCE + || state->texture_states[stage][WINED3DTSS_COLOROP] == WINED3DTOP_BUMPENVMAP); BOOL usedBump = !!(context->texShaderBumpMap & 1 << (stage + 1)); if (usesBump != usedBump) { GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage + 1)); checkGLcall("glActiveTextureARB"); - nvts_activate_dimensions(stage + 1, stateblock, context); + nvts_activate_dimensions(state, stage + 1, context); GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + mapped_stage)); checkGLcall("glActiveTextureARB"); } } } -static void nvts_texdim(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) +static void nvts_texdim(DWORD state_id, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context) { - DWORD sampler = state - STATE_SAMPLER(0); + DWORD sampler = state_id - STATE_SAMPLER(0); DWORD mapped_stage = stateblock->device->texUnitMap[sampler]; + const struct wined3d_state *state = &stateblock->state; /* No need to enable / disable anything here for unused samplers. The tex_colorop * handler takes care. Also no action is needed with pixel shaders, or if tex_colorop * will take care of this business */ if (mapped_stage == WINED3D_UNMAPPED_STAGE || mapped_stage >= context->gl_info->limits.textures) return; - if (sampler >= stateblock->state.lowest_disabled_stage) return; + if (sampler >= state->lowest_disabled_stage) return; if (isStateDirty(context, STATE_TEXTURESTAGE(sampler, WINED3DTSS_COLOROP))) return; - nvts_activate_dimensions(sampler, stateblock, context); + nvts_activate_dimensions(state, sampler, context); } static void nvts_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wined3d_context *context)

1 0

Henri Verbeet : wined3d: Pass a wined3d_state structure to remove_vbos().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: 4dcd56f43b7da9389c5242fbcf05012a165ae5f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcd56f43b7da9389c5242fbc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:47 2010 +0200 wined3d: Pass a wined3d_state structure to remove_vbos(). --- dlls/wined3d/drawprim.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 9370161..6b6102b 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -537,8 +537,8 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st } } -static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl_info *gl_info, - struct wined3d_stream_info *s) +static void remove_vbos(const struct wined3d_gl_info *gl_info, + const struct wined3d_state *state, struct wined3d_stream_info *s) { unsigned int i; @@ -551,7 +551,7 @@ static inline void remove_vbos(IWineD3DDeviceImpl *This, const struct wined3d_gl e = &s->elements[i]; if (e->buffer_object) { - struct wined3d_buffer *vb = This->stateBlock->state.streams[e->stream_idx].buffer; + struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->buffer_object = 0; e->data = (BYTE *)((ULONG_PTR)e->data + (ULONG_PTR)buffer_get_sysmem(vb, gl_info)); } @@ -683,7 +683,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT if(emulation) { stream_info = &stridedlcl; memcpy(&stridedlcl, &This->strided_streams, sizeof(stridedlcl)); - remove_vbos(This, context->gl_info, &stridedlcl); + remove_vbos(context->gl_info, state, &stridedlcl); } }

1 0

Henri Verbeet : wined3d: Pass gl_info and state parameters directly to drawStridedInstanced().
by Alexandre Julliard 01 Oct '10

01 Oct '10

Module: wine Branch: master Commit: cf9d9e3204bc7732423ec524ea7d322500683aba URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf9d9e3204bc7732423ec524e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 1 12:25:46 2010 +0200 wined3d: Pass gl_info and state parameters directly to drawStridedInstanced(). --- dlls/wined3d/drawprim.c | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 2441e4c..9370161 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -468,16 +468,13 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc } /* GL locking is done by the caller */ -static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wined3d_stream_info *si, - UINT numberOfVertices, GLenum glPrimitiveType, const void *idxData, UINT idxSize, - UINT startIdx) +static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, + const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, + const void *idxData, UINT idxSize, UINT startIdx) { UINT numInstances = 0, i; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; - const struct wined3d_gl_info *gl_info = &This->adapter->gl_info; - IWineD3DStateBlockImpl *stateblock = This->stateBlock; if (!idxSize) { @@ -491,20 +488,18 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine return; } - TRACE("(%p) : glElements(%x, %d, ...)\n", This, glPrimitiveType, numberOfVertices); - /* First, figure out how many instances we have to draw */ for (i = 0; i < MAX_STREAMS; ++i) { /* Look at the streams and take the first one which matches */ - if (stateblock->state.streams[i].buffer - && ((stateblock->state.streams[i].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) - || (stateblock->state.streams[i].flags & WINED3DSTREAMSOURCE_INDEXEDDATA))) + if (state->streams[i].buffer + && ((state->streams[i].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) + || (state->streams[i].flags & WINED3DSTREAMSOURCE_INDEXEDDATA))) { /* Use the specified number of instances from the first matched * stream. A streamFreq of 0 (with INSTANCEDATA or INDEXEDDATA) * is handled as 1. See d3d9/tests/visual.c-> stream_test(). */ - numInstances = stateblock->state.streams[i].frequency ? stateblock->state.streams[i].frequency : 1; + numInstances = state->streams[i].frequency ? state->streams[i].frequency : 1; break; } } @@ -513,7 +508,7 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine { if (!(si->use_map & (1 << i))) continue; - if (stateblock->state.streams[si->elements[i].stream_idx].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) + if (state->streams[si->elements[i].stream_idx].flags & WINED3DSTREAMSOURCE_INSTANCEDATA) { instancedData[numInstancedAttribs] = i; numInstancedAttribs++; @@ -526,11 +521,11 @@ static inline void drawStridedInstanced(IWineD3DDevice *iface, const struct wine for(j = 0; j < numInstancedAttribs; j++) { const BYTE *ptr = si->elements[instancedData[j]].data + si->elements[instancedData[j]].stride * i - + stateblock->state.streams[si->elements[instancedData[j]].stream_idx].offset; + + state->streams[si->elements[instancedData[j]].stream_idx].offset; if (si->elements[instancedData[j]].buffer_object) { - struct wined3d_buffer *vb = stateblock->state.streams[si->elements[instancedData[j]].stream_idx].buffer; - ptr += (ULONG_PTR)buffer_get_sysmem(vb, &This->adapter->gl_info); + struct wined3d_buffer *vb = state->streams[si->elements[instancedData[j]].stream_idx].buffer; + ptr += (ULONG_PTR)buffer_get_sysmem(vb, gl_info); } send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); @@ -712,11 +707,15 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT drawStridedSlow(iface, context, stream_info, index_count, glPrimType, idxData, idxSize, StartIdx); } - } else if(This->instancedDraw) { + } + else if (This->instancedDraw) + { /* Instancing emulation with mixing immediate mode and arrays */ - drawStridedInstanced(iface, &This->strided_streams, index_count, - glPrimType, idxData, idxSize, StartIdx); - } else { + drawStridedInstanced(context->gl_info, state, stream_info, + index_count, glPrimType, idxData, idxSize, StartIdx); + } + else + { drawStridedFast(glPrimType, index_count, idxSize, idxData, StartIdx); } }

1 0

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 October 2010