January 2022 - Wine-Commits

Paul Gofman : winhttp: Use separate SSL read and write buffers.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 25bd67465d388c301188e0845534447b850d1f08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25bd67465d388c301188e084… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 20 18:35:31 2022 +0300 winhttp: Use separate SSL read and write buffers. Signed-off-by: Paul Gofman <pgofman(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 | 34 +++++++++++++++++++++------------- dlls/winhttp/winhttp_private.h | 2 +- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 3016608404a..68aee036734 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -250,7 +250,8 @@ void netconn_close( struct netconn *conn ) if (conn->secure) { free( conn->peek_msg_mem ); - free(conn->ssl_buf); + free(conn->ssl_read_buf); + free(conn->ssl_write_buf); free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } @@ -365,8 +366,13 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur break; } - conn->ssl_buf = malloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); - if(!conn->ssl_buf) { + conn->ssl_read_buf = malloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); + if(!conn->ssl_read_buf) { + res = ERROR_OUTOFMEMORY; + break; + } + conn->ssl_write_buf = malloc(conn->ssl_sizes.cbHeader + conn->ssl_sizes.cbMaximumMessage + conn->ssl_sizes.cbTrailer); + if(!conn->ssl_write_buf) { res = ERROR_OUTOFMEMORY; break; } @@ -377,8 +383,10 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur if(status != SEC_E_OK || res != ERROR_SUCCESS) { WARN("Failed to initialize security context: %08x\n", status); - free(conn->ssl_buf); - conn->ssl_buf = NULL; + free(conn->ssl_read_buf); + conn->ssl_read_buf = NULL; + free(conn->ssl_write_buf); + conn->ssl_write_buf = NULL; DeleteSecurityContext(&ctx); return ERROR_WINHTTP_SECURE_CHANNEL_ERROR; } @@ -393,9 +401,9 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur static DWORD send_ssl_chunk( struct netconn *conn, const void *msg, size_t size ) { SecBuffer bufs[4] = { - {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_buf}, - {size, SECBUFFER_DATA, conn->ssl_buf+conn->ssl_sizes.cbHeader}, - {conn->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, conn->ssl_buf+conn->ssl_sizes.cbHeader+size}, + {conn->ssl_sizes.cbHeader, SECBUFFER_STREAM_HEADER, conn->ssl_write_buf}, + {size, SECBUFFER_DATA, conn->ssl_write_buf+conn->ssl_sizes.cbHeader}, + {conn->ssl_sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, conn->ssl_write_buf+conn->ssl_sizes.cbHeader+size}, {0, SECBUFFER_EMPTY, NULL} }; SecBufferDesc buf_desc = {SECBUFFER_VERSION, ARRAY_SIZE(bufs), bufs}; @@ -408,7 +416,7 @@ static DWORD send_ssl_chunk( struct netconn *conn, const void *msg, size_t size return res; } - if (sock_send( conn->socket, conn->ssl_buf, bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, 0 ) < 1) + if (sock_send( conn->socket, conn->ssl_write_buf, bufs[0].cbBuffer + bufs[1].cbBuffer + bufs[2].cbBuffer, 0 ) < 1) { WARN("send failed\n"); return WSAGetLastError(); @@ -456,13 +464,13 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S assert(conn->extra_len < ssl_buf_size); if(conn->extra_len) { - memcpy(conn->ssl_buf, conn->extra_buf, conn->extra_len); + memcpy(conn->ssl_read_buf, conn->extra_buf, conn->extra_len); buf_len = conn->extra_len; conn->extra_len = 0; free(conn->extra_buf); conn->extra_buf = NULL; }else { - if ((buf_len = sock_recv( conn->socket, conn->ssl_buf + conn->extra_len, ssl_buf_size - conn->extra_len, 0)) < 0) + if ((buf_len = sock_recv( conn->socket, conn->ssl_read_buf + conn->extra_len, ssl_buf_size - conn->extra_len, 0)) < 0) return WSAGetLastError(); if (!buf_len) @@ -479,7 +487,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S memset(bufs, 0, sizeof(bufs)); bufs[0].BufferType = SECBUFFER_DATA; bufs[0].cbBuffer = buf_len; - bufs[0].pvBuffer = conn->ssl_buf; + bufs[0].pvBuffer = conn->ssl_read_buf; switch ((res = DecryptMessage( &conn->ssl_ctx, &buf_desc, 0, NULL ))) { @@ -498,7 +506,7 @@ static DWORD read_ssl_chunk( struct netconn *conn, void *buf, SIZE_T buf_size, S case SEC_E_INCOMPLETE_MESSAGE: assert(buf_len < ssl_buf_size); - if ((size = sock_recv( conn->socket, conn->ssl_buf + buf_len, ssl_buf_size - buf_len, 0 )) < 1) + if ((size = sock_recv( conn->socket, conn->ssl_read_buf + buf_len, ssl_buf_size - buf_len, 0 )) < 1) return SEC_E_INCOMPLETE_MESSAGE; buf_len += size; diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 291a38e7bdd..1538a61da6d 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -108,7 +108,7 @@ struct netconn ULONGLONG keep_until; CtxtHandle ssl_ctx; SecPkgContext_StreamSizes ssl_sizes; - char *ssl_buf; + char *ssl_read_buf, *ssl_write_buf; char *extra_buf; size_t extra_len; char *peek_msg;

1 0

Paul Gofman : winhttp: Use a buffer for sending frame in send_frame().
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 70ada6d1890bc8e6d3cdb6d2c8fa475cf0de04c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70ada6d1890bc8e6d3cdb6d2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 20 18:35:32 2022 +0300 winhttp: Use a buffer for sending frame in send_frame(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 58 ++++++++++++++++++++++++++++++++---------- dlls/winhttp/winhttp_private.h | 4 +++ 2 files changed, 48 insertions(+), 14 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index d76edfa71d7..907ee538f54 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3063,6 +3063,7 @@ static void socket_destroy( struct object_header *hdr ) stop_queue( &socket->recv_q ); release_object( &socket->request->hdr ); + free( socket->send_frame_buffer ); free( socket ); } @@ -3142,10 +3143,12 @@ static DWORD send_bytes( struct socket *socket, char *bytes, int len ) static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHORT status, const char *buf, DWORD buflen, BOOL final ) { - DWORD i = 0, j, ret, offset = 2, len = buflen; - char hdr[14], byte, *mask = NULL; + DWORD i = 0, j, offset = 2, len = buflen; + DWORD buffer_size, ret = 0, send_size; + char hdr[14], *mask = NULL; + char *ptr; - TRACE("sending %02x frame\n", opcode); + TRACE( "sending %02x frame, len %u.\n", opcode, len ); if (opcode == SOCKET_OPCODE_CLOSE) len += sizeof(status); @@ -3171,29 +3174,56 @@ static DWORD send_frame( struct socket *socket, enum socket_opcode opcode, USHOR offset += 8; } - if ((ret = send_bytes( socket, hdr, offset ))) return ret; + buffer_size = len + offset; + if (len) buffer_size += 4; + assert( buffer_size - len < MAX_FRAME_BUFFER_SIZE ); + if (buffer_size > socket->send_frame_buffer_size && socket->send_frame_buffer_size < MAX_FRAME_BUFFER_SIZE) + { + DWORD new_size; + void *new; + + new_size = min( buffer_size, MAX_FRAME_BUFFER_SIZE ); + if (!(new = realloc( socket->send_frame_buffer, new_size ))) + { + ERR("Out of memory, buffer_size %u.\n", buffer_size); + return ERROR_OUTOFMEMORY; + } + socket->send_frame_buffer = new; + socket->send_frame_buffer_size = new_size; + } + ptr = socket->send_frame_buffer; + + memcpy(ptr, hdr, offset); + ptr += offset; if (len) { mask = &hdr[offset]; RtlGenRandom( mask, 4 ); - if ((ret = send_bytes( socket, mask, 4 ))) return ret; + memcpy( ptr, mask, 4 ); + ptr += 4; } if (opcode == SOCKET_OPCODE_CLOSE) /* prepend status code */ { - byte = (status >> 8) ^ mask[i++ % 4]; - if ((ret = send_bytes( socket, &byte, 1 ))) return ret; - - byte = (status & 0xff) ^ mask[i++ % 4]; - if ((ret = send_bytes( socket, &byte, 1 ))) return ret; + *ptr++ = (status >> 8) ^ mask[i++ % 4]; + *ptr++ = (status & 0xff) ^ mask[i++ % 4]; } - for (j = 0; j < buflen; j++) + offset = ptr - socket->send_frame_buffer; + send_size = offset + buflen; + while (1) { - byte = buf[j] ^ mask[i++ % 4]; - if ((ret = send_bytes( socket, &byte, 1 ))) return ret; - } + j = 0; + while (j < buflen && offset < MAX_FRAME_BUFFER_SIZE) + socket->send_frame_buffer[offset++] = buf[j++] ^ mask[i++ % 4]; + + if ((ret = send_bytes( socket, socket->send_frame_buffer, offset ))) return ret; + if (!(send_size -= offset)) break; + offset = 0; + buf += j; + buflen -= j; + } return ERROR_SUCCESS; } diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 1538a61da6d..557ee766735 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -248,6 +248,8 @@ struct socket USHORT status; char reason[123]; DWORD reason_len; + char *send_frame_buffer; + unsigned int send_frame_buffer_size; }; struct send_request @@ -398,4 +400,6 @@ static inline char *strdupWA_sized( const WCHAR *src, DWORD size ) extern HINSTANCE winhttp_instance DECLSPEC_HIDDEN; +#define MAX_FRAME_BUFFER_SIZE 65536 + #endif /* _WINE_WINHTTP_PRIVATE_H_ */

1 0

Paul Gofman : winhttp: Consider short read from netconn_recv() in receive_bytes().
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: b5b066f62aaef7eb3f5ebdcac6b61bf48fb22f5b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b066f62aaef7eb3f5ebdca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Jan 20 18:35:34 2022 +0300 winhttp: Consider short read from netconn_recv() in receive_bytes(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/request.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f215b984f6e..af04292ea06 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3328,7 +3328,7 @@ DWORD WINAPI WinHttpWebSocketSend( HINTERNET hsocket, WINHTTP_WEB_SOCKET_BUFFER_ return ret; } -static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD *ret_len ) +static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD *ret_len, BOOL read_full_buffer ) { DWORD err, size = 0, needed = len; char *ptr = buf; @@ -3342,8 +3342,17 @@ static DWORD receive_bytes( struct socket *socket, char *buf, DWORD len, DWORD * needed -= size; ptr += size; } - if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; - if ((*ret_len = size + received) != len) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; + while (size != len) + { + if ((err = netconn_recv( socket->request->netconn, ptr, needed, 0, &received ))) return err; + if (!received) break; + size += received; + if (!read_full_buffer) break; + needed -= received; + ptr += received; + } + *ret_len = size; + if (size != len && (read_full_buffer || !size)) return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; return ERROR_SUCCESS; } @@ -3368,7 +3377,7 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o DWORD ret, len, count; char hdr[2]; - if ((ret = receive_bytes( socket, hdr, sizeof(hdr), &count ))) return ret; + if ((ret = receive_bytes( socket, hdr, sizeof(hdr), &count, TRUE ))) return ret; if ((hdr[0] & RESERVED_BIT) || (hdr[1] & MASK_BIT) || !is_supported_opcode( hdr[0] & 0xf )) { return ERROR_WINHTTP_INVALID_SERVER_RESPONSE; @@ -3380,13 +3389,13 @@ static DWORD receive_frame( struct socket *socket, DWORD *ret_len, enum socket_o if (len == 126) { USHORT len16; - if ((ret = receive_bytes( socket, (char *)&len16, sizeof(len16), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len16, sizeof(len16), &count, TRUE ))) return ret; len = RtlUshortByteSwap( len16 ); } else if (len == 127) { ULONGLONG len64; - if ((ret = receive_bytes( socket, (char *)&len64, sizeof(len64), &count ))) return ret; + if ((ret = receive_bytes( socket, (char *)&len64, sizeof(len64), &count, TRUE ))) return ret; if ((len64 = RtlUlonglongByteSwap( len64 )) > ~0u) return ERROR_NOT_SUPPORTED; len = len64; } @@ -3434,7 +3443,7 @@ static DWORD socket_drain( struct socket *socket ) while (socket->read_size) { char buf[1024]; - if ((ret = receive_bytes( socket, buf, min(socket->read_size, sizeof(buf)), &count ))) return ret; + if ((ret = receive_bytes( socket, buf, min(socket->read_size, sizeof(buf)), &count, TRUE ))) return ret; socket->read_size -= count; } return ERROR_SUCCESS; @@ -3496,9 +3505,12 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD if (ret) break; } } - if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count ); + if (!ret) ret = receive_bytes( socket, buf, min(len, socket->read_size), &count, FALSE ); if (!ret) { + if (count < socket->read_size) + WARN("Short read.\n"); + socket->read_size -= count; if (!async) { @@ -3685,9 +3697,9 @@ static DWORD socket_close( struct socket *socket, USHORT status, const void *rea if (count) { DWORD reason_len = count - sizeof(socket->status); - if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count ))) goto done; + if ((ret = receive_bytes( socket, (char *)&socket->status, sizeof(socket->status), &count, TRUE ))) goto done; socket->status = RtlUshortByteSwap( socket->status ); - if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len ))) goto done; + if ((ret = receive_bytes( socket, socket->reason, reason_len, &socket->reason_len, TRUE ))) goto done; } socket->state = SOCKET_STATE_CLOSED;

1 0

Stefan Dösinger : d3d8/tests: Accept Nvidia results in test_sample_mask as broken.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 080b2c86046017b5162edea736e1ec9ae9ec7dd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=080b2c86046017b5162edea7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 21 12:58:13 2022 +0300 d3d8/tests: Accept Nvidia results in test_sample_mask as broken. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 3c61426e17f..8d5f9d39df8 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11171,7 +11171,15 @@ static void test_sample_mask(void) ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); get_rt_readback(rt, &rb); colour = get_readback_color(&rb, 64, 64); - ok(color_match(colour, 0xffff8080, 1), "Got unexpected colour %08x.\n", colour); + /* Multiple generations of Nvidia cards return broken results. + * A mask with no bits or all bits set produce the expected results (0x00 / 0xff), + * but any other mask behaves almost as if the result is 0.5 + (enabled / total) + * samples. It's not quite that though (you'd expect 0xbf or 0xc0 instead of 0xbc). + * + * I looked at a few other possible problems: Incorrectly enabled Z test, alpha test, + * culling, the multisample mask affecting CopyRects. Neither of these make a difference. */ + ok(color_match(colour, 0xffff8080, 1) || broken(color_match(colour, 0xffffbcbc, 1)), + "Got unexpected colour %08x.\n", colour); release_surface_readback(&rb); hr = IDirect3DDevice8_EndScene(device);

1 0

Alexandre Julliard : makefiles: Compare the full path when looking for generated include files.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 4c7a2b4cbbba5a76008d4c836f601d7da3642110 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c7a2b4cbbba5a76008d4c83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:50:12 2022 +0100 makefiles: Compare the full path when looking for generated include files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index 04cb14504b5..e7a71cb85d2 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -756,7 +756,16 @@ static struct incl_file *find_include_file( const struct makefile *make, const c struct incl_file *file; LIST_FOR_EACH_ENTRY( file, &make->includes, struct incl_file, entry ) - if (!strcmp( name, file->name )) return file; + { + const char *filename = file->filename; + if (!filename) continue; + if (make->obj_dir && strlen(make->obj_dir) < strlen(filename)) + { + filename += strlen(make->obj_dir); + while (*filename == '/') filename++; + } + if (!strcmp( name, filename )) return file; + } return NULL; }

1 0

Alistair Leslie-Hughes : msdasql: Connect to DSN in IDBInitialize Initialize.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 9d1e3b3a76ab794193267279cafe47a30df2923b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d1e3b3a76ab794193267279… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jan 21 14:33:19 2022 +1100 msdasql: Connect to DSN in IDBInitialize Initialize. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/Makefile.in | 2 +- dlls/msdasql/msdasql_main.c | 63 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/Makefile.in b/dlls/msdasql/Makefile.in index ee8fa672623..0f5453131f6 100644 --- a/dlls/msdasql/Makefile.in +++ b/dlls/msdasql/Makefile.in @@ -1,5 +1,5 @@ MODULE = msdasql.dll -IMPORTS = uuid ole32 oleaut32 +IMPORTS = uuid ole32 oleaut32 odbc32 EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index bc208a74cc5..cf69195baf7 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -30,6 +30,9 @@ #include "initguid.h" #include "msdasql.h" +#include "odbcinst.h" +#include "sqlext.h" +#include "sqlucode.h" #include "msdasql_private.h" @@ -40,6 +43,22 @@ DEFINE_GUID(DBPROPSET_DBINIT, 0xc8b522bc, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0 DEFINE_GUID(DBGUID_DEFAULT, 0xc8b521fb, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d); +static void dump_sql_diag_records(SQLSMALLINT type, SQLHANDLE handle) +{ + SQLCHAR state[6], msg[SQL_MAX_MESSAGE_LENGTH]; + SQLINTEGER native; + SQLSMALLINT i = 1, len; + + if (!TRACE_ON(msdasql)) + return; + + while(SQLGetDiagRec(type, handle, i, state, &native, msg, sizeof(msg), &len) != SQL_SUCCESS) + { + WARN("%d: %s: %s\n", i, state, msg); + i++; + } +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -210,6 +229,10 @@ struct msdasql LONG ref; struct msdasql_prop properties[14]; + + /* ODBC Support */ + HENV henv; + HDBC hdbc; }; static inline struct msdasql *impl_from_IUnknown(IUnknown *iface) @@ -294,6 +317,10 @@ static ULONG WINAPI msdsql_Release(IUnknown *iface) if (!ref) { + SQLDisconnect(provider->hdbc); + + SQLFreeHandle(SQL_HANDLE_DBC, provider->hdbc); + SQLFreeHandle(SQL_HANDLE_ENV, provider->henv); free(provider); } @@ -502,8 +529,33 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) { struct msdasql *provider = impl_from_IDBInitialize(iface); + int i; + SQLRETURN ret; - FIXME("%p stub\n", provider); + FIXME("%p semi-stub\n", provider); + + for(i=0; i < sizeof(provider->properties); i++) + { + if (provider->properties[i].id == DBPROP_INIT_DATASOURCE) + break; + } + + if (i >= sizeof(provider->properties)) + { + ERR("Datasource not found\n"); + return E_FAIL; + } + + ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), + SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS, (SQLWCHAR *)NULL, SQL_NTS ); + TRACE("SQLConnectW ret %d\n", ret); + if (ret != SQL_SUCCESS) + { + dump_sql_diag_records(SQL_HANDLE_DBC, provider->hdbc); + + if (ret != SQL_SUCCESS_WITH_INFO) + return E_FAIL; + } return S_OK; } @@ -653,6 +705,15 @@ static HRESULT create_msdasql_provider(REFIID riid, void **ppv) } } + SQLAllocHandle(SQL_HANDLE_ENV, NULL, &provider->henv ); + if (SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3_80, 0) == SQL_ERROR) + { + WARN("Falling back to SQL_OV_ODBC3\n"); + SQLSetEnvAttr(provider->henv, SQL_ATTR_ODBC_VERSION, (void *)SQL_OV_ODBC3, 0); + } + + SQLAllocHandle(SQL_HANDLE_DBC, provider->henv, &provider->hdbc); + hr = IUnknown_QueryInterface(&provider->MSDASQL_iface, riid, ppv); IUnknown_Release(&provider->MSDASQL_iface); return hr;

1 0

Alexandre Julliard : makefiles: Also look for generated includes in the source file directory.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 5d4ca2225e8edecbaab25545d6a08d40e54cfca9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d4ca2225e8edecbaab25545… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:49:19 2022 +0100 makefiles: Also look for generated includes in the source file directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/tools/makedep.c b/tools/makedep.c index a4557785f3a..04cb14504b5 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1203,6 +1203,28 @@ static struct file *open_file_same_dir( const struct incl_file *parent, const ch } +/******************************************************************* + * open_same_dir_generated_file + * + * Open a generated_file in the same directory as the parent. + */ +static struct file *open_same_dir_generated_file( const struct makefile *make, + const struct incl_file *parent, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_file_same_dir( parent, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = obj_dir_path( make, replace_filename( parent->name, file->name )); + } + return ret; +} + + /******************************************************************* * open_local_file * @@ -1426,7 +1448,9 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if (pFile->type == INCL_SYSTEM) return NULL; /* ignore system files we cannot find */ /* try in src file directory */ - if ((file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) + if ((file = open_same_dir_generated_file( make, pFile->included_by, pFile, ".tab.h", ".y" )) || + (file = open_same_dir_generated_file( make, pFile->included_by, pFile, ".h", ".idl" )) || + (file = open_file_same_dir( pFile->included_by, pFile->name, &pFile->filename ))) { pFile->is_external = pFile->included_by->is_external; return file;

1 0

Alexandre Julliard : makefiles: Add helper functions to open generated include files.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 9da1813651fb1b4061104fb0bd0eabff517a703f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9da1813651fb1b4061104fb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 21 09:49:00 2022 +0100 makefiles: Add helper functions to open generated include files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 99 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 50 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index ff89bae3ccf..a4557785f3a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1227,6 +1227,27 @@ static struct file *open_local_file( const struct makefile *make, const char *pa } +/******************************************************************* + * open_local_generated_file + * + * Open a generated file in the directory of the makefile. + */ +static struct file *open_local_generated_file( const struct makefile *make, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_local_file( make, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = obj_dir_path( make, file->name ); + } + return ret; +} + + /******************************************************************* * open_global_file * @@ -1254,6 +1275,27 @@ static struct file *open_global_header( const struct makefile *make, const char } +/******************************************************************* + * open_global_generated_file + * + * Open a generated file in the top-level source directory. + */ +static struct file *open_global_generated_file( const struct makefile *make, struct incl_file *file, + const char *ext, const char *src_ext ) +{ + char *filename; + struct file *ret = NULL; + + if (strendswith( file->name, ext ) && + (ret = open_global_header( make, replace_extension( file->name, ext, src_ext ), &filename ))) + { + file->sourcename = filename; + file->filename = strmake( "include/%s", file->name ); + } + return ret; +} + + /******************************************************************* * open_src_file */ @@ -1306,30 +1348,13 @@ static int has_external_import( const struct makefile *make ) static struct file *open_include_file( const struct makefile *make, struct incl_file *pFile ) { struct file *file = NULL; - char *filename; unsigned int i, len; errno = ENOENT; - /* check for generated bison header */ - - if (strendswith( pFile->name, ".tab.h" ) && - (file = open_local_file( make, replace_extension( pFile->name, ".tab.h", ".y" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = obj_dir_path( make, pFile->name ); - return file; - } - - /* check for corresponding idl file in source dir */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_local_file( make, replace_extension( pFile->name, ".h", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = obj_dir_path( make, pFile->name ); - return file; - } + /* check for generated files */ + if ((file = open_local_generated_file( make, pFile, ".tab.h", ".y" ))) return file; + if ((file = open_local_generated_file( make, pFile, ".h", ".idl" ))) return file; /* check for extra targets */ if (strarray_exists( &make->extra_targets, pFile->name )) @@ -1343,45 +1368,19 @@ static struct file *open_include_file( const struct makefile *make, struct incl_ if ((file = open_local_file( make, pFile->name, &pFile->filename ))) return file; /* check for global importlib (module dependency) */ - if (pFile->type == INCL_IMPORTLIB && find_importlib_module( pFile->name )) { pFile->filename = pFile->name; return NULL; } - /* check for corresponding idl file in global includes */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".idl" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - - /* check for corresponding .in file in global includes (for config.h.in) */ - - if (strendswith( pFile->name, ".h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".h.in" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } - - /* check for corresponding .x file in global includes */ - + /* check for generated files in global includes */ + if ((file = open_global_generated_file( make, pFile, ".h", ".idl" ))) return file; + if ((file = open_global_generated_file( make, pFile, ".h", ".h.in" ))) return file; if (strendswith( pFile->name, "tmpl.h" ) && - (file = open_global_header( make, replace_extension( pFile->name, ".h", ".x" ), &filename ))) - { - pFile->sourcename = filename; - pFile->filename = strmake( "include/%s", pFile->name ); - return file; - } + (file = open_global_generated_file( make, pFile, ".h", ".x" ))) return file; /* check in global includes source dir */ - if ((file = open_global_header( make, pFile->name, &pFile->filename ))) return file; /* check in global msvcrt includes */

1 0

Zhiyi Zhang : uxtheme: Do not call SetWindowTheme() in EnableThemeDialogTexture().
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 2adb11dd6159db3ccb8343722d8cc579c2a84552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2adb11dd6159db3ccb834372… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 21 15:47:54 2022 +0800 uxtheme: Do not call SetWindowTheme() in EnableThemeDialogTexture(). It's no longer necessary to call SetWindowTheme() in EnableThemeDialogTexture() because dialog theming doesn't need to open theme handles associated with the dialog. Calling SetWindowTheme() also sends extra messages. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/draw.c | 7 +------ dlls/uxtheme/tests/system.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/uxtheme/draw.c b/dlls/uxtheme/draw.c index 04ea1e79df9..a7942b03f97 100644 --- a/dlls/uxtheme/draw.c +++ b/dlls/uxtheme/draw.c @@ -60,12 +60,7 @@ HRESULT WINAPI EnableThemeDialogTexture(HWND hwnd, DWORD dwFlags) res = SetPropW (hwnd, (LPCWSTR)MAKEINTATOM(atDialogThemeEnabled), UlongToHandle(dwFlags|0x80000000)); /* 0x80000000 serves as a "flags set" flag */ - if (!res) - return HRESULT_FROM_WIN32(GetLastError()); - if (dwFlags & ETDT_USETABTEXTURE) - return SetWindowTheme (hwnd, NULL, L"Tab"); - else - return SetWindowTheme (hwnd, NULL, NULL); + return res ? S_OK : HRESULT_FROM_WIN32(GetLastError()); } /*********************************************************************** diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index 3f8f32a9a7b..03e435eb463 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2018,7 +2018,7 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, flags[i]); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "EnableThemeDialogTexture first flag", TRUE); + "EnableThemeDialogTexture first flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* Non-zero flags without ETDT_DISABLE enables dialog texture */ todo_wine_if(flags[i] == ETDT_USETABTEXTURE || flags[i] == ETDT_USEAEROWIZARDTABTEXTURE) @@ -2040,7 +2040,7 @@ static void test_EnableThemeDialogTexture(void) hr = EnableThemeDialogTexture(dialog, flags[j]); ok(hr == S_OK, "EnableThemeDialogTexture failed, hr %#x.\n", hr); ok_sequence(sequences, PARENT_SEQ_INDEX, empty_seq, - "EnableThemeDialogTexture second flag", TRUE); + "EnableThemeDialogTexture second flag", FALSE); ret = IsThemeDialogTextureEnabled(dialog); /* If the flag is zero, it will have previous dialog texture status */ if (flags[j])

1 0

Zhiyi Zhang : comctl32/tests: Remove WM_CTLCOLORSTATIC tests for property sheets.
by Alexandre Julliard Jan. 21, 2022

Jan. 21, 2022

Module: wine Branch: master Commit: 1e8ce36e30e8ae06a8fc66bf4ef0016127e9d345 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e8ce36e30e8ae06a8fc66bf… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jan 21 15:47:44 2022 +0800 comctl32/tests: Remove WM_CTLCOLORSTATIC tests for property sheets. The removed tests are covered by test_EnableThemeDialogTexture() in uxtheme/tests/system.c. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 229 +++------------------------------------- 1 file changed, 14 insertions(+), 215 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1e8ce36e30e8ae06a8fc…

1 0