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

Nikolay Sivov : ddraw: Remove referenced to IWineD3D* interfaces.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 84a8f7f457f49bfc8ea524406936a050e5b46d05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84a8f7f457f49bfc8ea524406… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 20:59:47 2017 +0300 ddraw: Remove referenced to IWineD3D* interfaces. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/device.c | 5 +---- dlls/ddraw/surface.c | 42 ++++++++++++------------------------------ 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 1a6f4e1..56a4a6b 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4392,10 +4392,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, if (device->index_buffer_size - index_count * sizeof(WORD) < ib_pos) ib_pos = 0; - /* Copy the index stream into the index buffer. A new IWineD3DDevice - * method could be created which takes an user pointer containing the - * indices or a SetData-Method for the index buffer, which overrides the - * index buffer data with our pointer. */ + /* Copy the index stream into the index buffer. */ wined3d_box.left = ib_pos; wined3d_box.right = ib_pos + index_count * sizeof(WORD); ib = wined3d_buffer_get_resource(device->index_buffer); diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 710f6cd..59a151b 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -950,7 +950,6 @@ static HRESULT WINAPI ddraw_surface1_GetAttachedSurface(IDirectDrawSurface *ifac * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if DDSD is NULL - * For more details, see IWineD3DSurface::LockRect * *****************************************************************************/ static HRESULT surface_lock(struct ddraw_surface *surface, @@ -1005,10 +1004,10 @@ static HRESULT surface_lock(struct ddraw_surface *surface, switch(hr) { /* D3D8 and D3D9 return the general D3DERR_INVALIDCALL error, but ddraw has a more - * specific error. But since IWineD3DSurface::LockRect returns that error in this - * only occasion, keep d3d8 and d3d9 free from the return value override. There are - * many different places where d3d8/9 would have to catch the DDERR_SURFACEBUSY, it - * is much easier to do it in one place in ddraw + * specific error. But since wined3d returns that error in this only occasion, + * keep d3d8 and d3d9 free from the return value override. There are many different + * places where d3d8/9 would have to catch the DDERR_SURFACEBUSY, it is much easier + * to do it in one place in ddraw. */ case WINED3DERR_INVALIDCALL: return DDERR_SURFACEBUSY; default: return hr; @@ -1170,8 +1169,7 @@ static HRESULT WINAPI ddraw_surface1_Lock(IDirectDrawSurface *iface, RECT *rect, * Rect: Not used by this implementation * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::UnlockRect + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Unlock(IDirectDrawSurface7 *iface, RECT *pRect) @@ -1537,8 +1535,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons * DDBltFx: Some extended blt parameters, connected to the flags * * Returns: - * D3D_OK on success - * See IWineD3DSurface::Blt for more details + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_Blt(IDirectDrawSurface7 *iface, RECT *dst_rect, @@ -2141,7 +2138,6 @@ static HRESULT WINAPI ddraw_surface1_AddOverlayDirtyRect(IDirectDrawSurface *ifa * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if hdc is NULL - * For details, see IWineD3DSurface::GetDC * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetDC(IDirectDrawSurface7 *iface, HDC *dc) @@ -2241,8 +2237,7 @@ static HRESULT WINAPI ddraw_surface1_GetDC(IDirectDrawSurface *iface, HDC *dc) * hdc: HDC to release * * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::ReleaseDC + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_ReleaseDC(IDirectDrawSurface7 *iface, HDC hdc) @@ -2458,8 +2453,7 @@ static HRESULT WINAPI ddraw_surface7_GetPriority(IDirectDrawSurface7 *iface, DWO * Flags: Some flags * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::SetPrivateData + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_SetPrivateData(IDirectDrawSurface7 *iface, @@ -2507,7 +2501,6 @@ static HRESULT WINAPI ddraw_surface4_SetPrivateData(IDirectDrawSurface4 *iface, * Returns: * DD_OK on success * DDERR_INVALIDPARAMS if Data is NULL - * For more details, see IWineD3DSurface::GetPrivateData * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetPrivateData(IDirectDrawSurface7 *iface, REFGUID tag, void *data, DWORD *size) @@ -2571,8 +2564,7 @@ static HRESULT WINAPI ddraw_surface4_GetPrivateData(IDirectDrawSurface4 *iface, * tag: Tag of the data to free * * Returns: - * D3D_OK on success - * For more details, see IWineD3DSurface::FreePrivateData + * D3D_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_FreePrivateData(IDirectDrawSurface7 *iface, REFGUID tag) @@ -3004,9 +2996,6 @@ static HRESULT WINAPI ddraw_surface1_EnumOverlayZOrders(IDirectDrawSurface *ifac * Params: * Flags: DDGBS_CANBLT or DDGBS_ISBLTDONE * - * Returns: - * See IWineD3DSurface::Blt - * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetBltStatus(IDirectDrawSurface7 *iface, DWORD Flags) { @@ -3176,9 +3165,6 @@ static HRESULT WINAPI ddraw_surface1_GetColorKey(IDirectDrawSurface *iface, DWOR * Params: * Flags: DDGFS_CANFLIP of DDGFS_ISFLIPDONE * - * Returns: - * See IWineD3DSurface::GetFlipStatus - * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_GetFlipStatus(IDirectDrawSurface7 *iface, DWORD Flags) { @@ -3554,7 +3540,6 @@ static HRESULT WINAPI d3d_texture1_Initialize(IDirect3DTexture *iface, * Returns: * DD_OK, if the surface is usable * DDERR_ISLOST if the surface is lost - * See IWineD3DSurface::IsLost for more details * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_IsLost(IDirectDrawSurface7 *iface) @@ -3612,8 +3597,7 @@ static HRESULT WINAPI ddraw_surface1_IsLost(IDirectDrawSurface *iface) * doesn't reload its old contents * * Returns: - * DD_OK on success - * See IWineD3DSurface::Restore for more details + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI ddraw_surface7_Restore(IDirectDrawSurface7 *iface) @@ -4187,8 +4171,7 @@ static HRESULT WINAPI ddraw_surface7_GetLOD(IDirectDrawSurface7 *iface, DWORD *M * trans: Type of transfer. Some DDBLTFAST_* flags * * Returns: - * DD_OK on success - * For more details, see IWineD3DSurface::BltFast + * DD_OK on success, error code otherwise. * *****************************************************************************/ static HRESULT WINAPI DECLSPEC_HOTPATCH ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, @@ -5063,8 +5046,7 @@ static HRESULT WINAPI d3d_texture1_Unload(IDirect3DTexture *iface) /***************************************************************************** * IDirect3DTexture2::GetHandle * - * Returns handle for the texture. At the moment, the interface - * to the IWineD3DTexture is used. + * Returns handle for the texture. * * Params: * device: Device this handle is assigned to

1 0

Henri Verbeet : wined3d: Send sub-resource update calls through the command stream.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: fbff59ae4a2d2bdf6179cfd0e5b67579e3b2e28e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbff59ae4a2d2bdf6179cfd0e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:24 2017 +0100 wined3d: Send sub-resource update calls through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 90 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 77 ++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 3 ++ 3 files changed, 122 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fbff59ae4a2d2bdf6179c…

1 0

Nikolay Sivov : xmllite/reader: Reset node type to XmlNodeType_None on EOF.
by Alexandre Julliard March 6, 2017

March 6, 2017

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 : d3d9: Remove reference to IWineD3DDevice.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: a4be16bfe3cdc91a4e3f1666e0a8d795ff7fd900 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4be16bfe3cdc91a4e3f1666e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 5 20:59:46 2017 +0300 d3d9: Remove reference to IWineD3DDevice. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a004a80..74070af 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2120,7 +2120,7 @@ static HRESULT WINAPI d3d9_device_EndStateBlock(IDirect3DDevice9Ex *iface, IDire wined3d_mutex_unlock(); if (FAILED(hr)) { - WARN("IWineD3DDevice_EndStateBlock() failed, hr %#x.\n", hr); + WARN("Failed to end the state block, hr %#x.\n", hr); return hr; }

1 0

Henri Verbeet : wined3d: Explicitly pass d3d_info and gl_info to context_stream_info_from_declaration ().
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 2338060142bcb2f3f53a91eb279acfa5d35e7345 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2338060142bcb2f3f53a91eb2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:23 2017 +0100 wined3d: Explicitly pass d3d_info and gl_info to context_stream_info_from_declaration(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 +-- dlls/wined3d/device.c | 5 +- dlls/wined3d/wined3d_private.h | 174 +++++++++++++++++++++-------------------- 3 files changed, 96 insertions(+), 96 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2338060142bcb2f3f53a9…

1 0

Bruno Jesus : wininet: Forward InternetGetConnectedState to Ex function.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 36f6387e5cab16a2343ce76ed24a95479f5cdcae URL: http://source.winehq.org/git/wine.git/?a=commit;h=36f6387e5cab16a2343ce76ed… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 01:24:29 2017 -0300 wininet: Forward InternetGetConnectedState to Ex function. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/internet.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 02379c2..91678b6 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -1182,11 +1182,7 @@ BOOL WINAPI InternetGetConnectedState(LPDWORD lpdwStatus, DWORD dwReserved) { TRACE("(%p, 0x%08x)\n", lpdwStatus, dwReserved); - if (lpdwStatus) { - WARN("always returning LAN connection.\n"); - *lpdwStatus = INTERNET_CONNECTION_LAN; - } - return TRUE; + return InternetGetConnectedStateExW(lpdwStatus, NULL, 0, dwReserved); }

1 0

Bruno Jesus : include: Add missing connection check flags to wininet.h.
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: 269f19e602e7325fc0aac263c8b0c39bb69338a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=269f19e602e7325fc0aac263c… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Mon Mar 6 15:28:22 2017 +0100 include: Add missing connection check flags to wininet.h. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wininet.h | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/include/wininet.h b/include/wininet.h index 39a6646..e9126de 100644 --- a/include/wininet.h +++ b/include/wininet.h @@ -1708,10 +1708,13 @@ INTERNETAPI BOOL WINAPI InternetAutodial(DWORD,HWND); INTERNETAPI BOOL WINAPI InternetAutodialHangup(DWORD); INTERNETAPI BOOL WINAPI InternetGetConnectedState(LPDWORD ,DWORD); -#define INTERNET_CONNECTION_MODEM 1 -#define INTERNET_CONNECTION_LAN 2 -#define INTERNET_CONNECTION_PROXY 4 -#define INTERNET_CONNECTION_MODEM_BUSY 8 +#define INTERNET_CONNECTION_MODEM 0x01 +#define INTERNET_CONNECTION_LAN 0x02 +#define INTERNET_CONNECTION_PROXY 0x04 +#define INTERNET_CONNECTION_MODEM_BUSY 0x08 +#define INTERNET_RAS_INSTALLED 0x10 +#define INTERNET_CONNECTION_OFFLINE 0x20 +#define INTERNET_CONNECTION_CONFIGURED 0x40 typedef DWORD (CALLBACK *PFN_DIAL_HANDLER) (HWND,LPCSTR,DWORD,LPDWORD);

1 0

Henri Verbeet : wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions().
by Alexandre Julliard March 6, 2017

March 6, 2017

Module: wine Branch: master Commit: c51537ba9fffee96bfe50c3fc5e828045d2d57a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c51537ba9fffee96bfe50c3fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 6 10:45:26 2017 +0100 wined3d: Merge wined3d_texture_check_block_align() into wined3d_texture_check_box_dimensions(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 81 +++++++-------------------------------- dlls/wined3d/texture.c | 87 ++++++++++++++++++------------------------ dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 52 insertions(+), 118 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c51537ba9fffee96bfe50…

1 0

Bruno Jesus : winmm: Dispatch MCI_BREAK to the driver.
by Alexandre Julliard March 6, 2017

March 6, 2017

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: Implement IsEOF().
by Alexandre Julliard March 6, 2017

March 6, 2017

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