winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
May 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
715 discussions
Start a n
N
ew thread
Hans Leidekker : setupapi: Don' t require a valid version section for INF_STYLE_OLDNT files.
by Alexandre Julliard
21 May '07
21 May '07
Module: wine Branch: master Commit: 3cfb018ea62e50fb5afb382decc029dfe0207da6 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3cfb018ea62e50fb5afb382de…
Author: Hans Leidekker <hans(a)it.vu.nl> Date: Fri May 18 20:24:18 2007 +0200 setupapi: Don't require a valid version section for INF_STYLE_OLDNT files. --- dlls/setupapi/parser.c | 6 +++--- dlls/setupapi/tests/query.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 4 deletions(-) diff --git a/dlls/setupapi/parser.c b/dlls/setupapi/parser.c index f77b1a1..6ddc1f2 100644 --- a/dlls/setupapi/parser.c +++ b/dlls/setupapi/parser.c @@ -925,7 +925,7 @@ static void append_inf_file( struct inf_file *parent, struct inf_file *child ) * * parse an INF file. */ -static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *error_line ) +static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, DWORD style, UINT *error_line ) { void *buffer; DWORD err = 0; @@ -1002,7 +1002,7 @@ static struct inf_file *parse_file( HANDLE handle, const WCHAR *class, UINT *err } } if (error_line) *error_line = 0; - err = ERROR_WRONG_INF_STYLE; + if (style & INF_STYLE_WIN4) err = ERROR_WRONG_INF_STYLE; } done: @@ -1145,7 +1145,7 @@ HINF WINAPI SetupOpenInfFileW( PCWSTR name, PCWSTR class, DWORD style, UINT *err if (handle != INVALID_HANDLE_VALUE) { - file = parse_file( handle, class, error ); + file = parse_file( handle, class, style, error ); CloseHandle( handle ); } if (!file) diff --git a/dlls/setupapi/tests/query.c b/dlls/setupapi/tests/query.c index 50d341b..39c91c7 100644 --- a/dlls/setupapi/tests/query.c +++ b/dlls/setupapi/tests/query.c @@ -101,6 +101,27 @@ static void create_inf_file(LPSTR filename) CloseHandle(hf); } +static void create_inf_file2(LPSTR filename) +{ + char data[1024]; + char *ptr = data; + DWORD dwNumberOfBytesWritten; + HANDLE hf = CreateFile(filename, GENERIC_WRITE, 0, NULL, + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); + + append_str(&ptr, "[SourceFileInfo]\n"); + append_str(&ptr, "sp1qfe\\bitsinst.exe=250B3702C7CCD7C2F9E4DAA1555C933E,000600060A28062C,27136,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\bitsprx2.dll=4EBEA67F4BB4EB402E725CA7CA2857AE,000600060A280621,7680,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\bitsprx3.dll=C788A1D9330DA011EF25E95D3BC7BDE5,000600060A280621,7168,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\qmgr.dll=696AC82FB290A03F205901442E0E9589,000600060A280621,361984,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\qmgrprxy.dll=8B5848144829E1BC985EA4C3D8CA7E3F,000600060A280621,17408,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\winhttp.dll=3EC6F518114606CA59D4160322077437,000500010A280615,331776,SP1QFE\n"); + append_str(&ptr, "sp1qfe\\xpob2res.dll=DB83156B9F496F20D1EA70E4ABEC0166,000500010A280622,158720,SP1QFE\n"); + + WriteFile(hf, data, ptr - data, &dwNumberOfBytesWritten, NULL); + CloseHandle(hf); +} + static BOOL check_info_filename(PSP_INF_INFORMATION info, LPSTR test) { LPSTR filename; @@ -271,7 +292,7 @@ static void test_SetupGetSourceFileLocation(void) { char buffer[MAX_PATH] = "not empty", inf_filename[MAX_PATH]; UINT source_id; - DWORD required; + DWORD required, error; HINF hinf; BOOL ret; @@ -296,6 +317,23 @@ static void test_SetupGetSourceFileLocation(void) pSetupCloseInfFile(hinf); DeleteFileA(inf_filename); + + create_inf_file2(inf_filename); + + SetLastError(0xdeadbeef); + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_WIN4, NULL); + error = GetLastError(); + ok(hinf == INVALID_HANDLE_VALUE, "could open inf file\n"); + ok(error == ERROR_WRONG_INF_STYLE, "got wrong error: %d\n", error); + + hinf = pSetupOpenInfFileA(inf_filename, NULL, INF_STYLE_OLDNT, NULL); + ok(hinf != INVALID_HANDLE_VALUE, "could not open inf file\n"); + + ret = pSetupGetSourceFileLocationA(hinf, NULL, "", &source_id, buffer, sizeof(buffer), &required); + ok(!ret, "SetupGetSourceFileLocation succeeded\n"); + + pSetupCloseInfFile(hinf); + DeleteFileA(inf_filename); } static void test_SetupGetSourceInfo(void)
1
0
0
0
Michael Karcher : user32: Reduce the PeekMessage timeout to zero for USER16_AlertableWait.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 5058fabf1e01b29e3113d31097f0e60596a4a7d9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5058fabf1e01b29e3113d3109…
Author: Michael Karcher <karcher(a)physik.fu-berlin.de> Date: Fri May 18 00:01:05 2007 +0200 user32: Reduce the PeekMessage timeout to zero for USER16_AlertableWait. --- dlls/user32/msg16.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index 3193a60..421f338 100644 --- a/dlls/user32/msg16.c +++ b/dlls/user32/msg16.c @@ -164,7 +164,7 @@ BOOL16 WINAPI PeekMessage32_16( MSG32_16 *msg16, HWND16 hwnd16, HWND hwnd = WIN_Handle32( hwnd16 ); if(USER16_AlertableWait) - MsgWaitForMultipleObjectsEx( 0, NULL, 1, 0, MWMO_ALERTABLE ); + MsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, MWMO_ALERTABLE ); if (!PeekMessageA( &msg, hwnd, first, last, flags )) return FALSE; msg16->msg.time = msg.time;
1
0
0
0
Misha Koshelev : msi: automation: Implement StringList::_NewEnum.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 01460f6753476c4d5b66d3b2a56a25907b19b0c8 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=01460f6753476c4d5b66d3b2a…
Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 18 11:23:19 2007 -0500 msi: automation: Implement StringList::_NewEnum. --- dlls/msi/automation.c | 203 +++++++++++++++++++++++++++++++++++++++++- dlls/msi/msiserver.idl | 2 + dlls/msi/msiserver_dispids.h | 1 + dlls/msi/tests/automation.c | 13 +-- 4 files changed, 210 insertions(+), 9 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index 98ec166..63fea99 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -80,6 +80,24 @@ interface AutomationObject { }; /* + * ListEnumerator - IEnumVARIANT implementation for MSI automation lists. + */ + +typedef interface ListEnumerator ListEnumerator; + +interface ListEnumerator { + /* VTables */ + const IEnumVARIANTVtbl *lpVtbl; + + /* Object reference count */ + LONG ref; + + /* Current position and pointer to AutomationObject that stores actual data */ + ULONG ulPos; + AutomationObject *pObj; +}; + +/* * Structures for additional data required by specific automation objects */ @@ -96,6 +114,7 @@ typedef struct { /* VTables */ static const struct IDispatchVtbl AutomationObject_Vtbl; static const struct IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClassInfo_Vtbl; +static const struct IEnumVARIANTVtbl ListEnumerator_Vtbl; /* Load type info so we don't have to process GetIDsOfNames */ HRESULT load_type_info(IDispatch *iface, ITypeInfo **pptinfo, REFIID clsid, LCID lcid) @@ -170,6 +189,31 @@ HRESULT create_automation_object(MSIHANDLE msiHandle, IUnknown *pUnkOuter, LPVOI return S_OK; } +/* Create a list enumerator, placing the result in the pointer ppObj. */ +HRESULT create_list_enumerator(IUnknown *pUnkOuter, LPVOID *ppObj, AutomationObject *pObj, ULONG ulPos) +{ + ListEnumerator *object; + + TRACE("(%p,%p,%p,%uld)\n", pUnkOuter, ppObj, pObj, ulPos); + + if( pUnkOuter ) + return CLASS_E_NOAGGREGATION; + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ListEnumerator)); + + /* Set all the VTable references */ + object->lpVtbl = &ListEnumerator_Vtbl; + object->ref = 1; + + /* Store data that was passed */ + object->ulPos = ulPos; + object->pObj = pObj; + if (pObj) IDispatch_AddRef((IDispatch *)pObj); + + *ppObj = object; + return S_OK; +} + /* Macros to get pointer to AutomationObject from the other VTables. */ static inline AutomationObject *obj_from_IProvideMultipleClassInfo( IProvideMultipleClassInfo *iface ) { @@ -512,6 +556,148 @@ static const IProvideMultipleClassInfoVtbl AutomationObject_IProvideMultipleClas }; /* + * ListEnumerator methods + */ + +/*** IUnknown methods ***/ +static HRESULT WINAPI ListEnumerator_QueryInterface(IEnumVARIANT* iface, REFIID riid, void** ppvObject) +{ + ListEnumerator *This = (ListEnumerator *)iface; + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); + + if (ppvObject == NULL) + return E_INVALIDARG; + + *ppvObject = 0; + + if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumVARIANT)) + *ppvObject = This; + else + { + TRACE("() : asking for unsupported interface %s\n",debugstr_guid(riid)); + return E_NOINTERFACE; + } + + IClassFactory_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI ListEnumerator_AddRef(IEnumVARIANT* iface) +{ + ListEnumerator *This = (ListEnumerator *)iface; + + TRACE("(%p/%p)\n", iface, This); + + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI ListEnumerator_Release(IEnumVARIANT* iface) +{ + ListEnumerator *This = (ListEnumerator *)iface; + ULONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p/%p)\n", iface, This); + + if (!ref) + { + if (This->pObj) IDispatch_Release((IDispatch *)This->pObj); + HeapFree(GetProcessHeap(), 0, This); + } + + return ref; +} + +/* IEnumVARIANT methods */ + +static HRESULT WINAPI ListEnumerator_Next(IEnumVARIANT* iface, ULONG celt, VARIANT *rgVar, ULONG *pCeltFetched) +{ + ListEnumerator *This = (ListEnumerator *)iface; + ListData *data = (ListData *)private_data(This->pObj); + ULONG idx, local; + + TRACE("(%p,%uld,%p,%p)\n", iface, celt, rgVar, pCeltFetched); + + if (pCeltFetched != NULL) + *pCeltFetched = 0; + + if (rgVar == NULL) + return S_FALSE; + + for (local = 0; local < celt; local++) + VariantInit(&rgVar[local]); + + for (idx = This->ulPos, local = 0; idx < data->ulCount && local < celt; idx++, local++) + VariantCopy(&rgVar[local], &data->pVars[idx]); + + if (pCeltFetched != NULL) + *pCeltFetched = local; + This->ulPos = idx; + + return (local < celt) ? S_FALSE : S_OK; +} + +static HRESULT WINAPI ListEnumerator_Skip(IEnumVARIANT* iface, ULONG celt) +{ + ListEnumerator *This = (ListEnumerator *)iface; + ListData *data = (ListData *)private_data(This->pObj); + + TRACE("(%p,%uld)\n", iface, celt); + + This->ulPos += celt; + if (This->ulPos >= data->ulCount) + { + This->ulPos = data->ulCount; + return S_FALSE; + } + return S_OK; +} + +static HRESULT WINAPI ListEnumerator_Reset(IEnumVARIANT* iface) +{ + ListEnumerator *This = (ListEnumerator *)iface; + + TRACE("(%p)\n", iface); + + This->ulPos = 0; + return S_OK; +} + +static HRESULT WINAPI ListEnumerator_Clone(IEnumVARIANT* iface, IEnumVARIANT **ppEnum) +{ + ListEnumerator *This = (ListEnumerator *)iface; + HRESULT hr; + + TRACE("(%p,%p)\n", iface, ppEnum); + + if (ppEnum == NULL) + return S_FALSE; + + *ppEnum = NULL; + hr = create_list_enumerator(NULL, (LPVOID *)ppEnum, This->pObj, 0); + if (FAILED(hr)) + { + if (*ppEnum) + IUnknown_Release(*ppEnum); + return hr; + } + + IUnknown_AddRef(*ppEnum); + return S_OK; +} + +static const struct IEnumVARIANTVtbl ListEnumerator_Vtbl = +{ + ListEnumerator_QueryInterface, + ListEnumerator_AddRef, + ListEnumerator_Release, + ListEnumerator_Next, + ListEnumerator_Skip, + ListEnumerator_Reset, + ListEnumerator_Clone +}; + +/* * Individual Object Invocation Functions */ @@ -649,13 +835,28 @@ static HRESULT WINAPI ListImpl_Invoke( ListData *data = (ListData *)private_data(This); HRESULT hr; VARIANTARG varg0; + IUnknown *pUnk = NULL; VariantInit(&varg0); switch (dispIdMember) { + case DISPID_LIST__NEWENUM: + if (wFlags & DISPATCH_METHOD) { + V_VT(pVarResult) = VT_UNKNOWN; + if (SUCCEEDED(hr = create_list_enumerator(NULL, (LPVOID *)&pUnk, This, 0))) + { + IUnknown_AddRef(pUnk); + V_UNKNOWN(pVarResult) = pUnk; + } + else + ERR("Failed to create IEnumVARIANT object, hresult 0x%08x\n", hr); + } + else return DISP_E_MEMBERNOTFOUND; + break; + case DISPID_LIST_ITEM: - if (wFlags & DISPATCH_PROPERTYGET) { + if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; if (V_I4(&varg0) < 0 || V_I4(&varg0) >= data->ulCount) diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 485334c..360e4f1 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -114,6 +114,8 @@ library WindowsInstaller { properties: methods: + [id(DISPID_LIST__NEWENUM)] + IUnknown _NewEnum(); [id(DISPID_LIST_ITEM), propget] BSTR Item(long Index); [id(DISPID_LIST_COUNT), propget] diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 5ef21c8..694090e 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -29,6 +29,7 @@ #define DISPID_RECORD_STRINGDATA 1 #define DISPID_RECORD_INTEGERDATA 2 +#define DISPID_LIST__NEWENUM -4 #define DISPID_LIST_ITEM 0 #define DISPID_LIST_COUNT 1 diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 82fe05e..9bd7d03 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1910,15 +1910,12 @@ static void test_Installer(void) ULONG celt; /* StringList::_NewEnum */ - todo_wine + hr = StringList__NewEnum(pStringList, &pUnk); + ok(hr == S_OK, "StringList_NewEnum failed, hresult 0x%08x\n", hr); + if (hr == S_OK) { - hr = StringList__NewEnum(pStringList, &pUnk); - ok(hr == S_OK, "StringList_NewEnum failed, hresult 0x%08x\n", hr); - if (hr == S_OK) - { - hr = IUnknown_QueryInterface(pUnk, &IID_IEnumVARIANT, (void **)&pEnum); - ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr); - } + hr = IUnknown_QueryInterface(pUnk, &IID_IEnumVARIANT, (void **)&pEnum); + ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr); } if (!pEnum) skip("IEnumVARIANT tests\n");
1
0
0
0
Misha Koshelev : msi: automation: Generalize list implementation.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 4ccdbc5845379337607962d359eda7c62882a575 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4ccdbc5845379337607962d35…
Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 18 11:23:01 2007 -0500 msi: automation: Generalize list implementation. Same structures and functions can be used for both StringList and RecordList. --- dlls/msi/automation.c | 69 ++++++++++++++++++++++-------------------- dlls/msi/msiserver.idl | 4 +- dlls/msi/msiserver_dispids.h | 4 +- 3 files changed, 40 insertions(+), 37 deletions(-) diff --git a/dlls/msi/automation.c b/dlls/msi/automation.c index f7183de..98ec166 100644 --- a/dlls/msi/automation.c +++ b/dlls/msi/automation.c @@ -84,9 +84,9 @@ interface AutomationObject { */ typedef struct { - int iCount; - LPWSTR *pszStrings; -} StringListData; + ULONG ulCount; + VARIANT *pVars; +} ListData; typedef struct { /* The parent Installer object */ @@ -635,7 +635,7 @@ static HRESULT WINAPI RecordImpl_Invoke( return S_OK; } -static HRESULT WINAPI StringListImpl_Invoke( +static HRESULT WINAPI ListImpl_Invoke( AutomationObject* This, DISPID dispIdMember, REFIID riid, @@ -646,7 +646,7 @@ static HRESULT WINAPI StringListImpl_Invoke( EXCEPINFO* pExcepInfo, UINT* puArgErr) { - StringListData *data = (StringListData *)private_data(This); + ListData *data = (ListData *)private_data(This); HRESULT hr; VARIANTARG varg0; @@ -654,22 +654,21 @@ static HRESULT WINAPI StringListImpl_Invoke( switch (dispIdMember) { - case DISPID_STRINGLIST_ITEM: + case DISPID_LIST_ITEM: if (wFlags & DISPATCH_PROPERTYGET) { hr = DispGetParam(pDispParams, 0, VT_I4, &varg0, puArgErr); if (FAILED(hr)) return hr; - if (V_I4(&varg0) < 0 || V_I4(&varg0) >= data->iCount) + if (V_I4(&varg0) < 0 || V_I4(&varg0) >= data->ulCount) return DISP_E_BADINDEX; - V_VT(pVarResult) = VT_BSTR; - V_BSTR(pVarResult) = SysAllocString(data->pszStrings[V_I4(&varg0)]); + VariantCopy(pVarResult, &data->pVars[V_I4(&varg0)]); } else return DISP_E_MEMBERNOTFOUND; break; - case DISPID_STRINGLIST_COUNT: + case DISPID_LIST_COUNT: if (wFlags & DISPATCH_PROPERTYGET) { V_VT(pVarResult) = VT_I4; - V_I4(pVarResult) = data->iCount; + V_I4(pVarResult) = data->ulCount; } else return DISP_E_MEMBERNOTFOUND; break; @@ -683,14 +682,14 @@ static HRESULT WINAPI StringListImpl_Invoke( return S_OK; } -static void WINAPI StringListImpl_Free(AutomationObject *This) +static void WINAPI ListImpl_Free(AutomationObject *This) { - StringListData *data = private_data(This); - int idx; + ListData *data = private_data(This); + ULONG idx; - for (idx=0; idx<data->iCount; idx++) - SysFreeString(data->pszStrings[idx]); - HeapFree(GetProcessHeap(), 0, data->pszStrings); + for (idx=0; idx<data->ulCount; idx++) + VariantClear(&data->pVars[idx]); + HeapFree(GetProcessHeap(), 0, data->pVars); } static HRESULT WINAPI ViewImpl_Invoke( @@ -1388,8 +1387,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( case DISPID_INSTALLER_PRODUCTS: if (wFlags & DISPATCH_PROPERTYGET) { - StringListData *sldata = NULL; - int idx = 0; + ListData *ldata = NULL; + ULONG idx = 0; WCHAR szProductBuf[GUID_SIZE]; /* Find number of products */ @@ -1401,22 +1400,24 @@ static HRESULT WINAPI InstallerImpl_Invoke( } V_VT(pVarResult) = VT_DISPATCH; - if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, StringListImpl_Invoke, StringListImpl_Free, sizeof(StringListData)))) + if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ - sldata = (StringListData *)private_data((AutomationObject *)pDispatch); - if (!(sldata->pszStrings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPWSTR)*sldata->iCount))) + ldata = (ListData *)private_data((AutomationObject *)pDispatch); + if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) ERR("Out of memory\n"); else { - sldata->iCount = idx; - for (idx = 0; idx < sldata->iCount; idx++) + ldata->ulCount = idx; + for (idx = 0; idx < ldata->ulCount; idx++) { ret = MsiEnumProductsW(idx, szProductBuf); - sldata->pszStrings[idx] = SysAllocString(szProductBuf); + VariantInit(&ldata->pVars[idx]); + V_VT(&ldata->pVars[idx]) = VT_BSTR; + V_BSTR(&ldata->pVars[idx]) = SysAllocString(szProductBuf); } } } @@ -1429,8 +1430,8 @@ static HRESULT WINAPI InstallerImpl_Invoke( case DISPID_INSTALLER_RELATEDPRODUCTS: if (wFlags & DISPATCH_PROPERTYGET) { - StringListData *sldata = NULL; - int idx = 0; + ListData *ldata = NULL; + ULONG idx = 0; WCHAR szProductBuf[GUID_SIZE]; hr = DispGetParam(pDispParams, 0, VT_BSTR, &varg0, puArgErr); @@ -1446,22 +1447,24 @@ static HRESULT WINAPI InstallerImpl_Invoke( } V_VT(pVarResult) = VT_DISPATCH; - if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, StringListImpl_Invoke, StringListImpl_Free, sizeof(StringListData)))) + if (SUCCEEDED(hr = create_automation_object(0, NULL, (LPVOID*)&pDispatch, &DIID_StringList, ListImpl_Invoke, ListImpl_Free, sizeof(ListData)))) { IDispatch_AddRef(pDispatch); V_DISPATCH(pVarResult) = pDispatch; /* Save product strings */ - sldata = (StringListData *)private_data((AutomationObject *)pDispatch); - if (!(sldata->pszStrings = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(LPWSTR)*sldata->iCount))) + ldata = (ListData *)private_data((AutomationObject *)pDispatch); + if (!(ldata->pVars = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VARIANT)*idx))) ERR("Out of memory\n"); else { - sldata->iCount = idx; - for (idx = 0; idx < sldata->iCount; idx++) + ldata->ulCount = idx; + for (idx = 0; idx < ldata->ulCount; idx++) { ret = MsiEnumRelatedProductsW(V_BSTR(&varg0), 0, idx, szProductBuf); - sldata->pszStrings[idx] = SysAllocString(szProductBuf); + VariantInit(&ldata->pVars[idx]); + V_VT(&ldata->pVars[idx]) = VT_BSTR; + V_BSTR(&ldata->pVars[idx]) = SysAllocString(szProductBuf); } } } diff --git a/dlls/msi/msiserver.idl b/dlls/msi/msiserver.idl index 33b6bf8..485334c 100644 --- a/dlls/msi/msiserver.idl +++ b/dlls/msi/msiserver.idl @@ -114,9 +114,9 @@ library WindowsInstaller { properties: methods: - [id(DISPID_STRINGLIST_ITEM), propget] + [id(DISPID_LIST_ITEM), propget] BSTR Item(long Index); - [id(DISPID_STRINGLIST_COUNT), propget] + [id(DISPID_LIST_COUNT), propget] long Count(); } diff --git a/dlls/msi/msiserver_dispids.h b/dlls/msi/msiserver_dispids.h index 065b874..5ef21c8 100644 --- a/dlls/msi/msiserver_dispids.h +++ b/dlls/msi/msiserver_dispids.h @@ -29,8 +29,8 @@ #define DISPID_RECORD_STRINGDATA 1 #define DISPID_RECORD_INTEGERDATA 2 -#define DISPID_STRINGLIST_ITEM 0 -#define DISPID_STRINGLIST_COUNT 1 +#define DISPID_LIST_ITEM 0 +#define DISPID_LIST_COUNT 1 #define DISPID_VIEW_EXECUTE 1 #define DISPID_VIEW_FETCH 2
1
0
0
0
Misha Koshelev : msi/tests: automation: Add tests for StringList::_NewEnum.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 2521111bc7039c70e8eb2be37399a3eaa876e2b7 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=2521111bc7039c70e8eb2be37…
Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 18 11:22:36 2007 -0500 msi/tests: automation: Add tests for StringList::_NewEnum. --- dlls/msi/tests/automation.c | 111 ++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 39bd272..82fe05e 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1157,6 +1157,15 @@ static HRESULT Record_IntegerDataPut(IDispatch *pRecord, int iField, int iValue) return invoke(pRecord, "IntegerData", DISPATCH_PROPERTYPUT, &dispparams, &varresult, VT_EMPTY); } +static HRESULT StringList__NewEnum(IDispatch *pList, IUnknown **ppEnumVARIANT) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr = invoke(pList, "_NewEnum", DISPATCH_METHOD, &dispparams, &varresult, VT_UNKNOWN); + *ppEnumVARIANT = V_UNKNOWN(&varresult); + return hr; +} + static HRESULT StringList_Item(IDispatch *pStringList, int iIndex, LPWSTR szString) { VARIANT varresult; @@ -1895,6 +1904,24 @@ static void test_Installer(void) if (hr == S_OK) { int idx; + IUnknown *pUnk = NULL; + IEnumVARIANT *pEnum = NULL; + VARIANT var; + ULONG celt; + + /* StringList::_NewEnum */ + todo_wine + { + hr = StringList__NewEnum(pStringList, &pUnk); + ok(hr == S_OK, "StringList_NewEnum failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + hr = IUnknown_QueryInterface(pUnk, &IID_IEnumVARIANT, (void **)&pEnum); + ok (hr == S_OK, "IUnknown::QueryInterface returned 0x%08x\n", hr); + } + } + if (!pEnum) + skip("IEnumVARIANT tests\n"); /* StringList::Count */ hr = StringList_Count(pStringList, &iCount); @@ -1907,14 +1934,94 @@ static void test_Installer(void) hr = StringList_Item(pStringList, idx, szPath); ok(hr == S_OK, "StringList_Item failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + /* Installer::ProductState */ if (hr == S_OK) { - /* Installer::ProductState */ hr = Installer_ProductState(szPath, &iValue); ok(hr == S_OK, "Installer_ProductState failed, hresult 0x%08x\n", hr); if (hr == S_OK) ok(iValue == INSTALLSTATE_DEFAULT || iValue == INSTALLSTATE_ADVERTISED, "Installer_ProductState returned %d, expected %d or %d\n", iValue, INSTALLSTATE_DEFAULT, INSTALLSTATE_ADVERTISED); } + + /* IEnumVARIANT::Next */ + if (pEnum) + { + hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt); + ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + ok(celt == 1, "%d items were retrieved, expected 1\n", celt); + ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); + ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szPath, V_BSTR(&var)); + VariantClear(&var); + } + } + + if (pEnum) + { + IEnumVARIANT *pEnum2 = NULL; + + if (0) /* Crashes on Windows XP */ + { + /* IEnumVARIANT::Clone, NULL pointer */ + hr = IEnumVARIANT_Clone(pEnum, NULL); + } + + /* IEnumVARIANT::Clone */ + hr = IEnumVARIANT_Clone(pEnum, &pEnum2); + ok(hr == S_OK, "IEnumVARIANT_Clone failed, hresult 0x%08x\n", hr); + if (hr == S_OK) + { + /* IEnumVARIANT::Clone is supposed to save the position, but it actually just goes back to the beginning */ + + /* IEnumVARIANT::Next of the clone */ + if (iCount) + { + hr = IEnumVARIANT_Next(pEnum2, 1, &var, &celt); + ok(hr == S_OK, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); + ok(celt == 1, "%d items were retrieved, expected 0\n", celt); + ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); + VariantClear(&var); + } + else + skip("IEnumVARIANT::Next of clone will not return success with 0 products\n"); + + IEnumVARIANT_Release(pEnum2); + } + + /* IEnumVARIANT::Skip should fail */ + hr = IEnumVARIANT_Skip(pEnum, 1); + ok(hr == S_FALSE, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr); + + /* IEnumVARIANT::Next, NULL variant pointer */ + hr = IEnumVARIANT_Next(pEnum, 1, NULL, &celt); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); + ok(celt == 0, "%d items were retrieved, expected 0\n", celt); + + /* IEnumVARIANT::Next, should not return any more items */ + hr = IEnumVARIANT_Next(pEnum, 1, &var, &celt); + ok(hr == S_FALSE, "IEnumVARIANT_Next failed, hresult 0x%08x\n", hr); + ok(celt == 0, "%d items were retrieved, expected 0\n", celt); + VariantClear(&var); + + /* IEnumVARIANT::Reset */ + hr = IEnumVARIANT_Reset(pEnum); + ok(hr == S_OK, "IEnumVARIANT_Reset failed, hresult 0x%08x\n", hr); + + if (iCount) + { + /* IEnumVARIANT::Skip to the last product */ + hr = IEnumVARIANT_Skip(pEnum, iCount-1); + ok(hr == S_OK, "IEnumVARIANT_Skip failed, hresult 0x%08x\n", hr); + + /* IEnumVARIANT::Next should match the very last retrieved value, also makes sure it works with + * NULL celt pointer. */ + hr = IEnumVARIANT_Next(pEnum, 1, &var, NULL); + ok(hr == S_OK, "IEnumVARIANT_Next failed (idx %d, count %d), hresult 0x%08x\n", idx, iCount, hr); + ok(V_VT(&var) == VT_BSTR, "IEnumVARIANT_Next returned variant of type %d, expected %d\n", V_VT(&var), VT_BSTR); + ok_w2("%s returned by StringList_Item does not match %s returned by IEnumVARIANT_Next\n", szPath, V_BSTR(&var)); + VariantClear(&var); + } + else + skip("IEnumVARIANT::Skip impossible for 0 products\n"); } /* StringList::Item using an invalid index */ @@ -1922,6 +2029,8 @@ static void test_Installer(void) hr = StringList_Item(pStringList, iCount, szPath); ok(hr == DISP_E_BADINDEX, "StringList_Item for an invalid index did not return DISP_E_BADINDEX, hresult 0x%08x\n", hr); + if (pEnum) IEnumVARIANT_Release(pEnum); + if (pUnk) IUnknown_Release(pUnk); IDispatch_Release(pStringList); }
1
0
0
0
Misha Koshelev : msi/tests: automation: Fix Installer_ProductInfo ok message to correctly state function.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 5ee995d90ab1bbc83f1f50aa86c07248d593913b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5ee995d90ab1bbc83f1f50aa8…
Author: Misha Koshelev <mk144210(a)bcm.edu> Date: Fri May 18 11:22:31 2007 -0500 msi/tests: automation: Fix Installer_ProductInfo ok message to correctly state function. --- dlls/msi/tests/automation.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index ffd0822..39bd272 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1703,13 +1703,13 @@ static void test_Installer_InstallProduct(LPCWSTR szPath) memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PACKAGENAMEW, szString); todo_wine ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - todo_wine ok_w2("StringList_Item returned %s but expected %s\n", szString, szMsifile); + todo_wine ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, szMsifile); /* Product name */ memset(szString, 0, sizeof(szString)); hr = Installer_ProductInfo(szProductCode, INSTALLPROPERTY_PRODUCTNAMEW, szString); ok(hr == S_OK, "Installer_ProductInfo failed, hresult 0x%08x\n", hr); - ok_w2("StringList_Item returned %s but expected %s\n", szString, szMSITEST); + ok_w2("Installer_ProductInfo returned %s but expected %s\n", szString, szMSITEST); /* Installer::RelatedProducts for our upgrade code */ hr = Installer_RelatedProducts(szUpgradeCode, &pStringList);
1
0
0
0
Mikołaj Zalewski : msxml3: Implement IXMLDOMElement:: getElementsByTagName.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 08fc650869d301235bd5c677570b50ec3ea9cee9 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=08fc650869d301235bd5c6775…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sat May 12 10:09:10 2007 +0200 msxml3: Implement IXMLDOMElement::getElementsByTagName. --- dlls/msxml3/element.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 7997b2f..e7f03d6 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -555,10 +555,24 @@ static HRESULT WINAPI domelem_removeAttributeNode( static HRESULT WINAPI domelem_getElementsByTagName( IXMLDOMElement *iface, - BSTR p, IXMLDOMNodeList** resultList) + BSTR bstrName, IXMLDOMNodeList** resultList) { - FIXME("\n"); - return E_NOTIMPL; + domelem *This = impl_from_IXMLDOMElement( iface ); + LPWSTR szPattern; + HRESULT hr; + + TRACE("(%p)->(%s,%p)\n", This, debugstr_w(bstrName), resultList); + + szPattern = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(3+lstrlenW(bstrName)+1)); + szPattern[0] = '.'; + szPattern[1] = szPattern[2] = '/'; + lstrcpyW(szPattern+3, bstrName); + TRACE("%s\n", debugstr_w(szPattern)); + + hr = queryresult_create(get_element(This), szPattern, resultList); + HeapFree(GetProcessHeap(), 0, szPattern); + + return hr; } static HRESULT WINAPI domelem_normalize(
1
0
0
0
Mikołaj Zalewski : msxml3: Add tests for XPath queries with namespaces.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: 37ea00731afccfadb1fd1a6ea1fd153bcb528f1b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=37ea00731afccfadb1fd1a6ea…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri May 11 17:05:32 2007 +0200 msxml3: Add tests for XPath queries with namespaces. --- dlls/msxml3/tests/domdoc.c | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index bc55a8e..9c51b48 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1460,6 +1460,7 @@ static void test_IXMLDOMDocument2(void) static void test_XPath() { HRESULT r; + VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; IXMLDOMNode *rootNode; @@ -1540,6 +1541,36 @@ static void test_XPath() ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//*[name()='foo:c']"), &list)); expect_list_and_release(list, "E3.E4.E2.D1"); + /* it has to be declared in SelectionNamespaces */ + todo_wine ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), + _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'"))); + + /* now the namespace can be used */ + todo_wine ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//test:c"), &list)); + todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); + todo_wine ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//test:c"), &list)); + todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); + todo_wine ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_("//test:c"), &list)); + todo_wine expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); + todo_wine ole_check(IXMLDOMNode_selectNodes(elem1Node, _bstr_(".//test:x"), &list)); + todo_wine expect_list_and_release(list, "E5.E1.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"), + _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###")), E_FAIL); + + ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + + todo_wine ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); + todo_wine expect_eq(V_VT(&var), VT_BSTR, int, "%x"); + if (V_VT(&var) == VT_BSTR) + expect_bstr_eq_and_free(V_BSTR(&var), "xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###"); + + /* extra attributes - same thing*/ + ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), + _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' param='test'")), E_FAIL); + ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + IXMLDOMNode_Release(rootNode); IXMLDOMNode_Release(elem1Node); IXMLDOMDocument_Release(doc);
1
0
0
0
Mikołaj Zalewski : msxml3: For queries the get_item should change the current position.
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: b5c1d274c52312ea8ebe7ad6a92df257de50e719 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b5c1d274c52312ea8ebe7ad6a…
Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri May 11 17:04:43 2007 +0200 msxml3: For queries the get_item should change the current position. --- dlls/msxml3/queryresult.c | 1 + dlls/msxml3/tests/domdoc.c | 27 ++++++++++++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/queryresult.c b/dlls/msxml3/queryresult.c index 4e9c409..85d7aca 100644 --- a/dlls/msxml3/queryresult.c +++ b/dlls/msxml3/queryresult.c @@ -220,6 +220,7 @@ static HRESULT WINAPI queryresult_get_item( return S_FALSE; *listItem = create_node(This->result->nodesetval->nodeTab[index]); + This->resultPos = index + 1; return S_OK; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 2d9ff5c..bc55a8e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -322,6 +322,8 @@ static char *list_to_string(IXMLDOMNodeList *list) *pos = 0; return buf; } + +#define expect_node(node, expstr) { char str[4096]; node_to_string(node, str); ok(strcmp(str, expstr)==0, "Invalid node: %s, exptected %s\n", str, expstr); } #define expect_list_and_release(list, expstr) { char *str = list_to_string(list); ok(strcmp(str, expstr)==0, "Invalid node list: %s, exptected %s\n", str, expstr); if (list) IXMLDOMNodeList_Release(list); } static void test_domdoc( void ) @@ -759,11 +761,25 @@ todo_wine if (map) IXMLDOMNamedNodeMap_Release( map ); - /* now traverse the tree from the root node */ + /* now traverse the tree from the root element */ if (element) { + IXMLDOMNode *node; r = IXMLDOMNode_get_childNodes( element, &list ); ok( r == S_OK, "get_childNodes returned wrong code\n"); + + /* using get_item for child list doesn't advance the position */ + ole_check(IXMLDOMNodeList_get_item(list, 1, &node)); + expect_node(node, "E2.E2.D1"); + IXMLDOMNode_Release(node); + ole_check(IXMLDOMNodeList_nextNode(list, &node)); + expect_node(node, "E1.E2.D1"); + IXMLDOMNode_Release(node); + ole_check(IXMLDOMNodeList_reset(list)); + + IXMLDOMNodeList_AddRef(list); + expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E3.E2.D1 E4.E2.D1"); + ole_check(IXMLDOMNodeList_reset(list)); } else ok( FALSE, "no element\n"); @@ -1448,6 +1464,7 @@ static void test_XPath() IXMLDOMDocument2 *doc; IXMLDOMNode *rootNode; IXMLDOMNode *elem1Node; + IXMLDOMNode *node; IXMLDOMNodeList *list; r = CoCreateInstance( &CLSID_DOMDocument, NULL, @@ -1476,6 +1493,14 @@ static void test_XPath() expect_list_and_release(list, "E3.E2.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem"), &list)); + /* using get_item for query results advances the position */ + ole_check(IXMLDOMNodeList_get_item(list, 1, &node)); + expect_node(node, "E2.E2.D1"); + IXMLDOMNode_Release(node); + ole_check(IXMLDOMNodeList_nextNode(list, &node)); + expect_node(node, "E4.E2.D1"); + IXMLDOMNode_Release(node); + ole_check(IXMLDOMNodeList_reset(list)); expect_list_and_release(list, "E1.E2.D1 E2.E2.D1 E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("."), &list));
1
0
0
0
Huw Davies : oleaut32: Recurse through the impltype list so that dispinterfaces get the correct parents .
by Alexandre Julliard
18 May '07
18 May '07
Module: wine Branch: master Commit: c1e89400aa5b4f0c871dee471b85f82365e0e1e3 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=c1e89400aa5b4f0c871dee471…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 18 14:35:24 2007 +0100 oleaut32: Recurse through the impltype list so that dispinterfaces get the correct parents. --- dlls/oleaut32/typelib.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index f3ee2bf..a1b28ec 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5827,11 +5827,10 @@ func_fail: /* not found, look for it in inherited interfaces */ ITypeInfo2_GetTypeKind(iface, &type_kind); if(type_kind == TKIND_INTERFACE || type_kind == TKIND_DISPATCH) { - HREFTYPE ref_type; - if(SUCCEEDED(ITypeInfo2_GetRefTypeOfImplType(iface, 0, &ref_type))) { + if(This->impltypelist) { /* recursive search */ ITypeInfo *pTInfo; - hres = ITypeInfo_GetRefTypeInfo(iface, ref_type, &pTInfo); + hres = ITypeInfo_GetRefTypeInfo(iface, This->impltypelist->hRef, &pTInfo); if(SUCCEEDED(hres)){ hres = ITypeInfo_Invoke(pTInfo,pIUnk,memid,wFlags,pDispParams,pVarResult,pExcepInfo,pArgErr); ITypeInfo_Release(pTInfo);
1
0
0
0
← Newer
1
...
25
26
27
28
29
30
31
...
72
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
Results per page:
10
25
50
100
200