October 2015 - Wine-Commits

Michael Stefaniuc : schedsvc: Simplify an if-condition (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: b39b37c0aec1bd0f3e82e5b6af3cbb5f4a70ccfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39b37c0aec1bd0f3e82e5b6a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Oct 14 00:04:59 2015 +0200 schedsvc: Simplify an if-condition (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/schedsvc/schedsvc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index 3f11d16..8be8c0d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -87,8 +87,7 @@ static HRESULT create_directory(const WCHAR *path) WCHAR *slash; DWORD last_error = GetLastError(); - if (last_error == ERROR_ALREADY_EXISTS || last_error != ERROR_PATH_NOT_FOUND || - !(slash = strrchrW(new_path, '\\'))) + if (last_error != ERROR_PATH_NOT_FOUND || !(slash = strrchrW(new_path, '\\'))) { hr = HRESULT_FROM_WIN32(last_error); break;

1 0

Huw Davies : ole32: Rewrite _Run() to return early on failure.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: a56a0eb063cca82dbbdcc8c3b30f753400c96035 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56a0eb063cca82dbbdcc8c3b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:47 2015 +0100 ole32: Rewrite _Run() to return early on failure. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 52 +++++++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 23 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 913d4af..1903932 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1330,26 +1330,30 @@ static HRESULT WINAPI DefaultHandler_Run( This->object_state = object_state_running; hr = IOleObject_Advise(This->pOleDelegate, &This->IAdviseSink_iface, &This->dwAdvConn); + if (FAILED(hr)) goto fail; - if (SUCCEEDED(hr) && This->clientSite) - hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); - - if (SUCCEEDED(hr)) + if (This->clientSite) { - IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, - (void **)&This->pPSDelegate); - if (This->pPSDelegate) - { - if(This->storage_state == storage_state_initialised) - hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); - else if(This->storage_state == storage_state_loaded) - hr = IPersistStorage_Load(This->pPSDelegate, This->storage); - } + hr = IOleObject_SetClientSite(This->pOleDelegate, This->clientSite); + if (FAILED(hr)) goto fail; } - if (SUCCEEDED(hr) && This->containerApp) + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IPersistStorage, + (void **)&This->pPSDelegate); + if (FAILED(hr)) goto fail; + + if (This->storage_state == storage_state_initialised) + hr = IPersistStorage_InitNew(This->pPSDelegate, This->storage); + else if (This->storage_state == storage_state_loaded) + hr = IPersistStorage_Load(This->pPSDelegate, This->storage); + if (FAILED(hr)) goto fail; + + if (This->containerApp) + { hr = IOleObject_SetHostNames(This->pOleDelegate, This->containerApp, This->containerObj); + if (FAILED(hr)) goto fail; + } /* FIXME: do more stuff here: * - IOleObject_GetMiscStatus @@ -1357,20 +1361,22 @@ static HRESULT WINAPI DefaultHandler_Run( * - IOleCache_OnRun */ - if (SUCCEEDED(hr)) - hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, - (void **)&This->pDataDelegate); + hr = IOleObject_QueryInterface(This->pOleDelegate, &IID_IDataObject, + (void **)&This->pDataDelegate); + if (FAILED(hr)) goto fail; - if (SUCCEEDED(hr) && This->dataAdviseHolder) - hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); - - if (FAILED(hr)) + if (This->dataAdviseHolder) { - DefaultHandler_Stop(This); - release_delegates(This); + hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); + if (FAILED(hr)) goto fail; } return hr; + +fail: + DefaultHandler_Stop(This); + release_delegates(This); + return hr; } /************************************************************************

1 0

Huw Davies : ole32: Always use object_is_running to check whether the object is running.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 4fcc5fec57349bf4ad82448b14d47280769fd5ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=4fcc5fec57349bf4ad82448b1… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:48 2015 +0100 ole32: Always use object_is_running to check whether the object is running. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 1903932..ad79e99 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1021,7 +1021,7 @@ static HRESULT WINAPI DefaultHandler_GetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && This->pDataDelegate) + if (FAILED(hres) && object_is_running( This )) hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium); return hres; @@ -1067,7 +1067,7 @@ static HRESULT WINAPI DefaultHandler_QueryGetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && This->pDataDelegate) + if (FAILED(hres) && object_is_running( This )) hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc); return hres; @@ -1089,7 +1089,7 @@ static HRESULT WINAPI DefaultHandler_GetCanonicalFormatEtc( TRACE("(%p, %p, %p)\n", iface, pformatetcIn, pformatetcOut); - if (!This->pDataDelegate) + if (!object_is_running( This )) return OLE_E_NOTRUNNING; return IDataObject_GetCanonicalFormatEtc(This->pDataDelegate, pformatetcIn, pformatetcOut); @@ -1177,7 +1177,7 @@ static HRESULT WINAPI DefaultHandler_DAdvise( if (!This->dataAdviseHolder) { hres = CreateDataAdviseHolder(&This->dataAdviseHolder); - if (SUCCEEDED(hres) && This->pDataDelegate) + if (SUCCEEDED(hres) && object_is_running( This )) DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate); } @@ -1327,8 +1327,6 @@ static HRESULT WINAPI DefaultHandler_Run( if (FAILED(hr)) return hr; - This->object_state = object_state_running; - hr = IOleObject_Advise(This->pOleDelegate, &This->IAdviseSink_iface, &This->dwAdvConn); if (FAILED(hr)) goto fail; @@ -1365,6 +1363,8 @@ static HRESULT WINAPI DefaultHandler_Run( (void **)&This->pDataDelegate); if (FAILED(hr)) goto fail; + This->object_state = object_state_running; + if (This->dataAdviseHolder) { hr = DataAdviseHolder_OnConnect(This->dataAdviseHolder, This->pDataDelegate);

1 0

Huw Davies : ole32: Return OLE_E_NOTRUNNING on a cache-miss when the object isn't running.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: e4ec89f2b052fa8052ba394d013e46d1660587ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4ec89f2b052fa8052ba394d0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Oct 14 10:33:49 2015 +0100 ole32: Return OLE_E_NOTRUNNING on a cache-miss when the object isn't running. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/defaulthandler.c | 22 ++++++++++++++++++++-- dlls/ole32/tests/ole2.c | 2 -- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index ad79e99..9f6fa2b 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -1021,8 +1021,17 @@ static HRESULT WINAPI DefaultHandler_GetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && object_is_running( This )) + if (hres == S_OK) return hres; + + if (object_is_running( This )) + { hres = IDataObject_GetData(This->pDataDelegate, pformatetcIn, pmedium); + if (hres == S_OK) return hres; + } + + /* Query running state again, as the object may have closed during _GetData call */ + if (!object_is_running( This )) + hres = OLE_E_NOTRUNNING; return hres; } @@ -1067,8 +1076,17 @@ static HRESULT WINAPI DefaultHandler_QueryGetData( IDataObject_Release(cacheDataObject); - if (FAILED(hres) && object_is_running( This )) + if (hres == S_OK) return hres; + + if (object_is_running( This )) + { hres = IDataObject_QueryGetData(This->pDataDelegate, pformatetc); + if (hres == S_OK) return hres; + } + + /* Query running state again, as the object may have closed during _QueryGetData call */ + if (!object_is_running( This )) + hres = OLE_E_NOTRUNNING; return hres; } diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index b297f03..39680af 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1933,7 +1933,6 @@ static void test_default_handler(void) fmtetc.lindex = -1; fmtetc.tymed = TYMED_ENHMF; hr = IDataObject_QueryGetData(pDataObject, &fmtetc); - todo_wine ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); fmtetc.cfFormat = CF_TEXT; @@ -1942,7 +1941,6 @@ static void test_default_handler(void) fmtetc.lindex = -1; fmtetc.tymed = TYMED_NULL; hr = IDataObject_QueryGetData(pDataObject, &fmtetc); - todo_wine ok(hr == OLE_E_NOTRUNNING, "IDataObject_QueryGetData should have returned OLE_E_NOTRUNNING instead of 0x%08x\n", hr); hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnableObject);

1 0

Alexandre Julliard : wineps: Avoid sizeof in a trace.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 36a88cdb1132d95af0f641746485fe0c4430cca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a88cdb1132d95af0f641746… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 14 20:37:40 2015 +0900 wineps: Avoid sizeof in a trace. --- dlls/wineps.drv/download.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c index 30eb0db..dc77cf1 100644 --- a/dlls/wineps.drv/download.c +++ b/dlls/wineps.drv/download.c @@ -656,7 +656,7 @@ static void get_post2_custom_glyph_name(BYTE *post2header, DWORD size, WORD inde if(name_offset + sizeof(BYTE) > size) { FIXME("Pascal name offset '%d' exceeds PostScript Format 2 table size (%d)\n", - name_offset + sizeof(BYTE), size); + name_offset + 1, size); return; } name_length = (post2header + name_offset)[0];

1 0

Hans Leidekker : webservices: Accept single quote as attribute value delimiter.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 63e0b485168e483c75694a212d46842038139001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=63e0b485168e483c75694a212… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:03 2015 +0200 webservices: Accept single quote as attribute value delimiter. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 8 +++++--- dlls/webservices/tests/reader.c | 23 +++++++++++++++++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index a8990d8..f85b5e7 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -746,7 +746,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { WS_XML_ATTRIBUTE *attr; WS_XML_UTF8_TEXT *text; - unsigned int len = 0, ch, skip; + unsigned int len = 0, ch, skip, quote; const char *start; HRESULT hr = WS_E_INVALID_FORMAT; @@ -775,7 +775,8 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) read_skip( reader, 1 ); read_skip_whitespace( reader ); - if (read_cmp( reader, "\"", 1 )) goto error; + if (read_cmp( reader, "\"", 1 ) && read_cmp( reader, "'", 1 )) goto error; + quote = read_utf8_char( reader, &skip ); read_skip( reader, 1 ); len = 0; @@ -783,7 +784,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) for (;;) { if (!(ch = read_utf8_char( reader, &skip ))) goto error; - if (ch == '"') break; + if (ch == quote) break; read_skip( reader, skip ); len += skip; } @@ -795,6 +796,7 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) return E_OUTOFMEMORY; } attr->value = (WS_XML_TEXT *)text; + attr->singleQuote = (quote == '\''); *ret = attr; return S_OK; diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 0d32864..f4ac601 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -50,7 +50,7 @@ static const char data5[] = static const char data6[] = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" - "<text attr= \"value\" >test</text>"; + "<text attr= \"value\" attr2='value2'>test</text>"; static const char data8[] = "<node1><node2>test</node2></node1>"; @@ -872,7 +872,7 @@ static void test_WsReadNode(void) ok( elem->ns != NULL, "ns not set\n" ); ok( !elem->ns->length, "got %u\n", elem->ns->length ); ok( elem->ns->bytes != NULL, "bytes not set\n" ); - ok( elem->attributeCount == 1, "got %u\n", elem->attributeCount ); + ok( elem->attributeCount == 2, "got %u\n", elem->attributeCount ); ok( elem->attributes != NULL, "attributes not set\n" ); ok( !elem->isEmpty, "isEmpty not zero\n" ); @@ -894,6 +894,25 @@ static void test_WsReadNode(void) ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); ok( text->value.length == 5, "got %u\n", text->value.length ); ok( !memcmp( text->value.bytes, "value", 5 ), "wrong data\n" ); + + attr = elem->attributes[1]; + ok( attr->singleQuote == 1, "got %u\n", attr->singleQuote ); + ok( !attr->isXmlNs, "got %u\n", attr->isXmlNs ); + ok( attr->prefix != NULL, "prefix not set\n" ); + ok( !attr->prefix->length, "got %u\n", attr->prefix->length ); + ok( attr->prefix->bytes == NULL, "bytes set\n" ); + ok( attr->localName != NULL, "localName not set\n" ); + ok( attr->localName->length == 5, "got %u\n", attr->localName->length ); + ok( !memcmp( attr->localName->bytes, "attr2", 5 ), "wrong data\n" ); + ok( attr->ns != NULL, "ns not set\n" ); + ok( !attr->ns->length, "got %u\n", attr->ns->length ); + ok( attr->ns->bytes == NULL, "bytes set\n" ); + ok( attr->value != NULL, "value not set\n" ); + + text = (WS_XML_UTF8_TEXT *)attr->value; + ok( attr->value->textType == WS_XML_TEXT_TYPE_UTF8, "got %u\n", attr->value->textType ); + ok( text->value.length == 6, "got %u\n", text->value.length ); + ok( !memcmp( text->value.bytes, "value2", 6 ), "wrong data\n" ); } WsFreeReader( reader );

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 11c0f05ac98912316e8ab6895b14b09d6a1eb90c URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c0f05ac98912316e8ab6895… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 14 13:01:04 2015 +0200 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/include/webservices.h b/include/webservices.h index d9d1052..7d9a0e2 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -27,6 +27,7 @@ typedef struct _WS_ERROR WS_ERROR; typedef struct _WS_HEAP WS_HEAP; typedef struct _WS_XML_BUFFER WS_XML_BUFFER; typedef struct _WS_XML_READER WS_XML_READER; +typedef struct _WS_XML_WRITER WS_XML_WRITER; struct _WS_STRUCT_DESCRIPTION; struct _WS_XML_STRING; @@ -81,6 +82,44 @@ typedef struct _WS_XML_READER_PROPERTY { } WS_XML_READER_PROPERTY; typedef enum { + WS_XML_WRITER_PROPERTY_MAX_DEPTH, + WS_XML_WRITER_PROPERTY_ALLOW_FRAGMENT, + WS_XML_WRITER_PROPERTY_MAX_ATTRIBUTES, + WS_XML_WRITER_PROPERTY_WRITE_DECLARATION, + WS_XML_WRITER_PROPERTY_INDENT, + WS_XML_WRITER_PROPERTY_BUFFER_TRIM_SIZE, + WS_XML_WRITER_PROPERTY_CHARSET, + WS_XML_WRITER_PROPERTY_BUFFERS, + WS_XML_WRITER_PROPERTY_BUFFER_MAX_SIZE, + WS_XML_WRITER_PROPERTY_BYTES, + WS_XML_WRITER_PROPERTY_IN_ATTRIBUTE, + WS_XML_WRITER_PROPERTY_MAX_MIME_PARTS_BUFFER_SIZE, + WS_XML_WRITER_PROPERTY_INITIAL_BUFFER, + WS_XML_WRITER_PROPERTY_ALLOW_INVALID_CHARACTER_REFERENCES, + WS_XML_WRITER_PROPERTY_MAX_NAMESPACES, + WS_XML_WRITER_PROPERTY_BYTES_WRITTEN, + WS_XML_WRITER_PROPERTY_BYTES_TO_CLOSE, + WS_XML_WRITER_PROPERTY_COMPRESS_EMPTY_ELEMENTS, + WS_XML_WRITER_PROPERTY_EMIT_UNCOMPRESSED_EMPTY_ELEMENTS +} WS_XML_WRITER_PROPERTY_ID; + +typedef struct _WS_XML_WRITER_PROPERTY { + WS_XML_WRITER_PROPERTY_ID id; + void *value; + ULONG valueSize; +} WS_XML_WRITER_PROPERTY; + +typedef struct _WS_BYTES { + ULONG length; + BYTE *bytes; +} WS_BYTES; + +typedef struct _WS_BUFFERS { + ULONG bufferCount; + WS_BYTES *buffers; +} WS_BUFFERS; + +typedef enum { WS_XML_READER_ENCODING_TYPE_TEXT = 1, WS_XML_READER_ENCODING_TYPE_BINARY = 2, WS_XML_READER_ENCODING_TYPE_MTOM = 3, @@ -92,6 +131,17 @@ typedef struct _WS_XML_READER_ENCODING { } WS_XML_READER_ENCODING; typedef enum { + WS_XML_WRITER_ENCODING_TYPE_TEXT = 1, + WS_XML_WRITER_ENCODING_TYPE_BINARY = 2, + WS_XML_WRITER_ENCODING_TYPE_MTOM = 3, + WS_XML_WRITER_ENCODING_TYPE_RAW = 4 +} WS_XML_WRITER_ENCODING_TYPE; + +typedef struct _WS_XML_WRITER_ENCODING { + WS_XML_WRITER_ENCODING_TYPE encodingType; +} WS_XML_WRITER_ENCODING; + +typedef enum { WS_CHARSET_AUTO, WS_CHARSET_UTF8, WS_CHARSET_UTF16LE, @@ -103,21 +153,39 @@ typedef struct _WS_XML_READER_TEXT_ENCODING { WS_CHARSET charSet; } WS_XML_READER_TEXT_ENCODING; +typedef struct _WS_XML_WRITER_TEXT_ENCODING { + WS_XML_WRITER_ENCODING encoding; + WS_CHARSET charSet; +} WS_XML_WRITER_TEXT_ENCODING; + typedef enum { WS_XML_READER_INPUT_TYPE_BUFFER = 1, WS_XML_READER_INPUT_TYPE_STREAM = 2 } WS_XML_READER_INPUT_TYPE; +typedef enum { + WS_XML_WRITER_OUTPUT_TYPE_BUFFER = 1, + WS_XML_WRITER_OUTPUT_TYPE_STREAM = 2 +} WS_XML_WRITER_OUTPUT_TYPE; + typedef struct _WS_XML_READER_INPUT { WS_XML_READER_INPUT_TYPE inputType; } WS_XML_READER_INPUT; +typedef struct _WS_XML_WRITER_OUTPUT { + WS_XML_WRITER_OUTPUT_TYPE outputType; +} WS_XML_WRITER_OUTPUT; + typedef struct _WS_XML_READER_BUFFER_INPUT { WS_XML_READER_INPUT input; void *encodedData; ULONG encodedDataSize; } WS_XML_READER_BUFFER_INPUT; +typedef struct _WS_XML_WRITER_BUFFER_OUTPUT { + WS_XML_WRITER_OUTPUT output; +} WS_XML_WRITER_BUFFER_OUTPUT; + typedef enum { WS_SHORT_CALLBACK, WS_LONG_CALLBACK @@ -208,6 +276,13 @@ typedef enum { } WS_READ_OPTION; typedef enum { + WS_WRITE_REQUIRED_VALUE = 1, + WS_WRITE_REQUIRED_POINTER = 2, + WS_WRITE_NILLABLE_VALUE = 3, + WS_WRITE_NILLABLE_POINTER = 4 +} WS_WRITE_OPTION; + +typedef enum { WS_TYPE_ATTRIBUTE_FIELD_MAPPING, WS_ATTRIBUTE_FIELD_MAPPING, WS_ELEMENT_FIELD_MAPPING, @@ -233,6 +308,15 @@ typedef struct _WS_ITEM_RANGE { ULONG maxItemCount; } WS_ITEM_RANGE; +enum +{ + WS_FIELD_POINTER = 0x1, + WS_FIELD_OPTIONAL = 0x2, + WS_FIELD_NILLABLE = 0x4, + WS_FIELD_NILLABLE_ITEM = 0x8, + WS_FIELD_OTHER_NAMESPACE = 0x10 +}; + typedef struct _WS_FIELD_DESCRIPTION { WS_FIELD_MAPPING mapping; WS_XML_STRING *localName; @@ -248,6 +332,13 @@ typedef struct _WS_FIELD_DESCRIPTION { WS_ITEM_RANGE *itemRange; } WS_FIELD_DESCRIPTION; +enum +{ + WS_STRUCT_ABSTRACT = 0x1, + WS_STRUCT_IGNORE_TRAILING_ELEMENT_CONTENT = 0x2, + WS_STRUCT_IGNORE_UNHANDLED_ATTRIBUTES = 0x4 +}; + typedef struct _WS_STRUCT_DESCRIPTION { ULONG size; ULONG alignment; @@ -353,18 +444,21 @@ typedef struct _WS_XML_NODE_POSITION { HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*); +HRESULT WINAPI WsCreateWriter(const WS_XML_WRITER_PROPERTY*, ULONG, WS_XML_WRITER**, WS_ERROR*); HRESULT WINAPI WsFillReader(WS_XML_READER*, ULONG, const WS_ASYNC_CONTEXT*, WS_ERROR*); HRESULT WINAPI WsFindAttribute(WS_XML_READER*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, ULONG*, WS_ERROR*); void WINAPI WsFreeError(WS_ERROR*); void WINAPI WsFreeHeap(WS_HEAP*); void WINAPI WsFreeReader(WS_XML_READER*); +void WINAPI WsFreeWriter(WS_XML_WRITER*); HRESULT WINAPI WsGetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, void*, ULONG); HRESULT WINAPI WsGetErrorString(WS_ERROR*, ULONG, WS_STRING*); HRESULT WINAPI WsGetHeapProperty(WS_HEAP*, WS_HEAP_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetReaderNode(WS_XML_READER*, const WS_XML_NODE**, WS_ERROR*); HRESULT WINAPI WsGetReaderPosition(WS_XML_READER*, WS_XML_NODE_POSITION*, WS_ERROR*); HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, @@ -380,7 +474,10 @@ HRESULT WINAPI WsReadType(WS_XML_READER*, WS_TYPE_MAPPING, WS_TYPE, const void*, HRESULT WINAPI WsSetErrorProperty(WS_ERROR*, WS_ERROR_PROPERTY_ID, const void*, ULONG); HRESULT WINAPI WsSetInput(WS_XML_READER*, const WS_XML_READER_ENCODING*, const WS_XML_READER_INPUT*, const WS_XML_READER_PROPERTY*, ULONG, WS_ERROR*); - +HRESULT WINAPI WsSetOutput(WS_XML_WRITER*, const WS_XML_WRITER_ENCODING*, const WS_XML_WRITER_OUTPUT*, + const WS_XML_WRITER_PROPERTY*, ULONG, WS_ERROR*); +HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, + const void*, ULONG, WS_ERROR*); #define WS_S_ASYNC 0x003d0000 #define WS_S_END 0x003d0001

1 0

Nikolay Sivov : comctl32/tests: Fix function prototype (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 490b4eec4bc2f169633e3e660e924e2276751e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=490b4eec4bc2f169633e3e660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:15:32 2015 +0300 comctl32/tests: Fix function prototype (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 6f13846..7e8108a 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1254,7 +1254,7 @@ static void test_imagelist_storage(void) static void test_shell_imagelist(void) { - BOOL (WINAPI *pSHGetImageList)(INT, REFIID, void**); + HRESULT (WINAPI *pSHGetImageList)(INT, REFIID, void**); IImageList *iml = NULL; HMODULE hShell32; HRESULT hr; @@ -1274,8 +1274,7 @@ static void test_shell_imagelist(void) } /* Get system image list */ - hr = (pSHGetImageList)(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); - + hr = pSHGetImageList(SHIL_SYSSMALL, &IID_IImageList, (void**)&iml); ok(SUCCEEDED(hr), "SHGetImageList failed, hr=%x\n", hr); if (hr != S_OK) {

1 0

Nikolay Sivov : ddraw/tests: Use proper type for return values (PVS-Studio ).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 8cd2d5df202ec290f0ffbad2efbbc3e0ed71b0ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd2d5df202ec290f0ffbad2e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:40:29 2015 +0300 ddraw/tests: Use proper type for return values (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddrawmodes.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c index a325f86..13e2732 100644 --- a/dlls/ddraw/tests/ddrawmodes.c +++ b/dlls/ddraw/tests/ddrawmodes.c @@ -567,13 +567,13 @@ static void setdisplaymode(int i) scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom); if (!EqualRect(&scrn, &orig_rect)) { - HRESULT rect_result; + BOOL rect_result, ret; /* Check that the client rect was resized */ - rc = GetClientRect(hwnd, &test); - ok(rc!=0, "GetClientRect returned %x\n", rc); - rc = EqualRect(&scrn, &test); - todo_wine ok(rc!=0, "Fullscreen window has wrong size\n"); + ret = GetClientRect(hwnd, &test); + ok(ret, "GetClientRect returned %d\n", ret); + ret = EqualRect(&scrn, &test); + todo_wine ok(ret, "Fullscreen window has wrong size\n"); /* Check that switching to normal cooperative level does not restore the display mode */

1 0

Nikolay Sivov : d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio).
by Alexandre Julliard Oct. 14, 2015

Oct. 14, 2015

Module: wine Branch: master Commit: 6c2bda6e339fde134c2ee3e191f4e38b560f50de URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c2bda6e339fde134c2ee3e19… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 14 00:32:11 2015 +0300 d3d9/tests: Use BOOL variable for ShowCursor return value (PVS-Studio). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 3bf0ff2..326e789 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1638,12 +1638,12 @@ static void test_cursor(void) ok(SUCCEEDED(hr), "Failed to create cursor surface, hr %#x.\n", hr); /* Initially hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Not enabled without a surface*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Fails */ hr = IDirect3DDevice9_SetCursorProperties(device, 0, 0, NULL); @@ -1661,12 +1661,12 @@ static void test_cursor(void) ok(info.hCursor == cur, "The cursor handle is %p\n", info.hCursor); /* unchanged */ /* Still hidden */ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == FALSE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(!ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); /* Enabled now*/ - hr = IDirect3DDevice9_ShowCursor(device, TRUE); - ok(hr == TRUE, "IDirect3DDevice9_ShowCursor returned %08x\n", hr); + ret = IDirect3DDevice9_ShowCursor(device, TRUE); + ok(ret, "IDirect3DDevice9_ShowCursor returned %d\n", ret); memset(&info, 0, sizeof(info)); info.cbSize = sizeof(info);

1 0