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

Hans Leidekker : winhttp: Escape untrusted URL paths.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

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

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

Aug. 24, 2018

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

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

Aug. 24, 2018

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

Rob Walker : winex11: Improve ChangeDisplaySettingsEx failed mode message.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

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

Alex Henrie : shell32: Add tree icon.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 1594905e8bb189255188ec1a03b150b010f3392c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1594905e8bb189255188ec1a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:50 2018 -0600 shell32: Add tree icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 5b23a8c..6b1a793 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -545,6 +545,10 @@ IDI_SHELL_START_MENU ICON resources/menu.ico /* @makedep: resources/optical_disc.ico */ IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/menu.ico */ +IDI_SHELL_TREE ICON resources/menu.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index a51a42e..7ab141a 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -210,6 +210,7 @@ #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 #define IDI_SHELL_MUSIC_CD 41 +#define IDI_SHELL_TREE 42 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

Alex Henrie : shell32: Add music CD icon.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: cb4181b0e4a504ab2e53e0cfe9d836d0711bbd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb4181b0e4a504ab2e53e0cf… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Aug 23 23:16:49 2018 -0600 shell32: Add music CD icon. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rc | 4 ++++ dlls/shell32/shresdef.h | 1 + 2 files changed, 5 insertions(+) diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc index 867e7c7..5b23a8c 100644 --- a/dlls/shell32/shell32.rc +++ b/dlls/shell32/shell32.rc @@ -541,6 +541,10 @@ IDI_SHELL_FONTS_FOLDER ICON resources/folder.ico /* @makedep: resources/menu.ico */ IDI_SHELL_START_MENU ICON resources/menu.ico +/* FIXME: Following resource is not yet added */ +/* @makedep: resources/optical_disc.ico */ +IDI_SHELL_MUSIC_CD ICON resources/optical_disc.ico + /* @makedep: resources/trash_file.ico */ IDI_SHELL_TRASH_FILE ICON resources/trash_file.ico diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h index 9fda9e1..a51a42e 100644 --- a/dlls/shell32/shresdef.h +++ b/dlls/shell32/shresdef.h @@ -209,6 +209,7 @@ #define IDI_SHELL_PRINTERS_FOLDER 38 #define IDI_SHELL_FONTS_FOLDER 39 #define IDI_SHELL_START_MENU 40 +#define IDI_SHELL_MUSIC_CD 41 #define IDI_SHELL_REMOTE_PRINTER 140 #define IDI_SHELL_TO_FILE_PRINTER 141 #define IDI_SHELL_TRASH_FILE 142

1 0

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

Aug. 24, 2018

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

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

Aug. 24, 2018

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

Nikolay Sivov : comctl32/tests: Fix test failures on XP.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: a5704991657800bc659ac5df44eb25f597bbda10 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5704991657800bc659ac5df… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Aug 24 12:57:08 2018 +0300 comctl32/tests: Fix test failures on XP. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index 14d814d..c60aa8a 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2225,8 +2225,8 @@ static void _check_item(HWND hwnd, HTREEITEM item, BOOL is_version_6, int line) else width = data->width; todo_wine - ok_(__FILE__, line)(width == (rect.right - rect.left), "Width %d, rect width %d.\n", - width, rect.right - rect.left); + ok_(__FILE__, line)(width == (rect.right - rect.left) || broken(is_version_6 && width == 0) /* XP */, + "Width %d, rect width %d.\n", width, rect.right - rect.left); } }

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness to process WM_GETMINMAXINFO.
by Alexandre Julliard Aug. 24, 2018

Aug. 24, 2018

Module: wine Branch: master Commit: 72644bb6031b82afee836b30093098586d9f5d3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=72644bb6031b82afee836b30… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:28:56 2018 +0200 user32: Switch to the window DPI awareness to process WM_GETMINMAXINFO. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 75b1452..267b7a6 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -748,6 +748,7 @@ static void WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow ) */ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) { + DPI_AWARENESS_CONTEXT context; MINMAXINFO MinMax; HMONITOR monitor; INT xinc, yinc; @@ -757,6 +758,8 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) RECT rc; WND *win; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + /* Compute default values */ GetWindowRect(hwnd, &rc); @@ -842,6 +845,7 @@ MINMAXINFO WINPOS_GetMinMaxInfo( HWND hwnd ) MinMax.ptMaxTrackSize.y = max( MinMax.ptMaxTrackSize.y, MinMax.ptMinTrackSize.y ); + SetThreadDpiAwarenessContext( context ); return MinMax; }

1 0