December 2020 - Wine-Commits

Piotr Caban : msvcrt: Use _configthreadlocale arguments definition from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: a7b9948f396a904b43851105f14e86455ebae703 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b9948f396a904b43851105… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:25 2020 +0100 msvcrt: Use _configthreadlocale arguments definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/locale.c | 8 ++++---- dlls/msvcrt/msvcrt.h | 3 --- include/msvcrt/locale.h | 12 ++++++++++++ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index 39ab6dadc84..ba98d31d719 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -2052,12 +2052,12 @@ int CDECL _configthreadlocale(int type) thread_data_t *data = msvcrt_get_thread_data(); int ret; - ret = (data->locale_flags & LOCALE_THREAD ? MSVCRT__ENABLE_PER_THREAD_LOCALE : - MSVCRT__DISABLE_PER_THREAD_LOCALE); + ret = (data->locale_flags & LOCALE_THREAD ? _ENABLE_PER_THREAD_LOCALE : + _DISABLE_PER_THREAD_LOCALE); - if(type == MSVCRT__ENABLE_PER_THREAD_LOCALE) + if(type == _ENABLE_PER_THREAD_LOCALE) data->locale_flags |= LOCALE_THREAD; - else if(type == MSVCRT__DISABLE_PER_THREAD_LOCALE) + else if(type == _DISABLE_PER_THREAD_LOCALE) data->locale_flags &= ~LOCALE_THREAD; else if(type) ret = -1; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 28feb7d90df..d86056f4c05 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -296,9 +296,6 @@ extern FILE MSVCRT__iob[]; #define _MAX__TIME64_T (((__time64_t)0x00000007 << 32) | 0x93406FFF) -#define MSVCRT__ENABLE_PER_THREAD_LOCALE 1 -#define MSVCRT__DISABLE_PER_THREAD_LOCALE 2 - _locale_t CDECL get_current_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; void CDECL free_locale_noalloc(_locale_t locale) DECLSPEC_HIDDEN; pthreadlocinfo CDECL get_locinfo(void) DECLSPEC_HIDDEN; diff --git a/include/msvcrt/locale.h b/include/msvcrt/locale.h index ee0d99b8e7e..d2963813475 100644 --- a/include/msvcrt/locale.h +++ b/include/msvcrt/locale.h @@ -68,6 +68,18 @@ struct lconv struct tm; +#ifndef _CONFIG_LOCALE_SWT +#define _CONFIG_LOCALE_SWT + +#define _ENABLE_PER_THREAD_LOCALE 0x1 +#define _DISABLE_PER_THREAD_LOCALE 0x2 +#define _ENABLE_PER_THREAD_LOCALE_GLOBAL 0x10 +#define _DISABLE_PER_THREAD_LOCALE_GLOBAL 0x20 +#define _ENABLE_PER_THREAD_LOCALE_NEW 0x100 +#define _DISABLE_PER_THREAD_LOCALE_NEW 0x200 + +#endif + #ifdef __cplusplus extern "C" { #endif

1 0

Piotr Caban : ntdll: Fix memchr implementation.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 7d94c4f0e4e96c97c0beed7aead626026caa2d03 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d94c4f0e4e96c97c0beed7a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 17:41:50 2020 +0100 ntdll: Fix memchr implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50228 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/string.c | 2 +- dlls/ntdll/string.c | 2 +- dlls/ntdll/tests/string.c | 21 +++++++++++++++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 0c4c657ba99..348c36f3ed5 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2621,7 +2621,7 @@ void* __cdecl memchr(const void *ptr, int c, size_t n) { const unsigned char *p = ptr; - for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + for (p = ptr; n; n--, p++) if (*p == (unsigned char)c) return (void *)(ULONG_PTR)p; return NULL; } diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 588b5dd5de7..f1cea6caa83 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -72,7 +72,7 @@ void * __cdecl memchr( const void *ptr, int c, size_t n ) { const unsigned char *p = ptr; - for (p = ptr; n; n--, p++) if (*p == c) return (void *)(ULONG_PTR)p; + for (p = ptr; n; n--, p++) if (*p == (unsigned char)c) return (void *)(ULONG_PTR)p; return NULL; } diff --git a/dlls/ntdll/tests/string.c b/dlls/ntdll/tests/string.c index b6a40f6709c..6939dd3c15e 100644 --- a/dlls/ntdll/tests/string.c +++ b/dlls/ntdll/tests/string.c @@ -65,6 +65,7 @@ static int (__cdecl *p_wcsnicmp)(LPCWSTR,LPCWSTR,int); static LPWSTR (__cdecl *pwcschr)(LPCWSTR, WCHAR); static LPWSTR (__cdecl *pwcsrchr)(LPCWSTR, WCHAR); +static void* (__cdecl *pmemchr)(const void*, int, size_t); static void (__cdecl *pqsort)(void *,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); static void* (__cdecl *pbsearch)(void *,void*,size_t,size_t, int(__cdecl *compar)(const void *, const void *) ); @@ -134,6 +135,7 @@ static void InitFunctionPtrs(void) X(_wcsnicmp); X(wcschr); X(wcsrchr); + X(memchr); X(qsort); X(bsearch); X(_snprintf); @@ -2035,6 +2037,24 @@ static void test_ctype(void) } } +static void test_memchr(void) +{ + const char s[] = "ab"; + char *r; + + r = pmemchr(s, 'z', 2); + ok(!r, "memchr returned %p, expected NULL\n", r); + + r = pmemchr(s, 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); + + r = pmemchr(s, 0x100 + 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); + + r = pmemchr(s, -0x100 + 'a', 2); + ok(r == s, "memchr returned %p, expected %p\n", r, s); +} + START_TEST(string) { InitFunctionPtrs(); @@ -2066,4 +2086,5 @@ START_TEST(string) test_sscanf(); test_wctype(); test_ctype(); + test_memchr(); }

1 0

Matteo Bruni : wined3d: Rename d3d_synchronous debug channel to d3d_sync.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 5031b9a994a0503b1861187537fa2070e52f0aab URL: https://source.winehq.org/git/wine.git/?a=commit;h=5031b9a994a0503b18611875… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Dec 3 17:58:53 2020 +0100 wined3d: Rename d3d_synchronous debug channel to d3d_sync. The old name exceeded the maximum size of 14 characters. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index ea12778e292..467f5b64d6c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); -WINE_DECLARE_DEBUG_CHANNEL(d3d_synchronous); +WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); #define WINED3D_MAX_FBO_ENTRIES 64 #define WINED3D_ALL_LAYERS (~0u) @@ -2144,7 +2144,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (context_debug_output_enabled(gl_info)) { GL_EXTCALL(glDebugMessageCallback(wined3d_debug_callback, context)); - if (TRACE_ON(d3d_synchronous)) + if (TRACE_ON(d3d_sync)) gl_info->gl_ops.gl.p_glEnable(GL_DEBUG_OUTPUT_SYNCHRONOUS); GL_EXTCALL(glDebugMessageControl(GL_DONT_CARE, GL_DONT_CARE, GL_DONT_CARE, 0, NULL, GL_FALSE)); if (ERR_ON(d3d))

1 0

Alistair Leslie-Hughes : odbccp32: Implement SQLRemoveDSNFromIni/w.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 44e2a14af1b9af22388098a66ea15cf92fe88065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44e2a14af1b9af22388098a6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Dec 2 20:36:20 2020 +1100 odbccp32: Implement SQLRemoveDSNFromIni/w. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/odbccp32/odbccp32.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/odbccp32/odbccp32.c b/dlls/odbccp32/odbccp32.c index 0e4a12534c8..420f206b700 100644 --- a/dlls/odbccp32/odbccp32.c +++ b/dlls/odbccp32/odbccp32.c @@ -1523,18 +1523,45 @@ BOOL WINAPI SQLRemoveDriverManager(LPDWORD pdwUsageCount) BOOL WINAPI SQLRemoveDSNFromIniW(LPCWSTR lpszDSN) { + HKEY hkey; + + TRACE("%s\n", debugstr_w(lpszDSN)); + clear_errors(); - FIXME("%s\n", debugstr_w(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\ODBC\\ODBC.INI\\ODBC Data Sources", &hkey) == ERROR_SUCCESS) + { + RegDeleteValueW(hkey, lpszDSN); + RegCloseKey(hkey); + } + + if (RegOpenKeyW(HKEY_LOCAL_MACHINE, L"Software\\ODBC\\ODBC.INI", &hkey) == ERROR_SUCCESS) + { + RegDeleteTreeW(hkey, lpszDSN); + RegCloseKey(hkey); + } + + return TRUE; } BOOL WINAPI SQLRemoveDSNFromIni(LPCSTR lpszDSN) { + BOOL ret = FALSE; + WCHAR *dsn; + + TRACE("%s\n", debugstr_a(lpszDSN)); + clear_errors(); - FIXME("%s\n", debugstr_a(lpszDSN)); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; + + dsn = SQLInstall_strdup(lpszDSN); + if (dsn) + ret = SQLRemoveDSNFromIniW(dsn); + else + push_error(ODBC_ERROR_OUT_OF_MEM, odbc_error_out_of_mem); + + heap_free(dsn); + + return ret; } BOOL WINAPI SQLRemoveTranslatorW(const WCHAR *translator, DWORD *usage_count)

1 0

Arkadiusz Hiler : user32: Fix WM_DEVICECHANGE handling.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: b4abe3889f95e74df77f9fac117b30d236b2b2cc URL: https://source.winehq.org/git/wine.git/?a=commit;h=b4abe3889f95e74df77f9fac… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Nov 25 17:04:14 2020 +0200 user32: Fix WM_DEVICECHANGE handling. WM_DEVICECHANGE's lParam can be either a pointer to a variant of DEV_BROADCAST_HDR or an immediate value (usually 0) depending on the wParam's value. This fixes a crash when broadcasting WM_DEVICECHANGE with wParam = DBT_DEVNODES_CHANGED, lParam = 0. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/message.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index d8ebbfd32e3..f7ce262f90d 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -1023,7 +1023,7 @@ static size_t pack_message( HWND hwnd, UINT message, WPARAM wparam, LPARAM lpara case WM_DEVICECHANGE: { DEV_BROADCAST_HDR *header = (DEV_BROADCAST_HDR *)lparam; - push_data( data, header, header->dbch_size ); + if ((wparam & 0x8000) && header) push_data( data, header, header->dbch_size ); return 0; } case WM_WINE_KEYBOARD_LL_HOOK: @@ -1426,6 +1426,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (!get_buffer_space( buffer, sizeof(BOOL) )) return FALSE; break; case WM_DEVICECHANGE: + if (!(*wparam & 0x8000)) return TRUE; minsize = sizeof(DEV_BROADCAST_HDR); break; case WM_WINE_KEYBOARD_LL_HOOK:

1 0

Alexandre Julliard : Release 6.0-rc1.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 842b38e29166a429d59331be40761335807c85d2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=842b38e29166a429d59331be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Dec 4 21:34:24 2020 +0100 Release 6.0-rc1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1057 ++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 608 insertions(+), 471 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=842b38e29166a429d593…

1 0

Piotr Caban : msvcrt: Use _finddata_t definition from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 8a2dc3aa42551da56dfc3fb9f1b3979c032a9738 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a2dc3aa42551da56dfc3fb9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:11 2020 +0100 msvcrt: Use _finddata_t definition from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/dir.c | 42 ++++++++++++++++--------- dlls/msvcrt/msvcrt.h | 88 ---------------------------------------------------- 2 files changed, 27 insertions(+), 103 deletions(-) diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index 689cfe805d1..53b97914cda 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -21,6 +21,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <corecrt_io.h> #include <stdarg.h> #include <stdlib.h> #include <direct.h> @@ -44,8 +45,19 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); #undef _wfindnext64i32 #undef _wfindnext64 +#undef _findfirst +#undef _findfirsti64 +#undef _findnext +#undef _findnexti64 +#undef _findfirst32 +#undef _findnext32 +#undef _findfirst64i32 +#undef _findfirst64 +#undef _findnext64i32 +#undef _findnext64 + /* INTERNAL: Translate WIN32_FIND_DATAA to finddata_t */ -static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t* ft) +static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct _finddata_t* ft) { DWORD dw; @@ -65,7 +77,7 @@ static void msvcrt_fttofd( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata_t } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata32_t */ -static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata32_t* ft) +static void msvcrt_fttofd32( const WIN32_FIND_DATAA *fd, struct _finddata32_t* ft) { DWORD dw; @@ -125,7 +137,7 @@ static void msvcrt_wfttofd32(const WIN32_FIND_DATAW *fd, struct _wfinddata32_t* } /* INTERNAL: Translate WIN32_FIND_DATAA to finddatai64_t */ -static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddatai64_t* ft) +static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct _finddatai64_t* ft) { DWORD dw; @@ -145,7 +157,7 @@ static void msvcrt_fttofdi64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddat } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata64_t */ -static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64_t* ft) +static void msvcrt_fttofd64( const WIN32_FIND_DATAA *fd, struct _finddata64_t* ft) { DWORD dw; @@ -185,7 +197,7 @@ static void msvcrt_wfttofd64( const WIN32_FIND_DATAW *fd, struct _wfinddata64_t* } /* INTERNAL: Translate WIN32_FIND_DATAA to finddata64i32_t */ -static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct MSVCRT__finddata64i32_t* ft) +static void msvcrt_fttofd64i32( const WIN32_FIND_DATAA *fd, struct _finddata64i32_t* ft) { DWORD dw; @@ -357,7 +369,7 @@ int CDECL _findclose(intptr_t hand) * NOTES * See FindFirstFileA. */ -intptr_t CDECL _findfirst(const char * fspec, struct MSVCRT__finddata_t* ft) +intptr_t CDECL _findfirst(const char * fspec, struct _finddata_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -376,7 +388,7 @@ intptr_t CDECL _findfirst(const char * fspec, struct MSVCRT__finddata_t* ft) /********************************************************************* * _findfirst32 (MSVCRT.@) */ -intptr_t CDECL _findfirst32(const char * fspec, struct MSVCRT__finddata32_t* ft) +intptr_t CDECL _findfirst32(const char * fspec, struct _finddata32_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -439,7 +451,7 @@ intptr_t CDECL _wfindfirst32(const wchar_t * fspec, struct _wfinddata32_t* ft) * * 64-bit version of _findfirst. */ -intptr_t CDECL _findfirsti64(const char * fspec, struct MSVCRT__finddatai64_t* ft) +intptr_t CDECL _findfirsti64(const char * fspec, struct _finddatai64_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -460,7 +472,7 @@ intptr_t CDECL _findfirsti64(const char * fspec, struct MSVCRT__finddatai64_t* f * * 64-bit version of _findfirst. */ -intptr_t CDECL _findfirst64(const char * fspec, struct MSVCRT__finddata64_t* ft) +intptr_t CDECL _findfirst64(const char * fspec, struct _finddata64_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -502,7 +514,7 @@ intptr_t CDECL _wfindfirst64(const wchar_t * fspec, struct _wfinddata64_t* ft) * * 64-bit/32-bit version of _findfirst. */ -intptr_t CDECL _findfirst64i32(const char * fspec, struct MSVCRT__finddata64i32_t* ft) +intptr_t CDECL _findfirst64i32(const char * fspec, struct _finddata64i32_t* ft) { WIN32_FIND_DATAA find_data; HANDLE hfind; @@ -576,7 +588,7 @@ intptr_t CDECL _wfindfirsti64(const wchar_t * fspec, struct _wfinddatai64_t* ft) * NOTES * See FindNextFileA. */ -int CDECL _findnext(intptr_t hand, struct MSVCRT__finddata_t * ft) +int CDECL _findnext(intptr_t hand, struct _finddata_t * ft) { WIN32_FIND_DATAA find_data; @@ -593,7 +605,7 @@ int CDECL _findnext(intptr_t hand, struct MSVCRT__finddata_t * ft) /********************************************************************* * _findnext32 (MSVCRT.@) */ -int CDECL _findnext32(intptr_t hand, struct MSVCRT__finddata32_t * ft) +int CDECL _findnext32(intptr_t hand, struct _finddata32_t * ft) { WIN32_FIND_DATAA find_data; @@ -648,7 +660,7 @@ int CDECL _wfindnext(intptr_t hand, struct _wfinddata_t * ft) * * 64-bit version of _findnext. */ -int CDECL _findnexti64(intptr_t hand, struct MSVCRT__finddatai64_t * ft) +int CDECL _findnexti64(intptr_t hand, struct _finddatai64_t * ft) { WIN32_FIND_DATAA find_data; @@ -667,7 +679,7 @@ int CDECL _findnexti64(intptr_t hand, struct MSVCRT__finddatai64_t * ft) * * 64-bit version of _findnext. */ -int CDECL _findnext64(intptr_t hand, struct MSVCRT__finddata64_t * ft) +int CDECL _findnext64(intptr_t hand, struct _finddata64_t * ft) { WIN32_FIND_DATAA find_data; @@ -705,7 +717,7 @@ int CDECL _wfindnext64(intptr_t hand, struct _wfinddata64_t * ft) * * 64-bit/32-bit version of _findnext. */ -int CDECL _findnext64i32(intptr_t hand, struct MSVCRT__finddata64i32_t * ft) +int CDECL _findnext64i32(intptr_t hand, struct _finddata64i32_t * ft) { WIN32_FIND_DATAA find_data; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 802482499ec..48b2ddfce72 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,78 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -struct MSVCRT__finddata32_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - _fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata32i64_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__finddata64i32_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - _fsize_t size; - char name[260]; -}; - -struct MSVCRT__finddata64_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - char name[260]; -}; - -struct MSVCRT__wfinddata32_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata32i64_t { - unsigned int attrib; - __time32_t time_create; - __time32_t time_access; - __time32_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64i32_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - _fsize_t size; - wchar_t name[260]; -}; - -struct MSVCRT__wfinddata64_t { - unsigned int attrib; - __time64_t time_create; - __time64_t time_access; - __time64_t time_write; - __int64 DECLSPEC_ALIGN(8) size; - wchar_t name[260]; -}; - struct MSVCRT__stat32 { _dev_t st_dev; _ino_t st_ino; @@ -411,22 +339,6 @@ struct MSVCRT__stat64 { __time64_t st_ctime; }; -#ifdef _WIN64 -#define MSVCRT__finddata_t MSVCRT__finddata64i32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata64i32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata64_t -#define MSVCRT__stat MSVCRT__stat64i32 -#define MSVCRT__stati64 MSVCRT__stat64 -#else -#define MSVCRT__finddata_t MSVCRT__finddata32_t -#define MSVCRT__finddatai64_t MSVCRT__finddata32i64_t -#define MSVCRT__wfinddata_t MSVCRT__wfinddata32_t -#define MSVCRT__wfinddatai64_t MSVCRT__wfinddata32i64_t -#define MSVCRT__stat MSVCRT__stat32 -#define MSVCRT__stati64 MSVCRT__stat32i64 -#endif - #define MSVCRT_RAND_MAX 0x7fff #define MSVCRT_NO_CONSOLE_FD (-2)

1 0

Piotr Caban : msvcrt: Use _JUMP_BUFFER from public header.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 835a83e3f9699a83482bc5e74d2e931d87cb1a5a URL: https://source.winehq.org/git/wine.git/?a=commit;h=835a83e3f9699a83482bc5e7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 4 15:50:04 2020 +0100 msvcrt: Use _JUMP_BUFFER from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_arm.c | 3 +- dlls/msvcrt/except_arm64.c | 3 +- dlls/msvcrt/except_i386.c | 15 ++++---- dlls/msvcrt/except_x86_64.c | 3 +- dlls/msvcrt/msvcrt.h | 86 --------------------------------------------- 5 files changed, 14 insertions(+), 96 deletions(-) diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index c76d9b4c330..8e5c552b552 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -21,6 +21,7 @@ #ifdef __arm__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -114,7 +115,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 7be0132acd0..242ef8bdb09 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -22,6 +22,7 @@ #ifdef __aarch64__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -115,7 +116,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void __cdecl MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 86d80d7deda..23a027368ba 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -27,6 +27,7 @@ #ifdef __i386__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -691,7 +692,7 @@ __ASM_GLOBAL_FUNC( __CxxFrameHandler, * * Callback meant to be used as UnwindFunc for setjmp/longjmp. */ -void __stdcall __CxxLongjmpUnwind( const struct MSVCRT___JUMP_BUFFER *buf ) +void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf ) { cxx_exception_frame *frame = (cxx_exception_frame *)buf->Registration; const cxx_function_descr *descr = (const cxx_function_descr *)buf->UnwindData[0]; @@ -1019,7 +1020,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), */ #define MSVCRT_JMP_MAGIC 0x56433230 /* ID value for new jump structure */ -typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFFER *); +typedef void (__stdcall *MSVCRT_unwind_function)(const _JUMP_BUFFER *); /* define an entrypoint for setjmp/setjmp3 that stores the registers in the jmp buf */ /* and then jumps to the C backend function */ @@ -1039,7 +1040,7 @@ typedef void (__stdcall *MSVCRT_unwind_function)(const struct MSVCRT___JUMP_BUFF * _setjmp (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT(MSVCRT__setjmp) -int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp) +int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(_JUMP_BUFFER *jmp) { jmp->Registration = (unsigned long)NtCurrentTeb()->Tib.ExceptionList; if (jmp->Registration == ~0UL) @@ -1056,7 +1057,7 @@ int CDECL DECLSPEC_HIDDEN __regs_MSVCRT__setjmp(struct MSVCRT___JUMP_BUFFER *jmp * _setjmp3 (MSVCRT.@) */ DEFINE_SETJMP_ENTRYPOINT( MSVCRT__setjmp3 ) -int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER *jmp, int nb_args, ...) +int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(_JUMP_BUFFER *jmp, int nb_args, ...) { jmp->Cookie = MSVCRT_JMP_MAGIC; jmp->UnwindFunc = 0; @@ -1087,7 +1088,7 @@ int WINAPIV DECLSPEC_HIDDEN __regs_MSVCRT__setjmp3(struct MSVCRT___JUMP_BUFFER * /********************************************************************* * longjmp (MSVCRT.@) */ -void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) +void CDECL MSVCRT_longjmp(_JUMP_BUFFER *jmp, int retval) { unsigned long cur_frame = 0; @@ -1125,7 +1126,7 @@ void CDECL MSVCRT_longjmp(struct MSVCRT___JUMP_BUFFER *jmp, int retval) /********************************************************************* * _seh_longjmp_unwind (MSVCRT.@) */ -void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) +void __stdcall _seh_longjmp_unwind(_JUMP_BUFFER *jmp) { msvcrt_local_unwind2( (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); } @@ -1133,7 +1134,7 @@ void __stdcall _seh_longjmp_unwind(struct MSVCRT___JUMP_BUFFER *jmp) /********************************************************************* * _seh_longjmp_unwind4 (MSVCRT.@) */ -void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) +void __stdcall _seh_longjmp_unwind4(_JUMP_BUFFER *jmp) { msvcrt_local_unwind4( (ULONG *)&jmp->Cookie, (MSVCRT_EXCEPTION_FRAME *)jmp->Registration, jmp->TryLevel, (void *)jmp->Ebp ); diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index a1a1bc14543..7cbffc0d837 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -20,6 +20,7 @@ #ifdef __x86_64__ +#include <setjmp.h> #include <stdarg.h> #include <fpieee.h> @@ -705,7 +706,7 @@ __ASM_GLOBAL_FUNC( MSVCRT__setjmp, /******************************************************************* * longjmp (MSVCRT.@) */ -void __cdecl MSVCRT_longjmp( struct MSVCRT___JUMP_BUFFER *jmp, int retval ) +void __cdecl MSVCRT_longjmp( _JUMP_BUFFER *jmp, int retval ) { EXCEPTION_RECORD rec; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index b26d736cb18..802482499ec 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -283,92 +283,6 @@ extern unsigned msvcrt_create_io_inherit_block(WORD*, BYTE**) DECLSPEC_HIDDEN; extern FILE MSVCRT__iob[]; -#ifdef __i386__ -struct MSVCRT___JUMP_BUFFER { - unsigned long Ebp; - unsigned long Ebx; - unsigned long Edi; - unsigned long Esi; - unsigned long Esp; - unsigned long Eip; - unsigned long Registration; - unsigned long TryLevel; - /* Start of new struct members */ - unsigned long Cookie; - unsigned long UnwindFunc; - unsigned long UnwindData[6]; -}; -#elif defined(__x86_64__) -struct MSVCRT__SETJMP_FLOAT128 -{ - unsigned __int64 DECLSPEC_ALIGN(16) Part[2]; -}; -struct MSVCRT___JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Rbx; - unsigned __int64 Rsp; - unsigned __int64 Rbp; - unsigned __int64 Rsi; - unsigned __int64 Rdi; - unsigned __int64 R12; - unsigned __int64 R13; - unsigned __int64 R14; - unsigned __int64 R15; - unsigned __int64 Rip; - unsigned __int64 Spare; - struct MSVCRT__SETJMP_FLOAT128 Xmm6; - struct MSVCRT__SETJMP_FLOAT128 Xmm7; - struct MSVCRT__SETJMP_FLOAT128 Xmm8; - struct MSVCRT__SETJMP_FLOAT128 Xmm9; - struct MSVCRT__SETJMP_FLOAT128 Xmm10; - struct MSVCRT__SETJMP_FLOAT128 Xmm11; - struct MSVCRT__SETJMP_FLOAT128 Xmm12; - struct MSVCRT__SETJMP_FLOAT128 Xmm13; - struct MSVCRT__SETJMP_FLOAT128 Xmm14; - struct MSVCRT__SETJMP_FLOAT128 Xmm15; -}; -#elif defined(__arm__) -struct MSVCRT___JUMP_BUFFER -{ - unsigned long Frame; - unsigned long R4; - unsigned long R5; - unsigned long R6; - unsigned long R7; - unsigned long R8; - unsigned long R9; - unsigned long R10; - unsigned long R11; - unsigned long Sp; - unsigned long Pc; - unsigned long Fpscr; - unsigned long long D[8]; -}; -#elif defined(__aarch64__) -struct MSVCRT___JUMP_BUFFER -{ - unsigned __int64 Frame; - unsigned __int64 Reserved; - unsigned __int64 X19; - unsigned __int64 X20; - unsigned __int64 X21; - unsigned __int64 X22; - unsigned __int64 X23; - unsigned __int64 X24; - unsigned __int64 X25; - unsigned __int64 X26; - unsigned __int64 X27; - unsigned __int64 X28; - unsigned __int64 Fp; - unsigned __int64 Lr; - unsigned __int64 Sp; - unsigned long Fpcr; - unsigned long Fpsr; - double D[8]; -}; -#endif /* __i386__ */ - struct MSVCRT__finddata32_t { unsigned int attrib; __time32_t time_create;

1 0

Henri Verbeet : wined3d: Handle GL_APPLE_flush_buffer_range flushing in wined3d_context_gl_unmap_bo_address().
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: b2748a99fdd4ba9fd2c747d8a4ab11dc9b70b8ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2748a99fdd4ba9fd2c747d8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 18:33:35 2020 +0330 wined3d: Handle GL_APPLE_flush_buffer_range flushing in wined3d_context_gl_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 27 --------------------------- dlls/wined3d/context_gl.c | 9 +++++++++ 2 files changed, 9 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index c752b329a32..6ff6a5b6cd0 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,7 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ -#define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ #define VB_RESETDECLCHANGE 1000 /* Reset the decl changecount after that number of draws */ @@ -160,8 +159,6 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu list_remove(&buffer_gl->bo_user.entry); wined3d_context_gl_destroy_bo(context_gl, &buffer_gl->bo); buffer_gl->b.buffer_object = 0; - - buffer_gl->b.flags &= ~WINED3D_BUFFER_APPLESYNC; } /* Context activation is done by the caller. */ @@ -196,9 +193,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf return FALSE; } - if (!coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) - buffer_gl->b.flags |= WINED3D_BUFFER_APPLESYNC; - list_init(&buffer_gl->bo_user.entry); list_add_head(&buffer_gl->bo.users, &buffer_gl->bo_user.entry); buffer_gl->b.buffer_object = (uintptr_t)bo; @@ -988,27 +982,6 @@ static HRESULT buffer_resource_sub_resource_unmap(struct wined3d_resource *resou context = context_acquire(device, NULL, 0); - if (buffer->flags & WINED3D_BUFFER_APPLESYNC) - { - struct wined3d_context_gl *context_gl; - const struct wined3d_gl_info *gl_info; - struct wined3d_buffer_gl *buffer_gl; - unsigned int i; - - buffer_gl = wined3d_buffer_gl(buffer); - context_gl = wined3d_context_gl(context); - gl_info = context_gl->gl_info; - - wined3d_buffer_gl_bind(buffer_gl, context_gl); - for (i = 0; i < range_count; ++i) - { - GL_EXTCALL(glFlushMappedBufferRangeAPPLE(buffer_gl->bo.binding, - buffer->maps[i].offset, buffer->maps[i].size)); - checkGLcall("glFlushMappedBufferRangeAPPLE"); - } - range_count = 0; - } - addr.buffer_object = buffer->buffer_object; addr.addr = 0; wined3d_context_unmap_bo_address(context, &addr, range_count, buffer->maps); diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index f2f6185ecc6..ea12778e292 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2743,6 +2743,15 @@ void wined3d_context_gl_unmap_bo_address(struct wined3d_context_gl *context_gl, (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); } } + else if (!bo->coherent && gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) + { + for (i = 0; i < range_count; ++i) + { + GL_EXTCALL(glFlushMappedBufferRangeAPPLE(bo->binding, + (uintptr_t)data->addr + ranges[i].offset, ranges[i].size)); + checkGLcall("glFlushMappedBufferRangeAPPLE"); + } + } GL_EXTCALL(glUnmapBuffer(bo->binding)); wined3d_context_gl_bind_bo(context_gl, bo->binding, 0);

1 0

Henri Verbeet : wined3d: Get rid of redundant DISCARD filtering.
by Alexandre Julliard Dec. 4, 2020

Dec. 4, 2020

Module: wine Branch: master Commit: 1044bc4a0527c554ca20a5014eaebdc8c741ea23 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1044bc4a0527c554ca20a501… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Dec 4 18:33:34 2020 +0330 wined3d: Get rid of redundant DISCARD filtering. Now that we handle DISCARD maps ourselves, this happens implicitly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index acedc1a183e..c752b329a32 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -32,7 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define WINED3D_BUFFER_HASDESC 0x01 /* A vertex description has been found. */ #define WINED3D_BUFFER_USE_BO 0x02 /* Use a buffer object for this buffer. */ #define WINED3D_BUFFER_PIN_SYSMEM 0x04 /* Keep a system memory copy for this buffer. */ -#define WINED3D_BUFFER_DISCARD 0x08 /* A DISCARD lock has occurred since the last preload. */ #define WINED3D_BUFFER_APPLESYNC 0x10 /* Using sync as in GL_APPLE_flush_buffer_range. */ #define VB_MAXDECLCHANGES 100 /* After that number of decl changes we stop converting */ @@ -714,11 +713,6 @@ void * CDECL wined3d_buffer_get_parent(const struct wined3d_buffer *buffer) return buffer->resource.parent; } -static void buffer_mark_used(struct wined3d_buffer *buffer) -{ - buffer->flags &= ~WINED3D_BUFFER_DISCARD; -} - /* Context activation is done by the caller. */ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_state *state) @@ -738,8 +732,6 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * WARN("Loading mapped buffer.\n"); } - buffer_mark_used(buffer); - /* TODO: Make converting independent from VBOs */ if (!(buffer->flags & WINED3D_BUFFER_USE_BO)) { @@ -921,16 +913,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (count == 1) { - /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 - * multitexture fill rate test seems to depend on this. When - * we map a buffer with GL_MAP_INVALIDATE_BUFFER_BIT, the - * driver is free to discard the previous contents of the - * buffer. The r600g driver only does this when the buffer is - * currently in use, while the proprietary NVIDIA driver - * appears to do this unconditionally. */ - if (buffer->flags & WINED3D_BUFFER_DISCARD) - flags &= ~WINED3D_MAP_DISCARD; - addr.buffer_object = buffer->buffer_object; addr.addr = 0; buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); @@ -962,9 +944,6 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc context_release(context); } - - if (flags & WINED3D_MAP_DISCARD) - buffer->flags |= WINED3D_BUFFER_DISCARD; } base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory; @@ -1052,9 +1031,6 @@ void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_off TRACE("dst_buffer %p, dst_offset %u, src_buffer %p, src_offset %u, size %u.\n", dst_buffer, dst_offset, src_buffer, src_offset, size); - buffer_mark_used(dst_buffer); - buffer_mark_used(src_buffer); - dst_location = wined3d_buffer_get_memory(dst_buffer, &dst, dst_buffer->locations); dst.addr += dst_offset;

1 0