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

Francois Gouget : testbot: Clarify the timeout error message in the email reports.
by Alexandre Julliard March 20, 2014

March 20, 2014

Module: tools Branch: master Commit: 872a26b5fe4e82b2e03541c4f1d6222012723dc4 URL: http://source.winehq.org/git/tools.git/?a=commit;h=872a26b5fe4e82b2e03541c4… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 17 10:22:07 2014 +0100 testbot: Clarify the timeout error message in the email reports. --- testbot/bin/WineSendLog.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index aec2bee..b375447 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -116,7 +116,7 @@ sub ReadLog if ($Line =~ m/${BaseName}:${TestSet} done $(\d+)$/ && $1 eq "258") { - $Messages[@Messages] = "Timeout"; + $Messages[@Messages] = "The test timed out"; } $Found = 1; } @@ -256,7 +256,7 @@ EOF } if ($Line =~ m/^[^:]+:([^ ]+) done $258$/) { - print SENDMAIL "$1: Timeout\n"; + print SENDMAIL "$1: The test timed out\n"; } else {

1 0

Nikolay Sivov : idl: Remove 'optional' for 'defaultvalue' non-VARIANT arguments.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 18c350ae224af6fafe15b92036fca77fdb4371da URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c350ae224af6fafe15b9203… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:21:10 2014 +0400 idl: Remove 'optional' for 'defaultvalue' non-VARIANT arguments. --- dlls/scrrun/scrrun.idl | 38 ++++++++++++++++++------------------ dlls/wshom.ocx/wshom.idl | 20 +++++++++---------- include/msinkaut.idl | 48 +++++++++++++++++++++++----------------------- 3 files changed, 53 insertions(+), 53 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18c350ae224af6fafe15b…

1 0

Nikolay Sivov : user32: Added AddClipboardFormatListener/ RemoveClipboardFormatListener stubs.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 961d26418a68bfc92e8c1f14afe9a319bf8a6ad8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961d26418a68bfc92e8c1f14a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:29:47 2014 +0400 user32: Added AddClipboardFormatListener/RemoveClipboardFormatListener stubs. --- dlls/user32/clipboard.c | 18 ++++++++++++++++++ dlls/user32/user32.spec | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/user32/clipboard.c b/dlls/user32/clipboard.c index fd16384..eb9f559 100644 --- a/dlls/user32/clipboard.c +++ b/dlls/user32/clipboard.c @@ -580,3 +580,21 @@ DWORD WINAPI GetClipboardSequenceNumber(VOID) TRACE("returning %x\n", seqno); return seqno; } + +/************************************************************************** + * AddClipboardFormatListener (USER32.@) + */ +BOOL WINAPI AddClipboardFormatListener(HWND hwnd) +{ + FIXME("%p: stub\n", hwnd); + return TRUE; +} + +/************************************************************************** + * RemoveClipboardFormatListener (USER32.@) + */ +BOOL WINAPI RemoveClipboardFormatListener(HWND hwnd) +{ + FIXME("%p: stub\n", hwnd); + return TRUE; +} diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 4b1f4b5..052f7ff 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -1,4 +1,5 @@ @ stdcall ActivateKeyboardLayout(long long) +@ stdcall AddClipboardFormatListener(long) @ stdcall AdjustWindowRect(ptr long long) @ stdcall AdjustWindowRectEx(ptr long long long) @ stdcall AlignRects(ptr long long long) @@ -575,6 +576,7 @@ @ stdcall RegisterWindowMessageW(wstr) @ stdcall ReleaseCapture() @ stdcall ReleaseDC(long long) +@ stdcall RemoveClipboardFormatListener(long) @ stdcall RemoveMenu(long long long) @ stdcall RemovePropA(long str) @ stdcall RemovePropW(long wstr)

1 0

Henri Verbeet : d3d9/tests: Use a separate device for texop_test().
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: ad45d2c2339ca22777699d0b89468ffdceffee34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad45d2c2339ca22777699d0b8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 19 08:57:06 2014 +0100 d3d9/tests: Use a separate device for texop_test(). --- dlls/d3d9/tests/visual.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e8b0e79..2cb6998 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10260,13 +10260,17 @@ cleanup: if(dsttex) IDirect3DTexture9_Release(dsttex); } -static void texop_test(IDirect3DDevice9 *device) +static void texop_test(void) { IDirect3DVertexDeclaration9 *vertex_declaration = NULL; IDirect3DTexture9 *texture = NULL; D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCOLOR color; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; unsigned i; @@ -10319,6 +10323,16 @@ static void texop_test(IDirect3DDevice9 *device) {D3DTOP_LERP, "LERP", D3DTEXOPCAPS_LERP, D3DCOLOR_ARGB(0x00, 0x00, 0x33, 0x33)}, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + memset(&caps, 0, sizeof(caps)); hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); @@ -10386,9 +10400,13 @@ static void texop_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed with 0x%08x\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); IDirect3DTexture9_Release(texture); IDirect3DVertexDeclaration9_Release(vertex_declaration); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void yuv_color_test(IDirect3DDevice9 *device) @@ -15748,11 +15766,10 @@ START_TEST(visual) } else skip("No ps_1_1 support\n"); - texop_test(device_ptr); - cleanup_device(device_ptr); device_ptr = NULL; + texop_test(); texop_range_test(); alphareplicate_test(); dp3_alpha_test();

1 0

Alexandre Julliard : user32: Set the queue mask only after flushing the window surfaces.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: fc183ba2c5145106b3fc54a6bfe5cc8445c9427f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc183ba2c5145106b3fc54a6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 15:56:22 2014 +0100 user32: Set the queue mask only after flushing the window surfaces. --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2cd1472..1aee670 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -4093,6 +4093,8 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, return WAIT_FAILED; } + flush_window_surfaces( TRUE ); + /* set the queue mask */ SERVER_START_REQ( set_queue_mask ) { @@ -4107,7 +4109,6 @@ DWORD WINAPI MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *pHandles, for (i = 0; i < count; i++) handles[i] = pHandles[i]; handles[count] = get_server_queue_handle(); - flush_window_surfaces( TRUE ); return wow_handlers.wait_message( count+1, handles, timeout, mask, flags ); }

1 0

Alexandre Julliard : user32/tests: Mark a failing test as todo.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 06960ac2674d15b922d1d63a4cf3505a97eba5b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=06960ac2674d15b922d1d63a4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 19 12:56:11 2014 +0100 user32/tests: Mark a failing test as todo. --- dlls/user32/tests/msg.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9c1320d..b716630 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11316,9 +11316,6 @@ if (0) /* FIXME: Wine behaves completely different here */ win_rc.left, win_rc.top, win_rc.right, win_rc.bottom, wp.rcNormalPosition.left, wp.rcNormalPosition.top, wp.rcNormalPosition.right, wp.rcNormalPosition.bottom); - - flush_events(); - flush_sequence(); } DestroyWindow(hwnd); @@ -14300,7 +14297,7 @@ static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, switch (message) { case WM_ENTERIDLE: - ok(GetCapture() == hwnd, "expected %p, got %p\n", hwnd, GetCapture()); + todo_wine ok(GetCapture() == hwnd, "expected %p, got %p\n", hwnd, GetCapture()); EndMenu(); break; case WM_INITMENU:

1 0

Dmitry Timoshkov : widl: Move is_ptr() and is_array() to header.h and make them inline.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: e809f0bd8c21558d030acf0bd2b7cf87fdc001ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=e809f0bd8c21558d030acf0bd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Mar 19 19:26:18 2014 +0900 widl: Move is_ptr() and is_array() to header.h and make them inline. --- tools/widl/header.h | 10 ++++++++++ tools/widl/typelib.c | 10 ---------- tools/widl/widltypes.h | 3 --- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tools/widl/header.h b/tools/widl/header.h index 3af57d6..8ca1cf1 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -58,6 +58,16 @@ extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, extern int has_out_arg_or_return(const var_t *func); extern int is_const_decl(const var_t *var); +static inline int is_ptr(const type_t *t) +{ + return type_get_type(t) == TYPE_POINTER; +} + +static inline int is_array(const type_t *t) +{ + return type_get_type(t) == TYPE_ARRAY; +} + static inline int last_ptr(const type_t *type) { return is_ptr(type) && !is_declptr(type_pointer_get_ref(type)); diff --git a/tools/widl/typelib.c b/tools/widl/typelib.c index e3fc0b9..8632fdf 100644 --- a/tools/widl/typelib.c +++ b/tools/widl/typelib.c @@ -49,16 +49,6 @@ static typelib_t *typelib; -int is_ptr(const type_t *t) -{ - return type_get_type(t) == TYPE_POINTER; -} - -int is_array(const type_t *t) -{ - return type_get_type(t) == TYPE_ARRAY; -} - /* List of oleauto types that should be recognized by name. * (most of) these seem to be intrinsic types in mktyplib. * This table MUST be alphabetically sorted on the kw field. diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index 30b6560..47c8844 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -544,9 +544,6 @@ type_t *alloc_type(void); void set_all_tfswrite(int val); void clear_all_offsets(void); -int is_ptr(const type_t *t); -int is_array(const type_t *t); - #define tsENUM 1 #define tsSTRUCT 2 #define tsUNION 3

1 0

Jacek Caban : jscript: Represent NULL VT_UNKNOWN VARIANT as NULL VT_DISPATCH.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 5cf20ceffd2a2906b6b1c8b06d276e8436d746b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5cf20ceffd2a2906b6b1c8b06… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 19 13:15:14 2014 +0100 jscript: Represent NULL VT_UNKNOWN VARIANT as NULL VT_DISPATCH. --- dlls/jscript/jsutils.c | 3 +++ dlls/jscript/tests/run.c | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 87bad26..a324c96 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -327,6 +327,9 @@ HRESULT variant_to_jsval(VARIANT *var, jsval_t *r) *r = jsval_disp(disp); return S_OK; } + }else { + *r = jsval_disp(NULL); + return S_OK; } /* fall through */ default: diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 0db3660..a92282a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1156,7 +1156,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, return S_OK; case DISPID_GLOBAL_TESTARGTYPES: { - VARIANT args[3]; + VARIANT args[4]; DISPPARAMS dp = {args, NULL, sizeof(args)/sizeof(*args), 0}; HRESULT hres; @@ -1190,6 +1190,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_INT(args+1) = 22; V_VT(args+2) = VT_UNKNOWN; V_UNKNOWN(args+2) = (IUnknown*)&testObj; + V_VT(args+3) = VT_UNKNOWN; + V_UNKNOWN(args+3) = NULL; hres = IDispatch_Invoke(V_DISPATCH(pdp->rgvarg), DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); ok(hres == S_OK, "Invoke failed: %08x\n", hres); @@ -2140,10 +2142,12 @@ static BOOL run_tests(void) CHECK_CALLED(global_propargput_i); SET_EXPECT(global_testargtypes_i); - parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(d,i,s) {" + parse_script_a("testArgTypes(dispUnk, intProp(), intProp, getShort(), shortProp, function(nullunk,d,i,s) {" " ok(getVT(i) === 'VT_I4', 'getVT(i) = ' + getVT(i));" " ok(getVT(s) === 'VT_I4', 'getVT(s) = ' + getVT(s));" " ok(getVT(d) === 'VT_DISPATCH', 'getVT(d) = ' + getVT(d));" + " ok(getVT(nullunk) === 'VT_DISPATCH', 'getVT(nullunk) = ' + getVT(nullunk));" + " ok(nullunk === null, 'nullunk !== null');" "});"); CHECK_CALLED(global_testargtypes_i);

1 0

Alistair Leslie-Hughes : ntoskrnl.exe: Add stub MmUnlockPagableImageSection.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: ba138930309410df79d2fe20e57516c36244b7ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba138930309410df79d2fe20e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Mar 19 10:12:02 2014 +1100 ntoskrnl.exe: Add stub MmUnlockPagableImageSection. --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f227e11..69e56d7 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1521,6 +1521,13 @@ PVOID WINAPI MmMapLockedPagesSpecifyCache(PMDLX MemoryDescriptorList, KPROCESSO return NULL; } +/*********************************************************************** + * MmUnlockPagableImageSection (NTOSKRNL.EXE.@) + */ +VOID WINAPI MmUnlockPagableImageSection(PVOID ImageSectionHandle) +{ + FIXME("stub %p\n", ImageSectionHandle); +} /*********************************************************************** * MmPageEntireDriver (NTOSKRNL.EXE.@) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index cec8c87..e70c380 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -716,7 +716,7 @@ @ stub MmSizeOfMdl @ stub MmSystemRangeStart @ stub MmTrimAllSystemPagableMemory -@ stub MmUnlockPagableImageSection +@ stdcall MmUnlockPagableImageSection(ptr) @ stdcall MmUnlockPages(ptr) @ stdcall MmUnmapIoSpace(ptr long) @ stub MmUnmapLockedPages

1 0

Nikolay Sivov : scrrun: Implemented AtEndOfStream() property.
by Alexandre Julliard March 19, 2014

March 19, 2014

Module: wine Branch: master Commit: 038438ad696fc936a6bae5669bc0f35d7dbb7fa0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=038438ad696fc936a6bae5669… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 19 10:21:27 2014 +0400 scrrun: Implemented AtEndOfStream() property. --- dlls/scrrun/filesystem.c | 26 ++++++++++++++++++++++++-- dlls/scrrun/tests/filesystem.c | 32 ++++++++++++++++++++++++-------- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index f1fea06..c6dbb76 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -111,6 +111,7 @@ struct textstream { IOMode mode; BOOL unicode; BOOL first_write; + LARGE_INTEGER size; HANDLE file; }; @@ -332,8 +333,24 @@ static HRESULT WINAPI textstream_get_Column(ITextStream *iface, LONG *column) static HRESULT WINAPI textstream_get_AtEndOfStream(ITextStream *iface, VARIANT_BOOL *eos) { struct textstream *This = impl_from_ITextStream(iface); - FIXME("(%p)->(%p): stub\n", This, eos); - return E_NOTIMPL; + LARGE_INTEGER pos, dist; + + TRACE("(%p)->(%p)\n", This, eos); + + if (!eos) + return E_POINTER; + + if (textstream_check_iomode(This, IORead)) { + *eos = VARIANT_TRUE; + return CTL_E_BADFILEMODE; + } + + dist.QuadPart = 0; + if (!SetFilePointerEx(This->file, dist, &pos, FILE_CURRENT)) + return E_FAIL; + + *eos = This->size.QuadPart == pos.QuadPart ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; } static HRESULT WINAPI textstream_get_AtEndOfLine(ITextStream *iface, VARIANT_BOOL *eol) @@ -548,6 +565,11 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod return hr; } + if (mode == ForReading) + GetFileSizeEx(stream->file, &stream->size); + else + stream->size.QuadPart = 0; + *ret = &stream->ITextStream_iface; return S_OK; } diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 4897652..63b79fa 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -154,9 +154,11 @@ static void test_textstream(void) static const WCHAR testfileW[] = {'t','e','s','t','f','i','l','e','.','t','x','t',0}; ITextStream *stream; VARIANT_BOOL b; + DWORD written; HANDLE file; HRESULT hr; BSTR name, data; + BOOL ret; file = CreateFileW(testfileW, GENERIC_READ, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); CloseHandle(file); @@ -199,12 +201,14 @@ static void test_textstream(void) hr = ITextStream_Write(stream, name); ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); + hr = ITextStream_get_AtEndOfStream(stream, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { - ok(hr == S_FALSE || broken(hr == S_OK), "got 0x%08x\n", hr); + ok(hr == S_OK || broken(hr == S_FALSE), "got 0x%08x\n", hr); ok(b == VARIANT_TRUE, "got 0x%x\n", b); -} + ITextStream_Release(stream); hr = IFileSystem3_OpenTextFile(fs3, name, ForWriting, VARIANT_FALSE, TristateFalse, &stream); @@ -212,10 +216,9 @@ todo_wine { b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); -} + b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { @@ -235,14 +238,12 @@ todo_wine { hr = IFileSystem3_OpenTextFile(fs3, name, ForAppending, VARIANT_FALSE, TristateFalse, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - SysFreeString(name); b = 10; hr = ITextStream_get_AtEndOfStream(stream, &b); -todo_wine { ok(hr == CTL_E_BADFILEMODE, "got 0x%08x\n", hr); ok(b == VARIANT_TRUE || broken(b == 10), "got 0x%x\n", b); -} + b = 10; hr = ITextStream_get_AtEndOfLine(stream, &b); todo_wine { @@ -260,6 +261,21 @@ todo_wine { ITextStream_Release(stream); + /* now with non-empty file */ + file = CreateFileW(testfileW, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ret = WriteFile(file, testfileW, sizeof(testfileW), &written, NULL); + ok(ret && written == sizeof(testfileW), "got %d\n", ret); + CloseHandle(file); + + hr = IFileSystem3_OpenTextFile(fs3, name, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + b = 10; + hr = ITextStream_get_AtEndOfStream(stream, &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(b == VARIANT_FALSE, "got 0x%x\n", b); + ITextStream_Release(stream); + + SysFreeString(name); DeleteFileW(testfileW); }

1 0