January 2012 - Wine-Commits

Nikolay Sivov : msxml3: ::get_namespaceURI() doesn' t reset out pointer on invalid index.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 91390a720fd0c26c89609e61dd6cd4f497482a25 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91390a720fd0c26c89609e61d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 07:35:20 2012 +0300 msxml3: ::get_namespaceURI() doesn't reset out pointer on invalid index. --- dlls/msxml3/schema.c | 4 ++-- dlls/msxml3/tests/schema.c | 12 +++++++----- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/schema.c b/dlls/msxml3/schema.c index 9de3768..6913e35 100644 --- a/dlls/msxml3/schema.c +++ b/dlls/msxml3/schema.c @@ -1197,16 +1197,16 @@ static HRESULT WINAPI schema_cache_get_namespaceURI(IXMLDOMSchemaCollection2* if LONG index, BSTR* len) { schema_cache* This = impl_from_IXMLDOMSchemaCollection2(iface); - cache_index_data data = {index,len}; + cache_index_data data = {index, len}; TRACE("(%p)->(%i %p)\n", This, index, len); if (!len) return E_POINTER; - *len = NULL; if (index >= xmlHashSize(This->cache)) return E_FAIL; + *len = NULL; xmlHashScan(This->cache, cache_index, &data); return S_OK; } diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index 48e9d4d..c350267 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -853,11 +853,12 @@ static void test_length(void) static void test_collection_content(void) { IXMLDOMDocument2 *schema1, *schema2, *schema3, *schema4, *schema5; + BSTR content[5] = {NULL, NULL, NULL, NULL, NULL}; IXMLDOMSchemaCollection *cache1, *cache2; VARIANT_BOOL b; - BSTR bstr; - BSTR content[5] = {NULL, NULL, NULL, NULL, NULL}; LONG length; + HRESULT hr; + BSTR bstr; int i, j; schema1 = create_document_version(30, &IID_IXMLDOMDocument2); @@ -935,10 +936,11 @@ static void test_collection_content(void) IXMLDOMDocument2_Release(schema5); } - bstr = NULL; + bstr = (void*)0xdeadbeef; /* error if index is out of range */ - ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, &bstr), E_FAIL); - SysFreeString(bstr); + hr = IXMLDOMSchemaCollection_get_namespaceURI(cache1, 3, &bstr); + EXPECT_HR(hr, E_FAIL); + ok(bstr == (void*)0xdeadbeef, "got %p\n", bstr); /* error if return pointer is NULL */ ole_expect(IXMLDOMSchemaCollection_get_namespaceURI(cache1, 0, NULL), E_POINTER); /* pointer is checked first */

1 0

Francois Gouget : po: Fix a formatting directive in the Polish translation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: f05afaca4d762b45cac2b47da81154d371350843 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f05afaca4d762b45cac2b47da… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:46 2012 +0100 po: Fix a formatting directive in the Polish translation. --- po/pl.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/pl.po b/po/pl.po index 24b992c..60a29d7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -10445,7 +10445,7 @@ msgid "" msgstr "" "%1\n" "Plik ten zawiera znaki Unicode, które zostaną utracone jeżeli\n" -"zapiszesz ten plik przy użyciu kodowania %s.\n" +"zapiszesz ten plik przy użyciu kodowania %2.\n" "Aby zachować te znaki, naciśnij Anuluj, a później zaznacz\n" "jedną z opcji Unicode z rozwijalnej listy kodowań.\n" "Czy chcesz kontynuować mimo tego?"

1 0

Nikolay Sivov : mscoree: Correct VARIANT type.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 6302ba5dd6674812a3780f694ccd044379bac4d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6302ba5dd6674812a3780f694… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 12:53:25 2012 +0300 mscoree: Correct VARIANT type. --- dlls/mscoree/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscoree/config.c b/dlls/mscoree/config.c index 02c11b1..c5e3cec 100644 --- a/dlls/mscoree/config.c +++ b/dlls/mscoree/config.c @@ -425,7 +425,7 @@ static HRESULT parse_config(VARIANT input, parsed_config_file *result) ISAXXMLReader_Release(reader); } - IUnknown_Release((IUnknown*)handler); + ISAXContentHandler_Release(&handler->ISAXContentHandler_iface); return S_OK; } @@ -445,7 +445,7 @@ HRESULT parse_config_file(LPCWSTR filename, parsed_config_file *result) if (SUCCEEDED(hr)) { - V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_VT(&var) = VT_UNKNOWN; V_UNKNOWN(&var) = (IUnknown*)stream; hr = parse_config(var, result);

1 0

Francois Gouget : po: Fix a formatting directive in the Russian translation .
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: aa5e253317f37c5fe781ab1155082c86c3a8fc97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5e253317f37c5fe781ab115… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:42 2012 +0100 po: Fix a formatting directive in the Russian translation. --- po/ru.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/ru.po b/po/ru.po index dbf0d8b..ed78cc0 100644 --- a/po/ru.po +++ b/po/ru.po @@ -938,7 +938,7 @@ msgid "" "Please enter a value between %1!d! and %2!d!." msgstr "" "Это значение не лежит внутри диапазона страниц.\n" -"Введите значение между %1!%d! и %2!d!." +"Введите значение между %1!d! и %2!d!." #: comdlg32.rc:56 msgid "The 'from' entry cannot exceed the 'to' entry."

1 0

Nikolay Sivov : msxml3: Initial implementation of ::getPrefix().
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: a5b492eb392a5118ed482b6c16995ff7179e1fce URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5b492eb392a5118ed482b6c1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jan 23 07:45:44 2012 +0300 msxml3: Initial implementation of ::getPrefix(). --- dlls/msxml3/mxnamespace.c | 47 +++++++++++++- dlls/msxml3/tests/domdoc.c | 146 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 186 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index dbfbdc6..f21c758 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -1,7 +1,7 @@ /* * IMXNamespaceManager implementation * - * Copyright 2011 Nikolay Sivov for CodeWeavers + * Copyright 2011-2012 Nikolay Sivov for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -143,6 +143,22 @@ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, return S_OK; } +/* returned stored pointer, caller needs to copy it */ +static HRESULT get_declared_prefix_uri(const struct nscontext *ctxt, const WCHAR *uri, BSTR *prefix) +{ + int i; + + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].uri, uri)) + { + *prefix = ctxt->ns[i].prefix; + return S_OK; + } + + *prefix = NULL; + return E_FAIL; +} + static HRESULT get_uri_from_prefix(const struct nscontext *ctxt, const WCHAR *prefix, BSTR *uri) { int i; @@ -294,8 +310,33 @@ static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len) { namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - FIXME("(%p)->(%s %d %p %p): stub\n", This, debugstr_w(uri), index, prefix, prefix_len); - return E_NOTIMPL; + struct nscontext *ctxt; + HRESULT hr; + BSTR prfx; + + TRACE("(%p)->(%s %d %p %p)\n", This, debugstr_w(uri), index, prefix, prefix_len); + + if (!uri || !*uri || !prefix_len) return E_INVALIDARG; + + ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + + hr = get_declared_prefix_uri(ctxt, uri, &prfx); + if (hr == S_OK) + { + /* TODO: figure out what index argument is for */ + if (index) return E_FAIL; + + if (prefix) + { + if (*prefix_len < (INT)SysStringLen(prfx)) return E_XML_BUFFERTOOSMALL; + strcpyW(prefix, prfx); + } + + *prefix_len = SysStringLen(prfx); + TRACE("prefix=%s\n", debugstr_w(prfx)); + } + + return hr; } static HRESULT WINAPI namespacemanager_getURI(IMXNamespaceManager *iface, diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7c8bd9c..a00f24a 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10403,7 +10403,7 @@ static void test_domobj_dispex(IUnknown *obj) IDispatchEx_Release(dispex); } -static void test_nsnamespacemanager(void) +static void test_mxnamespacemanager(void) { static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace"; IVBMXNamespaceManager *mgr2; @@ -10521,10 +10521,148 @@ todo_wine { IMXNamespaceManager_Release(nsmgr); + /* ::getPrefix() */ + hr = CoCreateInstance(&CLSID_MXNamespaceManager40, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXNamespaceManager, (void**)&nsmgr); + EXPECT_HR(hr, S_OK); + + hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + len = -1; + hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(len == -1, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 0, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 0; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 0, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 0, "got %d\n", len); + + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns1"), _bstr_("ns1 uri")); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("xml")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + /* with null buffer it's possible to get required length */ + len = 100; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, NULL, &len); + EXPECT_HR(hr, S_OK); + ok(len == 3, "got %d\n", len); + + len = 0; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("http://www.w3.org/XML/1998/namespace"), 0, NULL, &len); + EXPECT_HR(hr, S_OK); + ok(len == 3, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 1, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 2, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 0, buffW, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, NULL, 0, buffW, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns0 uri"), 1, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + /* declare another one, indices are shifted */ + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns2"), _bstr_("ns2 uri")); + EXPECT_HR(hr, S_OK); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns1 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns1")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 0, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns2")), "got %s\n", wine_dbgstr_w(buffW)); + ok(len == 3, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_("ns2 uri"), 1, buffW, &len); + EXPECT_HR(hr, E_FAIL); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getPrefix(nsmgr, _bstr_(""), 1, buffW, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + ok(len == 100, "got %d\n", len); + + IMXNamespaceManager_Release(nsmgr); + free_bstrs(); } -static void test_nsnamespacemanager_override(void) +static void test_mxnamespacemanager_override(void) { IMXNamespaceManager *nsmgr; WCHAR buffW[250]; @@ -11478,8 +11616,8 @@ START_TEST(domdoc) &IID_IMXNamespaceManager, (void**)&unk); if (hr == S_OK) { - test_nsnamespacemanager(); - test_nsnamespacemanager_override(); + test_mxnamespacemanager(); + test_mxnamespacemanager_override(); IUnknown_Release(unk); }

1 0

Christian Costa : d3dxof: Prevent accessing pobj when it is null. This can happend on error.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 0eb9740e79ffd6908ced0bc2ff4203de3aaf448d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eb9740e79ffd6908ced0bc2f… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 17:58:56 2012 +0100 d3dxof: Prevent accessing pobj when it is null. This can happend on error. --- dlls/d3dxof/d3dxof.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index ab13f17..3a6ce20 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -522,8 +522,11 @@ static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) if (!This->level && !This->from_ref) { HeapFree(GetProcessHeap(), 0, This->pstrings); - HeapFree(GetProcessHeap(), 0, This->pobj->pdata); - HeapFree(GetProcessHeap(), 0, This->pobj); + if (This->pobj) + { + HeapFree(GetProcessHeap(), 0, This->pobj->pdata); + HeapFree(GetProcessHeap(), 0, This->pobj); + } } HeapFree(GetProcessHeap(), 0, This); }

1 0

Christian Costa : d3dxof: Make sure This->buf. pdata is set to NULL before being used in case of error.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 310c174eee2170395e2e3c21347d1525ae14c0bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=310c174eee2170395e2e3c213… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Jan 22 17:44:01 2012 +0100 d3dxof: Make sure This->buf.pdata is set to NULL before being used in case of error. --- dlls/d3dxof/d3dxof.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 8678396..ab13f17 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -963,6 +963,9 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE This->buf.pxo_globals = This->xobjects; This->buf.nb_pxo_globals = This->nb_xobjects; This->buf.level = 0; + This->buf.pdata = NULL; + This->buf.capacity = 0; + This->buf.cur_pos_data = 0; This->buf.pxo_tab = HeapAlloc(GetProcessHeap(), 0, sizeof(xobject)*MAX_SUBOBJECTS); if (!This->buf.pxo_tab) @@ -973,9 +976,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE } This->buf.pxo = This->xobjects[This->nb_xobjects] = This->buf.pxo_tab; - This->buf.pxo->pdata = This->buf.pdata = NULL; - This->buf.capacity = 0; - This->buf.cur_pos_data = 0; + This->buf.pxo->pdata = NULL; This->buf.pxo->nb_subobjects = 1; pstrings = HeapAlloc(GetProcessHeap(), 0, MAX_STRINGS_BUFFER);

1 0

Francois Gouget : po: Fix a formatting directive in the Danish translation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: 0c36034f85e053733f33adbde6a0d9770386e8ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c36034f85e053733f33adbde… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jan 23 00:39:56 2012 +0100 po: Fix a formatting directive in the Danish translation. --- po/da.po | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/da.po b/po/da.po index 2540dcf..b7e351c 100644 --- a/po/da.po +++ b/po/da.po @@ -77,7 +77,7 @@ msgstr "OK" #: appwiz.rc:76 msgid "The following information can be used to get technical support for %s:" -msgstr "Følgende oplysninger kan bruges til at få teknisk support for% s:" +msgstr "Følgende oplysninger kan bruges til at få teknisk support for %s:" #: appwiz.rc:77 msgid "Publisher:"

1 0

Andrej Znidarsic : po: Update Slovenian translation.
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: f4630cd56be398b2bc99a126b089e81b9760f9cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4630cd56be398b2bc99a126b… Author: Andrej Znidarsic <andrej.znidarsic(a)gmail.com> Date: Sun Jan 22 21:17:57 2012 +0100 po: Update Slovenian translation. --- po/sl.po | 1494 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 667 insertions(+), 827 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4630cd56be398b2bc99a…

1 0

Hans Leidekker : msi: Don' t evaluate msidbFeatureAttributesFollowParent when features are preselected .
by Alexandre Julliard Jan. 23, 2012

Jan. 23, 2012

Module: wine Branch: master Commit: fcce720a2f776bf0891b24687103c517d23d6905 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcce720a2f776bf0891b24687… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 23 09:47:00 2012 +0100 msi: Don't evaluate msidbFeatureAttributesFollowParent when features are preselected. --- dlls/msi/action.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 16ac4f0..59e7b6d 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1821,21 +1821,6 @@ UINT MSI_SetFeatureStates(MSIPACKAGE *package) } } } - LIST_FOR_EACH_ENTRY( feature, &package->features, MSIFEATURE, entry ) - { - FeatureList *fl; - - if (!is_feature_selected( feature, level )) continue; - - LIST_FOR_EACH_ENTRY( fl, &feature->Children, FeatureList, entry ) - { - if (fl->feature->Attributes & msidbFeatureAttributesFollowParent) - { - fl->feature->Action = feature->Action; - fl->feature->ActionRequest = feature->ActionRequest; - } - } - } } /* now we want to set component state based based on feature state */

1 0