April 2017 - Wine-commits - list.winehq.org

Christopher Berner : wined3d: Add Nvidia TitanX (Pascal).
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: dad06728ce75e0422218bff06168e0c6328b9b7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=dad06728ce75e0422218bff06… Author: Christopher Berner <christopherberner(a)gmail.com> Date: Sun Apr 23 12:12:05 2017 -0700 wined3d: Add Nvidia TitanX (Pascal). Signed-off-by: Christopher Berner <christopherberner(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e89cd6d..0a925f0 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1389,6 +1389,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ {HW_VENDOR_AMD, CARD_AMD_RAGE_128PRO, "ATI Rage Fury", DRIVER_AMD_RAGE_128PRO, 16 }, @@ -1873,6 +1874,7 @@ static const struct wined3d_renderer_table cards_nvidia_binary[] = { /* Direct 3D 11 */ + {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 829360c..357ceed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2201,6 +2201,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

Daniel Lehman : msvcrt: Handle synchronous flag for x64 C++ exceptions.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: b0326bea747c4f789f0fb36cf317df1b98816f22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0326bea747c4f789f0fb36cf… Author: Daniel Lehman <dlehman(a)esri.com> Date: Thu Apr 20 06:21:14 2017 -0700 msvcrt: Handle synchronous flag for x64 C++ exceptions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/cppexcept.h | 2 ++ dlls/msvcrt/except_i386.c | 2 -- dlls/msvcrt/except_x86_64.c | 16 ++++++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 6ea5818..2091889 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -26,6 +26,8 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 +#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs and /EHsc) */ + typedef void (*vtable_ptr)(void); /* type_info object, see cpp.c for implementation */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index d26a864..963bd58 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -96,8 +96,6 @@ typedef struct __cxx_function_descr UINT flags; /* flags when magic >= VC8 */ } cxx_function_descr; -#define FUNC_DESCR_SYNCHRONOUS 1 /* synchronous exceptions only (built with /EHs) */ - typedef struct _SCOPETABLE { int previousTryLevel; diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d299608..8210f7b 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -331,6 +331,12 @@ static inline void* WINAPI call_catch_block(EXCEPTION_RECORD *rec) return ret_addr; } +static inline BOOL cxx_is_consolidate(const EXCEPTION_RECORD *rec) +{ + return rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && + rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block; +} + static inline void find_catch_block(EXCEPTION_RECORD *rec, ULONG64 frame, DISPATCHER_CONTEXT *dispatch, const cxx_function_descr *descr, @@ -442,6 +448,13 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (descr->magic >= CXX_FRAME_MAGIC_VC8 && + (descr->flags & FUNC_DESCR_SYNCHRONOUS) && + (rec->ExceptionCode != CXX_EXCEPTION && + !cxx_is_consolidate(rec) && + rec->ExceptionCode != STATUS_LONGJUMP)) + return ExceptionContinueSearch; /* handle only c++ exceptions */ + /* update orig_frame if it's a nested exception */ throw_func_off = RtlLookupFunctionEntry(dispatch->ControlPc, &throw_base, NULL)->BeginAddress; throw_func = rva_to_ptr(throw_func_off, throw_base); @@ -470,8 +483,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) { - if (rec->ExceptionCode==STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters==6 && - rec->ExceptionInformation[0]==(ULONG_PTR)call_catch_block) + if (cxx_is_consolidate(rec)) { EXCEPTION_RECORD *new_rec = (void*)rec->ExceptionInformation[4]; thread_data_t *data = msvcrt_get_thread_data();

1 0

Daniel Lehman : msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 64c4c39746049fcaaa3af42ee982df2fad18dd62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c4c39746049fcaaa3af42ee… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Apr 21 12:41:31 2017 -0700 msvcrt: Stop at trylevel for ControlPc on target frame for non-consolidate unwinds. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/except_x86_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 8210f7b..e891567 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -515,7 +515,7 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } if (frame == orig_frame) - cxx_local_unwind(frame, dispatch, descr, -1); + cxx_local_unwind(frame, dispatch, descr, rec->ExceptionFlags & EH_TARGET_UNWIND ? trylevel : -1); return ExceptionContinueSearch; } if (!descr->tryblock_count) return ExceptionContinueSearch;

1 0

Olivier F. R. Dierick : api-ms-win-core-processthreads-l1-1-0: Add some functions.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 61b573532b2c5b4b059a111e0aaade5b4b413016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61b573532b2c5b4b059a111e0… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Mon Apr 24 17:23:20 2017 +0200 api-ms-win-core-processthreads-l1-1-0: Add some functions. Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 8 ++++---- tools/make_specfiles | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index e555071..77414bc 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall CreateProcessA(str str ptr ptr long long ptr str ptr ptr) kernel32.CreateProcessA -@ stub CreateProcessAsUserW +@ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateProcessW(wstr wstr ptr ptr long long ptr wstr ptr ptr) kernel32.CreateProcessW @ stdcall CreateRemoteThread(long ptr long ptr long long ptr) kernel32.CreateRemoteThread @ stub CreateRemoteThreadEx @@ -24,9 +24,9 @@ @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList -@ stub OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stub OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC @@ -37,7 +37,7 @@ @ stdcall SetThreadPriority(long long) kernel32.SetThreadPriority @ stdcall SetThreadPriorityBoost(long long) kernel32.SetThreadPriorityBoost @ stdcall SetThreadStackGuarantee(ptr) kernel32.SetThreadStackGuarantee -@ stub SetThreadToken +@ stdcall SetThreadToken(ptr ptr) advapi32.SetThreadToken @ stdcall SuspendThread(long) kernel32.SuspendThread @ stdcall SwitchToThread() kernel32.SwitchToThread @ stdcall TerminateProcess(long long) kernel32.TerminateProcess diff --git a/tools/make_specfiles b/tools/make_specfiles index b36664d..a9b0c32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -157,7 +157,6 @@ my @dll_groups = "api-ms-win-appmodel-identity-l1-1-0", "api-ms-win-appmodel-runtime-l1-1-1", "api-ms-win-downlevel-normaliz-l1-1-0", - "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", @@ -247,6 +246,7 @@ my @dll_groups = "advapi32", "api-ms-win-core-namedpipe-l1-1-0", "api-ms-win-core-namedpipe-l1-2-0", + "api-ms-win-core-processthreads-l1-1-0", "api-ms-win-core-processthreads-l1-1-1", ], [

1 0

Huw Davies : shell32: Remove an extraneous '@'.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 6751e57e0b846e3021f0179642a33c35b74b64ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=6751e57e0b846e3021f017964… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Apr 24 16:01:38 2017 +0100 shell32: Remove an extraneous '@'. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32.rgs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shell32.rgs b/dlls/shell32/shell32.rgs index 79bf4b7..877be6b 100644 --- a/dlls/shell32/shell32.rgs +++ b/dlls/shell32/shell32.rgs @@ -9,7 +9,7 @@ HKCR '{645FF040-5081-101B-9F08-00AA002F954E}' { val LocalizedString = s '@%MODULE%,-8964' - DefaultIcon = s '@%MODULE%,-33' + DefaultIcon = s '%MODULE%,-33' } '{00021401-0000-0000-C000-000000000046}' { shellex { MayChangeDefaultMenu } } }

1 0

Michael Müller : include: Fix an invalid UUID in dxva2api.idl.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 11a1ceebc3544dd7954f4ef140a913cd722aa286 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11a1ceebc3544dd7954f4ef14… Author: Michael Müller <michael(a)fds-team.de> Date: Mon Apr 24 16:27:25 2017 +0200 include: Fix an invalid UUID in dxva2api.idl. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dxva2api.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dxva2api.idl b/include/dxva2api.idl index ebd508b..7a29157 100644 --- a/include/dxva2api.idl +++ b/include/dxva2api.idl @@ -434,7 +434,7 @@ interface IDirectXVideoDecoder : IUnknown */ [ object, - uuid(fc51a551-d5e7-11d9-af55-00054e43ff02), + uuid(fc51a552-d5e7-11d9-af55-00054e43ff02), local ] interface IDirectXVideoProcessorService : IDirectXVideoAccelerationService

1 0

Sebastian Lackner : vcomp: Handle begin == NULL in _vcomp_for_static_init.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: b228f16c0d020a3d8219668a64204bc57b3aa78d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b228f16c0d020a3d8219668a6… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 24 16:12:43 2017 +0200 vcomp: Handle begin == NULL in _vcomp_for_static_init. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcomp/main.c | 7 +++++++ dlls/vcomp/tests/vcomp.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 34e327e..5206e47 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -1171,10 +1171,17 @@ void CDECL _vcomp_for_static_init(int first, int last, int step, int chunksize, struct vcomp_team_data *team_data = thread_data->team; int num_threads = team_data ? team_data->num_threads : 1; int thread_num = thread_data->thread_num; + int no_begin, no_lastchunk; TRACE("(%d, %d, %d, %d, %p, %p, %p, %p, %p)\n", first, last, step, chunksize, loops, begin, end, next, lastchunk); + if (!begin) + { + begin = &no_begin; + lastchunk = &no_lastchunk; + } + if (num_threads == 1 && chunksize != 1) { *loops = 1; diff --git a/dlls/vcomp/tests/vcomp.c b/dlls/vcomp/tests/vcomp.c index f0d8b3a..9aec5cc 100644 --- a/dlls/vcomp/tests/vcomp.c +++ b/dlls/vcomp/tests/vcomp.c @@ -1002,6 +1002,30 @@ static void CDECL for_static_cb(void) p_vcomp_for_static_end(); p_vcomp_barrier(); + loops = end = next = lastchunk = 0xdeadbeef; + p_vcomp_for_static_init(tests[i].first, tests[i].last, tests[i].step, tests[i].chunksize, + &loops, NULL, &end, &next, &lastchunk); + + if (broken_flags & VCOMP_FOR_STATIC_BROKEN_LOOP) + { + ok(loops == 0 || loops == 1, "test %d, thread %d/%d: expected loops == 0 or 1, got %u\n", + i, thread_num, num_threads, loops); + } + else + { + ok(loops == my_loops, "test %d, thread %d/%d: expected loops == %u, got %u\n", + i, thread_num, num_threads, my_loops, loops); + ok(end == my_end, "test %d, thread %d/%d: expected end == %d, got %d\n", + i, thread_num, num_threads, my_end, end); + ok(next == my_next || broken(broken_flags & VCOMP_FOR_STATIC_BROKEN_NEXT), + "test %d, thread %d/%d: expected next == %d, got %d\n", i, thread_num, num_threads, my_next, next); + ok(lastchunk == 0xdeadbeef, "test %d, thread %d/%d: expected lastchunk == 0xdeadbeef, got %d\n", + i, thread_num, num_threads, lastchunk); + } + + p_vcomp_for_static_end(); + p_vcomp_barrier(); + if (tests[i].first == tests[i].last) continue; my_loops = my_begin = my_end = my_next = my_lastchunk = 0xdeadbeef; @@ -1032,6 +1056,30 @@ static void CDECL for_static_cb(void) p_vcomp_for_static_end(); p_vcomp_barrier(); + + loops = end = next = lastchunk = 0xdeadbeef; + p_vcomp_for_static_init(tests[i].last, tests[i].first, tests[i].step, tests[i].chunksize, + &loops, NULL, &end, &next, &lastchunk); + + if (broken_flags & VCOMP_FOR_STATIC_BROKEN_LOOP) + { + ok(loops == 0 || loops == 1, "test %d, thread %d/%d: expected loops == 0 or 1, got %u\n", + i, thread_num, num_threads, loops); + } + else + { + ok(loops == my_loops, "test %d, thread %d/%d: expected loops == %u, got %u\n", + i, thread_num, num_threads, my_loops, loops); + ok(end == my_end, "test %d, thread %d/%d: expected end == %d, got %d\n", + i, thread_num, num_threads, my_end, end); + ok(next == my_next || broken(broken_flags & VCOMP_FOR_STATIC_BROKEN_NEXT), + "test %d, thread %d/%d: expected next == %d, got %d\n", i, thread_num, num_threads, my_next, next); + ok(lastchunk == 0xdeadbeef, "test %d, thread %d/%d: expected lastchunk == 0xdeadbeef, got %d\n", + i, thread_num, num_threads, lastchunk); + } + + p_vcomp_for_static_end(); + p_vcomp_barrier(); } }

1 0

Alistair Leslie-Hughes : include/mfreadwrite.idl: Add MF_SOURCE_READER_* enum values.
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 07967d93aa29eec34857421d0a5b5f76150b5a8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=07967d93aa29eec34857421d0… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Apr 22 10:44:42 2017 +0000 include/mfreadwrite.idl: Add MF_SOURCE_READER_* enum values. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mfreadwrite.idl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mfreadwrite.idl b/include/mfreadwrite.idl index 3f53ff9..a146552 100644 --- a/include/mfreadwrite.idl +++ b/include/mfreadwrite.idl @@ -20,6 +20,17 @@ import "objidl.idl"; import "oaidl.idl"; import "mfobjects.idl"; +enum +{ + MF_SOURCE_READER_INVALID_STREAM_INDEX = 0xffffffff, + MF_SOURCE_READER_ALL_STREAMS = 0xfffffffe, + MF_SOURCE_READER_ANY_STREAM = 0xfffffffe, + MF_SOURCE_READER_FIRST_AUDIO_STREAM = 0xfffffffd, + MF_SOURCE_READER_FIRST_VIDEO_STREAM = 0xfffffffc, + MF_SOURCE_READER_MEDIASOURCE = 0xffffffff, + MF_SOURCE_READER_CURRENT_TYPE_INDEX = 0xffffffff +}; + interface IMFMediaSource; [

1 0

Henri Verbeet : wined3d: Use vector types in wined3d_format_convert_from_float().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: fa6dba885c495f92f8e1a72fdb706c214b645a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6dba885c495f92f8e1a72fd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:25 2017 +0200 wined3d: Use vector types in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 60 +++++++++++++++++++++++--------------------------- include/wine/wined3d.h | 8 +++++++ 2 files changed, 35 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 0eacc82..8c53f45 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4971,38 +4971,32 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con static const struct { enum wined3d_format_id format_id; - float r_mul; - float g_mul; - float b_mul; - float a_mul; - BYTE r_shift; - BYTE g_shift; - BYTE b_shift; - BYTE a_shift; + struct wined3d_vec4 mul; + struct wined3d_uvec4 shift; } conv[] = { - {WINED3DFMT_B8G8R8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B8G8R8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 16, 8, 0, 24}, - {WINED3DFMT_B5G6R5_UNORM, 31.0f, 63.0f, 31.0f, 0.0f, 11, 5, 0, 0}, - {WINED3DFMT_B5G5R5A1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_B5G5R5X1_UNORM, 31.0f, 31.0f, 31.0f, 1.0f, 10, 5, 0, 15}, - {WINED3DFMT_R8_UNORM, 255.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_A8_UNORM, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_B4G4R4A4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B4G4R4X4_UNORM, 15.0f, 15.0f, 15.0f, 15.0f, 8, 4, 0, 12}, - {WINED3DFMT_B2G3R3_UNORM, 7.0f, 7.0f, 3.0f, 0.0f, 5, 2, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_R8G8B8X8_UNORM, 255.0f, 255.0f, 255.0f, 255.0f, 0, 8, 16, 24}, - {WINED3DFMT_B10G10R10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 20, 10, 0, 30}, - {WINED3DFMT_R10G10B10A2_UNORM, 1023.0f, 1023.0f, 1023.0f, 3.0f, 0, 10, 20, 30}, - {WINED3DFMT_P8_UINT, 0.0f, 0.0f, 0.0f, 255.0f, 0, 0, 0, 0}, - {WINED3DFMT_S1_UINT_D15_UNORM, 32767.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D16_UNORM, 65535.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D24_UNORM_S8_UINT, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_X8D24_UNORM, 16777215.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, - {WINED3DFMT_D32_UNORM, 4294967295.0f, 0.0f, 0.0f, 0.0f, 0, 0, 0, 0}, + {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B8G8R8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, + {WINED3DFMT_B5G6R5_UNORM, { 31.0f, 63.0f, 31.0f, 0.0f}, {11, 5, 0, 0}}, + {WINED3DFMT_B5G5R5A1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_B5G5R5X1_UNORM, { 31.0f, 31.0f, 31.0f, 1.0f}, {10, 5, 0, 15}}, + {WINED3DFMT_R8_UNORM, { 255.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_A8_UNORM, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_B4G4R4A4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B4G4R4X4_UNORM, { 15.0f, 15.0f, 15.0f, 15.0f}, { 8, 4, 0, 12}}, + {WINED3DFMT_B2G3R3_UNORM, { 7.0f, 7.0f, 3.0f, 0.0f}, { 5, 2, 0, 0}}, + {WINED3DFMT_R8G8B8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_R8G8B8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, { 0, 8, 16, 24}}, + {WINED3DFMT_B10G10R10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, {20, 10, 0, 30}}, + {WINED3DFMT_R10G10B10A2_UNORM, { 1023.0f, 1023.0f, 1023.0f, 3.0f}, { 0, 10, 20, 30}}, + {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, }; unsigned int i; @@ -5014,10 +5008,10 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con if (format->id != conv[i].format_id) continue; - ret = ((DWORD)((color->r * conv[i].r_mul) + 0.5f)) << conv[i].r_shift; - ret |= ((DWORD)((color->g * conv[i].g_mul) + 0.5f)) << conv[i].g_shift; - ret |= ((DWORD)((color->b * conv[i].b_mul) + 0.5f)) << conv[i].b_shift; - ret |= ((DWORD)((color->a * conv[i].a_mul) + 0.5f)) << conv[i].a_shift; + ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; + ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; + ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; + ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 29a8431..9c3246b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1567,6 +1567,14 @@ struct wined3d_ivec4 int w; }; +struct wined3d_uvec4 +{ + unsigned int x; + unsigned int y; + unsigned int z; + unsigned int w; +}; + struct wined3d_matrix { float _11, _12, _13, _14;

1 0

Henri Verbeet : wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float ().
by Alexandre Julliard 24 Apr '17

24 Apr '17

Module: wine Branch: master Commit: 546be1b80bc1e44b9ed1ad5c159cdbd9f945e7f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=546be1b80bc1e44b9ed1ad5c1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 23 17:57:26 2017 +0200 wined3d: Use doubles to convert 24 and 32 bpc formats in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 46 +++++++++++++++++++++++++++++++++++----------- include/wine/wined3d.h | 8 ++++++++ 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8c53f45..bd83446 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4974,7 +4974,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con struct wined3d_vec4 mul; struct wined3d_uvec4 shift; } - conv[] = + float_conv[] = { {WINED3DFMT_B8G8R8A8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, {WINED3DFMT_B8G8R8X8_UNORM, { 255.0f, 255.0f, 255.0f, 255.0f}, {16, 8, 0, 24}}, @@ -4994,24 +4994,48 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con {WINED3DFMT_P8_UINT, { 0.0f, 0.0f, 0.0f, 255.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_S1_UINT_D15_UNORM, { 32767.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, {WINED3DFMT_D16_UNORM, { 65535.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_X8D24_UNORM, { 16777215.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, - {WINED3DFMT_D32_UNORM, {4294967295.0f, 0.0f, 0.0f, 0.0f}, { 0, 0, 0, 0}}, + }; + static const struct + { + enum wined3d_format_id format_id; + struct wined3d_dvec4 mul; + struct wined3d_uvec4 shift; + } + double_conv[] = + { + {WINED3DFMT_D24_UNORM_S8_UINT, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_X8D24_UNORM, { 16777215.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, + {WINED3DFMT_D32_UNORM, {4294967295.0, 0.0, 0.0, 0.0}, {0, 0, 0, 0}}, }; unsigned int i; + DWORD ret; TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); - for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) + for (i = 0; i < ARRAY_SIZE(float_conv); ++i) { - DWORD ret; + if (format->id != float_conv[i].format_id) + continue; - if (format->id != conv[i].format_id) continue; + ret = ((DWORD)((color->r * float_conv[i].mul.x) + 0.5f)) << float_conv[i].shift.x; + ret |= ((DWORD)((color->g * float_conv[i].mul.y) + 0.5f)) << float_conv[i].shift.y; + ret |= ((DWORD)((color->b * float_conv[i].mul.z) + 0.5f)) << float_conv[i].shift.z; + ret |= ((DWORD)((color->a * float_conv[i].mul.w) + 0.5f)) << float_conv[i].shift.w; + + TRACE("Returning 0x%08x.\n", ret); + + return ret; + } + + for (i = 0; i < ARRAY_SIZE(double_conv); ++i) + { + if (format->id != double_conv[i].format_id) + continue; - ret = ((DWORD)((color->r * conv[i].mul.x) + 0.5f)) << conv[i].shift.x; - ret |= ((DWORD)((color->g * conv[i].mul.y) + 0.5f)) << conv[i].shift.y; - ret |= ((DWORD)((color->b * conv[i].mul.z) + 0.5f)) << conv[i].shift.z; - ret |= ((DWORD)((color->a * conv[i].mul.w) + 0.5f)) << conv[i].shift.w; + ret = ((DWORD)((color->r * double_conv[i].mul.x) + 0.5)) << double_conv[i].shift.x; + ret |= ((DWORD)((color->g * double_conv[i].mul.y) + 0.5)) << double_conv[i].shift.y; + ret |= ((DWORD)((color->b * double_conv[i].mul.z) + 0.5)) << double_conv[i].shift.z; + ret |= ((DWORD)((color->a * double_conv[i].mul.w) + 0.5)) << double_conv[i].shift.w; TRACE("Returning 0x%08x.\n", ret); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9c3246b..e0929ae 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1559,6 +1559,14 @@ struct wined3d_vec4 float w; }; +struct wined3d_dvec4 +{ + double x; + double y; + double z; + double w; +}; + struct wined3d_ivec4 { int x;

1 0