April 2019 - Wine-Commits - list.winehq.org

Nikolay Sivov : kernel32/tests: Add a test for critical section DebugInfo initial value.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: bf174815ba8529bfbbda8697503d3c2539f82359 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf174815ba8529bfbbda8697… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 25 12:31:55 2019 +0300 kernel32/tests: Add a test for critical section DebugInfo initial value. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/sync.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/kernel32/tests/sync.c b/dlls/kernel32/tests/sync.c index f7be51e..8dea3b3 100644 --- a/dlls/kernel32/tests/sync.c +++ b/dlls/kernel32/tests/sync.c @@ -2636,6 +2636,26 @@ static void test_apc_deadlock(void) CloseHandle(pi.hProcess); } +static void test_crit_section(void) +{ + CRITICAL_SECTION cs; + BOOL ret; + + /* Win8+ does not initialize debug info, one has to use RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO + to override that. */ + memset(&cs, 0, sizeof(cs)); + InitializeCriticalSection(&cs); + ok(cs.DebugInfo != NULL, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); + + memset(&cs, 0, sizeof(cs)); + ret = InitializeCriticalSectionEx(&cs, 0, CRITICAL_SECTION_NO_DEBUG_INFO); + ok(ret, "Failed to initialize critical section.\n"); +todo_wine + ok(cs.DebugInfo == (void *)(ULONG_PTR)-1, "Unexpected debug info pointer %p.\n", cs.DebugInfo); + DeleteCriticalSection(&cs); +} + START_TEST(sync) { char **argv; @@ -2694,4 +2714,5 @@ START_TEST(sync) test_srwlock_example(); test_alertable_wait(); test_apc_deadlock(); + test_crit_section(); }

1 0

Francois Gouget : d3d11/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 4385a3ecb6b6cbfa137b77bd5bb57c5d3ee1abe2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4385a3ecb6b6cbfa137b77bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d11/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3d6cbf5..2850d59 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25681,6 +25681,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -25691,21 +25692,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -25713,7 +25716,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Nikola Pavlica : dsound: Revised 5.1 to stereo downmix.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 87eaa2f593d3a6b2e1440de3bf4c6b37ef089fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=87eaa2f593d3a6b2e1440de3… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:22 2019 +0200 dsound: Revised 5.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 26dbb32..6171b16 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -216,39 +216,37 @@ void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { - /* based on pulseaudio's downmix algorithm */ + /* based on analyzing a recording of a dsound downmix */ switch(channel){ - case 4: /* back left */ - value *= 0.056f; /* (1/9) / (sum of left volumes) */ + case 4: /* surround left */ + value *= 0.24f; dsb->put_aux(dsb, pos, 0, value); break; case 0: /* front left */ - value *= 0.503f; /* 1 / (sum of left volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 0, value); break; - case 5: /* back right */ - value *= 0.056f; /* (1/9) / (sum of right volumes) */ + case 5: /* surround right */ + value *= 0.24f; dsb->put_aux(dsb, pos, 1, value); break; case 1: /* front right */ - value *= 0.503f; /* 1 / (sum of right volumes) */ + value *= 1.0f; dsb->put_aux(dsb, pos, 1, value); break; - case 2: /* front centre */ - value *= 0.252f; /* 0.5 / (sum of left/right volumes) */ + case 2: /* centre */ + value *= 0.7; dsb->put_aux(dsb, pos, 0, value); dsb->put_aux(dsb, pos, 1, value); break; - case 3: /* LFE */ - value *= 0.189f; /* 0.375 / (sum of left/right volumes) */ - dsb->put_aux(dsb, pos, 0, value); - dsb->put_aux(dsb, pos, 1, value); + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ break; } }

1 0

Martin Storsjo : msvcrt: Fix the fallback implementation of asinh for large negative values.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: fc1107382b7f965103476babee74e74854f167e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc1107382b7f965103476bab… Author: Martin Storsjo <martin(a)martin.st> Date: Tue Apr 23 10:00:04 2019 +0300 msvcrt: Fix the fallback implementation of asinh for large negative values. Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index c893c83..21f1f9b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -3063,7 +3063,10 @@ double CDECL MSVCR120_asinh(double x) #ifdef HAVE_ASINH return asinh(x); #else - if (!isfinite(x*x+1)) return log(2) + log(x); + if (!isfinite(x*x+1)) { + if (x > 0) return log(2) + log(x); + else return -log(2) - log(-x); + } return log(x + sqrt(x*x+1)); #endif }

1 0

Nikola Pavlica : dsound: Added 7.1 to stereo downmix.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: fc84b8675a848683988d1793ea4bc9f95b7ea395 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc84b8675a848683988d1793… Author: Nikola Pavlica <pavlica.nikola(a)gmail.com> Date: Tue Apr 23 20:04:23 2019 +0200 dsound: Added 7.1 to stereo downmix. Signed-off-by: Nikola Pavlica <pavlica.nikola(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/dsound_convert.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ dlls/dsound/dsound_private.h | 1 + dlls/dsound/mixer.c | 6 ++++++ 3 files changed, 54 insertions(+) diff --git a/dlls/dsound/dsound_convert.c b/dlls/dsound/dsound_convert.c index 6171b16..3519337 100644 --- a/dlls/dsound/dsound_convert.c +++ b/dlls/dsound/dsound_convert.c @@ -251,6 +251,53 @@ void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD c } } +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) +{ + /* based on analyzing a recording of a dsound downmix */ + switch(channel){ + + case 6: /* back left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 4: /* surround left */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 0: /* front left */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 0, value); + break; + + case 7: /* back right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 5: /* surround right */ + value *= 0.24f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 1: /* front right */ + value *= 1.0f; + dsb->put_aux(dsb, pos, 1, value); + break; + + case 2: /* centre */ + value *= 0.7; + dsb->put_aux(dsb, pos, 0, value); + dsb->put_aux(dsb, pos, 1, value); + break; + + case 3: + /* LFE is totally ignored in dsound when downmixing to 2 channels */ + break; + } +} + void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) { /* based on pulseaudio's downmix algorithm */ diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 45a100e..b04ce06 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -179,6 +179,7 @@ void put_stereo2quad(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel void put_mono2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_stereo2surround51(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_surround512stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; +void put_surround712stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; void put_quad2stereo(const IDirectSoundBufferImpl *dsb, DWORD pos, DWORD channel, float value) DECLSPEC_HIDDEN; HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *dsbd, diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 32bde38..05ca99b 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -179,6 +179,12 @@ void DSOUND_RecalcFormat(IDirectSoundBufferImpl *dsb) dsb->put = put_surround512stereo; dsb->put_aux = putieee32_sum; } + else if (ichannels == 8 && ochannels == 2) + { + dsb->mix_channels = 8; + dsb->put = put_surround712stereo; + dsb->put_aux = putieee32_sum; + } else if (ichannels == 4 && ochannels == 2) { dsb->mix_channels = 4;

1 0

Akihiro Sagawa : user32: Make the second parameter of get_font_margins const.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: e78d7b08fe4bffe1b70c92bd0c076d4cec92cb72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e78d7b08fe4bffe1b70c92bd… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Apr 25 20:24:51 2019 +0900 user32: Make the second parameter of get_font_margins const. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 24af8ef..3c5331f 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -3812,7 +3812,7 @@ static void EDIT_WM_SetFocus(EDITSTATE *es) EDIT_NOTIFY_PARENT(es, EN_SETFOCUS); } -static DWORD get_font_margins(HDC hdc, TEXTMETRICW *tm, BOOL unicode) +static DWORD get_font_margins(HDC hdc, const TEXTMETRICW *tm, BOOL unicode) { ABC abc[256]; SHORT left, right;

1 0

Francois Gouget : d3d10core/tests: Limit the flood of failures in test_depth_bias().
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: d9150a66b36192b1fe301dfd577a26d83e5c5b7c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d9150a66b36192b1fe301dfd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Apr 25 09:53:36 2019 +0200 d3d10core/tests: Limit the flood of failures in test_depth_bias(). Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f799922..b0ff09d 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15765,6 +15765,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -15775,21 +15776,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -15797,7 +15800,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break;

1 0

Alexandre Julliard : msvcrt: Don't export the __p__* functions on 64-bit.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: wine Branch: master Commit: 52bff1fdfe3e041313654765a3b08891de6e9f84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=52bff1fdfe3e041313654765… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 25 14:49:01 2019 +0200 msvcrt: Don't export the __p__* functions on 64-bit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.spec | 56 ++++++++++++++++++++++----------------------- dlls/msvcrt20/msvcrt20.spec | 48 +++++++++++++++++++------------------- dlls/msvcrt40/msvcrt40.spec | 50 ++++++++++++++++++++-------------------- 3 files changed, 77 insertions(+), 77 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5be4b4c..7958a7a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -245,35 +245,35 @@ @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf @ extern __mb_cur_max MSVCRT___mb_cur_max -@ cdecl __p___argc() MSVCRT___p___argc -@ cdecl __p___argv() MSVCRT___p___argv -@ cdecl __p___initenv() -@ cdecl __p___mb_cur_max() -@ cdecl __p___wargv() MSVCRT___p___wargv -@ cdecl __p___winitenv() -@ cdecl __p__acmdln() MSVCRT___p__acmdln -@ cdecl __p__amblksiz() -@ cdecl __p__commode() -@ cdecl __p__daylight() MSVCRT___p__daylight -@ cdecl __p__dstbias() MSVCRT___p__dstbias -@ cdecl __p__environ() MSVCRT___p__environ -@ stub __p__fileinfo() -@ cdecl __p__fmode() MSVCRT___p__fmode +@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc +@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv +@ cdecl -arch=win32 __p___initenv() +@ cdecl -arch=win32 __p___mb_cur_max() +@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv +@ cdecl -arch=win32 __p___winitenv() +@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln +@ cdecl -arch=win32 __p__amblksiz() +@ cdecl -arch=win32 __p__commode() +@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight +@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias +@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ +@ stub -arch=win32 __p__fileinfo() +@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode @ cdecl __p__iob() -@ stub __p__mbcasemap() -@ cdecl __p__mbctype() -@ cdecl __p__osver() -@ cdecl __p__pctype() MSVCRT___p__pctype -@ cdecl __p__pgmptr() MSVCRT___p__pgmptr -@ stub __p__pwctype() -@ cdecl __p__timezone() MSVCRT___p__timezone -@ cdecl __p__tzname() -@ cdecl __p__wcmdln() MSVCRT___p__wcmdln -@ cdecl __p__wenviron() MSVCRT___p__wenviron -@ cdecl __p__winmajor() -@ cdecl __p__winminor() -@ cdecl __p__winver() -@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr +@ stub -arch=win32 __p__mbcasemap() +@ cdecl -arch=win32 __p__mbctype() +@ cdecl -arch=win32 __p__osver() +@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype +@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr +@ stub -arch=win32 __p__pwctype() +@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone +@ cdecl -arch=win32 __p__tzname() +@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln +@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron +@ cdecl -arch=win32 __p__winmajor() +@ cdecl -arch=win32 __p__winminor() +@ cdecl -arch=win32 __p__winver() +@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr @ cdecl __pctype_func() MSVCRT___pctype_func @ extern __pioinfo MSVCRT___pioinfo # stub __pwctype_func() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 84a1014..f9d36a9 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -808,32 +808,32 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __threadhandle() msvcrt.__threadhandle @ cdecl __threadid() msvcrt.__threadid diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index e4ef8d7..f0269e7 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -886,33 +886,33 @@ @ cdecl __iscsymf(long) msvcrt.__iscsymf @ cdecl __lconv_init() msvcrt.__lconv_init @ extern __mb_cur_max msvcrt.__mb_cur_max -@ cdecl __p___argc() msvcrt.__p___argc -@ cdecl __p___argv() msvcrt.__p___argv -@ cdecl __p___initenv() msvcrt.__p___initenv -@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max -@ cdecl __p___wargv() msvcrt.__p___wargv -@ cdecl __p___winitenv() msvcrt.__p___winitenv -@ cdecl __p__acmdln() msvcrt.__p__acmdln -@ cdecl __p__amblksiz() msvcrt.__p__amblksiz -@ cdecl __p__commode() msvcrt.__p__commode -@ cdecl __p__daylight() msvcrt.__p__daylight -@ cdecl __p__dstbias() msvcrt.__p__dstbias -@ cdecl __p__environ() msvcrt.__p__environ -@ cdecl __p__fmode() msvcrt.__p__fmode +@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc +@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv +@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv +@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max +@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv +@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv +@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln +@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz +@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode +@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight +@ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias +@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ +@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode @ cdecl __p__iob() msvcrt.__p__iob -@ cdecl __p__mbctype() msvcrt.__p__mbctype -@ cdecl __p__osver() msvcrt.__p__osver -@ cdecl __p__pctype() msvcrt.__p__pctype -@ cdecl __p__pgmptr() msvcrt.__p__pgmptr +@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype +@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver +@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype +@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr @ cdecl __p__pwctype() msvcrt.__p__pwctype -@ cdecl __p__timezone() msvcrt.__p__timezone -@ cdecl __p__tzname() msvcrt.__p__tzname -@ cdecl __p__wcmdln() msvcrt.__p__wcmdln -@ cdecl __p__wenviron() msvcrt.__p__wenviron -@ cdecl __p__winmajor() msvcrt.__p__winmajor -@ cdecl __p__winminor() msvcrt.__p__winminor -@ cdecl __p__winver() msvcrt.__p__winver -@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr +@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone +@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname +@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln +@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron +@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor +@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor +@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver +@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs @ cdecl __set_app_type(long) msvcrt.__set_app_type @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr

1 0

Józef Kucia : vkd3d-shader: Add FIXME() for unknown root signature descriptor flags.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: 070de4dfbb1e9458dbb8d670963e3a3959ba5e7f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=070de4dfbb1e9458dbb8d67… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:45 2019 +0200 vkd3d-shader: Add FIXME() for unknown root signature descriptor flags. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1230f30..3fe728e 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2130,6 +2130,18 @@ static int shader_parse_descriptor_ranges(struct root_signature_parser_context * return VKD3D_OK; } +static void shader_validate_descriptor_range1(const struct vkd3d_descriptor_range1 *range) +{ + unsigned int unknown_flags = range->flags & ~(VKD3D_DESCRIPTOR_RANGE_FLAG_NONE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown descriptor range flags %#x.\n", unknown_flags); +} + static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) { @@ -2157,6 +2169,8 @@ static int shader_parse_descriptor_ranges1(struct root_signature_parser_context ranges[i].range_type, ranges[i].descriptor_count, ranges[i].base_shader_register, ranges[i].register_space, ranges[i].flags, ranges[i].descriptor_table_offset); + + shader_validate_descriptor_range1(&ranges[i]); } return VKD3D_OK; @@ -2259,6 +2273,17 @@ static int shader_parse_root_descriptor(struct root_signature_parser_context *co return VKD3D_OK; } +static void shader_validate_root_descriptor1(const struct vkd3d_root_descriptor1 *descriptor) +{ + unsigned int unknown_flags = descriptor->flags & ~(VKD3D_ROOT_DESCRIPTOR_FLAG_NONE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE + | VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC); + + if (unknown_flags) + FIXME("Unknown root descriptor flags %#x.\n", unknown_flags); +} + static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) { @@ -2278,6 +2303,8 @@ static int shader_parse_root_descriptor1(struct root_signature_parser_context *c TRACE("Shader register %u, register space %u, flags %#x.\n", descriptor->shader_register, descriptor->register_space, descriptor->flags); + shader_validate_root_descriptor1(descriptor); + return VKD3D_OK; }

1 0

Józef Kucia : tests: Add tests for root signature 1.1 bytecode.
by Alexandre Julliard April 25, 2019

April 25, 2019

Module: vkd3d Branch: master Commit: cbab2362ce06f4f7734c0ddbdf334d75a2b928b9 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cbab2362ce06f4f7734c0dd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Apr 24 16:05:43 2019 +0200 tests: Add tests for root signature 1.1 bytecode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 638 ++++++++++++++++++++++++++++++++++++++++++------ tests/d3d12_crosstest.h | 8 + 2 files changed, 578 insertions(+), 68 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=cbab2362ce06f4f7734…

1 0