March 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3: Fix some leaks in tests.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 0ecc9201c33c85d0b1b1edd1dcaac24e4fab1f99 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ecc9201c33c85d0b1b1edd1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 14:55:39 2011 +0300 msxml3: Fix some leaks in tests. --- dlls/msxml3/tests/domdoc.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index be9a430..41a2b85 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -2956,18 +2956,23 @@ static void test_removeChild(void) r = IXMLDOMDocument_get_documentElement( doc, &element ); ok( r == S_OK, "ret %08x\n", r); + todo_wine EXPECT_REF(element, 2); r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(root_list, 1); r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(fo_node, 1); r = IXMLDOMNode_get_childNodes( fo_node, &fo_list ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(fo_list, 1); r = IXMLDOMNodeList_get_item( fo_list, 0, &ba_node ); ok( r == S_OK, "ret %08x\n", r); + EXPECT_REF(ba_node, 1); /* invalid parameter: NULL ptr */ removed_node = (void*)0xdeadbeef; @@ -2978,15 +2983,19 @@ static void test_removeChild(void) /* ba_node is a descendant of element, but not a direct child. */ removed_node = (void*)0xdeadbeef; EXPECT_REF(ba_node, 1); + EXPECT_CHILDREN(fo_node); r = IXMLDOMElement_removeChild( element, ba_node, &removed_node ); ok( r == E_INVALIDARG, "ret %08x\n", r ); ok( removed_node == NULL, "%p\n", removed_node ); EXPECT_REF(ba_node, 1); + EXPECT_CHILDREN(fo_node); EXPECT_REF(ba_node, 1); + EXPECT_REF(fo_node, 1); r = IXMLDOMElement_removeChild( element, fo_node, &removed_node ); ok( r == S_OK, "ret %08x\n", r); ok( fo_node == removed_node, "node %p node2 %p\n", fo_node, removed_node ); + EXPECT_REF(fo_node, 2); EXPECT_REF(ba_node, 1); /* try removing already removed child */ @@ -3016,6 +3025,7 @@ static void test_removeChild(void) ok( r == S_OK, "ret %08x\n", r); IXMLDOMElement_Release( lc_element ); + temp_node = (void*)0xdeadbeef; r = IXMLDOMNode_get_parentNode( lc_node, &temp_node ); ok( r == S_FALSE, "ret %08x\n", r); ok( temp_node == NULL, "%p\n", temp_node ); @@ -3117,9 +3127,13 @@ static void test_replaceChild(void) /* MS quirk: replaceChild also accepts elements instead of nodes */ r = IXMLDOMNode_QueryInterface( ba_node, &IID_IXMLDOMElement, (void**)&ba_element); ok( r == S_OK, "ret %08x\n", r ); + EXPECT_REF(ba_element, 2); + removed_node = NULL; r = IXMLDOMElement_replaceChild( element, ba_node, (IXMLDOMNode*)ba_element, &removed_node ); ok( r == S_OK, "ret %08x\n", r ); + ok( removed_node != NULL, "got %p\n", removed_node); + EXPECT_REF(ba_element, 3); IXMLDOMElement_Release( ba_element ); r = IXMLDOMNodeList_get_length( fo_list, &len); @@ -6099,6 +6113,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("value")), "got wrong value\n"); IXMLDOMProcessingInstruction_Release(pi); + VariantClear(&value); } hr = IXMLDOMDocument_createCDATASection(doc, _bstr_("[1]*2=3; &gee thats not right!"), &cdata); @@ -6111,6 +6126,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("[1]*2=3; &gee thats not right!")), "got wrong value\n"); IXMLDOMCDATASection_Release(cdata); + VariantClear(&value); } hr = IXMLDOMDocument_createComment(doc, _bstr_("comment"), &comment); @@ -6123,6 +6139,7 @@ static void test_nodeTypedValue(void) ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); ok(!lstrcmpW(V_BSTR(&value), _bstr_("comment")), "got wrong value\n"); IXMLDOMComment_Release(comment); + VariantClear(&value); } hr = IXMLDOMDocument_createDocumentFragment(doc, &frag); @@ -7523,6 +7540,7 @@ todo_wine { todo_wine EXPECT_REF(elem, 2); IXMLDOMDocument_Release(doc); todo_wine EXPECT_REF(elem, 2); + IXMLDOMElement_Release(elem); doc = create_document(&IID_IXMLDOMDocument); @@ -8064,6 +8082,7 @@ todo_wine { /* we currently output one '\n' instead of empty string */ todo_wine ok(lstrcmpW(V_BSTR(&v), _bstr_("")) == 0, "got %s\n", wine_dbgstr_w(V_BSTR(&v))); IXMLDOMDocument_Release(doc2); + VariantClear(&v); IXSLProcessor_Release(processor); @@ -8181,6 +8200,7 @@ static void test_insertBefore(void) ok(hr == E_FAIL, "got 0x%08x\n", hr); ok(node == NULL, "got %p\n", node); IXMLDOMNode_Release(newnode); + IXMLDOMAttribute_Release(attr); /* insertBefore for elements */ hr = IXMLDOMDocument_createElement(doc, _bstr_("elem"), &elem1); @@ -8206,6 +8226,7 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem1); todo_wine EXPECT_REF(elem2, 3); + IXMLDOMNode_Release(node); /* again for already linked node */ V_VT(&v) = VT_NULL; @@ -8217,7 +8238,8 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem1); /* increments each time */ - todo_wine EXPECT_REF(elem2, 4); + todo_wine EXPECT_REF(elem2, 3); + IXMLDOMNode_Release(node); /* try to add to another element */ V_VT(&v) = VT_NULL; @@ -8229,6 +8251,8 @@ static void test_insertBefore(void) EXPECT_CHILDREN(elem3); EXPECT_NO_CHILDREN(elem1); + IXMLDOMNode_Release(node); + /* cross document case - try to add as child to a node created with other doc */ doc2 = create_document(&IID_IXMLDOMDocument); @@ -8249,14 +8273,16 @@ static void test_insertBefore(void) ok(node == (void*)elem4, "got %p\n", node); todo_wine EXPECT_REF(elem4, 3); todo_wine EXPECT_REF(elem3, 2); + IXMLDOMNode_Release(node); V_VT(&v) = VT_NULL; node = NULL; hr = IXMLDOMElement_insertBefore(elem3, (IXMLDOMNode*)elem5, v, &node); ok(hr == S_OK, "got 0x%08x\n", hr); ok(node == (void*)elem5, "got %p\n", node); - todo_wine EXPECT_REF(elem4, 3); + todo_wine EXPECT_REF(elem4, 2); todo_wine EXPECT_REF(elem5, 3); + IXMLDOMNode_Release(node); IXMLDOMDocument_Release(doc2); @@ -8352,6 +8378,8 @@ static void test_insertBefore(void) ok(!lstrcmpW(p, _bstr_("<elem2/>")), "got %s\n", wine_dbgstr_w(p)); SysFreeString(p); + IXMLDOMElement_Release(elem1); + IXMLDOMElement_Release(elem2); IXMLDOMDocument_Release(doc); }

1 0

Nikolay Sivov : msxml3: Orphan a node removed with removeChild().
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 76645c5e6d3dcceb95ae17a6d0944040e8c48908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=76645c5e6d3dcceb95ae17a6d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 17:45:20 2011 +0300 msxml3: Orphan a node removed with removeChild(). --- dlls/msxml3/node.c | 31 +++++++++++++++++++------------ 1 files changed, 19 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 18b3db2..50cb481 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -292,7 +292,6 @@ HRESULT node_get_next_sibling(xmlnode *This, IXMLDOMNode **ret) HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT *ref_child, IXMLDOMNode **ret) { - xmlNodePtr new_child_node; IXMLDOMNode *before = NULL; xmlnode *node_obj; xmlDocPtr doc; @@ -321,12 +320,11 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT return E_FAIL; } - new_child_node = node_obj->node; - TRACE("new_child_node %p This->node %p\n", new_child_node, This->node); + TRACE("new child %p, This->node %p\n", node_obj->node, This->node); - if(!new_child_node->parent) - if(xmldoc_remove_orphan(new_child_node->doc, new_child_node) != S_OK) - WARN("%p is not an orphan of %p\n", new_child_node, new_child_node->doc); + if(!node_obj->node->parent) + if(xmldoc_remove_orphan(node_obj->node->doc, node_obj->node) != S_OK) + WARN("%p is not an orphan of %p\n", node_obj->node, node_obj->node->doc); if(before) { @@ -336,10 +334,13 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT /* unlink from current parent first */ if(node_obj->parent) - IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - doc = new_child_node->doc; + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; xmldoc_add_ref(before_node_obj->node->doc); - xmlAddPrevSibling(before_node_obj->node, new_child_node); + xmlAddPrevSibling(before_node_obj->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->parent; } @@ -347,10 +348,13 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT { /* unlink from current parent first */ if(node_obj->parent) - IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); - doc = new_child_node->doc; + { + hr = IXMLDOMNode_removeChild(node_obj->parent, node_obj->iface, NULL); + if (hr == S_OK) xmldoc_remove_orphan(node_obj->node->doc, node_obj->node); + } + doc = node_obj->node->doc; xmldoc_add_ref(This->node->doc); - xmlAddChild(This->node, new_child_node); + xmlAddChild(This->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->iface; } @@ -445,6 +449,7 @@ HRESULT node_remove_child(xmlnode *This, IXMLDOMNode* child, IXMLDOMNode** oldCh xmlUnlinkNode(child_node->node); child_node->parent = NULL; + xmldoc_add_orphan(child_node->node->doc, child_node->node); if(oldChild) { @@ -507,6 +512,8 @@ HRESULT node_clone(xmlnode *This, VARIANT_BOOL deep, IXMLDOMNode **cloneNode) if (!node) { ERR("Copy failed\n"); + xmldoc_remove_orphan(clone->doc, clone); + xmlFreeNode(clone); return E_FAIL; }

1 0

Nikolay Sivov : msxml3: Merge obsolete interfaces tests in a single file.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 1b1c4c014021a99811154bdb0caef1d862d699ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b1c4c014021a99811154bdb0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 8 00:39:24 2011 +0300 msxml3: Merge obsolete interfaces tests in a single file. --- dlls/msxml3/tests/Makefile.in | 3 +- dlls/msxml3/tests/xmldoc.c | 534 ++++++++++++++++++++++++++++++++++++ dlls/msxml3/tests/xmlelem.c | 598 ----------------------------------------- 3 files changed, 535 insertions(+), 600 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b1c4c014021a99811154…

1 0

Eric Pouech : dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form).
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 2d570921dc37a9cec36a9a1bf4e71205bf199c91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d570921dc37a9cec36a9a1bf… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:02 2011 +0100 dbghelp: When using a regular expression on a file name, interpret '*' as any string (.* in regexp form). --- dlls/dbghelp/symbol.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 07e62e2..78b0b2c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -220,6 +220,10 @@ static BOOL compile_file_regex(regex_t* re, const char* srcfile) *p++ = '\\'; *p++ = '.'; break; + case '*': + *p++ = '.'; + *p++ = '*'; + break; default: *p++ = *srcfile; break; @@ -2029,8 +2033,8 @@ BOOL WINAPI SymEnumLines(HANDLE hProcess, ULONG64 base, PCSTR compiland, if (dli->is_source_file) { file = source_get(pair.effective, dli->u.source_file); - if (!match_regexp(&re, file)) file = ""; - strcpy(sci.FileName, file); + if (!match_regexp(&re, file)) sci.FileName[0] = '\0'; + else strcpy(sci.FileName, file); } else if (sci.FileName[0]) {

1 0

Eric Pouech : winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: cf7120b8cce712bdd450d19585427633b7033544 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf7120b8cce712bdd450d1958… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Mar 7 22:41:09 2011 +0100 winedbg: Fix 'break file : lineno' command so that file can be in other modules than the current one. --- programs/winedbg/break.c | 60 +++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 24 deletions(-) diff --git a/programs/winedbg/break.c b/programs/winedbg/break.c index debc0c7..e156a40 100644 --- a/programs/winedbg/break.c +++ b/programs/winedbg/break.c @@ -270,6 +270,7 @@ void break_add_break_from_id(const char *name, int lineno, BOOL swbp) struct cb_break_lineno { + const char* filename; int lineno; ADDRESS64 addr; }; @@ -287,6 +288,17 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) return TRUE; } +static BOOL CALLBACK mcb(PCWSTR module, DWORD64 base, void* user) +{ + struct cb_break_lineno* bkln = user; + + SymEnumLines(dbg_curr_process->handle, base, NULL, bkln->filename, line_cb, bkln); + /* continue module enum if no addr found + * FIXME: we don't report when several addresses match the same filename/lineno pair + */ + return !bkln->addr.Offset; +} + /*********************************************************************** * break_add_break_from_lineno * @@ -295,38 +307,38 @@ static BOOL CALLBACK line_cb(SRCCODEINFO* sci, void* user) void break_add_break_from_lineno(const char *filename, int lineno, BOOL swbp) { struct cb_break_lineno bkln; + bkln.addr.Offset = 0; + bkln.lineno = lineno; - memory_get_current_pc(&bkln.addr); - - if (lineno != -1) + if (!filename) { + DWORD disp; + ADDRESS64 curr; IMAGEHLP_LINE64 il; - DWORD_PTR linear = (DWORD_PTR)memory_to_linear_addr(&bkln.addr); + DWORD_PTR linear; - if (!filename) + memory_get_current_pc(&curr); + linear = (DWORD_PTR)memory_to_linear_addr(&curr); + il.SizeOfStruct = sizeof(il); + if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) { - DWORD disp; - - il.SizeOfStruct = sizeof(il); - if (!SymGetLineFromAddr64(dbg_curr_process->handle, linear, &disp, &il)) - { - dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); - return; - } - filename = il.FileName; - } - bkln.addr.Offset = 0; - bkln.lineno = lineno; - SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); - if (!bkln.addr.Offset) - { - dbg_printf("Unknown line number\n" - "(either out of file, or no code at given line number)\n"); + dbg_printf("Unable to add breakpoint (unknown address %lx)\n", linear); return; } + filename = il.FileName; + SymEnumLines(dbg_curr_process->handle, linear, NULL, filename, line_cb, &bkln); } - - break_add_break(&bkln.addr, TRUE, swbp); + else + { + /* we have to enumerate across modules */ + bkln.filename = filename; + SymEnumerateModulesW64(dbg_curr_process->handle, mcb, &bkln); + } + if (bkln.addr.Offset) + break_add_break(&bkln.addr, TRUE, swbp); + else + dbg_printf("Unknown line number\n" + "(either out of file, or no code at given line number)\n"); } /***********************************************************************

1 0

Dmitry Timoshkov : gdi32: Add some additional tests for negative axes extents.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: afcfb51055751882f6b854b4b5c40a1aad3823da URL: http://source.winehq.org/git/wine.git/?a=commit;h=afcfb51055751882f6b854b4b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 8 16:55:24 2011 +0800 gdi32: Add some additional tests for negative axes extents. --- dlls/gdi32/tests/mapping.c | 32 ++++++++++++++++++++++++++++++-- 1 files changed, 30 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/mapping.c b/dlls/gdi32/tests/mapping.c index fba0abf..b0688a7 100644 --- a/dlls/gdi32/tests/mapping.c +++ b/dlls/gdi32/tests/mapping.c @@ -210,15 +210,43 @@ static void test_world_transform(void) expect_world_transform(hdc, 20.0, 20.0); expect_LPtoDP(hdc, 20000, 20000); + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + ret = SetMapMode(hdc, MM_ANISOTROPIC); + ok(ret == MM_TEXT, "expected MM_TEXT, got %d\n", ret); + + expect_viewport_ext(hdc, 1, 1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, 20000, 20000); + + size.cx = 0xdeadbeef; + size.cy = 0xdeadbeef; + ret = SetViewportExtEx(hdc, -1, -1, &size); + ok(ret, "SetViewportExtEx(-1, -1) failed\n"); + ok(size.cx == 1 && size.cy == 1, "expected 1,1 got %d,%d\n", size.cx, size.cy); + expect_viewport_ext(hdc, -1, -1); + expect_window_ext(hdc, 1, 1); + expect_world_transform(hdc, 20.0, 20.0); + expect_LPtoDP(hdc, -20000, -20000); + ret = SetGraphicsMode(hdc, GM_COMPATIBLE); ok(ret, "SetGraphicsMode(GM_COMPATIBLE) should not fail if DC has't an identity transform\n"); ret = GetGraphicsMode(hdc); ok(ret == GM_COMPATIBLE, "expected GM_COMPATIBLE, got %d\n", ret); - expect_viewport_ext(hdc, 1, 1); + expect_viewport_ext(hdc, -1, -1); expect_window_ext(hdc, 1, 1); expect_world_transform(hdc, 20.0, 20.0); - expect_LPtoDP(hdc, 20000, 20000); + expect_LPtoDP(hdc, -20000, -20000); DeleteDC(hdc); }

1 0

Hans Leidekker : msi: Make a second pass to determine which files to install in the InstallFiles action .
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 4a6c63e24a5a9ab22dc4e2145db16d86fe8f1895 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a6c63e24a5a9ab22dc4e2145… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:16 2011 +0100 msi: Make a second pass to determine which files to install in the InstallFiles action. This is needed because the target path can still change after CostFinalize is executed. This happens in the .NET 1.1 Service Pack 1 installer where a custom action calls SetTargetPath. --- dlls/msi/action.c | 52 +++++++-------------------------- dlls/msi/files.c | 81 ++++++++++++++++++++++++++++++++++++++++++++------- dlls/msi/msipriv.h | 4 ++- 3 files changed, 84 insertions(+), 53 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 86aa33f..a003f5e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2178,7 +2178,7 @@ int msi_compare_file_versions( VS_FIXEDFILEINFO *fi, const WCHAR *version ) return 0; } -static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) +int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) { DWORD ms1, ms2; @@ -2190,7 +2190,7 @@ static int msi_compare_font_versions( const WCHAR *ver1, const WCHAR *ver2 ) return 0; } -static DWORD get_disk_file_size( LPCWSTR filename ) +DWORD msi_get_disk_file_size( LPCWSTR filename ) { HANDLE file; DWORD size; @@ -2206,7 +2206,7 @@ static DWORD get_disk_file_size( LPCWSTR filename ) return size; } -static BOOL hash_matches( MSIFILE *file ) +BOOL msi_file_hash_matches( MSIFILE *file ) { UINT r; MSIFILEHASHINFO hash; @@ -2256,7 +2256,7 @@ static void set_target_path( MSIPACKAGE *package, MSIFILE *file ) TRACE("resolves to %s\n", debugstr_w(file->TargetPath)); } -static UINT set_file_install_states( MSIPACKAGE *package ) +static UINT calculate_file_cost( MSIPACKAGE *package ) { VS_FIXEDFILEINFO *file_version; WCHAR *font_version; @@ -2277,67 +2277,37 @@ static UINT set_file_install_states( MSIPACKAGE *package ) if ((comp->assembly && !comp->assembly->installed) || GetFileAttributesW(file->TargetPath) == INVALID_FILE_ATTRIBUTES) { - file->state = msifs_missing; comp->Cost += file->FileSize; continue; } + file_size = msi_get_disk_file_size( file->TargetPath ); + if (file->Version) { if ((file_version = msi_get_disk_file_version( file->TargetPath ))) { - TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), - HIWORD(file_version->dwFileVersionMS), - LOWORD(file_version->dwFileVersionMS), - HIWORD(file_version->dwFileVersionLS), - LOWORD(file_version->dwFileVersionLS)); - if (msi_compare_file_versions( file_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( file_version ); continue; } else if ((font_version = font_version_from_file( file->TargetPath ))) { - TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); - if (msi_compare_font_versions( font_version, file->Version ) < 0) { - file->state = msifs_overwrite; - comp->Cost += file->FileSize; - } - else - { - TRACE("Destination file version equal or greater, not overwriting\n"); - file->state = msifs_present; + comp->Cost += file->FileSize - file_size; } msi_free( font_version ); continue; } } - if ((file_size = get_disk_file_size( file->TargetPath )) != file->FileSize) + if (file_size != file->FileSize) { - file->state = msifs_overwrite; comp->Cost += file->FileSize - file_size; - continue; } - if (file->hash.dwFileHashInfoSize && hash_matches( file )) - { - TRACE("File hashes match, not overwriting\n"); - file->state = msifs_present; - continue; - } - file->state = msifs_overwrite; - comp->Cost += file->FileSize - file_size; } - return ERROR_SUCCESS; } @@ -2404,8 +2374,8 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) } } - TRACE("Calculating file install states\n"); - set_file_install_states( package ); + TRACE("Calculating file cost\n"); + calculate_file_cost( package ); msi_set_property( package->db, szCosting, szOne ); /* set default run level if not set */ diff --git a/dlls/msi/files.c b/dlls/msi/files.c index df765e5..e88a0c6 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -60,6 +60,73 @@ static void msi_file_update_ui( MSIPACKAGE *package, MSIFILE *f, const WCHAR *ac ui_progress( package, 2, f->FileSize, 0, 0 ); } +static msi_file_state calculate_install_state( MSIFILE *file ) +{ + MSICOMPONENT *comp = file->Component; + VS_FIXEDFILEINFO *file_version; + WCHAR *font_version; + msi_file_state state; + DWORD file_size; + + if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || + (comp->assembly && comp->assembly->installed)) + { + TRACE("file %s is not scheduled for install\n", debugstr_w(file->File)); + return msifs_skipped; + } + if ((comp->assembly && !comp->assembly->installed) || + GetFileAttributesW( file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + { + TRACE("file %s is missing\n", debugstr_w(file->File)); + return msifs_missing; + } + if (file->Version) + { + if ((file_version = msi_get_disk_file_version( file->TargetPath ))) + { + TRACE("new %s old %u.%u.%u.%u\n", debugstr_w(file->Version), + HIWORD(file_version->dwFileVersionMS), + LOWORD(file_version->dwFileVersionMS), + HIWORD(file_version->dwFileVersionLS), + LOWORD(file_version->dwFileVersionLS)); + + if (msi_compare_file_versions( file_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( file_version ); + return state; + } + else if ((font_version = font_version_from_file( file->TargetPath ))) + { + TRACE("new %s old %s\n", debugstr_w(file->Version), debugstr_w(font_version)); + + if (msi_compare_font_versions( font_version, file->Version ) < 0) + state = msifs_overwrite; + else + { + TRACE("destination file version equal or greater, not overwriting\n"); + state = msifs_present; + } + msi_free( font_version ); + return state; + } + } + if ((file_size = msi_get_disk_file_size( file->TargetPath )) != file->FileSize) + { + return msifs_overwrite; + } + if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_present; + } + return msifs_overwrite; +} + static void schedule_install_files(MSIPACKAGE *package) { MSIFILE *file; @@ -68,22 +135,14 @@ static void schedule_install_files(MSIPACKAGE *package) { MSICOMPONENT *comp = file->Component; - if (comp->ActionRequest != INSTALLSTATE_LOCAL || !comp->Enabled || - (comp->assembly && comp->assembly->installed)) + file->state = calculate_install_state( file ); + if (file->state == msifs_overwrite && (comp->Attributes & msidbComponentAttributesNeverOverwrite)) { - TRACE("File %s is not scheduled for install\n", debugstr_w(file->File)); + TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); file->state = msifs_skipped; - continue; } comp->Action = INSTALLSTATE_LOCAL; ui_progress( package, 2, file->FileSize, 0, 0 ); - - if (file->state == msifs_overwrite && - (comp->Attributes & msidbComponentAttributesNeverOverwrite)) - { - TRACE("not overwriting %s\n", debugstr_w(file->TargetPath)); - file->state = msifs_skipped; - } } } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7c25ec9..9ddcaeb 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -856,7 +856,9 @@ extern DWORD msi_version_str_to_dword(LPCWSTR p); extern void msi_parse_version_string(LPCWSTR, PDWORD, PDWORD); extern VS_FIXEDFILEINFO *msi_get_disk_file_version(LPCWSTR); extern int msi_compare_file_versions(VS_FIXEDFILEINFO *, const WCHAR *); - +extern int msi_compare_font_versions(const WCHAR *, const WCHAR *); +extern DWORD msi_get_disk_file_size(LPCWSTR); +extern BOOL msi_file_hash_matches(MSIFILE *); extern LONG msi_reg_set_val_str( HKEY hkey, LPCWSTR name, LPCWSTR value ); extern LONG msi_reg_set_val_multi_str( HKEY hkey, LPCWSTR name, LPCWSTR value );

1 0

Hans Leidekker : msi: Load media info even if there's no file to install.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: be790cb0adec3a41297d2a51bdcee4e46544341c URL: http://source.winehq.org/git/wine.git/?a=commit;h=be790cb0adec3a41297d2a51b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:08:39 2011 +0100 msi: Load media info even if there's no file to install. --- dlls/msi/files.c | 7 +++++++ dlls/msi/media.c | 9 +-------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 9 --------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e88a0c6..493baed 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -293,6 +293,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { + rc = msi_load_media_info( package, file, mi ); + if (rc != ERROR_SUCCESS) + { + ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); + return ERROR_FUNCTION_FAILED; + } + if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 8b5a8c6..8c4b0f7 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -656,7 +656,7 @@ static UINT get_drive_type(const WCHAR *path) return GetDriveTypeW(root); } -static UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) +UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) { MSIRECORD *row; LPWSTR source_dir; @@ -803,13 +803,6 @@ UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi) if (mi->is_continuous) return ERROR_SUCCESS; - rc = msi_load_media_info(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Unable to load media info %u\n", rc); - return ERROR_FUNCTION_FAILED; - } - /* cabinet is internal, no checks needed */ if (!mi->cabinet || mi->cabinet[0] == '#') return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9ddcaeb..10f51de 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -987,6 +987,7 @@ typedef struct } MSICABDATA; extern UINT ready_media(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); +extern UINT msi_load_media_info(MSIPACKAGE *package, MSIFILE *file, MSIMEDIAINFO *mi); extern void msi_free_media_info(MSIMEDIAINFO *mi); extern BOOL msi_cabextract(MSIPACKAGE* package, MSIMEDIAINFO *mi, LPVOID data); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ea5431a..ae6be76 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3339,11 +3339,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile0.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3368,11 +3365,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile1.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -3396,11 +3390,8 @@ static void test_lastusedsource(void) r = pMsiSourceListGetInfoA(prodcode, NULL, MSIINSTALLCONTEXT_USERUNMANAGED, MSICODE_PRODUCT, INSTALLPROPERTY_LASTUSEDSOURCE, value, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); - todo_wine - { ok(!lstrcmpA(value, path), "Expected \"%s\", got \"%s\"\n", path, value); ok(size == lstrlenA(path), "Expected %d, got %d\n", lstrlenA(path), size); - } r = MsiInstallProductA("msifile2.msi", "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r);

1 0

Hans Leidekker : msi: Assume a file is present if the target exists with the same size and there 's no file version or hash to verify.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 429407cfb6418d64592326d21aa19a25656f2ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429407cfb6418d64592326d21… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 8 10:09:01 2011 +0100 msi: Assume a file is present if the target exists with the same size and there's no file version or hash to verify. --- dlls/msi/files.c | 31 +++++++++++++++++++---------- dlls/msi/msipriv.h | 1 + dlls/msi/tests/install.c | 47 ++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 493baed..4736fce 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -119,12 +119,21 @@ static msi_file_state calculate_install_state( MSIFILE *file ) { return msifs_overwrite; } - if (file->hash.dwFileHashInfoSize && msi_file_hash_matches( file )) + if (file->hash.dwFileHashInfoSize) { - TRACE("file hashes match, not overwriting\n"); - return msifs_present; + if (msi_file_hash_matches( file )) + { + TRACE("file hashes match, not overwriting\n"); + return msifs_hashmatch; + } + else + { + TRACE("file hashes do not match, overwriting\n"); + return msifs_overwrite; + } } - return msifs_overwrite; + /* assume present */ + return msifs_present; } static void schedule_install_files(MSIPACKAGE *package) @@ -299,6 +308,13 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) ERR("Unable to load media info for %s (%u)\n", debugstr_w(file->File), rc); return ERROR_FUNCTION_FAILED; } + if (!file->Component->Enabled) continue; + + if (file->state != msifs_hashmatch && (rc = ready_media( package, file, mi ))) + { + ERR("Failed to ready media for %s\n", debugstr_w(file->File)); + goto done; + } if (file->state != msifs_missing && !mi->is_continuous && file->state != msifs_overwrite) continue; @@ -308,13 +324,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) { MSICABDATA data; - rc = ready_media(package, file, mi); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to ready media for %s\n", debugstr_w(file->File)); - goto done; - } - data.mi = mi; data.package = package; data.cb = installfiles_cb; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 10f51de..096678c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -499,6 +499,7 @@ typedef enum _msi_file_state { msifs_present, msifs_installed, msifs_skipped, + msifs_hashmatch } msi_file_state; typedef struct tagMSIFILE diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index ae6be76..deff5f7 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -713,7 +713,8 @@ static const CHAR mc_component_dat[] = "Component\tComponentId\tDirectory_\tAttr "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n" "augustus\t\tMSITESTDIR\t0\t1\taugustus\n" "caesar\t\tMSITESTDIR\t0\t1\tcaesar\n" - "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n"; + "gaius\t\tMSITESTDIR\t0\tGAIUS=1\tgaius\n" + "tiberius\t\tMSITESTDIR\t0\t\ttiberius\n"; static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" @@ -721,7 +722,8 @@ static const CHAR mc_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion "maximus\tmaximus\tmaximus\t500\t\t\t16384\t1\n" "augustus\taugustus\taugustus\t500\t\t\t0\t2\n" "caesar\tcaesar\tcaesar\t500\t\t\t16384\t3\n" - "gaius\tgaius\tgaius\t500\t\t\t16384\t4"; + "gaius\tgaius\tgaius\t500\t\t\t16384\t4\n" + "tiberius\ttiberius\ttiberius\t500\t\t\t0\t5\n"; static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" "i2\ti4\tL64\tS255\tS32\tS72\n" @@ -729,7 +731,8 @@ static const CHAR mc_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tV "1\t1\t\ttest1.cab\tDISK1\t\n" "2\t2\t\ttest2.cab\tDISK2\t\n" "3\t3\t\ttest3.cab\tDISK3\t\n" - "4\t4\t\ttest3.cab\tDISK3\t\n"; + "4\t4\t\ttest3.cab\tDISK3\t\n" + "5\t5\t\ttest4.cab\tDISK4\t\n"; static const CHAR mc_file_hash_dat[] = "File_\tOptions\tHashPart1\tHashPart2\tHashPart3\tHashPart4\n" "s72\ti2\ti4\ti4\ti4\ti4\n" @@ -2295,6 +2298,29 @@ static BOOL delete_cf(const CHAR *rel_path, BOOL is_file) return RemoveDirectoryA(path); } +static BOOL compare_pf_data(const char *filename, const char *data, DWORD size) +{ + DWORD read; + HANDLE handle; + BOOL ret = FALSE; + char *buffer, path[MAX_PATH]; + + lstrcpyA(path, PROG_FILES_DIR); + lstrcatA(path, "\\"); + lstrcatA(path, filename); + + handle = CreateFileA(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + buffer = HeapAlloc(GetProcessHeap(), 0, size); + if (buffer) + { + ReadFile(handle, buffer, size, &read, NULL); + if (read == size && !memcmp(data, buffer, size)) ret = TRUE; + HeapFree(GetProcessHeap(), 0, buffer); + } + CloseHandle(handle); + return ret; +} + static void delete_test_files(void) { DeleteFileA("msitest.msi"); @@ -4068,15 +4094,18 @@ static void test_missingcab(void) CreateDirectoryA("msitest", NULL); create_file("msitest\\augustus", 500); create_file("maximus", 500); + create_file("tiberius", 500); create_database(msifile, mc_tables, sizeof(mc_tables) / sizeof(msi_table)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); create_cab_file("test1.cab", MEDIA_SIZE, "maximus\0"); + create_cab_file("test4.cab", MEDIA_SIZE, "tiberius\0"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); r = MsiInstallProductA(msifile, NULL); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4093,11 +4122,14 @@ static void test_missingcab(void) ok(delete_pf("msitest\\maximus", TRUE), "File not installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File not installed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File not installed\n"); ok(!delete_pf("msitest\\gaius", TRUE), "File installed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); create_pf("msitest", FALSE); create_pf_data("msitest\\caesar", "abcdefgh", TRUE); + create_pf_data("msitest\\tiberius", "abcdefgh", TRUE); create_pf("msitest\\gaius", TRUE); r = MsiInstallProductA(msifile, "GAIUS=1"); @@ -4108,16 +4140,19 @@ static void test_missingcab(void) ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); } ok(delete_pf("msitest\\caesar", TRUE), "File removed\n"); + ok(compare_pf_data("msitest\\tiberius", "abcdefgh", sizeof("abcdefgh")), "Wrong file contents\n"); + ok(delete_pf("msitest\\tiberius", TRUE), "File removed\n"); ok(delete_pf("msitest\\gaius", TRUE), "File removed\n"); - ok(delete_pf("msitest", FALSE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "Directory not created\n"); error: - delete_pf("msitest\\caesar", TRUE); delete_pf("msitest", FALSE); DeleteFile("msitest\\augustus"); RemoveDirectory("msitest"); DeleteFile("maximus"); + DeleteFile("tiberius"); DeleteFile("test1.cab"); + DeleteFile("test4.cab"); DeleteFile(msifile); }

1 0

Juan Lang : wininet: Increment file use count when committing a URL cache entry.
by Alexandre Julliard 08 Mar '11

08 Mar '11

Module: wine Branch: master Commit: 6e713b3946b292f5da42a966b3aa65a78afae034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e713b3946b292f5da42a966b… Author: Juan Lang <juan.lang(a)gmail.com> Date: Sun Mar 6 10:07:17 2011 -0800 wininet: Increment file use count when committing a URL cache entry. --- dlls/wininet/urlcache.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index ad439dd..de31ff6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -2633,6 +2633,11 @@ static BOOL CommitUrlCacheEntryInternal( (DWORD)((LPBYTE)pUrlEntry - (LPBYTE)pHeader)); if (error != ERROR_SUCCESS) URLCache_DeleteEntry(pHeader, &pUrlEntry->CacheFileEntry); + else + { + if (pUrlEntry->CacheDir < pHeader->DirectoryCount) + pHeader->directory_data[pUrlEntry->CacheDir].dwNumFiles++; + } cleanup: URLCacheContainer_UnlockIndex(pContainer, pHeader);

1 0