January 2008 - Wine-Commits

Alistair Leslie-Hughes : msxml3: lastChild not supported for CDATASection, Comment, PI and Text Nodes.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 91ad27ea25c5714173688478a605e09ccb95e361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91ad27ea25c5714173688478a… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 10:28:57 2008 +1100 msxml3: lastChild not supported for CDATASection, Comment, PI and Text Nodes. --- dlls/msxml3/node.c | 19 ++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 23 +++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 9b4c4f0..dae9130 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -334,7 +334,24 @@ static HRESULT WINAPI xmlnode_get_lastChild( IXMLDOMNode** lastChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return get_node( This, "lastChild", This->node->last, lastChild ); + + TRACE("%p\n", This ); + + if (!lastChild) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* CDATASection, Comment, PI and Text Nodes do not support lastChild */ + case XML_TEXT_NODE: + case XML_CDATA_SECTION_NODE: + case XML_PI_NODE: + case XML_COMMENT_NODE: + *lastChild = NULL; + return S_FALSE; + default: + return get_node( This, "lastChild", This->node->last, lastChild ); + } } static HRESULT WINAPI xmlnode_get_previousSibling( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 777a815..272dfb6 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -347,6 +347,7 @@ static void test_domdoc( void ) IXMLDOMText *nodetext = NULL; IXMLDOMComment *node_comment = NULL; IXMLDOMAttribute *node_attr = NULL; + IXMLDOMNode *nodeChild = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -508,6 +509,17 @@ static void test_domdoc( void ) ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createTextNode(doc, str, &nodetext); ok( r == S_OK, "returns %08x\n", r ); + if(nodetext) + { + /* Text Last Child Checks */ + r = IXMLDOMText_get_lastChild(nodetext, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + nodeChild = (IXMLDOMNode*)0x1; + r = IXMLDOMText_get_lastChild(nodetext, &nodeChild); + ok(r == S_FALSE, "ret %08x\n", r ); + ok(nodeChild == NULL, "nodeChild not NULL\n"); + } IXMLDOMText_Release( nodetext ); SysFreeString( str ); @@ -516,6 +528,17 @@ static void test_domdoc( void ) ok( r == E_INVALIDARG, "returns %08x\n", r ); r = IXMLDOMDocument_createComment(doc, szComment, &node_comment); ok( r == S_OK, "returns %08x\n", r ); + if(node_comment) + { + /* Last Child Checks */ + r = IXMLDOMComment_get_lastChild(node_comment, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + nodeChild = (IXMLDOMNode*)0x1; + r = IXMLDOMComment_get_lastChild(node_comment, &nodeChild); + ok(r == S_FALSE, "ret %08x\n", r ); + ok(nodeChild == NULL, "pLastChild not NULL\n"); + } IXMLDOMText_Release( node_comment ); /* test Create Attribute */

1 0

Alistair Leslie-Hughes : msxml3: nextSibling not supported for Attribute, Document and Document Fragment Nodes.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 4e908f65fb067d3c8094788e4eb99288282c2e93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e908f65fb067d3c8094788e4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 09:59:01 2008 +1100 msxml3: nextSibling not supported for Attribute, Document and Document Fragment Nodes. --- dlls/msxml3/node.c | 18 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 17 +++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 8b17589..9b4c4f0 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -350,7 +350,23 @@ static HRESULT WINAPI xmlnode_get_nextSibling( IXMLDOMNode** nextSibling) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return get_node( This, "next", This->node->next, nextSibling ); + + TRACE("%p\n", This ); + + if (!nextSibling) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* Attribute, Document and Document Fragment Nodes do not support nextSibling */ + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ATTRIBUTE_NODE: + *nextSibling = NULL; + return S_FALSE; + default: + return get_node( This, "next", This->node->next, nextSibling ); + } } static HRESULT WINAPI xmlnode_get_attributes( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 67897e3..777a815 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1767,11 +1767,19 @@ static void test_xmlTypes(void) IXMLDOMAttribute *pAttrubute; IXMLDOMNamedNodeMap *pAttribs; BSTR str; + IXMLDOMNode *pNextChild = (IXMLDOMNode *)0x1; /* Used for testing Siblings */ hr = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument2, (LPVOID*)&doc ); if( hr != S_OK ) return; + hr = IXMLDOMDocument_get_nextSibling(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + hr = IXMLDOMDocument_get_nextSibling(doc, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pDocChild not NULL\n"); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1825,6 +1833,15 @@ static void test_xmlTypes(void) if(hr == S_OK) { IXMLDOMNode *pNewChild = (IXMLDOMNode *)0x1; + + hr = IXMLDOMAttribute_get_nextSibling(pAttrubute, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + pNextChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMAttribute_get_nextSibling(pAttrubute, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pNextChild not NULL\n"); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n");

1 0

Alistair Leslie-Hughes : msxml3: createProcessingInstruction: Check arguments are valid.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: f31cd30841f36c733e48c9167b64b632aa65a0d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f31cd30841f36c733e48c9167… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 11:07:12 2008 +1100 msxml3: createProcessingInstruction: Check arguments are valid. --- dlls/msxml3/domdoc.c | 6 ++++++ dlls/msxml3/tests/domdoc.c | 26 ++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index d955926..60a65d0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -958,6 +958,12 @@ static HRESULT WINAPI domdoc_createProcessingInstruction( TRACE("%p->(%s %s %p)\n", iface, debugstr_w(target), debugstr_w(data), pi); + if(!pi) + return E_INVALIDARG; + + if(!target || lstrlenW(target) == 0) + return E_FAIL; + xml_target = xmlChar_from_wchar((WCHAR*)target); xml_content = xmlChar_from_wchar((WCHAR*)data); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 272dfb6..910c044 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -348,6 +348,7 @@ static void test_domdoc( void ) IXMLDOMComment *node_comment = NULL; IXMLDOMAttribute *node_attr = NULL; IXMLDOMNode *nodeChild = NULL; + IXMLDOMProcessingInstruction *nodePI = NULL; VARIANT_BOOL b; VARIANT var; BSTR str; @@ -548,6 +549,31 @@ static void test_domdoc( void ) ok( r == S_OK, "returns %08x\n", r ); IXMLDOMText_Release( node_attr); + /* test Processing Instruction */ + str = SysAllocStringLen(NULL, 0); + r = IXMLDOMDocument_createProcessingInstruction(doc, str, str, NULL); + ok( r == E_INVALIDARG, "returns %08x\n", r ); + r = IXMLDOMDocument_createProcessingInstruction(doc, NULL, str, &nodePI); + ok( r == E_FAIL, "returns %08x\n", r ); + r = IXMLDOMDocument_createProcessingInstruction(doc, str, str, &nodePI); + ok( r == E_FAIL, "returns %08x\n", r ); + SysFreeString(str); + + r = IXMLDOMDocument_createProcessingInstruction(doc, _bstr_("xml"), _bstr_("version=\"1.0\""), &nodePI); + ok( r == S_OK, "returns %08x\n", r ); + if(nodePI) + { + /* Last Child Checks */ + r = IXMLDOMProcessingInstruction_get_lastChild(nodePI, NULL); + ok(r == E_INVALIDARG, "ret %08x\n", r ); + + nodeChild = (IXMLDOMNode*)0x1; + r = IXMLDOMProcessingInstruction_get_lastChild(nodePI, &nodeChild); + ok(r == S_FALSE, "ret %08x\n", r ); + ok(nodeChild == NULL, "nodeChild not NULL\n"); + } + IXMLDOMProcessingInstruction_Release(nodePI); + r = IXMLDOMDocument_Release( doc ); ok( r == 0, "document ref count incorrect\n");

1 0

Rob Shearman : rpcrt4: Fix a memory leak in the cstub tests.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 492947aa0275bb564a90a081ab97f046ae0f6132 URL: http://source.winehq.org/git/wine.git/?a=commit;h=492947aa0275bb564a90a081a… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 9 10:33:47 2008 +0000 rpcrt4: Fix a memory leak in the cstub tests. --- dlls/rpcrt4/tests/cstub.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 6a38397..a47fa6e 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -924,6 +924,8 @@ static void test_delegating_Invoke(IPSFactoryBuffer *ppsf) ok(*(DWORD*)msg.Buffer == 0xabcdef, "buf[0] %08x\n", *(DWORD*)msg.Buffer); ok(*((DWORD*)msg.Buffer + 1) == S_OK, "buf[1] %08x\n", *((DWORD*)msg.Buffer + 1)); } + /* free the buffer allocated by delegating_invoke_chan_get_buffer */ + HeapFree(GetProcessHeap(), 0, msg.Buffer); IRpcStubBuffer_Release(pstub); }

1 0

Rob Shearman : rpcrt4: Fix memory leaks in the ndr_marshall tests.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 24ba6a5cc62c327e204f4460243d604de1e99a61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ba6a5cc62c327e204f44602… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 9 10:33:38 2008 +0000 rpcrt4: Fix memory leaks in the ndr_marshall tests. --- dlls/rpcrt4/tests/ndr_marshall.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 04bb1d9..6c72d23 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -1573,6 +1573,7 @@ static void test_ndr_buffer(void) status = RpcBindingFromStringBinding(binding, &Handle); ok(status == RPC_S_OK, "RpcBindingFromStringBinding failed (%lu)\n", status); + RpcStringFree(&binding); NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 5); @@ -1601,6 +1602,8 @@ todo_wine /* attempt double-free */ NdrFreeBuffer(&StubMsg); + RpcBindingFree(&Handle); + status = RpcServerUnregisterIf(NULL, NULL, FALSE); ok(status == RPC_S_OK, "RpcServerUnregisterIf failed (%lu)\n", status); }

1 0

Rob Shearman : rpcrt4: Fix memory leak in NdrFullPointerXlatFree.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 52f08dd510dfb94791a16d328756e6cf63300589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f08dd510dfb94791a16d328… Author: Rob Shearman <rob(a)codeweavers.com> Date: Wed Jan 9 10:33:19 2008 +0000 rpcrt4: Fix memory leak in NdrFullPointerXlatFree. First of all, the code was freeing the wrong pointer (i.e. the pointer supplied by the caller of one of the NdrFullPointer* functions, not the PFULL_PTR_TO_REFID_ELEMENT. Second, the code wasn't following the Next link to the next entry in the list. --- dlls/rpcrt4/ndr_fullpointer.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/ndr_fullpointer.c b/dlls/rpcrt4/ndr_fullpointer.c index 3586bc3..307e545 100644 --- a/dlls/rpcrt4/ndr_fullpointer.c +++ b/dlls/rpcrt4/ndr_fullpointer.c @@ -68,8 +68,17 @@ void WINAPI NdrFullPointerXlatFree(PFULL_PTR_XLAT_TABLES pXlatTables) TRACE("(%p)\n", pXlatTables); /* free the entries in the table */ - for (i = 0; i < pXlatTables->RefIdToPointer.NumberOfEntries; i++) - HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable[i]); + for (i = 0; i < pXlatTables->PointerToRefId.NumberOfBuckets; i++) + { + PFULL_PTR_TO_REFID_ELEMENT XlatTableEntry; + for (XlatTableEntry = pXlatTables->PointerToRefId.XlatTable[i]; + XlatTableEntry; ) + { + PFULL_PTR_TO_REFID_ELEMENT Next = XlatTableEntry->Next; + HeapFree(GetProcessHeap(), 0, XlatTableEntry); + XlatTableEntry = Next; + } + } HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.XlatTable); HeapFree(GetProcessHeap(), 0, pXlatTables->RefIdToPointer.StateTable);

1 0

James Hawkins : msi: Actually delete the row data instead of blanking it out.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 4b75f33012cb382d91e396bbe3821a65e131c753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b75f33012cb382d91e396bbe… Author: James Hawkins <truiken(a)gmail.com> Date: Wed Jan 9 01:36:25 2008 -0700 msi: Actually delete the row data instead of blanking it out. --- dlls/msi/delete.c | 11 ++--------- dlls/msi/table.c | 7 +++++++ dlls/msi/tests/db.c | 14 ++++---------- dlls/msi/where.c | 22 +++++++++++++++++++++- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/dlls/msi/delete.c b/dlls/msi/delete.c index d315f27..8d37324 100644 --- a/dlls/msi/delete.c +++ b/dlls/msi/delete.c @@ -77,7 +77,6 @@ static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) { MSIDELETEVIEW *dv = (MSIDELETEVIEW*)view; UINT r, i, rows = 0, cols = 0; - MSIRECORD *empty; TRACE("%p %p\n", dv, record); @@ -92,17 +91,11 @@ static UINT DELETE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) if( r != ERROR_SUCCESS ) return r; - TRACE("blanking %d rows\n", rows); - - empty = MSI_CreateRecord( cols ); - if (!empty) - return ERROR_FUNCTION_FAILED; + TRACE("deleting %d rows\n", rows); /* blank out all the rows that match */ for ( i=0; i<rows; i++ ) - dv->table->ops->set_row( dv->table, i, empty, (1<<cols)-1 ); - - msiobj_release( &empty->hdr ); + dv->table->ops->delete_row( dv->table, i ); return ERROR_SUCCESS; } diff --git a/dlls/msi/table.c b/dlls/msi/table.c index 2da9d2c..97f0298 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1572,6 +1572,13 @@ static UINT TABLE_delete_row( struct tagMSIVIEW *view, UINT row ) data = tv->table->nonpersistent_data; } + /* reset the hash tables */ + for (i = 0; i < tv->num_cols; i++) + { + msi_free( tv->columns[i].hash_table ); + tv->columns[i].hash_table = NULL; + } + if ( row == num_rows - 1 ) return ERROR_SUCCESS; diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 719ea9e..a327ced 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4991,7 +4991,7 @@ static void test_viewmodify_delete_temporary(void) DeleteFileA(msifile); } -static void test_msidatabasecommit() +static void test_deleterow() { MSIHANDLE hdb, hview, hrec; const char *query; @@ -5040,18 +5040,12 @@ static void test_msidatabasecommit() size = MAX_PATH; r = MsiRecordGetStringA(hrec, 1, buf, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(buf, "two"), "Expected two, got %s\n", buf); - } + ok(!lstrcmpA(buf, "two"), "Expected two, got %s\n", buf); MsiCloseHandle(hrec); r = MsiViewFetch(hview, &hrec); - todo_wine - { - ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); - } + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); MsiViewClose(hview); MsiCloseHandle(hview); @@ -5089,5 +5083,5 @@ START_TEST(db) test_defaultdatabase(); test_order(); test_viewmodify_delete_temporary(); - test_msidatabasecommit(); + test_deleterow(); } diff --git a/dlls/msi/where.c b/dlls/msi/where.c index 98eaa62..e4d00c0 100644 --- a/dlls/msi/where.c +++ b/dlls/msi/where.c @@ -200,6 +200,26 @@ static UINT WHERE_set_row( struct tagMSIVIEW *view, UINT row, MSIRECORD *rec, UI return wv->table->ops->set_row( wv->table, row, rec, mask ); } +static UINT WHERE_delete_row(struct tagMSIVIEW *view, UINT row) +{ + MSIWHEREVIEW *wv = (MSIWHEREVIEW *)view; + UINT r; + + TRACE("(%p %d)\n", view, row); + + if ( !wv->table ) + return ERROR_FUNCTION_FAILED; + + if ( row > wv->row_count ) + return ERROR_NO_MORE_ITEMS; + + r = find_entry_in_hash( wv->reorder, row, &row ); + if ( r != ERROR_SUCCESS ) + return r; + + return wv->table->ops->delete_row( wv->table, row ); +} + static INT INT_evaluate_binary( INT lval, UINT op, INT rval ) { switch( op ) @@ -549,7 +569,7 @@ static const MSIVIEWOPS where_ops = WHERE_get_row, WHERE_set_row, NULL, - NULL, + WHERE_delete_row, WHERE_execute, WHERE_close, WHERE_get_dimensions,

1 0

James Hawkins : msi: Test committing a table with a removed row.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 419a8a24269c2c9d4b606292f52567bdc99ba006 URL: http://source.winehq.org/git/wine.git/?a=commit;h=419a8a24269c2c9d4b606292f… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 8 22:44:11 2008 -0700 msi: Test committing a table with a removed row. --- dlls/msi/tests/db.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 69 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 5282bf4..719ea9e 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -4991,6 +4991,74 @@ static void test_viewmodify_delete_temporary(void) DeleteFileA(msifile); } +static void test_msidatabasecommit() +{ + MSIHANDLE hdb, hview, hrec; + const char *query; + char buf[MAX_PATH]; + UINT r; + DWORD size; + + DeleteFile(msifile); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "CREATE TABLE `Table` ( `A` CHAR(72) NOT NULL PRIMARY KEY `A` )"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` (`A`) VALUES ('one')"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Table` (`A`) VALUES ('two')"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "DELETE FROM `Table` WHERE `A` = 'one'"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(hdb); + + r = MsiOpenDatabase(msifile, MSIDBOPEN_READONLY, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "SELECT * FROM `Table`"; + r = MsiDatabaseOpenView(hdb, query, &hview); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(hview, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(hview, &hrec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + size = MAX_PATH; + r = MsiRecordGetStringA(hrec, 1, buf, &size); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + todo_wine + { + ok(!lstrcmpA(buf, "two"), "Expected two, got %s\n", buf); + } + + MsiCloseHandle(hrec); + + r = MsiViewFetch(hview, &hrec); + todo_wine + { + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + } + + MsiViewClose(hview); + MsiCloseHandle(hview); + MsiCloseHandle(hdb); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -5021,4 +5089,5 @@ START_TEST(db) test_defaultdatabase(); test_order(); test_viewmodify_delete_temporary(); + test_msidatabasecommit(); }

1 0

James Hawkins : msi: Handle markers in the WHERE section of an UPDATE query , with tests.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: ce8199a46ec0d78842e0204d71a7b2332c3cb7ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8199a46ec0d78842e0204d7… Author: James Hawkins <truiken(a)gmail.com> Date: Tue Jan 8 22:16:07 2008 -0700 msi: Handle markers in the WHERE section of an UPDATE query, with tests. --- dlls/msi/tests/db.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/update.c | 44 +++++++++++++++++++++++++++++---- 2 files changed, 105 insertions(+), 6 deletions(-) diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c index 891139b..5282bf4 100644 --- a/dlls/msi/tests/db.c +++ b/dlls/msi/tests/db.c @@ -3777,6 +3777,73 @@ static void test_update(void) ok(r == ERROR_SUCCESS, "MsiViewClose failed\n"); r = MsiCloseHandle(view); ok(r == ERROR_SUCCESS, "MsiCloseHandle failed\n"); + + query = "CREATE TABLE `Apple` ( `Banana` CHAR(72) NOT NULL, " + "`Orange` CHAR(72), `Pear` INT PRIMARY KEY `Banana`)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Apple` ( `Banana`, `Orange`, `Pear` )" + "VALUES('one', 'two', 3)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Apple` ( `Banana`, `Orange`, `Pear` )" + "VALUES('three', 'four', 5)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + query = "INSERT INTO `Apple` ( `Banana`, `Orange`, `Pear` )" + "VALUES('six', 'two', 7)"; + r = run_query(hdb, 0, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + rec = MsiCreateRecord(2); + MsiRecordSetInteger(rec, 1, 8); + MsiRecordSetString(rec, 2, "two"); + + query = "UPDATE `Apple` SET `Pear` = ? WHERE `Orange` = ?"; + r = run_query(hdb, rec, query); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + MsiCloseHandle(rec); + + query = "SELECT `Pear` FROM `Apple` ORDER BY `Orange`"; + r = MsiDatabaseOpenView(hdb, query, &view); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + r = MsiViewExecute(view, 0); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == 8, "Expected 8, got %d\n", r); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == 8, "Expected 8, got %d\n", r); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + r = MsiRecordGetInteger(rec, 1); + ok(r == 5, "Expected 5, got %d\n", r); + + MsiCloseHandle(rec); + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expectd ERROR_NO_MORE_ITEMS, got %d\n", r); + + MsiViewClose(view); + MsiCloseHandle(view); + r = MsiDatabaseCommit(hdb); ok(r == ERROR_SUCCESS, "MsiDatabaseCommit failed\n"); r = MsiCloseHandle(hdb); diff --git a/dlls/msi/update.c b/dlls/msi/update.c index 23d7ab5..44d30c6 100644 --- a/dlls/msi/update.c +++ b/dlls/msi/update.c @@ -60,26 +60,56 @@ static UINT UPDATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) MSIUPDATEVIEW *uv = (MSIUPDATEVIEW*)view; UINT i, r, col_count = 0, row_count = 0; MSIRECORD *values = NULL; + MSIRECORD *where = NULL; MSIVIEW *wv; + UINT cols_count, where_count; + column_info *col = uv->vals; TRACE("%p %p\n", uv, record ); + /* extract the where markers from the record */ + if (record) + { + r = MSI_RecordGetFieldCount(record); + + for (i = 0; col; col = col->next) + i++; + + cols_count = i; + where_count = r - i; + + if (where_count > 0) + { + where = MSI_CreateRecord(where_count); + + if (where) + for (i = 1; i <= where_count; i++) + MSI_RecordCopyField(record, cols_count + i, where, i); + } + } + wv = uv->wv; if( !wv ) - return ERROR_FUNCTION_FAILED; + { + r = ERROR_FUNCTION_FAILED; + goto done; + } - r = wv->ops->execute( wv, 0 ); + r = wv->ops->execute( wv, where ); TRACE("tv execute returned %x\n", r); if( r ) - return r; + goto done; r = wv->ops->get_dimensions( wv, &row_count, &col_count ); if( r ) - return r; + goto done; values = msi_query_merge_record( col_count, uv->vals, record ); if (!values) - return ERROR_FUNCTION_FAILED; + { + r = ERROR_FUNCTION_FAILED; + goto done; + } for ( i=0; i<row_count; i++ ) { @@ -88,7 +118,9 @@ static UINT UPDATE_execute( struct tagMSIVIEW *view, MSIRECORD *record ) break; } - msiobj_release( &values->hdr ); +done: + if ( where ) msiobj_release( &where->hdr ); + if ( values ) msiobj_release( &values->hdr ); return r; }

1 0

Andrew Talbot : kernel32: Remove unneeded casts.
by Alexandre Julliard Jan. 9, 2008

Jan. 9, 2008

Module: wine Branch: master Commit: 272fb14e70396914644769a7d044a446c4a88316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=272fb14e70396914644769a7d… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jan 8 22:23:13 2008 +0000 kernel32: Remove unneeded casts. --- dlls/kernel32/heap.c | 16 ++++++++-------- dlls/kernel32/toolhelp.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index dc86d1c..34d4f20 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -955,7 +955,7 @@ HLOCAL WINAPI LocalAlloc( UINT flags, /* [in] Allocation attributes */ SIZE_T size /* [in] Number of bytes to allocate */ ) { - return (HLOCAL)GlobalAlloc( flags, size ); + return GlobalAlloc( flags, size ); } @@ -984,7 +984,7 @@ SIZE_T WINAPI LocalCompact( UINT minfree ) UINT WINAPI LocalFlags( HLOCAL handle /* [in] Handle of memory object */ ) { - return GlobalFlags( (HGLOBAL)handle ); + return GlobalFlags( handle ); } @@ -1004,7 +1004,7 @@ UINT WINAPI LocalFlags( HLOCAL WINAPI LocalFree( HLOCAL handle /* [in] Handle of memory object */ ) { - return (HLOCAL)GlobalFree( (HGLOBAL)handle ); + return GlobalFree( handle ); } @@ -1024,7 +1024,7 @@ HLOCAL WINAPI LocalFree( HLOCAL WINAPI LocalHandle( LPCVOID ptr /* [in] Address of local memory block */ ) { - return (HLOCAL)GlobalHandle( ptr ); + return GlobalHandle( ptr ); } @@ -1044,7 +1044,7 @@ HLOCAL WINAPI LocalHandle( LPVOID WINAPI LocalLock( HLOCAL handle /* [in] Address of local memory object */ ) { - return GlobalLock( (HGLOBAL)handle ); + return GlobalLock( handle ); } @@ -1066,7 +1066,7 @@ HLOCAL WINAPI LocalReAlloc( SIZE_T size, /* [in] New size of block */ UINT flags /* [in] How to reallocate object */ ) { - return (HLOCAL)GlobalReAlloc( (HGLOBAL)handle, size, flags ); + return GlobalReAlloc( handle, size, flags ); } @@ -1095,7 +1095,7 @@ SIZE_T WINAPI LocalShrink( HGLOBAL handle, UINT newsize ) SIZE_T WINAPI LocalSize( HLOCAL handle /* [in] Handle of memory object */ ) { - return GlobalSize( (HGLOBAL)handle ); + return GlobalSize( handle ); } @@ -1115,7 +1115,7 @@ SIZE_T WINAPI LocalSize( BOOL WINAPI LocalUnlock( HLOCAL handle /* [in] Handle of memory object */ ) { - return GlobalUnlock( (HGLOBAL)handle ); + return GlobalUnlock( handle ); } diff --git a/dlls/kernel32/toolhelp.c b/dlls/kernel32/toolhelp.c index 436a08f..5cd8d90 100644 --- a/dlls/kernel32/toolhelp.c +++ b/dlls/kernel32/toolhelp.c @@ -274,8 +274,8 @@ static void fill_thread( struct snapshot* snap, ULONG* offset, LPVOID info, ULON { thd_entry->dwSize = sizeof(THREADENTRY32); thd_entry->cntUsage = 0; /* MSDN says no longer used, always 0 */ - thd_entry->th32ThreadID = (ULONG)sti->dwThreadID; - thd_entry->th32OwnerProcessID = (ULONG)sti->dwOwningPID; + thd_entry->th32ThreadID = sti->dwThreadID; + thd_entry->th32OwnerProcessID = sti->dwOwningPID; thd_entry->tpBasePri = sti->dwBasePriority; thd_entry->tpDeltaPri = 0; /* MSDN says no longer used, always 0 */ thd_entry->dwFlags = 0; /* MSDN says no longer used, always 0" */

1 0