August 2018 - Wine-commits - list.winehq.org

Jacek Caban : widl: Split write_value for string and int values.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 68c43a5ad9106c165b5cd5513f8600bdfd82fa82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68c43a5ad9106c165b5cd551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 24 12:11:43 2018 +0200 widl: Split write_value for string and int values. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index b1f467d..98a788c 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1158,7 +1158,7 @@ static unsigned int get_ulong_val(unsigned int val, int vt) return val; } -static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *value) +static void write_int_value(msft_typelib_t *typelib, int *out, int vt, int value) { switch(vt) { case VT_I2: @@ -1176,7 +1176,7 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v case VT_UNKNOWN: case VT_DISPATCH: { - const unsigned int lv = get_ulong_val(*(const unsigned int *)value, vt); + const unsigned int lv = get_ulong_val(value, vt); if((lv & 0x3ffffff) == lv) { *out = 0x80000000; *out |= vt << 26; @@ -1184,33 +1184,31 @@ static void write_value(msft_typelib_t* typelib, int *out, int vt, const void *v } else { int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, 8, 0); *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; - memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], value, 4); + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &value, 4); *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6]) = 0x5757; *out = offset; } return; } - case VT_BSTR: - { - const char *s = (const char *) value; - int len = strlen(s), seg_len = (len + 6 + 3) & ~0x3; - int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, seg_len, 0); - *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; - memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &len, sizeof(len)); - memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], value, len); - len += 6; - while(len < seg_len) { - *((char *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+len]) = 0x57; - len++; - } - *out = offset; - return; - } default: warning("can't write value of type %d yet\n", vt); } - return; +} + +static void write_string_value(msft_typelib_t *typelib, int *out, const char *value) +{ + int len = strlen(value), seg_len = (len + 6 + 3) & ~0x3; + int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, seg_len, 0); + *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = VT_BSTR; + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &len, sizeof(len)); + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6], value, len); + len += 6; + while(len < seg_len) { + *((char *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+len]) = 0x57; + len++; + } + *out = offset; } static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, @@ -1228,7 +1226,10 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, guidentry.next_hash = -1; guidoffset = ctl2_alloc_guid(typelib, &guidentry); - write_value(typelib, &data_out, vt, value); + if(vt == VT_BSTR) + write_string_value(typelib, &data_out, value); + else + write_int_value(typelib, &data_out, vt, *(int*)value); custoffset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATAGUID, 12, 0); @@ -1499,12 +1500,12 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { if (vt != VT_BSTR) error("string default value applied to non-string type\n"); chat("default value '%s'\n", expr->u.sval); - write_value(typeinfo->typelib, defaultdata, vt, expr->u.sval); + write_string_value(typeinfo->typelib, defaultdata, expr->u.sval); } else { chat("default value %d\n", expr->cval); - write_value(typeinfo->typelib, defaultdata, vt, &expr->cval); + write_int_value(typeinfo->typelib, defaultdata, vt, expr->cval); } break; } @@ -1723,7 +1724,7 @@ static HRESULT add_var_desc(msft_typeinfo_t *typeinfo, UINT index, var_t* var) switch(typeinfo->typekind) { case TKIND_ENUM: - write_value(typeinfo->typelib, &typedata[4], VT_I4, &var->eval->cval); + write_int_value(typeinfo->typelib, &typedata[4], VT_I4, var->eval->cval); var_kind = 2; /* VAR_CONST */ var_type_size += 16; /* sizeof(VARIANT) */ typeinfo->datawidth = var_datawidth;

1 0

Jacek Caban : widl: Allow defaultvalue() attribute on any pointer type.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: bc6c2eb907e90cf29abcedb77f4bb840abea0231 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6c2eb907e90cf29abcedb7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Aug 24 12:12:02 2018 +0200 widl: Allow defaultvalue() attribute on any pointer type. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/write_msft.c | 130 +++++++++++++++++++++--------------------------- 1 file changed, 56 insertions(+), 74 deletions(-) diff --git a/tools/widl/write_msft.c b/tools/widl/write_msft.c index 98a788c..913e1a6 100644 --- a/tools/widl/write_msft.c +++ b/tools/widl/write_msft.c @@ -1160,39 +1160,17 @@ static unsigned int get_ulong_val(unsigned int val, int vt) static void write_int_value(msft_typelib_t *typelib, int *out, int vt, int value) { - switch(vt) { - case VT_I2: - case VT_I4: - case VT_R4: - case VT_BOOL: - case VT_I1: - case VT_UI1: - case VT_UI2: - case VT_UI4: - case VT_INT: - case VT_UINT: - case VT_HRESULT: - case VT_PTR: - case VT_UNKNOWN: - case VT_DISPATCH: - { - const unsigned int lv = get_ulong_val(value, vt); - if((lv & 0x3ffffff) == lv) { - *out = 0x80000000; - *out |= vt << 26; - *out |= lv; - } else { - int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, 8, 0); - *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; - memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &value, 4); - *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6]) = 0x5757; - *out = offset; - } - return; - } - - default: - warning("can't write value of type %d yet\n", vt); + const unsigned int lv = get_ulong_val(value, vt); + if ((lv & 0x3ffffff) == lv) { + *out = 0x80000000; + *out |= vt << 26; + *out |= lv; + } else { + int offset = ctl2_alloc_segment(typelib, MSFT_SEG_CUSTDATA, 8, 0); + *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset]) = vt; + memcpy(&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+2], &value, 4); + *((unsigned short *)&typelib->typelib_segment_data[MSFT_SEG_CUSTDATA][offset+6]) = 0x5757; + *out = offset; } } @@ -1211,6 +1189,50 @@ static void write_string_value(msft_typelib_t *typelib, int *out, const char *va *out = offset; } +static void write_default_value(msft_typelib_t *typelib, type_t *type, expr_t *expr, int *out) +{ + int vt; + + if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) { + if (get_type_vt(type) != VT_BSTR) + error("string default value applied to non-string type\n"); + chat("default value '%s'\n", expr->u.sval); + write_string_value(typelib, out, expr->u.sval); + return; + } + + if (type_get_type(type) == TYPE_ENUM) { + vt = VT_I4; + } else if (is_ptr(type)) { + vt = get_type_vt(type_pointer_get_ref(type)); + if (vt == VT_USERDEFINED) + vt = VT_I4; + if (expr->cval) + warning("non-null pointer default value\n"); + } else { + vt = get_type_vt(type); + switch(vt) { + case VT_I2: + case VT_I4: + case VT_R4: + case VT_BOOL: + case VT_I1: + case VT_UI1: + case VT_UI2: + case VT_UI4: + case VT_INT: + case VT_UINT: + case VT_HRESULT: + break; + default: + warning("can't write value of type %d yet\n", vt); + return; + } + } + + write_int_value(typelib, out, vt, expr->cval); +} + static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, int vt, const void *value, int *offset) { @@ -1242,33 +1264,6 @@ static HRESULT set_custdata(msft_typelib_t *typelib, REFGUID guid, return S_OK; } -/* It's possible to have a default value for pointer arguments too. - In this case default value has a referenced type, e.g. - 'LONG*' argument gets VT_I4, 'DOUBLE*' - VT_R8. IUnknown* and IDispatch* - are recognised too and stored as VT_UNKNOWN and VT_DISPATCH. - But IUnknown/IDispatch arguments can only have default value of 0 - (or expression that resolves to zero) while other pointers can have - any default value. */ -static int get_defaultvalue_vt(type_t *type) -{ - int vt; - if (type_get_type(type) == TYPE_ENUM) - vt = VT_I4; - else - { - vt = get_type_vt(type); - if (vt == VT_PTR && is_ptr(type)) { - vt = get_type_vt(type_pointer_get_ref(type)); - /* The only acceptable value for pointers to non-basic types - is NULL, it's stored as VT_I4 for both 32 and 64 bit typelibs. */ - if (vt == VT_USERDEFINED) - vt = VT_I4; - } - } - - return vt; -} - static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) { int offset, name_offset; @@ -1492,21 +1487,8 @@ static HRESULT add_func_desc(msft_typeinfo_t* typeinfo, var_t *func, int index) switch(attr->type) { case ATTR_DEFAULTVALUE: { - int vt; - expr_t *expr = (expr_t *)attr->u.pval; - vt = get_defaultvalue_vt(arg->type); paramflags |= 0x30; /* PARAMFLAG_FHASDEFAULT | PARAMFLAG_FOPT */ - if (expr->type == EXPR_STRLIT || expr->type == EXPR_WSTRLIT) - { - if (vt != VT_BSTR) error("string default value applied to non-string type\n"); - chat("default value '%s'\n", expr->u.sval); - write_string_value(typeinfo->typelib, defaultdata, expr->u.sval); - } - else - { - chat("default value %d\n", expr->cval); - write_int_value(typeinfo->typelib, defaultdata, vt, expr->cval); - } + write_default_value(typeinfo->typelib, arg->type, (expr_t *)attr->u.pval, defaultdata); break; } case ATTR_IN:

1 0

Hans Leidekker : winhttp: Escape untrusted URL paths.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 498042e0eeac12d6ee99a1cbada2ef2bd7b05131 URL: https://source.winehq.org/git/wine.git/?a=commit;h=498042e0eeac12d6ee99a1cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Aug 24 13:32:42 2018 +0200 winhttp: Escape untrusted URL paths. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 24 ++++++++++----------- dlls/winhttp/session.c | 8 +++---- dlls/winhttp/tests/url.c | 1 + dlls/winhttp/tests/winhttp.c | 40 ++++++++++++++++++++++++++++++++++ dlls/winhttp/url.c | 49 ++++++++++++++++++++++++------------------ dlls/winhttp/winhttp_private.h | 1 + 6 files changed, 86 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=498042e0eeac12d6ee99…

1 0

Rob Walker : winex11: Improve ChangeDisplaySettingsEx failed mode message.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 70fbfa2cb8198f86efa19eda91cf769056b7da2c URL: https://source.winehq.org/git/wine.git/?a=commit;h=70fbfa2cb8198f86efa19eda… Author: Rob Walker <bob.mt.wya(a)gmail.com> Date: Tue Aug 14 23:01:07 2018 +0100 winex11: Improve ChangeDisplaySettingsEx failed mode message. The failed mode error message dumps all the mode fields, that were being tested. Change this output so that only the mode fields explicitly being matched against are displayed. Make the failed message use formatting consist with the trace message, earlier in this function. Signed-off-by: Rob Walker <bob.mt.wya(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/settings.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/settings.c b/dlls/winex11.drv/settings.c index afa26cf..800b65d 100644 --- a/dlls/winex11.drv/settings.c +++ b/dlls/winex11.drv/settings.c @@ -345,6 +345,7 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, DWORD i, dwBpp = 0; DEVMODEW dm; BOOL def_mode = TRUE; + char bpp_buffer[16], freq_buffer[18]; TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid); TRACE("flags=%s\n",_CDS_flags(flags)); @@ -422,9 +423,14 @@ LONG CDECL X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode, return DISP_CHANGE_SUCCESSFUL; } - /* no valid modes found */ - ERR("No matching mode found %ux%ux%u @%u! (%s)\n", - devmode->dmPelsWidth, devmode->dmPelsHeight, - devmode->dmBitsPerPel, devmode->dmDisplayFrequency, handler_name); + /* no valid modes found, only print the fields we were trying to matching against */ + bpp_buffer[0] = freq_buffer[0] = 0; + if (devmode->dmFields & DM_BITSPERPEL) + sprintf(bpp_buffer, "bpp=%u ", devmode->dmBitsPerPel); + if ((devmode->dmFields & DM_DISPLAYFREQUENCY) && (devmode->dmDisplayFrequency != 0)) + sprintf(freq_buffer, "freq=%u ", devmode->dmDisplayFrequency); + ERR("No matching mode found: width=%d height=%d %s%s(%s)\n", + devmode->dmPelsWidth, devmode->dmPelsHeight, bpp_buffer, freq_buffer, handler_name); + return DISP_CHANGE_BADMODE; }

1 0

Dmitry Timoshkov : oleaut32/tests: Fix the IPicture::Render() usage.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 4b525aa0a4eb8bd60e0f9a2f9eb5f4598aa87a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b525aa0a4eb8bd60e0f9a2f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:02 2018 +0800 oleaut32/tests: Fix the IPicture::Render() usage. When one specifies the target rectangle (0, 0, width, -height) IPicture::Render() places the origin at 0,0 and flips the image vertically. This means that in order to paint an icon on the DC it's necessary to specify the rectangle (0, height, width, -height), i.e. place the origin at 0,height. I've written a test app that verifies this behaviour, ufortunately I don't see a way to add a Wine test case for this. The test currently works by chance under Windows because in case of (0, 0, width, -height) IPicture::Render() draws black rectangle instead of an icon at (0, 0, width, height). If Wine intends to replicate this behaviour it should be fixed by a separate patch. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/olepicture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c06cec1..6a5f7ee 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -864,7 +864,7 @@ static void test_Render(void) SetPixelV(hdc, 10, 10, 0x00223344); expected = GetPixel(hdc, 0, 0); - hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, 0, pWidth, -pHeight, NULL); + hres = picture_render(pic, hdc, 1, 1, 9, 9, 0, pHeight, pWidth, -pHeight, NULL); ole_expect(hres, S_OK); if(hres != S_OK) goto done;

1 0

Dmitry Timoshkov : oleaut32: Move rendering a bitmap to a separate helper.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 293a6790767d158ab36ac339fa5a45bd04e440ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=293a6790767d158ab36ac339… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:06 2018 +0800 oleaut32: Move rendering a bitmap to a separate helper. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 103 ++++++++++++++++++++++++++++----------------- 1 file changed, 64 insertions(+), 39 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a2a54bd..aa82b05 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -610,6 +610,55 @@ static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface, return S_OK; } +static void render_masked_bitmap(OLEPictureImpl *This, HDC hdc, + LONG x, LONG y, LONG cx, LONG cy, OLE_XPOS_HIMETRIC xSrc, OLE_YPOS_HIMETRIC ySrc, + OLE_XSIZE_HIMETRIC cxSrc, OLE_YSIZE_HIMETRIC cySrc, HBITMAP hbmMask, HBITMAP hbmXor) +{ + HBITMAP hbmpOld; + HDC hdcBmp; + + /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. + * NB y-axis gets flipped + */ + + hdcBmp = CreateCompatibleDC(0); + SetMapMode(hdcBmp, MM_ANISOTROPIC); + SetWindowOrgEx(hdcBmp, 0, 0, NULL); + SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); + SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); + + if (hbmMask) + { + HDC hdcMask = CreateCompatibleDC(0); + HBITMAP hOldbm = SelectObject(hdcMask, hbmMask); + + hbmpOld = SelectObject(hdcBmp, hbmXor); + + SetMapMode(hdcMask, MM_ANISOTROPIC); + SetWindowOrgEx(hdcMask, 0, 0, NULL); + SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); + SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); + SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); + + SetBkColor(hdc, RGB(255, 255, 255)); + SetTextColor(hdc, RGB(0, 0, 0)); + StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); + + SelectObject(hdcMask, hOldbm); + DeleteDC(hdcMask); + } + else + { + hbmpOld = SelectObject(hdcBmp, hbmXor); + StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); + } + + SelectObject(hdcBmp, hbmpOld); + DeleteDC(hdcBmp); +} + /************************************************************************ * OLEPictureImpl_Render */ @@ -643,48 +692,24 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, /* nothing to do */ return S_OK; case PICTYPE_BITMAP: - { - HBITMAP hbmpOld; - HDC hdcBmp; - - /* Set a mapping mode that maps bitmap pixels into HIMETRIC units. - NB y-axis gets flipped */ - - hdcBmp = CreateCompatibleDC(0); - SetMapMode(hdcBmp, MM_ANISOTROPIC); - SetWindowOrgEx(hdcBmp, 0, 0, NULL); - SetWindowExtEx(hdcBmp, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcBmp, 0, This->origHeight, NULL); - SetViewportExtEx(hdcBmp, This->origWidth, -This->origHeight, NULL); - - if (This->hbmMask) { - HDC hdcMask = CreateCompatibleDC(0); - HBITMAP hOldbm = SelectObject(hdcMask, This->hbmMask); - - hbmpOld = SelectObject(hdcBmp, This->hbmXor); - - SetMapMode(hdcMask, MM_ANISOTROPIC); - SetWindowOrgEx(hdcMask, 0, 0, NULL); - SetWindowExtEx(hdcMask, This->himetricWidth, This->himetricHeight, NULL); - SetViewportOrgEx(hdcMask, 0, This->origHeight, NULL); - SetViewportExtEx(hdcMask, This->origWidth, -This->origHeight, NULL); - - SetBkColor(hdc, RGB(255, 255, 255)); - SetTextColor(hdc, RGB(0, 0, 0)); - StretchBlt(hdc, x, y, cx, cy, hdcMask, xSrc, ySrc, cxSrc, cySrc, SRCAND); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCPAINT); - - SelectObject(hdcMask, hOldbm); - DeleteDC(hdcMask); - } else { - hbmpOld = SelectObject(hdcBmp, This->desc.u.bmp.hbitmap); - StretchBlt(hdc, x, y, cx, cy, hdcBmp, xSrc, ySrc, cxSrc, cySrc, SRCCOPY); - } + { + HBITMAP hbmMask, hbmXor; - SelectObject(hdcBmp, hbmpOld); - DeleteDC(hdcBmp); + if (This->hbmMask) + { + hbmMask = This->hbmMask; + hbmXor = This->hbmXor; + } + else + { + hbmMask = 0; + hbmXor = This->desc.u.bmp.hbitmap; } + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, hbmMask, hbmXor); break; + } + case PICTYPE_ICON: FIXME("Not quite correct implementation of rendering icons...\n"); DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL);

1 0

Dmitry Timoshkov : oleaut32: Use common helper for masked bitmaps to render an icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 3dcd048175914e7b5c372b5dc201c517028f0f64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3dcd048175914e7b5c372b5d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Aug 24 16:04:09 2018 +0800 oleaut32: Use common helper for masked bitmaps to render an icon. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/olepicture.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index aa82b05..0ef0ecf 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -711,9 +711,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc, } case PICTYPE_ICON: - FIXME("Not quite correct implementation of rendering icons...\n"); - DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL); + { + ICONINFO info; + + if (!GetIconInfo(This->desc.u.icon.hicon, &info)) + return E_FAIL; + + render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor); + + DeleteObject(info.hbmMask); + if (info.hbmColor) DeleteObject(info.hbmColor); break; + } case PICTYPE_METAFILE: {

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 sleep icons.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 13d2264e731a7e63e7b9e8fa2b03b1a02027f923 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13d2264e731a7e63e7b9e8fa… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:45 2018 -0600 shell32: Scale SVG properly to create 48x48 sleep icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/sleep.ico | Bin 65140 -> 65140 bytes dlls/shell32/resources/sleep.svg | 244 ++++++++++++++++++--------------------- 2 files changed, 112 insertions(+), 132 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=13d2264e731a7e63e7b9…

1 0

Alex Henrie : shell32: Scale SVG properly to create 48x48 shutdown icons.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: c49c12b2cdcfffc9b825c0b2190e9a7425cec949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c49c12b2cdcfffc9b825c0b2… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:46 2018 -0600 shell32: Scale SVG properly to create 48x48 shutdown icons. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/resources/shut_down.ico | Bin 38405 -> 38405 bytes dlls/shell32/resources/shut_down.svg | 94 ++++++++++++++++++----------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/dlls/shell32/resources/shut_down.ico b/dlls/shell32/resources/shut_down.ico index cb6aa9c..c8b9f43 100644 Binary files a/dlls/shell32/resources/shut_down.ico and b/dlls/shell32/resources/shut_down.ico differ diff --git a/dlls/shell32/resources/shut_down.svg b/dlls/shell32/resources/shut_down.svg index e637059..c1c2fd3 100644 --- a/dlls/shell32/resources/shut_down.svg +++ b/dlls/shell32/resources/shut_down.svg @@ -634,29 +634,30 @@ height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-8" x="328" @@ -666,29 +667,30 @@ aWZ5ADIwMDYtMDYtMTNUMDU6Mzk6MjYtMDY6MDB7C1PbAAAAAElFTkSuQmCC height="48" preserveAspectRatio="none" xlink:href="data:image/png;base64,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 +TkuKUCky5HzEOXXwCj9R4EKEEjQ4YxWNawBL71YCQBxiCwAqfg0wor8G4EABNPWw1ipyGwDkCqBK +kWkr04rBepObMlDrDMgjO0cS3HdoIEGBOoO3Gan1K2yNAVGhdmhQxq8Bhkx5S1k+Y0ymHkbTzaCM +vLmKduixpw7O2GkRuaNMKwZSM5yQkSjLBROKWpkaVUstGpQMXI3BYg1AM3Cqn26ggajdMScNAPWX +/hYMdKtIGDGsxTJljGMZWoWL2uQp74NSYomMRkxqDC6wy4BDpooBp7WKimCsQY89ztcAdpgw4AUX +AkDc6DteOE29KCVnTs4wyviCJX3mITUu8tDBoOqnGuAvHnDMbtjJ+Jl9+hTM/RMukfsODSoIp4yE +fXJl9xShT8HCAziaemkDQCVZ3Ab6PONA3Rcy9pixjD4bm5LUALBepsJdfuGQBIvFAoY+VyhIMeQk +tH+DtDDQVZRRcJ1DZlgSLAZLgiOnR+JfmxuK3JwiyMnpMyb37lcQfQxg16w3YlA07I1abLsAbJl3 +p7aTLb/rHFZ1sKqmPMDn5GT0QjyWHgWCw1HUZt4wF0xUWo7rDP7hFb8zjGp4wtjXTFk7q7lSIK51 +wXIxAAgJAx7y1NQ0+M4M5TJ7nPjsW3aJ27f+FBB1lb8GQ8qA33jMnbrI33PZiHzMu4rHtkOY84Bf ++dq8pFQ3Gh/wiVw6s/OVO8cffGkOXsvLm/H/jv8AeTNp0HBGM0YAAAAUdEVYdEF1dGhvcgBKYWt1 +YiBTdGVpbmVy5vv3LwAAAFh0RVh0Q29weXJpZ2h0AENDMCBQdWJsaWMgRG9tYWluIERlZGljYXRp +b24gaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvcHVibGljZG9tYWluL3plcm8vMS4wL8bjvfkA +AAAldEVYdGRhdGU6Y3JlYXRlADIwMTgtMDgtMjNUMjI6MjI6NTctMDY6MDCUsdROAAAAJXRFWHRk +YXRlOm1vZGlmeQAyMDE4LTA4LTIzVDIyOjIyOjU3LTA2OjAw5exs8gAAABl0RVh0U29mdHdhcmUA +d3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAAhdEVYdFNvdXJjZQBodHRwOi8vamltbWFjLm11c2ljaGFs +bC5jemlm414AAAAVdEVYdFRpdGxlAFN5c3RlbSBTaHV0ZG93bt6238UAAAAASUVORK5CYII= " id="icon:48-4" x="384"

1 0

Alex Henrie : shell32: Add start menu icon.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: f2252757baf9720b6d762d6827362d1921a3140a URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2252757baf9720b6d762d68… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:47 2018 -0600 shell32: Add start menu icon. Adapted from list-remove.svg in the Tango Icon Library. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/Makefile.in | 1 + dlls/shell32/resources/menu.ico | Bin 0 -> 34002 bytes dlls/shell32/resources/menu.svg | 631 ++++++++++++++++++++++++++++++++++++++++ dlls/shell32/shell32.rc | 3 + dlls/shell32/shresdef.h | 1 + 5 files changed, 636 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f2252757baf9720b6d76…

1 0