February 2017 - Wine-commits

Erich E. Hoover : dsound: Clear the temporary mixing buffer after allocation.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: b7118753f41832fe40a0e3f75b123f51e7364ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7118753f41832fe40a0e3f75… Author: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Date: Mon Dec 19 14:17:23 2016 -0700 dsound: Clear the temporary mixing buffer after allocation. Signed-off-by: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/mixer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 309c338..2550753 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -428,6 +428,8 @@ static void DSOUND_MixToTemporary(IDirectSoundBufferImpl *dsb, DWORD frames) else dsb->device->tmp_buffer = HeapAlloc(GetProcessHeap(), 0, size_bytes); } + if(dsb->put_aux == putieee32_sum) + memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); cp_fields(dsb, frames, &dsb->freqAccNum); @@ -506,9 +508,6 @@ static DWORD DSOUND_MixInBuffer(IDirectSoundBufferImpl *dsb, float *mix_buffer, /* Resample buffer to temporary buffer specifically allocated for this purpose, if needed */ oldpos = dsb->sec_mixpos; - - if(dsb->put_aux == putieee32_sum) - memset(dsb->device->tmp_buffer, 0, dsb->device->tmp_buffer_len); DSOUND_MixToTemporary(dsb, frames); ibuf = dsb->device->tmp_buffer;

1 0

Christian Inci : kernel32/tests: Add test for SetFileTime.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: a3d6d9c2540c48296672d0ef292408db743994a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d6d9c2540c48296672d0ef2… Author: Christian Inci <chris.pcguy.inci(a)gmail.com> Date: Mon Feb 6 09:10:23 2017 +0100 kernel32/tests: Add test for SetFileTime. Signed-off-by: Christian Inci <chris.pcguy.inci(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index a65d556..0b8cef2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3898,6 +3898,18 @@ todo_wine_if (i == 1) ok(!ret, "%d: WriteFile should fail\n", i); ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); } + SetLastError(0xdeadbeef); + ret = SetFileTime(hfile, NULL, NULL, NULL); + if (td[i].access & GENERIC_WRITE) /* actually FILE_WRITE_ATTRIBUTES */ + ok(ret, "%d: SetFileTime error %d\n", i, GetLastError()); + else + { + todo_wine + { + ok(!ret, "%d: SetFileTime should fail\n", i); + ok(GetLastError() == ERROR_ACCESS_DENIED, "%d: expected ERROR_ACCESS_DENIED, got %d\n", i, GetLastError()); + } + } CloseHandle(hfile); } else

1 0

Jarkko Korpi : ntoskrnl: Add IoStopTimer stub.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 85214c56e3dc3577bee09aab89b2c79eafbf728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=85214c56e3dc3577bee09aab8… Author: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Date: Sat Feb 4 17:59:18 2017 +0200 ntoskrnl: Add IoStopTimer stub. Signed-off-by: Jarkko Korpi <jarkko_korpi(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index bc12788..06320d0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -682,6 +682,15 @@ void WINAPI IoStartTimer(PDEVICE_OBJECT DeviceObject) /*********************************************************************** + * IoStopTimer (NTOSKRNL.EXE.@) + */ +void WINAPI IoStopTimer(PDEVICE_OBJECT DeviceObject) +{ + FIXME( "stub: %p\n", DeviceObject ); +} + + +/*********************************************************************** * IoAllocateIrp (NTOSKRNL.EXE.@) */ PIRP WINAPI IoAllocateIrp( CCHAR stack_size, BOOLEAN charge_quota ) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index acc740f..efa69fe 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -463,7 +463,7 @@ @ stub IoStartPacket @ stdcall IoStartTimer(ptr) @ stub IoStatisticsLock -@ stub IoStopTimer +@ stdcall IoStopTimer(ptr) @ stub IoSynchronousInvalidateDeviceRelations @ stub IoSynchronousPageWrite @ stub IoThreadToProcess

1 0

Lauri Kenttä : msvcrt: Check pmode in _wsopen_dispatch.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 27759315367428c6bd4bed5cf410407bd2d18fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27759315367428c6bd4bed5cf… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 4 16:38:03 2017 +0200 msvcrt: Check pmode in _wsopen_dispatch. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 4 ++-- dlls/ucrtbase/tests/misc.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8965156..24a6e2e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2171,8 +2171,8 @@ int CDECL MSVCRT__wsopen_dispatch( const MSVCRT_wchar_t* path, int oflags, int s if (oflags & MSVCRT__O_CREAT) { - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) - FIXME(": pmode 0x%04x ignored\n", pmode); + if (secure && !MSVCRT_CHECK_PMT(!(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)))) + return MSVCRT_EINVAL; if (oflags & MSVCRT__O_EXCL) creation = CREATE_NEW; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index cc82022..d8075cc 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -396,11 +396,9 @@ static void test__sopen_dispatch(void) SET_EXPECT(global_invalid_parameter_handler); fd = 0; ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 1); -todo_wine { ok(ret == EINVAL, "got %d\n", ret); ok(fd == -1, "got fd %d\n", fd); CHECK_CALLED(global_invalid_parameter_handler); -} if (fd > 0) { _close(fd); @@ -438,11 +436,9 @@ static void test__sopen_s(void) SET_EXPECT(global_invalid_parameter_handler); fd = 0; ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0xff); -todo_wine { ok(ret == EINVAL, "got %d\n", ret); ok(fd == -1, "got fd %d\n", fd); CHECK_CALLED(global_invalid_parameter_handler); -} p__set_invalid_parameter_handler(NULL); free(tempf);

1 0

Nikolay Sivov : oleview: Remove application specific version string.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: a8cfe2eeb5f664cf70d292e45c7ff19b2ddcfc1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8cfe2eeb5f664cf70d292e45… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Feb 6 01:51:16 2017 +0300 oleview: Remove application specific version string. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 134 +++++++++++++++++++++---------------------- po/bg.po | 134 +++++++++++++++++++++---------------------- po/ca.po | 134 +++++++++++++++++++++---------------------- po/cs.po | 134 +++++++++++++++++++++---------------------- po/da.po | 134 +++++++++++++++++++++---------------------- po/de.po | 134 +++++++++++++++++++++---------------------- po/el.po | 134 +++++++++++++++++++++---------------------- po/en.po | 134 +++++++++++++++++++++---------------------- po/en_US.po | 134 +++++++++++++++++++++---------------------- po/eo.po | 134 +++++++++++++++++++++---------------------- po/es.po | 134 +++++++++++++++++++++---------------------- po/fa.po | 134 +++++++++++++++++++++---------------------- po/fi.po | 134 +++++++++++++++++++++---------------------- po/fr.po | 134 +++++++++++++++++++++---------------------- po/he.po | 134 +++++++++++++++++++++---------------------- po/hi.po | 134 +++++++++++++++++++++---------------------- po/hr.po | 134 +++++++++++++++++++++---------------------- po/hu.po | 134 +++++++++++++++++++++---------------------- po/it.po | 134 +++++++++++++++++++++---------------------- po/ja.po | 134 +++++++++++++++++++++---------------------- po/ko.po | 134 +++++++++++++++++++++---------------------- po/lt.po | 134 +++++++++++++++++++++---------------------- po/ml.po | 134 +++++++++++++++++++++---------------------- po/nb_NO.po | 134 +++++++++++++++++++++---------------------- po/nl.po | 134 +++++++++++++++++++++---------------------- po/or.po | 134 +++++++++++++++++++++---------------------- po/pa.po | 134 +++++++++++++++++++++---------------------- po/pl.po | 134 +++++++++++++++++++++---------------------- po/pt_BR.po | 134 +++++++++++++++++++++---------------------- po/pt_PT.po | 134 +++++++++++++++++++++---------------------- po/rm.po | 134 +++++++++++++++++++++---------------------- po/ro.po | 134 +++++++++++++++++++++---------------------- po/ru.po | 134 +++++++++++++++++++++---------------------- po/sk.po | 134 +++++++++++++++++++++---------------------- po/sl.po | 134 +++++++++++++++++++++---------------------- po/sr_RS(a)cyrillic.po | 135 +++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 135 +++++++++++++++++++++----------------------- po/sv.po | 134 +++++++++++++++++++++---------------------- po/te.po | 134 +++++++++++++++++++++---------------------- po/th.po | 134 +++++++++++++++++++++---------------------- po/tr.po | 134 +++++++++++++++++++++---------------------- po/uk.po | 134 +++++++++++++++++++++---------------------- po/wa.po | 134 +++++++++++++++++++++---------------------- po/wine.pot | 134 +++++++++++++++++++++---------------------- po/zh_CN.po | 134 +++++++++++++++++++++---------------------- po/zh_TW.po | 134 +++++++++++++++++++++---------------------- programs/oleview/oleview.c | 5 +- programs/oleview/oleview.rc | 1 - programs/oleview/resource.h | 1 - 49 files changed, 2991 insertions(+), 3182 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8cfe2eeb5f664cf70d29…

1 0

Jacek Caban : inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 51e1a08893384183b8fda9d44a5b3d0e473a4d2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e1a08893384183b8fda9d44… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:58:43 2017 +0100 inetcomm: Return S_FALSE if no data is returned in IInternetProtocol::Read. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/inetcomm/protocol.c | 10 +++++++++- dlls/inetcomm/tests/mimeole.c | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/inetcomm/protocol.c b/dlls/inetcomm/protocol.c index 0b28930..c77cf26 100644 --- a/dlls/inetcomm/protocol.c +++ b/dlls/inetcomm/protocol.c @@ -564,10 +564,18 @@ static HRESULT WINAPI MimeHtmlProtocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI MimeHtmlProtocol_Read(IInternetProtocol *iface, void* pv, ULONG cb, ULONG* pcbRead) { MimeHtmlProtocol *This = impl_from_IInternetProtocol(iface); + ULONG read = 0; + HRESULT hres; TRACE("(%p)->(%p %u %p)\n", This, pv, cb, pcbRead); - return IStream_Read(This->stream, pv, cb, pcbRead); + hres = IStream_Read(This->stream, pv, cb, &read); + if(pcbRead) + *pcbRead = read; + if(hres != S_OK) + return hres; + + return read ? S_OK : S_FALSE; } static HRESULT WINAPI MimeHtmlProtocol_Seek(IInternetProtocol *iface, LARGE_INTEGER dlibMove, diff --git a/dlls/inetcomm/tests/mimeole.c b/dlls/inetcomm/tests/mimeole.c index fbee6e1..5701af6 100644 --- a/dlls/inetcomm/tests/mimeole.c +++ b/dlls/inetcomm/tests/mimeole.c @@ -1368,6 +1368,8 @@ static HRESULT WINAPI ProtocolSink_ReportData(IInternetProtocolSink *iface, DWOR buf[read] = 0; ok(!strcmp(buf, current_binding_test->data), "unexpected data: %s\n", buf); + hres = IInternetProtocol_Read(current_binding_protocol, buf, sizeof(buf), &read); + ok(hres == S_FALSE, "Read failed: %08x\n", hres); return S_OK; }

1 0

Jacek Caban : mshtml: Added MHTMLDocument object implementation.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: ebee2a8346afe9f92a51064bad17751d0b17e40c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebee2a8346afe9f92a51064ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:58:54 2017 +0100 mshtml: Added MHTMLDocument object implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 15 ++++++++++----- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/persist.c | 19 +++++++++++++++++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index e50b8f8..097ba70 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -1,7 +1,7 @@ MODULE = mshtml.dll IMPORTLIB = mshtml IMPORTS = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32 -DELAYIMPORTS = wininet +DELAYIMPORTS = wininet inetcomm C_SRCS = \ conpoint.c \ diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 940519a..b672c2d 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5075,7 +5075,7 @@ static dispex_static_data_t HTMLDocumentObj_dispex = { HTMLDocumentObj_iface_tids }; -HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID riid, void **ppv) { mozIDOMWindowProxy *mozwindow; HTMLDocumentObj *doc; @@ -5083,8 +5083,6 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) nsresult nsres; HRESULT hres; - TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); - if(outer && !IsEqualGUID(&IID_IUnknown, riid)) { *ppv = NULL; return E_INVALIDARG; @@ -5102,6 +5100,7 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) init_doc(&doc->basedoc, outer ? outer : &doc->IUnknown_outer, &doc->dispex.IDispatchEx_iface); TargetContainer_Init(doc); doc->basedoc.doc_obj = doc; + doc->is_mhtml = is_mhtml; doc->usermode = UNKNOWN_USERMODE; @@ -5149,8 +5148,14 @@ HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) return S_OK; } +HRESULT HTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) +{ + TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return create_document_object(FALSE, outer, riid, ppv); +} + HRESULT MHTMLDocument_Create(IUnknown *outer, REFIID riid, void **ppv) { - FIXME("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); - return E_NOTIMPL; + TRACE("(%p %s %p)\n", outer, debugstr_mshtml_guid(riid), ppv); + return create_document_object(TRUE, outer, riid, ppv); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9c8b94c..f27b674 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -640,6 +640,7 @@ struct HTMLDocumentObj { HWND hwnd; HWND tooltips_hwnd; + BOOL is_mhtml; BOOL request_uiactivate; BOOL in_place_active; BOOL ui_active; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 2735ab5..363a955 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -29,6 +29,7 @@ #include "ole2.h" #include "shlguid.h" #include "idispids.h" +#include "mimeole.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -587,6 +588,7 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva IMoniker *pimkName, LPBC pibc, DWORD grfMode) { HTMLDocument *This = impl_from_IPersistMoniker(iface); + IMoniker *mon; HRESULT hres; TRACE("(%p)->(%x %p %p %08x)\n", This, fFullyAvailable, pimkName, pibc, grfMode); @@ -620,9 +622,22 @@ static HRESULT WINAPI PersistMoniker_Load(IPersistMoniker *iface, BOOL fFullyAva } } - prepare_for_binding(This, pimkName, FALSE); + if(This->doc_obj->is_mhtml) { + IUnknown *unk; + + hres = MimeOleObjectFromMoniker(0, pimkName, pibc, &IID_IUnknown, (void**)&unk, &mon); + if(FAILED(hres)) + return hres; + IUnknown_Release(unk); + pibc = NULL; + }else { + IMoniker_AddRef(mon = pimkName); + } + + prepare_for_binding(This, mon, FALSE); call_docview_84(This->doc_obj); - hres = set_moniker(This->window, pimkName, NULL, pibc, NULL, TRUE); + hres = set_moniker(This->window, mon, NULL, pibc, NULL, TRUE); + IMoniker_Release(mon); if(FAILED(hres)) return hres;

1 0

Jacek Caban : mshtml/tests: Added MHTML document tests.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 7219c7cf5d9e0dee20adf8406924d2493e346972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7219c7cf5d9e0dee20adf8406… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 3 18:59:02 2017 +0100 mshtml/tests: Added MHTML document tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/htmldoc.c | 132 +++++++++++++++++++++++++++++++++++++++----- 1 file changed, 117 insertions(+), 15 deletions(-) diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c index cb6c9b0..2cfc414 100644 --- a/dlls/mshtml/tests/htmldoc.c +++ b/dlls/mshtml/tests/htmldoc.c @@ -224,6 +224,7 @@ static BOOL support_wbapp, allow_new_window, no_travellog; static BOOL report_mime; static BOOL testing_submit; static BOOL resetting_document; +static BOOL is_mhtml; static int stream_read, protocol_read; static IStream *history_stream; static enum load_state_t { @@ -244,6 +245,22 @@ static const char html_page[] = "<body><div>test</div></body>" "</html>"; +static const char mhtml_page[] = + "MIME-Version: 1.0\r\n" + "Content-Type: multipart/related; type:=\"text/html\"; boundary=\"----=_NextPart_000_00\"\r\n" + "\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: text/html; charset=\"Windows-1252\"\r\n" + "Content-Transfer-Encoding: quoted-printable\r\n" + "\r\n" + "<HTML></HTML>\r\n" + "------=_NextPart_000_00\r\n" + "Content-Type: Image/Jpeg\r\n" + "Content-Transfer-Encoding: base64\r\n" + "Content-Location: http://winehq.org/mhtmltest.html\r\n" + "\r\n\t\t\t\tVGVzdA==\r\n\r\n" + "------=_NextPart_000_00--"; + static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = @@ -578,12 +595,15 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(pOIBindInfo != NULL, "pOIBindInfo == NULL\n"); ok(!grfPI, "grfPI = %x\n", grfPI); ok(!dwReserved, "dwReserved = %lx\n", dwReserved); + if(is_mhtml) + ok(!strcmp_wa(szUrl, "winetest:doc"), "unexpected URL %s\n", wine_dbgstr_w(szUrl)); memset(&bindinfo, 0, sizeof(bindinfo)); bindinfo.cbSize = sizeof(bindinfo); hres = IInternetBindInfo_GetBindInfo(pOIBindInfo, &bindf, &bindinfo); ok(hres == S_OK, "GetBindInfo failed: %08x\n", hres); if(!testing_submit) + todo_wine_if(is_mhtml) ok(bindf == (BINDF_FROMURLMON|BINDF_PULLDATA|BINDF_NEEDFILE|BINDF_ASYNCSTORAGE|BINDF_ASYNCHRONOUS), "bindf = %x\n", bindf); else @@ -606,9 +626,11 @@ static HRESULT WINAPI Protocol_Start(IInternetProtocol *iface, LPCWSTR szUrl, ok(!memcmp(U(bindinfo.stgmedData).hGlobal, "cmd=TEST", 8), "unexpected hGlobal\n"); } ok(bindinfo.szCustomVerb == 0, "bindinfo.szCustomVerb=%p\n", bindinfo.szCustomVerb); - ok(bindinfo.dwOptions == 0x80000 || - bindinfo.dwOptions == 0x4080000, /* win2k3 */ - "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + if(is_mhtml) + ok(!bindinfo.dwOptions, "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); + else + ok(bindinfo.dwOptions == 0x80000 || bindinfo.dwOptions == 0x4080000, /* win2k3 */ + "bindinfo.dwOptions=%x\n", bindinfo.dwOptions); ok(bindinfo.dwOptionsFlags == 0, "bindinfo.dwOptionsFlags=%d\n", bindinfo.dwOptionsFlags); /* TODO: test dwCodePage */ /* TODO: test securityAttributes */ @@ -672,18 +694,23 @@ static HRESULT WINAPI Protocol_Resume(IInternetProtocol *iface) static HRESULT WINAPI Protocol_Read(IInternetProtocol *iface, void *pv, ULONG cb, ULONG *pcbRead) { + const char *data = is_mhtml ? mhtml_page : css_data; + unsigned data_len = strlen(data); + CHECK_EXPECT2(Protocol_Read); ok(pv != NULL, "pv == NULL\n"); - ok(cb > sizeof(css_data), "cb < sizeof(css_data)\n"); + ok(cb > data_len, "cb < data_len\n"); ok(pcbRead != NULL, "pcbRead == NULL\n"); - ok(!*pcbRead || *pcbRead==sizeof(css_data)-1, "*pcbRead=%d\n", *pcbRead); + ok(!*pcbRead || *pcbRead == data_len, "*pcbRead=%d\n", *pcbRead); - if(protocol_read) + if(protocol_read) { + *pcbRead = 0; return S_FALSE; + } - protocol_read += *pcbRead = sizeof(css_data)-1; - memcpy(pv, css_data, sizeof(css_data)-1); + protocol_read += *pcbRead = data_len; + memcpy(pv, data, data_len); return S_OK; } @@ -5589,7 +5616,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) SET_EXPECT(OnChanged_READYSTATE); SET_EXPECT(Invoke_OnReadyStateChange_Loading); SET_EXPECT(IsSystemMoniker); - if(mon == &Moniker) + if(!is_mhtml && mon == &Moniker) SET_EXPECT(BindToStorage); SET_EXPECT(SetActiveObject); if(set_clientsite) { @@ -5602,6 +5629,14 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) } SET_EXPECT(Exec_ShellDocView_84); SET_EXPECT(GetPendingUrl); + if(is_mhtml) { + SET_EXPECT(CreateInstance); + SET_EXPECT(Start); + SET_EXPECT(Protocol_Read); + SET_EXPECT(LockRequest); + SET_EXPECT(Terminate); + SET_EXPECT(UnlockRequest); + } load_state = LD_DOLOAD; expect_LockContainer_fLock = TRUE; readystate_set_loading = TRUE; @@ -5636,7 +5671,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) CHECK_CALLED(OnChanged_READYSTATE); CHECK_CALLED(Invoke_OnReadyStateChange_Loading); CLEAR_CALLED(IsSystemMoniker); /* IE7 */ - if(mon == &Moniker) + if(!is_mhtml && mon == &Moniker) CHECK_CALLED(BindToStorage); CLEAR_CALLED(SetActiveObject); /* FIXME */ if(set_clientsite) { @@ -5649,10 +5684,21 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon) } CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); + if(is_mhtml) { + CHECK_CALLED(CreateInstance); + CHECK_CALLED(Start); + CHECK_CALLED(Protocol_Read); + CHECK_CALLED(LockRequest); + CHECK_CALLED(Terminate); + CHECK_CALLED(UnlockRequest); + } set_clientsite = container_locked = TRUE; - test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE); + if(!is_mhtml) + test_GetCurMoniker((IUnknown*)persist, mon, NULL, FALSE); + else + test_GetCurMoniker((IUnknown*)persist, NULL, "mhtml:winetest:doc", FALSE); IBindCtx_Release(bind); @@ -5697,7 +5743,7 @@ static void test_download(DWORD flags) SET_EXPECT(Invoke_AMBIENT_SILENT); SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); } - if(flags & (DWL_VERBDONE|DWL_HTTP)) + if(is_mhtml || (flags & (DWL_VERBDONE|DWL_HTTP))) SET_EXPECT(Exec_SETPROGRESSMAX); if(flags & DWL_EX_GETHOSTINFO) SET_EXPECT(GetHostInfo); @@ -5762,7 +5808,7 @@ static void test_download(DWORD flags) } if(!is_js && !is_extern) { if(!editmode && !(flags & DWL_REFRESH)) { - if(!(flags & DWL_EMPTY)) + if(!is_mhtml && !(flags & DWL_EMPTY)) SET_EXPECT(FireNavigateComplete2); SET_EXPECT(FireDocumentComplete); } @@ -5788,7 +5834,7 @@ static void test_download(DWORD flags) CHECK_CALLED(Invoke_AMBIENT_SILENT); CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); } - if(flags & DWL_VERBDONE) + if(is_mhtml || (flags & DWL_VERBDONE)) CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); @@ -5874,7 +5920,7 @@ static void test_download(DWORD flags) } if(!is_js && !is_extern) { if(!editmode && !(flags & DWL_REFRESH)) { - if(!(flags & DWL_EMPTY)) { + if(!is_mhtml && !(flags & DWL_EMPTY)) { todo_wine_if(!support_wbapp) CHECK_CALLED(FireNavigateComplete2); } @@ -7484,6 +7530,7 @@ static void init_test(enum load_state_t ls) { complete = FALSE; testing_submit = FALSE; expect_uihandler_iface = &DocHostUIHandler; + is_mhtml = FALSE; } static void test_HTMLDocument(BOOL do_load, BOOL mime) @@ -7590,6 +7637,60 @@ static void test_HTMLDocument(BOOL do_load, BOOL mime) ok(!IsWindow(doc_hwnd), "hwnd is not destroyed\n"); } +static void test_MHTMLDocument(void) +{ + IHTMLDocument2 *doc; + IOleObject *oleobj; + HRESULT hres; + + if(!is_ie9plus) { + win_skip("Skipping MHTML document tests on too old IE.\n"); + return; + } + + trace("Testing MHTMLDocument...\n"); + + init_test(LD_DOLOAD); + is_mhtml = TRUE; + nav_url = nav_serv_url = "mhtml:winetest:doc"; + + hres = CoCreateInstance(&CLSID_MHTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHTMLDocument2, (void**)&doc); + ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres); + + doc_unk = (IUnknown*)doc; + + test_QueryInterface(doc); + test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); + test_ViewAdviseSink(doc); + test_ConnectionPointContainer(doc); + + hres = IHTMLDocument2_QueryInterface(doc, &IID_IOleObject, (void**)&oleobj); + ok(hres == S_OK, "Could not get IOleObject iface: %08x\n", hres); + test_ClientSite(oleobj, CLIENTSITE_EXPECTPATH); + test_DoVerb(oleobj); + IOleObject_Release(oleobj); + + test_GetCurMoniker((IUnknown*)doc, NULL, NULL, FALSE); + test_Persist(doc, &Moniker); + set_custom_uihandler(doc, &CustomDocHostUIHandler); + test_GetCurMoniker((IUnknown*)doc, NULL, "mhtml:winetest:doc", FALSE); + test_download(0); + + test_exec_onunload(doc); + test_UIDeactivate(); + test_InPlaceDeactivate(doc, TRUE); + test_InPlaceDeactivate(doc, FALSE); + test_CloseView(); + test_Close(doc, TRUE); + + if(view) + IOleDocumentView_Release(view); + view = NULL; + + release_document(doc); +} + static void test_HTMLDocument_hlink(DWORD status) { IHTMLDocument2 *doc; @@ -8634,6 +8735,7 @@ START_TEST(htmldoc) test_HTMLDocument(TRUE, TRUE); test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); + test_MHTMLDocument(); test_editing_mode(FALSE, FALSE); test_editing_mode(TRUE, FALSE); test_editing_mode(TRUE, TRUE);

1 0

Lauri Kenttä : cabinet: Make Extract overwrite existing files.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: af86bdc31b59c68ea218d6fcdb794e7c3ae74d7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=af86bdc31b59c68ea218d6fcd… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 4 14:24:49 2017 +0200 cabinet: Make Extract overwrite existing files. Only read-only files must not be overwritten. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/cabinet_main.c | 2 +- dlls/cabinet/tests/extract.c | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 5a1ae06..239849d 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -251,7 +251,7 @@ static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICAT } hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, - CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); + CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if (hFile == INVALID_HANDLE_VALUE) hFile = 0; diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index 849d612..d39043f 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -80,6 +80,18 @@ static void createTestFile(const CHAR *name) CloseHandle(file); } +static int getFileSize(const CHAR *name) +{ + HANDLE file; + int size; + file = CreateFileA(name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (file == INVALID_HANDLE_VALUE) + return -1; + size = GetFileSize(file, NULL); + CloseHandle(file); + return size; +} + static void create_test_files(void) { int len; @@ -621,9 +633,10 @@ static void test_Extract(void) ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); free_file_list(&session); - /* first file exists */ + /* first file exists but is read-only */ createTestFile("dest\\a.txt"); SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_READONLY); + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); ZeroMemory(&session, sizeof(SESSION)); lstrcpyA(session.Destination, "dest"); session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; @@ -647,7 +660,8 @@ static void test_Extract(void) ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); - ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to not exist\n"); + ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); + ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to be read-only\n"); todo_wine { ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); @@ -663,7 +677,8 @@ static void test_Extract(void) SetFileAttributesA("dest\\a.txt", FILE_ATTRIBUTE_NORMAL); DeleteFileA("dest\\a.txt"); - /* third file exists */ + /* first file exists and is writable, third file exists but is read-only */ + createTestFile("dest\\a.txt"); createTestFile("dest\\testdir\\c.txt"); SetFileAttributesA("dest\\testdir\\c.txt", FILE_ATTRIBUTE_READONLY); ZeroMemory(&session, sizeof(SESSION)); @@ -689,9 +704,10 @@ static void test_Extract(void) ok(!lstrcmpA(session.Destination, "dest"), "Expected dest, got %s\n", session.Destination); ok(!*session.Reserved, "Expected empty string, got %s\n", session.Reserved); ok(!session.FilterList, "Expected empty filter list\n"); + ok(getFileSize("dest\\a.txt") == 6, "Expected dest\\a.txt to be 6 bytes\n"); ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); - ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to be read-only\n"); todo_wine { ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n");

1 0

Lauri Kenttä : cabinet: Make Extract fail on read-only files.
by Alexandre Julliard 06 Feb '17

06 Feb '17

Module: wine Branch: master Commit: 1f7d144ff9c804a22b4f9cca72d68476fe29a8b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7d144ff9c804a22b4f9cca7… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Sat Feb 4 14:24:50 2017 +0200 cabinet: Make Extract fail on read-only files. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/cabinet/cabinet_main.c | 4 +-- dlls/cabinet/tests/extract.c | 64 ++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 41 deletions(-) diff --git a/dlls/cabinet/cabinet_main.c b/dlls/cabinet/cabinet_main.c index 239849d..8af0fb1 100644 --- a/dlls/cabinet/cabinet_main.c +++ b/dlls/cabinet/cabinet_main.c @@ -253,9 +253,7 @@ static INT_PTR CDECL fdi_notify_extract(FDINOTIFICATIONTYPE fdint, PFDINOTIFICAT hFile = CreateFileA(szFullPath, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); - if (hFile == INVALID_HANDLE_VALUE) - hFile = 0; - else if (node) + if (hFile != INVALID_HANDLE_VALUE && node) node->DoExtract = FALSE; } diff --git a/dlls/cabinet/tests/extract.c b/dlls/cabinet/tests/extract.c index d39043f..c3d4510 100644 --- a/dlls/cabinet/tests/extract.c +++ b/dlls/cabinet/tests/extract.c @@ -642,18 +642,15 @@ static void test_Extract(void) session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); node = session.FileList; - todo_wine - { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); - ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize); - ok(session.Error.erfOper == FDIERROR_USER_ABORT, - "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); - ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); - ok(session.FileCount == 1, "Expected 1, got %d\n", session.FileCount); - ok(!lstrcmpA(session.CurrentFile, "dest\\a.txt"), - "Expected dest\\a.txt, got %s\n", session.CurrentFile); - } + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); + ok(session.FileSize == 6, "Expected 6, got %d\n", session.FileSize); + ok(session.Error.erfOper == FDIERROR_USER_ABORT, + "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); + ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); + ok(session.FileCount == 1, "Expected 1, got %d\n", session.FileCount); + ok(!lstrcmpA(session.CurrentFile, "dest\\a.txt"), + "Expected dest\\a.txt, got %s\n", session.CurrentFile); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES), "Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation); @@ -662,15 +659,12 @@ static void test_Extract(void) ok(!session.FilterList, "Expected empty filter list\n"); ok(getFileSize("dest\\a.txt") == 11, "Expected dest\\a.txt to be 11 bytes\n"); ok(!DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to be read-only\n"); - todo_wine - { - ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); - ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); - ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); - ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); - ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); - } + ok(!DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to not exist\n"); + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); + ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry should not exist\n"); + ok(!check_list(&node, "b.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "a.txt", FALSE), "list entry should not exist\n"); free_file_list(&session); @@ -686,18 +680,15 @@ static void test_Extract(void) session.Operation = EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES; res = pExtract(&session, "extract.cab"); node = session.FileList; - todo_wine - { - ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, - "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); - ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize); - ok(session.Error.erfOper == FDIERROR_USER_ABORT, - "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); - ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); - ok(session.FileCount == 3, "Expected 3, got %d\n", session.FileCount); - ok(!lstrcmpA(session.CurrentFile, "dest\\testdir\\c.txt"), - "Expected dest\\c.txt, got %s\n", session.CurrentFile); - } + ok(res == HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) || res == E_FAIL, + "Expected HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) or E_FAIL, got %08x\n", res); + ok(session.FileSize == 26, "Expected 26, got %d\n", session.FileSize); + ok(session.Error.erfOper == FDIERROR_USER_ABORT, + "Expected FDIERROR_USER_ABORT, got %d\n", session.Error.erfOper); + ok(session.Error.fError == TRUE, "Expected TRUE, got %d\n", session.Error.fError); + ok(session.FileCount == 3, "Expected 3, got %d\n", session.FileCount); + ok(!lstrcmpA(session.CurrentFile, "dest\\testdir\\c.txt"), + "Expected dest\\c.txt, got %s\n", session.CurrentFile); ok(session.Error.erfType == 0, "Expected 0, got %d\n", session.Error.erfType); ok(session.Operation == (EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES), "Expected EXTRACT_FILLFILELIST | EXTRACT_EXTRACTFILES, got %d\n", session.Operation); @@ -708,11 +699,8 @@ static void test_Extract(void) ok(DeleteFileA("dest\\a.txt"), "Expected dest\\a.txt to exist\n"); ok(DeleteFileA("dest\\b.txt"), "Expected dest\\b.txt to exist\n"); ok(!DeleteFileA("dest\\testdir\\c.txt"), "Expected dest\\testdir\\c.txt to be read-only\n"); - todo_wine - { - ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); - ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); - } + ok(!DeleteFileA("dest\\testdir\\d.txt"), "Expected dest\\testdir\\d.txt to not exist\n"); + ok(!check_list(&node, "testdir\\d.txt", FALSE), "list entry should not exist\n"); ok(!check_list(&node, "testdir\\c.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "b.txt", FALSE), "list entry wrong\n"); ok(!check_list(&node, "a.txt", TRUE), "list entry wrong\n");

1 0