wine-commits December 2020

wine-commits@winehq.org

1 participants
414 discussions

Jacek Caban : msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: df446b9c21f52b917a9c2a360bccaed35896a32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=df446b9c21f52b917a9c2a36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:11 2020 +0100 msvcrt: Use __ASM_USE_THISCALL_WRAPPER in cxx.h. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cxx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index 42717f9d702..f8fe239b8aa 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -240,7 +240,7 @@ typedef struct #endif -#if defined(__i386__) && !defined(__MINGW32__) +#ifdef __ASM_USE_THISCALL_WRAPPER #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args

1 0

Jacek Caban : msvcrt: Use GCC-style assembly on Clang MSVC target.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 05806e0edb05a2bc594201947d3637bcbf126d1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=05806e0edb05a2bc59420194… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 14 18:10:04 2020 +0100 msvcrt: Use GCC-style assembly on Clang MSVC target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 14 +++++++------- dlls/msvcrt/misc.c | 6 +++--- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index e5dd9cb2b8a..e6e837e52c6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1297,7 +1297,7 @@ double CDECL tanh( double x ) } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define CREATE_FPU_FUNC1(name, call) \ __ASM_GLOBAL_FUNC(name, \ @@ -1411,7 +1411,7 @@ __ASM_GLOBAL_FUNC(_ftol, __ASM_CFI(".cfi_same_value %ebp\n\t") "ret") -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ /********************************************************************* * _fpclass (MSVCRT.@) @@ -1638,7 +1638,7 @@ double CDECL modf( double x, double *iptr ) #if defined(__i386__) || defined(__x86_64__) void CDECL _statusfp2( unsigned int *x86_sw, unsigned int *sse2_sw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned int flags; unsigned long fpword; @@ -1710,7 +1710,7 @@ unsigned int CDECL _statusfp(void) unsigned int CDECL _clearfp(void) { unsigned int flags = 0; -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) unsigned long fpword; __asm__ __volatile__( "fnstsw %0; fnclex" : "=m" (fpword) ); @@ -1802,7 +1802,7 @@ double CDECL _chgsign(double num) int CDECL __control87_2( unsigned int newval, unsigned int mask, unsigned int *x86_cw, unsigned int *sse2_cw ) { -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) unsigned long fpword; unsigned int flags; unsigned int old_flags; @@ -2152,7 +2152,7 @@ int CDECL _finite(double num) */ void CDECL _fpreset(void) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) const unsigned int x86_cw = 0x27f; __asm__ __volatile__( "fninit; fldcw %0" : : "m" (x86_cw) ); if (sse2_supported) @@ -2171,7 +2171,7 @@ void CDECL _fpreset(void) */ int CDECL fesetenv(const fenv_t *env) { -#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) +#if (defined(__GNUC__) || defined(__clang__)) && (defined(__i386__) || defined(__x86_64__)) struct { WORD control_word; WORD unused1; diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 17019e9f5a7..5ea1ddfc6c7 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -213,7 +213,7 @@ void* CDECL bsearch(const void *key, const void *base, size_t nmemb, */ #ifdef __i386__ -# ifdef __GNUC__ +# if defined(__GNUC__) || defined(__clang__) __ASM_GLOBAL_FUNC(_chkesp, "jnz 1f\n\t" @@ -242,7 +242,7 @@ void CDECL DECLSPEC_HIDDEN chkesp_fail(void) DebugBreak(); } -# else /* __GNUC__ */ +# else /* __GNUC__ || __clang__ */ /**********************************************************************/ @@ -250,7 +250,7 @@ void CDECL _chkesp(void) { } -# endif /* __GNUC__ */ +# endif /* __GNUC__ || __clang__ */ #endif /* __i386__ */

1 0

Jacek Caban : msvcrt: Prefix *rot* functions.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: e8936e79c20f09156afe8ecac0fe9cde87905a71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8936e79c20f09156afe8eca… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:33 2020 +0100 msvcrt: Prefix *rot* functions. MSVC does not allow overriding those intrinsic functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crtdll/crtdll.spec | 8 ++++---- dlls/msvcr100/msvcr100.spec | 12 ++++++------ dlls/msvcr110/msvcr110.spec | 12 ++++++------ dlls/msvcr120/msvcr120.spec | 12 ++++++------ dlls/msvcr70/msvcr70.spec | 8 ++++---- dlls/msvcr71/msvcr71.spec | 8 ++++---- dlls/msvcr80/msvcr80.spec | 12 ++++++------ dlls/msvcr90/msvcr90.spec | 12 ++++++------ dlls/msvcrt/math.c | 12 ++++++------ dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrtd/msvcrtd.spec | 8 ++++---- dlls/ucrtbase/ucrtbase.spec | 12 ++++++------ 12 files changed, 64 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e8936e79c20f09156afe…

1 0

Jacek Caban : ucrtbase: Improve __intrinsic_abnormal_termination stub.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: e734d729461855a5ddaf81f4e08e0cc2b3286e37 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e734d729461855a5ddaf81f4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 16 13:50:15 2020 +0100 ucrtbase: Improve __intrinsic_abnormal_termination stub. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/crtdll/crtdll.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/except.c | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 2a912bba7bf..136358a174c 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -38,7 +38,7 @@ @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ stub __dcrt_get_wide_environment_from_os @ stub __dcrt_initial_narrow_environment -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec index efa5c022808..ce1bbc9d5b7 100644 --- a/dlls/crtdll/crtdll.spec +++ b/dlls/crtdll/crtdll.spec @@ -38,7 +38,7 @@ @ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __toascii(long) -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln_dll MSVCRT__acmdln @ extern _aexit_rtn_dll _aexit_rtn diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 3c27eda4652..c7a458950c7 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -676,7 +676,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 10258b032d1..90125fed340 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1024,7 +1024,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 4e5f6520caf..bb66b83739d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1014,7 +1014,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2851c42d7c8..bf5f61484fe 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -209,7 +209,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 6a60a7d5827..9a97c41cbe9 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -204,7 +204,7 @@ @ cdecl __wcserror(wstr) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5634e34d5ff..1159876f235 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -325,7 +325,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8151b4ddd3c..d115d2f9eed 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -309,7 +309,7 @@ @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index 3cc8b9c92ea..8130e34b2c4 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -281,7 +281,7 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) /********************************************************************* * _abnormal_termination (MSVCRT.@) */ -int CDECL _abnormal_termination(void) +int CDECL __intrinsic_abnormal_termination(void) { FIXME("(void)stub\n"); return 0; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6f256a2d58e..a425ff8aa6d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -295,7 +295,7 @@ # stub __wcsncnt(wstr long) @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl -ret64 _abs64(int64) @ cdecl _access(str long) @ cdecl _access_s(str long) diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 503a13180ba..5fda5332f62 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -197,7 +197,7 @@ @ extern __wargv MSVCRT___wargv @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv -@ cdecl _abnormal_termination() +@ cdecl _abnormal_termination() __intrinsic_abnormal_termination @ cdecl _access(str long) @ extern _acmdln MSVCRT__acmdln @ stdcall -arch=i386 _adj_fdiv_m16i(long) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3c8afa86c0d..35925d4ebe5 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -92,7 +92,7 @@ @ cdecl __fpe_flt_rounds() @ cdecl __fpecode() @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init -@ stub __intrinsic_abnormal_termination +@ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long)

1 0

Paul Gofman : ntdll: Remove unwind registers save space from struct stack_layout on x64.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: 0643a4fdce93a1bfde08a25b29b4884d46f33656 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0643a4fdce93a1bfde08a25b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Dec 14 17:05:28 2020 +0300 ntdll: Remove unwind registers save space from struct stack_layout on x64. The unwind space used right below the context's Rsp and can currently potentially overlap with xstate. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_x86_64.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 359f2d7c361..7181b48728c 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -240,10 +240,6 @@ struct stack_layout CONTEXT context; CONTEXT_EX context_ex; EXCEPTION_RECORD rec; - ULONG64 rsi; - ULONG64 rdi; - ULONG64 rbp; - ULONG64 rip; ULONG64 align; char xstate[0]; /* If xstate is present it is allocated * dynamically to provide 64 byte alignment. */ @@ -252,7 +248,7 @@ struct stack_layout C_ASSERT((offsetof(struct stack_layout, xstate) == sizeof(struct stack_layout))); C_ASSERT( sizeof(XSTATE) == 0x140 ); -C_ASSERT( sizeof(struct stack_layout) == 0x5b0 ); /* Should match the size in call_user_exception_dispatcher(). */ +C_ASSERT( sizeof(struct stack_layout) == 0x590 ); /* Should match the size in call_user_exception_dispatcher(). */ struct syscall_frame { @@ -1964,10 +1960,10 @@ static void setup_raise_exception( ucontext_t *sigcontext, EXCEPTION_RECORD *rec /* fix up instruction pointer in context for EXCEPTION_BREAKPOINT */ if (rec->ExceptionCode == EXCEPTION_BREAKPOINT) context->Rip--; - stack_size = sizeof(*stack); + stack_size = sizeof(*stack) + 0x20; if ((src_xs = xstate_from_context( context ))) { - stack_size += (ULONG_PTR)stack_ptr - (((ULONG_PTR)stack_ptr + stack_size += (ULONG_PTR)stack_ptr - 0x20 - (((ULONG_PTR)stack_ptr - 0x20 - sizeof(XSTATE)) & ~(ULONG_PTR)63); } @@ -2120,12 +2116,13 @@ struct stack_layout * WINAPI setup_user_exception_dispatcher_stack( EXCEPTION_RE __ASM_GLOBAL_FUNC( call_user_exception_dispatcher, "movq 0x98(%rdx),%r9\n\t" /* context->Rsp */ + "subq $0x20,%r9\n\t" /* Unwind registers save space */ "andq $~0xf,%r9\n\t" "btl $6,0x30(%rdx)\n\t" /* context->ContextFlags, CONTEXT_XSTATE bit. */ "jnc 1f\n\t" "subq $0x140,%r9\n\t" /* sizeof(XSTATE) */ "andq $~63,%r9\n" - "1:\tsubq $0x5b0,%r9\n\t" /* sizeof(struct stack_layout) */ + "1:\tsubq $0x590,%r9\n\t" /* sizeof(struct stack_layout) */ "cmpq %rsp,%r9\n\t" "cmovbq %r9,%rsp\n\t" "pushq %r8\n\t"

1 0

Paul Gofman : ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: f17404f8ed2883e28ef33887c7e0a9c2fc2e4874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f17404f8ed2883e28ef33887… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Dec 16 11:58:27 2020 +0300 ws2_32: Fix buffer size check in WSAIoctl() for SIO_GET_INTERFACE_LIST. Fixes out of bound memory access in Anno 1404 Addon. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 3 ++- dlls/ws2_32/tests/sock.c | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 6cb35bcd135..05097ce53b8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4618,10 +4618,11 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID if (ptr->IpAddressList.IpAddress.String[0] == '\0') continue; - if ((numInt + 1)*sizeof(INTERFACE_INFO)/sizeof(IP_ADAPTER_INFO) > out_size) + if ((numInt + 1) * sizeof(INTERFACE_INFO) > out_size) { WARN("Buffer too small = %u, out_size = %u\n", numInt + 1, out_size); status = WSAEFAULT; + if (ret_size) *ret_size = 0; break; } diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8711b65fcea..98cc3881853 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10514,6 +10514,30 @@ static void test_WSCGetProviderPath(void) ok(len == 256, "Got unexpected len %d.\n", len); } +static void test_wsaioctl(void) +{ + char buffer[4096]; + DWORD size; + SOCKET s; + int ret; + + s = WSASocketW(AF_INET, SOCK_STREAM, IPPROTO_TCP, NULL, 0, WSA_FLAG_OVERLAPPED); + ok(s != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(buffer), &size, NULL, NULL); + ok(!ret, "Got unexpected ret %d.\n", ret); + ok(size && size != 0xdeadbeef && !(size % sizeof(INTERFACE_INFO)), "Got unexpected size %u.\n", size); + + size = 0xdeadbeef; + ret = WSAIoctl(s, SIO_GET_INTERFACE_LIST, NULL, 0, buffer, sizeof(INTERFACE_INFO), &size, NULL, NULL); + ok(ret == -1, "Got unexpected ret %d.\n", ret); + ok(WSAGetLastError() == WSAEFAULT, "Got unexpected error %d.\n", WSAGetLastError()); + ok(!size, "Got unexpected size %u.\n", size); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10595,6 +10619,7 @@ START_TEST( sock ) /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send(); test_synchronous_WSAIoctl(); + test_wsaioctl(); Exit(); }

1 0

Byeongsik Jeon : po: Update Korean translation.
by Alexandre Julliard 16 Dec '20

16 Dec '20

Module: wine Branch: master Commit: ebb8a59d813f037e75c1584e1201c0498c9863f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebb8a59d813f037e75c1584e… Author: Byeongsik Jeon <bsjeon(a)hanmail.net> Date: Wed Dec 16 13:17:39 2020 +0900 po: Update Korean translation. Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ko.po | 536 ++++++++++++++++++++++----------------------------------------- 1 file changed, 189 insertions(+), 347 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ebb8a59d813f037e75c1…

1 0

Biswapriyo Nath : include: Add IAudioAmbisonicsControl interface in audioclient.idl.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: 79e2672858c1643d12c9a2b2b179b001da568029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79e2672858c1643d12c9a2b2… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add IAudioAmbisonicsControl interface in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index e1a4200730f..754ae58f78c 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -361,6 +361,32 @@ typedef struct AMBISONICS_PARAMS UINT32 *pu32ChannelMap; } AMBISONICS_PARAMS; +[ + local, + pointer_default(unique), + uuid(28724c91-df35-4856-9f76-d6a26413f3df), + object, +] +interface IAudioAmbisonicsControl : IUnknown +{ + HRESULT SetData( + [in] const AMBISONICS_PARAMS *param, + [in] UINT32 size + ); + HRESULT SetHeadTracking( + [in] BOOL enable + ); + HRESULT GetHeadTracking( + [out] BOOL *enable + ); + HRESULT SetRotation( + [in] float x, + [in] float y, + [in] float z, + [in] float w + ); +} + [ local, pointer_default(unique),

1 0

Biswapriyo Nath : include: Add AMBISONICS_PARAMS structure in audioclient.idl.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: 38c21c3395ebbf391b78ef800cc65e73dd6b1d8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=38c21c3395ebbf391b78ef80… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add AMBISONICS_PARAMS structure in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 311c01c8eab..e1a4200730f 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -333,6 +333,34 @@ interface IAudioStreamVolume : IUnknown ); } +typedef enum AMBISONICS_TYPE +{ + AMBISONICS_TYPE_FULL3D = 0x0, +} AMBISONICS_TYPE; + +typedef enum AMBISONICS_CHANNEL_ORDERING +{ + AMBISONICS_CHANNEL_ORDERING_ACN = 0x0, +} AMBISONICS_CHANNEL_ORDERING; + +typedef enum AMBISONICS_NORMALIZATION +{ + AMBISONICS_NORMALIZATION_SN3D = 0x0, + AMBISONICS_NORMALIZATION_N3D = 0x1, +} AMBISONICS_NORMALIZATION; + +typedef struct AMBISONICS_PARAMS +{ + UINT32 u32Size; + UINT32 u32Version; + AMBISONICS_TYPE u32Type; + AMBISONICS_CHANNEL_ORDERING u32ChannelOrdering; + AMBISONICS_NORMALIZATION u32Normalization; + UINT32 u32Order; + UINT32 u32NumChannels; + UINT32 *pu32ChannelMap; +} AMBISONICS_PARAMS; + [ local, pointer_default(unique),

1 0

Biswapriyo Nath : include: Add error codes in audioclient.idl.
by Alexandre Julliard 15 Dec '20

15 Dec '20

Module: wine Branch: master Commit: e0a2692a4b3dc0b42a55bf52849420610f737127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0a2692a4b3dc0b42a55bf52… Author: Biswapriyo Nath <nathbappai(a)gmail.com> Date: Tue Dec 15 15:26:54 2020 +0530 include: Add error codes in audioclient.idl. Signed-off-by: Biswapriyo Nath <nathbappai(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/audioclient.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/audioclient.idl b/include/audioclient.idl index 48bdbdcdcd4..311c01c8eab 100644 --- a/include/audioclient.idl +++ b/include/audioclient.idl @@ -399,6 +399,11 @@ cpp_quote("#define AUDCLNT_E_OUT_OF_OFFLOAD_RESOURCES AUDCLNT_ERR(0x023)") cpp_quote("#define AUDCLNT_E_OFFLOAD_MODE_ONLY AUDCLNT_ERR(0x024)") cpp_quote("#define AUDCLNT_E_NONOFFLOAD_MODE_ONLY AUDCLNT_ERR(0x025)") cpp_quote("#define AUDCLNT_E_RESOURCES_INVALIDATED AUDCLNT_ERR(0x026)") +cpp_quote("#define AUDCLNT_E_RAW_MODE_UNSUPPORTED AUDCLNT_ERR(0x027)") +cpp_quote("#define AUDCLNT_E_ENGINE_PERIODICITY_LOCKED AUDCLNT_ERR(0x028)") +cpp_quote("#define AUDCLNT_E_ENGINE_FORMAT_LOCKED AUDCLNT_ERR(0x029)") +cpp_quote("#define AUDCLNT_E_HEADTRACKING_ENABLED AUDCLNT_ERR(0x030)") +cpp_quote("#define AUDCLNT_E_HEADTRACKING_UNSUPPORTED AUDCLNT_ERR(0x040)") cpp_quote("#define AUDCLNT_S_BUFFER_EMPTY AUDCLNT_SUCCESS(0x1)") cpp_quote("#define AUDCLNT_S_THREAD_ALREADY_REGISTERED AUDCLNT_SUCCESS(0x2)")

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2020