wine-commits April 2017

wine-commits@winehq.org

2 participants
757 discussions

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

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

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: 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/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

Louis Lenders : advapi32: Add stubs for RegSaveKeyEx{A,W}.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 6c7760f2175e241b330cde0a902c96d9007922e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7760f2175e241b330cde0a9… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Thu Apr 13 18:00:22 2017 +0200 advapi32: Add stubs for RegSaveKeyEx{A,W}. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/advapi32.spec | 4 ++-- dlls/advapi32/registry.c | 19 +++++++++++++++++++ .../api-ms-win-core-localregistry-l1-1-0.spec | 4 ++-- .../api-ms-win-core-registry-l1-1-0.spec | 4 ++-- .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 4 ++-- dlls/kernelbase/kernelbase.spec | 4 ++-- include/winreg.h | 3 +++ 7 files changed, 32 insertions(+), 10 deletions(-) diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 078bb8f..7922c37 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -680,8 +680,8 @@ @ stdcall RegRestoreKeyA(long str long) @ stdcall RegRestoreKeyW(long wstr long) @ stdcall RegSaveKeyA(long ptr ptr) -# @ stub RegSaveKeyExA -# @ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) +@ stdcall RegSaveKeyExW(long wstr ptr long) @ stdcall RegSaveKeyW(long ptr ptr) @ stdcall RegSetKeySecurity(long long ptr) @ stdcall RegSetKeyValueA(long str str long ptr long) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e32f48a..7a26fff 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -2427,6 +2427,25 @@ LSTATUS WINAPI RegSaveKeyA( HKEY hkey, LPCSTR file, LPSECURITY_ATTRIBUTES sa ) return RegSaveKeyW(hkey, fileW->Buffer, sa); } +/****************************************************************************** + * RegSaveKeyExA [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegSaveKeyExA( HKEY hkey, LPCSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) +{ + FIXME( "(%p,%s,%p,%d) flags not handled\n", hkey, debugstr_a(file), sa, flags ); + return RegSaveKeyA(hkey, file, sa); +} + +/****************************************************************************** + * RegSaveKeyExW [ADVAPI32.@] + * + */ +LSTATUS WINAPI RegSaveKeyExW( HKEY hkey, LPCWSTR file, SECURITY_ATTRIBUTES *sa, DWORD flags ) +{ + FIXME( "(%p,%s,%p,%d) flags not handled\n", hkey, debugstr_w(file), sa, flags ); + return RegSaveKeyW(hkey, file, sa); +} /****************************************************************************** * RegRestoreKeyW [ADVAPI32.@] diff --git a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec index fcf4f00..114d5a9 100644 --- a/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec +++ b/dlls/api-ms-win-core-localregistry-l1-1-0/api-ms-win-core-localregistry-l1-1-0.spec @@ -31,8 +31,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec index 91b1a94..7a48e3b 100644 --- a/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec +++ b/dlls/api-ms-win-core-registry-l1-1-0/api-ms-win-core-registry-l1-1-0.spec @@ -34,8 +34,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index d5bc3e6..d0660eb 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -120,8 +120,8 @@ @ stdcall RegQueryValueExW(long wstr ptr ptr ptr ptr) advapi32.RegQueryValueExW @ stdcall RegRestoreKeyA(long str long) advapi32.RegRestoreKeyA @ stdcall RegRestoreKeyW(long wstr long) advapi32.RegRestoreKeyW -@ stub RegSaveKeyExA -@ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall RegSetKeySecurity(long long ptr) advapi32.RegSetKeySecurity @ stdcall RegSetValueExA(long str long long ptr long) advapi32.RegSetValueExA @ stdcall RegSetValueExW(long wstr long long ptr long) advapi32.RegSetValueExW diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index e8cf502..cf6ceef 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1307,8 +1307,8 @@ @ stdcall -private RegQueryValueExW(long wstr ptr ptr ptr ptr) kernel32.RegQueryValueExW @ stdcall -private RegRestoreKeyA(long str long) kernel32.RegRestoreKeyA @ stdcall -private RegRestoreKeyW(long wstr long) kernel32.RegRestoreKeyW -# @ stub RegSaveKeyExA -# @ stub RegSaveKeyExW +@ stdcall RegSaveKeyExA(long str ptr long) advapi32.RegSaveKeyExA +@ stdcall RegSaveKeyExW(long wstr ptr long) advapi32.RegSaveKeyExW @ stdcall -private RegSetKeySecurity(long long ptr) kernel32.RegSetKeySecurity @ stdcall RegSetKeyValueA(long str str long ptr long) advapi32.RegSetKeyValueA @ stdcall RegSetKeyValueW(long wstr wstr long ptr long) advapi32.RegSetKeyValueW diff --git a/include/winreg.h b/include/winreg.h index cf6bd47..42b7725 100644 --- a/include/winreg.h +++ b/include/winreg.h @@ -168,6 +168,9 @@ WINADVAPI LSTATUS WINAPI RegRestoreKeyW(HKEY,LPCWSTR,DWORD); WINADVAPI LSTATUS WINAPI RegSaveKeyA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES); WINADVAPI LSTATUS WINAPI RegSaveKeyW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES); #define RegSaveKey WINELIB_NAME_AW(RegSaveKey) +WINADVAPI LSTATUS WINAPI RegSaveKeyExA(HKEY,LPCSTR,LPSECURITY_ATTRIBUTES,DWORD); +WINADVAPI LSTATUS WINAPI RegSaveKeyExW(HKEY,LPCWSTR,LPSECURITY_ATTRIBUTES,DWORD); +#define RegSaveKeyEx WINELIB_NAME_AW(RegSaveKeyEx) WINADVAPI LSTATUS WINAPI RegSetKeySecurity(HKEY,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); WINADVAPI LSTATUS WINAPI RegSetKeyValueA(HKEY,LPCSTR,LPCSTR,DWORD,const void*,DWORD); WINADVAPI LSTATUS WINAPI RegSetKeyValueW(HKEY,LPCWSTR,LPCWSTR,DWORD,const void*,DWORD);

1 0

Austin English : ntoskrnl.exe: Add IoReportResourceForDetection stub.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 18c94886d7ca3f5c9df71e0b6268b3114ada25e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18c94886d7ca3f5c9df71e0b6… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Apr 20 18:26:14 2017 +0200 ntoskrnl.exe: Add IoReportResourceForDetection stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 ++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c87f105..4b8a005 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1453,6 +1453,20 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** + * IoReportResourceForDetection (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI IoReportResourceForDetection( DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, ULONG drv_size, + DEVICE_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, ULONG dev_size, + BOOLEAN *conflict ) +{ + FIXME( "(%p, %p, %u, %p, %p, %u, %p): stub\n", drv_obj, drv_list, drv_size, + dev_obj, dev_list, dev_size, conflict ); + + return STATUS_NOT_IMPLEMENTED; +} + + +/*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7cd5146..25649c9 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -441,7 +441,7 @@ @ stub IoRemoveShareAccess @ stub IoReportDetectedDevice @ stub IoReportHalResourceUsage -@ stub IoReportResourceForDetection +@ stdcall IoReportResourceForDetection(ptr ptr long ptr ptr long ptr) @ stdcall IoReportResourceUsage(ptr ptr ptr long ptr ptr long long ptr) @ stub IoReportTargetDeviceChange @ stub IoReportTargetDeviceChangeAsynchronous

1 0

Sebastian Lackner : ntoskrnl.exe: Do not use P* types in IoReportResourceUsage.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 1cab71c788b15e259bd8eca1d8cca1b279148c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cab71c788b15e259bd8eca1d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Apr 20 18:26:04 2017 +0200 ntoskrnl.exe: Do not use P* types in IoReportResourceUsage. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index f022f4c..c87f105 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1455,12 +1455,13 @@ VOID WINAPI IoUnregisterShutdownNotification( PDEVICE_OBJECT obj ) /*********************************************************************** * IoReportResourceUsage (NTOSKRNL.EXE.@) */ -NTSTATUS WINAPI IoReportResourceUsage(PUNICODE_STRING name, PDRIVER_OBJECT drv_obj, PCM_RESOURCE_LIST drv_list, - ULONG drv_size, PDRIVER_OBJECT dev_obj, PCM_RESOURCE_LIST dev_list, - ULONG dev_size, BOOLEAN overwrite, PBOOLEAN detected) +NTSTATUS WINAPI IoReportResourceUsage( UNICODE_STRING *name, DRIVER_OBJECT *drv_obj, CM_RESOURCE_LIST *drv_list, + ULONG drv_size, DRIVER_OBJECT *dev_obj, CM_RESOURCE_LIST *dev_list, + ULONG dev_size, BOOLEAN overwrite, BOOLEAN *conflict ) { FIXME( "(%s, %p, %p, %u, %p, %p, %u, %d, %p): stub\n", debugstr_us(name), - drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, detected ); + drv_obj, drv_list, drv_size, dev_obj, dev_list, dev_size, overwrite, conflict ); + return STATUS_NOT_IMPLEMENTED; }

1 0

Jacek Caban : mshtml: Replace get_htmldoc_classinfo with more generic helper.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 4632045f9ae92ec3803d9e3c7587061d9ed8a181 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4632045f9ae92ec3803d9e3c7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:50 2017 +0200 mshtml: Replace get_htmldoc_classinfo with more generic helper. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/dispex.c | 4 ++-- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/mshtml_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index caaf788..6e7f1be 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -188,7 +188,7 @@ void release_typelib(void) DeleteCriticalSection(&cs_dispex_static_data); } -HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) +HRESULT get_class_typeinfo(const CLSID *clsid, ITypeInfo **typeinfo) { HRESULT hres; @@ -197,7 +197,7 @@ HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) if (!typelib) return hres; - hres = ITypeLib_GetTypeInfoOfGuid(typelib, &CLSID_HTMLDocument, typeinfo); + hres = ITypeLib_GetTypeInfoOfGuid(typelib, clsid, typeinfo); if(FAILED(hres)) ERR("GetTypeInfoOfGuid failed: %08x\n", hres); return hres; diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4271326..57679fc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4473,7 +4473,7 @@ static HRESULT WINAPI ProvideClassInfo_GetClassInfo(IProvideClassInfo* iface, { HTMLDocument *This = impl_from_IProvideClassInfo(iface); TRACE("(%p)->(%p)\n", This, ppTI); - return get_htmldoc_classinfo(ppTI); + return get_class_typeinfo(&CLSID_HTMLDocument, ppTI); } static const IProvideClassInfoVtbl ProvideClassInfoVtbl = { diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 89f2fcb..c0b1d29 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -316,7 +316,7 @@ HRESULT dispex_get_dynid(DispatchEx*,const WCHAR*,DISPID*) DECLSPEC_HIDDEN; void dispex_traverse(DispatchEx*,nsCycleCollectionTraversalCallback*) DECLSPEC_HIDDEN; void dispex_unlink(DispatchEx*) DECLSPEC_HIDDEN; void release_typelib(void) DECLSPEC_HIDDEN; -HRESULT get_htmldoc_classinfo(ITypeInfo **typeinfo) DECLSPEC_HIDDEN; +HRESULT get_class_typeinfo(const CLSID*,ITypeInfo**) DECLSPEC_HIDDEN; const dispex_static_data_vtbl_t *dispex_get_vtbl(DispatchEx*) DECLSPEC_HIDDEN; void dispex_info_add_interface(dispex_data_t*,tid_t) DECLSPEC_HIDDEN;

1 0

Jacek Caban : mshtml.idl: Added HTMLStyleElement coclass declaration.
by Alexandre Julliard 20 Apr '17

20 Apr '17

Module: wine Branch: master Commit: 91c568bc6dbdde09e4137ca5e6eee558bda9969e URL: http://source.winehq.org/git/wine.git/?a=commit;h=91c568bc6dbdde09e4137ca5e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 20 16:23:45 2017 +0200 mshtml.idl: Added HTMLStyleElement coclass declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyleelem.c | 4 ++-- include/mshtml.idl | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyleelem.c b/dlls/mshtml/htmlstyleelem.c index 96c394c..f516273 100644 --- a/dlls/mshtml/htmlstyleelem.c +++ b/dlls/mshtml/htmlstyleelem.c @@ -33,14 +33,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml); -typedef struct { +struct HTMLStyleElement { HTMLElement element; IHTMLStyleElement IHTMLStyleElement_iface; nsIDOMHTMLStyleElement *nsstyle; IHTMLStyleSheet *style_sheet; -} HTMLStyleElement; +}; static inline HTMLStyleElement *impl_from_IHTMLStyleElement(IHTMLStyleElement *iface) { diff --git a/include/mshtml.idl b/include/mshtml.idl index 1b4ba2a..a9d6502 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -19721,6 +19721,23 @@ methods: } /***************************************************************************** + * HTMLStyleElement coclass + */ +[ + noncreatable, + uuid(3050f37d-98b5-11cf-bb82-00aa00bdce0b) +] +coclass HTMLStyleElement +{ + [default] dispinterface DispHTMLStyleElement; + /* [source, default] dispinterface HTMLStyleElementEvents; */ + /* [source] dispinterface HTMLStyleElementEvents2; */ + WINE_HTMLELEMENT_INTERFACES; + interface IHTMLStyleElement; + /* interface IHTMLStyleElement2; */ +} + +/***************************************************************************** * IHTMLStorage interface */ [

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2017