February 2014 - Wine-commits

Nikolay Sivov : oleaut32: Add more tracing, hide initialization details by calling a method.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: c583dea77cc0ee0e7da3630153b6afc39490890f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c583dea77cc0ee0e7da363015… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:50:23 2014 +0400 oleaut32: Add more tracing, hide initialization details by calling a method. --- dlls/oleaut32/recinfo.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/recinfo.c b/dlls/oleaut32/recinfo.c index ad80993..69c973c 100644 --- a/dlls/oleaut32/recinfo.c +++ b/dlls/oleaut32/recinfo.c @@ -149,6 +149,8 @@ static HRESULT WINAPI IRecordInfoImpl_QueryInterface(IRecordInfo *iface, REFIID { TRACE("(%p)->(%s %p)\n", iface, debugstr_guid(riid), ppvObject); + *ppvObject = NULL; + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IRecordInfo, riid)) { *ppvObject = iface; IRecordInfo_AddRef(iface); @@ -527,10 +529,14 @@ static BOOL WINAPI IRecordInfoImpl_IsMatchingType(IRecordInfo *iface, IRecordInf static PVOID WINAPI IRecordInfoImpl_RecordCreate(IRecordInfo *iface) { IRecordInfoImpl *This = impl_from_IRecordInfo(iface); + void *record; TRACE("(%p)\n", This); - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->size); + record = HeapAlloc(GetProcessHeap(), 0, This->size); + IRecordInfo_RecordInit(iface, record); + TRACE("created record at %p\n", record); + return record; } static HRESULT WINAPI IRecordInfoImpl_RecordCreateCopy(IRecordInfo *iface, PVOID pvSource, @@ -600,8 +606,8 @@ HRESULT WINAPI GetRecordInfoFromGuids(REFGUID rGuidTypeLib, ULONG uVerMajor, ITypeLib *pTypeLib; HRESULT hres; - TRACE("(%p,%d,%d,%d,%p,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, - lcid, rGuidTypeInfo, ppRecInfo); + TRACE("(%p,%d,%d,%d,%s,%p)\n", rGuidTypeLib, uVerMajor, uVerMinor, + lcid, debugstr_guid(rGuidTypeInfo), ppRecInfo); hres = LoadRegTypeLib(rGuidTypeLib, uVerMajor, uVerMinor, lcid, &pTypeLib); if(FAILED(hres)) { @@ -700,6 +706,7 @@ HRESULT WINAPI GetRecordInfoFromTypeInfo(ITypeInfo* pTI, IRecordInfo** ppRecInfo NULL, NULL, NULL); if(FAILED(hres)) WARN("GetDocumentation failed: %08x\n", hres); + TRACE("field=%s, offset=%d\n", debugstr_w(ret->fields[i].name), ret->fields[i].offset); ITypeInfo_ReleaseVarDesc(pTypeInfo, vardesc); }

1 0

Nikolay Sivov : oleaut32: Initialize result VARIANT in *FromDisp().
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 8c2b4bfe4899faa7f8438767ccacb13855ff17f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c2b4bfe4899faa7f8438767c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:51:41 2014 +0400 oleaut32: Initialize result VARIANT in *FromDisp(). --- dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/vartype.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 6c45144..61ad45e 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -604,6 +604,7 @@ static HRESULT WINAPI DummyDispatch_Invoke(IDispatch *iface, ok(params->cNamedArgs == 0, "got %d\n", params->cNamedArgs); ok(res != NULL, "got %p\n", res); + ok(V_VT(res) == VT_EMPTY, "got %d\n", V_VT(res)); ok(ei == NULL, "got %p\n", ei); ok(arg_err == NULL, "got %p\n", arg_err); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 672fbcb..43902c5 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -122,6 +122,7 @@ static HRESULT VARIANT_FromDisp(IDispatch* pdispIn, LCID lcid, void* pOut, return DISP_E_BADVARTYPE; /* Get the default 'value' property from the IDispatch */ + VariantInit(&srcVar); hRet = IDispatch_Invoke(pdispIn, DISPID_VALUE, &IID_NULL, lcid, DISPATCH_PROPERTYGET, &emptyParams, &srcVar, NULL, NULL);

1 0

Nikolay Sivov : comctl32/tab: Fix TCM_SETCURSEL on negative indices.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 0e73e478ff3f8ee46fc18b1f1bf211b0dec80a2a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e73e478ff3f8ee46fc18b1f1… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:52:17 2014 +0400 comctl32/tab: Fix TCM_SETCURSEL on negative indices. --- dlls/comctl32/tab.c | 27 +++++++++++++++++---------- dlls/comctl32/tests/tab.c | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tab.c b/dlls/comctl32/tab.c index 85467ba..a9c3b7b 100644 --- a/dlls/comctl32/tab.c +++ b/dlls/comctl32/tab.c @@ -252,22 +252,29 @@ static inline LRESULT TAB_SetCurSel (TAB_INFO *infoPtr, INT iItem) TRACE("(%p %d)\n", infoPtr, iItem); - if (iItem < 0) - infoPtr->iSelected = -1; - else if (iItem >= infoPtr->uNumItem) + if (iItem >= (INT)infoPtr->uNumItem) return -1; - else { - if (prevItem != iItem) { - if (prevItem != -1) - TAB_GetItem(infoPtr, prevItem)->dwState &= ~TCIS_BUTTONPRESSED; - TAB_GetItem(infoPtr, iItem)->dwState |= TCIS_BUTTONPRESSED; + if (prevItem != iItem) { + if (prevItem != -1) + TAB_GetItem(infoPtr, prevItem)->dwState &= ~TCIS_BUTTONPRESSED; + + if (iItem >= 0) + { + TAB_GetItem(infoPtr, iItem)->dwState |= TCIS_BUTTONPRESSED; infoPtr->iSelected = iItem; infoPtr->uFocus = iItem; - TAB_EnsureSelectionVisible(infoPtr); - TAB_InvalidateTabArea(infoPtr); } + else + { + infoPtr->iSelected = -1; + infoPtr->uFocus = -1; + } + + TAB_EnsureSelectionVisible(infoPtr); + TAB_InvalidateTabArea(infoPtr); } + return prevItem; } diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 9bfa386..7353ccd 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -746,6 +746,24 @@ static void test_cursel(void) ok (tcItem.dwState & TCIS_BUTTONPRESSED || broken(tcItem.dwState == 0), /* older comctl32 */ "Selected item should have TCIS_BUTTONPRESSED\n"); + /* now deselect all and check previously selected item state */ + focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(focusIndex == 1, "got %d\n", focusIndex); + + selectionIndex = SendMessageA(hTab, TCM_SETCURSEL, -1, 0); + ok(selectionIndex == 1, "got %d\n", selectionIndex); + + memset(&tcItem, 0, sizeof(TCITEMA)); + + /* focus is reset too */ + focusIndex = SendMessageA(hTab, TCM_GETCURFOCUS, 0, 0); + ok(focusIndex == -1, "got %d\n", focusIndex); + + tcItem.mask = TCIF_STATE; + tcItem.dwStateMask = TCIS_BUTTONPRESSED; + SendMessageA(hTab, TCM_GETITEMA, selectionIndex, (LPARAM)&tcItem); + ok(tcItem.dwState == 0, "got state %d\n", tcItem.dwState); + DestroyWindow(hTab); }

1 0

Nikolay Sivov : wshom: Implement LocationPath property for shortcut.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 9239b8603768a97bff26888e08c7aef5c99dcea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9239b8603768a97bff26888e0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:52:34 2014 +0400 wshom: Implement LocationPath property for shortcut. --- dlls/wshom.ocx/shell.c | 49 ++++++++++++++++++++++++++++++++++++++---- dlls/wshom.ocx/tests/wshom.c | 3 +++ 2 files changed, 48 insertions(+), 4 deletions(-) diff --git a/dlls/wshom.ocx/shell.c b/dlls/wshom.ocx/shell.c index ea9caba..92733cc 100644 --- a/dlls/wshom.ocx/shell.c +++ b/dlls/wshom.ocx/shell.c @@ -451,16 +451,57 @@ static HRESULT WINAPI WshShortcut_put_Hotkey(IWshShortcut *iface, BSTR Hotkey) static HRESULT WINAPI WshShortcut_get_IconLocation(IWshShortcut *iface, BSTR *IconPath) { + static const WCHAR fmtW[] = {'%','s',',',' ','%','d',0}; WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%p): stub\n", This, IconPath); - return E_NOTIMPL; + WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; + INT icon = 0; + HRESULT hr; + + TRACE("(%p)->(%p)\n", This, IconPath); + + if (!IconPath) + return E_POINTER; + + hr = IShellLinkW_GetIconLocation(This->link, buffW, sizeof(buffW)/sizeof(WCHAR), &icon); + if (FAILED(hr)) return hr; + + sprintfW(pathW, fmtW, buffW, icon); + *IconPath = SysAllocString(pathW); + if (!*IconPath) return E_OUTOFMEMORY; + + return S_OK; } static HRESULT WINAPI WshShortcut_put_IconLocation(IWshShortcut *iface, BSTR IconPath) { WshShortcut *This = impl_from_IWshShortcut(iface); - FIXME("(%p)->(%s): stub\n", This, debugstr_w(IconPath)); - return E_NOTIMPL; + HRESULT hr; + WCHAR *ptr; + BSTR path; + INT icon; + + TRACE("(%p)->(%s)\n", This, debugstr_w(IconPath)); + + /* scan for icon id */ + ptr = strrchrW(IconPath, ','); + if (!ptr) + { + WARN("icon index not found\n"); + return E_FAIL; + } + + path = SysAllocStringLen(IconPath, ptr-IconPath); + + /* skip spaces if any */ + while (isspaceW(*++ptr)) + ; + + icon = atoiW(ptr); + + hr = IShellLinkW_SetIconLocation(This->link, path, icon); + SysFreeString(path); + + return hr; } static HRESULT WINAPI WshShortcut_put_RelativePath(IWshShortcut *iface, BSTR rhs) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index 0e01304..5f6e79d 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -116,6 +116,9 @@ static void test_wshshell(void) hr = IWshShortcut_get_Arguments(shcut, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); + hr = IWshShortcut_get_IconLocation(shcut, NULL); + ok(hr == E_POINTER, "got 0x%08x\n", hr); + IWshShortcut_Release(shcut); IDispatch_Release(shortcut);

1 0

Nikolay Sivov : wininet: Update module version.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 1f1d404832a5498c3a11be61f9f97fdf3ffc17b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f1d404832a5498c3a11be61f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:54:39 2014 +0400 wininet: Update module version. --- dlls/wininet/wininet.rc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/wininet.rc b/dlls/wininet/wininet.rc index b059fe9..b6e3562 100644 --- a/dlls/wininet/wininet.rc +++ b/dlls/wininet/wininet.rc @@ -87,9 +87,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine Internet Connectivity" #define WINE_FILENAME_STR "wininet.dll" -#define WINE_FILEVERSION 6,0,2800,1106 -#define WINE_FILEVERSION_STR "6.0.2800.1106" -#define WINE_PRODUCTVERSION 6,0,2800,1106 -#define WINE_PRODUCTVERSION_STR "6.0.2800.1106" +#define WINE_FILEVERSION 8,00,7601,17601 +#define WINE_FILEVERSION_STR "8.00.7601.17601" +#define WINE_PRODUCTVERSION 8,00,7601,17601 +#define WINE_PRODUCTVERSION_STR "8.00.7601.17601" #include "wine/wine_common_ver.rc"

1 0

Nikolay Sivov : mshtml: Implement HTMLStyleSheet_get_href().
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 688cc96ee7d1f87a42c53937d6ea32be1a66c702 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688cc96ee7d1f87a42c53937d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:55:16 2014 +0400 mshtml: Implement HTMLStyleSheet_get_href(). --- dlls/mshtml/htmlstylesheet.c | 10 ++++++++-- dlls/mshtml/tests/dom.c | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlstylesheet.c b/dlls/mshtml/htmlstylesheet.c index 4b43082..a1669c1 100644 --- a/dlls/mshtml/htmlstylesheet.c +++ b/dlls/mshtml/htmlstylesheet.c @@ -552,8 +552,14 @@ static HRESULT WINAPI HTMLStyleSheet_put_href(IHTMLStyleSheet *iface, BSTR v) static HRESULT WINAPI HTMLStyleSheet_get_href(IHTMLStyleSheet *iface, BSTR *p) { HTMLStyleSheet *This = impl_from_IHTMLStyleSheet(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsAString href_str; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsAString_Init(&href_str, NULL); + nsres = nsIDOMCSSStyleSheet_GetHref(This->nsstylesheet, &href_str); + return return_nsstr(nsres, &href_str, p); } static HRESULT WINAPI HTMLStyleSheet_get_type(IHTMLStyleSheet *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2b2eea5..892e812 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5958,6 +5958,7 @@ static void test_stylesheet(IDispatch *disp) IHTMLStyleSheetRulesCollection *col = NULL; IHTMLStyleSheet *stylesheet; HRESULT hres; + BSTR href; test_disp2((IUnknown*)disp, &DIID_DispHTMLStyleSheet, &IID_IHTMLStyleSheet, "[object]"); @@ -5967,8 +5968,14 @@ static void test_stylesheet(IDispatch *disp) hres = IHTMLStyleSheet_get_rules(stylesheet, &col); ok(hres == S_OK, "get_rules failed: %08x\n", hres); ok(col != NULL, "col == NULL\n"); - IHTMLStyleSheetRulesCollection_Release(col); + + href = (void*)0xdeadbeef; + hres = IHTMLStyleSheet_get_href(stylesheet, &href); + ok(hres == S_OK, "get_href failed: %08x\n", hres); + ok(href == NULL, "got href != NULL\n"); + SysFreeString(href); + IHTMLStyleSheet_Release(stylesheet); }

1 0

Nikolay Sivov : ole32: Use CoTaskMemAlloc() instead of IMalloc directly.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: d1c4871012d537f1a1568261c6e661c9c646b358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c4871012d537f1a1568261c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:56:38 2014 +0400 ole32: Use CoTaskMemAlloc() instead of IMalloc directly. --- dlls/ole32/compobj.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 3e99097..2160cba 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -2215,11 +2215,7 @@ HRESULT WINAPI CLSIDFromString(LPCOLESTR idstr, LPCLSID id ) */ HRESULT WINAPI StringFromCLSID(REFCLSID id, LPOLESTR *idstr) { - HRESULT ret; - LPMALLOC mllc; - - if ((ret = CoGetMalloc(0,&mllc))) return ret; - if (!(*idstr = IMalloc_Alloc( mllc, CHARS_IN_GUID * sizeof(WCHAR) ))) return E_OUTOFMEMORY; + if (!(*idstr = CoTaskMemAlloc(CHARS_IN_GUID * sizeof(WCHAR)))) return E_OUTOFMEMORY; StringFromGUID2( id, *idstr, CHARS_IN_GUID ); return S_OK; }

1 0

Nikolay Sivov : ole32: Separate IIDFromString() for CLSIDFromString(), fix corner cases and return values.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: cdd932a060fa8b86b009dd7a87dacc4b62eda447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd932a060fa8b86b009dd7a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 9 17:57:36 2014 +0400 ole32: Separate IIDFromString() for CLSIDFromString(), fix corner cases and return values. --- dlls/ole32/compobj.c | 119 +++++++++++++++++++++++++++++--------------- dlls/ole32/ole32.spec | 2 +- dlls/ole32/tests/compobj.c | 74 ++++++++++++++++++++++++++- 3 files changed, 153 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdd932a060fa8b86b009d…

1 0

Dmitry Timoshkov : xmllite/tests: Fix stack corruption in 64-bit builds.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: 42e681e31df84c508cac9cbae2b436dad1c777d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42e681e31df84c508cac9cbae… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 12:43:09 2014 +0900 xmllite/tests: Fix stack corruption in 64-bit builds. --- dlls/xmllite/tests/reader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 1f3d306..5774400 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -233,12 +233,12 @@ static const char *type_to_str(XmlNodeType type) static void test_read_state_(IXmlReader *reader, XmlReadState expected, XmlReadState exp_broken, BOOL todo, int line) { - XmlReadState state; + LONG_PTR state; HRESULT hr; BOOL broken_state; state = -1; /* invalid value */ - hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, (LONG_PTR*)&state); + hr = IXmlReader_GetProperty(reader, XmlReaderProperty_ReadState, &state); ok_(__FILE__, line)(hr == S_OK, "Expected S_OK, got %08x\n", hr); if (exp_broken == -1)

1 0

Dmitry Timoshkov : xmllite/tests: There is no need to initialize OLE.
by Alexandre Julliard 10 Feb '14

10 Feb '14

Module: wine Branch: master Commit: ce894b9fc6a37ab42e0a93ea6dd607f0d1ab2887 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce894b9fc6a37ab42e0a93ea6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Feb 10 12:43:54 2014 +0900 xmllite/tests: There is no need to initialize OLE. --- dlls/xmllite/tests/reader.c | 10 ---------- dlls/xmllite/tests/writer.c | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 5774400..b7ef862 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -1671,16 +1671,8 @@ static void test_read_attribute(void) START_TEST(reader) { - HRESULT r; - - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init com\n"); - if (!init_pointers()) - { - CoUninitialize(); return; - } test_reader_create(); test_readerinput(); @@ -1697,6 +1689,4 @@ START_TEST(reader) test_read_pending(); test_readvaluechunk(); test_read_xmldeclaration(); - - CoUninitialize(); } diff --git a/dlls/xmllite/tests/writer.c b/dlls/xmllite/tests/writer.c index af4e1a8..5f3d511 100644 --- a/dlls/xmllite/tests/writer.c +++ b/dlls/xmllite/tests/writer.c @@ -70,18 +70,8 @@ static BOOL init_pointers(void) START_TEST(writer) { - HRESULT r; - - r = CoInitialize( NULL ); - ok( r == S_OK, "failed to init com\n"); - if (!init_pointers()) - { - CoUninitialize(); return; - } test_writer_create(); - - CoUninitialize(); }

1 0