wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Joachim Priesner : scrrun: Implement filesys_DriveExists.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 5b9a11a01c3db4a71ab72292053b3d74c43e5d02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b9a11a01c3db4a71ab722920… Author: Joachim Priesner <joachim.priesner(a)web.de> Date: Thu Jan 28 17:12:36 2016 +0100 scrrun: Implement filesys_DriveExists. Signed-off-by: Joachim Priesner <joachim.priesner(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 22 ++++++++++-- dlls/scrrun/tests/filesystem.c | 78 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 2 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 3de38d2..98895cc 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3221,9 +3221,27 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *pbstrResult static HRESULT WINAPI filesys_DriveExists(IFileSystem3 *iface, BSTR DriveSpec, VARIANT_BOOL *pfExists) { - FIXME("%p %s %p\n", iface, debugstr_w(DriveSpec), pfExists); + UINT len; + WCHAR driveletter; + TRACE("%p %s %p\n", iface, debugstr_w(DriveSpec), pfExists); + + if (!pfExists) return E_POINTER; + + *pfExists = VARIANT_FALSE; + len = SysStringLen(DriveSpec); + + if (len >= 1) { + driveletter = toupperW(DriveSpec[0]); + if (driveletter >= 'A' && driveletter <= 'Z' + && (len < 2 || DriveSpec[1] == ':') + && (len < 3 || DriveSpec[2] == '\\')) { + const WCHAR root[] = {driveletter, ':', '\\', 0}; + UINT drivetype = GetDriveTypeW(root); + *pfExists = drivetype != DRIVE_NO_ROOT_DIR && drivetype != DRIVE_UNKNOWN ? VARIANT_TRUE : VARIANT_FALSE; + } + } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI filesys_FileExists(IFileSystem3 *iface, BSTR path, VARIANT_BOOL *ret) diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 28242ce..b80540d 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1790,6 +1790,83 @@ todo_wine SysFreeString(nameW); } +struct driveexists_test { + const WCHAR drivespec[10]; + const INT drivetype; + const VARIANT_BOOL expected_ret; +}; + +/* If 'drivetype' != -1, the first character of 'drivespec' will be replaced + * with the drive letter of a drive of this type. If such a drive does not exist, + * the test will be skipped. */ +static const struct driveexists_test driveexiststestdata[] = { + { {'N',':','\\',0}, DRIVE_NO_ROOT_DIR, VARIANT_FALSE }, + { {'R',':','\\',0}, DRIVE_REMOVABLE, VARIANT_TRUE }, + { {'F',':','\\',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'F',':',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'F','?',0}, DRIVE_FIXED, VARIANT_FALSE }, + { {'F',0}, DRIVE_FIXED, VARIANT_TRUE }, + { {'?',0}, -1, VARIANT_FALSE }, + { { 0 } } +}; + +static void test_DriveExists(void) +{ + const struct driveexists_test *ptr = driveexiststestdata; + HRESULT hr; + VARIANT_BOOL ret; + BSTR drivespec; + WCHAR root[] = {'?',':','\\',0}; + + hr = IFileSystem3_DriveExists(fs3, NULL, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + + ret = VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, NULL, &ret); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(ret == VARIANT_FALSE, "got %x\n", ret); + + drivespec = SysAllocString(root); + hr = IFileSystem3_DriveExists(fs3, drivespec, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + SysFreeString(drivespec); + + for (; *ptr->drivespec; ptr++) { + drivespec = SysAllocString(ptr->drivespec); + if (ptr->drivetype != -1) { + for (root[0] = 'A'; root[0] <= 'Z'; root[0]++) + if (GetDriveTypeW(root) == ptr->drivetype) + break; + if (root[0] > 'Z') { + skip("No drive with type 0x%x found, skipping test %s.\n", + ptr->drivetype, wine_dbgstr_w(ptr->drivespec)); + SysFreeString(drivespec); + continue; + } + + /* Test both upper and lower case drive letters. */ + drivespec[0] = root[0]; + ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); + ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", + ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + + drivespec[0] = tolower(root[0]); + } + + ret = ptr->expected_ret == VARIANT_TRUE ? VARIANT_FALSE : VARIANT_TRUE; + hr = IFileSystem3_DriveExists(fs3, drivespec, &ret); + ok(hr == S_OK, "got 0x%08x for drive spec %s (%s)\n", + hr, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + ok(ret == ptr->expected_ret, "got %d, expected %d for drive spec %s (%s)\n", + ret, ptr->expected_ret, wine_dbgstr_w(drivespec), wine_dbgstr_w(ptr->drivespec)); + + SysFreeString(drivespec); + } +} + struct getdrivename_test { const WCHAR path[10]; const WCHAR drive[5]; @@ -2019,6 +2096,7 @@ START_TEST(filesystem) test_WriteLine(); test_ReadAll(); test_Read(); + test_DriveExists(); test_GetDriveName(); test_SerialNumber(); test_GetExtensionName();

1 0

Austin English : ndis.sys: Add NdisAllocateSpinLock stub.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: c9516970f93ae01f21a54894ceee3fd1b9d7f873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9516970f93ae01f21a54894c… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 5 17:24:12 2016 -0600 ndis.sys: Add NdisAllocateSpinLock stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ndis.sys/main.c | 5 +++++ dlls/ndis.sys/ndis.sys.spec | 2 +- include/ddk/ndis.h | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/ndis.sys/main.c b/dlls/ndis.sys/main.c index b2c1da4..499f167 100644 --- a/dlls/ndis.sys/main.c +++ b/dlls/ndis.sys/main.c @@ -43,3 +43,8 @@ NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **address, UINT length, ULONG FIXME("(%p, %u, %u): stub\n", address, length, tag); return NDIS_STATUS_FAILURE; } + +void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *lock) +{ + FIXME("(%p): stub\n", lock); +} diff --git a/dlls/ndis.sys/ndis.sys.spec b/dlls/ndis.sys/ndis.sys.spec index 1017296..31b421a 100644 --- a/dlls/ndis.sys/ndis.sys.spec +++ b/dlls/ndis.sys/ndis.sys.spec @@ -16,7 +16,7 @@ @ stub NdisAllocatePacket @ stub NdisAllocatePacketPool @ stub NdisAllocatePacketPoolEx -@ stub NdisAllocateSpinLock +@ stdcall NdisAllocateSpinLock(ptr) @ stub NdisAnsiStringToUnicodeString @ stub NdisBufferLength @ stub NdisBufferVirtualAddress diff --git a/include/ddk/ndis.h b/include/ddk/ndis.h index a57d9f8..aa77d9a 100644 --- a/include/ddk/ndis.h +++ b/include/ddk/ndis.h @@ -23,8 +23,15 @@ typedef void *NDIS_HANDLE, *PNDIS_HANDLE; typedef int NDIS_STATUS, *PNDIS_STATUS; +typedef struct _NDIS_SPIN_LOCK +{ + KSPIN_LOCK SpinLock; + KIRQL OldIrql; +} NDIS_SPIN_LOCK, *PNDIS_SPIN_LOCK; + #define NDIS_STATUS_FAILURE ((NDIS_STATUS) STATUS_UNSUCCESSFUL) NDIS_STATUS WINAPI NdisAllocateMemoryWithTag(void **, UINT, ULONG); +void WINAPI NdisAllocateSpinLock(NDIS_SPIN_LOCK *); #endif /* _NDIS_ */

1 0

Hans Leidekker : webservices: Add support for structure types in WsReadType.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 9fb780ec086fd37aeadfe92665b40b3235088abf URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb780ec086fd37aeadfe9266… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:30 2016 +0100 webservices: Add support for structure types in WsReadType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 712 ++++++++++++++++++++++++++++++++++------ dlls/webservices/tests/reader.c | 99 ++++++ 2 files changed, 709 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fb780ec086fd37aeadfe…

1 0

Hans Leidekker : webservices: Implement WsReadStartAttribute.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: bd4361cb0f050e2928a20953d632d316095f829f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd4361cb0f050e2928a20953d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:29 2016 +0100 webservices: Implement WsReadStartAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 24 ++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 13ca50b..82a3a1a 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -378,6 +378,7 @@ enum reader_state READER_STATE_INITIAL, READER_STATE_BOF, READER_STATE_STARTELEMENT, + READER_STATE_STARTATTRIBUTE, READER_STATE_STARTENDELEMENT, READER_STATE_TEXT, READER_STATE_ENDELEMENT, @@ -393,6 +394,7 @@ struct reader enum reader_state state; struct node *root; struct node *current; + ULONG current_attr; WS_XML_READER_INPUT_TYPE input_type; const unsigned char *input_data; ULONG input_size; @@ -1341,6 +1343,28 @@ HRESULT WINAPI WsMoveReader( WS_XML_READER *handle, WS_MOVE_TO move, BOOL *found return read_move_to( reader, move, found ); } +/************************************************************************** + * WsReadStartAttribute [webservices.@] + */ +HRESULT WINAPI WsReadStartAttribute( WS_XML_READER *handle, ULONG index, WS_ERROR *error ) +{ + struct reader *reader = (struct reader *)handle; + WS_XML_ELEMENT_NODE *elem; + + TRACE( "%p %u %p\n", handle, index, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!reader) return E_INVALIDARG; + + elem = &reader->current->hdr; + if (reader->state != READER_STATE_STARTELEMENT || index >= elem->attributeCount) + return WS_E_INVALID_FORMAT; + + reader->current_attr = index; + reader->state = READER_STATE_STARTATTRIBUTE; + return S_OK; +} + static WCHAR *xmltext_to_widechar( WS_HEAP *heap, const WS_XML_TEXT *text ) { WCHAR *ret; diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6931f77..062af8d 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -118,7 +118,7 @@ @ stub WsReadMetadata @ stdcall WsReadNode(ptr ptr) @ stub WsReadQualifiedName -@ stub WsReadStartAttribute +@ stdcall WsReadStartAttribute(ptr long ptr) @ stdcall WsReadStartElement(ptr ptr) @ stdcall WsReadToStartElement(ptr ptr ptr ptr ptr) @ stdcall WsReadType(ptr long long ptr long ptr ptr long ptr)

1 0

Hans Leidekker : webservices: Implement WsWriteAttribute.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 5eed03cb28d14260ddbb7ffe8a319b83adbff7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5eed03cb28d14260ddbb7ffe8… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:28 2016 +0100 webservices: Implement WsWriteAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 66 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 28 +++++++++++++++++ 3 files changed, 95 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 252ac2c..a4d1973 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -906,6 +906,71 @@ static void test_WsWriteValue(void) WsFreeWriter( writer ); } +static void test_WsWriteAttribute(void) +{ + static const WCHAR testW[] = {'t','e','s','t',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_ATTRIBUTE_DESCRIPTION desc; + WS_XML_STRING localname = {3, (BYTE *)"str"}, ns = {0, NULL}; + struct test { const WCHAR *str; } *test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* text field mapping */ + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + + desc.attributeLocalName = &localname; + desc.attributeNs = &ns; + desc.type = WS_STRUCT_TYPE; + desc.typeDescription = &s; + + test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); + test->str = testW; + hr = WsWriteAttribute( NULL, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteAttribute( writer, NULL, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == WS_E_INVALID_OPERATION, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteAttribute( writer, &desc, WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<str str=\"test\"/>", __LINE__ ); + + HeapFree( GetProcessHeap(), 0, test ); + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -917,6 +982,7 @@ START_TEST(writer) test_WsWriteType(); test_WsWriteElement(); test_WsWriteValue(); + test_WsWriteAttribute(); test_basic_type(); test_simple_struct_type(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 4bda968..6931f77 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -165,7 +165,7 @@ @ stub WsTrimXmlWhitespace @ stub WsVerifyXmlNCName @ stub WsWriteArray -@ stub WsWriteAttribute +@ stdcall WsWriteAttribute(ptr ptr long ptr long ptr) @ stub WsWriteBody @ stub WsWriteBytes @ stub WsWriteChars diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 05094cd..dafeb24 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1349,6 +1349,34 @@ static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TY } /************************************************************************** + * WsWriteAttribute [webservices.@] + */ +HRESULT WINAPI WsWriteAttribute( WS_XML_WRITER *handle, const WS_ATTRIBUTE_DESCRIPTION *desc, + WS_WRITE_OPTION option, const void *value, ULONG size, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + HRESULT hr; + + TRACE( "%p %p %u %p %u %p\n", handle, desc, option, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !desc || !desc->attributeLocalName || !desc->attributeNs || !value) + return E_INVALIDARG; + + if (writer->state != WRITER_STATE_STARTELEMENT) return WS_E_INVALID_OPERATION; + + if ((hr = write_add_attribute( writer, NULL, desc->attributeLocalName, desc->attributeNs, + FALSE )) != S_OK) return hr; + + if ((hr = write_type( writer, WS_ATTRIBUTE_TYPE_MAPPING, desc->type, desc->typeDescription, + option, value, size )) != S_OK) return hr; + + writer->state = WRITER_STATE_STARTELEMENT; + return S_OK; +} + +/************************************************************************** * WsWriteElement [webservices.@] */ HRESULT WINAPI WsWriteElement( WS_XML_WRITER *handle, const WS_ELEMENT_DESCRIPTION *desc,

1 0

Hans Leidekker : webservices: Implement WsWriteValue.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 0b57ba1904bd0664d9e06da1fd6660122165c82b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b57ba1904bd0664d9e06da1f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:27 2016 +0100 webservices: Implement WsWriteValue. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 107 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 57 ++++++++++++++++++++ 3 files changed, 165 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 37f62c6..252ac2c 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -800,6 +800,112 @@ static void test_WsWriteElement(void) WsFreeWriter( writer ); } +static void test_WsWriteValue(void) +{ + HRESULT hr; + WS_XML_WRITER *writer; + WS_XML_STRING localname = {1, (BYTE *)"t"}, ns = {0, NULL}; + ULONG i; + static const struct + { + WS_VALUE_TYPE type; + INT64 val; + ULONG size; + const char *result; + const char *result2; + } + tests[] = + { + { WS_BOOL_VALUE_TYPE, ~0, sizeof(BOOL), "<t>true</t>", "<t t=\"true\"/>" }, + { WS_BOOL_VALUE_TYPE, FALSE, sizeof(BOOL), "<t>false</t>", "<t t=\"false\"/>" }, + { WS_INT8_VALUE_TYPE, -128, sizeof(INT8), "<t>-128</t>", "<t t=\"-128\"/>" }, + { WS_INT16_VALUE_TYPE, -32768, sizeof(INT16), "<t>-32768</t>", "<t t=\"-32768\"/>" }, + { WS_INT32_VALUE_TYPE, -2147483647 - 1, sizeof(INT32), "<t>-2147483648</t>", + "<t t=\"-2147483648\"/>" }, + { WS_INT64_VALUE_TYPE, -9223372036854775807 - 1, sizeof(INT64), "<t>-9223372036854775808</t>", + "<t t=\"-9223372036854775808\"/>" }, + { WS_UINT8_VALUE_TYPE, 255, sizeof(UINT8), "<t>255</t>", "<t t=\"255\"/>" }, + { WS_UINT16_VALUE_TYPE, 65535, sizeof(UINT16), "<t>65535</t>", "<t t=\"65535\"/>" }, + { WS_UINT32_VALUE_TYPE, ~0u, sizeof(UINT32), "<t>4294967295</t>", "<t t=\"4294967295\"/>" }, + { WS_UINT64_VALUE_TYPE, ~0, sizeof(UINT64), "<t>18446744073709551615</t>", + "<t t=\"18446744073709551615\"/>" }, + }; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteValue( NULL, tests[0].type, &tests[0].val, tests[0].size, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteValue( writer, tests[0].type, &tests[0].val, tests[0].size, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* zero size */ + hr = WsWriteValue( writer, tests[0].type, &tests[0].val, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + /* NULL value */ + hr = WsWriteValue( writer, tests[0].type, NULL, 0, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* element type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteValue( writer, tests[i].type, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result, __LINE__ ); + } + + /* attribute type mapping */ + for (i = 0; i < sizeof(tests)/sizeof(tests[0]); i++) + { + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteValue( writer, tests[i].type, &tests[i].val, tests[i].size, NULL ); + ok( hr == S_OK, "%u: got %08x\n", i, hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, tests[i].result2, __LINE__ ); + } + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -810,6 +916,7 @@ START_TEST(writer) test_WsWriteStartAttribute(); test_WsWriteType(); test_WsWriteElement(); + test_WsWriteValue(); test_basic_type(); test_simple_struct_type(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index a6656ab..4bda968 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -186,7 +186,7 @@ @ stdcall WsWriteStartElement(ptr ptr ptr ptr ptr) @ stdcall WsWriteText(ptr ptr ptr) @ stdcall WsWriteType(ptr long long ptr long ptr long ptr) -@ stub WsWriteValue +@ stdcall WsWriteValue(ptr long ptr long ptr) @ stdcall WsWriteXmlBuffer(ptr ptr ptr) @ stdcall WsWriteXmlBufferToBytes(ptr ptr ptr ptr long ptr ptr ptr ptr) @ stub WsWriteXmlnsAttribute diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 20a76de..05094cd 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1414,6 +1414,63 @@ HRESULT WINAPI WsWriteType( WS_XML_WRITER *handle, WS_TYPE_MAPPING mapping, WS_T return hr; } +static WS_TYPE map_value_type( WS_VALUE_TYPE type ) +{ + switch (type) + { + case WS_BOOL_VALUE_TYPE: return WS_BOOL_TYPE; + case WS_INT8_VALUE_TYPE: return WS_INT8_TYPE; + case WS_INT16_VALUE_TYPE: return WS_INT16_TYPE; + case WS_INT32_VALUE_TYPE: return WS_INT32_TYPE; + case WS_INT64_VALUE_TYPE: return WS_INT64_TYPE; + case WS_UINT8_VALUE_TYPE: return WS_UINT8_TYPE; + case WS_UINT16_VALUE_TYPE: return WS_UINT16_TYPE; + case WS_UINT32_VALUE_TYPE: return WS_UINT32_TYPE; + case WS_UINT64_VALUE_TYPE: return WS_UINT64_TYPE; + case WS_FLOAT_VALUE_TYPE: return WS_FLOAT_TYPE; + case WS_DOUBLE_VALUE_TYPE: return WS_DOUBLE_TYPE; + case WS_DECIMAL_VALUE_TYPE: return WS_DECIMAL_TYPE; + case WS_DATETIME_VALUE_TYPE: return WS_DATETIME_TYPE; + case WS_TIMESPAN_VALUE_TYPE: return WS_TIMESPAN_TYPE; + case WS_GUID_VALUE_TYPE: return WS_GUID_TYPE; + default: + FIXME( "unhandled type %u\n", type ); + return ~0u; + } +} + +/************************************************************************** + * WsWriteValue [webservices.@] + */ +HRESULT WINAPI WsWriteValue( WS_XML_WRITER *handle, WS_VALUE_TYPE value_type, const void *value, + ULONG size, WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_TYPE_MAPPING mapping; + WS_TYPE type; + + TRACE( "%p %u %p %u %p\n", handle, value_type, value, size, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !value || (type = map_value_type( value_type )) == ~0u) return E_INVALIDARG; + + switch (writer->state) + { + case WRITER_STATE_STARTATTRIBUTE: + mapping = WS_ATTRIBUTE_TYPE_MAPPING; + break; + + case WRITER_STATE_STARTELEMENT: + mapping = WS_ELEMENT_TYPE_MAPPING; + break; + + default: + return WS_E_INVALID_FORMAT; + } + + return write_type( writer, mapping, type, NULL, WS_WRITE_REQUIRED_VALUE, value, size ); +} + /************************************************************************** * WsWriteXmlBuffer [webservices.@] */

1 0

Hans Leidekker : webservices: Implement WsWriteElement.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 2f37267312390a9d2930f90ddfe5934f072f3e5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f37267312390a9d2930f90dd… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:26 2016 +0100 webservices: Implement WsWriteElement. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 80 +++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 158 ++++++++++++++++++++++++++------------ 3 files changed, 191 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2f37267312390a9d2930f…

1 0

Hans Leidekker : webservices: Add support for structure types in WsWriteType.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 98d19212e7a8c0ed4625941f415a42cc34a62cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98d19212e7a8c0ed4625941f4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jan 29 13:27:25 2016 +0100 webservices: Add support for structure types in WsWriteType. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 86 +++++++++++++++++++++++++++ dlls/webservices/writer.c | 126 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 8394f7a..fdddceb 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -636,6 +636,91 @@ static void test_basic_type(void) WsFreeWriter( writer ); } +static void test_simple_struct_type(void) +{ + static const WCHAR valueW[] = {'v','a','l','u','e',0}; + HRESULT hr; + WS_XML_WRITER *writer; + WS_STRUCT_DESCRIPTION s; + WS_FIELD_DESCRIPTION f, *fields[1]; + WS_XML_STRING localname = {6, (BYTE *)"struct"}, ns = {0, NULL}; + struct test + { + const WCHAR *field; + } *test; + + hr = WsCreateWriter( NULL, 0, &writer, NULL ) ; + ok( hr == S_OK, "got %08x\n", hr ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + memset( &f, 0, sizeof(f) ); + f.mapping = WS_TEXT_FIELD_MAPPING; + f.type = WS_WSZ_TYPE; + fields[0] = &f; + + memset( &s, 0, sizeof(s) ); + s.size = sizeof(struct test); + s.alignment = TYPE_ALIGNMENT(struct test); + s.fields = fields; + s.fieldCount = 1; + + test = HeapAlloc( GetProcessHeap(), 0, sizeof(*test) ); + test->field = valueW; + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, NULL, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_CONTENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ELEMENT_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct>value</struct>", __LINE__ ); + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartElement( writer, NULL, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteStartAttribute( writer, NULL, &localname, &ns, FALSE, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteType( writer, WS_ATTRIBUTE_TYPE_MAPPING, WS_STRUCT_TYPE, &s, + WS_WRITE_REQUIRED_POINTER, &test, sizeof(test), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndAttribute( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + check_output( writer, "<struct struct=\"value\"/>", __LINE__ ); + + HeapFree( GetProcessHeap(), 0, test ); + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -646,4 +731,5 @@ START_TEST(writer) test_WsWriteStartAttribute(); test_WsWriteType(); test_basic_type(); + test_simple_struct_type(); } diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index 00fd310..5efd62e 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -1113,12 +1113,138 @@ static HRESULT write_type_wsz( struct writer *writer, WS_TYPE_MAPPING mapping, return hr; } +static HRESULT write_type_struct( struct writer *, WS_TYPE_MAPPING, const WS_STRUCT_DESCRIPTION *, + const void * ); + +static HRESULT write_type_struct_field( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_FIELD_DESCRIPTION *desc, const void *value ) +{ + HRESULT hr; + + if (desc->options && desc->options != WS_FIELD_POINTER && + desc->options != WS_FIELD_OPTIONAL && + desc->options != (WS_FIELD_POINTER | WS_FIELD_OPTIONAL)) + { + FIXME( "options 0x%x not supported\n", desc->options ); + return E_NOTIMPL; + } + + switch (desc->type) + { + case WS_STRUCT_TYPE: + { + const void * const *ptr = value; + if ((hr = write_type_struct( writer, mapping, desc->typeDescription, *ptr )) != S_OK) return hr; + break; + } + case WS_BOOL_TYPE: + { + const BOOL *ptr = value; + if ((hr = write_type_bool( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT8_TYPE: + { + const INT8 *ptr = value; + if ((hr = write_type_int8( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT16_TYPE: + { + const INT16 *ptr = value; + if ((hr = write_type_int16( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT32_TYPE: + { + const INT32 *ptr = value; + if ((hr = write_type_int32( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_INT64_TYPE: + { + const INT64 *ptr = value; + if ((hr = write_type_int64( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT8_TYPE: + { + const UINT8 *ptr = value; + if ((hr = write_type_uint8( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT16_TYPE: + { + const UINT16 *ptr = value; + if ((hr = write_type_uint16( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT32_TYPE: + { + const UINT32 *ptr = value; + if ((hr = write_type_uint32( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_UINT64_TYPE: + { + const UINT64 *ptr = value; + if ((hr = write_type_uint64( writer, mapping, desc->typeDescription, ptr )) != S_OK) return hr; + break; + } + case WS_WSZ_TYPE: + { + const WCHAR * const *ptr = value; + if ((hr = write_type_wsz( writer, mapping, desc->typeDescription, *ptr )) != S_OK) return hr; + break; + } + default: + FIXME( "type %u not implemented\n", desc->type ); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT write_type_struct( struct writer *writer, WS_TYPE_MAPPING mapping, + const WS_STRUCT_DESCRIPTION *desc, const void *value ) +{ + ULONG i; + HRESULT hr; + const char *ptr; + + if (!desc) return E_INVALIDARG; + + if (desc->structOptions) + { + FIXME( "struct options 0x%x not supported\n", desc->structOptions ); + return E_NOTIMPL; + } + + for (i = 0; i < desc->fieldCount; i++) + { + ptr = (const char *)value + desc->fields[i]->offset; + if ((hr = write_type_struct_field( writer, mapping, desc->fields[i], ptr )) != S_OK) + return hr; + } + + return S_OK; +} + static HRESULT write_type( struct writer *writer, WS_TYPE_MAPPING mapping, WS_TYPE type, const void *desc, WS_WRITE_OPTION option, const void *value, ULONG size ) { switch (type) { + case WS_STRUCT_TYPE: + { + const void * const *ptr = value; + + if (!desc || option != WS_WRITE_REQUIRED_POINTER || size != sizeof(*ptr)) + return E_INVALIDARG; + + return write_type_struct( writer, mapping, desc, *ptr ); + } case WS_BOOL_TYPE: { const BOOL *ptr = value;

1 0

Francois Gouget : ntdll/tests: Fix an infinite loop on platforms where NtQuerySystemInformationEx() is not implemented.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 93988c503922095353a7c2da3bfacd8ab6fe2754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93988c503922095353a7c2da3… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 29 12:32:16 2016 +0100 ntdll/tests: Fix an infinite loop on platforms where NtQuerySystemInformationEx() is not implemented. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index f590cfb..c9b6703 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -743,17 +743,21 @@ static void test_query_logicalprocex(void) status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len); ok(status == STATUS_SUCCESS, "got 0x%08x\n", status); - ok(infoex->Size > 0, "got %u\n", infoex->Size); ret = pGetLogicalProcessorInformationEx(RelationAll, infoex2, &len2); ok(ret, "got %d, error %d\n", ret, GetLastError()); ok(!memcmp(infoex, infoex2, len), "returned info data mismatch\n"); - for(i = 0; i < len; ){ + for(i = 0; status == STATUS_SUCCESS && i < len; ){ SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *ex = (void*)(((char *)infoex) + i); ok(ex->Relationship >= RelationProcessorCore && ex->Relationship <= RelationGroup, "Got invalid relationship value: 0x%x\n", ex->Relationship); + if (!ex->Size) + { + ok(0, "got infoex[%u].Size=0\n", i); + break; + } trace("infoex[%u].Size: %u\n", i, ex->Size); switch(ex->Relationship){

1 0

Alexandre Julliard : include: Update stdcall and cdecl definitions in crtdefs.h.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 206e8b147bc8670621d8dfaaa03834fb1fc02082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=206e8b147bc8670621d8dfaaa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 18:05:46 2016 +0900 include: Update stdcall and cdecl definitions in crtdefs.h. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/crtdefs.h | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/include/msvcrt/crtdefs.h b/include/msvcrt/crtdefs.h index f2600ad..dde5ea1 100644 --- a/include/msvcrt/crtdefs.h +++ b/include/msvcrt/crtdefs.h @@ -44,7 +44,7 @@ #ifndef __stdcall # ifdef __i386__ # ifdef __GNUC__ -# ifdef __APPLE__ /* Mac OS X uses a 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__)) # else # define __stdcall __attribute__((__stdcall__)) @@ -55,21 +55,29 @@ # error You need to define __stdcall for your compiler # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __stdcall __attribute__((ms_abi)) -# else +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __stdcall __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __stdcall __attribute__((ms_abi)) +# endif +# else /* __i386__ */ # define __stdcall -# endif +# endif /* __i386__ */ #endif /* __stdcall */ #ifndef __cdecl # if defined(__i386__) && defined(__GNUC__) -# ifdef __APPLE__ /* Mac OS X uses 16-byte aligned stack and not a 4-byte one */ +# if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__) # define __cdecl __attribute__((__cdecl__)) __attribute__((__force_align_arg_pointer__)) # else # define __cdecl __attribute__((__cdecl__)) # endif # elif defined(__x86_64__) && defined (__GNUC__) -# define __cdecl __attribute__((ms_abi)) +# if (__GNUC__ > 5) || ((__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)) +# define __cdecl __attribute__((ms_abi)) __attribute__((__force_align_arg_pointer__)) +# else +# define __cdecl __attribute__((ms_abi)) +# endif # elif !defined(_MSC_VER) # define __cdecl # endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016