March 2017 - Wine-commits - list.winehq.org

Alistair Leslie-Hughes : dplayx/tests: Free IDirectPlayLobby objects.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: e16abdfad1395d3703e1886838ae5f7cc8cb74e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16abdfad1395d3703e188683… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Mar 3 05:15:44 2017 +0000 dplayx/tests: Free IDirectPlayLobby objects. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/tests/dplayx.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c index 27dc9ee..2b4fda3 100644 --- a/dlls/dplayx/tests/dplayx.c +++ b/dlls/dplayx/tests/dplayx.c @@ -700,7 +700,7 @@ static void init_TCPIP_provider( IDirectPlay4 *pDP, LPCSTR strIPAddressString, W checkHR( DP_OK, hr ); HeapFree( GetProcessHeap(), 0, pAddress ); - + IDirectPlayLobby_Release(pDPL); } static BOOL CALLBACK EnumSessions_cb_join( LPCDPSESSIONDESC2 lpThisSD, @@ -940,6 +940,8 @@ static BOOL CALLBACK EnumConnections_cb( LPCGUID lpguidSP, callbackData->dwCounter1++; + IDirectPlayLobby_Release(pDPL); + return TRUE; } @@ -3075,7 +3077,7 @@ static void test_GetPlayerAddress(void) if ( hr == DP_OK ) { todo_wine win_skip( "GetPlayerAddress not implemented\n" ); - return; + goto cleanup; } init_TCPIP_provider( pDP[0], "127.0.0.1", 0 ); @@ -3171,9 +3173,11 @@ static void test_GetPlayerAddress(void) HeapFree( GetProcessHeap(), 0, lpData ); + +cleanup: IDirectPlayX_Release( pDP[0] ); IDirectPlayX_Release( pDP[1] ); - + IDirectPlayLobby_Release(pDPL); } /* GetPlayerFlags */

1 0

Louis Lenders : kernel32: Add stub for GetCurrentPackageFullName.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 3f50319ec384730360d16dd79d703adafaa953fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f50319ec384730360d16dd79… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Sat Mar 4 10:56:06 2017 +0100 kernel32: Add stub for GetCurrentPackageFullName. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/version.c | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 1eb8327..2c5cf9e 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -4,7 +4,7 @@ @ stub GetApplicationUserModelId @ stub GetCurrentApplicationUserModelId @ stub GetCurrentPackageFamilyName -@ stub GetCurrentPackageFullName +@ stdcall GetCurrentPackageFullName(ptr ptr) kernel32.GetCurrentPackageFullName @ stdcall GetCurrentPackageId(ptr ptr) kernel32.GetCurrentPackageId @ stub GetCurrentPackageInfo @ stub GetCurrentPackagePath diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 388f7c0..59e39a7 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -629,6 +629,7 @@ @ stdcall GetCurrentDirectoryA(long ptr) @ stdcall GetCurrentDirectoryW(long ptr) @ stdcall GetCurrentPackageId(ptr ptr) +@ stdcall GetCurrentPackageFullName(ptr ptr) @ stdcall -norelay GetCurrentProcess() @ stdcall -norelay GetCurrentProcessId() @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber diff --git a/dlls/kernel32/version.c b/dlls/kernel32/version.c index b9d13e4..cf783af 100644 --- a/dlls/kernel32/version.c +++ b/dlls/kernel32/version.c @@ -207,3 +207,12 @@ LONG WINAPI GetCurrentPackageId(UINT32 *len, BYTE *buffer) FIXME("(%p %p): stub\n", len, buffer); return APPMODEL_ERROR_NO_PACKAGE; } + +/*********************************************************************** + * GetCurrentPackageFullName (KERNEL32.@) + */ +LONG WINAPI GetCurrentPackageFullName(UINT32 *length, PWSTR name) +{ + FIXME("(%p %p): stub\n", length, name); + return APPMODEL_ERROR_NO_PACKAGE; +}

1 0

Bruno Jesus : mciavi32: Trace MCIAVI_CreateWindow.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: d3c25df82456032ac8f9faf16b3f5d549c6826f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3c25df82456032ac8f9faf16… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:26 2017 -0300 mciavi32: Trace MCIAVI_CreateWindow. Also normalize the parms parameter name like other functions Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/wnd.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mciavi32/wnd.c b/dlls/mciavi32/wnd.c index 66c7565..c9da9ec 100644 --- a/dlls/mciavi32/wnd.c +++ b/dlls/mciavi32/wnd.c @@ -109,7 +109,7 @@ BOOL MCIAVI_RegisterClass(void) return FALSE; } -BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpOpenParms) +BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARMSW lpParms) { static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0}; HWND hParent = 0; @@ -119,8 +119,8 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM /* what should be done ? */ if (wma->hWnd) return TRUE; - if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpOpenParms->hWndParent; - if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpOpenParms->dwStyle; + if (dwFlags & MCI_DGV_OPEN_PARENT) hParent = lpParms->hWndParent; + if (dwFlags & MCI_DGV_OPEN_WS) dwStyle = lpParms->dwStyle; if (wma->hic) SetRect(&rc, 0, 0, wma->outbih->biWidth, wma->outbih->biHeight); @@ -141,6 +141,9 @@ BOOL MCIAVI_CreateWindow(WINE_MCIAVI* wma, DWORD dwFlags, LPMCI_DGV_OPEN_PARM hParent, 0, MCIAVI_hInstance, ULongToPtr(wma->wDevID)); wma->hWndPaint = wma->hWnd; + + TRACE("(%04x, %08X, %p, style %x, parent %p, dimensions %dx%d, hwnd %p)\n", wma->wDevID, + dwFlags, lpParms, dwStyle, hParent, rc.right - rc.left, rc.bottom - rc.top, wma->hWnd); return wma->hWnd != 0; }

1 0

Bruno Jesus : mciavi32: Implement MCI_BREAK.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: c59dcfa50215ebd93a34003c6d76932910587ed9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c59dcfa50215ebd93a34003c6… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:27 2017 -0300 mciavi32: Implement MCI_BREAK. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciavi32/mciavi.c | 58 +++++++++++++++++++++++++++++++++++++----- dlls/mciavi32/private_mciavi.h | 5 ++++ 2 files changed, 56 insertions(+), 7 deletions(-) diff --git a/dlls/mciavi32/mciavi.c b/dlls/mciavi32/mciavi.c index 843fe2c..b32accb 100644 --- a/dlls/mciavi32/mciavi.c +++ b/dlls/mciavi32/mciavi.c @@ -353,6 +353,7 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP DWORD numEvents = 1; HANDLE events[2]; double next_frame_us; + BOOL wait_audio = TRUE; EnterCriticalSection(&wma->cs); @@ -419,19 +420,37 @@ static DWORD MCIAVI_player(WINE_MCIAVI *wma, DWORD dwFlags, LPMCI_PLAY_PARMS lpP else delta = 0; + /* check if the playback was cancelled */ + if ((wma->mci_break.flags & MCI_BREAK_KEY) && + (GetAsyncKeyState(wma->mci_break.parms.nVirtKey) & 0x8000)) + { + if (!(wma->mci_break.flags & MCI_BREAK_HWND) || + GetForegroundWindow() == wma->mci_break.parms.hwndBreak) + { + /* we queue audio blocks ahead so ignore them otherwise the audio + * will keep playing until the buffer is empty */ + wait_audio = FALSE; + + TRACE("playback cancelled using break key\n"); + break; + } + } + LeaveCriticalSection(&wma->cs); ret = WaitForMultipleObjects(numEvents, events, FALSE, delta / 1000); EnterCriticalSection(&wma->cs); if (ret == WAIT_OBJECT_0 || wma->dwStatus != MCI_MODE_PLAY) break; } - if (wma->lpWaveFormat) { - while (wma->dwEventCount != nHdr - 1) - { - LeaveCriticalSection(&wma->cs); - Sleep(100); - EnterCriticalSection(&wma->cs); - } + if (wma->lpWaveFormat) + { + if (wait_audio) + while (wma->dwEventCount != nHdr - 1) + { + LeaveCriticalSection(&wma->cs); + Sleep(100); + EnterCriticalSection(&wma->cs); + } /* just to get rid of some race conditions between play, stop and pause */ LeaveCriticalSection(&wma->cs); @@ -871,6 +890,30 @@ static DWORD MCIAVI_mciCue(UINT wDevID, DWORD dwFlags, LPMCI_DGV_CUE_PARMS lpPar } /****************************************************************************** + * MCIAVI_mciBreak [internal] + */ +static DWORD MCIAVI_mciBreak(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) +{ + WINE_MCIAVI *wma; + + TRACE("(%04x, %08x, %p)\n", wDevID, dwFlags, lpParms); + + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; + + wma = MCIAVI_mciGetOpenDev(wDevID); + if (wma == NULL) return MCIERR_INVALID_DEVICE_ID; + + EnterCriticalSection(&wma->cs); + + wma->mci_break.flags = dwFlags; + wma->mci_break.parms = *lpParms; + + LeaveCriticalSection(&wma->cs); + + return 0; +} + +/****************************************************************************** * MCIAVI_mciSetAudio [internal] */ static DWORD MCIAVI_mciSetAudio(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SETAUDIO_PARMSW lpParms) @@ -988,6 +1031,7 @@ LRESULT CALLBACK MCIAVI_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case MCI_WHERE: return MCIAVI_mciWhere (dwDevID, dwParam1, (LPMCI_DGV_RECT_PARMS) dwParam2); case MCI_STEP: return MCIAVI_mciStep (dwDevID, dwParam1, (LPMCI_DGV_STEP_PARMS) dwParam2); case MCI_CUE: return MCIAVI_mciCue (dwDevID, dwParam1, (LPMCI_DGV_CUE_PARMS) dwParam2); + case MCI_BREAK: return MCIAVI_mciBreak (dwDevID, dwParam1, (LPMCI_BREAK_PARMS) dwParam2); /* Digital Video specific */ case MCI_SETAUDIO: return MCIAVI_mciSetAudio (dwDevID, dwParam1, (LPMCI_DGV_SETAUDIO_PARMSW) dwParam2); case MCI_SIGNAL: return MCIAVI_mciSignal (dwDevID, dwParam1, (LPMCI_DGV_SIGNAL_PARMS) dwParam2); diff --git a/dlls/mciavi32/private_mciavi.h b/dlls/mciavi32/private_mciavi.h index 4dfcc09..1b53ab8 100644 --- a/dlls/mciavi32/private_mciavi.h +++ b/dlls/mciavi32/private_mciavi.h @@ -76,6 +76,11 @@ typedef struct { DWORD dwToVideoFrame; /* play to */ DWORD dwCurrAudioBlock; /* current audio block being played */ RECT source, dest; + struct + { + DWORD flags; + MCI_BREAK_PARMS parms; + } mci_break; /* data for the background mechanism */ CRITICAL_SECTION cs; HANDLE hStopEvent;

1 0

Bruno Jesus : winmm: Dispatch MCI_BREAK to the driver.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 0aaade2cecdfaa14df1ca9d397031cb0a015d77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aaade2cecdfaa14df1ca9d39… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:28 2017 -0300 winmm: Dispatch MCI_BREAK to the driver. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/mci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index f772388..56a537d 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -2063,13 +2063,18 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm */ static DWORD MCI_Break(UINT wDevID, DWORD dwFlags, LPMCI_BREAK_PARMS lpParms) { + DWORD dwRet; + if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - FIXME("(%04x) vkey %04X stub\n", dwFlags, lpParms->nVirtKey); - if (dwFlags & MCI_NOTIFY) + TRACE("(%08x, %08X, vkey %04X, hwnd %p)\n", wDevID, dwFlags, + lpParms->nVirtKey, lpParms->hwndBreak); + + dwRet = MCI_SendCommandFrom32(wDevID, MCI_BREAK, dwFlags, (DWORD_PTR)lpParms); + if (!dwRet && (dwFlags & MCI_NOTIFY)) mciDriverNotify((HWND)lpParms->dwCallback, wDevID, MCI_NOTIFY_SUCCESSFUL); - return MMSYSERR_NOERROR; + return dwRet; } /**************************************************************************

1 0

Nikolay Sivov : xmllite/reader: Improve input stream encoding detection.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 80cf8838e38a8be16ca38a7655830a79bbe52da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80cf8838e38a8be16ca38a765… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:55 2017 +0300 xmllite/reader: Improve input stream encoding detection. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 20 +++++++++----- dlls/xmllite/tests/reader.c | 67 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 79 insertions(+), 8 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index a880bee..699af4b 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -1,7 +1,7 @@ /* * IXmlReader implementation * - * Copyright 2010, 2012-2013, 2016 Nikolay Sivov + * Copyright 2010, 2012-2013, 2016-2017 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -93,6 +93,8 @@ static const WCHAR gtW[] = {'>',0}; static const WCHAR commentW[] = {'<','!','-','-',0}; static const WCHAR piW[] = {'<','?',0}; +static BOOL is_namestartchar(WCHAR ch); + static const char *debugstr_nodetype(XmlNodeType nodetype) { static const char * const type_names[] = @@ -840,10 +842,9 @@ static inline BOOL readerinput_is_utf8(xmlreaderinput *readerinput) static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encoding *enc) { encoded_buffer *buffer = &readerinput->buffer->encoded; - static const WCHAR startW[] = {'<','?'}; - static const WCHAR commentW[] = {'<','!'}; static const char utf8bom[] = {0xef,0xbb,0xbf}; static const char utf16lebom[] = {0xff,0xfe}; + WCHAR *ptrW; *enc = XmlEncoding_Unknown; @@ -854,13 +855,17 @@ static HRESULT readerinput_detectencoding(xmlreaderinput *readerinput, xml_encod if (buffer->written <= 3) return MX_E_INPUTEND; } + ptrW = (WCHAR *)buffer->data; /* try start symbols if we have enough data to do that, input buffer should contain first chunk already */ if (readerinput_is_utf8(readerinput)) *enc = XmlEncoding_UTF8; - else if (!memcmp(buffer->data, startW, sizeof(startW)) || - !memcmp(buffer->data, commentW, sizeof(commentW))) - *enc = XmlEncoding_UTF16; + else if (*ptrW == '<') + { + ptrW++; + if (*ptrW == '?' || *ptrW == '!' || is_namestartchar(*ptrW)) + *enc = XmlEncoding_UTF16; + } /* try with BOM now */ else if (!memcmp(buffer->data, utf8bom, sizeof(utf8bom))) { @@ -2492,7 +2497,8 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) /* try to detect encoding by BOM or data and set input code page */ hr = readerinput_detectencoding(reader->input, &enc); - TRACE("detected encoding %s, 0x%08x\n", debugstr_w(xml_encoding_map[enc].name), hr); + TRACE("detected encoding %s, 0x%08x\n", enc == XmlEncoding_Unknown ? "(unknown)" : + debugstr_w(xml_encoding_map[enc].name), hr); if (FAILED(hr)) return hr; /* always switch first time cause we have to put something in */ diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f7f738e..fba73c9 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -49,7 +49,7 @@ static void free_str(WCHAR *str) static const char xmldecl_full[] = "\xef\xbb\xbf<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"; static const char xmldecl_short[] = "<?xml version=\"1.0\"?><RegistrationInfo/>"; -static IStream *create_stream_on_data(const char *data, int size) +static IStream *create_stream_on_data(const void *data, unsigned int size) { IStream *stream = NULL; HGLOBAL hglobal; @@ -2086,6 +2086,70 @@ static void test_read_charref(void) IStream_Release(stream); } +static void test_encoding_detection(void) +{ + static const struct encoding_testW + { + WCHAR text[16]; + } + encoding_testsW[] = + { + { { '<','?','p','i',' ','?','>',0 } }, + { { '<','!','-','-',' ','c','-','-','>',0 } }, + { { 0xfeff,'<','a','/','>',0 } }, + { { '<','a','/','>',0 } }, + }; + static const char *encoding_testsA[] = + { + "<?pi ?>", + "", + "\xef\xbb\xbf<a/>", /* UTF-8 BOM */ + "<a/>", + }; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + unsigned int i; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + /* there's no way to query detected encoding back, so just verify that document is browsable */ + + for (i = 0; i < sizeof(encoding_testsA)/sizeof(encoding_testsA[0]); i++) + { + stream = create_stream_on_data(encoding_testsA[i], strlen(encoding_testsA[i])); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %08x\n", hr); + ok(type != XmlNodeType_None, "Unexpected node type %d\n", type); + + IStream_Release(stream); + } + + for (i = 0; i < sizeof(encoding_testsW)/sizeof(encoding_testsW[0]); i++) + { + stream = create_stream_on_data(encoding_testsW[i].text, lstrlenW(encoding_testsW[i].text) * sizeof(WCHAR)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "%u: got %08x\n", i, hr); + ok(type != XmlNodeType_None, "%u: unexpected node type %d\n", i, type); + + IStream_Release(stream); + } + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2108,4 +2172,5 @@ START_TEST(reader) test_prefix(); test_namespaceuri(); test_read_charref(); + test_encoding_detection(); }

1 0

Nikolay Sivov : xmllite/reader: Always return node type from Read().
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 0cbd938af8e900a76abdc890b7a50668d4b3f045 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cbd938af8e900a76abdc890b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:56 2017 +0300 xmllite/reader: Always return node type from Read(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 10 ++++------ dlls/xmllite/tests/reader.c | 37 +++++++++++++++++++++++++++++++------ 2 files changed, 35 insertions(+), 12 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 699af4b..43dae30 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2786,12 +2786,10 @@ static HRESULT WINAPI xmlreader_Read(IXmlReader* iface, XmlNodeType *nodetype) hr = reader_parse_nextnode(This); if (oldtype == XmlNodeType_None && This->nodetype != oldtype) This->state = XmlReadState_Interactive; - if (hr == S_OK) - { - TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); - if (nodetype) - *nodetype = This->nodetype; - } + + TRACE("node type %s\n", debugstr_nodetype(This->nodetype)); + if (nodetype) + *nodetype = This->nodetype; return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index fba73c9..4685bec 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -647,8 +647,9 @@ static void test_readerinput(void) static void test_reader_state(void) { - IXmlReader *reader; XmlNodeType nodetype; + IXmlReader *reader; + IStream *stream; HRESULT hr; hr = CreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); @@ -662,10 +663,33 @@ static void test_reader_state(void) test_read_state(reader, XmlReadState_Closed, -1, FALSE); if (0) { - /* newer versions crash here, probably cause no input was set */ + /* newer versions crash here, probably because no input was set */ hr = IXmlReader_Read(reader, &nodetype); ok(hr == S_FALSE, "got %08x\n", hr); } + + stream = create_stream_on_data("xml", sizeof("xml")); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + test_read_state(reader, XmlReadState_Initial, -1, FALSE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &nodetype); +todo_wine + ok(FAILED(hr), "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); + + test_read_state(reader, XmlReadState_Error, -1, TRUE); + + nodetype = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &nodetype); +todo_wine + ok(FAILED(hr), "got %08x\n", hr); + ok(nodetype == XmlNodeType_None, "Unexpected node type %d\n", nodetype); + + IStream_Release(stream); IXmlReader_Release(reader); } @@ -1118,9 +1142,8 @@ static void test_read_full(void) ok(hr == S_OK, "got %08x\n", hr); i = 0; - type = XmlNodeType_None; - hr = IXmlReader_Read(reader, &type); - while (hr == S_OK) + type = ~0u; + while (IXmlReader_Read(reader, &type) == S_OK) { ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); if (test->types[i] == XmlNodeType_None) break; @@ -1134,7 +1157,6 @@ static void test_read_full(void) ok(hr == S_OK, "%d: GetValue failed 0x%08x\n", i, hr); ok(len > 0, "%d: wrong value length %d\n", i, len); } - hr = IXmlReader_Read(reader, &type); i++; } ok(test->types[i] == XmlNodeType_None, "incomplete sequence, got %d\n", test->types[i]); @@ -2024,6 +2046,7 @@ static void test_namespaceuri(void) hr = IXmlReader_SetInput(reader, (IUnknown *)stream); ok(hr == S_OK, "got %08x\n", hr); + type = ~0u; while (IXmlReader_Read(reader, &type) == S_OK) { const WCHAR *uri, *local; WCHAR *uriW; @@ -2042,6 +2065,8 @@ static void test_namespaceuri(void) j++; } + todo_wine + ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); IStream_Release(stream); }

1 0

Nikolay Sivov : xmllite/reader: Reset node type to XmlNodeType_None on EOF.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: b188079349070b903ded81d2249aff75fdf0cbbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b188079349070b903ded81d22… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:57 2017 +0300 xmllite/reader: Reset node type to XmlNodeType_None on EOF. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 3 +++ dlls/xmllite/tests/reader.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 43dae30..ae5d9ea 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2552,7 +2552,10 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) if (FAILED(hr)) return hr; if (hr == S_FALSE) + { reader->instate = XmlReadInState_Eof; + reader->nodetype = XmlNodeType_None; + } return hr; case XmlReadInState_Eof: return S_FALSE; diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 4685bec..f41375a 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -904,8 +904,7 @@ todo_wine hr = IXmlReader_Read(reader, &type); todo_wine ok(hr == WC_E_SYNTAX || hr == WC_E_XMLCHARACTER /* XP */, "expected WC_E_SYNTAX, got %08x\n", hr); -todo_wine - ok(type == XmlNodeType_None, "expected None, got %s\n", type_to_str(type)); + ok(type == XmlNodeType_None, "expected XmlNodeType_None, got %s\n", type_to_str(type)); ok_pos(reader, 1, 41, -1, -1, TRUE); test_read_state(reader, XmlReadState_Error, -1, TRUE); @@ -2065,7 +2064,6 @@ static void test_namespaceuri(void) j++; } - todo_wine ok(type == XmlNodeType_None, "Unexpected node type %d\n", type); IStream_Release(stream);

1 0

Nikolay Sivov : xmllite/reader: Implement IsEOF().
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 073c43a139de7cb6bc43c2d4a9328fbd004f6903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=073c43a139de7cb6bc43c2d4a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:58 2017 +0300 xmllite/reader: Implement IsEOF(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 6 +++-- dlls/xmllite/tests/reader.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index ae5d9ea..8e975b3 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -2554,6 +2554,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) if (hr == S_FALSE) { reader->instate = XmlReadInState_Eof; + reader->state = XmlReadState_EndOfFile; reader->nodetype = XmlNodeType_None; } return hr; @@ -3171,8 +3172,9 @@ static HRESULT WINAPI xmlreader_GetDepth(IXmlReader* iface, UINT *depth) static BOOL WINAPI xmlreader_IsEOF(IXmlReader* iface) { - FIXME("(%p): stub\n", iface); - return FALSE; + xmlreader *This = impl_from_IXmlReader(iface); + TRACE("(%p)\n", iface); + return This->state == XmlReadState_EndOfFile; } static const struct IXmlReaderVtbl xmlreader_vtbl = diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index f41375a..6389019 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -2173,6 +2173,61 @@ static void test_encoding_detection(void) IXmlReader_Release(reader); } +static void test_eof_state(IXmlReader *reader, BOOL eof) +{ + LONG_PTR state; + HRESULT hr; + + ok(IXmlReader_IsEOF(reader) == eof, "Unexpected IsEOF() result\n"); + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); + ok(hr == S_OK, "GetProperty() failed, %#x\n", hr); + ok((state == XmlReadState_EndOfFile) == eof, "Unexpected EndOfFile state %ld\n", state); +} + +static void test_endoffile(void) +{ + static const char *xml = "<a/>"; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + + hr = CreateXmlReader(&IID_IXmlReader, (void **)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + test_eof_state(reader, FALSE); + + stream = create_stream_on_data(xml, strlen(xml)); + + hr = IXmlReader_SetInput(reader, (IUnknown *)stream); + ok(hr == S_OK, "got %08x\n", hr); + + test_eof_state(reader, FALSE); + + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_OK, "got %#x\n", hr); + ok(type == XmlNodeType_Element, "Unexpected type %d\n", type); + + test_eof_state(reader, FALSE); + + type = XmlNodeType_Element; + hr = IXmlReader_Read(reader, &type); + ok(hr == S_FALSE, "got %#x\n", hr); + ok(type == XmlNodeType_None, "Unexpected type %d\n", type); + + test_eof_state(reader, TRUE); + + hr = IXmlReader_SetInput(reader, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + test_eof_state(reader, FALSE); + + IStream_Release(stream); + + IXmlReader_Release(reader); +} + START_TEST(reader) { test_reader_create(); @@ -2196,4 +2251,5 @@ START_TEST(reader) test_namespaceuri(); test_read_charref(); test_encoding_detection(); + test_endoffile(); }

1 0

Nikolay Sivov : xmllite/reader: Improve the way nesting level returned by GetDepth() is updated.
by Alexandre Julliard 06 Mar '17

06 Mar '17

Module: wine Branch: master Commit: 8f0c235f819ed77e0006ccee9f027cec97b2a489 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f0c235f819ed77e0006ccee9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 6 12:35:59 2017 +0300 xmllite/reader: Improve the way nesting level returned by GetDepth() is updated. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/reader.c | 69 +++++++++++++++++------------- dlls/xmllite/tests/reader.c | 100 +++++++++++++++++++++++++------------------- 2 files changed, 98 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f0c235f819ed77e0006c…

1 0