July 2013 - Wine-Commits - list.winehq.org

Hans Leidekker : iphlpapi: Add support for the listener and connection classes in GetExtendedTcpTable .
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 86157236994c6e8204751734463baf25637b7eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=86157236994c6e82047517344… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Jul 30 12:56:57 2013 +0200 iphlpapi: Add support for the listener and connection classes in GetExtendedTcpTable. --- dlls/iphlpapi/iphlpapi_main.c | 4 +++- dlls/iphlpapi/ipstats.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/iphlpapi/tests/iphlpapi.c | 18 ++++++++++++++++++ 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index aeb91c1..e970162 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1860,7 +1860,9 @@ DWORD WINAPI GetExtendedTcpTable(PVOID pTcpTable, PDWORD pdwSize, BOOL bOrder, if (!pdwSize) return ERROR_INVALID_PARAMETER; if (ulAf != AF_INET || - (TableClass != TCP_TABLE_BASIC_ALL && TableClass != TCP_TABLE_OWNER_PID_ALL)) + TableClass == TCP_TABLE_OWNER_MODULE_LISTENER || + TableClass == TCP_TABLE_OWNER_MODULE_CONNECTIONS || + TableClass == TCP_TABLE_OWNER_MODULE_ALL) { FIXME("ulAf = %u, TableClass = %u not supported\n", ulAf, TableClass); return ERROR_NOT_SUPPORTED; diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 1f52fcc..87651d3 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1981,6 +1981,33 @@ static unsigned int find_owning_pid( struct pid_map *map, unsigned int num_entri #endif } +static BOOL match_class( TCP_TABLE_CLASS class, MIB_TCP_STATE state ) +{ + switch (class) + { + case TCP_TABLE_BASIC_ALL: + case TCP_TABLE_OWNER_PID_ALL: + case TCP_TABLE_OWNER_MODULE_ALL: + return TRUE; + + case TCP_TABLE_BASIC_LISTENER: + case TCP_TABLE_OWNER_PID_LISTENER: + case TCP_TABLE_OWNER_MODULE_LISTENER: + if (state == MIB_TCP_STATE_LISTEN) return TRUE; + return FALSE; + + case TCP_TABLE_BASIC_CONNECTIONS: + case TCP_TABLE_OWNER_PID_CONNECTIONS: + case TCP_TABLE_OWNER_MODULE_CONNECTIONS: + if (state == MIB_TCP_STATE_ESTAB) return TRUE; + return FALSE; + + default: + ERR( "unhandled class %u\n", class ); + return FALSE; + } +} + DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE heap, DWORD flags, DWORD *size ) { @@ -2007,7 +2034,9 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE unsigned int dummy, num_entries = 0; int inode; - if (class == TCP_TABLE_OWNER_PID_ALL) map = get_pid_map( &num_entries ); + if (class == TCP_TABLE_OWNER_PID_ALL || + class == TCP_TABLE_OWNER_PID_LISTENER || + class == TCP_TABLE_OWNER_PID_CONNECTIONS) map = get_pid_map( &num_entries ); /* skip header line */ ptr = fgets(buf, sizeof(buf), fp); @@ -2020,7 +2049,10 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwLocalPort = htons( row.dwLocalPort ); row.dwRemotePort = htons( row.dwRemotePort ); row.dwState = TCPStateToMIBState( row.dwState ); - if (class == TCP_TABLE_OWNER_PID_ALL) + if (!match_class( class, row.dwState )) continue; + if (class == TCP_TABLE_OWNER_PID_ALL || + class == TCP_TABLE_OWNER_PID_LISTENER || + class == TCP_TABLE_OWNER_PID_CONNECTIONS) row.dwOwningPid = find_owning_pid( map, num_entries, inode ); if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) @@ -2048,6 +2080,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemoteAddr = entry->tcpConnRemAddress; row.dwRemotePort = htons( entry->tcpConnRemPort ); row.dwState = entry->tcpConnState; + if (!match_class( class, row.dwState )) continue; if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) break; } @@ -2128,6 +2161,7 @@ DWORD build_tcp_table( TCP_TABLE_CLASS class, void **tablep, BOOL order, HANDLE row.dwRemoteAddr = pINData->inp_faddr.s_addr; row.dwRemotePort = pINData->inp_fport; row.dwState = TCPStateToMIBState (pTCPData->t_state); + if (!match_class( class, row.dwState )) continue; if (!(table = append_tcp_row( class, heap, flags, table, &count, &row, row_size ))) break; } diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index 26bf26e..d15e05c 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1212,6 +1212,15 @@ static void test_GetExtendedTcpTable(void) HeapFree( GetProcessHeap(), 0, table ); size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table ); + + size = 0; ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); @@ -1219,6 +1228,15 @@ static void test_GetExtendedTcpTable(void) ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 ); ok( ret == ERROR_SUCCESS, "got %u\n", ret ); HeapFree( GetProcessHeap(), 0, table_pid ); + + size = 0; + ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); + ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %u\n", ret ); + + table_pid = HeapAlloc( GetProcessHeap(), 0, size ); + ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 ); + ok( ret == ERROR_SUCCESS, "got %u\n", ret ); + HeapFree( GetProcessHeap(), 0, table_pid ); } static void test_GetExtendedUdpTable(void)

1 0

Nikolay Sivov : xmllite: Initial implementation of attribute parsing.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 53f72826a21b25df6ebf3b34a2dcbe0f3aabcba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53f72826a21b25df6ebf3b34a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 14:59:28 2013 +0400 xmllite: Initial implementation of attribute parsing. --- dlls/xmllite/reader.c | 137 ++++++++++++++++++++++++++++++++++--------- dlls/xmllite/tests/reader.c | 88 +++++++++++++++++++++++++++ 2 files changed, 198 insertions(+), 27 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index b556d7d..38d539d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1757,37 +1757,129 @@ static HRESULT reader_parse_qname(xmlreader *reader, strval *prefix, strval *loc return S_OK; } +/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' + [67] Reference ::= EntityRef | CharRef + [68] EntityRef ::= '&' Name ';' */ +static HRESULT reader_parse_reference(xmlreader *reader) +{ + FIXME("References not supported\n"); + return E_NOTIMPL; +} + +/* [10 NS] AttValue ::= '"' ([^<&"] | Reference)* '"' | "'" ([^<&'] | Reference)* "'" */ +static HRESULT reader_parse_attvalue(xmlreader *reader, strval *value) +{ + WCHAR *ptr, *start; + WCHAR quote; + + ptr = reader_get_cur(reader); + + /* skip opening quote */ + quote = *ptr; + if (quote != '\"' && quote != '\'') return WC_E_QUOTE; + reader_skipn(reader, 1); + + start = ptr = reader_get_cur(reader); + while (*ptr) + { + if (*ptr == '<') return WC_E_LESSTHAN; + + if (*ptr == quote) + { + /* skip closing quote */ + reader_skipn(reader, 1); + break; + } + + if (*ptr == '&') + { + HRESULT hr = reader_parse_reference(reader); + if (FAILED(hr)) return hr; + } + else + reader_skipn(reader, 1); + ptr = reader_get_cur(reader); + } + + reader_init_strvalue(start, ptr-start, value); + + return S_OK; +} + +/* [1 NS] NSAttName ::= PrefixedAttName | DefaultAttName + [2 NS] PrefixedAttName ::= 'xmlns:' NCName + [3 NS] DefaultAttName ::= 'xmlns' + [15 NS] Attribute ::= NSAttName Eq AttValue | QName Eq AttValue */ +static HRESULT reader_parse_attribute(xmlreader *reader) +{ + static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; + strval prefix, local, qname, xmlns, value; + HRESULT hr; + + hr = reader_parse_qname(reader, &prefix, &local, &qname); + if (FAILED(hr)) return hr; + + reader_init_strvalue((WCHAR*)xmlnsW, 5, &xmlns); + + if (strval_eq(&prefix, &xmlns)) + { + FIXME("namespace definitions not supported\n"); + return E_NOTIMPL; + } + + if (strval_eq(&qname, &xmlns)) + { + FIXME("default namespace definitions not supported\n"); + return E_NOTIMPL; + } + + hr = reader_parse_eq(reader); + if (FAILED(hr)) return hr; + + hr = reader_parse_attvalue(reader, &value); + if (FAILED(hr)) return hr; + + TRACE("%s=\"%s\"\n", debugstr_wn(local.str, local.len), debugstr_wn(value.str, value.len)); + return reader_add_attr(reader, &local, &value); +} + /* [12 NS] STag ::= '<' QName (S Attribute)* S? '>' [14 NS] EmptyElemTag ::= '<' QName (S Attribute)* S? '/>' */ static HRESULT reader_parse_stag(xmlreader *reader, strval *prefix, strval *local, strval *qname, int *empty) { - static const WCHAR endW[] = {'/','>',0}; HRESULT hr; hr = reader_parse_qname(reader, prefix, local, qname); if (FAILED(hr)) return hr; - reader_skipspaces(reader); - - /* empty element */ - if ((*empty = !reader_cmp(reader, endW))) + while (1) { - /* skip '/>' */ - reader_skipn(reader, 2); - reader->empty_element = TRUE; - return S_OK; - } + static const WCHAR endW[] = {'/','>',0}; - /* got a start tag */ - if (!reader_cmp(reader, gtW)) - { - /* skip '>' */ - reader_skipn(reader, 1); - return reader_push_element(reader, qname); + reader_skipspaces(reader); + + /* empty element */ + if ((*empty = !reader_cmp(reader, endW))) + { + /* skip '/>' */ + reader_skipn(reader, 2); + reader->empty_element = TRUE; + return S_OK; + } + + /* got a start tag */ + if (!reader_cmp(reader, gtW)) + { + /* skip '>' */ + reader_skipn(reader, 1); + return reader_push_element(reader, qname); + } + + hr = reader_parse_attribute(reader); + if (FAILED(hr)) return hr; } - FIXME("only empty elements/start tags without attribute list supported\n"); - return E_NOTIMPL; + return S_OK; } /* [39] element ::= EmptyElemTag | STag content ETag */ @@ -1937,15 +2029,6 @@ static HRESULT reader_parse_cdata(xmlreader *reader) return S_OK; } -/* [66] CharRef ::= '&#' [0-9]+ ';' | '&#x' [0-9a-fA-F]+ ';' - [67] Reference ::= EntityRef | CharRef - [68] EntityRef ::= '&' Name ';' */ -static HRESULT reader_parse_reference(xmlreader *reader) -{ - FIXME("References not supported\n"); - return E_NOTIMPL; -} - /* [14] CharData ::= [^<&]* - ([^<&]* ']]>' [^<&]*) */ static HRESULT reader_parse_chardata(xmlreader *reader) { diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 86bdf69..548abb1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1566,6 +1566,93 @@ static void test_isemptyelement(void) IXmlReader_Release(reader); } +static struct test_entry attributes_tests[] = { + { "<a attr1=\"attrvalue\"/>", "attr1", "attrvalue", S_OK }, + { "<a attr1=\"a\'\'ttrvalue\"/>", "attr1", "a\'\'ttrvalue", S_OK }, + { "<a attr1=\'a\"ttrvalue\'/>", "attr1", "a\"ttrvalue", S_OK }, + { "<a attr1=\' \'/>", "attr1", " ", S_OK }, + { "<a attr1=\" \"/>", "attr1", " ", S_OK }, + { "<a attr1=attrvalue/>", NULL, NULL, WC_E_QUOTE }, + { "<a attr1=\"attr<value\"/>", NULL, NULL, WC_E_LESSTHAN }, + { NULL } +}; + +static void test_read_attribute(void) +{ + struct test_entry *test = attributes_tests; + IXmlReader *reader; + HRESULT hr; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + while (test->xml) + { + XmlNodeType type; + IStream *stream; + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + + if (test->hr_broken) + ok(hr == test->hr || broken(hr == test->hr_broken), "got %08x for %s\n", hr, test->xml); + else + ok(hr == test->hr, "got %08x for %s\n", hr, test->xml); + if (hr == S_OK) + { + const WCHAR *str; + WCHAR *str_exp; + UINT len; + + ok(type == XmlNodeType_Element, "got %d for %s\n", type, test->xml); + + hr = IXmlReader_MoveToFirstAttribute(reader); + ok(hr == S_OK, "got 0x%08x\n", hr); + + len = 1; + str = NULL; + hr = IXmlReader_GetLocalName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine { + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + len = 1; + str = NULL; + hr = IXmlReader_GetQualifiedName(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine { + ok(len == strlen(test->name), "got %u\n", len); + str_exp = a2w(test->name); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + /* value */ + len = 1; + str = NULL; + hr = IXmlReader_GetValue(reader, &str, &len); + ok(hr == S_OK, "got 0x%08x\n", hr); + todo_wine { + ok(len == strlen(test->value), "got %u\n", len); + str_exp = a2w(test->value); + ok(!lstrcmpW(str, str_exp), "got %s\n", wine_dbgstr_w(str)); + free_str(str_exp); + } + } + + IStream_Release(stream); + test++; + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -1582,6 +1669,7 @@ START_TEST(reader) test_reader_create(); test_readerinput(); test_reader_state(); + test_read_attribute(); test_read_cdata(); test_read_comment(); test_read_pi();

1 0

Nikolay Sivov : msxml3: Implement setting attributes properties with IMXAttributes.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: ccf04d644ba27accd3463075041b0f83f7cd704c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ccf04d644ba27accd34630750… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 15:08:03 2013 +0400 msxml3: Implement setting attributes properties with IMXAttributes. --- dlls/msxml3/mxwriter.c | 63 +++++++++++++++++++++++++++++++++++++---------- 1 files changed, 49 insertions(+), 14 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 03c1b67..dd4e629 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -1888,14 +1888,20 @@ static HRESULT WINAPI MXAttributes_clear(IMXAttributes *iface) return S_OK; } +static mxattribute *get_attribute_byindex(mxattributes *attrs, int index) +{ + if (index < 0 || index >= attrs->length) return NULL; + return &attrs->attr[index]; +} + static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int index) { mxattributes *This = impl_from_IMXAttributes( iface ); - mxattribute *src, *dst; + mxattribute *dst; TRACE("(%p)->(%d)\n", This, index); - if (index < 0 || index >= This->length) return E_INVALIDARG; + if (!(dst = get_attribute_byindex(This, index))) return E_INVALIDARG; /* no need to remove last attribute, just make it inaccessible */ if (index + 1 == This->length) @@ -1904,10 +1910,7 @@ static HRESULT WINAPI MXAttributes_removeAttribute(IMXAttributes *iface, int ind return S_OK; } - dst = &This->attr[index]; - src = &This->attr[index+1]; - - memmove(dst, src, (This->length-index-1)*sizeof(*dst)); + memmove(dst, dst + 1, (This->length-index-1)*sizeof(*dst)); This->length--; return S_OK; @@ -1933,29 +1936,61 @@ static HRESULT WINAPI MXAttributes_setLocalName(IMXAttributes *iface, int index, BSTR localName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(localName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(localName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->local); + attr->local = SysAllocString(localName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setQName(IMXAttributes *iface, int index, BSTR QName) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(QName)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(QName)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->qname); + attr->qname = SysAllocString(QName); + + return S_OK; } static HRESULT WINAPI MXAttributes_setURI(IMXAttributes *iface, int index, BSTR uri) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(uri)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(uri)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->uri); + attr->uri = SysAllocString(uri); + + return S_OK; } static HRESULT WINAPI MXAttributes_setValue(IMXAttributes *iface, int index, BSTR value) { mxattributes *This = impl_from_IMXAttributes( iface ); - FIXME("(%p)->(%d %s): stub\n", This, index, debugstr_w(value)); - return E_NOTIMPL; + mxattribute *attr; + + TRACE("(%p)->(%d %s)\n", This, index, debugstr_w(value)); + + if (!(attr = get_attribute_byindex(This, index))) return E_INVALIDARG; + + SysFreeString(attr->value); + attr->value = SysAllocString(value); + + return S_OK; } static const IMXAttributesVtbl MXAttributesVtbl = {

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert Variant->R8.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: d04d1f52309a4fa185cd303c2220ec61bd63f592 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d04d1f52309a4fa185cd303c2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jun 25 14:48:04 2013 +1000 oledb32: Implement DataConvert Variant->R8. --- dlls/oledb32/convert.c | 5 ++++ dlls/oledb32/tests/convert.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index e68078b..8875057 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -361,6 +361,11 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, case DBTYPE_BSTR: hr = VarR8FromStr(*(WCHAR**)src, LOCALE_USER_DEFAULT, 0, d); break; case DBTYPE_BOOL: hr = VarR8FromBool(*(VARIANT_BOOL*)src, d); break; case DBTYPE_DECIMAL: hr = VarR8FromDec((DECIMAL*)src, d); break; + case DBTYPE_VARIANT: + VariantInit(&tmp); + if ((hr = VariantChangeType(&tmp, (VARIANT*)src, 0, VT_R8)) == S_OK) + *d = V_R8(&tmp); + break; default: FIXME("Unimplemented conversion %04x -> R8\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 5c6694f..61607a9 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2276,6 +2276,59 @@ static void test_converttor4(void) ok(dst == 10.0, "got %f\n", dst); } +static void test_converttor8(void) +{ + HRESULT hr; + DOUBLE dst; + BYTE src[20]; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT var; + + dst = 1.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_EMPTY, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0.0, "got %f\n", dst); + + dst = 1.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_NULL, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == DB_E_UNSUPPORTEDCONVERSION, "got %08x\n", hr); + ok(dst_status == DBSTATUS_E_BADACCESSOR, "got %08x\n", dst_status); + ok(dst_len == 0x1234, "got %ld\n", dst_len); + ok(dst == 1.0, "got %f\n", dst); + + dst = 1.0; + *(signed int*)src = 12345678; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 12345678.0, "got %f\n", dst); + + dst = 1.0; + *(FLOAT *)src = 10.0; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_R4, DBTYPE_R8, 0, &dst_len, src, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 10.0, "got %f\n", dst); + + dst_len = dst = 0x1234; + V_VT(&var) = VT_I2; + V_I2(&var) = 0x4321; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_R8, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(dst == 0x4321, "got %f\n", dst); +} + static void test_converttocy(void) { HRESULT hr; @@ -2862,6 +2915,7 @@ START_TEST(convert) test_converttoui1(); test_converttoui4(); test_converttor4(); + test_converttor8(); test_converttofiletime(); test_converttocy(); test_converttoui8();

1 0

Nikolay Sivov : include: Added IRowPosition interface definition.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 2fe34bfb094b93d825ebe6d1342e28804262398a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fe34bfb094b93d825ebe6d13… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 30 14:38:38 2013 +0400 include: Added IRowPosition interface definition. --- dlls/msdaps/usrmarshal.c | 60 +++++++++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/oledb.idl | 1 + include/rowpos.idl | 77 ++++++++++++++++++++++++++++++++++++++++++++++ tools/make_makefiles | 1 + 5 files changed, 140 insertions(+), 0 deletions(-) diff --git a/dlls/msdaps/usrmarshal.c b/dlls/msdaps/usrmarshal.c index b93340e..54c9b90 100644 --- a/dlls/msdaps/usrmarshal.c +++ b/dlls/msdaps/usrmarshal.c @@ -1279,3 +1279,63 @@ HRESULT __RPC_STUB IErrorRecords_AddErrorRecord_Stub(IErrorRecords* This, ERRORI return hr; } + +HRESULT __RPC_STUB IRowPosition_Initialize_Stub(IRowPosition* This, IUnknown *rowset, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p %p): stub\n", This, rowset, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_SetRowPosition_Stub(IRowPosition* This, HCHAPTER chapter, HROW row, DBPOSITIONFLAGS flags, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%lx %lx %d %p): stub\n", This, chapter, row, flags, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_GetRowset_Stub(IRowPosition* This, REFIID riid, IUnknown **rowset, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%s %p %p): stub\n", This, debugstr_guid(riid), rowset, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_GetRowPosition_Stub(IRowPosition* This, HCHAPTER *chapter, HROW *row, DBPOSITIONFLAGS *flags, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p %p %p %p): stub\n", This, chapter, row, flags, errorinfo); + return E_NOTIMPL; +} + +HRESULT __RPC_STUB IRowPosition_ClearRowPosition_Stub(IRowPosition* This, IErrorInfo **errorinfo) +{ + FIXME("(%p)->(%p): stub\n", This, errorinfo); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_ClearRowPosition_Proxy(IRowPosition* This) +{ + FIXME("(%p): stub\n", This); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_GetRowPosition_Proxy(IRowPosition* This, HCHAPTER *chapter, HROW *row, DBPOSITIONFLAGS *flags) +{ + FIXME("(%p)->(%p %p %p): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_GetRowset_Proxy(IRowPosition* This, REFIID riid, IUnknown **rowset) +{ + FIXME("(%p)->(%s %p): stub\n", This, debugstr_guid(riid), rowset); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_Initialize_Proxy(IRowPosition* This, IUnknown *rowset) +{ + FIXME("(%p)->(%p): stub\n", This, rowset); + return E_NOTIMPL; +} + +HRESULT CALLBACK IRowPosition_SetRowPosition_Proxy(IRowPosition* This, HCHAPTER chapter, HROW row, DBPOSITIONFLAGS flags) +{ + FIXME("(%p)->(%lx %lx %d): stub\n", This, chapter, row, flags); + return E_NOTIMPL; +} diff --git a/include/Makefile.in b/include/Makefile.in index cecc845..0818999 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -480,6 +480,7 @@ SRCDIR_INCLUDES = \ rmxfguid.h \ row.idl \ rowchg.idl \ + rowpos.idl \ rpc.h \ rpcasync.h \ rpcdce.h \ diff --git a/include/oledb.idl b/include/oledb.idl index 5cd287f..3d47fe7 100644 --- a/include/oledb.idl +++ b/include/oledb.idl @@ -64,6 +64,7 @@ typedef DWORD_PTR DBHASHVALUE; #include "opnrst.idl" #include "row.idl" #include "rowchg.idl" +#include "rowpos.idl" #include "binres.idl" #include "crtrow.idl" #include "errrec.idl" diff --git a/include/rowpos.idl b/include/rowpos.idl new file mode 100644 index 0000000..1ef6807 --- /dev/null +++ b/include/rowpos.idl @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2013 Nikolay Sivov + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +[ + object, + uuid(0c733a94-2a1c-11ce-ade5-00aa0044773d), + pointer_default(unique) +] +interface IRowPosition : IUnknown +{ + typedef DWORD DBPOSITIONFLAGS; + + enum DBPOSITIONFLAGSENUM { + DBPOSITION_OK, + DBPOSITION_NOROW, + DBPOSITION_BOF, + DBPOSITION_EOF + }; + + [local] + HRESULT ClearRowPosition(); + + [call_as(ClearRowPosition)] + HRESULT RemoteClearRowPosition([out] IErrorInfo **errorinfo); + + [local] + HRESULT GetRowPosition([out] HCHAPTER *chapter, + [out] HROW *row, + [out] DBPOSITIONFLAGS *position_flags); + + [call_as(GetRowPosition)] + HRESULT RemoteGetRowPosition([out] HCHAPTER *chapter, + [out] HROW *row, + [out] DBPOSITIONFLAGS *position_flags, + [out] IErrorInfo **errorinfo); + [local] + HRESULT GetRowset([in] REFIID riid, + [out, iid_is(riid)] IUnknown **rowset); + + [call_as(GetRowset)] + HRESULT RemoteGetRowset([in] REFIID riid, + [out, iid_is(riid)] IUnknown **rowset, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT Initialize([in] IUnknown *rowset); + + [call_as(Initialize)] + HRESULT RemoteInitialize([in] IUnknown *rowset, + [out] IErrorInfo **errorinfo); + + [local] + HRESULT SetRowPosition([in] HCHAPTER chapter, + [in] HROW row, + [in] DBPOSITIONFLAGS flags); + + [call_as(SetRowPosition)] + HRESULT RemoteSetRowPosition([in] HCHAPTER chapter, + [in] HROW row, + [in] DBPOSITIONFLAGS flags, + [out] IErrorInfo **errorinfo); +} diff --git a/tools/make_makefiles b/tools/make_makefiles index 6d4e8a7..566ca0d 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -155,6 +155,7 @@ my %private_idl_headers = ( "opnrst.idl" => 1, "row.idl" => 1, "rowchg.idl" => 1, + "rowpos.idl" => 1, "rstbas.idl" => 1, "rstinf.idl" => 1, "rstloc.idl" => 1,

1 0

Alexandre Julliard : configure: Move the checks inside the WINE_PACKAGE_FLAGS macro to enable restoring CPPFLAGS automatically .
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 75d4023153a27ebdfae0e9235785464728801c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75d4023153a27ebdfae0e9235… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 30 16:09:51 2013 +0200 configure: Move the checks inside the WINE_PACKAGE_FLAGS macro to enable restoring CPPFLAGS automatically. --- aclocal.m4 | 29 ++++-- configure | 242 ++++++++++++++++++++++++++----------------------- configure.ac | 290 +++++++++++++++++++++++++++------------------------------- 3 files changed, 280 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75d4023153a27ebdfae0e…

1 0

Alistair Leslie-Hughes : msdasc.idl: Add coclass DataLinks.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 0ad8a18e3a92b1eb8a6bfd8bb86a26908a66613f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ad8a18e3a92b1eb8a6bfd8bb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 14 11:50:22 2013 +1000 msdasc.idl: Add coclass DataLinks. --- include/msdasc.idl | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-) diff --git a/include/msdasc.idl b/include/msdasc.idl index 16d2372..f3b6a37 100644 --- a/include/msdasc.idl +++ b/include/msdasc.idl @@ -34,6 +34,56 @@ library MSDASC { importlib("stdole2.tlb"); + typedef DWORD DBPROMPTOPTIONS; + + typedef enum tagDBPROMPTOPTIONSENUM + { + DBPROMPTOPTIONS_NONE = 0x00, + DBPROMPTOPTIONS_WIZARDSHEET = 0x01, + DBPROMPTOPTIONS_PROPERTYSHEET = 0x02, + DBPROMPTOPTIONS_BROWSEONLY = 0x08, + DBPROMPTOPTIONS_DISABLE_PROVIDER_SELECTION = 0x10, + DBPROMPTOPTIONS_DISABLESAVEPASSWORD = 0x20 + } DBPROMPTOPTIONSENUM; + + [ + odl, + uuid(2206CCB2-19C1-11D1-89E0-00C04FD7A829), + helpstring("OLE DB Service Component Automation Interface"), + dual, + oleautomation + ] + interface IDataSourceLocator : IDispatch + { + [id(0x60020000), propget] + HRESULT hWnd([out, retval] long* phwndParent); + + [id(0x60020000), propput] + HRESULT hWnd([in] long phwndParent); + + [id(0x60020002), helpstring("PromptNew")] + HRESULT PromptNew([out, retval] IDispatch** ppADOConnection); + + [id(0x60020003), helpstring("PromptEdit")] + HRESULT PromptEdit([in, out] IDispatch** ppADOConnection, [out, retval] VARIANT_BOOL* pbSuccess); + } + + [ + odl, + uuid(2206CCB0-19C1-11D1-89E0-00C04FD7A829), + restricted + ] + interface IDBPromptInitialize : IUnknown + { + HRESULT _stdcall PromptDataSource([in] IUnknown* pUnkOuter, [in] HWND hWndParent, + [in] DBPROMPTOPTIONS dwPromptOptions, [in] ULONG cSourceTypeFilter, + [in] DBSOURCETYPE* rgSourceTypeFilter, [in] LPWSTR pwszszzProviderFilter, + [in] GUID* riid, [in, out] IUnknown** ppDataSource); + + HRESULT _stdcall PromptFileName([in] HWND hWndParent, [in] ULONG dwPromptOptions, + [in] LPWSTR pwszInitialDirectory, [in] LPWSTR pwszInitialFile, [out] LPWSTR* ppwszSelectedFile); + } + [ uuid(2206CCB1-19C1-11D1-89E0-00C04FD7A829), ] @@ -71,4 +121,15 @@ library MSDASC { [default] interface IDataInitialize; } + + [ + uuid(2206CDB2-19C1-11D1-89E0-00C04FD7A829), + progid("DataLinks") + ] + coclass DataLinks + { + [default] interface IDataSourceLocator; + interface IDBPromptInitialize; + interface IDataInitialize; + } }

1 0

Ken Sharp : kernel32: Correct log on / logon (noun / verb).
by Alexandre Julliard July 30, 2013

July 30, 2013

1 0

Piotr Caban : oleaut32: Don' t leak BSTRs allocated in string_list and name_list.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: 6d6c3e5d81a6f93800982498bd206ec2fc8be23f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6c3e5d81a6f93800982498b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 15:19:37 2013 +0200 oleaut32: Don't leak BSTRs allocated in string_list and name_list. --- dlls/oleaut32/typelib.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 1041e1b..b0cfc88 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -4594,11 +4594,13 @@ static ULONG WINAPI ITypeLib2_fnRelease( ITypeLib2 *iface) LIST_FOR_EACH_ENTRY_SAFE(tlbstr, tlbstr_next, &This->string_list, TLBString, entry) { list_remove(&tlbstr->entry); + SysFreeString(tlbstr->str); heap_free(tlbstr); } LIST_FOR_EACH_ENTRY_SAFE(tlbstr, tlbstr_next, &This->name_list, TLBString, entry) { list_remove(&tlbstr->entry); + SysFreeString(tlbstr->str); heap_free(tlbstr); }

1 0

Piotr Caban : scrrun: Add IFileSystem3::CopyFolder implementation.
by Alexandre Julliard July 30, 2013

July 30, 2013

Module: wine Branch: master Commit: a20c9738eee5836e86372be9e56208c9d46ca3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=a20c9738eee5836e86372be9e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Jul 30 11:32:13 2013 +0200 scrrun: Add IFileSystem3::CopyFolder implementation. --- dlls/scrrun/filesystem.c | 123 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 121 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index d03b32d..19e3e23 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -82,6 +82,7 @@ static inline HRESULT create_error(DWORD err) case ERROR_PATH_NOT_FOUND: return CTL_E_PATHNOTFOUND; case ERROR_ACCESS_DENIED: return CTL_E_PERMISSIONDENIED; case ERROR_FILE_EXISTS: return CTL_E_FILEALREADYEXISTS; + case ERROR_ALREADY_EXISTS: return CTL_E_FILEALREADYEXISTS; default: FIXME("Unsupported error code: %d\n", err); return E_FAIL; @@ -1589,12 +1590,130 @@ static HRESULT WINAPI filesys_CopyFile(IFileSystem3 *iface, BSTR Source, SysStringLen(Destination), OverWriteFiles); } +static HRESULT copy_folder(const WCHAR *source, DWORD source_len, const WCHAR *destination, + DWORD destination_len, VARIANT_BOOL overwrite) +{ + DWORD tmp, src_len, dst_len, name_len; + WCHAR src[MAX_PATH], dst[MAX_PATH]; + WIN32_FIND_DATAW ffd; + HANDLE f; + HRESULT hr; + BOOL copied = FALSE; + + if(!source[0] || !destination[0]) + return E_INVALIDARG; + + dst_len = destination_len; + if(dst_len+1 >= MAX_PATH) + return E_FAIL; + memcpy(dst, destination, (dst_len+1)*sizeof(WCHAR)); + + if(dst[dst_len-1]!='\\' && dst[dst_len-1]!='/' && + (tmp = GetFileAttributesW(source))!=INVALID_FILE_ATTRIBUTES && + tmp&FILE_ATTRIBUTE_DIRECTORY) { + if(!CreateDirectoryW(dst, NULL)) { + if(overwrite && GetLastError()==ERROR_ALREADY_EXISTS) { + tmp = GetFileAttributesW(dst); + if(tmp==INVALID_FILE_ATTRIBUTES || !(tmp&FILE_ATTRIBUTE_DIRECTORY)) + return CTL_E_FILEALREADYEXISTS; + }else { + return create_error(GetLastError()); + } + } + copied = TRUE; + + src_len = source_len; + if(src_len+2 >= MAX_PATH) + return E_FAIL; + memcpy(src, source, src_len*sizeof(WCHAR)); + src[src_len++] = '\\'; + src[src_len] = '*'; + src[src_len+1] = 0; + + hr = copy_file(src, src_len+1, dst, dst_len, overwrite); + if(FAILED(hr) && hr!=CTL_E_FILENOTFOUND) + return create_error(GetLastError()); + + f = FindFirstFileW(src, &ffd); + }else { + src_len = get_parent_folder_name(source, source_len); + if(src_len+2 >= MAX_PATH) + return E_FAIL; + memcpy(src, source, src_len*sizeof(WCHAR)); + if(src_len) + src[src_len++] = '\\'; + + f = FindFirstFileW(source, &ffd); + } + if(f == INVALID_HANDLE_VALUE) + return CTL_E_PATHNOTFOUND; + + dst[dst_len++] = '\\'; + dst[dst_len] = 0; + + do { + if(!(ffd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + continue; + if(ffd.cFileName[0]=='.' && (ffd.cFileName[1]==0 || + (ffd.cFileName[1]=='.' && ffd.cFileName[2]==0))) + continue; + + name_len = strlenW(ffd.cFileName); + if(dst_len+name_len>=MAX_PATH || src_len+name_len+2>=MAX_PATH) { + FindClose(f); + return E_FAIL; + } + memcpy(dst+dst_len, ffd.cFileName, name_len*sizeof(WCHAR)); + dst[dst_len+name_len] = 0; + memcpy(src+src_len, ffd.cFileName, name_len*sizeof(WCHAR)); + src[src_len+name_len] = '\\'; + src[src_len+name_len+1] = '*'; + src[src_len+name_len+2] = 0; + + TRACE("copying %s to %s\n", debugstr_w(src), debugstr_w(dst)); + + if(!CreateDirectoryW(dst, NULL)) { + if(overwrite && GetLastError()==ERROR_ALREADY_EXISTS) { + tmp = GetFileAttributesW(dst); + if(tmp==INVALID_FILE_ATTRIBUTES || !(tmp&FILE_ATTRIBUTE_DIRECTORY)) { + FindClose(f); + return CTL_E_FILEALREADYEXISTS; + } + }else { + FindClose(f); + return create_error(GetLastError()); + } + return create_error(GetLastError()); + } + copied = TRUE; + + hr = copy_file(src, src_len+name_len+2, dst, dst_len+name_len, overwrite); + if(FAILED(hr) && hr!=CTL_E_FILENOTFOUND) { + FindClose(f); + return hr; + } + + hr = copy_folder(src, src_len+name_len+2, dst, dst_len+name_len, overwrite); + if(FAILED(hr) && hr!=CTL_E_PATHNOTFOUND) { + FindClose(f); + return hr; + } + } while(FindNextFileW(f, &ffd)); + FindClose(f); + + return copied ? S_OK : CTL_E_PATHNOTFOUND; +} + static HRESULT WINAPI filesys_CopyFolder(IFileSystem3 *iface, BSTR Source, BSTR Destination, VARIANT_BOOL OverWriteFiles) { - FIXME("%p %s %s %d\n", iface, debugstr_w(Source), debugstr_w(Destination), OverWriteFiles); + TRACE("%p %s %s %d\n", iface, debugstr_w(Source), debugstr_w(Destination), OverWriteFiles); - return E_NOTIMPL; + if(!Source || !Destination) + return E_POINTER; + + return copy_folder(Source, SysStringLen(Source), Destination, + SysStringLen(Destination), OverWriteFiles); } static HRESULT WINAPI filesys_CreateFolder(IFileSystem3 *iface, BSTR path,

1 0