wine-commits August 2018

wine-commits@winehq.org

2 participants
618 discussions

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

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

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

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

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

24 Aug '18

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

Zhiyi Zhang : winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION.
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: b55f5683833059abfea714d59e4799204dcc39f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b55f5683833059abfea714d5… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 24 16:32:49 2018 +0800 winhttp: Add support for WINHTTP_ENABLE_SSL_REVOCATION. This also fixes a regression caused by 0b61334b9d6392e8c8a9772d762efaf0c2eb0835, which is causing Office 2013 to fail to login, saying that there is a problem with your account. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 14 ++++++++------ dlls/winhttp/request.c | 2 +- dlls/winhttp/session.c | 12 ++++++++++++ dlls/winhttp/tests/winhttp.c | 31 +++++++++++++++++++++++++++++++ dlls/winhttp/winhttp_private.h | 3 ++- 5 files changed, 54 insertions(+), 8 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index d577a64..2625e4a 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -160,7 +160,7 @@ static int sock_recv(int fd, void *msg, size_t len, int flags) return ret; } -static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags ) +static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD security_flags, BOOL check_revocation ) { HCERTSTORE store = cert->hCertStore; BOOL ret; @@ -173,9 +173,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu TRACE("verifying %s\n", debugstr_w( server )); chainPara.RequestedUsage.Usage.cUsageIdentifier = 1; chainPara.RequestedUsage.Usage.rgpszUsageIdentifier = server_auth; - if ((ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, - CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT, - NULL, &chain ))) + ret = CertGetCertificateChain( NULL, cert, NULL, store, &chainPara, + check_revocation ? CERT_CHAIN_REVOCATION_CHECK_CHAIN_EXCLUDE_ROOT : 0, + NULL, &chain ); + if (ret) { if (chain->TrustStatus.dwErrorStatus) { @@ -370,7 +371,8 @@ BOOL netconn_close( netconn_t *conn ) return TRUE; } -BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle ) +BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_flags, CredHandle *cred_handle, + BOOL check_revocation) { SecBuffer out_buf = {0, SECBUFFER_TOKEN, NULL}, in_bufs[2] = {{0, SECBUFFER_TOKEN}, {0, SECBUFFER_EMPTY}}; SecBufferDesc out_desc = {SECBUFFER_VERSION, 1, &out_buf}, in_desc = {SECBUFFER_VERSION, 2, in_bufs}; @@ -466,7 +468,7 @@ BOOL netconn_secure_connect( netconn_t *conn, WCHAR *hostname, DWORD security_fl status = QueryContextAttributesW(&ctx, SECPKG_ATTR_REMOTE_CERT_CONTEXT, (void*)&cert); if(status == SEC_E_OK) { - res = netconn_verify_cert(cert, hostname, security_flags); + res = netconn_verify_cert(cert, hostname, security_flags, check_revocation); CertFreeCertificateContext(cert); if(res != ERROR_SUCCESS) { WARN("cert verify failed: %u\n", res); diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 5e5b229..65d641f 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1769,7 +1769,7 @@ static BOOL open_connection( request_t *request ) if (!ensure_cred_handle( connect->session ) || !netconn_secure_connect( netconn, connect->hostname, request->security_flags, - &connect->session->cred_handle )) + &connect->session->cred_handle, request->check_revocation )) { heap_free( addressW ); netconn_close( netconn ); diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index fb81568..788f7c6 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1020,6 +1020,18 @@ static BOOL request_set_option( object_header_t *hdr, DWORD option, LPVOID buffe } FIXME("WINHTTP_OPTION_CLIENT_CERT_CONTEXT\n"); return TRUE; + case WINHTTP_OPTION_ENABLE_FEATURE: + if(buflen == sizeof( DWORD ) && *(DWORD *)buffer == WINHTTP_ENABLE_SSL_REVOCATION) + { + request->check_revocation = TRUE; + SetLastError( NO_ERROR ); + return TRUE; + } + else + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } default: FIXME("unimplemented option %u\n", option); set_last_error( ERROR_WINHTTP_INVALID_OPTION ); diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index c9e053f..2e903e1 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -201,6 +201,37 @@ static void test_QueryOption(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + feature = 0xdeadbeef; + size = sizeof(feature); + SetLastError(0xdeadbeef); + ret = WinHttpQueryOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, &size); + ok(!ret, "should fail to query enabled features for a request\n"); + ok(feature == 0xdeadbeef, "expect feature 0xdeadbeef, got %u\n", feature); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + feature = WINHTTP_ENABLE_SSL_REVOCATION; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, 0, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, 0); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(ret, "failed to set feature\n"); + ok(GetLastError() == NO_ERROR || broken(GetLastError() == 0xdeadbeef), /* Doesn't set error code on Vista or older */ + "expected NO_ERROR, got %u\n", GetLastError()); + + feature = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = WinHttpSetOption(request, WINHTTP_OPTION_ENABLE_FEATURE, &feature, sizeof(feature)); + ok(!ret, "should fail to enable WINHTTP_ENABLE_SSL_REVOCATION with invalid parameters\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + SetLastError(0xdeadbeef); ret = WinHttpCloseHandle(request); ok(ret, "WinHttpCloseHandle failed on closing request: %u\n", GetLastError()); diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index d639a2d..f1aa562 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -210,6 +210,7 @@ typedef struct DWORD optional_len; netconn_t *netconn; DWORD security_flags; + BOOL check_revocation; const CERT_CONTEXT *server_cert; int resolve_timeout; int connect_timeout; @@ -306,7 +307,7 @@ void netconn_unload( void ) DECLSPEC_HIDDEN; ULONG netconn_query_data_available( netconn_t * ) DECLSPEC_HIDDEN; BOOL netconn_recv( netconn_t *, void *, size_t, int, int * ) DECLSPEC_HIDDEN; BOOL netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; -BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle * ) DECLSPEC_HIDDEN; +BOOL netconn_secure_connect( netconn_t *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; BOOL netconn_send( netconn_t *, const void *, size_t, int * ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( netconn_t *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( netconn_t * ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness in update_window_state().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 56b05ded78665feef68184b9409cbc0f6cd80905 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56b05ded78665feef68184b9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:35:16 2018 +0200 user32: Switch to the window DPI awareness in update_window_state(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index e3edbf6..e7bbc4e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -446,13 +446,16 @@ static void send_parent_notify( HWND hwnd, UINT msg ) */ static void update_window_state( HWND hwnd ) { + DPI_AWARENESS_CONTEXT context; RECT window_rect, client_rect, valid_rects[2]; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, &client_rect ); valid_rects[0] = valid_rects[1] = client_rect; set_window_pos( hwnd, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOCLIENTSIZE | SWP_NOCLIENTMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW, &window_rect, &client_rect, valid_rects ); + SetThreadDpiAwarenessContext( context ); }

1 0

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

24 Aug '18

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

Alexandre Julliard : user32: Switch to the window DPI awareness in ShowWindow().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 0da23418abf63f8c2abe5e0e328d5fb4daa9dfb7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da23418abf63f8c2abe5e0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:29:40 2018 +0200 user32: Switch to the window DPI awareness in ShowWindow(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winpos.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/dlls/user32/winpos.c b/dlls/user32/winpos.c index 98eec62..75b1452 100644 --- a/dlls/user32/winpos.c +++ b/dlls/user32/winpos.c @@ -1066,6 +1066,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) { WND *wndPtr; HWND parent; + DPI_AWARENESS_CONTEXT context; LONG style = GetWindowLongW( hwnd, GWL_STYLE ); BOOL wasVisible = (style & WS_VISIBLE) != 0; BOOL showFlag = TRUE; @@ -1074,10 +1075,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) TRACE("hwnd=%p, cmd=%d, wasVisible %d\n", hwnd, cmd, wasVisible); + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + switch(cmd) { case SW_HIDE: - if (!wasVisible) return FALSE; + if (!wasVisible) goto done; showFlag = FALSE; swp |= SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; @@ -1091,14 +1094,14 @@ static BOOL show_window( HWND hwnd, INT cmd ) case SW_SHOWMINIMIZED: swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); - if ((style & WS_MINIMIZE) && wasVisible) return TRUE; + if ((style & WS_MINIMIZE) && wasVisible) goto done; break; case SW_SHOWMAXIMIZED: /* same as SW_MAXIMIZE */ if (!wasVisible) swp |= SWP_SHOWWINDOW; swp |= SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, SW_MAXIMIZE, &newPos ); - if ((style & WS_MAXIMIZE) && wasVisible) return TRUE; + if ((style & WS_MAXIMIZE) && wasVisible) goto done; break; case SW_SHOWNA: @@ -1106,7 +1109,7 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (style & WS_CHILD) swp |= SWP_NOZORDER; break; case SW_SHOW: - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; @@ -1126,19 +1129,19 @@ static BOOL show_window( HWND hwnd, INT cmd ) } else { - if (wasVisible) return TRUE; + if (wasVisible) goto done; swp |= SWP_NOSIZE | SWP_NOMOVE; } if (style & WS_CHILD && !(swp & SWP_STATECHANGED)) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; default: - return wasVisible; + goto done; } if ((showFlag != wasVisible || cmd == SW_SHOWNA) && cmd != SW_SHOWMAXIMIZED && !(swp & SWP_STATECHANGED)) { SendMessageW( hwnd, WM_SHOWWINDOW, showFlag, 0 ); - if (!IsWindow( hwnd )) return wasVisible; + if (!IsWindow( hwnd )) goto done; } swp = USER_Driver->pShowWindow( hwnd, cmd, &newPos, swp ); @@ -1176,12 +1179,12 @@ static BOOL show_window( HWND hwnd, INT cmd ) if (parent == GetDesktopWindow()) parent = 0; SetFocus(parent); } - return wasVisible; + goto done; } if (IsIconic(hwnd)) WINPOS_ShowIconTitle( hwnd, TRUE ); - if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) return wasVisible; + if (!(wndPtr = WIN_GetPtr( hwnd )) || wndPtr == WND_OTHER_PROCESS) goto done; if (wndPtr->flags & WIN_NEED_SIZE) { @@ -1209,6 +1212,8 @@ static BOOL show_window( HWND hwnd, INT cmd ) /* if previous state was minimized Windows sets focus to the window */ if (style & WS_MINIMIZE) SetFocus( hwnd ); +done: + SetThreadDpiAwarenessContext( context ); return wasVisible; }

1 0

Alexandre Julliard : user32: Switch to the window DPI awareness in SetParent().
by Alexandre Julliard 24 Aug '18

24 Aug '18

Module: wine Branch: master Commit: 3bf279e7dabf80e2116bfd0956b390824d47394d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bf279e7dabf80e2116bfd09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 24 12:28:44 2018 +0200 user32: Switch to the window DPI awareness in SetParent(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/win.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d9ef151..e3edbf6 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3121,6 +3121,7 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) BOOL was_visible; WND *wndPtr; BOOL ret; + DPI_AWARENESS_CONTEXT context; RECT window_rect, old_screen_rect, new_screen_rect; TRACE("(%p %p)\n", hwnd, parent); @@ -3164,8 +3165,11 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) wndPtr = WIN_GetPtr( hwnd ); if (!wndPtr || wndPtr == WND_OTHER_PROCESS || wndPtr == WND_DESKTOP) return 0; + context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); WIN_GetRectangles( hwnd, COORDS_PARENT, &window_rect, NULL ); + SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); WIN_GetRectangles( hwnd, COORDS_SCREEN, &old_screen_rect, NULL ); + SetThreadDpiAwarenessContext( context ); SERVER_START_REQ( set_parent ) { @@ -3184,6 +3188,10 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) WIN_ReleasePtr( wndPtr ); if (!ret) return 0; + context = SetThreadDpiAwarenessContext( DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE ); + WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); + SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd )); + USER_Driver->pSetParent( full_handle, parent, old_parent ); winpos.hwnd = hwnd; @@ -3194,12 +3202,12 @@ HWND WINAPI SetParent( HWND hwnd, HWND parent ) winpos.cy = 0; winpos.flags = SWP_NOSIZE; - WIN_GetRectangles( hwnd, COORDS_SCREEN, &new_screen_rect, NULL ); USER_SetWindowPos( &winpos, new_screen_rect.left - old_screen_rect.left, new_screen_rect.top - old_screen_rect.top ); if (was_visible) ShowWindow( hwnd, SW_SHOW ); + SetThreadDpiAwarenessContext( context ); return old_parent; }

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
62
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 August 2018