wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Zebediah Figura : kernel32: Implement bytes left in PeekNamedPipe().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: d37bfe960f6fb554f0d4e24052d6b802ba745f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37bfe960f6fb554f0d4e2405… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:51 2017 -0500 kernel32: Implement bytes left in PeekNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 +- server/named_pipe.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ee995f5..d3d46b7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1475,7 +1475,7 @@ BOOL WINAPI PeekNamedPipe( HANDLE hPipe, LPVOID lpvBuffer, DWORD cbBuffer, ULONG read_size = io.Information - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); if (lpcbAvail) *lpcbAvail = buffer->ReadDataAvailable; if (lpcbRead) *lpcbRead = read_size; - if (lpcbMessage) *lpcbMessage = 0; /* FIXME */ + if (lpcbMessage) *lpcbMessage = buffer->MessageLength - read_size; if (lpvBuffer) memcpy( lpvBuffer, buffer->Data, read_size ); } else SetLastError( RtlNtStatusToDosError(status) ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b8ea426..0c314bd 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -927,6 +927,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) FILE_PIPE_PEEK_BUFFER *buffer; struct pipe_message *message; data_size_t avail = 0; + data_size_t message_length = 0; if (!use_server_io( pipe_end )) { @@ -947,7 +948,8 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) if (avail) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); - reply_size = min( reply_size, message->iosb->in_size - message->read_pos ); + message_length = message->iosb->in_size - message->read_pos; + reply_size = min( reply_size, message_length ); } else reply_size = 0; @@ -955,7 +957,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) buffer->NamedPipeState = 0; /* FIXME */ buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ - buffer->MessageLength = 0; /* FIXME */ + buffer->MessageLength = message_length; if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); }

1 0

Paul Gofman : d3dx9/tests: Check pixel shader sampler states in test_effect_commitchanges().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 37bdb8e8cdacec4ef17a17e51e97a0a7233004e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdb8e8cdacec4ef17a17e51… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 20:30:08 2017 +0300 d3dx9/tests: Check pixel shader sampler states in test_effect_commitchanges(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 09b786b..1bd471a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5122,6 +5122,10 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, D3DVERTEXTEXTURESAMPLER0, D3DSAMP_MAGFILTER, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -5141,6 +5145,12 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetSamplerState(device, D3DVERTEXTEXTURESAMPLER0, D3DSAMP_MAGFILTER, &value); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(value == 0, "Unexpected sampler 0 minfilter %u.\n", value); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MINFILTER, &value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(value == 1, "Unexpected sampler 0 minfilter %u.\n", value); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(value == 0, "Unexpected sampler 0 minfilter %u.\n", value); ivect[3] = 2; hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect));

1 0

Paul Gofman : d3dx9: Use pass update version for detecting updated FXLC parameter.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 174ea70bf3301fd837518e376a2f5b097fac5503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174ea70bf3301fd837518e376… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 22 13:24:12 2017 +0200 d3dx9: Use pass update version for detecting updated FXLC parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 511ed32..e9b139e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1092,7 +1092,10 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta { *out_param = param; *param_value = param->data; - if (update_all || is_param_eval_input_dirty(param->param_eval, ULONG64_MAX)) + /* We check with the update_version of the pass because the + * same preshader might be used by both the vertex and the + * pixel shader (that can happen e.g. for sampler states). */ + if (update_all || is_param_eval_input_dirty(param->param_eval, pass->update_version)) { *param_dirty = TRUE; return d3dx_evaluate_parameter(param->param_eval, param, *param_value);

1 0

Paul Gofman : d3dx9: Fix NAN handling in 'cmp' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: f03de9ac4c3c85fc91dcbb1126ea5d1bad212358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03de9ac4c3c85fc91dcbb112… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 22 13:24:11 2017 +0200 d3dx9: Fix NAN handling in 'cmp' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 50ab18f..40a86fa 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -102,7 +102,7 @@ static double pres_ge(double *args, int n) {return args[0] >= args[1] ? 1.0 : 0 static double pres_frc(double *args, int n) {return args[0] - floor(args[0]);} static double pres_min(double *args, int n) {return fmin(args[0], args[1]);} static double pres_max(double *args, int n) {return fmax(args[0], args[1]);} -static double pres_cmp(double *args, int n) {return args[0] < 0.0 ? args[2] : args[1];} +static double pres_cmp(double *args, int n) {return args[0] >= 0.0 ? args[1] : args[2];} static double pres_sin(double *args, int n) {return sin(args[0]);} static double pres_cos(double *args, int n) {return cos(args[0]);} static double pres_rsq(double *args, int n)

1 0

Paul Gofman : d3dx9: Add 'div' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: cd62062673584cae4776561306705ec3e3c18464 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd62062673584cae477656130… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:37 2017 +0300 d3dx9: Add 'div' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 6 ++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 7940e2f..50ab18f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -47,6 +47,7 @@ enum pres_ops PRESHADER_OP_ADD, PRESHADER_OP_MUL, PRESHADER_OP_ATAN2, + PRESHADER_OP_DIV, PRESHADER_OP_CMP, PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, @@ -134,6 +135,10 @@ static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]) static double pres_atan(double *args, int n) {return atan(args[0]);} static double pres_atan2(double *args, int n) {return atan2(args[0], args[1]);} +/* According to the test results 'div' operation always returns 0. Compiler does not seem to ever + * generate it, using rcp + mul instead, so probably it is not implemented in native d3dx. */ +static double pres_div(double *args, int n) {return 0.0;} + #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 #define PRES_SCALAR_FLAG 0x80000000 @@ -176,6 +181,7 @@ static const struct op_info pres_op_info[] = {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ {0x206, "atan2", 2, 0, pres_atan2}, /* PRESHADER_OP_ATAN2 */ + {0x208, "div", 2, 0, pres_div}, /* PRESHADER_OP_DIV */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 0fa8821..09b786b 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4566,6 +4566,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 0.0f, -0.0f, NAN}, {0.0f, -0.0f, 0.0f, 1.0f}}, {"atan2 test #2", 0x20600004, 2, {0xbfc90fdb, 0, 0xc0490fdb, 0}, {-0.3f, 0.0f, -0.0f, -0.0f}, {-0.0f, 0.0f, -0.0f, 1.0f}}, + {"div", 0x20800004, 2, {0, 0, 0, 0}, + {-0.3f, 0.0f, -2.2f, NAN}, {0.0f, -0.0f, -3.0f, 1.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'atan2' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 2f4789895372977036af9046241514676925ccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f4789895372977036af90462… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:36 2017 +0300 d3dx9: Add 'atan2' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 72f6ff5..7940e2f 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -46,6 +46,7 @@ enum pres_ops PRESHADER_OP_GE, PRESHADER_OP_ADD, PRESHADER_OP_MUL, + PRESHADER_OP_ATAN2, PRESHADER_OP_CMP, PRESHADER_OP_DOT, PRESHADER_OP_DOTSWIZ6, @@ -131,6 +132,7 @@ static double pres_log(double *args, int n) static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} static double pres_atan(double *args, int n) {return atan(args[0]);} +static double pres_atan2(double *args, int n) {return atan2(args[0], args[1]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -173,6 +175,7 @@ static const struct op_info pres_op_info[] = {0x203, "ge", 2, 0, pres_ge }, /* PRESHADER_OP_GE */ {0x204, "add", 2, 0, pres_add}, /* PRESHADER_OP_ADD */ {0x205, "mul", 2, 0, pres_mul}, /* PRESHADER_OP_MUL */ + {0x206, "atan2", 2, 0, pres_atan2}, /* PRESHADER_OP_ATAN2 */ {0x300, "cmp", 3, 0, pres_cmp}, /* PRESHADER_OP_CMP */ {0x500, "dot", 2, 1, pres_dot}, /* PRESHADER_OP_DOT */ {0x70e, "d3ds_dotswiz", 6, 0, pres_dotswiz6}, /* PRESHADER_OP_DOTSWIZ6 */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index ffdb1dd..0fa8821 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4562,6 +4562,10 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"atan", 0x10c00001, 1, {0xbe9539d4, 0x3fa9b465, 0xbf927420, 0x3fc90fdb}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"atan2 test #1", 0x20600004, 2, {0xbfc90fdb, 0x40490fdb, 0x80000000, 0x7fc00000}, + {-0.3f, 0.0f, -0.0f, NAN}, {0.0f, -0.0f, 0.0f, 1.0f}}, + {"atan2 test #2", 0x20600004, 2, {0xbfc90fdb, 0, 0xc0490fdb, 0}, + {-0.3f, 0.0f, -0.0f, -0.0f}, {-0.0f, 0.0f, -0.0f, 1.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'atan' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 89043af09f88925d33df02324d89d55af0ce6094 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89043af09f88925d33df02324… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:35 2017 +0300 d3dx9: Add 'atan' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 05618b9..72f6ff5 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -39,6 +39,7 @@ enum pres_ops PRESHADER_OP_COS, PRESHADER_OP_ASIN, PRESHADER_OP_ACOS, + PRESHADER_OP_ATAN, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -129,6 +130,7 @@ static double pres_log(double *args, int n) } static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} +static double pres_atan(double *args, int n) {return atan(args[0]);} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -164,6 +166,7 @@ static const struct op_info pres_op_info[] = {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ {0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */ + {0x10c, "atan", 1, 0, pres_atan}, /* PRESHADER_OP_ATAN */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index b8c5737..ffdb1dd 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4560,6 +4560,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"acos", 0x10b00001, 1, {0x3ff01006, 0xffc00000, 0xffc00000, 0xffc00000}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"atan", 0x10c00001, 1, {0xbe9539d4, 0x3fa9b465, 0xbf927420, 0x3fc90fdb}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'acos' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 537390ed8df7499531181a14e690b1a9f5035176 URL: http://source.winehq.org/git/wine.git/?a=commit;h=537390ed8df7499531181a14e… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:34 2017 +0300 d3dx9: Add 'acos' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 3 +++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 428215e..05618b9 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -38,6 +38,7 @@ enum pres_ops PRESHADER_OP_SIN, PRESHADER_OP_COS, PRESHADER_OP_ASIN, + PRESHADER_OP_ACOS, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -127,6 +128,7 @@ static double pres_log(double *args, int n) #endif } static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} +static double pres_acos(double *args, int n) {return to_signed_nan(acos(args[0]));} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -161,6 +163,7 @@ static const struct op_info pres_op_info[] = {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ + {0x10b, "acos", 1, 0, pres_acos}, /* PRESHADER_OP_ACOS */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index dc22bd7..b8c5737 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4558,6 +4558,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"asin", 0x10a00001, 1, {0xbe9c00ad, 0xffc00000, 0xffc00000, 0xffc00000}, {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"acos", 0x10b00001, 1, {0x3ff01006, 0xffc00000, 0xffc00000, 0xffc00000}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Paul Gofman : d3dx9: Add 'asin' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 5d887de728e146fc63d2a16d52c2fc4d5d24ce43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d887de728e146fc63d2a16d5… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 14:56:33 2017 +0300 d3dx9: Add 'asin' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 18 ++++++++++++++++++ dlls/d3dx9_36/tests/effect.c | 2 ++ 2 files changed, 20 insertions(+) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 8d1d1b4..428215e 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -37,6 +37,7 @@ enum pres_ops PRESHADER_OP_RSQ, PRESHADER_OP_SIN, PRESHADER_OP_COS, + PRESHADER_OP_ASIN, PRESHADER_OP_MIN, PRESHADER_OP_MAX, PRESHADER_OP_LT, @@ -51,6 +52,21 @@ enum pres_ops typedef double (*pres_op_func)(double *args, int n); +static double to_signed_nan(double v) +{ + static const union + { + ULONG64 ulong64_value; + double double_value; + } + signed_nan = + { + 0xfff8000000000000 + }; + + return isnan(v) ? signed_nan.double_value : v; +} + static double pres_mov(double *args, int n) {return args[0];} static double pres_add(double *args, int n) {return args[0] + args[1];} static double pres_mul(double *args, int n) {return args[0] * args[1];} @@ -110,6 +126,7 @@ static double pres_log(double *args, int n) return log(v) / log(2); #endif } +static double pres_asin(double *args, int n) {return to_signed_nan(asin(args[0]));} #define PRES_OPCODE_MASK 0x7ff00000 #define PRES_OPCODE_SHIFT 20 @@ -143,6 +160,7 @@ static const struct op_info pres_op_info[] = {0x107, "rsq", 1, 0, pres_rsq}, /* PRESHADER_OP_RSQ */ {0x108, "sin", 1, 0, pres_sin}, /* PRESHADER_OP_SIN */ {0x109, "cos", 1, 0, pres_cos}, /* PRESHADER_OP_COS */ + {0x10a, "asin", 1, 0, pres_asin}, /* PRESHADER_OP_ASIN */ {0x200, "min", 2, 0, pres_min}, /* PRESHADER_OP_MIN */ {0x201, "max", 2, 0, pres_max}, /* PRESHADER_OP_MAX */ {0x202, "lt", 2, 0, pres_lt }, /* PRESHADER_OP_LT */ diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index f4a4777..dc22bd7 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -4556,6 +4556,8 @@ static void test_effect_preshader_ops(IDirect3DDevice9 *device) {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"log", 0x10600001, 1, {0, 0x40000000, 0x3f9199b7, 0x43000000}, {0.0f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, + {"asin", 0x10a00001, 1, {0xbe9c00ad, 0xffc00000, 0xffc00000, 0xffc00000}, + {-0.3f, 4.0f, -2.2f, 3.402823466e+38f}, {1.0f, 2.0f, -3.0f, 4.0f}}, {"0 * INF", 0x20500004, 2, {0xffc00000, 0xffc00000, 0xc0d33334, 0x7f800000}, {0.0f, -0.0f, -2.2f, 3.402823466e+38f}, {INFINITY, INFINITY, 3.0f, 4.0f}}, };

1 0

Alistair Leslie-Hughes : oleaut32: Use VariantChangeTypeEx to convert to VT_BOOL.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 1762f89ff259f6f82c0284b50e2a7380f94badcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1762f89ff259f6f82c0284b50… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 18 22:59:44 2017 +0000 oleaut32: Use VariantChangeTypeEx to convert to VT_BOOL. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/variant.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 188e393..2dcded5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2503,19 +2503,12 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) { VARTYPE leftvt,rightvt,resultvt; HRESULT hres; - static WCHAR str_true[32]; - static WCHAR str_false[32]; static const WCHAR sz_empty[] = {'\0'}; leftvt = V_VT(left); rightvt = V_VT(right); TRACE("%s,%s,%p)\n", debugstr_variant(left), debugstr_variant(right), out); - if (!str_true[0]) { - VARIANT_GetLocalisedText(LOCALE_USER_DEFAULT, IDS_FALSE, str_false); - VARIANT_GetLocalisedText(LOCALE_USER_DEFAULT, IDS_TRUE, str_true); - } - /* when both left and right are NULL the result is NULL */ if (leftvt == VT_NULL && rightvt == VT_NULL) { @@ -2596,24 +2589,15 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) /* Convert left side variant to string */ if (leftvt != VT_BSTR) { - if (leftvt == VT_BOOL) - { - /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ - V_VT(&bstrvar_left) = VT_BSTR; - if (V_BOOL(left)) - V_BSTR(&bstrvar_left) = SysAllocString(str_true); - else - V_BSTR(&bstrvar_left) = SysAllocString(str_false); - } /* Fill with empty string for later concat with right side */ - else if (leftvt == VT_NULL) + if (leftvt == VT_NULL) { V_VT(&bstrvar_left) = VT_BSTR; V_BSTR(&bstrvar_left) = SysAllocString(sz_empty); } else { - hres = VariantChangeTypeEx(&bstrvar_left,left,0,0,VT_BSTR); + hres = VariantChangeTypeEx(&bstrvar_left,left,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right); @@ -2625,24 +2609,15 @@ HRESULT WINAPI VarCat(LPVARIANT left, LPVARIANT right, LPVARIANT out) /* convert right side variant to string */ if (rightvt != VT_BSTR) { - if (rightvt == VT_BOOL) - { - /* Bools are handled as localized True/False strings instead of 0/-1 as in MSDN */ - V_VT(&bstrvar_right) = VT_BSTR; - if (V_BOOL(right)) - V_BSTR(&bstrvar_right) = SysAllocString(str_true); - else - V_BSTR(&bstrvar_right) = SysAllocString(str_false); - } /* Fill with empty string for later concat with right side */ - else if (rightvt == VT_NULL) + if (rightvt == VT_NULL) { V_VT(&bstrvar_right) = VT_BSTR; V_BSTR(&bstrvar_right) = SysAllocString(sz_empty); } else { - hres = VariantChangeTypeEx(&bstrvar_right,right,0,0,VT_BSTR); + hres = VariantChangeTypeEx(&bstrvar_right,right,0,VARIANT_ALPHABOOL|VARIANT_LOCALBOOL,VT_BSTR); if (hres != S_OK) { VariantClear(&bstrvar_left); VariantClear(&bstrvar_right);

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
64
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 May 2017