November 2020 - Wine-Commits

Piotr Caban : msvcrt: Remove MSVCRT_ prefix from cpp.c functions.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 772f0331aa1c4e24f97ca5c5ae27a65805cea8d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=772f0331aa1c4e24f97ca5c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:22 2020 +0100 msvcrt: Remove MSVCRT_ prefix from cpp.c functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 148 ++++++------- dlls/msvcr110/msvcr110.spec | 192 ++++++++--------- dlls/msvcr120/msvcr120.spec | 192 ++++++++--------- dlls/msvcr70/msvcr70.spec | 154 ++++++------- dlls/msvcr71/msvcr71.spec | 138 ++++++------ dlls/msvcr80/msvcr80.spec | 144 ++++++------- dlls/msvcr90/msvcr90.spec | 144 ++++++------- dlls/msvcrt/cpp.c | 510 ++++++++++++++++++++++---------------------- dlls/msvcrt/cppexcept.h | 8 +- dlls/msvcrt/cxx.h | 14 +- dlls/msvcrt/except_i386.c | 6 +- dlls/msvcrt/except_x86_64.c | 6 +- dlls/msvcrt/msvcrt.h | 17 +- dlls/msvcrt/msvcrt.spec | 216 +++++++++---------- dlls/msvcrt/scheduler.c | 22 +- dlls/msvcrtd/msvcrtd.spec | 138 ++++++------ dlls/ucrtbase/ucrtbase.spec | 36 ++-- 17 files changed, 1042 insertions(+), 1043 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=772f0331aa1c4e24f97c…

1 0

Piotr Caban : msvcrt: Use WEOF from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 7acfe8fb73d88c354dcec0f56c3cdc6acacbdc04 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7acfe8fb73d88c354dcec0f5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:05 2020 +0100 msvcrt: Use WEOF from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 18 ++++++++---------- dlls/msvcrt/file.c | 42 +++++++++++++++++++++--------------------- dlls/msvcrt/mbcs.c | 4 ++-- dlls/msvcrt/msvcrt.h | 1 - dlls/msvcrt/scanf.h | 8 ++++---- dlls/msvcrt/string.c | 22 +++++++++++----------- dlls/msvcrt/wcs.c | 4 ++-- 7 files changed, 48 insertions(+), 51 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7acfe8fb73d88c354dce…

1 0

Piotr Caban : msvcrt: Use errno values from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 1317b935efaa841e8842b848d422d1bf2471e448 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1317b935efaa841e8842b848… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:27 2020 +0100 msvcrt: Use errno values from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/ctype.c | 4 +- dlls/msvcrt/data.c | 16 ++--- dlls/msvcrt/dir.c | 106 ++++++++++++++--------------- dlls/msvcrt/environ.c | 36 +++++----- dlls/msvcrt/errno.c | 52 +++++++------- dlls/msvcrt/except_i386.c | 2 +- dlls/msvcrt/file.c | 170 +++++++++++++++++++++++----------------------- dlls/msvcrt/heap.c | 56 +++++++-------- dlls/msvcrt/math.c | 120 ++++++++++++++++---------------- dlls/msvcrt/mbcs.c | 88 ++++++++++++------------ dlls/msvcrt/misc.c | 4 +- dlls/msvcrt/msvcrt.h | 44 +----------- dlls/msvcrt/printf.h | 4 +- dlls/msvcrt/process.c | 8 +-- dlls/msvcrt/string.c | 169 +++++++++++++++++++++++---------------------- dlls/msvcrt/thread.c | 6 +- dlls/msvcrt/time.c | 150 ++++++++++++++++++++-------------------- dlls/msvcrt/wcs.c | 144 +++++++++++++++++++-------------------- 18 files changed, 569 insertions(+), 610 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1317b935efaa841e8842…

1 0

Piotr Caban : msvcrt: Use _CRT_FLOAT and _CRT_DBL from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 811647dff44ab93b89200d873d7707a02331d89a URL: https://source.winehq.org/git/wine.git/?a=commit;h=811647dff44ab93b89200d87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:36 2020 +0100 msvcrt: Use _CRT_FLOAT and _CRT_DBL from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 15 --------------- dlls/msvcrt/string.c | 24 ++++++++++++------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 6c7d1c291d1..3d3a2d92dfe 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -984,21 +984,6 @@ int create_positional_ctx_w(void*, const wchar_t*, __ms_va_list) DECLSPEC_HIDDEN printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; printf_arg arg_clbk_positional(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; -#define MSVCRT_FLT_MIN 1.175494351e-38F -#define MSVCRT_DBL_MIN 2.2250738585072014e-308 -#define MSVCRT__OVERFLOW 3 -#define MSVCRT__UNDERFLOW 4 - -typedef struct -{ - float f; -} MSVCRT__CRT_FLOAT; - -typedef struct -{ - double x; -} MSVCRT__CRT_DOUBLE; - extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t,unsigned short int); /* __unDName/__unDNameEx flags */ diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 08750711ab9..8586cc5537c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1092,7 +1092,7 @@ double CDECL MSVCRT__atof_l( const char *str, _locale_t locale) /********************************************************************* * _atoflt_l (MSVCRT.@) */ -int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, _locale_t locale) +int CDECL MSVCRT__atoflt_l(_CRT_FLOAT *value, char *str, _locale_t locale) { double d; int err; @@ -1100,16 +1100,16 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, _locale_t local d = strtod_helper(str, NULL, locale, &err); value->f = d; if(isinf(value->f)) - return MSVCRT__OVERFLOW; - if((d!=0 || err) && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) - return MSVCRT__UNDERFLOW; + return _OVERFLOW; + if((d!=0 || err) && value->f>-FLT_MIN && value->f<FLT_MIN) + return _UNDERFLOW; return 0; } /********************************************************************* * _atoflt (MSVCR100.@) */ -int CDECL MSVCRT__atoflt(MSVCRT__CRT_FLOAT *value, char *str) +int CDECL MSVCRT__atoflt(_CRT_FLOAT *value, char *str) { return MSVCRT__atoflt_l(value, str, NULL); } @@ -1117,22 +1117,22 @@ int CDECL MSVCRT__atoflt(MSVCRT__CRT_FLOAT *value, char *str) /********************************************************************* * _atodbl_l (MSVCRT.@) */ -int CDECL MSVCRT__atodbl_l(MSVCRT__CRT_DOUBLE *value, char *str, _locale_t locale) +int CDECL MSVCRT__atodbl_l(_CRT_DOUBLE *value, char *str, _locale_t locale) { int err; value->x = strtod_helper(str, NULL, locale, &err); if(isinf(value->x)) - return MSVCRT__OVERFLOW; - if((value->x!=0 || err) && value->x>-MSVCRT_DBL_MIN && value->x<MSVCRT_DBL_MIN) - return MSVCRT__UNDERFLOW; + return _OVERFLOW; + if((value->x!=0 || err) && value->x>-DBL_MIN && value->x<DBL_MIN) + return _UNDERFLOW; return 0; } /********************************************************************* * _atodbl (MSVCRT.@) */ -int CDECL MSVCRT__atodbl(MSVCRT__CRT_DOUBLE *value, char *str) +int CDECL MSVCRT__atodbl(_CRT_DOUBLE *value, char *str) { return MSVCRT__atodbl_l(value, str, NULL); } @@ -1482,8 +1482,8 @@ int CDECL MSVCRT__atoldbl_l( MSVCRT__LDOUBLE *value, const char *str, _locale_t char *endptr; switch(__STRINGTOLD_L( value, &endptr, str, 0, locale )) { - case 1: return MSVCRT__UNDERFLOW; - case 2: return MSVCRT__OVERFLOW; + case 1: return _UNDERFLOW; + case 2: return _OVERFLOW; default: return 0; } }

1 0

Francois Gouget : advapi32/tests: Don't check the display name if not in an English locale.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 58ff2a0a887feca82f5e8128968c10ab03d64b72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58ff2a0a887feca82f5e8128… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Nov 30 16:02:28 2020 +0100 advapi32/tests: Don't check the display name if not in an English locale. Service display names are often translated. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/service.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/service.c b/dlls/advapi32/tests/service.c index d216e096207..cbe7fffbc7a 100644 --- a/dlls/advapi32/tests/service.c +++ b/dlls/advapi32/tests/service.c @@ -2678,6 +2678,26 @@ static void test_refcount(void) CloseServiceHandle(scm_handle); } +static BOOL is_lang_english(void) +{ + static HMODULE hkernel32 = NULL; + static LANGID (WINAPI *pGetThreadUILanguage)(void) = NULL; + static LANGID (WINAPI *pGetUserDefaultUILanguage)(void) = NULL; + + if (!hkernel32) + { + hkernel32 = GetModuleHandleA("kernel32.dll"); + pGetThreadUILanguage = (void*)GetProcAddress(hkernel32, "GetThreadUILanguage"); + pGetUserDefaultUILanguage = (void*)GetProcAddress(hkernel32, "GetUserDefaultUILanguage"); + } + if (pGetThreadUILanguage) + return PRIMARYLANGID(pGetThreadUILanguage()) == LANG_ENGLISH; + if (pGetUserDefaultUILanguage) + return PRIMARYLANGID(pGetUserDefaultUILanguage()) == LANG_ENGLISH; + + return PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + static void test_EventLog(void) { SC_HANDLE scm_handle, svc_handle; @@ -2715,7 +2735,8 @@ todo_wine ok(!strcmp(config->lpServiceStartName, "LocalSystem") /* XP */ || !strcmp(config->lpServiceStartName, "NT AUTHORITY\\LocalService"), "got %s\n", config->lpServiceStartName); - ok(!strcmp(config->lpDisplayName, "Event Log") /* XP */ || + ok(!is_lang_english() || /* DisplayName is often translated */ + !strcmp(config->lpDisplayName, "Event Log") /* XP */ || !strcmp(config->lpDisplayName, "Windows Event Log") /* Vista+ */, "got %s\n", config->lpDisplayName); HeapFree(GetProcessHeap(), 0, config);

1 0

Henri Verbeet : wined3d: Store the usage in struct wined3d_bo_gl.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: db42859977ec31b69c12fe9c6d7846d9cf725e4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=db42859977ec31b69c12fe9c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 30 18:29:22 2020 +0330 wined3d: Store the usage in struct wined3d_bo_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 10 ++++------ dlls/wined3d/texture.c | 3 ++- dlls/wined3d/view.c | 3 ++- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 2b24e071c05..0caf933724a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -200,7 +200,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf struct wined3d_context_gl *context_gl) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; - GLenum gl_usage = GL_STATIC_DRAW; struct wined3d_bo_gl *bo; GLenum error; @@ -223,6 +222,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf bo = &buffer_gl->bo; GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = wined3d_buffer_gl_binding_from_bind_flags(gl_info, buffer_gl->b.resource.bind_flags); + bo->usage = GL_STATIC_DRAW; buffer_gl->b.buffer_object = (uintptr_t)bo; error = gl_info->gl_ops.gl.p_glGetError(); if (!bo->id || error != GL_NO_ERROR) @@ -242,7 +242,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf if (buffer_gl->b.resource.usage & WINED3DUSAGE_DYNAMIC) { TRACE("Buffer has WINED3DUSAGE_DYNAMIC set.\n"); - gl_usage = GL_STREAM_DRAW_ARB; + bo->usage = GL_STREAM_DRAW_ARB; if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE]) { @@ -254,7 +254,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf /* No setup is needed here for GL_ARB_map_buffer_range. */ } - GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, gl_usage)); + GL_EXTCALL(glBufferData(bo->binding, buffer_gl->b.resource.size, NULL, bo->usage)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) { @@ -262,7 +262,6 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf goto fail; } - buffer_gl->buffer_object_usage = gl_usage; buffer_invalidate_bo_range(&buffer_gl->b, 0, 0); return TRUE; @@ -799,8 +798,7 @@ static void wined3d_buffer_gl_sync_apple(struct wined3d_buffer_gl *buffer_gl, { wined3d_buffer_gl_bind(buffer_gl, context_gl); - GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, - NULL, buffer_gl->buffer_object_usage)); + GL_EXTCALL(glBufferData(buffer_gl->bo.binding, buffer_gl->b.resource.size, NULL, buffer_gl->bo.usage)); checkGLcall("glBufferData"); return; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 0aef891547a..73821cc27a9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1926,8 +1926,9 @@ static void wined3d_texture_prepare_buffer_object(struct wined3d_texture *textur GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = GL_PIXEL_UNPACK_BUFFER; + bo->usage = GL_STREAM_DRAW; GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); - GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, GL_STREAM_DRAW)); + GL_EXTCALL(glBufferData(bo->binding, sub_resource->size, NULL, bo->usage)); GL_EXTCALL(glBindBuffer(bo->binding, 0)); checkGLcall("Create buffer object"); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index a690bd4ae6b..bf4c9ca5af1 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1417,8 +1417,9 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) GL_EXTCALL(glGenBuffers(1, &bo->id)); bo->binding = GL_ATOMIC_COUNTER_BUFFER; + bo->usage = GL_STATIC_DRAW; GL_EXTCALL(glBindBuffer(bo->binding, bo->id)); - GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, GL_STATIC_DRAW)); + GL_EXTCALL(glBufferData(bo->binding, sizeof(initial_value), &initial_value, bo->usage)); checkGLcall("create atomic counter buffer"); view_gl->v.counter_bo = (uintptr_t)bo; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fa718501e45..dbdb10a182a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1539,6 +1539,7 @@ struct wined3d_bo_gl { GLuint id; GLenum binding; + GLenum usage; }; static inline GLuint wined3d_bo_gl_id(uintptr_t bo) @@ -4825,7 +4826,6 @@ struct wined3d_buffer_gl struct wined3d_buffer b; struct wined3d_bo_gl bo; - GLenum buffer_object_usage; }; static inline struct wined3d_buffer_gl *wined3d_buffer_gl(struct wined3d_buffer *buffer)

1 0

Piotr Caban : msvcrt: Use _beginthread_start_routine_t from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: fbc9110d232fd5e86113fc73153b754278e0f5e9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc9110d232fd5e86113fc73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:24 2020 +0100 msvcrt: Use _beginthread_start_routine_t from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/console.c | 4 ++-- dlls/msvcrt/msvcrt.h | 2 -- dlls/msvcrt/thread.c | 7 ++++--- dlls/ucrtbase/ucrtbase.spec | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/msvcrt/console.c b/dlls/msvcrt/console.c index cc390feb603..7074accbfa7 100644 --- a/dlls/msvcrt/console.c +++ b/dlls/msvcrt/console.c @@ -564,7 +564,7 @@ int WINAPIV _cwprintf(const wchar_t* format, ...) /********************************************************************* * __conio_common_vcprintf (UCRTBASE.@) */ -int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* format, +int CDECL __conio_common_vcprintf(unsigned __int64 options, const char* format, _locale_t locale, __ms_va_list valist) { if (options & ~UCRTBASE_PRINTF_MASK) @@ -576,7 +576,7 @@ int CDECL MSVCRT__conio_common_vcprintf(unsigned __int64 options, const char* fo /********************************************************************* * __conio_common_vcwprintf (UCRTBASE.@) */ -int CDECL MSVCRT__conio_common_vcwprintf(unsigned __int64 options, const wchar_t* format, +int CDECL __conio_common_vcwprintf(unsigned __int64 options, const wchar_t* format, _locale_t locale, __ms_va_list valist) { if (options & ~UCRTBASE_PRINTF_MASK) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 907d9ba2c99..5f21950f4d4 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -35,8 +35,6 @@ typedef void (__cdecl *unexpected_function)(void); typedef void (__cdecl *_se_translator_function)(unsigned int code, struct _EXCEPTION_POINTERS *info); void __cdecl terminate(void); -typedef void (__cdecl *MSVCRT__beginthread_start_routine_t)(void *); -typedef unsigned int (__stdcall *MSVCRT__beginthreadex_start_routine_t)(void *); typedef int (__cdecl *MSVCRT__onexit_t)(void); typedef void (__cdecl *MSVCRT_invalid_parameter_handler)(const wchar_t*, const wchar_t*, const wchar_t*, unsigned, uintptr_t); typedef void (__cdecl *MSVCRT_purecall_handler)(void); diff --git a/dlls/msvcrt/thread.c b/dlls/msvcrt/thread.c index bbf1eb5177f..548f4a6ef66 100644 --- a/dlls/msvcrt/thread.c +++ b/dlls/msvcrt/thread.c @@ -17,6 +17,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <process.h> #include "msvcrt.h" #include "wine/debug.h" @@ -26,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); typedef struct { HANDLE thread; - MSVCRT__beginthread_start_routine_t start_address; + _beginthread_start_routine_t start_address; void *arglist; } _beginthread_trampoline_t; @@ -109,7 +110,7 @@ static DWORD CALLBACK _beginthread_trampoline(LPVOID arg) * _beginthread (MSVCRT.@) */ uintptr_t CDECL _beginthread( - MSVCRT__beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + _beginthread_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ void *arglist) /* [in] Argument list to be passed to new thread or NULL */ { @@ -151,7 +152,7 @@ uintptr_t CDECL _beginthread( uintptr_t CDECL _beginthreadex( void *security, /* [in] Security descriptor for new thread; must be NULL for Windows 9x applications */ unsigned int stack_size, /* [in] Stack size for new thread or 0 */ - MSVCRT__beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ + _beginthreadex_start_routine_t start_address, /* [in] Start address of routine that begins execution of new thread */ void *arglist, /* [in] Argument list to be passed to new thread or NULL */ unsigned int initflag, /* [in] Initial state of new thread (0 for running or CREATE_SUSPEND for suspended) */ unsigned int *thrdaddr) /* [out] Points to a 32-bit variable that receives the thread identifier */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 10d16919769..9b183d91590 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -73,11 +73,11 @@ @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func -@ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf +@ cdecl __conio_common_vcprintf(int64 str ptr ptr) @ stub __conio_common_vcprintf_p @ stub __conio_common_vcprintf_s @ stub __conio_common_vcscanf -@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf +@ cdecl __conio_common_vcwprintf(int64 wstr ptr ptr) __conio_common_vcwprintf @ stub __conio_common_vcwprintf_p @ stub __conio_common_vcwprintf_s @ stub __conio_common_vcwscanf @@ -759,11 +759,11 @@ @ cdecl _o____lc_locale_name_func() ___lc_locale_name_func @ cdecl _o____mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func -@ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf +@ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) __conio_common_vcprintf @ stub _o___conio_common_vcprintf_p @ stub _o___conio_common_vcprintf_s @ stub _o___conio_common_vcscanf -@ cdecl _o___conio_common_vcwprintf(int64 wstr ptr ptr) MSVCRT__conio_common_vcwprintf +@ cdecl _o___conio_common_vcwprintf(int64 wstr ptr ptr) __conio_common_vcwprintf @ stub _o___conio_common_vcwprintf_p @ stub _o___conio_common_vcwprintf_s @ stub _o___conio_common_vcwscanf

1 0

Matteo Bruni : wined3d: Introduce wined3d_context_gl_create_bo().
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 90f33067daf0b4e39c24b61dabd0ee634c1f1a36 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90f33067daf0b4e39c24b61d… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:23 2020 +0330 wined3d: Introduce wined3d_context_gl_create_bo(). 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/buffer.c | 77 ++++++++++-------------------------------- dlls/wined3d/context_gl.c | 35 +++++++++++++++++++ dlls/wined3d/texture.c | 20 +++++------ dlls/wined3d/view.c | 22 +++++------- dlls/wined3d/wined3d_private.h | 2 ++ 5 files changed, 72 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=90f33067daf0b4e39c24…

1 0

Piotr Caban : msvcrt: Use struct tm from public header.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 6c4b7758c691fad6fd5b5f629a8a01b6bc2f961a URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c4b7758c691fad6fd5b5f62… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 30 14:37:12 2020 +0100 msvcrt: Use struct tm from public header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 4 +-- dlls/msvcrt/time.c | 90 ++++++++++++++++++++++++++-------------------------- 2 files changed, 46 insertions(+), 48 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6c4b7758c691fad6fd5b…

1 0

Matteo Bruni : wined3d: Use GL_ARB_buffer_storage if available.
by Alexandre Julliard Nov. 30, 2020

Nov. 30, 2020

Module: wine Branch: master Commit: 77f0149a6c99fc0289d12a788f630519d7dc49d3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f0149a6c99fc0289d12a78… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Nov 30 18:29:24 2020 +0330 wined3d: Use GL_ARB_buffer_storage if available. 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/buffer.c | 4 +++- dlls/wined3d/context_gl.c | 11 +++++++---- dlls/wined3d/resource.c | 15 +++++++++++++++ dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 +++-- 6 files changed, 32 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 285ae7231ec..61e35dc1e45 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -201,6 +201,7 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf { const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLenum usage = GL_STATIC_DRAW; + GLbitfield gl_storage_flags; struct wined3d_bo_gl *bo; bool coherent = true; GLsizeiptr size; @@ -216,8 +217,9 @@ static BOOL wined3d_buffer_gl_create_buffer_object(struct wined3d_buffer_gl *buf usage = GL_STREAM_DRAW_ARB; coherent = false; } + gl_storage_flags = wined3d_resource_gl_storage_flags(&buffer_gl->b.resource); bo = &buffer_gl->bo; - if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, bo)) + if (!wined3d_context_gl_create_bo(context_gl, size, binding, usage, coherent, gl_storage_flags, bo)) { ERR("Failed to create OpenGL buffer object.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 567d6ba56b7..12e5e088713 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2694,13 +2694,13 @@ void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct } bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, - GLenum binding, GLenum usage, bool coherent, struct wined3d_bo_gl *bo) + GLenum binding, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) { const struct wined3d_gl_info *gl_info = context_gl->gl_info; GLuint id = 0; - TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, bo %p.\n", - context_gl, size, binding, usage, coherent, bo); + TRACE("context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + context_gl, size, binding, usage, coherent, flags, bo); GL_EXTCALL(glGenBuffers(1, &id)); if (!id) @@ -2716,7 +2716,10 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei GL_EXTCALL(glBufferParameteriAPPLE(binding, GL_BUFFER_SERIALIZED_MODIFY_APPLE, GL_FALSE)); } - GL_EXTCALL(glBufferData(binding, size, NULL, usage)); + if (gl_info->supported[ARB_BUFFER_STORAGE]) + GL_EXTCALL(glBufferStorage(binding, size, NULL, flags | GL_DYNAMIC_STORAGE_BIT)); + else + GL_EXTCALL(glBufferData(binding, size, NULL, usage)); wined3d_context_gl_bind_bo(context_gl, binding, 0); checkGLcall("buffer object creation"); diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index c8d5fecf9d9..97b8b68374d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -428,6 +428,21 @@ void wined3d_resource_free_sysmem(struct wined3d_resource *resource) resource->heap_memory = NULL; } +GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) +{ + uint32_t access = resource->access; + GLbitfield flags = 0; + + if (resource->usage & WINED3DUSAGE_DYNAMIC) + flags |= GL_CLIENT_STORAGE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_W) + flags |= GL_MAP_WRITE_BIT; + if (access & WINED3D_RESOURCE_ACCESS_MAP_R) + flags |= GL_MAP_READ_BIT; + + return flags; +} + GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) { GLbitfield ret = 0; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b311df0f896..b84b68c592b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1924,8 +1924,8 @@ static void wined3d_texture_gl_prepare_buffer_object(struct wined3d_texture_gl * if (bo->id) return; - if (!wined3d_context_gl_create_bo(context_gl, sub_resource->size, - GL_PIXEL_UNPACK_BUFFER, GL_STREAM_DRAW, true, bo)) + if (!wined3d_context_gl_create_bo(context_gl, sub_resource->size, GL_PIXEL_UNPACK_BUFFER, + GL_STREAM_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo)) return; TRACE("Created buffer object %u for texture %p, sub-resource %u.\n", bo->id, texture_gl, sub_resource_idx); diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 1d77b0e44fb..4c85e2fefe4 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -1415,8 +1415,8 @@ static void wined3d_unordered_access_view_gl_cs_init(void *object) struct wined3d_bo_gl *bo = &view_gl->counter_bo; view_gl->v.counter_bo = (uintptr_t)bo; - wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), - GL_ATOMIC_COUNTER_BUFFER, GL_STATIC_DRAW, true, bo); + wined3d_context_gl_create_bo(context_gl, sizeof(uint32_t), GL_ATOMIC_COUNTER_BUFFER, + GL_STATIC_DRAW, true, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT | GL_CLIENT_STORAGE_BIT, bo); wined3d_unordered_access_view_set_counter(&view_gl->v, 0); } context_release(&context_gl->c); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9b12295ec52..3dcd3e26846 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2256,8 +2256,8 @@ void wined3d_context_gl_bind_texture(struct wined3d_context_gl *context_gl, void wined3d_context_gl_check_fbo_status(const struct wined3d_context_gl *context_gl, GLenum target) DECLSPEC_HIDDEN; void wined3d_context_gl_copy_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *dst, const struct wined3d_bo_address *src, size_t size) DECLSPEC_HIDDEN; -bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, - GLenum binding, GLenum usage, bool coherent, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; +bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizeiptr size, GLenum binding, + GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_destroy_bo(struct wined3d_context_gl *context_gl, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_context_gl_draw_shaded_quad(struct wined3d_context_gl *context_gl, struct wined3d_texture_gl *texture_gl, @@ -4049,6 +4049,7 @@ const struct wined3d_format *wined3d_resource_get_decompress_format( unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; +GLbitfield wined3d_resource_gl_storage_flags(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN; BOOL wined3d_resource_prepare_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0