February 2016 - Wine-Commits

Sebastian Lackner : ntdll/tests: Allow broken SpinCount for some Win 8+ systems.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: dcf914857c1e29b64a31a67685b123a09db1bae1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcf914857c1e29b64a31a6768… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 23 15:14:00 2016 +0100 ntdll/tests: Allow broken SpinCount for some Win 8+ systems. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/rtl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 1b17a7e..fc0d4b4 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -2075,8 +2075,9 @@ static void test_RtlInitializeCriticalSectionEx(void) "expected DebugInfo != NULL and DebugInfo != ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); - ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); - ok(cs.SpinCount == 0, "expected SpinCount == 0, got %ld\n", cs.SpinCount); + ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); + ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, + "expected SpinCount == 0, got %ld\n", cs.SpinCount); RtlDeleteCriticalSection(&cs); memset(&cs, 0x11, sizeof(cs)); @@ -2085,7 +2086,7 @@ static void test_RtlInitializeCriticalSectionEx(void) ok(cs.DebugInfo == no_debug, "expected DebugInfo == ~0, got %p\n", cs.DebugInfo); ok(cs.LockCount == -1, "expected LockCount == -1, got %d\n", cs.LockCount); ok(cs.RecursionCount == 0, "expected RecursionCount == 0, got %d\n", cs.RecursionCount); - ok(cs.LockSemaphore == 0, "expected LockSemaphore == 0, got %p\n", cs.LockSemaphore); + ok(cs.LockSemaphore == NULL, "expected LockSemaphore == NULL, got %p\n", cs.LockSemaphore); ok(cs.SpinCount == 0 || broken(cs.SpinCount != 0) /* >= Win 8 */, "expected SpinCount == 0, got %ld\n", cs.SpinCount); RtlDeleteCriticalSection(&cs);

1 0

Hans Leidekker : webservices: Add support for namespace attributes in the reader.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: e0ff2f930ddc3811e090efa5702bb1d6ea351b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ff2f930ddc3811e090efa57… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:54 2016 +0100 webservices: Add support for namespace attributes in the reader. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 2abb82a..92a8184 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -862,10 +862,12 @@ static HRESULT parse_name( const unsigned char *str, unsigned int len, static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) { + static const WS_XML_STRING xmlns = {5, (BYTE *)"xmlns"}; WS_XML_ATTRIBUTE *attr; WS_XML_UTF8_TEXT *text; unsigned int len = 0, ch, skip, quote; const unsigned char *start; + WS_XML_STRING *prefix, *localname; HRESULT hr = WS_E_INVALID_FORMAT; if (!(attr = heap_alloc_zero( sizeof(*attr) ))) return E_OUTOFMEMORY; @@ -880,9 +882,19 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) } if (!len) goto error; - if ((hr = parse_name( start, len, &attr->prefix, &attr->localName )) != S_OK) goto error; + if ((hr = parse_name( start, len, &prefix, &localname )) != S_OK) goto error; hr = E_OUTOFMEMORY; - if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; + if (WsXmlStringEquals( prefix, &xmlns, NULL ) == S_OK) + { + attr->isXmlNs = 1; + if (!(attr->prefix = alloc_xml_string( localname->bytes, localname->length ))) goto error; + attr->localName = localname; + } + else + { + attr->prefix = prefix; + attr->localName = localname; + } hr = WS_E_INVALID_FORMAT; read_skip_whitespace( reader ); @@ -906,8 +918,18 @@ static HRESULT read_attribute( struct reader *reader, WS_XML_ATTRIBUTE **ret ) read_skip( reader, 1 ); hr = E_OUTOFMEMORY; - if (!(text = alloc_utf8_text( start, len ))) goto error; - attr->value = &text->text; + if (attr->isXmlNs) + { + if (!(attr->ns = alloc_xml_string( start, len ))) goto error; + if (!(text = alloc_utf8_text( NULL, 0 ))) goto error; + attr->value = &text->text; + } + else + { + if (!(attr->ns = alloc_xml_string( NULL, 0 ))) goto error; + if (!(text = alloc_utf8_text( start, len ))) goto error; + attr->value = &text->text; + } attr->singleQuote = (quote == '\''); *ret = attr;

1 0

Austin English : include: Fix tagLOGCOLORSPACEW indentation.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 0366b4194e617643463bb9d7a21b81ae6b5a7b23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0366b4194e617643463bb9d7a… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Feb 23 02:40:28 2016 -0600 include: Fix tagLOGCOLORSPACEW indentation. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wingdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wingdi.h b/include/wingdi.h index ff11406..dbe12cd 100644 --- a/include/wingdi.h +++ b/include/wingdi.h @@ -193,7 +193,7 @@ typedef struct tagLOGCOLORSPACEA CHAR lcsFilename[MAX_PATH]; } LOGCOLORSPACEA, *LPLOGCOLORSPACEA; - typedef struct tagLOGCOLORSPACEW +typedef struct tagLOGCOLORSPACEW { DWORD lcsSignature; DWORD lcsVersion;

1 0

Alistair Leslie-Hughes : gdi32/tests: Add tests for GetPath using metafile.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: bd571e7d1d9749195941988a7c267eed7260e28d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd571e7d1d9749195941988a7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Feb 23 18:16:49 2016 +1100 gdi32/tests: Add tests for GetPath using metafile. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/metafile.c | 57 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index f464720..a90c533 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2661,6 +2661,62 @@ static void test_mf_clipping(void) DestroyWindow(hwnd); } +static const unsigned char MF_PATH_BITS[] = +{ + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x2c, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x14, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x13, 0x02, 0x96, 0x00, 0x32, 0x00, 0x05, 0x00, + 0x00, 0x00, 0x13, 0x02, 0x96, 0x00, 0x96, 0x00, + 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, 0x32, 0x00, + 0x96, 0x00, 0x05, 0x00, 0x00, 0x00, 0x13, 0x02, + 0x32, 0x00, 0x32, 0x00, 0x07, 0x00, 0x00, 0x00, + 0x1b, 0x04, 0x14, 0x00, 0x14, 0x00, 0x0a, 0x00, + 0x0a, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 +}; + +static void test_mf_GetPath(void) +{ + HDC hdc; + HMETAFILE hmf; + BOOL ret; + int size; + + SetLastError(0xdeadbeef); + hdc = CreateMetaFileA(NULL); + ok(hdc != 0, "CreateMetaFileA error %d\n", GetLastError()); + + BeginPath(hdc); + ret = MoveToEx(hdc, 50, 50, NULL); + ok( ret, "MoveToEx error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 150); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 150, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + ret = LineTo(hdc, 50, 50); + ok( ret, "LineTo error %d.\n", GetLastError()); + Rectangle(hdc, 10, 10, 20, 20); + EndPath(hdc); + + size = GetPath(hdc, NULL, NULL, 0); + ok( size == -1, "GetPath returned %d.\n", size); + + hmf = CloseMetaFile(hdc); + ok(hmf != 0, "CloseMetaFile error %d\n", GetLastError()); + + if (compare_mf_bits (hmf, MF_PATH_BITS, sizeof(MF_PATH_BITS), "mf_GetPath") != 0) + { + dump_mf_bits(hmf, "mf_GetPath"); + EnumMetaFile(0, hmf, mf_enum_proc, 0); + } + + ret = DeleteMetaFile(hmf); + ok( ret, "DeleteMetaFile error %d\n", GetLastError()); +} + static INT CALLBACK EmfEnumProc(HDC hdc, HANDLETABLE *lpHTable, const ENHMETARECORD *lpEMFR, INT nObj, LPARAM lpData) { LPMETAFILEPICT lpMFP = (LPMETAFILEPICT)lpData; @@ -3461,6 +3517,7 @@ START_TEST(metafile) test_SetMetaFileBits(); test_mf_ExtTextOut_on_path(); test_mf_clipping(); + test_mf_GetPath(); /* For metafile conversions */ test_mf_conversions();

1 0

Huw Davies : ole32: Remove curDragTargetHWND since it's never used.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: bf8e8f56f5e58e242aa4c9e8d9abf31a938e5863 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8e8f56f5e58e242aa4c9e8d… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Feb 23 10:09:27 2016 +0000 ole32: Remove curDragTargetHWND since it's never used. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/ole2.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index f078fb6..3740968 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -68,7 +68,6 @@ typedef struct tagTrackerWindowInfo BOOL escPressed; HWND curTargetHWND; /* window the mouse is hovering over */ - HWND curDragTargetHWND; /* might be an ancestor of curTargetHWND */ IDropTarget* curDragTarget; POINTL curMousePos; /* current position of the mouse in screen coordinates */ DWORD dwKeyState; /* current state of the shift and ctrl keys and the mouse buttons */ @@ -770,7 +769,6 @@ HRESULT WINAPI DoDragDrop ( trackerInfo.pdwEffect = pdwEffect; trackerInfo.trackingDone = FALSE; trackerInfo.escPressed = FALSE; - trackerInfo.curDragTargetHWND = 0; trackerInfo.curTargetHWND = 0; trackerInfo.curDragTarget = 0; @@ -2255,7 +2253,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) if (next_target_wnd) hwndNewTarget = next_target_wnd; - trackerInfo->curDragTargetHWND = hwndNewTarget; if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = get_droptarget_pointer(hwndNewTarget); @@ -2274,7 +2271,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) /* failed DragEnter() means invalid target */ if (hr != S_OK) { - trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0; @@ -2286,7 +2282,6 @@ static void OLEDD_TrackStateChange(TrackerWindowInfo* trackerInfo) /* * The mouse is not over a window so we don't track anything. */ - trackerInfo->curDragTargetHWND = 0; trackerInfo->curTargetHWND = 0; if(trackerInfo->curDragTarget) IDropTarget_Release(trackerInfo->curDragTarget); trackerInfo->curDragTarget = 0;

1 0

Detlef Riekenberg : crypt32/tests: Accept Windows 10 error code.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: c957ff6c4cea98ad35e48b69be49e507ef63f014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c957ff6c4cea98ad35e48b69b… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sat Feb 20 22:01:31 2016 +0100 crypt32/tests: Accept Windows 10 error code. Signed-off-by: Detlef Riekenberg <wine.dev(a)web.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/chain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index b7fe08b..be2ec54 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -125,8 +125,10 @@ static void testCreateCertChainEngine(void) CertAddEncodedCertificateToStore(store, X509_ASN_ENCODING, selfSignedCert, sizeof(selfSignedCert), CERT_STORE_ADD_ALWAYS, NULL); ret = pCertCreateCertificateChainEngine(pConfig, &engine); - ok(!ret && GetLastError() == CRYPT_E_NOT_FOUND, - "Expected CRYPT_E_NOT_FOUND, got %08x\n", GetLastError()); + /* ERROR_FILE_NOT_FOUND used in Windows 10 */ + ok(!ret && ((GetLastError() == CRYPT_E_NOT_FOUND) || + (GetLastError() == ERROR_FILE_NOT_FOUND)), + "Expected CRYPT_E_NOT_FOUND or ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); CertCloseStore(store, 0); }

1 0

Hugh McMaster : libwine: strtoulW and strtolW should set errno to ERANGE if an overflow will occur.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: a9fb9ac657fccd45baee39df4dbe085a8a8e7014 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9fb9ac657fccd45baee39df4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Feb 22 20:29:16 2016 +1100 libwine: strtoulW and strtolW should set errno to ERANGE if an overflow will occur. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/wine/string.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/wine/string.c b/libs/wine/string.c index f2a9bd3..7aa981f 100644 --- a/libs/wine/string.c +++ b/libs/wine/string.c @@ -19,6 +19,7 @@ */ #include <assert.h> +#include <errno.h> #include <limits.h> #include <stdio.h> @@ -162,6 +163,7 @@ long int strtolW( const WCHAR *nptr, WCHAR **endptr, int base ) if (overflow) { + errno = ERANGE; return negative ? LONG_MIN : LONG_MAX; } @@ -274,6 +276,7 @@ unsigned long int strtoulW( const WCHAR *nptr, WCHAR **endptr, int base ) if (overflow) { + errno = ERANGE; return ULONG_MAX; }

1 0

Hans Leidekker : webservices: Implement WsGetPrefixFromNamespace.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 2a4063cd86ea196b0e4b8cc8d6e7686331e72f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a4063cd86ea196b0e4b8cc8d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:52 2016 +0100 webservices: Implement WsGetPrefixFromNamespace. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 93 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 31 +++++++++++++ include/webservices.h | 2 + 4 files changed, 127 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/tests/writer.c b/dlls/webservices/tests/writer.c index 0e67eaf..446fa1d 100644 --- a/dlls/webservices/tests/writer.c +++ b/dlls/webservices/tests/writer.c @@ -1211,6 +1211,98 @@ static void test_WsWriteXmlnsAttribute(void) WsFreeWriter( writer ); } +static void prepare_prefix_test( WS_XML_WRITER *writer ) +{ + const WS_XML_STRING p = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, ns = {2, (BYTE *)"ns"}; + HRESULT hr; + + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndStartElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); +} + +static void test_WsGetPrefixFromNamespace(void) +{ + const WS_XML_STRING p = {1, (BYTE *)"p"}, localname = {1, (BYTE *)"t"}, *prefix; + const WS_XML_STRING ns = {2, (BYTE *)"ns"}, ns2 = {3, (BYTE *)"ns2"}; + WS_XML_WRITER *writer; + HRESULT hr; + + 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, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( NULL, NULL, FALSE, &prefix, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsGetPrefixFromNamespace( writer, NULL, FALSE, &prefix, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + /* element must be committed */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* but writer can't be positioned on end element node */ + hr = set_output( writer ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteStartElement( writer, &p, &localname, &ns, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsWriteEndElement( writer, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + + /* required = TRUE */ + prefix = NULL; + prepare_prefix_test( writer ); + hr = WsGetPrefixFromNamespace( writer, &ns, TRUE, &prefix, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( prefix != NULL, "prefix not set\n" ); + if (prefix) + { + ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); + } + + prefix = (const WS_XML_STRING *)0xdeadbeef; + hr = WsGetPrefixFromNamespace( writer, &ns2, TRUE, &prefix, NULL ); + ok( hr == WS_E_INVALID_FORMAT, "got %08x\n", hr ); + ok( prefix == (const WS_XML_STRING *)0xdeadbeef, "prefix set\n" ); + + /* required = FALSE */ + prefix = NULL; + prepare_prefix_test( writer ); + hr = WsGetPrefixFromNamespace( writer, &ns, FALSE, &prefix, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( prefix != NULL, "prefix not set\n" ); + if (prefix) + { + ok( prefix->length == 1, "got %u\n", prefix->length ); + ok( !memcmp( prefix->bytes, "p", 1 ), "wrong prefix\n" ); + } + + prefix = (const WS_XML_STRING *)0xdeadbeef; + hr = WsGetPrefixFromNamespace( writer, &ns2, FALSE, &prefix, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + ok( prefix == NULL, "prefix not set\n" ); + + WsFreeWriter( writer ); +} + START_TEST(writer) { test_WsCreateWriter(); @@ -1227,4 +1319,5 @@ START_TEST(writer) test_WsWriteAttribute(); test_WsWriteStartCData(); test_WsWriteXmlnsAttribute(); + test_WsGetPrefixFromNamespace(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3b0f1fc..f0a843a 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -79,7 +79,7 @@ @ stub WsGetOperationContextProperty @ stub WsGetPolicyAlternativeCount @ stub WsGetPolicyProperty -@ stub WsGetPrefixFromNamespace +@ stdcall WsGetPrefixFromNamespace(ptr ptr long ptr ptr) @ stdcall WsGetReaderNode(ptr ptr ptr) @ stub WsGetReaderPosition @ stdcall WsGetReaderProperty(ptr long ptr long ptr) diff --git a/dlls/webservices/writer.c b/dlls/webservices/writer.c index f55f644..14bddfb 100644 --- a/dlls/webservices/writer.c +++ b/dlls/webservices/writer.c @@ -493,6 +493,37 @@ static inline BOOL is_current_namespace( struct writer *writer, const WS_XML_STR return (WsXmlStringEquals( writer->current_ns, ns, NULL ) == S_OK); } +/************************************************************************** + * WsGetPrefixFromNamespace [webservices.@] + */ +HRESULT WINAPI WsGetPrefixFromNamespace( WS_XML_WRITER *handle, const WS_XML_STRING *ns, + BOOL required, const WS_XML_STRING **prefix, + WS_ERROR *error ) +{ + struct writer *writer = (struct writer *)handle; + WS_XML_ELEMENT_NODE *elem; + BOOL found = FALSE; + + TRACE( "%p %s %d %p %p\n", handle, debugstr_xmlstr(ns), required, prefix, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!writer || !ns || !prefix) return E_INVALIDARG; + + elem = &writer->current->hdr; + if (elem->prefix && is_current_namespace( writer, ns )) + { + *prefix = elem->prefix; + found = TRUE; + } + if (!found) + { + if (required) return WS_E_INVALID_FORMAT; + *prefix = NULL; + return S_FALSE; + } + return S_OK; +} + static HRESULT set_current_namespace( struct writer *writer, const WS_XML_STRING *ns ) { WS_XML_STRING *str; diff --git a/include/webservices.h b/include/webservices.h index 73b7f0a..cd82cb7 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -556,6 +556,8 @@ 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 WsGetPrefixFromNamespace(WS_XML_WRITER*, const WS_XML_STRING*, BOOL, + const WS_XML_STRING**, 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*);

1 0

Hans Leidekker : webservices: Implement WsWriteXmlnsAttribute.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 21d9e5181d8ca4434ab6e3847f3ec4980ef3c7f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=21d9e5181d8ca4434ab6e3847… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 23 13:11:51 2016 +0100 webservices: Implement WsWriteXmlnsAttribute. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/writer.c | 193 ++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- dlls/webservices/writer.c | 19 ++++ include/webservices.h | 2 + 4 files changed, 215 insertions(+), 1 deletion(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21d9e5181d8ca4434ab6e…

1 0

Alexandre Julliard : winepulse.drv: Avoid some printf format warnings.
by Alexandre Julliard Feb. 23, 2016

Feb. 23, 2016

Module: wine Branch: master Commit: 9bfff40db571bf4b4e0f704e6a05401ddf88567f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9bfff40db571bf4b4e0f704e6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 23 21:53:34 2016 +0900 winepulse.drv: Avoid some printf format warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winepulse.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winepulse.drv/mmdevdrv.c b/dlls/winepulse.drv/mmdevdrv.c index 04e9a0b..d57b822 100644 --- a/dlls/winepulse.drv/mmdevdrv.c +++ b/dlls/winepulse.drv/mmdevdrv.c @@ -662,7 +662,7 @@ static void pulse_wr_callback(pa_stream *s, size_t bytes, void *userdata) UINT32 oldpad = This->pad; if(This->local_buffer){ - size_t to_write; + UINT32 to_write; BYTE *buf = This->local_buffer + This->lcl_offs_bytes; if(This->pad > bytes){

1 0