August 2011 - Wine-Commits - list.winehq.org

Lucas Fialho Zawacki : dinput: Added ConfigureDevices A to W crosscall.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 89367ebec02ff58104cb2dcc5b8db8b6e2c5328b URL: http://source.winehq.org/git/wine.git/?a=commit;h=89367ebec02ff58104cb2dcc5… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Sun Aug 21 22:26:40 2011 -0300 dinput: Added ConfigureDevices A to W crosscall. --- dlls/dinput/dinput_main.c | 64 +++++++++++++++++++++++++++++++++++---------- 1 files changed, 50 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 6ddcd71..17ba595 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -999,28 +999,64 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( return DI_OK; } -static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices( - LPDIRECTINPUT8A iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, - LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData +static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices( + LPDIRECTINPUT8W iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, + LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData ) { - IDirectInputImpl *This = impl_from_IDirectInput8A( iface ); + IDirectInputImpl *This = impl_from_IDirectInput8W(iface); - FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, - dwFlags, pvRefData); - return 0; + FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, dwFlags, pvRefData); + + return DI_OK; } -static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices( - LPDIRECTINPUT8W iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, - LPDICONFIGUREDEVICESPARAMSW lpdiCDParams, DWORD dwFlags, LPVOID pvRefData +static HRESULT WINAPI IDirectInput8AImpl_ConfigureDevices( + LPDIRECTINPUT8A iface, LPDICONFIGUREDEVICESCALLBACK lpdiCallback, + LPDICONFIGUREDEVICESPARAMSA lpdiCDParams, DWORD dwFlags, LPVOID pvRefData ) { - IDirectInputImpl *This = impl_from_IDirectInput8W( iface ); + IDirectInputImpl *This = impl_from_IDirectInput8A(iface); + DIACTIONFORMATW diafW; + DICONFIGUREDEVICESPARAMSW diCDParamsW; + HRESULT hr; + int i; + + FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, dwFlags, pvRefData); + + /* Copy parameters */ + diCDParamsW.dwSize = sizeof(DICONFIGUREDEVICESPARAMSW); + diCDParamsW.dwcFormats = lpdiCDParams->dwcFormats; + diCDParamsW.lprgFormats = &diafW; + diCDParamsW.hwnd = lpdiCDParams->hwnd; + + diafW.rgoAction = HeapAlloc(GetProcessHeap(), 0, sizeof(DIACTIONW)*lpdiCDParams->lprgFormats->dwNumActions); + _copy_diactionformatAtoW(&diafW, lpdiCDParams->lprgFormats); + + /* Copy action names */ + for (i=0; i < diafW.dwNumActions; i++) + { + const char* from = lpdiCDParams->lprgFormats->rgoAction[i].u.lptszActionName; + int len = MultiByteToWideChar(CP_ACP, 0, from , -1, NULL , 0); + WCHAR *to = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); + + MultiByteToWideChar(CP_ACP, 0, from , -1, to , len); + diafW.rgoAction[i].u.lptszActionName = to; + } + + hr = IDirectInput8WImpl_ConfigureDevices(&This->IDirectInput8W_iface, lpdiCallback, &diCDParamsW, dwFlags, pvRefData); + + /* Copy back configuration */ + if (SUCCEEDED(hr)) + _copy_diactionformatWtoA(lpdiCDParams->lprgFormats, &diafW); + + /* Free memory */ + for (i=0; i < diafW.dwNumActions; i++) + HeapFree(GetProcessHeap(), 0, (void*) diafW.rgoAction[i].u.lptszActionName); + + HeapFree(GetProcessHeap(), 0, diafW.rgoAction); - FIXME("(this=%p,%p,%p,%04x,%p): stub\n", This, lpdiCallback, lpdiCDParams, - dwFlags, pvRefData); - return 0; + return hr; } static const IDirectInput7AVtbl ddi7avt = {

1 0

Alexandre Julliard : setupapi: Delay freeing registered dlls until they have all been processed.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: a192b707f2d102374771ed90e6c94ea40e79a08a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a192b707f2d102374771ed90e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 13:12:26 2011 +0200 setupapi: Delay freeing registered dlls until they have all been processed. --- dlls/setupapi/install.c | 49 ++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 40 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/install.c b/dlls/setupapi/install.c index 8f52a58..6ecc288 100644 --- a/dlls/setupapi/install.c +++ b/dlls/setupapi/install.c @@ -63,6 +63,9 @@ struct register_dll_info PSP_FILE_CALLBACK_W callback; PVOID callback_context; BOOL unregister; + int modules_size; + int modules_count; + HMODULE *modules; }; typedef BOOL (*iterate_fields_func)( HINF hinf, PCWSTR field, void *arg ); @@ -492,7 +495,7 @@ static BOOL registry_callback( HINF hinf, PCWSTR field, void *arg ) * * Register or unregister a dll. */ -static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR *path, +static BOOL do_register_dll( struct register_dll_info *info, const WCHAR *path, INT flags, INT timeout, const WCHAR *args ) { HMODULE module; @@ -616,7 +619,23 @@ static BOOL do_register_dll( const struct register_dll_info *info, const WCHAR * } done: - if (module) FreeLibrary( module ); + if (module) + { + if (info->modules_count >= info->modules_size) + { + int new_size = max( 32, info->modules_size * 2 ); + HMODULE *new = info->modules ? + HeapReAlloc( GetProcessHeap(), 0, info->modules, new_size * sizeof(*new) ) : + HeapAlloc( GetProcessHeap(), 0, new_size * sizeof(*new) ); + if (new) + { + info->modules_size = new_size; + info->modules = new; + } + } + if (info->modules_count < info->modules_size) info->modules[info->modules_count++] = module; + else FreeLibrary( module ); + } if (info->callback) info->callback( info->callback_context, SPFILENOTIFY_ENDREGISTRATION, (UINT_PTR)&status, !info->unregister ); return TRUE; @@ -1047,11 +1066,13 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, PSP_FILE_CALLBACK_W callback, PVOID context, HDEVINFO devinfo, PSP_DEVINFO_DATA devinfo_data ) { + BOOL ret; + int i; + if (flags & SPINST_FILES) { struct files_callback_info info; HSPFILEQ queue; - BOOL ret; if (!(queue = SetupOpenFileQueue())) return FALSE; info.queue = queue; @@ -1086,7 +1107,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, { struct register_dll_info info; - info.unregister = FALSE; + info.unregister = FALSE; + info.modules_size = 0; + info.modules_count = 0; + info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; @@ -1099,14 +1123,19 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, else return FALSE; - if (!iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info )) - return FALSE; + ret = iterate_section_fields( hinf, section, RegisterDlls, register_dlls_callback, &info ); + for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + HeapFree( GetProcessHeap(), 0, info.modules ); + if (!ret) return FALSE; } if (flags & SPINST_UNREGSVR) { struct register_dll_info info; - info.unregister = TRUE; + info.unregister = TRUE; + info.modules_size = 0; + info.modules_count = 0; + info.modules = NULL; if (flags & SPINST_REGISTERCALLBACKAWARE) { info.callback = callback; @@ -1114,8 +1143,10 @@ BOOL WINAPI SetupInstallFromInfSectionW( HWND owner, HINF hinf, PCWSTR section, } else info.callback = NULL; - if (!iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info )) - return FALSE; + ret = iterate_section_fields( hinf, section, UnregisterDlls, register_dlls_callback, &info ); + for (i = 0; i < info.modules_count; i++) FreeLibrary( info.modules[i] ); + HeapFree( GetProcessHeap(), 0, info.modules ); + if (!ret) return FALSE; } if (flags & SPINST_REGISTRY) {

1 0

Piotr Caban : mshtml: Added HTMLAttributeCollection_item implementation.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: e1dcafc6bea3c0e79980cbf62a08230b19504a1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1dcafc6bea3c0e79980cbf62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:25:26 2011 +0200 mshtml: Added HTMLAttributeCollection_item implementation. --- dlls/mshtml/htmlelem.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 99 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 86e3279..d840d63 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2262,11 +2262,90 @@ static HRESULT WINAPI HTMLAttributeCollection__newEnum(IHTMLAttributeCollection return E_NOTIMPL; } +static inline HRESULT get_attr_dispid_by_idx(HTMLAttributeCollection *This, LONG index, DISPID *id) +{ + if(index<0 || index>=This->size) + return DISP_E_UNKNOWNNAME; + + *id = This->collection[index]; + return S_OK; +} + +static inline HRESULT get_attr_dispid_by_name(HTMLAttributeCollection *This, BSTR name, DISPID *id) +{ + HRESULT hres; + + if(name[0]>='0' && name[0]<='9') { + WCHAR *end_ptr; + LONG idx; + + idx = strtoulW(name, &end_ptr, 10); + if(!*end_ptr) { + hres = get_attr_dispid_by_idx(This, idx, id); + if(SUCCEEDED(hres)) + return hres; + } + } + + hres = IDispatchEx_GetDispID(&This->elem->node.dispex.IDispatchEx_iface, + name, fdexNameCaseInsensitive, id); + return hres; +} + +static inline HRESULT get_domattr(HTMLElement *elem, DISPID id, HTMLDOMAttribute **attr) +{ + HTMLDOMAttribute *iter; + HRESULT hres; + + *attr = NULL; + LIST_FOR_EACH_ENTRY(iter, &elem->attrs, HTMLDOMAttribute, entry) { + if(iter->dispid == id) { + *attr = iter; + break; + } + } + + if(!*attr) { + hres = HTMLDOMAttribute_Create(elem, id, attr); + if(FAILED(hres)) + return hres; + } + + IHTMLDOMAttribute_AddRef(&(*attr)->IHTMLDOMAttribute_iface); + return S_OK; +} + static HRESULT WINAPI HTMLAttributeCollection_item(IHTMLAttributeCollection *iface, VARIANT *name, IDispatch **ppItem) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - FIXME("(%p)->(%s, %p)\n", This, debugstr_variant(name), ppItem); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + DISPID id; + HRESULT hres; + + TRACE("(%p)->(%s %p)\n", This, debugstr_variant(name), ppItem); + + switch(V_VT(name)) { + case VT_I4: + hres = get_attr_dispid_by_idx(This, V_I4(name), &id); + break; + case VT_BSTR: + hres = get_attr_dispid_by_name(This, V_BSTR(name), &id); + break; + default: + FIXME("unsupported vt %x\n", V_VT(name)); + hres = E_NOTIMPL; + } + if(hres == DISP_E_UNKNOWNNAME) + return E_INVALIDARG; + if(FAILED(hres)) + return hres; + + hres = get_domattr(This->elem, id, &attr); + if(FAILED(hres)) + return hres; + + *ppItem = (IDispatch*)&attr->IHTMLDOMAttribute_iface; + return S_OK; } static const IHTMLAttributeCollectionVtbl HTMLAttributeCollectionVtbl = { @@ -2452,8 +2531,24 @@ static HRESULT WINAPI HTMLAttributeCollection3_removeNamedItem(IHTMLAttributeCol static HRESULT WINAPI HTMLAttributeCollection3_item(IHTMLAttributeCollection3 *iface, LONG index, IHTMLDOMAttribute **ppNodeOut) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - FIXME("(%p)->(%d %p)\n", This, index, ppNodeOut); - return E_NOTIMPL; + HTMLDOMAttribute *attr; + DISPID id; + HRESULT hres; + + TRACE("(%p)->(%d %p)\n", This, index, ppNodeOut); + + hres = get_attr_dispid_by_idx(This, index, &id); + if(hres == DISP_E_UNKNOWNNAME) + return E_INVALIDARG; + if(FAILED(hres)) + return hres; + + hres = get_domattr(This->elem, id, &attr); + if(FAILED(hres)) + return hres; + + *ppNodeOut = &attr->IHTMLDOMAttribute_iface; + return S_OK; } static HRESULT WINAPI HTMLAttributeCollection3_get_length(IHTMLAttributeCollection3 *iface, LONG *p)

1 0

Piotr Caban : mshtml: Added HTMLDOMAttribute_get_nodeName implementation.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: e3527ef23b273a8dc51ae0f9cc887e6d2d724fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3527ef23b273a8dc51ae0f9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:25:35 2011 +0200 mshtml: Added HTMLDOMAttribute_get_nodeName implementation. --- dlls/mshtml/htmlattr.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlattr.c b/dlls/mshtml/htmlattr.c index d5446c6..40b2de6 100644 --- a/dlls/mshtml/htmlattr.c +++ b/dlls/mshtml/htmlattr.c @@ -121,8 +121,10 @@ static HRESULT WINAPI HTMLDOMAttribute_Invoke(IHTMLDOMAttribute *iface, DISPID d static HRESULT WINAPI HTMLDOMAttribute_get_nodeName(IHTMLDOMAttribute *iface, BSTR *p) { HTMLDOMAttribute *This = impl_from_IHTMLDOMAttribute(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IDispatchEx_GetMemberName(&This->elem->node.dispex.IDispatchEx_iface, This->dispid, p); } static HRESULT WINAPI HTMLDOMAttribute_put_nodeName(IHTMLDOMAttribute *iface, VARIANT v)

1 0

Piotr Caban : mshtml: Added HTMLAttributeCollection_get_length implementation.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 7b37a1bd00ba2a8a8dfc036f0619fe23aa2cbd33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b37a1bd00ba2a8a8dfc036f0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:25:17 2011 +0200 mshtml: Added HTMLAttributeCollection_get_length implementation. --- dlls/mshtml/htmlelem.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 44 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 514166b..86e3279 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2171,6 +2171,7 @@ static ULONG WINAPI HTMLAttributeCollection_Release(IHTMLAttributeCollection *if if(!ref) { IHTMLElement_Release(&This->elem->IHTMLElement_iface); + heap_free(This->collection); heap_free(This); } @@ -2210,8 +2211,48 @@ static HRESULT WINAPI HTMLAttributeCollection_Invoke(IHTMLAttributeCollection *i static HRESULT WINAPI HTMLAttributeCollection_get_length(IHTMLAttributeCollection *iface, LONG *p) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + IDispatchEx *dispex = &This->elem->node.dispex.IDispatchEx_iface; + DISPID id; + LONG len; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, p); + FIXME("filter non-enumerable attributes out\n"); + + heap_free(This->collection); + This->size = 0; + This->collection = NULL; + + id = DISPID_STARTENUM; + len = 0; + while(1) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); + if(FAILED(hres)) + return hres; + else if(hres == S_FALSE) + break; + + len++; + } + + This->collection = heap_alloc(len*sizeof(DISPID)); + if(!This->collection) + return E_OUTOFMEMORY; + + id = DISPID_STARTENUM; + len = 0; + while(1) { + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumAll, id, &id); + if(FAILED(hres)) + return hres; + else if(hres == S_FALSE) + break; + + This->collection[len++] = id; + } + + *p = This->size = len; + return S_OK; } static HRESULT WINAPI HTMLAttributeCollection__newEnum(IHTMLAttributeCollection *iface, IUnknown **p) @@ -2418,8 +2459,7 @@ static HRESULT WINAPI HTMLAttributeCollection3_item(IHTMLAttributeCollection3 *i static HRESULT WINAPI HTMLAttributeCollection3_get_length(IHTMLAttributeCollection3 *iface, LONG *p) { HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + return IHTMLAttributeCollection_get_length(&This->IHTMLAttributeCollection_iface, p); } static const IHTMLAttributeCollection3Vtbl HTMLAttributeCollection3Vtbl = {

1 0

Alexandre Julliard : ntdll/tests: Wait for async I/ O to complete when the result is STATUS_PENDING.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: bfb98ace571a911875835379f58410dbc7e1c037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bfb98ace571a911875835379f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 26 11:59:49 2011 +0200 ntdll/tests: Wait for async I/O to complete when the result is STATUS_PENDING. --- dlls/ntdll/tests/file.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index aec869e..ec62fe7 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -715,6 +715,7 @@ static void read_file_test(void) ResetEvent( event ); status = pNtWriteFile( handle, event, apc, &apc_count, &iosb, text, strlen(text), &offset, NULL ); ok( status == STATUS_SUCCESS || status == STATUS_PENDING, "wrong status %x\n", status ); + if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -731,6 +732,7 @@ static void read_file_test(void) ok( status == STATUS_SUCCESS || status == STATUS_PENDING, /* vista */ "wrong status %x\n", status ); + if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -746,6 +748,7 @@ static void read_file_test(void) status = pNtReadFile( handle, event, apc, &apc_count, &iosb, buffer, 2, &offset, NULL ); if (status == STATUS_PENDING) /* vista */ { + WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_END_OF_FILE, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == 0, "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -776,6 +779,7 @@ static void read_file_test(void) status == STATUS_SUCCESS || status == STATUS_PENDING, /* vista */ "wrong status %x\n", status ); + if (status == STATUS_PENDING) WaitForSingleObject( event, 1000 ); ok( U(iosb).Status == STATUS_SUCCESS, "wrong status %x\n", U(iosb).Status ); ok( iosb.Information == strlen(text), "wrong info %lu\n", iosb.Information ); ok( is_signaled( event ), "event is signaled\n" ); @@ -846,7 +850,7 @@ static void append_file_test(void) if (status == STATUS_PENDING) { - WaitForSingleObject( handle, INFINITE ); + WaitForSingleObject( handle, 1000 ); status = U(iosb).Status; } written = iosb.Information;

1 0

Piotr Caban : mshtml: Added IHTMLAttributeCollection3 stub.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 33881c44f5e326b21e98cdfff36c847b83573ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33881c44f5e326b21e98cdfff… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:25:01 2011 +0200 mshtml: Added IHTMLAttributeCollection3 stub. --- dlls/mshtml/htmlelem.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 305dede..514166b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2137,7 +2137,8 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle TRACE("(%p)->(IID_IHTMLAttributeCollection2 %p)\n", This, ppv); *ppv = &This->IHTMLAttributeCollection2_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) { - FIXME("(%p)->(IID_IHTMLAttributeCollection3 %p)\n", This, ppv); + TRACE("(%p)->(IID_IHTMLAttributeCollection3 %p)\n", This, ppv); + *ppv = &This->IHTMLAttributeCollection3_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; } @@ -2330,6 +2331,112 @@ static const IHTMLAttributeCollection2Vtbl HTMLAttributeCollection2Vtbl = { HTMLAttributeCollection2_removeNamedItem }; +static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection3(IHTMLAttributeCollection3 *iface) +{ + return CONTAINING_RECORD(iface, HTMLAttributeCollection, IHTMLAttributeCollection3_iface); +} + +static HRESULT WINAPI HTMLAttributeCollection3_QueryInterface(IHTMLAttributeCollection3 *iface, REFIID riid, void **ppv) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IHTMLAttributeCollection_QueryInterface(&This->IHTMLAttributeCollection_iface, riid, ppv); +} + +static ULONG WINAPI HTMLAttributeCollection3_AddRef(IHTMLAttributeCollection3 *iface) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IHTMLAttributeCollection_AddRef(&This->IHTMLAttributeCollection_iface); +} + +static ULONG WINAPI HTMLAttributeCollection3_Release(IHTMLAttributeCollection3 *iface) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IHTMLAttributeCollection_Release(&This->IHTMLAttributeCollection_iface); +} + +static HRESULT WINAPI HTMLAttributeCollection3_GetTypeInfoCount(IHTMLAttributeCollection3 *iface, UINT *pctinfo) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLAttributeCollection3_GetTypeInfo(IHTMLAttributeCollection3 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLAttributeCollection3_GetIDsOfNames(IHTMLAttributeCollection3 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLAttributeCollection3_Invoke(IHTMLAttributeCollection3 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLAttributeCollection3_getNamedItem(IHTMLAttributeCollection3 *iface, BSTR bstrName, + IHTMLDOMAttribute **ppNodeOut) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrName), ppNodeOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection3_setNamedItem(IHTMLAttributeCollection3 *iface, + IHTMLDOMAttribute *pNodeIn, IHTMLDOMAttribute **ppNodeOut) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + FIXME("(%p)->(%p %p)\n", This, pNodeIn, ppNodeOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection3_removeNamedItem(IHTMLAttributeCollection3 *iface, + BSTR bstrName, IHTMLDOMAttribute **ppNodeOut) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrName), ppNodeOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection3_item(IHTMLAttributeCollection3 *iface, LONG index, IHTMLDOMAttribute **ppNodeOut) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + FIXME("(%p)->(%d %p)\n", This, index, ppNodeOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection3_get_length(IHTMLAttributeCollection3 *iface, LONG *p) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection3(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLAttributeCollection3Vtbl HTMLAttributeCollection3Vtbl = { + HTMLAttributeCollection3_QueryInterface, + HTMLAttributeCollection3_AddRef, + HTMLAttributeCollection3_Release, + HTMLAttributeCollection3_GetTypeInfoCount, + HTMLAttributeCollection3_GetTypeInfo, + HTMLAttributeCollection3_GetIDsOfNames, + HTMLAttributeCollection3_Invoke, + HTMLAttributeCollection3_getNamedItem, + HTMLAttributeCollection3_setNamedItem, + HTMLAttributeCollection3_removeNamedItem, + HTMLAttributeCollection3_item, + HTMLAttributeCollection3_get_length +}; + static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); @@ -2382,6 +2489,7 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a ret->IHTMLAttributeCollection_iface.lpVtbl = &HTMLAttributeCollectionVtbl; ret->IHTMLAttributeCollection2_iface.lpVtbl = &HTMLAttributeCollection2Vtbl; + ret->IHTMLAttributeCollection3_iface.lpVtbl = &HTMLAttributeCollection3Vtbl; ret->ref = 1; IHTMLElement_AddRef(&This->IHTMLElement_iface);

1 0

Piotr Caban : mshtml: Added IHTMLAttributeCollection stub.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: bea3154f48f97f866b1083e6f4421055244b8b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bea3154f48f97f866b1083e6f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:23:35 2011 +0200 mshtml: Added IHTMLAttributeCollection stub. --- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 3 +- dlls/mshtml/htmlelem.c | 190 +++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlembed.c | 3 +- dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 3 +- dlls/mshtml/htmlhead.c | 4 +- dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 1 + dlls/mshtml/htmlnode.c | 18 ++++- dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 3 +- dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 3 +- dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablerow.c | 3 +- dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/mshtml_private.h | 21 +++++ 22 files changed, 253 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bea3154f48f97f866b108…

1 0

Piotr Caban : mshtml: Added IHTMLAttributeCollection2 stub.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: 665747cc30690d8df96848c0810a0178a25a78e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=665747cc30690d8df96848c08… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Aug 25 15:24:52 2011 +0200 mshtml: Added IHTMLAttributeCollection2 stub. --- dlls/mshtml/htmlelem.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 93 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 5f77e68..305dede 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2134,7 +2134,8 @@ static HRESULT WINAPI HTMLAttributeCollection_QueryInterface(IHTMLAttributeColle TRACE("(%p)->(IID_IHTMLAttributeCollection %p)\n", This, ppv); *ppv = &This->IHTMLAttributeCollection_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection2, riid)) { - FIXME("(%p)->(IID_IHTMLAttributeCollection2 %p)\n", This, ppv); + TRACE("(%p)->(IID_IHTMLAttributeCollection2 %p)\n", This, ppv); + *ppv = &This->IHTMLAttributeCollection2_iface; }else if(IsEqualGUID(&IID_IHTMLAttributeCollection3, riid)) { FIXME("(%p)->(IID_IHTMLAttributeCollection3 %p)\n", This, ppv); }else if(dispex_query_interface(&This->dispex, riid, ppv)) { @@ -2239,6 +2240,96 @@ static const IHTMLAttributeCollectionVtbl HTMLAttributeCollectionVtbl = { HTMLAttributeCollection_item }; +static inline HTMLAttributeCollection *impl_from_IHTMLAttributeCollection2(IHTMLAttributeCollection2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLAttributeCollection, IHTMLAttributeCollection2_iface); +} + +static HRESULT WINAPI HTMLAttributeCollection2_QueryInterface(IHTMLAttributeCollection2 *iface, REFIID riid, void **ppv) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IHTMLAttributeCollection_QueryInterface(&This->IHTMLAttributeCollection_iface, riid, ppv); +} + +static ULONG WINAPI HTMLAttributeCollection2_AddRef(IHTMLAttributeCollection2 *iface) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IHTMLAttributeCollection_AddRef(&This->IHTMLAttributeCollection_iface); +} + +static ULONG WINAPI HTMLAttributeCollection2_Release(IHTMLAttributeCollection2 *iface) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IHTMLAttributeCollection_Release(&This->IHTMLAttributeCollection_iface); +} + +static HRESULT WINAPI HTMLAttributeCollection2_GetTypeInfoCount(IHTMLAttributeCollection2 *iface, UINT *pctinfo) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLAttributeCollection2_GetTypeInfo(IHTMLAttributeCollection2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLAttributeCollection2_GetIDsOfNames(IHTMLAttributeCollection2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLAttributeCollection2_Invoke(IHTMLAttributeCollection2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, + wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLAttributeCollection2_getNamedItem(IHTMLAttributeCollection2 *iface, BSTR bstrName, + IHTMLDOMAttribute **newretNode) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrName), newretNode); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection2_setNamedItem(IHTMLAttributeCollection2 *iface, + IHTMLDOMAttribute *ppNode, IHTMLDOMAttribute **newretNode) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + FIXME("(%p)->(%p %p)\n", This, ppNode, newretNode); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLAttributeCollection2_removeNamedItem(IHTMLAttributeCollection2 *iface, + BSTR bstrName, IHTMLDOMAttribute **newretNode) +{ + HTMLAttributeCollection *This = impl_from_IHTMLAttributeCollection2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(bstrName), newretNode); + return E_NOTIMPL; +} + +static const IHTMLAttributeCollection2Vtbl HTMLAttributeCollection2Vtbl = { + HTMLAttributeCollection2_QueryInterface, + HTMLAttributeCollection2_AddRef, + HTMLAttributeCollection2_Release, + HTMLAttributeCollection2_GetTypeInfoCount, + HTMLAttributeCollection2_GetTypeInfo, + HTMLAttributeCollection2_GetIDsOfNames, + HTMLAttributeCollection2_Invoke, + HTMLAttributeCollection2_getNamedItem, + HTMLAttributeCollection2_setNamedItem, + HTMLAttributeCollection2_removeNamedItem +}; + static inline HTMLAttributeCollection *HTMLAttributeCollection_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLAttributeCollection, dispex); @@ -2290,6 +2381,7 @@ HRESULT HTMLElement_get_attr_col(HTMLDOMNode *iface, HTMLAttributeCollection **a return E_OUTOFMEMORY; ret->IHTMLAttributeCollection_iface.lpVtbl = &HTMLAttributeCollectionVtbl; + ret->IHTMLAttributeCollection2_iface.lpVtbl = &HTMLAttributeCollection2Vtbl; ret->ref = 1; IHTMLElement_AddRef(&This->IHTMLElement_iface);

1 0

Frédéric Delanoy : cmd/tests: Add tests for FOR / F 'delims' option.
by Alexandre Julliard Aug. 26, 2011

Aug. 26, 2011

Module: wine Branch: master Commit: fef13bf2ca9cf6f19abe2e71a85f79ddd353a790 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef13bf2ca9cf6f19abe2e71a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Aug 25 23:08:34 2011 +0200 cmd/tests: Add tests for FOR /F 'delims' option. --- programs/cmd/tests/test_builtins.cmd | 8 ++++++++ programs/cmd/tests/test_builtins.cmd.exp | 8 ++++++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index af3b52e..36c0922 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -639,6 +639,14 @@ for /f "eol=@" %%i in ("@y") do echo %%i > output_file if not exist output_file (echo no output) else (del output_file) for /f "eol==" %%i in ("=y") do echo %%i > output_file if not exist output_file (echo no output) else (del output_file) +echo ......delims option +for /f "delims=|" %%i in ("a|d") do echo %%i +for /f "delims=|" %%i in ("a |d") do echo %%i +for /f "delims=|" %%i in ("a d|") do echo %%i +for /f "delims=| " %%i in ("a d|") do echo %%i +for /f "delims==" %%i in ("C r=d|") do echo %%i +for /f "delims=" %%i in ("foo bar baz") do echo %%i +for /f "delims=" %%i in ("c:\foo bar baz\..") do echo %%~fi cd .. rd /s/q foobar diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 3ff7eeb..2244ed9 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -467,6 +467,14 @@ c @todo_wine(a)a|d @todo_wine(a)no output @todo_wine(a)no output +......delims option +(a)todo_wine@a +(a)todo_wine@a(a)space@ +(a)todo_wine@a d +(a)todo_wine@a +(a)todo_wine@C r +(a)todo_wine@foo bar baz +(a)todo_wine@c:\ -----------Testing del /a----------- not-r.test not found after delete, good r.test found before delete, good

1 0