January 2010 - Wine-Commits

Jacek Caban : mshtml: Silence invalid FIXME.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

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

Jason Edmeades : comctl32/listview: Issue LVM_DELETEALLITEMS from WM_DESTROY.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 81d813542426d660c2289b4cb72797d7f156d285 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81d813542426d660c2289b4cb… Author: Jason Edmeades <jason.edmeades(a)googlemail.com> Date: Wed Jan 13 14:51:01 2010 -0800 comctl32/listview: Issue LVM_DELETEALLITEMS from WM_DESTROY. --- dlls/comctl32/listview.c | 9 +++++---- dlls/comctl32/tests/listview.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d21935f..80a32f7 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9188,10 +9188,14 @@ static LRESULT LISTVIEW_Create(HWND hwnd, const CREATESTRUCTW *lpcs) * Success: 0 * Failure: -1 */ -static LRESULT LISTVIEW_Destroy(const LISTVIEW_INFO *infoPtr) +static LRESULT LISTVIEW_Destroy(LISTVIEW_INFO *infoPtr) { HTHEME theme = GetWindowTheme(infoPtr->hwndSelf); CloseThemeData(theme); + + /* delete all items */ + LISTVIEW_DeleteAllItems(infoPtr, TRUE); + return 0; } @@ -9923,9 +9927,6 @@ static LRESULT LISTVIEW_NCDestroy(LISTVIEW_INFO *infoPtr) TRACE("()\n"); - /* delete all items */ - LISTVIEW_DeleteAllItems(infoPtr, TRUE); - /* destroy data structure */ DPA_Destroy(infoPtr->hdpaItems); DPA_Destroy(infoPtr->hdpaItemIds); diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 0122886..0bac4ec 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -32,7 +32,8 @@ #define PARENT_FULL_SEQ_INDEX 1 #define LISTVIEW_SEQ_INDEX 2 #define EDITBOX_SEQ_INDEX 3 -#define NUM_MSG_SEQUENCES 4 +#define COMBINED_SEQ_INDEX 4 +#define NUM_MSG_SEQUENCES 5 #define LISTVIEW_ID 0 #define HEADER_ID 1 @@ -286,6 +287,18 @@ static const struct message hover_parent[] = { { 0 } }; +static const struct message listview_destroy[] = { + { 0x0090, sent|optional }, /* Vista */ + { WM_PARENTNOTIFY, sent }, + { WM_SHOWWINDOW, sent }, + { WM_WINDOWPOSCHANGING, sent }, + { WM_WINDOWPOSCHANGED, sent|optional }, + { WM_DESTROY, sent }, + { WM_NOTIFY, sent|id, 0, 0, LVN_DELETEALLITEMS }, + { WM_NCDESTROY, sent }, + { 0 } +}; + static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { static LONG defwndproc_counter = 0; @@ -312,6 +325,7 @@ static LRESULT WINAPI parent_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LP trace("parent: %p, %04x, %08lx, %08lx\n", hwnd, message, wParam, lParam); add_message(sequences, PARENT_SEQ_INDEX, &msg); + add_message(sequences, COMBINED_SEQ_INDEX, &msg); } add_message(sequences, PARENT_FULL_SEQ_INDEX, &msg); @@ -460,6 +474,7 @@ static LRESULT WINAPI listview_subclass_proc(HWND hwnd, UINT message, WPARAM wPa msg.lParam = lParam; msg.id = LISTVIEW_ID; add_message(sequences, LISTVIEW_SEQ_INDEX, &msg); + add_message(sequences, COMBINED_SEQ_INDEX, &msg); defwndproc_counter++; ret = CallWindowProcA(oldproc, hwnd, message, wParam, lParam); @@ -4263,6 +4278,18 @@ static void test_hover(void) DestroyWindow(hwnd); } +static void test_destroynotify(void) +{ + HWND hwnd; + + hwnd = create_listview_control(LVS_REPORT); + ok(hwnd != NULL, "failed to create listview window\n"); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + DestroyWindow(hwnd); + ok_sequence(sequences, COMBINED_SEQ_INDEX, listview_destroy, "check destroy order", FALSE); +} + START_TEST(listview) { HMODULE hComctl32; @@ -4323,6 +4350,7 @@ START_TEST(listview) test_approximate_viewrect(); test_finditem(); test_hover(); + test_destroynotify(); if (!load_v6_module(&ctx_cookie, &hCtx)) {

1 0

Jacek Caban : mshtml.idl: Added IHTMLIFrameElement interface declaration.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: f5430010cf974df38ff380e854a929dcfa07a0ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5430010cf974df38ff380e85… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 14 09:47:30 2010 -0600 mshtml.idl: Added IHTMLIFrameElement interface declaration. --- include/mshtml.idl | 32 +++++++++++++++++++++++++++++++- 1 files changed, 31 insertions(+), 1 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index 4a182f2..1f3a8a8 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Jacek Caban for CodeWeavers + * Copyright 2004-2010 Jacek Caban for CodeWeavers * Copyright 2008 Konstantin Kondratyuk (Etersoft) * * This library is free software; you can redistribute it and/or @@ -14729,6 +14729,36 @@ interface IHTMLFrameBase2 : IDispatch } /***************************************************************************** + * IHTMLIFrameElement dispinterface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f315-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLIFrameElement : IDispatch +{ + [propput, id(DISPID_IHTMLIFRAMEELEMENT_VSPACE)] + HRESULT vspace([in] LONG v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT_VSPACE)] + HRESULT vspace([retval, out] LONG *p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT_HSPACE)] + HRESULT hspace([in] LONG v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT_HSPACE)] + HRESULT hspace([retval, out] LONG *p); + + [propput, id(DISPID_IHTMLIFRAMEELEMENT_ALIGN), displaybind, bindable] + HRESULT align([in] BSTR v); + + [propget, id(DISPID_IHTMLIFRAMEELEMENT_ALIGN), displaybind, bindable] + HRESULT align([retval, out] BSTR *p); +} + +/***************************************************************************** * DispHTMLIFrame dispinterface */ [

1 0

Jacek Caban : mshtml: Added IHTMLIFrameElement stub implementation.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: 91140222b5623273f88d1c9810b61ce0a7bc4638 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91140222b5623273f88d1c981… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 14 09:47:59 2010 -0600 mshtml: Added IHTMLIFrameElement stub implementation. --- dlls/mshtml/htmliframe.c | 127 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 126 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmliframe.c b/dlls/mshtml/htmliframe.c index ddb32c8..689b432 100644 --- a/dlls/mshtml/htmliframe.c +++ b/dlls/mshtml/htmliframe.c @@ -33,15 +33,139 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); typedef struct { HTMLFrameBase framebase; + const IHTMLIFrameElementVtbl *lpIHTMLIFrameElementVtbl; } HTMLIFrame; +#define HTMLIFRAMEELEM(x) ((IHTMLIFrameElement*) &(x)->lpIHTMLIFrameElementVtbl) + +#define HTMLIFRAME_THIS(iface) DEFINE_THIS(HTMLIFrame, IHTMLIFrameElement, iface) + +static HRESULT WINAPI HTMLIFrameElement_QueryInterface(IHTMLIFrameElement *iface, + REFIID riid, void **ppv) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + + return IHTMLDOMNode_QueryInterface(HTMLDOMNODE(&This->framebase.element.node), riid, ppv); +} + +static ULONG WINAPI HTMLIFrameElement_AddRef(IHTMLIFrameElement *iface) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + + return IHTMLDOMNode_AddRef(HTMLDOMNODE(&This->framebase.element.node)); +} + +static ULONG WINAPI HTMLIFrameElement_Release(IHTMLIFrameElement *iface) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + + return IHTMLDOMNode_Release(HTMLDOMNODE(&This->framebase.element.node)); +} + +static HRESULT WINAPI HTMLIFrameElement_GetTypeInfoCount(IHTMLIFrameElement *iface, UINT *pctinfo) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + return IDispatchEx_GetTypeInfoCount(DISPATCHEX(&This->framebase.element.node.dispex), pctinfo); +} + +static HRESULT WINAPI HTMLIFrameElement_GetTypeInfo(IHTMLIFrameElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + return IDispatchEx_GetTypeInfo(DISPATCHEX(&This->framebase.element.node.dispex), iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLIFrameElement_GetIDsOfNames(IHTMLIFrameElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + return IDispatchEx_GetIDsOfNames(DISPATCHEX(&This->framebase.element.node.dispex), riid, rgszNames, cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLIFrameElement_Invoke(IHTMLIFrameElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + return IDispatchEx_Invoke(DISPATCHEX(&This->framebase.element.node.dispex), dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLIFrameElement_put_vspace(IHTMLIFrameElement *iface, LONG v) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement_get_vspace(IHTMLIFrameElement *iface, LONG *p) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement_put_hspace(IHTMLIFrameElement *iface, LONG v) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%d)\n", This, v); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement_get_hspace(IHTMLIFrameElement *iface, LONG *p) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement_put_align(IHTMLIFrameElement *iface, BSTR v) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLIFrameElement_get_align(IHTMLIFrameElement *iface, BSTR *p) +{ + HTMLIFrame *This = HTMLIFRAME_THIS(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +#undef HTMLIFRAME_THIS + +static const IHTMLIFrameElementVtbl HTMLIFrameElementVtbl = { + HTMLIFrameElement_QueryInterface, + HTMLIFrameElement_AddRef, + HTMLIFrameElement_Release, + HTMLIFrameElement_GetTypeInfoCount, + HTMLIFrameElement_GetTypeInfo, + HTMLIFrameElement_GetIDsOfNames, + HTMLIFrameElement_Invoke, + HTMLIFrameElement_put_vspace, + HTMLIFrameElement_get_vspace, + HTMLIFrameElement_put_hspace, + HTMLIFrameElement_get_hspace, + HTMLIFrameElement_put_align, + HTMLIFrameElement_get_align +}; + #define HTMLIFRAME_NODE_THIS(iface) DEFINE_THIS2(HTMLIFrame, framebase.element.node, iface) static HRESULT HTMLIFrame_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) { HTMLIFrame *This = HTMLIFRAME_NODE_THIS(iface); - return HTMLFrameBase_QI(&This->framebase, riid, ppv); + if(IsEqualGUID(&IID_IHTMLIFrameElement, riid)) { + TRACE("(%p)->(IID_IHTMLIFrameElement %p)\n", This, ppv); + *ppv = HTMLIFRAMEELEM(This); + }else { + return HTMLFrameBase_QI(&This->framebase, riid, ppv); + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; } static void HTMLIFrame_destructor(HTMLDOMNode *iface) @@ -154,6 +278,7 @@ HTMLElement *HTMLIFrame_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem) ret = heap_alloc_zero(sizeof(HTMLIFrame)); + ret->lpIHTMLIFrameElementVtbl = &HTMLIFrameElementVtbl; ret->framebase.element.node.vtbl = &HTMLIFrameImplVtbl; HTMLFrameBase_Init(&ret->framebase, doc, nselem, &HTMLIFrame_dispex);

1 0

Andrew Nguyen : ntdll/tests: Add a few additional tests for wcsrchr.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: d7557a192672c0e00dd368f686bfe51a91ea8f1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7557a192672c0e00dd368f68… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:45:22 2010 -0600 ntdll/tests: Add a few additional tests for wcsrchr. --- dlls/ntdll/tests/string.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index f9b8665..cd3ae37 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1126,9 +1126,15 @@ static void test_wcschr(void) } static void test_wcsrchr(void) -{ - static const WCHAR testing[] = {'T','e','s','t','i','n','g',0}; - ok (p_wcsrchr(testing,0)!=NULL, "wcsrchr Not finding terminating character\n"); +{ + static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + + ok(p_wcsrchr(teststringW, 'a') == teststringW + 10, + "wcsrchr should have returned a pointer to the last 'a' character\n"); + ok(p_wcsrchr(teststringW, 0) == teststringW + 11, + "wcsrchr should have returned a pointer to the null terminator\n"); + ok(p_wcsrchr(teststringW, 'x') == NULL, + "wcsrchr should have returned NULL\n"); } START_TEST(string)

1 0

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

Jan. 14, 2010

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

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

Jan. 14, 2010

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 Jan. 14, 2010

Jan. 14, 2010

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

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

Jan. 14, 2010

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: Add a few additional tests for wcschr.
by Alexandre Julliard Jan. 14, 2010

Jan. 14, 2010

Module: wine Branch: master Commit: dca1bd86337c078d39d9bb7e7bca0b450da7c4fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=dca1bd86337c078d39d9bb7e7… Author: Andrew Nguyen <arethusa26(a)gmail.com> Date: Wed Jan 13 06:45:02 2010 -0600 ntdll/tests: Add a few additional tests for wcschr. --- dlls/ntdll/tests/string.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index 16c1192..f9b8665 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -1113,10 +1113,21 @@ static void test_wtoi64(void) } } -static void test_wcsfuncs(void) +static void test_wcschr(void) +{ + static const WCHAR teststringW[] = {'a','b','r','a','c','a','d','a','b','r','a',0}; + + ok(p_wcschr(teststringW, 'a') == teststringW + 0, + "wcschr should have returned a pointer to the first 'a' character\n"); + ok(p_wcschr(teststringW, 0) == teststringW + 11, + "wcschr should have returned a pointer to the null terminator\n"); + ok(p_wcschr(teststringW, 'x') == NULL, + "wcschr should have returned NULL\n"); +} + +static void test_wcsrchr(void) { static const WCHAR testing[] = {'T','e','s','t','i','n','g',0}; - ok (p_wcschr(testing,0)!=NULL, "wcschr Not finding terminating character\n"); ok (p_wcsrchr(testing,0)!=NULL, "wcsrchr Not finding terminating character\n"); } @@ -1140,8 +1151,10 @@ START_TEST(string) test_wtol(); if (p_wtoi64) test_wtoi64(); - if (p_wcschr && p_wcsrchr) - test_wcsfuncs(); + if (p_wcschr) + test_wcschr(); + if (p_wcsrchr) + test_wcsrchr(); if (patoi) test_atoi(); if (patol)

1 0