July 2024 - Wine-commits - list.winehq.org

Hans Leidekker : odbc32: Forward SQLBrowseConnect() to the Unicode version if needed.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 57ca252568cf0772188ce5e1abefb1cde2a8699a URL: https://gitlab.winehq.org/wine/wine/-/commit/57ca252568cf0772188ce5e1abefb1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 13:45:12 2024 +0200 odbc32: Forward SQLBrowseConnect() to the Unicode version if needed. --- dlls/odbc32/proxyodbc.c | 107 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 78 insertions(+), 29 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 6c67ec2aeb0..56f3f42c64f 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -2650,6 +2650,57 @@ static WCHAR *get_datasource( const WCHAR *connection_string ) return ret; } +static WCHAR *strnAtoW( const SQLCHAR *str, int len ) +{ + WCHAR *ret; + int lenW; + + if (!str) return NULL; + + if (len == SQL_NTS) len = strlen( (const char *)str ); + lenW = MultiByteToWideChar( CP_ACP, 0, (const char *)str, len, NULL, 0 ); + if ((ret = malloc( (lenW + 1) * sizeof(WCHAR) ))) + { + MultiByteToWideChar( CP_ACP, 0, (const char *)str, len, ret, lenW ); + ret[lenW] = 0; + } + return ret; +} + +static SQLRETURN browse_connect_win32_a( struct handle *handle, SQLCHAR *in_conn_str, SQLSMALLINT inlen, + SQLCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *outlen ) +{ + SQLRETURN ret = SQL_ERROR; + SQLWCHAR *in = NULL, *out = NULL; + SQLSMALLINT lenW; + + if (handle->win32_funcs->SQLBrowseConnect) + return handle->win32_funcs->SQLBrowseConnect( handle->win32_handle, in_conn_str, inlen, out_conn_str, + buflen, outlen ); + if (handle->win32_funcs->SQLBrowseConnectW) + { + if (!(in = strnAtoW( in_conn_str, inlen ))) return SQL_ERROR; + if (!(out = malloc( buflen * sizeof(WCHAR) ))) goto done; + ret = handle->win32_funcs->SQLBrowseConnectW( handle->win32_handle, in, inlen, out, buflen, &lenW ); + if (SUCCESS( ret )) + { + int len = WideCharToMultiByte( CP_ACP, 0, out, -1, (char *)out_conn_str, buflen, NULL, NULL ); + if (outlen) *outlen = len - 1; + } + } +done: + free( in ); + free( out ); + return ret; +} + +static SQLRETURN browse_connect_unix_a( struct handle *handle, SQLCHAR *in_conn_str, SQLSMALLINT len, + SQLCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2 ) +{ + struct SQLBrowseConnect_params params = { handle->unix_handle, in_conn_str, len, out_conn_str, buflen, len2 }; + return ODBC_CALL( SQLBrowseConnect, &params ); +} + /************************************************************************* * SQLBrowseConnect [ODBC32.055] */ @@ -2690,20 +2741,18 @@ SQLRETURN WINAPI SQLBrowseConnect(SQLHDBC ConnectionHandle, SQLCHAR *InConnectio if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - ret = handle->win32_funcs->SQLBrowseConnect( handle->win32_handle, InConnectionString, StringLength1, - OutConnectionString, BufferLength, StringLength2 ); + ret = browse_connect_win32_a( handle, InConnectionString, StringLength1, OutConnectionString, + BufferLength, StringLength2 ); } else { - struct SQLBrowseConnect_params params = { 0, InConnectionString, StringLength1, OutConnectionString, - BufferLength, StringLength2 }; - TRACE( "using Unix driver %s\n", debugstr_w(filename) ); + if (!SUCCESS((ret = create_env( handle->parent, TRUE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - params.ConnectionHandle = handle->unix_handle; - ret = ODBC_CALL( SQLBrowseConnect, &params ); + ret = browse_connect_unix_a( handle, InConnectionString, StringLength1, OutConnectionString, + BufferLength, StringLength2 ); } done: @@ -3309,21 +3358,6 @@ SQLRETURN WINAPI SQLBindParameter(SQLHSTMT StatementHandle, SQLUSMALLINT Paramet return ret; } -static WCHAR *strnAtoW( const SQLCHAR *str, int in_len ) -{ - WCHAR *ret = NULL; - if (str) - { - int len = MultiByteToWideChar( CP_ACP, 0, (const char *)str, in_len, NULL, 0 ); - if ((ret = malloc( (len + 1) * sizeof(WCHAR) ))) - { - MultiByteToWideChar( CP_ACP, 0, (const char *)str, in_len, ret, len ); - ret[len] = 0; - } - } - return ret; -} - static SQLRETURN driver_connect_win32_a( struct handle *handle, SQLHWND window, SQLCHAR *in_conn_str, SQLSMALLINT inlen, SQLCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *outlen, SQLUSMALLINT completion ) @@ -4423,6 +4457,23 @@ SQLRETURN WINAPI SQLTablesW(SQLHSTMT StatementHandle, SQLWCHAR *CatalogName, SQL return ret; } +static SQLRETURN browse_connect_win32_w( struct handle *handle, SQLWCHAR *in_conn_str, SQLSMALLINT len, + SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2 ) +{ + if (handle->win32_funcs->SQLBrowseConnectW) + return handle->win32_funcs->SQLBrowseConnectW( handle->win32_handle, in_conn_str, len, out_conn_str, + buflen, len2 ); + if (handle->win32_funcs->SQLBrowseConnect) FIXME( "Unicode to ANSI conversion not handled\n" ); + return SQL_ERROR; +} + +static SQLRETURN browse_connect_unix_w( struct handle *handle, SQLWCHAR *in_conn_str, SQLSMALLINT len, + SQLWCHAR *out_conn_str, SQLSMALLINT buflen, SQLSMALLINT *len2 ) +{ + struct SQLBrowseConnectW_params params = { handle->unix_handle, in_conn_str, len, out_conn_str, buflen, len2 }; + return ODBC_CALL( SQLBrowseConnectW, &params ); +} + /************************************************************************* * SQLBrowseConnectW [ODBC32.155] */ @@ -4463,20 +4514,18 @@ SQLRETURN WINAPI SQLBrowseConnectW(SQLHDBC ConnectionHandle, SQLWCHAR *InConnect if (!SUCCESS((ret = create_env( handle->parent, FALSE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - ret = handle->win32_funcs->SQLBrowseConnectW( handle->win32_handle, InConnectionString, StringLength1, - OutConnectionString, BufferLength, StringLength2 ); + ret = browse_connect_win32_w( handle, InConnectionString, StringLength1, OutConnectionString, BufferLength, + StringLength2 ); } else { - struct SQLBrowseConnectW_params params = { 0, InConnectionString, StringLength1, OutConnectionString, - BufferLength, StringLength2 }; - TRACE( "using Unix driver %s\n", debugstr_w(filename) ); + if (!SUCCESS((ret = create_env( handle->parent, TRUE )))) goto done; if (!SUCCESS((ret = create_con( handle )))) goto done; - params.ConnectionHandle = handle->unix_handle; - ret = ODBC_CALL( SQLBrowseConnectW, &params ); + ret = browse_connect_unix_w( handle, InConnectionString, StringLength1, OutConnectionString, BufferLength, + StringLength2 ); } done:

1 0

Hans Leidekker : odbc32: Forward SQLColAttributes() to the Unicode version if needed.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: f6590a596e5f923e3ccea1f631bada3d151a78d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6590a596e5f923e3ccea1f631bada… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 15 11:07:23 2024 +0200 odbc32: Forward SQLColAttributes() to the Unicode version if needed. --- dlls/odbc32/proxyodbc.c | 106 ++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 85 insertions(+), 21 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 56f3f42c64f..82cf20cc529 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -2789,6 +2789,52 @@ SQLRETURN WINAPI SQLBulkOperations(SQLHSTMT StatementHandle, SQLSMALLINT Operati return ret; } +static SQLRETURN col_attributes_unix_a( struct handle *handle, SQLUSMALLINT col, SQLUSMALLINT field_id, + SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen, + SQLLEN *num_attrs ) +{ + SQLRETURN ret; + INT64 attrs; + struct SQLColAttributes_params params = { handle->unix_handle, col, field_id, char_attrs, buflen, retlen, &attrs }; + if (SUCCESS((ret = ODBC_CALL( SQLColAttributes, &params )))) *num_attrs = attrs; + return ret; +} + +static SQLRETURN col_attributes_win32_a( struct handle *handle, SQLUSMALLINT col, SQLUSMALLINT field_id, + SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen, + SQLLEN *num_attrs ) +{ + SQLRETURN ret = SQL_ERROR; + + if (handle->win32_funcs->SQLColAttributes) + { + return handle->win32_funcs->SQLColAttributes( handle->win32_handle, col, field_id, char_attrs, buflen, + retlen, num_attrs ); + } + else if (handle->win32_funcs->SQLColAttributesW) + { + if (buflen < 0) + ret = handle->win32_funcs->SQLColAttributesW( handle->win32_handle, col, field_id, char_attrs, buflen, + retlen, num_attrs ); + else + { + SQLWCHAR *strW; + SQLSMALLINT lenW; + + if (!(strW = malloc( buflen * sizeof(WCHAR) ))) return SQL_ERROR; + ret = handle->win32_funcs->SQLColAttributesW( handle->win32_handle, col, field_id, strW, buflen, &lenW, + num_attrs ); + if (SUCCESS( ret )) + { + int len = WideCharToMultiByte( CP_ACP, 0, strW, -1, char_attrs, buflen, NULL, NULL ); + if (retlen) *retlen = len - 1; + } + free( strW ); + } + } + return ret; +} + /************************************************************************* * SQLColAttributes [ODBC32.006] */ @@ -2807,16 +2853,13 @@ SQLRETURN WINAPI SQLColAttributes(SQLHSTMT StatementHandle, SQLUSMALLINT ColumnN if (handle->unix_handle) { - INT64 attrs; - struct SQLColAttributes_params params = { handle->unix_handle, ColumnNumber, FieldIdentifier, - CharacterAttributes, BufferLength, StringLength, &attrs }; - if (SUCCESS((ret = ODBC_CALL( SQLColAttributes, &params )))) *NumericAttributes = attrs; + ret = col_attributes_unix_a( handle, ColumnNumber, FieldIdentifier, CharacterAttributes, BufferLength, + StringLength, NumericAttributes ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLColAttributes( handle->win32_handle, ColumnNumber, FieldIdentifier, - CharacterAttributes, BufferLength, StringLength, - NumericAttributes ); + ret = col_attributes_win32_a( handle, ColumnNumber, FieldIdentifier, CharacterAttributes, BufferLength, + StringLength, NumericAttributes ); } TRACE("Returning %d\n", ret); @@ -3515,6 +3558,37 @@ static BOOL SQLColAttributes_KnownStringAttribute(SQLUSMALLINT fDescType) return FALSE; } +static SQLRETURN col_attributes_unix_w( struct handle *handle, SQLUSMALLINT col, SQLUSMALLINT field_id, + SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen, + SQLLEN *num_attrs ) +{ + SQLRETURN ret; + INT64 attrs; + struct SQLColAttributesW_params params = { handle->unix_handle, col, field_id, char_attrs, buflen, retlen, + &attrs }; + + if (SUCCESS((ret = ODBC_CALL( SQLColAttributesW, &params )))) *num_attrs = attrs; + + if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(field_id) && char_attrs && + retlen && *retlen != wcslen( char_attrs ) * sizeof(WCHAR)) + { + TRACE("CHEAT: resetting name length for ADO\n"); + *retlen = wcslen( char_attrs ) * sizeof(WCHAR); + } + return ret; +} + +static SQLRETURN col_attributes_win32_w( struct handle *handle, SQLUSMALLINT col, SQLUSMALLINT field_id, + SQLPOINTER char_attrs, SQLSMALLINT buflen, SQLSMALLINT *retlen, + SQLLEN *num_attrs ) +{ + if (handle->win32_funcs->SQLColAttributesW) + return handle->win32_funcs->SQLColAttributesW( handle->win32_handle, col, field_id, char_attrs, buflen, + retlen, num_attrs ); + if (handle->win32_funcs->SQLColAttributes) FIXME( "Unicode to ANSI conversion not handled\n" ); + return SQL_ERROR; +} + /************************************************************************* * SQLColAttributesW [ODBC32.106] */ @@ -3533,23 +3607,13 @@ SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT StatementHandle, SQLUSMALLINT Column if (handle->unix_handle) { - INT64 attrs; - struct SQLColAttributesW_params params = { handle->unix_handle, ColumnNumber, FieldIdentifier, - CharacterAttributes, BufferLength, StringLength, &attrs }; - if (SUCCESS((ret = ODBC_CALL( SQLColAttributesW, &params )))) *NumericAttributes = attrs; - - if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(FieldIdentifier) && CharacterAttributes && - StringLength && *StringLength != wcslen(CharacterAttributes) * 2) - { - TRACE("CHEAT: resetting name length for ADO\n"); - *StringLength = wcslen(CharacterAttributes) * 2; - } + ret = col_attributes_unix_w( handle, ColumnNumber, FieldIdentifier, CharacterAttributes, BufferLength, + StringLength, NumericAttributes ); } else if (handle->win32_handle) { - ret = handle->win32_funcs->SQLColAttributesW( handle->win32_handle, ColumnNumber, FieldIdentifier, - CharacterAttributes, BufferLength, StringLength, - NumericAttributes ); + ret = col_attributes_win32_w( handle, ColumnNumber, FieldIdentifier, CharacterAttributes, BufferLength, + StringLength, NumericAttributes ); } TRACE("Returning %d\n", ret);

1 0

Gabriel Ivăncescu : mshtml: Make sure we aren't detached before setting interactive ready state.
by Alexandre Julliard 15 Jul '24

15 Jul '24

Module: wine Branch: master Commit: 7e08c8198e74879b864ebcaa5af8704f1bfdb1f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7e08c8198e74879b864ebcaa5af870… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Jul 12 20:12:25 2024 +0300 mshtml: Make sure we aren't detached before setting interactive ready state. Once Human's EULA window uses InitNew during the parse_complete notifications, causing the window to become detached from the outer window, and ending up in a crash. But conceptually, even without the crash and somehow obtaining the current outer window, it doesn't make sense to touch it if it changed. Spotted by Paul Gofman. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/mutation.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index a502e3c9427..4e0276fd5f6 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -312,9 +312,9 @@ static nsresult run_end_load(HTMLDocumentNode *This, nsISupports *arg1, nsISuppo bind_event_scripts(This); - if(This->window == window) { + if(This->window == window && window->base.outer_window) { window->dom_interactive_time = get_time_stamp(); - set_ready_state(This->window->base.outer_window, READYSTATE_INTERACTIVE); + set_ready_state(window->base.outer_window, READYSTATE_INTERACTIVE); } IHTMLWindow2_Release(&window->base.IHTMLWindow2_iface); return NS_OK;

1 0

Piotr Caban : ucrtbase: Fix FILE no buffering flag value.
by Alexandre Julliard 14 Jul '24

14 Jul '24

Module: wine Branch: master Commit: 40a4809c1c6bda1c6dd5b64a4dd52393d5ac965f URL: https://gitlab.winehq.org/wine/wine/-/commit/40a4809c1c6bda1c6dd5b64a4dd523… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sun Jul 14 16:40:45 2024 +0200 ucrtbase: Fix FILE no buffering flag value. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56956 --- dlls/msvcrt/file.c | 20 ++++++++++---------- dlls/msvcrt/msvcrt.h | 7 +++++++ dlls/ucrtbase/tests/file.c | 6 +++++- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0bf8510c5c9..05630fb54b1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -883,7 +883,7 @@ static BOOL msvcrt_alloc_buffer(FILE* file) } else { file->_base = (char*)(&file->_charbuf); file->_bufsiz = 2; - file->_flag |= _IONBF; + file->_flag |= MSVCRT__NOBUF; } file->_ptr = file->_base; file->_cnt = 0; @@ -896,7 +896,7 @@ static BOOL add_std_buffer(FILE *file) static char buffers[2][BUFSIZ]; if((file->_file!=STDOUT_FILENO && file->_file!=STDERR_FILENO) - || (file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF)) + || (file->_flag & (MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF)) || !_isatty(file->_file)) return FALSE; @@ -3885,7 +3885,7 @@ int CDECL _filbuf(FILE* file) return EOF; /* Allocate buffer if needed */ - if(!(file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF))) + if(!(file->_flag & (MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF))) msvcrt_alloc_buffer(file); if(!(file->_flag & _IOREAD)) { @@ -4136,7 +4136,7 @@ wchar_t * CDECL fgetws(wchar_t *s, int size, FILE* file) int CDECL _flsbuf(int c, FILE* file) { /* Flush output buffer */ - if(!(file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF))) { + if(!(file->_flag & (MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF))) { msvcrt_alloc_buffer(file); } @@ -4221,13 +4221,13 @@ size_t CDECL _fwrite_nolock(const void *ptr, size_t size, size_t nmemb, FILE* fi written += pcnt; wrcnt -= pcnt; ptr = (const char*)ptr + pcnt; - } else if((file->_flag & _IONBF) + } else if((file->_flag & MSVCRT__NOBUF) || ((file->_flag & (_IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= file->_bufsiz) || (!(file->_flag & (_IOMYBUF | MSVCRT__USERBUF)) && wrcnt >= MSVCRT_INTERNAL_BUFSIZ)) { size_t pcnt; int bufsiz; - if(file->_flag & _IONBF) + if(file->_flag & MSVCRT__NOBUF) bufsiz = 1; else if(!(file->_flag & (_IOMYBUF | MSVCRT__USERBUF))) bufsiz = MSVCRT_INTERNAL_BUFSIZ; @@ -4510,7 +4510,7 @@ size_t CDECL _fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* file) } } - if(rcnt>0 && !(file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF))) + if(rcnt>0 && !(file->_flag & (MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF))) msvcrt_alloc_buffer(file); while(rcnt>0) @@ -5084,11 +5084,11 @@ int CDECL setvbuf(FILE* file, char *buf, int mode, size_t size) _fflush_nolock(file); if(file->_flag & _IOMYBUF) free(file->_base); - file->_flag &= ~(_IONBF | _IOMYBUF | MSVCRT__USERBUF); + file->_flag &= ~(MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF); file->_cnt = 0; if(mode == _IONBF) { - file->_flag |= _IONBF; + file->_flag |= MSVCRT__NOBUF; file->_base = file->_ptr = (char*)&file->_charbuf; file->_bufsiz = 2; }else if(buf) { @@ -5823,7 +5823,7 @@ int CDECL _ungetc_nolock(int c, FILE * file) (file->_flag&_IORW && !(file->_flag&_IOWRT)))) return EOF; - if((!(file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF)) + if((!(file->_flag & (MSVCRT__NOBUF | _IOMYBUF | MSVCRT__USERBUF)) && msvcrt_alloc_buffer(file)) || (!file->_cnt && file->_ptr==file->_base)) file->_ptr++; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index e95b824f3f3..eaaf8b0034d 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -43,6 +43,13 @@ typedef struct _iobuf #define _IOMYBUF 0x0040 #define _IOSTRG 0x1000 #endif + +#define MSVCRT__NOBUF 0x0400 + +#else + +#define MSVCRT__NOBUF _IONBF + #endif #include <errno.h> diff --git a/dlls/ucrtbase/tests/file.c b/dlls/ucrtbase/tests/file.c index e739934de02..d128a9bffb0 100644 --- a/dlls/ucrtbase/tests/file.c +++ b/dlls/ucrtbase/tests/file.c @@ -107,7 +107,7 @@ static void test_iobuf_layout(void) fp.f = fopen(tempf, "wb"); ok(fp.f != NULL, "fopen failed with error: %d\n", errno); - ok(!(fp.iobuf->_flag & 0x40), "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); + ok(!(fp.iobuf->_flag & 0x440), "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); r = fprintf(fp.f, "%s", "init"); ok(r == 4, "fprintf returned %d\n", r); ok(fp.iobuf->_flag & 0x40, "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); @@ -129,6 +129,10 @@ static void test_iobuf_layout(void) ok(file_ptr == &fp.iobuf->_ptr, "_ptr = %p, expected %p\n", file_ptr, &fp.iobuf->_ptr); ok(file_cnt == &fp.iobuf->_cnt, "_cnt = %p, expected %p\n", file_cnt, &fp.iobuf->_cnt); + r = setvbuf(fp.f, NULL, _IONBF, 0); + ok(!r, "setvbuf returned %d\n", r); + ok(fp.iobuf->_flag & 0x400, "fp.iobuf->_flag = %x\n", fp.iobuf->_flag); + ok(TryEnterCriticalSection(&fp.iobuf->_crit), "TryEnterCriticalSection section returned FALSE\n"); LeaveCriticalSection(&fp.iobuf->_crit);

1 0

Rémi Bernon : maintainers: Remove MF GStreamer section.
by Alexandre Julliard 14 Jul '24

14 Jul '24

Module: wine Branch: master Commit: 08e381d7f5a89613416a2fd3f0ab26f13474d73f URL: https://gitlab.winehq.org/wine/wine/-/commit/08e381d7f5a89613416a2fd3f0ab26… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Mar 18 10:04:13 2024 +0100 maintainers: Remove MF GStreamer section. --- MAINTAINERS | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 29fa77c0404..d913427f6a5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -205,23 +205,6 @@ F: dlls/winexinput.sys/ F: dlls/winmm/joystick.c F: dlls/xinput*/ -Media Foundation GStreamer backend -M: Rémi Bernon <rbernon(a)codeweavers.com> -P: Nikolay Sivov <nsivov(a)codeweavers.com> -P: Elizabeth Figura <zfigura(a)codeweavers.com> -F: dlls/mf/tests/transform.c -F: dlls/winegstreamer/aac_decoder.c -F: dlls/winegstreamer/color_convert.c -F: dlls/winegstreamer/media_source.c -F: dlls/winegstreamer/mfplat.c -F: dlls/winegstreamer/resampler.c -F: dlls/winegstreamer/video_decoder.c -F: dlls/winegstreamer/video_processor.c -F: dlls/winegstreamer/wg_sample.c -F: dlls/winegstreamer/wg_transform.c -F: dlls/winegstreamer/wma_decoder.c -F: dlls/winegstreamer/wmv_decoder.c - Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com> F: dlls/concrt140/

1 0

Alexandre Julliard : Release 9.13.
by Alexandre Julliard 14 Jul '24

14 Jul '24

Module: wine Branch: master Commit: e8f936c745b24f794b36a0af794086e0f57c8551 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8f936c745b24f794b36a0af794086… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 14 22:40:51 2024 +0200 Release 9.13. --- ANNOUNCE.md | 814 ++++++++++++++++++++++++++++++------------------------------ AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 423 insertions(+), 412 deletions(-)

1 0

Tag wine-9.13 : Alexandre Julliard : Release 9.13
by Alexandre Julliard 14 Jul '24

14 Jul '24

Module: wine Branch: refs/tags/wine-9.13 Tag: a42f54bf501670957f04dcd04cfa90fbbf398a9e URL: https://gitlab.winehq.org/wine/wine/-/tags/a42f54bf501670957f04dcd04cfa90fb… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Jul 14 22:40:51 2024 +0200 Release 9.13

1 0

Fabian Maurer : msv1_0: Set mode in ntlm_check_version.
by Alexandre Julliard 14 Jul '24

14 Jul '24

Module: wine Branch: master Commit: 51c413259a59784169717e185573bbe5608f4420 URL: https://gitlab.winehq.org/wine/wine/-/commit/51c413259a59784169717e185573bb… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jul 13 04:17:10 2024 +0200 msv1_0: Set mode in ntlm_check_version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56954 --- dlls/msv1_0/unixlib.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msv1_0/unixlib.c b/dlls/msv1_0/unixlib.c index b51dde2ef0a..807f3778109 100644 --- a/dlls/msv1_0/unixlib.c +++ b/dlls/msv1_0/unixlib.c @@ -217,6 +217,7 @@ static NTSTATUS ntlm_check_version( void *args ) struct fork_params params = { &ctx, argv }; int len; + ctx.mode = MODE_CLIENT; argv[0] = (char *)"ntlm_auth"; argv[1] = (char *)"--version"; argv[2] = NULL;

1 0

Hans Leidekker : odbc32: Implement SQLGet/SetConnectAttr(SQL_ATTR_LOGIN_TIMEOUT).
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 6cecc4e029a485bf291c16717de360a10bf275c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/6cecc4e029a485bf291c16717de360… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 11:13:45 2024 +0200 odbc32: Implement SQLGet/SetConnectAttr(SQL_ATTR_LOGIN_TIMEOUT). --- dlls/odbc32/proxyodbc.c | 98 ++++++++++++++++++++++++++++++++++++++++++++-- dlls/odbc32/tests/odbc32.c | 30 ++++++++++++++ dlls/odbc32/unixlib.h | 1 + 3 files changed, 126 insertions(+), 3 deletions(-)

1 0

Hans Leidekker : odbc32: Implement SQLGet/SetConnectAttr(SQL_ATTR_CONNECTION_TIMEOUT).
by Alexandre Julliard 12 Jul '24

12 Jul '24

Module: wine Branch: master Commit: 58bfc9ce7b0c5bdc68f28e60811901cb5869b681 URL: https://gitlab.winehq.org/wine/wine/-/commit/58bfc9ce7b0c5bdc68f28e60811901… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jul 10 11:33:13 2024 +0200 odbc32: Implement SQLGet/SetConnectAttr(SQL_ATTR_CONNECTION_TIMEOUT). --- dlls/odbc32/proxyodbc.c | 24 +++++++++++++++++++++--- dlls/odbc32/unixlib.h | 1 + 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 1e2bd0db2f6..c9db219c203 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -816,10 +816,11 @@ static SQLRETURN set_env_attr( struct handle *handle, SQLINTEGER attr, SQLPOINTE return ret; } +#define INT_PTR(val) (SQLPOINTER)(ULONG_PTR)val static SQLRETURN prepare_env( struct handle *handle ) { SQLRETURN ret; - if ((ret = set_env_attr( handle, SQL_ATTR_ODBC_VERSION, (SQLPOINTER)(ULONG_PTR)handle->env_attr_version, 0 ))) + if ((ret = set_env_attr( handle, SQL_ATTR_ODBC_VERSION, INT_PTR(handle->env_attr_version), 0 ))) return ret; return SQL_SUCCESS; } @@ -843,8 +844,9 @@ static SQLRETURN set_con_attr( struct handle *handle, SQLINTEGER attr, SQLPOINTE static SQLRETURN prepare_con( struct handle *handle ) { SQLRETURN ret; - if ((ret = set_con_attr( handle, SQL_ATTR_LOGIN_TIMEOUT, (SQLPOINTER)(ULONG_PTR)handle->con_attr_login_timeout, 0 ))) - return ret; + + if ((ret = set_con_attr( handle, SQL_ATTR_CONNECTION_TIMEOUT, INT_PTR(handle->con_attr_con_timeout), 0 ))) return ret; + if ((ret = set_con_attr( handle, SQL_ATTR_LOGIN_TIMEOUT, INT_PTR(handle->con_attr_login_timeout), 0 ))) return ret; return SQL_SUCCESS; } @@ -1478,6 +1480,10 @@ SQLRETURN WINAPI SQLGetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribut { switch (Attribute) { + case SQL_ATTR_CONNECTION_TIMEOUT: + *(SQLINTEGER *)Value = handle->con_attr_con_timeout; + break; + case SQL_ATTR_LOGIN_TIMEOUT: *(SQLINTEGER *)Value = handle->con_attr_login_timeout; break; @@ -2050,6 +2056,10 @@ SQLRETURN WINAPI SQLSetConnectAttr(SQLHDBC ConnectionHandle, SQLINTEGER Attribut { switch (Attribute) { + case SQL_ATTR_CONNECTION_TIMEOUT: + handle->con_attr_con_timeout = (UINT32)(ULONG_PTR)Value; + break; + case SQL_ATTR_LOGIN_TIMEOUT: handle->con_attr_login_timeout = (UINT32)(ULONG_PTR)Value; break; @@ -3706,6 +3716,10 @@ SQLRETURN WINAPI SQLGetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu { switch (Attribute) { + case SQL_ATTR_CONNECTION_TIMEOUT: + *(SQLINTEGER *)Value = handle->con_attr_con_timeout; + break; + case SQL_ATTR_LOGIN_TIMEOUT: *(SQLINTEGER *)Value = handle->con_attr_login_timeout; break; @@ -3909,6 +3923,10 @@ SQLRETURN WINAPI SQLSetConnectAttrW(SQLHDBC ConnectionHandle, SQLINTEGER Attribu { switch (Attribute) { + case SQL_ATTR_CONNECTION_TIMEOUT: + handle->con_attr_con_timeout = (UINT32)(ULONG_PTR)Value; + break; + case SQL_ATTR_LOGIN_TIMEOUT: handle->con_attr_login_timeout = (UINT32)(ULONG_PTR)Value; break; diff --git a/dlls/odbc32/unixlib.h b/dlls/odbc32/unixlib.h index c26317012b5..4241d06c892 100644 --- a/dlls/odbc32/unixlib.h +++ b/dlls/odbc32/unixlib.h @@ -192,6 +192,7 @@ struct handle struct handle *parent; /* attributes */ UINT32 env_attr_version; + UINT32 con_attr_con_timeout; UINT32 con_attr_login_timeout; /* drivers and data sources */ UINT32 drivers_idx;

1 0