- Wine-Commits - list.winehq.org

Hans Leidekker : odbc32: Fix a couple of spec file entries.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 94143b38aca8164fe83038a4d0ada5d7a8059d28 URL: https://gitlab.winehq.org/wine/wine/-/commit/94143b38aca8164fe83038a4d0ada5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jul 15 14:49:31 2024 +0200 odbc32: Fix a couple of spec file entries. --- dlls/odbc32/odbc32.spec | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/odbc32/odbc32.spec b/dlls/odbc32/odbc32.spec index f94eaabea26..c42bf55c3eb 100644 --- a/dlls/odbc32/odbc32.spec +++ b/dlls/odbc32/odbc32.spec @@ -5,16 +5,16 @@ 5 stdcall SQLCancel(long) 6 stdcall SQLColAttributes(long long long ptr long ptr ptr) 7 stdcall SQLConnect(long str long str long str long) - 8 stdcall SQLDescribeCol(long long str long ptr ptr ptr ptr ptr) + 8 stdcall SQLDescribeCol(long long ptr long ptr ptr ptr ptr ptr) 9 stdcall SQLDisconnect(long) - 10 stdcall SQLError(long long long str ptr str long ptr) + 10 stdcall SQLError(long long long ptr ptr ptr long ptr) 11 stdcall SQLExecDirect(long str long) 12 stdcall SQLExecute(long) 13 stdcall SQLFetch(long) 14 stdcall SQLFreeConnect(long) 15 stdcall SQLFreeEnv(long) 16 stdcall SQLFreeStmt(long long ) - 17 stdcall SQLGetCursorName(long str long ptr) + 17 stdcall SQLGetCursorName(long ptr long ptr) 18 stdcall SQLNumResultCols(long ptr) 19 stdcall SQLPrepare(long str long) 20 stdcall SQLRowCount(long ptr) @@ -31,14 +31,14 @@ 31 stdcall SQLFreeHandle(long long) 32 stdcall SQLGetConnectAttr(long long ptr long ptr) 33 stdcall SQLGetDescField(long long long ptr long ptr) - 34 stdcall SQLGetDescRec(long long str long ptr ptr ptr ptr ptr ptr ptr) + 34 stdcall SQLGetDescRec(long long ptr long ptr ptr ptr ptr ptr ptr ptr) 35 stdcall SQLGetDiagField(long long long long ptr long ptr) - 36 stdcall SQLGetDiagRec(long long long str ptr str long ptr) + 36 stdcall SQLGetDiagRec(long long long ptr ptr ptr long ptr) 37 stdcall SQLGetEnvAttr(long long ptr long ptr) 38 stdcall SQLGetStmtAttr(long long ptr long ptr) 39 stdcall SQLSetConnectAttr(long long ptr long) 40 stdcall SQLColumns(long str long str long str long str long) - 41 stdcall SQLDriverConnect(long long str long str long ptr long) + 41 stdcall SQLDriverConnect(long long str long ptr long ptr long) 42 stdcall SQLGetConnectOption(long long ptr) 43 stdcall SQLGetData(long long long ptr long ptr) 44 stdcall SQLGetFunctions(long long ptr) @@ -52,14 +52,14 @@ 52 stdcall SQLSpecialColumns(long long str long str long str long long long) 53 stdcall SQLStatistics(long str long str long str long long long) 54 stdcall SQLTables(long str long str long str long str long) - 55 stdcall SQLBrowseConnect(long str long str long ptr) + 55 stdcall SQLBrowseConnect(long str long ptr long ptr) 56 stdcall SQLColumnPrivileges(long str long str long str long str long) - 57 stdcall SQLDataSources(long long str long ptr str long ptr) + 57 stdcall SQLDataSources(long long str long ptr ptr long ptr) 58 stdcall SQLDescribeParam(long long ptr ptr ptr ptr) 59 stdcall SQLExtendedFetch(long long long ptr ptr) 60 stdcall SQLForeignKeys(long str long str long str long str long str long str long) 61 stdcall SQLMoreResults(long) - 62 stdcall SQLNativeSql(long str long str long ptr) + 62 stdcall SQLNativeSql(long str long ptr long ptr) 63 stdcall SQLNumParams(long ptr) 64 stdcall SQLParamOptions(long long ptr) 65 stdcall SQLPrimaryKeys(long str long str long str long) @@ -68,7 +68,7 @@ 68 stdcall SQLSetPos(long long long long) 69 stdcall SQLSetScrollOptions(long long long long) 70 stdcall SQLTablePrivileges(long str long str long str long) - 71 stdcall SQLDrivers(long long str long ptr str long ptr) + 71 stdcall SQLDrivers(long long str long ptr ptr long ptr) 72 stdcall SQLBindParameter(long long long long long long long ptr long ptr) 73 stdcall SQLSetDescField(long long long ptr long) 74 stdcall SQLSetDescRec(long long long long long long long ptr ptr ptr) @@ -88,22 +88,22 @@ 90 stub ODBCSharedVSFlag 106 stdcall SQLColAttributesW(long long long ptr long ptr ptr) 107 stdcall SQLConnectW(long wstr long wstr long wstr long) -108 stdcall SQLDescribeColW(long long wstr long ptr ptr ptr ptr ptr) -110 stdcall SQLErrorW(long long long wstr ptr wstr long ptr) -111 stdcall SQLExecDirectW(long wstr long) -117 stdcall SQLGetCursorNameW(long wstr long ptr) +108 stdcall SQLDescribeColW(long long ptr long ptr ptr ptr ptr ptr) +110 stdcall SQLErrorW(long long long ptr ptr ptr long ptr) +111 stdcall SQLExecDirectW(long ptr long) +117 stdcall SQLGetCursorNameW(long ptr long ptr) 119 stdcall SQLPrepareW(long wstr long) 121 stdcall SQLSetCursorNameW(long wstr long) 127 stdcall SQLColAttributeW(long long long ptr long ptr ptr) 132 stdcall SQLGetConnectAttrW(long long ptr long ptr) 133 stdcall SQLGetDescFieldW(long long long ptr long ptr) -134 stdcall SQLGetDescRecW(long long wstr long ptr ptr ptr ptr ptr ptr ptr) +134 stdcall SQLGetDescRecW(long long ptr long ptr ptr ptr ptr ptr ptr ptr) 135 stdcall SQLGetDiagFieldW(long long long long ptr long ptr) -136 stdcall SQLGetDiagRecW(long long long wstr ptr wstr long ptr) +136 stdcall SQLGetDiagRecW(long long long ptr ptr ptr long ptr) 138 stdcall SQLGetStmtAttrW(long long ptr long ptr) 139 stdcall SQLSetConnectAttrW(long long ptr long) 140 stdcall SQLColumnsW(long wstr long wstr long wstr long wstr long) -141 stdcall SQLDriverConnectW(long long wstr long wstr long ptr long) +141 stdcall SQLDriverConnectW(long long wstr long ptr long ptr long) 142 stdcall SQLGetConnectOptionW(long long ptr) 145 stdcall SQLGetInfoW(long long ptr long ptr) 147 stdcall SQLGetTypeInfoW(long long) @@ -111,16 +111,16 @@ 152 stdcall SQLSpecialColumnsW(long long wstr long wstr long wstr long long long) 153 stdcall SQLStatisticsW(long wstr long wstr long wstr long long long) 154 stdcall SQLTablesW(long wstr long wstr long wstr long wstr long) -155 stdcall SQLBrowseConnectW(long wstr long wstr long ptr) +155 stdcall SQLBrowseConnectW(long wstr long ptr long ptr) 156 stdcall SQLColumnPrivilegesW(long wstr long wstr long wstr long wstr long) -157 stdcall SQLDataSourcesW(long long wstr long ptr wstr long ptr) +157 stdcall SQLDataSourcesW(long long wstr long ptr ptr long ptr) 160 stdcall SQLForeignKeysW(long wstr long wstr long wstr long wstr long wstr long wstr long) -162 stdcall SQLNativeSqlW(long wstr long wstr long ptr) +162 stdcall SQLNativeSqlW(long wstr long ptr long ptr) 165 stdcall SQLPrimaryKeysW(long wstr long wstr long wstr long) 166 stdcall SQLProcedureColumnsW(long wstr long wstr long wstr long wstr long) 167 stdcall SQLProceduresW(long wstr long wstr long wstr long) 170 stdcall SQLTablePrivilegesW(long wstr long wstr long wstr long) -171 stdcall SQLDriversW(long long wstr long ptr wstr long ptr) +171 stdcall SQLDriversW(long long wstr long ptr ptr long ptr) 173 stdcall SQLSetDescFieldW(long long long ptr long) 176 stdcall SQLSetStmtAttrW(long long ptr long) 206 stub SQLColAttributesA @@ -150,7 +150,7 @@ 254 stub SQLTablesA 255 stub SQLBrowseConnectA 256 stub SQLColumnPrivilegesA -257 stdcall SQLDataSourcesA(long long str long ptr str long ptr) +257 stdcall SQLDataSourcesA(long long str long ptr ptr long ptr) 260 stub SQLForeignKeysA 262 stub SQLNativeSqlA 265 stub SQLPrimaryKeysA

1 0

Hans Leidekker : odbc32: Use LoadLibraryExW() instead of LoadLibraryW().
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: ac7f96f0fbdd3f074d2b0cfa32abd72a50d7a5d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ac7f96f0fbdd3f074d2b0cfa32abd7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 12 09:17:19 2024 +0200 odbc32: Use LoadLibraryExW() instead of LoadLibraryW(). --- dlls/odbc32/proxyodbc.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index c78c76103eb..2b7bf1c4236 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -338,32 +338,20 @@ static const struct win32_funcs *load_driver( const WCHAR *filename ) { HMODULE module; struct win32_driver *driver; - WCHAR *ptr, *path = wcsdup( filename ); + WCHAR *ptr; UINT32 i; for (i = 0; i < win32_drivers.count; i++) { - if (!wcsicmp( filename, win32_drivers.drivers[i]->filename )) - { - free( path ); - return &win32_drivers.drivers[i]->funcs; - } + if (!wcsicmp( filename, win32_drivers.drivers[i]->filename )) return &win32_drivers.drivers[i]->funcs; } - if (!(driver = malloc( sizeof(*driver) + (wcslen(filename) + 1) * sizeof(WCHAR) ))) - { - free( path ); - return NULL; - } + if (!(driver = malloc( sizeof(*driver) + (wcslen(filename) + 1) * sizeof(WCHAR) ))) return NULL; ptr = (WCHAR *)(driver + 1); wcscpy( ptr, filename ); driver->filename = ptr; - if ((ptr = wcsrchr( path, '\\' )) || (ptr = wcsrchr( path, '/' ))) *ptr = 0; - SetDllDirectoryW( path ); - module = LoadLibraryW( filename ); - SetDllDirectoryW( NULL ); - free( path ); + module = LoadLibraryExW( filename, NULL, LOAD_LIBRARY_SEARCH_DLL_LOAD_DIR | LOAD_LIBRARY_SEARCH_DEFAULT_DIRS ); if (!module) { free( driver );

1 0

Gabriel Ivăncescu : jscript: Make JS_COUNT_OPERATION a no-op.
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: bfa85536a34e99c4d77bfce67301132e41874d0d URL: https://gitlab.winehq.org/wine/wine/-/commit/bfa85536a34e99c4d77bfce6730113… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Jul 15 16:09:50 2024 +0300 jscript: Make JS_COUNT_OPERATION a no-op. It's not an error, and this just pollutes the logs for no reason. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/regexp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 325b5ad56d6..a29b4bb90e1 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define ReportRegExpErrorHelper(a,b,c,d) throw_error((a)->context, E_FAIL, L"") #define JS_ReportErrorNumber(a,b,c,d) throw_error((a), E_FAIL, L"") #define JS_ReportErrorFlagsAndNumber(a,b,c,d,e,f) throw_error((a), E_FAIL, L"") -#define JS_COUNT_OPERATION(a,b) throw_error((a), E_FAIL, L"") +#define JS_COUNT_OPERATION(a,b) do { } while(0) typedef BYTE JSPackedBool;

1 0

Paul Gofman : mshtml: Check get_document_node() result in get_node().
by Alexandre Julliard July 15, 2024

July 15, 2024

Module: wine Branch: master Commit: 20169cb2e9d9b8824c85a72d23fc05150546da49 URL: https://gitlab.winehq.org/wine/wine/-/commit/20169cb2e9d9b8824c85a72d23fc05… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jul 12 14:02:54 2024 -0600 mshtml: Check get_document_node() result in get_node(). Suggested by Gabriel Ivăncescu. --- dlls/mshtml/htmlnode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index ceb50a17d02..36e89818bb3 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1410,7 +1410,7 @@ HRESULT get_node(nsIDOMNode *nsnode, BOOL create, HTMLDOMNode **ret) hres = get_document_node(dom_document, &document); nsIDOMDocument_Release(dom_document); - if(!document) + if(FAILED(hres)) return E_FAIL; hres = create_node(document, nsnode, ret);

1 0

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

July 15, 2024

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

Alexandre Julliard : Release 9.13.
by Alexandre Julliard July 14, 2024

July 14, 2024

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

Rémi Bernon : maintainers: Remove MF GStreamer section.
by Alexandre Julliard July 14, 2024

July 14, 2024

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

Tag wine-9.13 : Alexandre Julliard : Release 9.13
by Alexandre Julliard July 14, 2024

July 14, 2024

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

Piotr Caban : ucrtbase: Fix FILE no buffering flag value.
by Alexandre Julliard July 14, 2024

July 14, 2024

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

Fabian Maurer : msv1_0: Set mode in ntlm_check_version.
by Alexandre Julliard July 14, 2024

July 14, 2024

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