April 2017 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Added GetClassInfo implementation for HTMLElement objects.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 97c71b25fefa0ae904046bfd27480f36fa929a4c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c71b25fefa0ae904046bfd2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:49 2017 +0200 mshtml: Added GetClassInfo implementation for HTMLElement objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlanchor.c | 1 + dlls/mshtml/htmlarea.c | 1 + dlls/mshtml/htmlbody.c | 1 + dlls/mshtml/htmlcomment.c | 1 + dlls/mshtml/htmldoc.c | 2 ++ dlls/mshtml/htmlelem.c | 5 +++-- dlls/mshtml/htmlembed.c | 1 + dlls/mshtml/htmlform.c | 1 + dlls/mshtml/htmlframe.c | 1 + dlls/mshtml/htmlgeneric.c | 1 + dlls/mshtml/htmlhead.c | 3 +++ dlls/mshtml/htmliframe.c | 1 + dlls/mshtml/htmlimg.c | 1 + dlls/mshtml/htmlinput.c | 3 +++ dlls/mshtml/htmllink.c | 1 + dlls/mshtml/htmlmeta.c | 1 + dlls/mshtml/htmlnode.c | 1 + dlls/mshtml/htmlobject.c | 1 + dlls/mshtml/htmloption.c | 1 + dlls/mshtml/htmlscript.c | 1 + dlls/mshtml/htmlselect.c | 1 + dlls/mshtml/htmlstyleelem.c | 1 + dlls/mshtml/htmltable.c | 1 + dlls/mshtml/htmltablecell.c | 1 + dlls/mshtml/htmltablerow.c | 1 + dlls/mshtml/htmltextarea.c | 1 + dlls/mshtml/htmltextnode.c | 1 + dlls/mshtml/mshtml_private.h | 1 + 28 files changed, 35 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=97c71b25fefa0ae904046…

1 0

Jacek Caban : mshtml: Added IProvideClassInfo2 implementation for HTMLXMLHttpRequest object.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 21a30da6bf8dcabdb560e6b8bd3910ab6440947e URL: http://source.winehq.org/git/wine.git/?a=commit;h=21a30da6bf8dcabdb560e6b8b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 21 13:50:59 2017 +0200 mshtml: Added IProvideClassInfo2 implementation for HTMLXMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/xmlhttprequest.c | 51 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index 30389a4..1565f9b 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -101,6 +101,7 @@ typedef struct { struct HTMLXMLHttpRequest { EventTarget event_target; IHTMLXMLHttpRequest IHTMLXMLHttpRequest_iface; + IProvideClassInfo2 IProvideClassInfo2_iface; LONG ref; nsIXMLHttpRequest *nsxhr; XMLHttpReqEventListener *event_listener; @@ -218,6 +219,10 @@ static HRESULT WINAPI HTMLXMLHttpRequest_QueryInterface(IHTMLXMLHttpRequest *ifa *ppv = &This->IHTMLXMLHttpRequest_iface; }else if(IsEqualGUID(&IID_IHTMLXMLHttpRequest, riid)) { *ppv = &This->IHTMLXMLHttpRequest_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo, riid)) { + *ppv = &This->IProvideClassInfo2_iface; + }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { + *ppv = &This->IProvideClassInfo2_iface; }else if(dispex_query_interface(&This->event_target.dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -682,6 +687,51 @@ static const IHTMLXMLHttpRequestVtbl HTMLXMLHttpRequestVtbl = { HTMLXMLHttpRequest_setRequestHeader }; +static inline HTMLXMLHttpRequest *impl_from_IProvideClassInfo2(IProvideClassInfo2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, IProvideClassInfo2_iface); +} + +static HRESULT WINAPI ProvideClassInfo_QueryInterface(IProvideClassInfo2 *iface, REFIID riid, void **ppv) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_QueryInterface(&This->IHTMLXMLHttpRequest_iface, riid, ppv); +} + +static ULONG WINAPI ProvideClassInfo_AddRef(IProvideClassInfo2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_AddRef(&This->IHTMLXMLHttpRequest_iface); +} + +static ULONG WINAPI ProvideClassInfo_Release(IProvideClassInfo2 *iface) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + return IHTMLXMLHttpRequest_Release(&This->IHTMLXMLHttpRequest_iface); +} + +static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo2 *iface, ITypeInfo **ppTI) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + TRACE("(%p)->(%p)\n", This, ppTI); + return get_class_typeinfo(&CLSID_HTMLXMLHttpRequest, ppTI); +} + +static HRESULT WINAPI ProvideClassInfo2_GetGUID(IProvideClassInfo2 *iface, DWORD dwGuidKind, GUID *pGUID) +{ + HTMLXMLHttpRequest *This = impl_from_IProvideClassInfo2(iface); + FIXME("(%p)->(%u %p)\n", This, dwGuidKind, pGUID); + return E_NOTIMPL; +} + +static const IProvideClassInfo2Vtbl ProvideClassInfo2Vtbl = { + ProvideClassInfo_QueryInterface, + ProvideClassInfo_AddRef, + ProvideClassInfo_Release, + ProvideClassInfo_GetClassInfo, + ProvideClassInfo2_GetGUID, +}; + static inline HTMLXMLHttpRequest *impl_from_DispatchEx(DispatchEx *iface) { return CONTAINING_RECORD(iface, HTMLXMLHttpRequest, event_target.dispex); @@ -849,6 +899,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->nsxhr = nsxhr; ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; + ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; init_event_target(&ret->event_target); init_dispex(&ret->event_target.dispex, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, &HTMLXMLHttpRequest_dispex);

1 0

Huw Davies : shell32/tests: Add a test for the size of the icon returned by ExtractIcons().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 9072dbd2f2c4c62c8465f812bba9d7a85bff343f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9072dbd2f2c4c62c8465f812b… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 09:49:25 2017 +0100 shell32/tests: Add a test for the size of the icon returned by ExtractIcons(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/Makefile.in | 2 +- dlls/shell32/tests/shelllink.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/tests/Makefile.in b/dlls/shell32/tests/Makefile.in index cfe0c50..4bde094 100644 --- a/dlls/shell32/tests/Makefile.in +++ b/dlls/shell32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = shell32.dll -IMPORTS = shell32 ole32 oleaut32 user32 advapi32 +IMPORTS = shell32 ole32 oleaut32 user32 gdi32 advapi32 C_SRCS = \ appbar.c \ diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index fdf2b14..c88e344 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -1159,6 +1159,8 @@ static void test_ExtractIcon(void) char path[MAX_PATH]; HANDLE file; int r; + ICONINFO info; + BITMAP bm; /* specified instance handle */ hicon = ExtractIconA(GetModuleHandleA("shell32.dll"), NULL, 0); @@ -1214,6 +1216,10 @@ if (0) /* existing index */ hicon = ExtractIconW(NULL, shell32W, 0); ok(hicon != NULL && HandleToLong(hicon) != -1, "Got icon %p\n", hicon); + GetIconInfo(hicon, &info); + GetObjectW(info.hbmColor, sizeof(bm), &bm); + ok(bm.bmWidth == GetSystemMetrics(SM_CXICON), "got %d\n", bm.bmWidth); + ok(bm.bmHeight == GetSystemMetrics(SM_CYICON), "got %d\n", bm.bmHeight); DestroyIcon(hicon); /* returns number of resources */

1 0

Huw Davies : shell32: Don't copy the imagelist in SHGetImageList().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 5f0d1a006bf02e22893355f001641ac24046f9b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0d1a006bf02e22893355f00… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 09:49:26 2017 +0100 shell32: Don't copy the imagelist in SHGetImageList(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shellord.c | 12 ++---------- dlls/shell32/tests/shelllink.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 1a67a52..96dd33a 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2182,7 +2182,6 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) { HIMAGELIST hLarge, hSmall; HIMAGELIST hNew; - HRESULT ret = E_FAIL; /* Wine currently only maintains large and small image lists */ if ((iImageList != SHIL_LARGE) && (iImageList != SHIL_SMALL) && (iImageList != SHIL_SYSSMALL)) @@ -2192,16 +2191,9 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) } Shell_GetImageLists(&hLarge, &hSmall); - hNew = ImageList_Duplicate(iImageList == SHIL_LARGE ? hLarge : hSmall); + hNew = (iImageList == SHIL_LARGE) ? hLarge : hSmall; - /* Get the interface for the new image list */ - if (hNew) - { - ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); - ImageList_Destroy(hNew); - } - - return ret; + return HIMAGELIST_QueryInterface(hNew, riid, ppv); } /************************************************************************* diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index c88e344..db15ccd 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -27,6 +27,7 @@ #include "shobjidl.h" #include "shlobj.h" #include "shellapi.h" +#include "commoncontrols.h" #include "wine/test.h" #include "shell32_test.h" @@ -1303,6 +1304,44 @@ todo_wine { DestroyIcon(hicon); } +static void test_SHGetImageList(void) +{ + HRESULT hr; + IImageList *list, *list2; + BOOL ret; + HIMAGELIST lg, sm; + ULONG start_refs, refs; + + hr = SHGetImageList( SHIL_LARGE, &IID_IImageList, (void **)&list ); + ok( hr == S_OK, "got %08x\n", hr ); + start_refs = IImageList_AddRef( list ); + IImageList_Release( list ); + + hr = SHGetImageList( SHIL_LARGE, &IID_IImageList, (void **)&list2 ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( list == list2, "lists differ\n" ); + refs = IImageList_AddRef( list ); + IImageList_Release( list ); + ok( refs == start_refs + 1, "got %d, start_refs %d\n", refs, start_refs ); + IImageList_Release( list2 ); + + hr = SHGetImageList( SHIL_SMALL, &IID_IImageList, (void **)&list2 ); + ok( hr == S_OK, "got %08x\n", hr ); + + ret = Shell_GetImageLists( &lg, &sm ); + ok( ret, "got %d\n", ret ); + ok( lg == (HIMAGELIST)list, "mismatch\n" ); + ok( sm == (HIMAGELIST)list2, "mismatch\n" ); + + /* Shell_GetImageLists doesn't take a reference */ + refs = IImageList_AddRef( list ); + IImageList_Release( list ); + ok( refs == start_refs, "got %d, start_refs %d\n", refs, start_refs ); + + IImageList_Release( list2 ); + IImageList_Release( list ); +} + START_TEST(shelllink) { HRESULT r; @@ -1333,6 +1372,7 @@ START_TEST(shelllink) test_propertystore(); test_ExtractIcon(); test_ExtractAssociatedIcon(); + test_SHGetImageList(); CoUninitialize(); }

1 0

Huw Davies : shell32: Take a reference on the imagelist returned with SHGFI_SYSICONINDEX.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: c4155c523debae6cde2945078a9426835ce67cc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4155c523debae6cde2945078… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 09:49:27 2017 +0100 shell32: Take a reference on the imagelist returned with SHGFI_SYSICONINDEX. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.c | 2 ++ dlls/shell32/tests/shlfileop.c | 59 +++++++++++++++++++++++++++++++----------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 1a22150..0ccde93 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -40,6 +40,7 @@ #include "rpcproxy.h" #include "shlwapi.h" #include "propsys.h" +#include "commoncontrols.h" #include "undocshell.h" #include "pidl.h" @@ -730,6 +731,7 @@ DWORD_PTR WINAPI SHGetFileInfoW(LPCWSTR path,DWORD dwFileAttributes, ret = (DWORD_PTR)small_icons; else ret = (DWORD_PTR)big_icons; + IImageList_AddRef((IImageList*)ret); } } diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index 4ae93ff..b13c554 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -21,10 +21,12 @@ #include <stdarg.h> #include <stdio.h> +#define COBJMACROS #define WINE_NOWINSOCK #include <windows.h> #include "shellapi.h" #include "shlobj.h" +#include "commoncontrols.h" #include "wine/test.h" @@ -325,6 +327,8 @@ static void test_get_file_info_iconlist(void) LPITEMIDLIST pidList; SHFILEINFOA shInfoa; SHFILEINFOW shInfow; + IImageList *small_list, *large_list; + ULONG start_refs, refs; hr = SHGetSpecialFolderLocation(NULL, CSIDL_DESKTOP, &pidList); if (FAILED(hr)) { @@ -332,11 +336,22 @@ static void test_get_file_info_iconlist(void) return; } + SHGetImageList( SHIL_LARGE, &IID_IImageList, (void **)&large_list ); + SHGetImageList( SHIL_SMALL, &IID_IImageList, (void **)&small_list ); + + start_refs = IImageList_AddRef( small_list ); + IImageList_Release( small_list ); + memset(&shInfoa, 0xcf, sizeof(shInfoa)); hSysImageList = (HIMAGELIST) SHGetFileInfoA((const char *)pidList, 0, &shInfoa, sizeof(shInfoa), SHGFI_SYSICONINDEX | SHGFI_SMALLICON | SHGFI_PIDL); - ok((hSysImageList != INVALID_HANDLE_VALUE) && (hSysImageList > (HIMAGELIST) 0xffff), "Can't get handle for CSIDL_DESKTOP imagelist\n"); + ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); + refs = IImageList_AddRef( small_list ); + IImageList_Release( small_list ); + ok( refs == start_refs + 1 || + broken( refs == start_refs ), /* XP and 2003 */ + "got %d, start_refs %d\n", refs, start_refs ); todo_wine ok(shInfoa.hIcon == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); todo_wine ok(shInfoa.szTypeName[0] == 0, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfoa.iIcon != 0xcfcfcfcf, "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); @@ -344,7 +359,7 @@ static void test_get_file_info_iconlist(void) shInfoa.dwAttributes == 0 || /* Vista */ broken(shInfoa.dwAttributes != 0xcfcfcfcf), /* NT4 doesn't clear but sets this field */ "SHGetFileInfoA(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL), unexpected dwAttributes\n"); - CloseHandle(hSysImageList); + /* Don't release hSysImageList here (and in similar places below) because of the broken reference behaviour of XP and 2003. */ if (!pSHGetFileInfoW) { @@ -362,20 +377,19 @@ static void test_get_file_info_iconlist(void) win_skip("SHGetFileInfoW is not implemented\n"); return; } - ok((hSysImageList != INVALID_HANDLE_VALUE) && (hSysImageList > (HIMAGELIST) 0xffff), "Can't get handle for CSIDL_DESKTOP imagelist\n"); + ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); todo_wine ok(shInfow.hIcon == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear hIcon\n"); ok(shInfow.szTypeName[0] == 0, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) did not clear szTypeName[0]\n"); ok(shInfow.iIcon != 0xcfcfcfcf, "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) should set iIcon\n"); ok(shInfow.dwAttributes == 0xcfcfcfcf || shInfoa.dwAttributes == 0, /* Vista */ "SHGetFileInfoW(CSIDL_DESKTOP, SHGFI_SYSICONINDEX|SHGFI_SMALLICON|SHGFI_PIDL) unexpected dwAttributes\n"); - CloseHandle(hSysImageList); /* Various suposidly invalid flag testing */ memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); - ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); + ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf || shInfoa.dwAttributes==0, /* Vista */ @@ -400,9 +414,9 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); - ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); + ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf || shInfoa.dwAttributes==0, /* Vista */ @@ -430,18 +444,18 @@ static void test_get_file_info_iconlist(void) ok(shInfow.dwAttributes==0xcfcfcfcf,"dwAttributes modified\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_ATTRIBUTES); - ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_ATTRIBUTES Failed\n"); + ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON| SHGFI_EXETYPE); - todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_EXETYPE Failed\n"); + todo_wine ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf || shInfoa.dwAttributes==0, /* Vista */ @@ -462,17 +476,18 @@ static void test_get_file_info_iconlist(void) ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL| SHGFI_ATTRIBUTES); + ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, large_list); ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_ATTRIBUTES Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); - hr = pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE); - todo_wine ok(hr != 0, "SHGFI_SYSICONINDEX|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_EXETYPE Failed\n"); + todo_wine ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, large_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); ok(shInfow.dwAttributes==0xcfcfcfcf || shInfoa.dwAttributes==0, /* Vista */ @@ -492,7 +507,21 @@ static void test_get_file_info_iconlist(void) todo_wine ok(shInfow.iIcon==0xcfcfcfcf, "Icon Index Modified\n"); ok(shInfow.dwAttributes!=0xcfcfcfcf,"dwAttributes not set\n"); + memset(&shInfow, 0xcf, sizeof(shInfow)); + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_SHELLICONSIZE); + ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); + + memset(&shInfow, 0xcf, sizeof(shInfow)); + hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), + SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SHELLICONSIZE); + ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, small_list); + ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); + ILFree(pidList); + IImageList_Release( small_list ); + IImageList_Release( large_list ); }

1 0

Huw Davies : shell32/tests: Add tests for the size of the icon returned by SHGetFileInfo().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: adc439b1a9c40b8d38b21ae59a57c39604cbbf59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc439b1a9c40b8d38b21ae59… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 21 09:49:28 2017 +0100 shell32/tests: Add tests for the size of the icon returned by SHGetFileInfo(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 50 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index b13c554..8f637f6 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -317,6 +317,40 @@ static void test_get_file_info(void) ok(shfi.iIcon != 0xdeadbeef, "iIcon was expected to change\n"); } +static void check_icon_size( HICON icon, DWORD flags ) +{ + ICONINFO info; + BITMAP bm; + SIZE list_size, metrics_size; + IImageList *list; + + GetIconInfo( icon, &info ); + GetObjectW( info.hbmColor, sizeof(bm), &bm ); + + SHGetImageList( (flags & SHGFI_SMALLICON) ? SHIL_SMALL : SHIL_LARGE, + &IID_IImageList, (void **)&list ); + IImageList_GetIconSize( list, &list_size.cx, &list_size.cy ); + IImageList_Release( list ); + + metrics_size.cx = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CXSMICON : SM_CXICON ); + metrics_size.cy = GetSystemMetrics( (flags & SHGFI_SMALLICON) ? SM_CYSMICON : SM_CYICON ); + + + if (flags & SHGFI_SHELLICONSIZE) + { + todo_wine_if(list_size.cx != metrics_size.cx) + { + ok( bm.bmWidth == list_size.cx, "got %d expected %d\n", bm.bmWidth, list_size.cx ); + ok( bm.bmHeight == list_size.cy, "got %d expected %d\n", bm.bmHeight, list_size.cy ); + } + } + else + { + ok( bm.bmWidth == metrics_size.cx, "got %d expected %d\n", bm.bmWidth, metrics_size.cx ); + ok( bm.bmHeight == metrics_size.cy, "got %d expected %d\n", bm.bmHeight, metrics_size.cy ); + } +} + static void test_get_file_info_iconlist(void) { /* Test retrieving a handle to the system image list, and @@ -400,8 +434,8 @@ static void test_get_file_info_iconlist(void) SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON); ok(hr != 0, " SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_SMALLICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); - if (shInfow.hIcon!=(HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); + check_icon_size( shInfow.hIcon, SHGFI_SMALLICON ); + DestroyIcon(shInfow.hIcon); todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -409,8 +443,8 @@ static void test_get_file_info_iconlist(void) SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON); ok(hr != 0, "SHGFI_ICON|SHGFI_USEFILEATTRIBUTES|SHGFI_PIDL|SHGFI_LARGEICON Failed\n"); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); - ok(shInfow.hIcon!=(HICON)0xcfcfcfcf && shInfow.hIcon!=0,"hIcon invalid\n"); - if (shInfow.hIcon != (HICON)0xcfcfcfcf) DestroyIcon(shInfow.hIcon); + check_icon_size( shInfow.hIcon, SHGFI_LARGEICON ); + DestroyIcon( shInfow.hIcon ); todo_wine ok(shInfow.dwAttributes==0,"dwAttributes not set\n"); memset(&shInfow, 0xcf, sizeof(shInfow)); @@ -509,15 +543,19 @@ static void test_get_file_info_iconlist(void) memset(&shInfow, 0xcf, sizeof(shInfow)); hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), - SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_SHELLICONSIZE); + SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SMALLICON|SHGFI_SHELLICONSIZE|SHGFI_ICON); ok(hSysImageList == (HIMAGELIST)small_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); + check_icon_size( shInfow.hIcon, SHGFI_SMALLICON | SHGFI_SHELLICONSIZE ); + DestroyIcon( shInfow.hIcon ); memset(&shInfow, 0xcf, sizeof(shInfow)); hSysImageList = (HIMAGELIST)pSHGetFileInfoW((const WCHAR *)pidList, 0, &shInfow, sizeof(shInfow), - SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SHELLICONSIZE); + SHGFI_SYSICONINDEX|SHGFI_PIDL|SHGFI_SHELLICONSIZE|SHGFI_ICON); ok(hSysImageList == (HIMAGELIST)large_list, "got %p expect %p\n", hSysImageList, small_list); ok(shInfow.iIcon!=0xcfcfcfcf, "Icon Index Missing\n"); + check_icon_size( shInfow.hIcon, SHGFI_LARGEICON | SHGFI_SHELLICONSIZE ); + DestroyIcon( shInfow.hIcon ); ILFree(pidList); IImageList_Release( small_list );

1 0

Ken Thomases : winemac: Invalidate cached hasGLDescendant value unconditionally when the view is hidden or unhidden.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: c9528f09074a7836e87f2698101135d1ed16fae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9528f09074a7836e87f26981… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Apr 20 20:53:16 2017 -0500 winemac: Invalidate cached hasGLDescendant value unconditionally when the view is hidden or unhidden. Even if the (un)hidden view doesn't have attached GL contexts itself, its descendants may. It doesn't make sense not to check them just because this view doesn't have GL contexts. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/cocoa_window.m | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m index af8ebe7..c67dd07 100644 --- a/dlls/winemac.drv/cocoa_window.m +++ b/dlls/winemac.drv/cocoa_window.m @@ -617,18 +617,14 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi - (void) viewDidHide { [super viewDidHide]; - if ([self hasGLContext]) - [self invalidateHasGLDescendant]; + [self invalidateHasGLDescendant]; } - (void) viewDidUnhide { [super viewDidUnhide]; - if ([self hasGLContext]) - { - [self updateGLContexts:YES]; - [self invalidateHasGLDescendant]; - } + [self updateGLContexts:YES]; + [self invalidateHasGLDescendant]; } - (void) completeText:(NSString*)text

1 0

Henri Verbeet : wined3d: Introduce context functions to map/ unmap a wined3d_bo_address.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 62ca4f38269139ef2a8b9842ec538d9e7f7a0e76 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62ca4f38269139ef2a8b9842e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:10 2017 +0200 wined3d: Introduce context functions to map/unmap a wined3d_bo_address. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 42 ++++++++++++++++++++++++++ dlls/wined3d/surface.c | 54 ++++++++++++++------------------- dlls/wined3d/texture.c | 68 ++++-------------------------------------- dlls/wined3d/wined3d_private.h | 8 ++--- 4 files changed, 74 insertions(+), 98 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=62ca4f38269139ef2a8b9…

1 0

Henri Verbeet : wined3d: Use context_map_bo_address() in wined3d_buffer_copy().
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 3311ea98595a71b7de4edec498b31fec68526e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3311ea98595a71b7de4edec49… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 21 00:57:11 2017 +0200 wined3d: Use context_map_bo_address() in wined3d_buffer_copy(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6e1ecb0..3cf153b 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1202,7 +1202,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ struct wined3d_device *device; BYTE *dst_ptr, *src_ptr; DWORD dst_location; - HRESULT hr; buffer_mark_used(dst_buffer); buffer_mark_used(src_buffer); @@ -1213,7 +1212,10 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ gl_info = context->gl_info; dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); + dst.addr += dst_offset; + wined3d_buffer_get_memory(src_buffer, &src, src_buffer->locations); + src.addr += src_offset; if (dst.buffer_object && src.buffer_object) { @@ -1227,41 +1229,30 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ } else { - if (FAILED(hr = wined3d_buffer_map(dst_buffer, dst_offset, size, &dst_ptr, 0))) - { - WARN("Failed to map dst_buffer, hr %#x.\n", hr); - context_release(context); - return WINED3DERR_INVALIDCALL; - } - if (FAILED(hr = wined3d_buffer_map(src_buffer, src_offset, size, &src_ptr, WINED3D_MAP_READONLY))) - { - WARN("Failed to map src_buffer, hr %#x.\n", hr); - wined3d_buffer_unmap(dst_buffer); - context_release(context); - return WINED3DERR_INVALIDCALL; - } + src_ptr = context_map_bo_address(context, &src, size, src_buffer->buffer_type_hint, WINED3D_MAP_READONLY); + dst_ptr = context_map_bo_address(context, &dst, size, dst_buffer->buffer_type_hint, 0); memcpy(dst_ptr, src_ptr, size); - wined3d_buffer_unmap(src_buffer); - wined3d_buffer_unmap(dst_buffer); + context_unmap_bo_address(context, &dst, dst_buffer->buffer_type_hint); + context_unmap_bo_address(context, &src, src_buffer->buffer_type_hint); } } else if (!dst.buffer_object && src.buffer_object) { buffer_bind(src_buffer, context); - GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr + dst_offset)); + GL_EXTCALL(glGetBufferSubData(src_buffer->buffer_type_hint, src_offset, size, dst.addr)); checkGLcall("buffer download"); } else if (dst.buffer_object && !src.buffer_object) { buffer_bind(dst_buffer, context); - GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr + src_offset)); + GL_EXTCALL(glBufferSubData(dst_buffer->buffer_type_hint, dst_offset, size, src.addr)); checkGLcall("buffer upload"); } else { - memcpy(dst.addr + dst_offset, src.addr + src_offset, size); + memcpy(dst.addr, src.addr, size); } wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size);

1 0

Alexandre Julliard : glu32: Import tessellation functions from Mesa.
by Alexandre Julliard 21 Apr '17

21 Apr '17

Module: wine Branch: master Commit: 2386e37bd24f26ebb0757827eb4b81916d8284da URL: http://source.winehq.org/git/wine.git/?a=commit;h=2386e37bd24f26ebb0757827e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 21 13:34:53 2017 +0200 glu32: Import tessellation functions from Mesa. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/glu32/Makefile.in | 8 +- dlls/glu32/geom.c | 244 ++++++++ dlls/glu32/glu.c | 293 ---------- dlls/glu32/glu32.spec | 28 +- dlls/glu32/mesh.c | 951 +++++++++++++++++++++++++++++++ dlls/glu32/mesh.h | 271 +++++++++ dlls/glu32/priorityq.c | 467 ++++++++++++++++ dlls/glu32/render.c | 497 ++++++++++++++++ dlls/glu32/sweep.c | 1460 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/glu32/tess.c | 812 +++++++++++++++++++++++++++ dlls/glu32/tess.h | 240 ++++++++ 11 files changed, 4963 insertions(+), 308 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2386e37bd24f26ebb0757…

1 0