March 2018 - Wine-Commits - list.winehq.org

Kimmo Myllyvirta : xaudio2: Add support for float formats with more than 2 channels.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 4081b2c2793bcdb207edaa4a85d4f5ce7c482a20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4081b2c2793bcdb207edaa4a… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun Nov 12 12:35:34 2017 +0200 xaudio2: Add support for float formats with more than 2 channels. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 8b94c5b51c2c706dd8fa42cec4631f386f3a8562) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index b2a5e3b..f3a749c 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,6 +499,14 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) return AL_FORMAT_MONO_FLOAT32; case 2: return AL_FORMAT_STEREO_FLOAT32; + case 4: + return AL_FORMAT_QUAD32; + case 6: + return AL_FORMAT_51CHN32; + case 7: + return AL_FORMAT_61CHN32; + case 8: + return AL_FORMAT_71CHN32; } } }

1 0

Nikolay Sivov : d3dx9: Implement D3DXFrameFind().
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 10bf711c021f66c818e66c37731f7ea852b2967c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10bf711c021f66c818e66c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 6 13:31:10 2017 +0300 d3dx9: Implement D3DXFrameFind(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 6bae0a003e893072ab2b636d5b6c982d76b39f36) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_24/d3dx9_24.spec | 2 +- dlls/d3dx9_25/d3dx9_25.spec | 2 +- dlls/d3dx9_26/d3dx9_26.spec | 2 +- dlls/d3dx9_27/d3dx9_27.spec | 2 +- dlls/d3dx9_28/d3dx9_28.spec | 2 +- dlls/d3dx9_29/d3dx9_29.spec | 2 +- dlls/d3dx9_30/d3dx9_30.spec | 2 +- dlls/d3dx9_31/d3dx9_31.spec | 2 +- dlls/d3dx9_32/d3dx9_32.spec | 2 +- dlls/d3dx9_33/d3dx9_33.spec | 2 +- dlls/d3dx9_34/d3dx9_34.spec | 2 +- dlls/d3dx9_35/d3dx9_35.spec | 2 +- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 80 +++++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/tests/mesh.c | 76 ++++++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_37/d3dx9_37.spec | 2 +- dlls/d3dx9_38/d3dx9_38.spec | 2 +- dlls/d3dx9_39/d3dx9_39.spec | 2 +- dlls/d3dx9_40/d3dx9_40.spec | 2 +- dlls/d3dx9_41/d3dx9_41.spec | 2 +- dlls/d3dx9_42/d3dx9_42.spec | 2 +- dlls/d3dx9_43/d3dx9_43.spec | 2 +- 22 files changed, 176 insertions(+), 20 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10bf711c021f66c818e6…

1 0

Zebediah Figura : dinput/tests: Don't pump messages in test_acquire().
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 292e43263f60c602ae35658f29cba3eda85272e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=292e43263f60c602ae35658f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Nov 3 17:26:59 2017 -0500 dinput/tests: Don't pump messages in test_acquire(). This causes intermittent failures due to implementation of our window drivers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 51895145fd67d3dd055888caaba7af413e4753f6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/dinput/tests/mouse.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/mouse.c b/dlls/dinput/tests/mouse.c index 262ed0e..0f9e375 100644 --- a/dlls/dinput/tests/mouse.c +++ b/dlls/dinput/tests/mouse.c @@ -93,7 +93,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) DIPROPDWORD di_op; DIDEVICEOBJECTDATA mouse_state; DWORD cnt; - MSG msg; int i; if (! SetForegroundWindow(hwnd)) @@ -132,7 +131,6 @@ static void test_acquire(IDirectInputA *pDI, HWND hwnd) hwnd2 = CreateWindowA("static", "Temporary", WS_VISIBLE, 10, 210, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd2 != NULL, "CreateWindowA failed with %u\n", GetLastError()); - while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); hr = IDirectInputDevice_GetDeviceState(pMouse, sizeof(m_state), &m_state); ok(hr == DIERR_NOTACQUIRED, "GetDeviceState() should have failed: %08x\n", hr);

1 0

Piotr Caban : msvcrt: Call cdecl functions with empty FPU stack in _CI* functions.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 24f97b33e1cc7118fe983a6ac939ed36cf4c5073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f97b33e1cc7118fe983a6a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 27 20:29:44 2017 +0100 msvcrt: Call cdecl functions with empty FPU stack in _CI* functions. The FPU stack should be empty on cdecl function call. Failing to do so breaks GCC 6.4.0 -O2 optimized code. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ee33d38c5041a8293c64257801572d1c742b0aba) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 269 ++++++++++++++++++++++------------------------------- 1 file changed, 111 insertions(+), 158 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 775fbac..8a84a26 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -496,164 +496,117 @@ double CDECL MSVCRT_tanh( double x ) #if defined(__GNUC__) && defined(__i386__) -#define FPU_DOUBLE(var) double var; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) -#define FPU_DOUBLES(var1,var2) double var1,var2; \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var2) : ); \ - __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var1) : ) - -/********************************************************************* - * _CIacos (MSVCRT.@) - */ -double CDECL _CIacos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_acos(x); -} - -/********************************************************************* - * _CIasin (MSVCRT.@) - */ -double CDECL _CIasin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_asin(x); -} - -/********************************************************************* - * _CIatan (MSVCRT.@) - */ -double CDECL _CIatan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_atan(x); -} - -/********************************************************************* - * _CIatan2 (MSVCRT.@) - */ -double CDECL _CIatan2(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_atan2(x,y); -} - -/********************************************************************* - * _CIcos (MSVCRT.@) - */ -double CDECL _CIcos(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cos(x); -} - -/********************************************************************* - * _CIcosh (MSVCRT.@) - */ -double CDECL _CIcosh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_cosh(x); -} - -/********************************************************************* - * _CIexp (MSVCRT.@) - */ -double CDECL _CIexp(void) -{ - FPU_DOUBLE(x); - return MSVCRT_exp(x); -} - -/********************************************************************* - * _CIfmod (MSVCRT.@) - */ -double CDECL _CIfmod(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_fmod(x,y); -} - -/********************************************************************* - * _CIlog (MSVCRT.@) - */ -double CDECL _CIlog(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log(x); -} - -/********************************************************************* - * _CIlog10 (MSVCRT.@) - */ -double CDECL _CIlog10(void) -{ - FPU_DOUBLE(x); - return MSVCRT_log10(x); -} - -/********************************************************************* - * _CIpow (MSVCRT.@) - */ -double CDECL _CIpow(void) -{ - FPU_DOUBLES(x,y); - return MSVCRT_pow(x,y); -} - -/********************************************************************* - * _CIsin (MSVCRT.@) - */ -double CDECL _CIsin(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sin(x); -} - -/********************************************************************* - * _CIsinh (MSVCRT.@) - */ -double CDECL _CIsinh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sinh(x); -} - -/********************************************************************* - * _CIsqrt (MSVCRT.@) - */ -double CDECL _CIsqrt(void) -{ - FPU_DOUBLE(x); - return MSVCRT_sqrt(x); -} - -/********************************************************************* - * _CItan (MSVCRT.@) - */ -double CDECL _CItan(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tan(x); -} - -/********************************************************************* - * _CItanh (MSVCRT.@) - */ -double CDECL _CItanh(void) -{ - FPU_DOUBLE(x); - return MSVCRT_tanh(x); -} - -/********************************************************************* - * _ftol (MSVCRT.@) - */ -LONGLONG CDECL MSVCRT__ftol(void) -{ - FPU_DOUBLE(x); - return (LONGLONG)x; -} +#define CREATE_FPU_FUNC1(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl (%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "movl $1, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl (%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $0, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +#define CREATE_FPU_FUNC2(name, call) \ + __ASM_GLOBAL_FUNC(name, \ + "pushl %ebp\n\t" \ + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") \ + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") \ + "movl %esp, %ebp\n\t" \ + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") \ + "subl $68, %esp\n\t" /* sizeof(double)*8 + sizeof(int) */ \ + "fstpl 8(%esp)\n\t" /* store function argument */ \ + "fwait\n\t" \ + "fstpl (%esp)\n\t" \ + "fwait\n\t" \ + "movl $2, %ecx\n\t" /* empty FPU stack */ \ + "1:\n\t" \ + "fxam\n\t" \ + "fstsw %ax\n\t" \ + "and $0x4500, %ax\n\t" \ + "cmp $0x4100, %ax\n\t" \ + "je 2f\n\t" \ + "fstpl (%esp,%ecx,8)\n\t" \ + "fwait\n\t" \ + "incl %ecx\n\t" \ + "jmp 1b\n\t" \ + "2:\n\t" \ + "movl %ecx, -4(%ebp)\n\t" \ + "call " __ASM_NAME( #call ) "\n\t" \ + "movl -4(%ebp), %ecx\n\t" \ + "fstpl 8(%esp)\n\t" /* save result */ \ + "3:\n\t" /* restore FPU stack */ \ + "decl %ecx\n\t" \ + "fldl (%esp,%ecx,8)\n\t" \ + "cmpl $1, %ecx\n\t" \ + "jne 3b\n\t" \ + "leave\n\t" \ + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") \ + __ASM_CFI(".cfi_same_value %ebp\n\t") \ + "ret") + +CREATE_FPU_FUNC1(_CIacos, MSVCRT_acos) +CREATE_FPU_FUNC1(_CIasin, MSVCRT_asin) +CREATE_FPU_FUNC1(_CIatan, MSVCRT_atan) +CREATE_FPU_FUNC2(_CIatan2, MSVCRT_atan2) +CREATE_FPU_FUNC1(_CIcos, MSVCRT_cos) +CREATE_FPU_FUNC1(_CIcosh, MSVCRT_cosh) +CREATE_FPU_FUNC1(_CIexp, MSVCRT_exp) +CREATE_FPU_FUNC2(_CIfmod, MSVCRT_fmod) +CREATE_FPU_FUNC1(_CIlog, MSVCRT_log) +CREATE_FPU_FUNC1(_CIlog10, MSVCRT_log10) +CREATE_FPU_FUNC2(_CIpow, MSVCRT_pow) +CREATE_FPU_FUNC1(_CIsin, MSVCRT_sin) +CREATE_FPU_FUNC1(_CIsinh, MSVCRT_sinh) +CREATE_FPU_FUNC1(_CIsqrt, MSVCRT_sqrt) +CREATE_FPU_FUNC1(_CItan, MSVCRT_tan) +CREATE_FPU_FUNC1(_CItanh, MSVCRT_tanh) + +__ASM_GLOBAL_FUNC(MSVCRT__ftol, + "pushl %ebp\n\t" + __ASM_CFI(".cfi_adjust_cfa_offset 4\n\t") + __ASM_CFI(".cfi_rel_offset %ebp,0\n\t") + "movl %esp, %ebp\n\t" + __ASM_CFI(".cfi_def_cfa_register %ebp\n\t") + "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ + "fnstcw (%esp)\n\t" + "mov (%esp), %ax\n\t" + "or $0xc, %ax\n\t" + "mov %ax, 2(%esp)\n\t" + "fldcw 2(%esp)\n\t" + "fistpq 4(%esp)\n\t" + "fldcw (%esp)\n\t" + "movl 4(%esp), %eax\n\t" + "movl 8(%esp), %edx\n\t" + "leave\n\t" + __ASM_CFI(".cfi_def_cfa %esp,4\n\t") + __ASM_CFI(".cfi_same_value %ebp\n\t") + "ret") #endif /* defined(__GNUC__) && defined(__i386__) */

1 0

Fabian Maurer : gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: f14c832313f51a0ea2e5556d8d06bd88f61b0e0c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f14c832313f51a0ea2e5556d… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 26 14:33:18 2017 +0100 gdiplus: In GdipPrivateAddMemoryFont allow loading fonts with long names. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 89366f740f1e3629a58711057afba39681a07ad6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/gdiplus/font.c | 38 ++++++++++-------- dlls/gdiplus/tests/Makefile.in | 5 +++ dlls/gdiplus/tests/font.c | 73 +++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/resource.rc | 22 +++++++++++ dlls/gdiplus/tests/wine_longname.sfd | 66 +++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_longname.ttf | Bin 0 -> 2216 bytes 6 files changed, 188 insertions(+), 16 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f14c832313f51a0ea2e5…

1 0

Nikolay Sivov : msvcrt: Added _get_purecall_handler().
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 135b7b40cd8975c991c9934eb7e7b00d5eb938bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=135b7b40cd8975c991c9934e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Nov 24 21:17:08 2017 +0300 msvcrt: Added _get_purecall_handler(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit b8d294cd7b277893de98721f6b81626d12952fd6) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/exit.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 10 files changed, 18 insertions(+), 9 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 d1cd0b4..bc5414c 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 @@ -55,7 +55,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a85cbe..8a7e29e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -883,7 +883,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d7c2044..feba5d3 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 0a09475..9d9d891 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1230,7 +1230,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 68992a5..cedc09f 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1158,7 +1158,7 @@ @ cdecl _get_output_format() msvcr120._get_output_format @ cdecl _get_pgmptr(ptr) msvcr120._get_pgmptr @ cdecl _get_printf_count_output() msvcr120._get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() msvcr120._get_purecall_handler @ cdecl _get_terminate() msvcr120._get_terminate @ cdecl _get_timezone(ptr) msvcr120._get_timezone @ cdecl _get_tzname(ptr str long long) msvcr120._get_tzname diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 96c4f0f..947479b 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -552,7 +552,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a6a02ed..38ce86c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -533,7 +533,7 @@ @ cdecl _get_output_format() MSVCRT__get_output_format @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_sbh_threshold() @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_timezone(ptr) diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c index 9fd373e..475082b 100644 --- a/dlls/msvcrt/exit.c +++ b/dlls/msvcrt/exit.c @@ -440,6 +440,15 @@ MSVCRT_purecall_handler CDECL _set_purecall_handler(MSVCRT_purecall_handler func } /********************************************************************* + * _get_purecall_handler + */ +MSVCRT_purecall_handler CDECL _get_purecall_handler(void) +{ + TRACE("\n"); + return purecall_handler; +} + +/********************************************************************* * _purecall (MSVCRT.@) */ void CDECL _purecall(void) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index eb87ba6..ef616e0 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -372,7 +372,7 @@ @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() @ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers @ cdecl _get_terminate() MSVCRT__get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 1b9f3f9..b2ea7a7 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -57,7 +57,7 @@ @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr) ucrtbase._except_handler2 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr) ucrtbase._except_handler3 @ cdecl -arch=i386 _except_handler4_common(ptr ptr ptr ptr ptr ptr) ucrtbase._except_handler4_common -@ stub _get_purecall_handler +@ cdecl _get_purecall_handler() ucrtbase._get_purecall_handler @ cdecl _get_unexpected() ucrtbase._get_unexpected @ cdecl -arch=i386 _global_unwind2(ptr) ucrtbase._global_unwind2 @ stub _is_exception_typeof

1 0

Andrey Gusev : d3dx10: Add D3DX10PreprocessShaderFromMemory stub.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: e2951030e23a9406705381ceb58b17bc318c53af URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2951030e23a9406705381ce… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Nov 9 16:25:05 2017 +0200 d3dx10: Add D3DX10PreprocessShaderFromMemory stub. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 010119085b4cee3d7edbad2c5a46d35daa95000d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx10_43/async.c | 11 +++++++++++ dlls/d3dx10_43/d3dx10_43.spec | 2 +- include/d3dx10async.h | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index fb988a4..397ec93 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -396,3 +396,14 @@ HRESULT WINAPI D3DX10CreateAsyncResourceLoaderW(HMODULE module, const WCHAR *res return S_OK; } + +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult) +{ + FIXME("data %s, data_size %lu, filename %s, defines %p, include %p, pump %p, shader_text %p, errors %p, " + "hresult %p stub!\n", + debugstr_a(data), data_size, debugstr_a(filename), defines, include, pump, shader_text, errors, hresult); + + return E_NOTIMPL; +} diff --git a/dlls/d3dx10_43/d3dx10_43.spec b/dlls/d3dx10_43/d3dx10_43.spec index 49a6d3a..a36220f 100644 --- a/dlls/d3dx10_43/d3dx10_43.spec +++ b/dlls/d3dx10_43/d3dx10_43.spec @@ -57,7 +57,7 @@ @ stub D3DX10LoadTextureFromTexture(ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileA(str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromFileW(wstr ptr ptr ptr ptr ptr) -@ stub D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr) +@ stdcall D3DX10PreprocessShaderFromMemory(str long str ptr ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceA(long str str ptr ptr ptr ptr ptr) @ stub D3DX10PreprocessShaderFromResourceW(long wstr wstr ptr ptr ptr ptr ptr) @ stub D3DX10SHProjectCubeMap(long ptr ptr ptr ptr) diff --git a/include/d3dx10async.h b/include/d3dx10async.h index 6663be4..c8204bc 100644 --- a/include/d3dx10async.h +++ b/include/d3dx10async.h @@ -54,6 +54,10 @@ HRESULT WINAPI D3DX10CreateEffectPoolFromMemory(const void *data, SIZE_T datasiz UINT fxflags, ID3D10Device *device, ID3DX10ThreadPump *pump, ID3D10EffectPool **effectpool, ID3D10Blob **errors, HRESULT *hresult); +HRESULT WINAPI D3DX10PreprocessShaderFromMemory(const char *data, SIZE_T data_size, const char *filename, + const D3D10_SHADER_MACRO *defines, ID3DInclude *include, ID3DX10ThreadPump *pump, ID3D10Blob **shader_text, + ID3D10Blob **errors, HRESULT *hresult); + HRESULT WINAPI D3DX10CreateAsyncFileLoaderW(const WCHAR *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncFileLoaderA(const char *filename, ID3DX10DataLoader **loader); HRESULT WINAPI D3DX10CreateAsyncMemoryLoader(const void *data, SIZE_T datasize, ID3DX10DataLoader **loader);

1 0

Michael Stefaniuc : comctl32/tests: Add an ImageList_Copy() test.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: d1db77cc44210fc766addcb6fd2c0f6c0a66711d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1db77cc44210fc766addcb6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Apr 5 15:25:44 2017 +0200 comctl32/tests: Add an ImageList_Copy() test. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit a6a9ec4459d1ba912b4ce13671fe8ba0bfe531ee) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index b5445c5..7669fb6 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -2230,6 +2230,29 @@ static void test_color_table(UINT ilc) ImageList_Destroy(himl); } +static void test_copy(void) +{ + HIMAGELIST dst, src; + BOOL ret; + int count; + + dst = ImageList_Create(5, 11, ILC_COLOR, 1, 1); + count = ImageList_GetImageCount(dst); + ok(!count, "ImageList not empty.\n"); + src = createImageList(7, 13); + count = ImageList_GetImageCount(src); + ok(count > 2, "Tests need an ImageList with more than 2 images\n"); + + /* ImageList_Copy() cannot copy between two ImageLists */ + ret = ImageList_Copy(dst, 0, src, 2, ILCF_MOVE); + ok(!ret, "ImageList_Copy() should have returned FALSE\n"); + count = ImageList_GetImageCount(dst); + ok(count == 0, "Expected no image in dst ImageList, got %d\n", count); + + ImageList_Destroy(dst); + ImageList_Destroy(src); +} + static void test_IImageList_Clone(void) { IImageList *imgl, *imgl2; @@ -2380,6 +2403,7 @@ START_TEST(imagelist) test_iconsize(); test_color_table(ILC_COLOR4); test_color_table(ILC_COLOR8); + test_copy(); FreeLibrary(hComCtl32);

1 0

Piotr Caban : msvcrt: Correctly set rounding mode in _ftol implementation.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: b7b880c3bba73cb59a550fdb9f5b6e5fbacc2b35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7b880c3bba73cb59a550fdb… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 18 12:10:28 2017 +0100 msvcrt: Correctly set rounding mode in _ftol implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 22edbd849ada33e8037f6f2b7fde75b1617f3f78) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 8a84a26..f2d41c8 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -596,7 +596,7 @@ __ASM_GLOBAL_FUNC(MSVCRT__ftol, "subl $12, %esp\n\t" /* sizeof(LONGLONG) + 2*sizeof(WORD) */ "fnstcw (%esp)\n\t" "mov (%esp), %ax\n\t" - "or $0xc, %ax\n\t" + "or $0xc00, %ax\n\t" "mov %ax, 2(%esp)\n\t" "fldcw 2(%esp)\n\t" "fistpq 4(%esp)\n\t"

1 0

Piotr Caban : msvcrt: Fix buffer size checks in swscanf_s.
by Alexandre Julliard March 18, 2018

March 18, 2018

Module: wine Branch: oldstable Commit: 24c691956459fcbe5007fc00a99c598718f94d5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=24c691956459fcbe5007fc00… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 1 12:29:08 2017 +0100 msvcrt: Fix buffer size checks in swscanf_s. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 7aa67f1e5f4e0ecafe9fbeec982326c4d78bf883) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 6 +++--- dlls/msvcrt/tests/scanf.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 2920b9b..cbbcae4 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -540,7 +540,7 @@ _FUNCTION_ { char *str = suppress ? NULL : va_arg(ap, char*); char *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(char); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -566,7 +566,7 @@ _FUNCTION_ { MSVCRT_wchar_t *str = suppress ? NULL : va_arg(ap, MSVCRT_wchar_t*); MSVCRT_wchar_t *pstr = str; #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(MSVCRT_wchar_t); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif @@ -615,7 +615,7 @@ _FUNCTION_ { ULONG *Mask; int invert = 0; /* Set if we are NOT to find the chars */ #ifdef SECURE - unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned)/sizeof(_CHAR_); + unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); #else unsigned size = UINT_MAX; #endif diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 1d1f28e..e3e0efd 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -324,9 +324,43 @@ static void test_swscanf( void ) ok(c == 'b', "c = %x\n", c); } +static void test_swscanf_s(void) +{ + static const wchar_t fmt1[] = {'%','c',0}; + static const wchar_t fmt2[] = {'%','[','a','-','z',']',0}; + + int (WINAPIV *pswscanf_s)(const wchar_t*,const wchar_t*,...); + HMODULE hmod = GetModuleHandleA("msvcrt.dll"); + wchar_t buf[2], out[2]; + int ret; + + pswscanf_s = (void*)GetProcAddress(hmod, "swscanf_s"); + if(!pswscanf_s) { + win_skip("swscanf_s not available\n"); + return; + } + + buf[0] = 'a'; + buf[1] = '1'; + out[1] = 'b'; + ret = pswscanf_s(buf, fmt1, out, 1); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(out[1] == 'b', "out[1] = %x\n", out[1]); + + ret = pswscanf_s(buf, fmt2, out, 1); + ok(!ret, "swscanf_s returned %d\n", ret); + + ret = pswscanf_s(buf, fmt2, out, 2); + ok(ret == 1, "swscanf_s returned %d\n", ret); + ok(out[0] == 'a', "out[0] = %x\n", out[0]); + ok(!out[1], "out[1] = %x\n", out[1]); +} + START_TEST(scanf) { test_sscanf(); test_sscanf_s(); test_swscanf(); + test_swscanf_s(); }

1 0