wine-commits August 2016

wine-commits@winehq.org

2 participants
777 discussions

Huw Davies : ucrtbase: Add __stdio_common_vswscanf().
by Alexandre Julliard 25 Aug '16

25 Aug '16

Module: wine Branch: master Commit: f22769f81a2384219c6cb0f6b9f6daf4ac3c8857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22769f81a2384219c6cb0f6b… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 12:58:31 2016 +0100 ucrtbase: Add __stdio_common_vswscanf(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-stdio-l1-1-0.spec | 2 +- dlls/msvcrt/scanf.c | 22 +++++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec index 0dc03b8..af723f7 100644 --- a/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec +++ b/dlls/api-ms-win-crt-stdio-l1-1-0/api-ms-win-crt-stdio-l1-1-0.spec @@ -18,7 +18,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) ucrtbase.__stdio_common_vswscanf @ cdecl _chsize(long long) ucrtbase._chsize @ cdecl _chsize_s(long int64) ucrtbase._chsize_s @ cdecl _close(long) ucrtbase._close diff --git a/dlls/msvcrt/scanf.c b/dlls/msvcrt/scanf.c index 579dec5..093424a 100644 --- a/dlls/msvcrt/scanf.c +++ b/dlls/msvcrt/scanf.c @@ -66,7 +66,7 @@ static int wchar2digit(MSVCRT_wchar_t c, int base) { #undef SECURE #include "scanf.h" -/* vfscanf_l */ +/* vfscanf_s_l */ #define SECURE 1 #include "scanf.h" @@ -683,6 +683,26 @@ int CDECL MSVCRT__stdio_common_vsscanf(unsigned __int64 options, } /********************************************************************* + * __stdio_common_vswscanf (MSVCRT.@) + */ +int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options, + const MSVCRT_wchar_t *input, MSVCRT_size_t length, + const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, + __ms_va_list valist) +{ + /* LEGACY_WIDE_SPECIFIERS only has got an effect on the wide + * scanf. LEGACY_MSVCRT_COMPATIBILITY affects parsing of nan/inf, + * but parsing of those isn't implemented at all yet. */ + if (options & ~UCRTBASE_SCANF_MASK) + FIXME("options %s not handled\n", wine_dbgstr_longlong(options)); + if (options & UCRTBASE_SCANF_SECURECRT) + return MSVCRT_vsnwscanf_s_l(input, length, format, locale, valist); + else + return MSVCRT_vsnwscanf_l(input, length, format, locale, valist); +} + +/********************************************************************* * __stdio_common_vfwscanf (MSVCRT.@) */ int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options, diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index d20ef71..6ec16d9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -163,7 +163,7 @@ @ cdecl __stdio_common_vswprintf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf @ cdecl __stdio_common_vswprintf_p(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_p @ cdecl __stdio_common_vswprintf_s(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswprintf_s -@ stub __stdio_common_vswscanf +@ cdecl __stdio_common_vswscanf(int64 ptr long wstr ptr ptr) MSVCRT__stdio_common_vswscanf @ stub __strncnt @ cdecl __sys_errlist() @ cdecl __sys_nerr()

1 0

Huw Davies : gdi32: Unroll the start- and end-of-line loops.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: a875e3c6ab075c0603e7bf1430abdba704640602 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a875e3c6ab075c0603e7bf143… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 08:55:34 2016 +0100 gdi32: Unroll the start- and end-of-line loops. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 349 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 319 insertions(+), 30 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a875e3c6ab075c0603e7b…

1 0

Huw Davies : gdi32: Handle the case of a partial source byte separately.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 45b848ccd1bb5852e93a2ab29fe982094dd666c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45b848ccd1bb5852e93a2ab29… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 08:55:33 2016 +0100 gdi32: Handle the case of a partial source byte separately. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 79 +++++++++++++++++++++++++++++++++++++++--- dlls/gdi32/tests/dib.c | 36 +++++++++++-------- 2 files changed, 96 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45b848ccd1bb5852e93a2…

1 0

Huw Davies : gdi32: Eliminate a masking operation by generating a larger colour table.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 6c7ed1214c6d10b4cb598f976175431e2031bc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c7ed1214c6d10b4cb598f976… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Aug 24 08:55:32 2016 +0100 gdi32: Eliminate a masking operation by generating a larger colour table. This helps significantly for large rectangles. This is only done for the 32-bpp case as typically the lower bit depths would more likely be used to draw small icons and the like, where the extra fixed cost of this optimization will potentially outweigh the savings. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/primitives.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index e75792c..d512af2 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -5264,7 +5264,7 @@ static BOOL gradient_rect_null( const dib_info *dib, const RECT *rc, const TRIVE static void mask_rect_32( const dib_info *dst, const RECT *rc, const dib_info *src, const POINT *origin, int rop2 ) { - DWORD *dst_start = get_pixel_ptr_32(dst, rc->left, rc->top), dst_colors[2]; + DWORD *dst_start = get_pixel_ptr_32(dst, rc->left, rc->top), dst_colors[256]; DWORD src_val, bit_val, i, full, pos; struct rop_codes codes; int x, y; @@ -5274,15 +5274,19 @@ static void mask_rect_32( const dib_info *dst, const RECT *rc, get_rop_codes( rop2, &codes ); if (dst->funcs == &funcs_8888) - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < 2; i++) dst_colors[i] = color_table[i].rgbRed << 16 | color_table[i].rgbGreen << 8 | color_table[i].rgbBlue; else - for (i = 0; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + for (i = 0; i < 2; i++) dst_colors[i] = put_field(color_table[i].rgbRed, dst->red_shift, dst->red_len) | put_field(color_table[i].rgbGreen, dst->green_shift, dst->green_len) | put_field(color_table[i].rgbBlue, dst->blue_shift, dst->blue_len); + /* Creating a BYTE-sized table so we don't need to mask the lsb of bit_val */ + for (i = 2; i < sizeof(dst_colors) / sizeof(dst_colors[0]); i++) + dst_colors[i] = dst_colors[i & 1]; + for (y = rc->top; y < rc->bottom; y++) { pos = origin->x & 7; @@ -5298,21 +5302,21 @@ static void mask_rect_32( const dib_info *dst, const RECT *rc, { src_val = src_start[pos / 8]; - bit_val = (src_val >> 7) & 1; + bit_val = src_val >> 7; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 6) & 1; + bit_val = src_val >> 6; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 5) & 1; + bit_val = src_val >> 5; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 4) & 1; + bit_val = src_val >> 4; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 3) & 1; + bit_val = src_val >> 3; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 2) & 1; + bit_val = src_val >> 2; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = (src_val >> 1) & 1; + bit_val = src_val >> 1; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); - bit_val = src_val & 1; + bit_val = src_val; do_rop_codes_32( dst_start + x++, dst_colors[bit_val], &codes ); }

1 0

Piotr Caban : msvcr90: Add _fpieee_flt tests.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: eb9584d7fc35978db8cd1ca335aae334ab3416d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9584d7fc35978db8cd1ca33… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:58:16 2016 +0200 msvcr90: Add _fpieee_flt tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 167 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 167 insertions(+) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index a4bcdc5..5c5a6bf 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -25,6 +25,8 @@ #include <sys/stat.h> #include <time.h> #include <locale.h> +#include <fpieee.h> +#include <excpt.h> #include <windef.h> #include <winbase.h> @@ -128,6 +130,7 @@ static int (__cdecl *p_fflush_nolock)(FILE*); static size_t (__cdecl *p_mbstowcs)(wchar_t*, const char*, size_t); static size_t (__cdecl *p_wcstombs)(char*, const wchar_t*, size_t); static char* (__cdecl *p_setlocale)(int, const char*); +static int (__cdecl *p__fpieee_flt)(ULONG, EXCEPTION_POINTERS*, int (__cdecl *handler)(_FPIEEE_RECORD*)); /* make sure we use the correct errno */ #undef errno @@ -393,6 +396,7 @@ static BOOL init(void) SET(p_mbstowcs, "mbstowcs"); SET(p_wcstombs, "wcstombs"); SET(p_setlocale, "setlocale"); + SET(p__fpieee_flt, "_fpieee_flt"); if (sizeof(void *) == 8) { SET(p_type_info_name_internal_method, "?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z"); @@ -1633,6 +1637,166 @@ static void test__mbstok_s(void) ok(context == space+1, "Expected space+1, got %p.\n", context); } +#ifdef __i386__ +static _FPIEEE_RECORD fpieee_record; +static int handler_called; +static int __cdecl fpieee_handler(_FPIEEE_RECORD *rec) +{ + handler_called++; + fpieee_record = *rec; + return EXCEPTION_CONTINUE_EXECUTION; +} + +static void test__fpieee_flt(void) +{ + double argd = 1.5; + struct { + DWORD exception_code; + WORD opcode; + DWORD data_offset; + DWORD control_word; + DWORD status_word; + _FPIEEE_RECORD rec; + int ret; + } test_data[] = { + { STATUS_FLOAT_DIVIDE_BY_ZERO, 0x35dc, (DWORD)&argd, 0, 0, + {0, 2, _FpCodeDivide, + {0}, {1, 1, 1, 1, 1}, {0}, + {{0}, 1, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 0, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_INEXACT_RESULT, 0x35dc, (DWORD)&argd, 0, 0, + {0, 2, _FpCodeDivide, + {0}, {1, 1, 1, 1, 1}, {0}, + {{0}, 0, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 1, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_INVALID_OPERATION, 0x35dc, (DWORD)&argd, 0, 0, + {0, 2, _FpCodeDivide, + {0}, {1, 1, 1, 1, 1}, {0}, + {{0}, 1, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 0, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_OVERFLOW, 0x35dc, (DWORD)&argd, 0, 0, + {0, 2, _FpCodeDivide, + {0}, {1, 1, 1, 1, 1}, {0}, + {{0}, 0, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 1, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_UNDERFLOW, 0x35dc, (DWORD)&argd, 0, 0, + {0, 2, _FpCodeDivide, + {0}, {1, 1, 1, 1, 1}, {0}, + {{0}, 0, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 1, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_DIVIDE_BY_ZERO, 0x35dc, (DWORD)&argd, 0, 0xffffffff, + {0, 2, _FpCodeDivide, + {1, 1, 1, 1, 1}, {1, 1, 1, 1, 1}, {1, 1, 1, 1, 1}, + {{0}, 1, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 0, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + { STATUS_FLOAT_DIVIDE_BY_ZERO, 0x35dc, (DWORD)&argd, 0xffffffff, 0xffffffff, + {3, 0, _FpCodeDivide, + {0}, {0}, {1, 1, 1, 1, 1}, + {{0}, 1, _FpFormatFp80}, + {{0}, 1, _FpFormatFp64}, + {{0}, 0, _FpFormatFp80}}, + EXCEPTION_CONTINUE_EXECUTION }, + }; + EXCEPTION_POINTERS ep; + EXCEPTION_RECORD rec; + CONTEXT ctx; + int i, ret; + + if(!p__fpieee_flt) { + win_skip("_fpieee_flt not available\n"); + return; + } + + ep.ExceptionRecord = &rec; + ep.ContextRecord = &ctx; + memset(&rec, 0, sizeof(rec)); + memset(&ctx, 0, sizeof(ctx)); + ret = p__fpieee_flt(1, &ep, fpieee_handler); + ok(ret == EXCEPTION_CONTINUE_SEARCH, "_fpieee_flt returned %d\n", ret); + ok(handler_called == 0, "handler_called = %d\n", handler_called); + + for(i=0; i<sizeof(test_data)/sizeof(test_data[0]); i++) { + ep.ExceptionRecord = &rec; + ep.ContextRecord = &ctx; + memset(&rec, 0, sizeof(rec)); + memset(&ctx, 0, sizeof(ctx)); + + ctx.FloatSave.ErrorOffset = (DWORD)&test_data[i].opcode; + ctx.FloatSave.DataOffset = test_data[i].data_offset; + ctx.FloatSave.ControlWord = test_data[i].control_word; + ctx.FloatSave.StatusWord = test_data[i].status_word; + + handler_called = 0; + ret = p__fpieee_flt(test_data[i].exception_code, &ep, fpieee_handler); + ok(ret == test_data[i].ret, "%d) _fpieee_flt returned %d\n", i, ret); + ok(handler_called == 1, "%d) handler_called = %d\n", i, handler_called); + + ok(fpieee_record.RoundingMode == test_data[i].rec.RoundingMode, + "%d) RoundingMode = %x\n", i, fpieee_record.RoundingMode); + ok(fpieee_record.Precision == test_data[i].rec.Precision, + "%d) Precision = %x\n", i, fpieee_record.Precision); + ok(fpieee_record.Operation == test_data[i].rec.Operation, + "%d) Operation = %x\n", i, fpieee_record.Operation); + ok(fpieee_record.Cause.Inexact == test_data[i].rec.Cause.Inexact, + "%d) Cause.Inexact = %x\n", i, fpieee_record.Cause.Inexact); + ok(fpieee_record.Cause.Underflow == test_data[i].rec.Cause.Underflow, + "%d) Cause.Underflow = %x\n", i, fpieee_record.Cause.Underflow); + ok(fpieee_record.Cause.Overflow == test_data[i].rec.Cause.Overflow, + "%d) Cause.Overflow = %x\n", i, fpieee_record.Cause.Overflow); + ok(fpieee_record.Cause.ZeroDivide == test_data[i].rec.Cause.ZeroDivide, + "%d) Cause.ZeroDivide = %x\n", i, fpieee_record.Cause.ZeroDivide); + ok(fpieee_record.Cause.InvalidOperation == test_data[i].rec.Cause.InvalidOperation, + "%d) Cause.InvalidOperation = %x\n", i, fpieee_record.Cause.InvalidOperation); + ok(fpieee_record.Enable.Inexact == test_data[i].rec.Enable.Inexact, + "%d) Enable.Inexact = %x\n", i, fpieee_record.Enable.Inexact); + ok(fpieee_record.Enable.Underflow == test_data[i].rec.Enable.Underflow, + "%d) Enable.Underflow = %x\n", i, fpieee_record.Enable.Underflow); + ok(fpieee_record.Enable.Overflow == test_data[i].rec.Enable.Overflow, + "%d) Enable.Overflow = %x\n", i, fpieee_record.Enable.Overflow); + ok(fpieee_record.Enable.ZeroDivide == test_data[i].rec.Enable.ZeroDivide, + "%d) Enable.ZeroDivide = %x\n", i, fpieee_record.Enable.ZeroDivide); + ok(fpieee_record.Enable.InvalidOperation == test_data[i].rec.Enable.InvalidOperation, + "%d) Enable.InvalidOperation = %x\n", i, fpieee_record.Enable.InvalidOperation); + ok(fpieee_record.Status.Inexact == test_data[i].rec.Status.Inexact, + "%d) Status.Inexact = %x\n", i, fpieee_record.Status.Inexact); + ok(fpieee_record.Status.Underflow == test_data[i].rec.Status.Underflow, + "%d) Status.Underflow = %x\n", i, fpieee_record.Status.Underflow); + ok(fpieee_record.Status.Overflow == test_data[i].rec.Status.Overflow, + "%d) Status.Overflow = %x\n", i, fpieee_record.Status.Overflow); + ok(fpieee_record.Status.ZeroDivide == test_data[i].rec.Status.ZeroDivide, + "%d) Status.ZeroDivide = %x\n", i, fpieee_record.Status.ZeroDivide); + ok(fpieee_record.Status.InvalidOperation == test_data[i].rec.Status.InvalidOperation, + "%d) Status.InvalidOperation = %x\n", i, fpieee_record.Status.InvalidOperation); + ok(fpieee_record.Operand1.OperandValid == test_data[i].rec.Operand1.OperandValid, + "%d) Operand1.OperandValid = %x\n", i, fpieee_record.Operand1.OperandValid); + if(fpieee_record.Operand1.OperandValid) { + ok(fpieee_record.Operand1.Format == test_data[i].rec.Operand1.Format, + "%d) Operand1.Format = %x\n", i, fpieee_record.Operand1.Format); + } + ok(fpieee_record.Operand2.OperandValid == test_data[i].rec.Operand2.OperandValid, + "%d) Operand2.OperandValid = %x\n", i, fpieee_record.Operand2.OperandValid); + ok(fpieee_record.Operand2.Format == test_data[i].rec.Operand2.Format, + "%d) Operand2.Format = %x\n", i, fpieee_record.Operand2.Format); + ok(fpieee_record.Result.OperandValid == test_data[i].rec.Result.OperandValid, + "%d) Result.OperandValid = %x\n", i, fpieee_record.Result.OperandValid); + ok(fpieee_record.Result.Format == test_data[i].rec.Result.Format, + "%d) Result.Format = %x\n", i, fpieee_record.Result.Format); + } +} +#endif + START_TEST(msvcr90) { if(!init()) @@ -1664,4 +1828,7 @@ START_TEST(msvcr90) test_mbstowcs(); test_strtok_s(); test__mbstok_s(); +#ifdef __i386__ + test__fpieee_flt(); +#endif }

1 0

Piotr Caban : msvcrt: Support fdiv m64fp in i386 _fpieee_flt.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: a6ffb1d2cf4b86290e61e1c44c8e3c9179c4172d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6ffb1d2cf4b86290e61e1c44… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:58:00 2016 +0200 msvcrt: Support fdiv m64fp in i386 _fpieee_flt. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_i386.c | 70 +++++++++++++++++++++++++++++- dlls/msvcrt/msvcrt.h | 107 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 175 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 6a01fa7..d26a864 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -1124,8 +1124,74 @@ void __stdcall _seh_longjmp_unwind4(struct MSVCRT___JUMP_BUFFER *jmp) int __cdecl _fpieee_flt(ULONG exception_code, EXCEPTION_POINTERS *ep, int (__cdecl *handler)(_FPIEEE_RECORD*)) { - FIXME("(%x %p %p) opcode: %x\n", exception_code, ep, handler, - *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + FLOATING_SAVE_AREA *ctx = &ep->ContextRecord->FloatSave; + _FPIEEE_RECORD rec; + int ret; + + TRACE("(%x %p %p)\n", exception_code, ep, handler); + + switch(exception_code) { + case STATUS_FLOAT_DIVIDE_BY_ZERO: + case STATUS_FLOAT_INEXACT_RESULT: + case STATUS_FLOAT_INVALID_OPERATION: + case STATUS_FLOAT_OVERFLOW: + case STATUS_FLOAT_UNDERFLOW: + break; + default: + return EXCEPTION_CONTINUE_SEARCH; + } + + memset(&rec, 0, sizeof(rec)); + rec.RoundingMode = ctx->ControlWord >> 10; + switch((ctx->ControlWord >> 8) & 0x3) { + case 0: rec.Precision = 2; break; + case 1: rec.Precision = 3; break; + case 2: rec.Precision = 1; break; + case 3: rec.Precision = 0; break; + } + rec.Status.InvalidOperation = ctx->StatusWord & 0x1; + rec.Status.ZeroDivide = ((ctx->StatusWord & 0x4) != 0); + rec.Status.Overflow = ((ctx->StatusWord & 0x8) != 0); + rec.Status.Underflow = ((ctx->StatusWord & 0x10) != 0); + rec.Status.Inexact = ((ctx->StatusWord & 0x20) != 0); + rec.Enable.InvalidOperation = ((ctx->ControlWord & 0x1) == 0); + rec.Enable.ZeroDivide = ((ctx->ControlWord & 0x4) == 0); + rec.Enable.Overflow = ((ctx->ControlWord & 0x8) == 0); + rec.Enable.Underflow = ((ctx->ControlWord & 0x10) == 0); + rec.Enable.Inexact = ((ctx->ControlWord & 0x20) == 0); + rec.Cause.InvalidOperation = rec.Enable.InvalidOperation & rec.Status.InvalidOperation; + rec.Cause.ZeroDivide = rec.Enable.ZeroDivide & rec.Status.ZeroDivide; + rec.Cause.Overflow = rec.Enable.Overflow & rec.Status.Overflow; + rec.Cause.Underflow = rec.Enable.Underflow & rec.Status.Underflow; + rec.Cause.Inexact = rec.Enable.Inexact & rec.Status.Inexact; + + TRACE("opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); + + if(*(WORD*)ctx->ErrorOffset == 0x35dc) { /* fdiv m64fp */ + if(exception_code==STATUS_FLOAT_DIVIDE_BY_ZERO || exception_code==STATUS_FLOAT_INVALID_OPERATION) { + rec.Operand1.OperandValid = 1; + rec.Result.OperandValid = 0; + } else { + rec.Operand1.OperandValid = 0; + rec.Result.OperandValid = 1; + } + rec.Operand2.OperandValid = 1; + rec.Operation = _FpCodeDivide; + rec.Operand1.Format = _FpFormatFp80; + memcpy(&rec.Operand1.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + rec.Operand2.Format = _FpFormatFp64; + rec.Operand2.Value.Fp64Value = *(double*)ctx->DataOffset; + rec.Result.Format = _FpFormatFp80; + memcpy(&rec.Result.Value.Fp80Value, ctx->RegisterArea, sizeof(rec.Operand1.Value.Fp80Value)); + + ret = handler(&rec); + + if(ret == EXCEPTION_CONTINUE_EXECUTION) + memcpy(ctx->RegisterArea, &rec.Result.Value.Fp80Value, sizeof(rec.Operand1.Value.Fp80Value)); + return ret; + } + + FIXME("unsupported opcode: %x\n", *(ULONG*)ep->ContextRecord->FloatSave.ErrorOffset); return EXCEPTION_CONTINUE_SEARCH; } diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index eb6273d..71d80c9 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -1177,6 +1177,113 @@ extern char* __cdecl __unDName(char *,const char*,int,malloc_func_t,free_func_t, #define UCRTBASE_SCANF_MASK (0x0007) typedef enum { + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, +} _FP_OPERATION_CODE; + +typedef enum { _FpFormatFp32, _FpFormatFp64, _FpFormatFp80,

1 0

Piotr Caban : msvcrt: Add _fpieee_flt stub.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: dc0e3d0a9c3ffa085d1cbcc53940d1876005af1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc0e3d0a9c3ffa085d1cbcc53… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:55 2016 +0200 msvcrt: Add _fpieee_flt stub. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-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/msvcr120_app/msvcr120_app.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_arm.c | 10 +++ dlls/msvcrt/except_i386.c | 11 +++ dlls/msvcrt/except_x86_64.c | 11 +++ dlls/msvcrt/msvcrt.h | 90 ++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- 19 files changed, 137 insertions(+), 15 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dc0e3d0a9c3ffa085d1cb…

1 0

Piotr Caban : include: Add msvcrt/fpieee.h header.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: 514ff74e9bb222bcc1e1e9829ad412d91ae5efe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=514ff74e9bb222bcc1e1e9829… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Aug 24 13:57:49 2016 +0200 include: Add msvcrt/fpieee.h header. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/msvcrt/fpieee.h | 239 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 240 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 4aaefaf..89004b8 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -473,6 +473,7 @@ HEADER_SRCS = \ msvcrt/errno.h \ msvcrt/fcntl.h \ msvcrt/float.h \ + msvcrt/fpieee.h \ msvcrt/io.h \ msvcrt/limits.h \ msvcrt/locale.h \ diff --git a/include/msvcrt/fpieee.h b/include/msvcrt/fpieee.h new file mode 100644 index 0000000..67f6d11 --- /dev/null +++ b/include/msvcrt/fpieee.h @@ -0,0 +1,239 @@ +/** + * Derived from mingw-w64 header. + * This file is in the public domain. + */ +#ifndef __WINE_FPIEEE_H +#define __WINE_FPIEEE_H + +#include <crtdefs.h> + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + _FpCompareEqual, + _FpCompareGreater, + _FpCompareLess, + _FpCompareUnordered +} _FPIEEE_COMPARE_RESULT; + +typedef enum { + _FpFormatFp32, + _FpFormatFp64, + _FpFormatFp80, + _FpFormatFp128, + _FpFormatI16, + _FpFormatI32, + _FpFormatI64, + _FpFormatU16, + _FpFormatU32, + _FpFormatU64, + _FpFormatBcd80, + _FpFormatCompare, + _FpFormatString, +} _FPIEEE_FORMAT; + +typedef enum { + _FpCodeUnspecified, + _FpCodeAdd, + _FpCodeSubtract, + _FpCodeMultiply, + _FpCodeDivide, + _FpCodeSquareRoot, + _FpCodeRemainder, + _FpCodeCompare, + _FpCodeConvert, + _FpCodeRound, + _FpCodeTruncate, + _FpCodeFloor, + _FpCodeCeil, + _FpCodeAcos, + _FpCodeAsin, + _FpCodeAtan, + _FpCodeAtan2, + _FpCodeCabs, + _FpCodeCos, + _FpCodeCosh, + _FpCodeExp, + _FpCodeFabs, + _FpCodeFmod, + _FpCodeFrexp, + _FpCodeHypot, + _FpCodeLdexp, + _FpCodeLog, + _FpCodeLog10, + _FpCodeModf, + _FpCodePow, + _FpCodeSin, + _FpCodeSinh, + _FpCodeTan, + _FpCodeTanh, + _FpCodeY0, + _FpCodeY1, + _FpCodeYn, + _FpCodeLogb, + _FpCodeNextafter, + _FpCodeNegate, + _FpCodeFmin, + _FpCodeFmax, + _FpCodeConvertTrunc, + _XMMIAddps, + _XMMIAddss, + _XMMISubps, + _XMMISubss, + _XMMIMulps, + _XMMIMulss, + _XMMIDivps, + _XMMIDivss, + _XMMISqrtps, + _XMMISqrtss, + _XMMIMaxps, + _XMMIMaxss, + _XMMIMinps, + _XMMIMinss, + _XMMICmpps, + _XMMICmpss, + _XMMIComiss, + _XMMIUComiss, + _XMMICvtpi2ps, + _XMMICvtsi2ss, + _XMMICvtps2pi, + _XMMICvtss2si, + _XMMICvttps2pi, + _XMMICvttss2si, + _XMMIAddsubps, + _XMMIHaddps, + _XMMIHsubps, + _XMMI2Addpd, + _XMMI2Addsd, + _XMMI2Subpd, + _XMMI2Subsd, + _XMMI2Mulpd, + _XMMI2Mulsd, + _XMMI2Divpd, + _XMMI2Divsd, + _XMMI2Sqrtpd, + _XMMI2Sqrtsd, + _XMMI2Maxpd, + _XMMI2Maxsd, + _XMMI2Minpd, + _XMMI2Minsd, + _XMMI2Cmppd, + _XMMI2Cmpsd, + _XMMI2Comisd, + _XMMI2UComisd, + _XMMI2Cvtpd2pi, + _XMMI2Cvtsd2si, + _XMMI2Cvttpd2pi, + _XMMI2Cvttsd2si, + _XMMI2Cvtps2pd, + _XMMI2Cvtss2sd, + _XMMI2Cvtpd2ps, + _XMMI2Cvtsd2ss, + _XMMI2Cvtdq2ps, + _XMMI2Cvttps2dq, + _XMMI2Cvtps2dq, + _XMMI2Cvttpd2dq, + _XMMI2Cvtpd2dq, + _XMMI2Addsubpd, + _XMMI2Haddpd, + _XMMI2Hsubpd, +} _FP_OPERATION_CODE; + +typedef enum { + _FpRoundNearest, + _FpRoundMinusInfinity, + _FpRoundPlusInfinity, + _FpRoundChopped +} _FPIEEE_ROUNDING_MODE; + +typedef enum { + _FpPrecisionFull, + _FpPrecision53, + _FpPrecision24, +} _FPIEEE_PRECISION; + +typedef float _FP32; +typedef double _FP64; +typedef short _I16; +typedef int _I32; +typedef unsigned short _U16; +typedef unsigned int _U32; +typedef __int64 _Q64; + +typedef struct { + unsigned short W[5]; +} _FP80; + +typedef struct DECLSPEC_ALIGN(16) { + __msvcrt_ulong W[4]; +} _FP128; + +typedef struct DECLSPEC_ALIGN(8) { + __msvcrt_ulong W[2]; +} _I64; + +typedef struct DECLSPEC_ALIGN(8) { + __msvcrt_ulong W[2]; +} _U64; + +typedef struct { + unsigned short W[5]; +} _BCD80; + +typedef struct DECLSPEC_ALIGN(16) { + _Q64 W[2]; +} _FPQ64; + +typedef struct { + union { + _FP32 Fp32Value; + _FP64 Fp64Value; + _FP80 Fp80Value; + _FP128 Fp128Value; + _I16 I16Value; + _I32 I32Value; + _I64 I64Value; + _U16 U16Value; + _U32 U32Value; + _U64 U64Value; + _BCD80 Bcd80Value; + char *StringValue; + int CompareValue; + _Q64 Q64Value; + _FPQ64 Fpq64Value; + } Value; + unsigned int OperandValid : 1; + unsigned int Format : 4; +} _FPIEEE_VALUE; + +typedef struct { + unsigned int Inexact : 1; + unsigned int Underflow : 1; + unsigned int Overflow : 1; + unsigned int ZeroDivide : 1; + unsigned int InvalidOperation : 1; +} _FPIEEE_EXCEPTION_FLAGS; + +typedef struct { + unsigned int RoundingMode : 2; + unsigned int Precision : 3; + unsigned int Operation :12; + _FPIEEE_EXCEPTION_FLAGS Cause; + _FPIEEE_EXCEPTION_FLAGS Enable; + _FPIEEE_EXCEPTION_FLAGS Status; + _FPIEEE_VALUE Operand1; + _FPIEEE_VALUE Operand2; + _FPIEEE_VALUE Result; +} _FPIEEE_RECORD,*_PFPIEEE_RECORD; + +struct _EXCEPTION_POINTERS; + +int __cdecl _fpieee_flt(__msvcrt_ulong _ExceptionCode,struct _EXCEPTION_POINTERS *_PtExceptionPtr,int (__cdecl *_Handler)(_FPIEEE_RECORD *)); + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Jacek Caban : wpc: Added IWindowsParentalControls stub implementation.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: fec49b9af6160b3f3008ca069c116b0d1a76cc8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=fec49b9af6160b3f3008ca069… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Aug 24 12:40:42 2016 +0200 wpc: Added IWindowsParentalControls stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpc/tests/wpc.c | 2 +- dlls/wpc/wpc.c | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/dlls/wpc/tests/wpc.c b/dlls/wpc/tests/wpc.c index 9fcc3f2..2cf35cc 100644 --- a/dlls/wpc/tests/wpc.c +++ b/dlls/wpc/tests/wpc.c @@ -32,7 +32,7 @@ static void test_wpc(void) if(hres == REGDB_E_CLASSNOTREG) win_skip("CLSID_WindowsParentalControls not registered\n"); else - todo_wine ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); + ok(hres == S_OK, "Could not create CLSID_WindowsParentalControls instance: %08x\n", hres); if(FAILED(hres)) return; diff --git a/dlls/wpc/wpc.c b/dlls/wpc/wpc.c index 20db3fc..10468e9 100644 --- a/dlls/wpc/wpc.c +++ b/dlls/wpc/wpc.c @@ -28,12 +28,87 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpc); static HINSTANCE wpc_instance; -static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +static HRESULT WINAPI WindowsParentalControls_QueryInterface(IWindowsParentalControls *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(riid, &IID_IUnknown)) { + TRACE("(IID_IUnknown %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWindowsParentalControlsCore)) { + TRACE("(IID_IWindowsParentalControlsCore %p)\n", ppv); + *ppv = iface; + }else if(IsEqualGUID(riid, &IID_IWindowsParentalControls)) { + TRACE("(IID_IWindowsParentalControls %p)\n", ppv); + *ppv = iface; + }else { + FIXME("unsupported iface %s\n", debugstr_guid(riid)); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI WindowsParentalControls_AddRef(IWindowsParentalControls *iface) +{ + return 2; +} + +static ULONG WINAPI WindowsParentalControls_Release(IWindowsParentalControls *iface) +{ + return 1; +} + +static HRESULT WINAPI WindowsParentalControls_GetVisibility(IWindowsParentalControls *iface, WPCFLAG_VISIBILITY *visibility) +{ + FIXME("(%p)\n", visibility); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetUserSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCSettings **settings) +{ + FIXME("(%s %p)\n", debugstr_w(sid), settings); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetWebSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCWebSettings **settings) { - FIXME("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + FIXME("(%s %p)\n", debugstr_w(sid), settings); return E_NOTIMPL; } +static HRESULT WINAPI WindowsParentalControls_GetWebFilterInfo(IWindowsParentalControls *iface, GUID *id, WCHAR **name) +{ + FIXME("(%p %p)\n", id, name); + return E_NOTIMPL; +} + +static HRESULT WINAPI WindowsParentalControls_GetGamesSettings(IWindowsParentalControls *iface, const WCHAR *sid, IWPCGamesSettings **settings) +{ + FIXME("(%s %p)\n", debugstr_w(sid), settings); + return E_NOTIMPL; +} + +static const IWindowsParentalControlsVtbl WindowsParentalControlsVtbl = { + WindowsParentalControls_QueryInterface, + WindowsParentalControls_AddRef, + WindowsParentalControls_Release, + WindowsParentalControls_GetVisibility, + WindowsParentalControls_GetUserSettings, + WindowsParentalControls_GetWebSettings, + WindowsParentalControls_GetWebFilterInfo, + WindowsParentalControls_GetGamesSettings +}; + +static HRESULT WINAPI WindowsParentalControls_CreateInstance(IClassFactory *iface, IUnknown *outer, REFIID riid, void **ppv) +{ + static IWindowsParentalControls wpc = { &WindowsParentalControlsVtbl }; + + TRACE("(%s %p %p)\n", debugstr_guid(riid), outer, ppv); + + return IWindowsParentalControls_QueryInterface(&wpc, riid, ppv); +} + static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID riid, void **ppv) { *ppv = NULL;

1 0

Michael Müller : d3d11: Correctly print unhandled bind flags in wined3d_usage_from_d3d11.
by Alexandre Julliard 24 Aug '16

24 Aug '16

Module: wine Branch: master Commit: d64e9bb59d38e3884fea675de4de7b18107277db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64e9bb59d38e3884fea675de… Author: Michael Müller <michael(a)fds-team.de> Date: Tue Aug 23 17:25:13 2016 +0200 d3d11: Correctly print unhandled bind flags in wined3d_usage_from_d3d11. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d11/utils.c b/dlls/d3d11/utils.c index 370858e..89dbbda 100644 --- a/dlls/d3d11/utils.c +++ b/dlls/d3d11/utils.c @@ -411,7 +411,7 @@ DWORD wined3d_usage_from_d3d11(UINT bind_flags, enum D3D11_USAGE usage) if (bind_flags & D3D11_BIND_DEPTH_STENCIL) wined3d_usage |= WINED3DUSAGE_DEPTHSTENCIL; if (bind_flags & ~handled) - FIXME("Unhandled bind flags %#x.\n", usage & ~handled); + FIXME("Unhandled bind flags %#x.\n", bind_flags & ~handled); if (usage == D3D11_USAGE_DYNAMIC) wined3d_usage |= WINED3DUSAGE_DYNAMIC;

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
78
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 August 2016