January 2010 - Wine-commits

Jacek Caban : mshtml: Silence invalid FIXME.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 56f26c1e19df4152d36ba4f7ad781f9511bbe79a URL: http://source.winehq.org/git/wine.git/?a=commit;h=56f26c1e19df4152d36ba4f7a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 14 10:10:57 2010 -0600 mshtml: Silence invalid FIXME. --- dlls/mshtml/nsio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index 46fdcbc..763e877 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -438,7 +438,7 @@ static nsresult NSAPI nsChannel_GetSecurityInfo(nsIHttpChannel *iface, nsISuppor { nsChannel *This = NSCHANNEL_THIS(iface); - FIXME("(%p)->(%p)\n", This, aSecurityInfo); + TRACE("(%p)->(%p)\n", This, aSecurityInfo); return NS_ERROR_NOT_IMPLEMENTED; }

1 0

Kusanagi Kouichi : user32/tests: Add test for Shift+F10.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 95676b50f8b7b77034aef6acd745af4d8322cafd URL: http://source.winehq.org/git/wine.git/?a=commit;h=95676b50f8b7b77034aef6acd… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 13 22:55:05 2010 +0900 user32/tests: Add test for Shift+F10. --- dlls/user32/tests/msg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 7be49ed..96b9ccc 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6903,6 +6903,32 @@ static const struct message WmVkF10Seq[] = { { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, { 0 } }; +static const struct message WmShiftF10Seq[] = { + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 1 }, /* XP */ + { WM_KEYDOWN, wparam|lparam, VK_SHIFT, 1 }, + { WM_KEYDOWN, sent|wparam|lparam, VK_SHIFT, 0x00000001 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 1 }, /* XP */ + { WM_SYSKEYDOWN, wparam|lparam, VK_F10, 1 }, + { WM_SYSKEYDOWN, sent|wparam|lparam, VK_F10, 0x00000001 }, + { WM_CONTEXTMENU, sent|defwinproc|lparam, /*hwnd*/0, MAKELPARAM(-1, -1) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_F10, 0xc0000001 }, /* XP */ + { WM_SYSKEYUP, wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSKEYUP, sent|wparam|lparam, VK_F10, 0xc0000001 }, + { WM_SYSCOMMAND, sent|defwinproc|wparam, SC_KEYMENU }, + { HCBT_SYSCOMMAND, hook }, + { WM_ENTERMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_INITMENU, sent|defwinproc }, + { WM_MENUSELECT, sent|defwinproc|wparam, MAKEWPARAM(0,MF_SYSMENU|MF_POPUP|MF_HILITE) }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_SHIFT, 0xd0000001 }, /* XP */ + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0x10000001 }, /* XP */ + { WM_CAPTURECHANGED, sent|defwinproc|wparam|lparam, 0, 0 }, + { WM_MENUSELECT, sent|defwinproc|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|defwinproc|wparam|lparam, 0, 0 }, + { HCBT_KEYSKIPPED, hook|wparam|lparam|optional, VK_ESCAPE, 0xc0000001 }, /* XP */ + { WM_KEYUP, wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { WM_KEYUP, sent|wparam|lparam, VK_ESCAPE, 0xc0000001 }, + { 0 } +}; static void pump_msg_loop(HWND hwnd, HACCEL hAccel) { @@ -7123,6 +7149,16 @@ static void test_accelerators(void) pump_msg_loop(hwnd, 0); ok_sequence(WmVkF10Seq, "VK_F10 press/release", TRUE); + trace("testing SHIFT+F10 press/release\n"); + keybd_event(VK_SHIFT, 0, 0, 0); + keybd_event(VK_F10, 0, 0, 0); + keybd_event(VK_F10, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_SHIFT, 0, KEYEVENTF_KEYUP, 0); + keybd_event(VK_ESCAPE, 0, 0, 0); + keybd_event(VK_ESCAPE, 0, KEYEVENTF_KEYUP, 0); + pump_msg_loop(hwnd, 0); + ok_sequence(WmShiftF10Seq, "SHIFT+F10 press/release", TRUE); + trace("testing Shift+MouseButton press/release\n"); /* first, move mouse pointer inside of the window client area */ GetClientRect(hwnd, &rc);

1 0

Kusanagi Kouichi : user32: Make DefWindowProc handle Shift+F10.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 529b1833978e2cc3d2477395eababaf038d8fe4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=529b1833978e2cc3d2477395e… Author: Kusanagi Kouichi <slash(a)ac.auone-net.jp> Date: Wed Jan 13 22:55:25 2010 +0900 user32: Make DefWindowProc handle Shift+F10. --- dlls/user32/defwnd.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index ae104e2..e3736fc 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -561,7 +561,11 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa } } else if( wParam == VK_F10 ) + { + if (GetKeyState(VK_SHIFT) & 0x8000) + SendMessageW( hwnd, WM_CONTEXTMENU, (WPARAM)hwnd, MAKELPARAM(-1, -1) ); iF10Key = 1; + } else if( wParam == VK_ESCAPE && (GetKeyState(VK_SHIFT) & 0x8000)) SendMessageW( hwnd, WM_SYSCOMMAND, SC_KEYMENU, ' ' ); break;

1 0

Erich Hoover : ntoskrnl: Forward ExSystemTimeToLocalTime and ExLocalTimeToSystemTime to ntdll.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: c7ccf24020b9e995aade36038f6cbf84da2caf9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ccf24020b9e995aade36038… Author: Erich Hoover <ehoover(a)mines.edu> Date: Thu Jan 14 10:16:50 2010 -0700 ntoskrnl: Forward ExSystemTimeToLocalTime and ExLocalTimeToSystemTime to ntdll. --- dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 6fc72c1..5e11bf9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -157,7 +157,7 @@ @ stub ExIsProcessorFeaturePresent @ stub ExIsResourceAcquiredExclusiveLite @ stub ExIsResourceAcquiredSharedLite -@ stub ExLocalTimeToSystemTime +@ stdcall ExLocalTimeToSystemTime(ptr ptr) ntdll.RtlLocalTimeToSystemTime @ stub ExNotifyCallback @ stub ExQueryPoolBlockSize @ stub ExQueueWorkItem @@ -173,7 +173,7 @@ @ stub ExSetResourceOwnerPointer @ stub ExSetTimerResolution @ stub ExSystemExceptionFilter -@ stub ExSystemTimeToLocalTime +@ stdcall ExSystemTimeToLocalTime(ptr ptr) ntdll.RtlSystemTimeToLocalTime @ stub ExUnregisterCallback @ stub ExUuidCreate @ stub ExVerifySuite

1 0

Nikolay Sivov : msxml3/tests: Add some tests for IPersistStreamInit implementation of IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 1b2f1867c8b1e04a7d66bc5337397990c130d26b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b2f1867c8b1e04a7d66bc533… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 12 03:48:00 2010 +0300 msxml3/tests: Add some tests for IPersistStreamInit implementation of IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 166 +++++++++++++++++++++++++++++++++++--------- dlls/msxml3/xmldoc.c | 3 +- 2 files changed, 136 insertions(+), 33 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 5db91f1..8cf3357 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -49,6 +49,33 @@ static void create_xml_file(LPCSTR filename) CloseHandle(hf); } +static void create_stream_on_file(IStream **stream, LPCSTR path) +{ + HANDLE hfile; + HGLOBAL hglobal; + LPVOID ptr; + HRESULT hr; + DWORD file_size, read; + + hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, + OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); + file_size = GetFileSize(hfile, NULL); + + hglobal = GlobalAlloc(GHND, file_size); + ptr = GlobalLock(hglobal); + + ReadFile(hfile, ptr, file_size, &read, NULL); + ok(file_size == read, "Expected to read the whole file, read %d\n", read); + + hr = CreateStreamOnHGlobal(hglobal, TRUE, stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(*stream != NULL, "Expected non-NULL stream\n"); + + CloseHandle(hfile); + GlobalUnlock(hglobal); +} + static void test_xmldoc(void) { HRESULT hr; @@ -57,10 +84,6 @@ static void test_xmldoc(void) IXMLElementCollection *collection = NULL, *inner = NULL; IPersistStreamInit *psi = NULL; IStream *stream = NULL; - HGLOBAL hglobal; - HANDLE hfile; - LPVOID ptr; - DWORD file_size, read; CHAR path[MAX_PATH]; LONG type, num_child; VARIANT vIndex, vName; @@ -75,32 +98,11 @@ static void test_xmldoc(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); - - hfile = CreateFile(path, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); - ok(hfile != INVALID_HANDLE_VALUE, "Expected a valid file handle\n"); - file_size = GetFileSize(hfile, NULL); - - hglobal = GlobalAlloc(GHND, file_size); - ptr = GlobalLock(hglobal); - - ReadFile(hfile, ptr, file_size, &read, NULL); - ok(file_size == read, "Expected to read the whole file, read %d\n", read); - - hr = CreateStreamOnHGlobal(hglobal, TRUE, &stream); - ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - ok(stream != NULL, "Expected non-NULL stream\n"); - - CloseHandle(hfile); - GlobalUnlock(hglobal); + create_stream_on_file(&stream, path); hr = IXMLDocument_QueryInterface(doc, &IID_IPersistStreamInit, (LPVOID *)&psi); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -271,11 +273,7 @@ static void test_createElement(void) hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); - if (FAILED(hr)) - { - skip("Failed to create XMLDocument instance\n"); - return; - } + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* invalid vType type */ V_VT(&vType) = VT_NULL; @@ -354,6 +352,103 @@ static void test_createElement(void) IXMLDocument_Release(doc); } +static void test_persiststreaminit(void) +{ + IXMLDocument *doc = NULL; + IPersistStreamInit *psi = NULL; + IStream *stream = NULL; + STATSTG stat; + HRESULT hr; + ULARGE_INTEGER size; + CHAR path[MAX_PATH]; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IXMLDocument_QueryInterface(doc, &IID_IPersistStreamInit, (LPVOID *)&psi); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(psi != NULL, "Expected non-NULL psi\n"); + + /* null arguments */ + hr = IPersistStreamInit_GetSizeMax(psi, NULL); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); + + hr = IPersistStreamInit_Load(psi, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = IPersistStreamInit_Save(psi, NULL, FALSE); + todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + create_xml_file("bank.xml"); + GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); + create_stream_on_file(&stream, path); + + /* GetSizeMax not implemented */ + size.QuadPart = 0; + hr = IPersistStreamInit_GetSizeMax(psi, &size); + ok(hr == E_NOTIMPL, "Expected E_NOTIMPL, got %08x\n", hr); + ok(size.QuadPart == 0, "Expected 0\n"); + + hr = IPersistStreamInit_Load(psi, stream); + IStream_Release(stream); + ok(hr == S_OK || hr == XML_E_INVALIDATROOTLEVEL, "Expected S_OK, got %08x\n", hr); + if(hr == XML_E_INVALIDATROOTLEVEL) + goto cleanup; + + /* try to save document */ + stream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IPersistStreamInit_Save(psi, stream, FALSE); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stat.cbSize.QuadPart = 0; + hr = IStream_Stat(stream, &stat, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); + IStream_Release(stream); + + /* reset internal stream */ + hr = IPersistStreamInit_InitNew(psi); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stream = NULL; + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IPersistStreamInit_Save(psi, stream, FALSE); + todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + stat.cbSize.QuadPart = 0; + hr = IStream_Stat(stream, &stat, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); + IStream_Release(stream); + +cleanup: + IPersistStreamInit_Release(psi); + IXMLDocument_Release(doc); + DeleteFileA("bank.xml"); +} + +static BOOL test_try_xmldoc(void) +{ + IXMLDocument *doc = NULL; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, + &IID_IXMLDocument, (LPVOID*)&doc); + if (FAILED(hr)) + { + skip("Failed to create XMLDocument instance\n"); + return FALSE; + } + + IXMLDocument_Release(doc); + return TRUE; +} + START_TEST(xmldoc) { HRESULT hr; @@ -361,8 +456,15 @@ START_TEST(xmldoc) hr = CoInitialize(NULL); ok(hr == S_OK, "failed to init com\n"); + if (!test_try_xmldoc()) + { + CoUninitialize(); + return; + } + test_xmldoc(); test_createElement(); + test_persiststreaminit(); CoUninitialize(); } diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 018cf6c..72e185c 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -657,7 +657,8 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Save( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( IPersistStreamInit *iface, ULARGE_INTEGER *pcbSize) { - FIXME("(%p, %p): stub!\n", iface, pcbSize); + xmldoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p, %p)\n", This, pcbSize); return E_NOTIMPL; }

1 0

Nikolay Sivov : msxml3/xmldoc: Fix IPersistStreamInit::GetClassID() for IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: a18ee2111ac6595c80a2e909c9925d32706557a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18ee2111ac6595c80a2e909c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jan 12 04:13:15 2010 +0300 msxml3/xmldoc: Fix IPersistStreamInit::GetClassID() for IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 9 +++++++++ dlls/msxml3/xmldoc.c | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 8cf3357..426ef6f 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -361,6 +361,7 @@ static void test_persiststreaminit(void) HRESULT hr; ULARGE_INTEGER size; CHAR path[MAX_PATH]; + CLSID id; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -380,6 +381,9 @@ static void test_persiststreaminit(void) hr = IPersistStreamInit_Save(psi, NULL, FALSE); todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + hr = IPersistStreamInit_GetClassID(psi, NULL); + ok(hr == E_POINTER, "Expected E_INVALIDARG, got %08x\n", hr); + create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); create_stream_on_file(&stream, path); @@ -426,6 +430,11 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); + memset(&id, 0, sizeof(id)); + hr = IPersistStreamInit_GetClassID(psi, &id); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(IsEqualCLSID(&id, &CLSID_XMLDocument), "Expected CLSID_XMLDocument\n"); + cleanup: IPersistStreamInit_Release(psi); IXMLDocument_Release(doc); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 72e185c..7f5e41d 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -574,8 +574,13 @@ static ULONG WINAPI xmldoc_IPersistStreamInit_Release( static HRESULT WINAPI xmldoc_IPersistStreamInit_GetClassID( IPersistStreamInit *iface, CLSID *classid) { - FIXME("(%p,%p): stub!\n", iface, classid); - return E_NOTIMPL; + xmldoc *this = impl_from_IPersistStreamInit(iface); + TRACE("(%p,%p)\n", this, classid); + + if (!classid) return E_POINTER; + + *classid = CLSID_XMLDocument; + return S_OK; } static HRESULT WINAPI xmldoc_IPersistStreamInit_IsDirty(

1 0

Nikolay Sivov : msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 6c1275a57cef4c5a03ff9df2c346a349e095397d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c1275a57cef4c5a03ff9df2c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 13 00:30:46 2010 +0300 msxml3/xmldoc: IPersistStreamInit::InitNew() seems to do nothing for IXMLDocument. --- dlls/msxml3/tests/xmldoc.c | 25 +++++++++++++++++++++++-- dlls/msxml3/xmldoc.c | 5 +++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 426ef6f..9611f7c 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -355,6 +355,7 @@ static void test_createElement(void) static void test_persiststreaminit(void) { IXMLDocument *doc = NULL; + IXMLElement *element = NULL; IPersistStreamInit *psi = NULL; IStream *stream = NULL; STATSTG stat; @@ -362,6 +363,8 @@ static void test_persiststreaminit(void) ULARGE_INTEGER size; CHAR path[MAX_PATH]; CLSID id; + BSTR str; + static const WCHAR testW[] = {'t','e','s','t',0}; hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDocument, (LPVOID*)&doc); @@ -382,7 +385,10 @@ static void test_persiststreaminit(void) todo_wine ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); hr = IPersistStreamInit_GetClassID(psi, NULL); - ok(hr == E_POINTER, "Expected E_INVALIDARG, got %08x\n", hr); + ok(hr == E_POINTER, "Expected E_POINTER, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); create_xml_file("bank.xml"); GetFullPathNameA("bank.xml", MAX_PATH, path, NULL); @@ -400,6 +406,9 @@ static void test_persiststreaminit(void) if(hr == XML_E_INVALIDATROOTLEVEL) goto cleanup; + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* try to save document */ stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); @@ -413,9 +422,21 @@ static void test_persiststreaminit(void) todo_wine ok(stat.cbSize.QuadPart > 0, "Expected >0\n"); IStream_Release(stream); + str = SysAllocString(testW); + hr = IXMLDocument_get_root(doc, &element); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IXMLElement_put_text(element, str); + SysFreeString(str); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* reset internal stream */ hr = IPersistStreamInit_InitNew(psi); - todo_wine ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); stream = NULL; hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 7f5e41d..2ca874b 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -670,8 +670,9 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_GetSizeMax( static HRESULT WINAPI xmldoc_IPersistStreamInit_InitNew( IPersistStreamInit *iface) { - FIXME("(%p): stub!\n", iface); - return E_NOTIMPL; + xmldoc *This = impl_from_IPersistStreamInit(iface); + TRACE("(%p)\n", This); + return S_OK; } static const IPersistStreamInitVtbl xmldoc_IPersistStreamInit_VTable =

1 0

Nikolay Sivov : msxml3/xmldoc: Don' t leak document and stream on next IXMLDocument::Load().
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 1cad1646e5b0081ed2d9292c12a4f1575bece45d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cad1646e5b0081ed2d9292c1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jan 13 00:33:03 2010 +0300 msxml3/xmldoc: Don't leak document and stream on next IXMLDocument::Load(). --- dlls/msxml3/tests/xmldoc.c | 8 ++++++++ dlls/msxml3/xmldoc.c | 6 ++++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/xmldoc.c b/dlls/msxml3/tests/xmldoc.c index 9611f7c..7cc6cd5 100644 --- a/dlls/msxml3/tests/xmldoc.c +++ b/dlls/msxml3/tests/xmldoc.c @@ -431,6 +431,14 @@ static void test_persiststreaminit(void) hr = IPersistStreamInit_IsDirty(psi); todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + create_stream_on_file(&stream, path); + hr = IPersistStreamInit_Load(psi, stream); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + IStream_Release(stream); + + hr = IPersistStreamInit_IsDirty(psi); + todo_wine ok(hr == S_FALSE, "Expected S_FALSE, got %08x\n", hr); + /* reset internal stream */ hr = IPersistStreamInit_InitNew(psi); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); diff --git a/dlls/msxml3/xmldoc.c b/dlls/msxml3/xmldoc.c index 2ca874b..cf39cc5 100644 --- a/dlls/msxml3/xmldoc.c +++ b/dlls/msxml3/xmldoc.c @@ -616,6 +616,8 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( if (!pStm) return E_INVALIDARG; + /* release previously allocated stream */ + if (This->stream) IStream_Release(This->stream); hr = CreateStreamOnHGlobal(NULL, TRUE, &This->stream); if (FAILED(hr)) return hr; @@ -639,7 +641,10 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( len = GlobalSize(hglobal); ptr = GlobalLock(hglobal); if (len != 0) + { + xmlFreeDoc(This->xmldoc); This->xmldoc = parse_xml(ptr, len); + } GlobalUnlock(hglobal); if (!This->xmldoc) @@ -648,6 +653,7 @@ static HRESULT WINAPI xmldoc_IPersistStreamInit_Load( return E_FAIL; } + if (This->root) IXMLElement_Release(This->root); xmlnode = xmlDocGetRootElement(This->xmldoc); return XMLElement_create((IUnknown *)This, xmlnode, (LPVOID *)&This->root); }

1 0

Andrew Nguyen : ntdll/tests: Make function pointer checks consistent and report skips.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: 3ed716f8335b96064a06c18c75d805849dc1ddec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ed716f8335b96064a06c18c7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:44:44 2010 -0600 ntdll/tests: Make function pointer checks consistent and report skips. --- dlls/ntdll/tests/rtl.c | 118 +++++++++++++++++++++++++++++++++++------------ 1 files changed, 88 insertions(+), 30 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7beef6d..37479a7 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -112,7 +112,10 @@ static void test_RtlCompareMemory(void) SIZE_T size; if (!pRtlCompareMemory) + { + win_skip("RtlCompareMemory is not available\n"); return; + } strcpy(dest, src); @@ -127,6 +130,12 @@ static void test_RtlCompareMemoryUlong(void) ULONG a[10]; ULONG result; + if (!pRtlCompareMemoryUlong) + { + win_skip("RtlCompareMemoryUlong is not available\n"); + return; + } + a[0]= 0x0123; a[1]= 0x4567; a[2]= 0x89ab; @@ -173,7 +182,10 @@ static void test_RtlCompareMemoryUlong(void) static void test_RtlMoveMemory(void) { if (!pRtlMoveMemory) + { + win_skip("RtlMoveMemory is not available\n"); return; + } /* Length should be in bytes and not rounded. Use strcmp to ensure we * didn't write past the end (it checks for the final NUL left by memset) @@ -201,7 +213,10 @@ static void test_RtlMoveMemory(void) static void test_RtlFillMemory(void) { if (!pRtlFillMemory) + { + win_skip("RtlFillMemory is not available\n"); return; + } /* Length should be in bytes and not rounded. Use strcmp to ensure we * didn't write past the end (the remainder of the string should match) @@ -224,7 +239,10 @@ static void test_RtlFillMemoryUlong(void) { ULONG val = ('x' << 24) | ('x' << 16) | ('x' << 8) | 'x'; if (!pRtlFillMemoryUlong) + { + win_skip("RtlFillMemoryUlong is not available\n"); return; + } /* Length should be in bytes and not rounded. Use strcmp to ensure we * didn't write past the end (the remainder of the string should match) @@ -247,7 +265,10 @@ static void test_RtlFillMemoryUlong(void) static void test_RtlZeroMemory(void) { if (!pRtlZeroMemory) + { + win_skip("RtlZeroMemory is not available\n"); return; + } /* Length should be in bytes and not rounded. */ ZERO(0); MCMP("This is a test!"); @@ -266,6 +287,12 @@ static void test_RtlUlonglongByteSwap(void) { ULONGLONG result; + if ( !pRtlUlonglongByteSwap ) + { + win_skip("RtlUlonglongByteSwap is not available\n"); + return; + } + if ( pRtlUlonglongByteSwap( 0 ) != 0 ) { win_skip("Broken RtlUlonglongByteSwap in win2k\n"); @@ -287,6 +314,12 @@ static void test_RtlUniform(void) ULONG expected; ULONG result; + if (!pRtlUniform) + { + win_skip("RtlUniform is not available\n"); + return; + } + /* * According to the documentation RtlUniform is using D.H. Lehmer's 1948 * algorithm. This algorithm is: @@ -612,6 +645,12 @@ static void test_RtlRandom(void) ULONG result; ULONG result_expected; + if (!pRtlRandom) + { + win_skip("RtlRandom is not available\n"); + return; + } + /* * Unlike RtlUniform, RtlRandom is not documented. We guess that for * RtlRandom D.H. Lehmer's 1948 algorithm is used like stated in @@ -820,6 +859,12 @@ static void test_RtlAreAllAccessesGranted(void) unsigned int test_num; BOOLEAN result; + if (!pRtlAreAllAccessesGranted) + { + win_skip("RtlAreAllAccessesGranted is not available\n"); + return; + } + for (test_num = 0; test_num < NB_ALL_ACCESSES; test_num++) { result = pRtlAreAllAccessesGranted(all_accesses[test_num].GrantedAccess, all_accesses[test_num].DesiredAccess); @@ -857,6 +902,12 @@ static void test_RtlAreAnyAccessesGranted(void) unsigned int test_num; BOOLEAN result; + if (!pRtlAreAnyAccessesGranted) + { + win_skip("RtlAreAnyAccessesGranted is not available\n"); + return; + } + for (test_num = 0; test_num < NB_ANY_ACCESSES; test_num++) { result = pRtlAreAnyAccessesGranted(any_accesses[test_num].GrantedAccess, any_accesses[test_num].DesiredAccess); @@ -873,7 +924,10 @@ static void test_RtlComputeCrc32(void) DWORD crc = 0; if (!pRtlComputeCrc32) + { + win_skip("RtlComputeCrc32 is not available\n"); return; + } crc = pRtlComputeCrc32(crc, (const BYTE *)src, LEN); ok(crc == 0x40861dc2,"Expected 0x40861dc2, got %8x\n", crc); @@ -900,6 +954,12 @@ static void test_HandleTables(void) MY_HANDLE * MyHandle; RTL_HANDLE_TABLE HandleTable; + if (!pRtlInitializeHandleTable) + { + win_skip("RtlInitializeHandleTable is not available\n"); + return; + } + pRtlInitializeHandleTable(0x3FFF, sizeof(MY_HANDLE), &HandleTable); MyHandle = (MY_HANDLE *)pRtlAllocateHandle(&HandleTable, &Index); ok(MyHandle != NULL, "RtlAllocateHandle failed\n"); @@ -919,6 +979,12 @@ static void test_RtlAllocateAndInitializeSid(void) SID_IDENTIFIER_AUTHORITY sia = {{ 1, 2, 3, 4, 5, 6 }}; PSID psid; + if (!pRtlAllocateAndInitializeSid) + { + win_skip("RtlAllocateAndInitializeSid is not available\n"); + return; + } + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); ok(!ret, "RtlAllocateAndInitializeSid error %08x\n", ret); ret = pRtlFreeSid(psid); @@ -935,6 +1001,13 @@ static void test_RtlAllocateAndInitializeSid(void) static void test_RtlDeleteTimer(void) { NTSTATUS ret; + + if (!pRtlDeleteTimer) + { + win_skip("RtlDeleteTimer is not available\n"); + return; + } + ret = pRtlDeleteTimer(NULL, NULL, NULL); ok(ret == STATUS_INVALID_PARAMETER_1 || ret == STATUS_INVALID_PARAMETER, /* W2K */ @@ -945,34 +1018,19 @@ START_TEST(rtl) { InitFunctionPtrs(); - if (pRtlCompareMemory) - test_RtlCompareMemory(); - if (pRtlCompareMemoryUlong) - test_RtlCompareMemoryUlong(); - if (pRtlMoveMemory) - test_RtlMoveMemory(); - if (pRtlFillMemory) - test_RtlFillMemory(); - if (pRtlFillMemoryUlong) - test_RtlFillMemoryUlong(); - if (pRtlZeroMemory) - test_RtlZeroMemory(); - if (pRtlUlonglongByteSwap) - test_RtlUlonglongByteSwap(); - if (pRtlUniform) - test_RtlUniform(); - if (pRtlRandom) - test_RtlRandom(); - if (pRtlAreAllAccessesGranted) - test_RtlAreAllAccessesGranted(); - if (pRtlAreAnyAccessesGranted) - test_RtlAreAnyAccessesGranted(); - if (pRtlComputeCrc32) - test_RtlComputeCrc32(); - if (pRtlInitializeHandleTable) - test_HandleTables(); - if (pRtlAllocateAndInitializeSid) - test_RtlAllocateAndInitializeSid(); - if (pRtlDeleteTimer) - test_RtlDeleteTimer(); + test_RtlCompareMemory(); + test_RtlCompareMemoryUlong(); + test_RtlMoveMemory(); + test_RtlFillMemory(); + test_RtlFillMemoryUlong(); + test_RtlZeroMemory(); + test_RtlUlonglongByteSwap(); + test_RtlUniform(); + test_RtlRandom(); + test_RtlAreAllAccessesGranted(); + test_RtlAreAnyAccessesGranted(); + test_RtlComputeCrc32(); + test_HandleTables(); + test_RtlAllocateAndInitializeSid(); + test_RtlDeleteTimer(); }

1 0

Andrew Nguyen : ntdll/tests: Allow native crashing code to be compiled.
by Alexandre Julliard 14 Jan '10

14 Jan '10

Module: wine Branch: master Commit: d8ba75473a76184c9766eaf8da9be710b64be850 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8ba75473a76184c9766eaf8d… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:44:53 2010 -0600 ntdll/tests: Allow native crashing code to be compiled. --- dlls/ntdll/tests/rtl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 37479a7..6bc12bb 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -990,9 +990,12 @@ static void test_RtlAllocateAndInitializeSid(void) ret = pRtlFreeSid(psid); ok(!ret, "RtlFreeSid error %08x\n", ret); - /* these tests crash on XP - ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); - ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL);*/ + /* these tests crash on XP */ + if (0) + { + ret = pRtlAllocateAndInitializeSid(NULL, 0, 1, 2, 3, 4, 5, 6, 7, 8, &psid); + ret = pRtlAllocateAndInitializeSid(&sia, 0, 1, 2, 3, 4, 5, 6, 7, 8, NULL); + } ret = pRtlAllocateAndInitializeSid(&sia, 9, 1, 2, 3, 4, 5, 6, 7, 8, &psid); ok(ret == STATUS_INVALID_SID, "wrong error %08x\n", ret);

1 0