March 2020 - Wine-Commits - list.winehq.org

Jacek Caban : locale.h: Add _Strftime declaration.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: cef21392074915e9d05cfbd9ad39f292e8340e9c URL: https://source.winehq.org/git/wine.git/?a=commit;h=cef21392074915e9d05cfbd9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 19 15:41:32 2020 +0100 locale.h: Add _Strftime declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/locale.c | 2 -- include/msvcrt/locale.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp90/locale.c b/dlls/msvcp90/locale.c index 7b84874425..9293e0c9ac 100644 --- a/dlls/msvcp90/locale.c +++ b/dlls/msvcp90/locale.c @@ -55,8 +55,6 @@ unsigned int __cdecl ___lc_codepage_func(void); int __cdecl ___lc_collate_cp_func(void); const unsigned short* __cdecl __pctype_func(void); const locale_facet* __thiscall locale__Getfacet(const locale*, MSVCP_size_t); -MSVCP_size_t __cdecl _Strftime(char*, MSVCP_size_t, const char*, - const struct tm*, struct __lc_time_data*); const locale* __cdecl locale_classic(void); #if _MSVCP_VER >= 110 diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index c6262c2c31..120f39c2fc 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -56,6 +56,7 @@ struct lconv }; #endif /* _LCONV_DEFINED */ +struct tm; #ifdef __cplusplus extern "C" { @@ -63,6 +64,7 @@ extern "C" { char* __cdecl setlocale(int,const char*); struct lconv* __cdecl localeconv(void); +size_t __cdecl _Strftime(char*,size_t,const char*,const struct tm*,void*); int __cdecl _configthreadlocale(int); _locale_t __cdecl _get_current_locale(void); _locale_t __cdecl _create_locale(int, const char*);

1 0

Vijay Kiran Kamuju : include: Add missing GUIDs in dsound.h.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 90233748209bb9a5c0adfc41a100c83535a1b9b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90233748209bb9a5c0adfc41… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 15 18:28:43 2020 +0100 include: Add missing GUIDs in dsound.h. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48750 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dsound.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dsound.h b/include/dsound.h index d397e2315c..85235ef1bb 100644 --- a/include/dsound.h +++ b/include/dsound.h @@ -116,6 +116,11 @@ DEFINE_GUID(DSDEVID_DefaultVoiceCapture, 0xDEF00003,0x9C6D,0x47ED,0xAA,0xF1,0x4D DEFINE_GUID(DSDEVID_WinePlayback, 0x40316A1D,0x605B,0xD611,0x87,0xC6,0x00,0x80,0xAD,0x00,0x02,0xFE); +#define DSD3DALG_DEFAULT GUID_NULL +DEFINE_GUID(DS3DALG_NO_VIRTUALIZATION, 0xc241333f,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_FULL, 0xc2413340,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); +DEFINE_GUID(DS3DALG_HRTF_LIGHT, 0xc2413342,0x1c1b,0x11d2,0x94,0xf5,0x00,0xc0,0x4f,0xc2,0x8a,0xca); + DEFINE_GUID(GUID_DSFX_STANDARD_GARGLE, 0xDAFD8210,0x5711,0x4B91,0x9F,0xE3,0xF7,0x5B,0x7A,0xE2,0x79,0xBF); DEFINE_GUID(GUID_DSFX_STANDARD_CHORUS, 0xEFE6629C,0x81F7,0x4281,0xBD,0x91,0xC9,0xD6,0x04,0xA9,0x5A,0xF6); DEFINE_GUID(GUID_DSFX_STANDARD_FLANGER, 0xEFCA3D92,0xDFD8,0x4672,0xA6,0x03,0x74,0x20,0x89,0x4B,0xAD,0x98);

1 0

Nikolay Sivov : comctl32/imagelist: Update todo list.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: b9eb121eabf5db597c918f54ba13b9140e68635f URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9eb121eabf5db597c918f54… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 19 15:04:55 2020 +0300 comctl32/imagelist: Update todo list. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 237719cf7d..925952351f 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -24,7 +24,7 @@ * * TODO: * - Add support for ILD_PRESERVEALPHA, ILD_SCALE, ILD_DPISCALE - * - Add support for ILS_GLOW, ILS_SHADOW, ILS_SATURATE + * - Add support for ILS_GLOW, ILS_SHADOW * - Thread-safe locking */

1 0

Zebediah Figura : rpcrt4: Handle bare coclasses as top-level parameters.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 15e91ac2ce2d5d5f1a86a300552f921df838e792 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e91ac2ce2d5d5f1a86a300… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 18 23:52:30 2020 -0500 rpcrt4: Handle bare coclasses as top-level parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 32 ++++++++++++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 8 ++++++++ dlls/rpcrt4/ndr_typelib.c | 6 +++++- 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 18e4b1b180..4e9a8baeca 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1577,6 +1577,22 @@ static HRESULT WINAPI Widget_Coclass_ptr(IWidget *iface, Coclass1 **in, Coclass1 return S_OK; } +static HRESULT WINAPI Widget_Coclass_noptr(IWidget *iface, Coclass1 class1, Coclass2 class2, Coclass3 class3) +{ + HRESULT hr; + + hr = ICoclass1_test(class1.iface); + ok(hr == 1, "Got hr %#x.\n", hr); + + hr = ICoclass2_test(class2.iface); + ok(hr == 2, "Got hr %#x.\n", hr); + + hr = ICoclass1_test(class3.iface); + ok(hr == 1, "Got hr %#x.\n", hr); + + return S_OK; +} + static HRESULT WINAPI Widget_no_in_out(IWidget *iface, BSTR str, int i) { ok(SysStringLen(str) == 4, "unexpected len\n"); @@ -1644,6 +1660,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_myint, Widget_Coclass, Widget_Coclass_ptr, + Widget_Coclass_noptr, Widget_no_in_out, }; @@ -2671,6 +2688,9 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) struct coclass_obj *class1, *class2, *class3; IUnknown *unk_in, *unk_out, *unk_in_out; ICoclass1 *in, *out, *in_out; + Coclass1 class1_noptr; + Coclass2 class2_noptr; + Coclass3 class3_noptr; HRESULT hr; class1 = create_coclass_obj(); @@ -2742,6 +2762,18 @@ static void test_marshal_coclass(IWidget *widget, IDispatch *disp) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!in_out, "Got [in, out] %p.\n", in_out); + class1 = create_coclass_obj(); + class2 = create_coclass_obj(); + class3 = create_coclass_obj(); + class1_noptr.iface = &class1->ICoclass1_iface; + class2_noptr.iface = &class2->ICoclass2_iface; + class3_noptr.iface = &class3->ICoclass1_iface; + hr = IWidget_Coclass_noptr(widget, class1_noptr, class2_noptr, class3_noptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + release_iface(&class1->ICoclass1_iface); + release_iface(&class2->ICoclass1_iface); + release_iface(&class3->ICoclass1_iface); + /* Test with Invoke(). Note that since we pass VT_UNKNOWN, we don't get our * interface back, but rather an IUnknown. */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index 1344aa4912..9182def313 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -73,6 +73,7 @@ enum IWidget_dispids DISPID_TM_TYPEDEF, DISPID_TM_COCLASS, DISPID_TM_COCLASS_PTR, + DISPID_TM_COCLASS_NOPTR, DISPID_TM_NOINOUT }; @@ -171,6 +172,10 @@ library TestTypelib HRESULT test(); } +cpp_quote("struct Coclass1 { ICoclass1 *iface; };") +cpp_quote("struct Coclass2 { ICoclass2 *iface; };") +cpp_quote("struct Coclass3 { ICoclass1 *iface; };") + [ uuid(3f7e06fe-0bce-46f0-8b7d-3a68393c796c) ] @@ -379,6 +384,9 @@ library TestTypelib [id(DISPID_TM_COCLASS_PTR)] HRESULT Coclass_ptr([in] Coclass1 **in, [out] Coclass1 **out, [in, out] Coclass1 **in_out); + [id(DISPID_TM_COCLASS_NOPTR)] + HRESULT Coclass_noptr([in] Coclass1 class1, [in] Coclass2 class2, [in] Coclass3 class3); + [id(DISPID_TM_NOINOUT)] HRESULT no_in_out(BSTR str, int i); } diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index 462b235d33..91c4a07464 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -787,6 +787,7 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, ITypeInfo *refinfo; TYPEATTR *attr; size_t off; + GUID guid; TRACE("vt %d%s\n", desc->vt, toplevel ? " (toplevel)" : ""); @@ -815,7 +816,9 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, write_ip_tfs(str, len, &attr->guid); break; case TKIND_COCLASS: - assert(0); + off = *len; + get_default_iface(refinfo, attr->cImplTypes, &guid); + write_ip_tfs(str, len, &guid); break; case TKIND_ALIAS: off = write_type_tfs(refinfo, str, len, &attr->tdescAlias, toplevel, onstack); @@ -1007,6 +1010,7 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, case TKIND_INTERFACE: case TKIND_DISPATCH: + case TKIND_COCLASS: /* These are treated as if they were interface pointers. */ *flags |= MustFree; break;

1 0

Francois Gouget : shell32/tests: Don't use randomized paths in the shlexec test.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 30f84ef51e5c4bc885b71f15e71aa11b9ba57c0d URL: https://source.winehq.org/git/wine.git/?a=commit;h=30f84ef51e5c4bc885b71f15… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 19 12:04:18 2020 +0100 shell32/tests: Don't use randomized paths in the shlexec test. In case of a failure it is necessary to show the path that was passed to ShellExecute(). That means the paths must not be randomized so as not to prevent the TestBot from detecting new failures. Note that because of the registry modifications one cannot run two instances of the test concurrently anyway. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index eec1a63d38..f6f384bbe0 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2693,7 +2693,13 @@ static void init_test(void) strcpy(filename, "c:\\"); else GetTempPathA(sizeof(filename), filename); - GetTempFileNameA(filename, "wt", 0, tmpdir); + + /* In case of a failure it is necessary to show the path that was passed to + * ShellExecute(). That means the paths must not be randomized so as not to + * prevent the TestBot from detecting new failures. + */ + strcpy(tmpdir, filename); + strcat(tmpdir, "\\wtShlexecDir"); GetLongPathNameA(tmpdir, tmpdir, sizeof(tmpdir)); DeleteFileA( tmpdir ); rc = CreateDirectoryA( tmpdir, NULL ); @@ -2701,8 +2707,8 @@ static void init_test(void) /* Set %TMPDIR% for the tests */ SetEnvironmentVariableA("TMPDIR", tmpdir); - rc = GetTempFileNameA(tmpdir, "wt", 0, child_file); - ok(rc != 0, "got %d\n", rc); + strcpy(child_file, tmpdir); + strcat(child_file, "\\wtShlexecFile"); init_event(child_file); /* Set up the test files */

1 0

Francois Gouget : tests: Fix the wait_child_process_() macro in the no-line-number case.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: e6e77f146942ab4604ea403f2b566a24b153d18a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6e77f146942ab4604ea403f… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Mar 19 10:22:20 2020 +0100 tests: Fix the wait_child_process_() macro in the no-line-number case. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/test.h b/include/wine/test.h index 1bf178339f..9967094671 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -110,7 +110,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip # define trace_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_trace -# define wait_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_process +# define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok

1 0

Nikolay Sivov : comctl32/imagelist: Implement IImageList::GetItemFlags().
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 2e62014896e5f8a8d2e06d3742a9d33c07fde1bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e62014896e5f8a8d2e06d37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 19 15:04:54 2020 +0300 comctl32/imagelist: Implement IImageList::GetItemFlags(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/imagelist.c | 67 +++++++++++++++-------------------------- dlls/comctl32/tests/imagelist.c | 26 +++++++++++++++- include/commoncontrols.idl | 3 +- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 14a17c2717..237719cf7d 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -76,7 +76,7 @@ struct _IMAGELIST HBRUSH hbrBlend50; INT cInitial; UINT uBitsPixel; - char *has_alpha; + DWORD *item_flags; BOOL color_table_set; LONG ref; /* reference count */ @@ -217,7 +217,7 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he if (has_alpha) { - himl->has_alpha[pos + n] = 1; + himl->item_flags[pos + n] = ILIF_ALPHA; if (mask_info && himl->hbmMask) /* generate the mask from the alpha channel */ { @@ -251,7 +251,7 @@ static BOOL add_with_alpha( HIMAGELIST himl, HDC hdc, int pos, int count, if (!GetObjectW( hbmImage, sizeof(bm), &bm )) return FALSE; /* if either the imagelist or the source bitmap don't have an alpha channel, bail out now */ - if (!himl->has_alpha) return FALSE; + if ((himl->flags & 0xfe) != ILC_COLOR32) return FALSE; if (bm.bmBitsPixel != 32) return FALSE; SelectObject( hdc, hbmImage ); @@ -368,17 +368,8 @@ IMAGELIST_InternalExpandBitmaps(HIMAGELIST himl, INT nImageCount) himl->hbmMask = hbmNewBitmap; } - if (himl->has_alpha) - { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); - if (new_alpha) himl->has_alpha = new_alpha; - else - { - heap_free( himl->has_alpha ); - himl->has_alpha = NULL; - } - } - + himl->item_flags = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, himl->item_flags, + nNewCount * sizeof(*himl->item_flags)); himl->cMaxImage = nNewCount; DeleteDC (hdcBitmap); @@ -844,10 +835,7 @@ ImageList_Create (INT cx, INT cy, UINT flags, else himl->hbmMask = 0; - if (ilc == ILC_COLOR32) - himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); - else - himl->has_alpha = NULL; + himl->item_flags = heap_alloc_zero( himl->cMaxImage * sizeof(*himl->item_flags) ); /* create blending brushes */ hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); @@ -1433,7 +1421,7 @@ ImageList_DrawIndirect (IMAGELISTDRAWPARAMS *pimldp) oldImageFg = SetTextColor( hImageDC, RGB( 0, 0, 0 ) ); oldImageBk = SetBkColor( hImageDC, RGB( 0xff, 0xff, 0xff ) ); - has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]); + has_alpha = himl->item_flags[pimldp->i] & ILIF_ALPHA; if (!bMask && (has_alpha || (fState & ILS_ALPHA) || (fState & ILS_SATURATE))) { COLORREF colour, blend_col = CLR_NONE; @@ -1632,8 +1620,7 @@ ImageList_Duplicate (HIMAGELIST himlSrc) himlSrc->hdcMask, 0, 0, SRCCOPY); himlDst->cCurImage = himlSrc->cCurImage; - if (himlSrc->has_alpha && himlDst->has_alpha) - memcpy( himlDst->has_alpha, himlSrc->has_alpha, himlDst->cCurImage ); + memcpy( himlDst->item_flags, himlSrc->item_flags, himlDst->cCurImage * sizeof(*himlDst->item_flags) ); } return himlDst; } @@ -2300,7 +2287,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm) } else mask_info = NULL; - if (himl->has_alpha && image_info->bmiHeader.biBitCount == 32) + if ((himl->flags & 0xfe) == ILC_COLOR32 && image_info->bmiHeader.biBitCount == 32) { DWORD *ptr = image_bits; BYTE *mask_ptr = mask_bits; @@ -2396,11 +2383,8 @@ ImageList_Remove (HIMAGELIST himl, INT i) for (nCount = 0; nCount < MAX_OVERLAYIMAGE; nCount++) himl->nOvlIdx[nCount] = -1; - if (himl->has_alpha) - { - heap_free( himl->has_alpha ); - himl->has_alpha = heap_alloc_zero( himl->cMaxImage ); - } + heap_free( himl->item_flags ); + himl->item_flags = heap_alloc_zero( himl->cMaxImage * sizeof(*himl->item_flags) ); hbmNewImage = ImageList_CreateImage(himl->hdcImage, himl, himl->cMaxImage); SelectObject (himl->hdcImage, hbmNewImage); @@ -2615,7 +2599,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) himl->cCurImage++; } - if (himl->has_alpha && GetIconInfo (hBestFitIcon, &ii)) + if ((himl->flags & 0xfe) == ILC_COLOR32 && GetIconInfo (hBestFitIcon, &ii)) { HDC hdcImage = CreateCompatibleDC( 0 ); GetObjectW (ii.hbmMask, sizeof(BITMAP), &bmp); @@ -2940,16 +2924,8 @@ ImageList_SetImageCount (HIMAGELIST himl, UINT iImageCount) DeleteDC (hdcBitmap); - if (himl->has_alpha) - { - char *new_alpha = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->has_alpha, nNewCount ); - if (new_alpha) himl->has_alpha = new_alpha; - else - { - heap_free( himl->has_alpha ); - himl->has_alpha = NULL; - } - } + himl->item_flags = HeapReAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, himl->item_flags, + nNewCount * sizeof(*himl->item_flags)); /* Update max image count and current image count */ himl->cMaxImage = nNewCount; @@ -3292,7 +3268,7 @@ static ULONG WINAPI ImageListImpl_Release(IImageList2 *iface) if (This->hbrBlend50) DeleteObject (This->hbrBlend50); This->IImageList2_iface.lpVtbl = NULL; - heap_free(This->has_alpha); + heap_free(This->item_flags); heap_free(This); } @@ -3626,11 +3602,16 @@ static HRESULT WINAPI ImageListImpl_GetDragImage(IImageList2 *iface, POINT *ppt, return ret; } -static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, - DWORD *dwFlags) +static HRESULT WINAPI ImageListImpl_GetItemFlags(IImageList2 *iface, int i, DWORD *flags) { - FIXME("STUB: %p %d %p\n", iface, i, dwFlags); - return E_NOTIMPL; + HIMAGELIST This = impl_from_IImageList2(iface); + + if (i < 0 || i >= This->cCurImage) + return E_INVALIDARG; + + *flags = This->item_flags[i]; + + return S_OK; } static HRESULT WINAPI ImageListImpl_GetOverlayImage(IImageList2 *iface, int iOverlay, diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 984ca053c8..427ce1a84c 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -1502,6 +1502,9 @@ static void test_ImageList_DrawIndirect(void) UINT32 *bits = 0; UINT32 maskBits = 0x00000000, inverseMaskBits = 0xFFFFFFFF; int bpp, broken_value; + IImageList *imgl; + DWORD flags; + HRESULT hr; BITMAPINFO bitmapInfo = {{sizeof(BITMAPINFOHEADER), 2, 1, 1, 32, BI_RGB, 0, 0, 0, 0, 0}}; @@ -1524,6 +1527,9 @@ static void test_ImageList_DrawIndirect(void) ok(himl != 0, "ImageList_Create failed\n"); if(!himl) goto cleanup; + hr = pHIMAGELIST_QueryInterface(himl, &IID_IImageList, (void **) &imgl); + ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr); + /* Add a no-alpha image */ hbmImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_image); if(!hbmImage) goto cleanup; @@ -1532,6 +1538,16 @@ static void test_ImageList_DrawIndirect(void) ok(iImage != -1, "ImageList_Add failed\n"); if(iImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, 1000, &flags); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IImageList_GetItemFlags(imgl, 1000, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IImageList_GetItemFlags(imgl, iImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(!flags, "Unexpected flags %#x.\n", flags); + /* Add an alpha image */ hbmAlphaImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_alpha); if(!hbmAlphaImage) goto cleanup; @@ -1540,6 +1556,10 @@ static void test_ImageList_DrawIndirect(void) ok(iAlphaImage != -1, "ImageList_Add failed\n"); if(iAlphaImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, iAlphaImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(flags & ILIF_ALPHA, "Unexpected flags %#x.\n", flags); + /* Add a transparent alpha image */ hbmTransparentImage = create_test_bitmap(hdcDst, 2, 1, 32, bits_transparent); if(!hbmTransparentImage) goto cleanup; @@ -1548,6 +1568,10 @@ static void test_ImageList_DrawIndirect(void) ok(iTransparentImage != -1, "ImageList_Add failed\n"); if(iTransparentImage == -1) goto cleanup; + hr = IImageList_GetItemFlags(imgl, iTransparentImage, &flags); + ok(hr == S_OK, "Failed to get item flags, hr %#x.\n", hr); + ok(flags & ILIF_ALPHA, "Unexpected flags %#x.\n", flags); + /* 32-bit Tests */ bitmapInfo.bmiHeader.biBitCount = 32; hbmDst = CreateDIBSection(hdcDst, &bitmapInfo, DIB_RGB_COLORS, (void**)&bits, NULL, 0); @@ -1713,7 +1737,7 @@ static void test_iimagelist(void) if (!himl) return; - hr = (pHIMAGELIST_QueryInterface)(himl, &IID_IImageList, (void **) &imgl); + hr = pHIMAGELIST_QueryInterface(himl, &IID_IImageList, (void **) &imgl); ok(SUCCEEDED(hr), "HIMAGELIST_QueryInterface failed, hr=%x\n", hr); if (hr == S_OK) diff --git a/include/commoncontrols.idl b/include/commoncontrols.idl index 8cfcb56309..407274994e 100644 --- a/include/commoncontrols.idl +++ b/include/commoncontrols.idl @@ -63,7 +63,8 @@ cpp_quote("#endif") cpp_quote("HRESULT WINAPI ImageList_CoCreateInstance(REFCLSID,const IUnknown *, REFIID,void **);") -const UINT ILIF_ALPHA = 1; +cpp_quote("#define ILIF_ALPHA 0x00000001") +cpp_quote("#define ILIF_LOWQUALITY 0x00000002") [ uuid(46eb5926-582e-4017-9fdf-e8998daa0950),

1 0

Zebediah Figura : rpcrt4: Handle bare interfaces as top-level parameters.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: f4ee83c0ebf7d84ac46c9eac7f9c2eed07a32b3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f4ee83c0ebf7d84ac46c9eac… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 18 23:52:29 2020 -0500 rpcrt4: Handle bare interfaces as top-level parameters. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 22 ++++++++++++++++++++++ dlls/oleaut32/tests/tmarshal.idl | 4 ++++ dlls/rpcrt4/ndr_typelib.c | 11 +++++++++++ 3 files changed, 37 insertions(+) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 8710645c61..18e4b1b180 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -1291,6 +1291,12 @@ static HRESULT WINAPI Widget_iface_ptr(IWidget *iface, ISomethingFromDispatch ** return S_OK; } +static HRESULT WINAPI Widget_iface_noptr(IWidget *iface, IUnknown unk, IDispatch disp, ISomethingFromDispatch sfd) +{ + check_iface_marshal((IUnknown *)unk.lpVtbl, (IDispatch *)disp.lpVtbl, (ISomethingFromDispatch *)sfd.lpVtbl); + return S_OK; +} + static HRESULT WINAPI Widget_bstr(IWidget *iface, BSTR in, BSTR *out, BSTR *in_ptr, BSTR *in_out) { UINT len; @@ -1623,6 +1629,7 @@ static const struct IWidgetVtbl Widget_VTable = Widget_iface_in, Widget_iface_out, Widget_iface_ptr, + Widget_iface_noptr, Widget_bstr, Widget_variant, Widget_safearray, @@ -2169,6 +2176,9 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) ISomethingFromDispatch *sfd1, *sfd2, *sfd3, *proxy_sfd, *sfd_in, *sfd_out, *sfd_in_out; IUnknown *proxy_unk, *proxy_unk2, *unk_in, *unk_out, *unk_in_out; IDispatch *proxy_disp; + IUnknown unk_noptr; + IDispatch disp_noptr; + ISomethingFromDispatch sfd_noptr; HRESULT hr; testmode = 0; @@ -2251,6 +2261,18 @@ static void test_marshal_iface(IWidget *widget, IDispatch *disp) ok(!sfd_in_out, "Got [in, out] %p.\n", sfd_in_out); release_iface(sfd3); + sfd1 = create_disp_obj(); + sfd2 = create_disp_obj(); + sfd3 = create_disp_obj(); + unk_noptr.lpVtbl = (IUnknownVtbl *)sfd1; + disp_noptr.lpVtbl = (IDispatchVtbl *)sfd2; + sfd_noptr.lpVtbl = (ISomethingFromDispatchVtbl *)sfd3; + hr = IWidget_iface_noptr(widget, unk_noptr, disp_noptr, sfd_noptr); + ok(hr == S_OK, "Got hr %#x.\n", hr); + release_iface(sfd1); + release_iface(sfd2); + release_iface(sfd3); + /* Test with Invoke(). Note that since we pass VT_UNKNOWN, we don't get our * interface back, but rather an IUnknown. */ diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl index f1e040ed4d..1344aa4912 100644 --- a/dlls/oleaut32/tests/tmarshal.idl +++ b/dlls/oleaut32/tests/tmarshal.idl @@ -58,6 +58,7 @@ enum IWidget_dispids DISPID_TM_IFACE_IN, DISPID_TM_IFACE_OUT, DISPID_TM_IFACE_PTR, + DISPID_TM_IFACE_NOPTR, DISPID_TM_BSTR, DISPID_TM_VARIANT, DISPID_TM_SAFEARRAY, @@ -312,6 +313,9 @@ library TestTypelib [id(DISPID_TM_IFACE_PTR)] HRESULT iface_ptr([in] ISomethingFromDispatch **in, [out] ISomethingFromDispatch **out, [in, out] ISomethingFromDispatch **in_out); + [id(DISPID_TM_IFACE_NOPTR)] + HRESULT iface_noptr([in] IUnknown unk, [in] IDispatch disp, [in] ISomethingFromDispatch sfd); + [id(DISPID_TM_BSTR)] HRESULT bstr([in] BSTR in, [out] BSTR *out, [in] BSTR *in_ptr, [in, out] BSTR *in_out); diff --git a/dlls/rpcrt4/ndr_typelib.c b/dlls/rpcrt4/ndr_typelib.c index c90c60c7b8..462b235d33 100644 --- a/dlls/rpcrt4/ndr_typelib.c +++ b/dlls/rpcrt4/ndr_typelib.c @@ -810,6 +810,10 @@ static size_t write_type_tfs(ITypeInfo *typeinfo, unsigned char *str, break; case TKIND_INTERFACE: case TKIND_DISPATCH: + /* These are treated as if they were interface pointers. */ + off = *len; + write_ip_tfs(str, len, &attr->guid); + break; case TKIND_COCLASS: assert(0); break; @@ -1000,6 +1004,13 @@ static HRESULT get_param_info(ITypeInfo *typeinfo, TYPEDESC *tdesc, int is_in, hr = get_param_info(refinfo, &attr->tdescAlias, is_in, is_out, server_size, flags, basetype, tfs_tdesc); break; + + case TKIND_INTERFACE: + case TKIND_DISPATCH: + /* These are treated as if they were interface pointers. */ + *flags |= MustFree; + break; + default: FIXME("unhandled kind %#x\n", attr->typekind); hr = E_NOTIMPL;

1 0

Nikolay Sivov : mfplat: Fix packed byte width calculation for 2D buffer.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: 2863eb0251dfea273dcbe1adb39a8138422173af URL: https://source.winehq.org/git/wine.git/?a=commit;h=2863eb0251dfea273dcbe1ad… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 19 15:07:40 2020 +0300 mfplat: Fix packed byte width calculation for 2D buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 8 ++++---- dlls/mfplat/mediatype.c | 4 ++-- dlls/mfplat/mfplat_private.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 7039f93f57..65c23101e7 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -544,7 +544,7 @@ static HRESULT create_1d_buffer(DWORD max_length, DWORD alignment, IMFMediaBuffe static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bottom_up, IMFMediaBuffer **buffer) { - unsigned int bpp, max_length, plane_size; + unsigned int stride, max_length, plane_size; struct memory_buffer *object; unsigned int row_alignment; GUID subtype; @@ -560,7 +560,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = fourcc; - if (!(bpp = mf_format_get_bpp(&subtype, &is_yuv))) + if (!(stride = mf_format_get_stride(&subtype, width, &is_yuv))) return MF_E_INVALIDMEDIATYPE; if (is_yuv && bottom_up) @@ -586,7 +586,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo row_alignment = MF_64_BYTE_ALIGNMENT; } - pitch = ALIGN_SIZE(width * bpp, row_alignment); + pitch = ALIGN_SIZE(stride, row_alignment); switch (fourcc) { @@ -610,7 +610,7 @@ static HRESULT create_2d_buffer(DWORD width, DWORD height, DWORD fourcc, BOOL bo object->IMF2DBuffer2_iface.lpVtbl = &memory_2d_buffer_vtbl; object->_2d.plane_size = plane_size; - object->_2d.width = width * bpp; + object->_2d.width = stride; object->_2d.height = height; object->_2d.pitch = bottom_up ? -pitch : pitch; object->_2d.scanline0 = bottom_up ? object->data + pitch * (object->_2d.height - 1) : object->data; diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 5995454326..196d803722 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -1815,14 +1815,14 @@ static unsigned int mf_get_stride_for_format(const struct uncompressed_video_for return (width * format->bytes_per_pixel + format->alignment) & ~format->alignment; } -unsigned int mf_format_get_bpp(const GUID *subtype, BOOL *is_yuv) +unsigned int mf_format_get_stride(const GUID *subtype, unsigned int width, BOOL *is_yuv) { struct uncompressed_video_format *format = mf_get_video_format(subtype); if (format) { *is_yuv = format->yuv; - return format->bytes_per_pixel; + return mf_get_stride_for_format(format, width); } return 0; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 15d81a65b9..ad4958465a 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -115,7 +115,7 @@ static inline BOOL mf_array_reserve(void **elements, size_t *capacity, size_t co return TRUE; } -extern unsigned int mf_format_get_bpp(const GUID *subtype, BOOL *is_yuv) DECLSPEC_HIDDEN; +extern unsigned int mf_format_get_stride(const GUID *subtype, unsigned int width, BOOL *is_yuv) DECLSPEC_HIDDEN; static inline const char *debugstr_propvar(const PROPVARIANT *v) {

1 0

Gabriel Ivăncescu : include/winnt: Add more ACTCTX_COMPATIBILITY_ELEMENT_TYPE definitions and fix typo.
by Alexandre Julliard March 19, 2020

March 19, 2020

Module: wine Branch: master Commit: caff74f369e1c35228ef945cc16d5c412a22e227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=caff74f369e1c35228ef945c… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Mar 18 18:31:51 2020 +0200 include/winnt: Add more ACTCTX_COMPATIBILITY_ELEMENT_TYPE definitions and fix typo. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 2 +- dlls/ntdll/actctx.c | 2 +- include/winnt.h | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 01c6c1e627..2d942cdc98 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2851,7 +2851,7 @@ static void test_with_compat(HANDLE handle, DWORD num_compat, const GUID* expect wine_dbgstr_guid(&compat_info.Elements[n].Id), wine_dbgstr_guid(expected_compat[n]), n); - ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS, + ok_(__FILE__, line)(compat_info.Elements[n].Type == ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, "Wrong type, got %u for %u\n", (DWORD)compat_info.Elements[n].Type, n); } } diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index c513419828..b88e6dea07 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2397,7 +2397,7 @@ static void parse_supportedos_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, set_error( xmlbuf ); return; } - compat->Type = ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS; + compat->Type = ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS; compat->Id = compat_id; } else diff --git a/include/winnt.h b/include/winnt.h index 50a6213ef0..7a5b8aafc1 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6294,8 +6294,10 @@ typedef struct _ASSEMBLY_FILE_DETAILED_INFORMATION { typedef const ASSEMBLY_FILE_DETAILED_INFORMATION *PCASSEMBLY_FILE_DETAILED_INFORMATION; typedef enum { - ACTCX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, - ACTCX_COMPATIBILITY_ELEMENT_TYPE_OS + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_UNKNOWN = 0, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_OS, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_MITIGATION, + ACTCTX_COMPATIBILITY_ELEMENT_TYPE_MAXVERSIONTESTED } ACTCTX_COMPATIBILITY_ELEMENT_TYPE; typedef struct _COMPATIBILITY_CONTEXT_ELEMENT {

1 0