May 2017 - Wine-Commits - list.winehq.org

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

May 22, 2017

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 May 22, 2017

May 22, 2017

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

Jacek Caban : kernel32/tests: Added more PeekNamedPipe tests.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 9d011931db89afec1f56f56bd90c40eb162ae0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d011931db89afec1f56f56bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:40:58 2017 +0200 kernel32/tests: Added more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e27e29e..8c62bd0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winioctl.h" #include "wine/test.h" #define PIPENAME "\\\\.\\PiPe\\tests_pipe.c" @@ -2534,17 +2535,40 @@ todo_wine CloseHandle(event); } -#define test_peek_pipe(a,b,c) _test_peek_pipe(__LINE__,a,b,c) -static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail) +#define test_peek_pipe(a,b,c,d) _test_peek_pipe(__LINE__,a,b,c,d) +static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { - DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef; + DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; char buf[4000]; + FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; + IO_STATUS_BLOCK io; + NTSTATUS status; BOOL r; - r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, NULL); + r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, &left); ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); ok_(__FILE__,line)(bytes_read == expected_read, "bytes_read = %u, expected %u\n", bytes_read, expected_read); ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length - expected_read, "left = %d, expected %d\n", + left, expected_message_length - expected_read); + + status = NtFsControlFile(pipe, 0, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, buf, sizeof(buf)); + ok_(__FILE__,line)(!status || status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_PEEK) failed: %x\n", status); + ok_(__FILE__,line)(io.Information == FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[expected_read]), + "io.Information = %lu\n", io.Information); + ok_(__FILE__,line)(peek_buf->ReadDataAvailable == expected_avail, "ReadDataAvailable = %u, expected %u\n", + peek_buf->ReadDataAvailable, expected_avail); + ok_(__FILE__,line)(peek_buf->MessageLength == expected_message_length, "MessageLength = %u, expected %u\n", + peek_buf->MessageLength, expected_message_length); + + if (expected_read) + { + r = PeekNamedPipe(pipe, buf, 1, &bytes_read, &avail, &left); + ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); + ok_(__FILE__,line)(bytes_read == 1, "bytes_read = %u, expected %u\n", bytes_read, expected_read); + ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length-1, "left = %d, expected %d\n", left, expected_message_length-1); + } } #define overlapped_read_sync(a,b,c,d,e) _overlapped_read_sync(__LINE__,a,b,c,d,e) @@ -2728,7 +2752,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* test pending read with overlapped event */ overlapped_read_async(reader, read_buf, 1000, &read_overlapped); test_flush_sync(writer); - test_peek_pipe(reader, 0, 0); + test_peek_pipe(reader, 0, 0, 0); /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); @@ -2813,13 +2837,13 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(reader, &read_overlapped2, 1, FALSE); overlapped_write_sync(writer, buf, 20); - test_peek_pipe(reader, 20, 20); + test_peek_pipe(reader, 20, 20, msg_mode ? 20 : 0); overlapped_write_sync(writer, buf, 15); - test_peek_pipe(reader, msg_mode ? 20 : 35, 35); + test_peek_pipe(reader, msg_mode ? 20 : 35, 35, msg_mode ? 20 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); - test_peek_pipe(reader, msg_mode ? 10 : 25, 25); + test_peek_pipe(reader, msg_mode ? 10 : 25, 25, msg_mode ? 10 : 0); overlapped_read_sync(reader, read_buf, 10, 10, FALSE); - test_peek_pipe(reader, 15, 15); + test_peek_pipe(reader, 15, 15, msg_mode ? 15 : 0); overlapped_read_sync(reader, read_buf, 15, 15, FALSE); if(!pCancelIoEx) {

1 0

Zebediah Figura : kernel32/tests: Test bytes left in PeekNamedPipe().
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: ad2f1efe01fe6a402878a56743c671f037dfa3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2f1efe01fe6a402878a5674… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:52 2017 -0500 kernel32/tests: Test 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/tests/pipe.c | 63 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 77450e3..e27e29e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -149,6 +149,7 @@ static void test_CreateNamedPipe(int pipemode) DWORD written; DWORD readden; DWORD avail; + DWORD left; DWORD lpmode; BOOL ret; @@ -240,8 +241,12 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len 1\n"); - ok(PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf), "peek 1 got %d bytes\n", readden); + ok(PeekNamedPipe(hFile, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf), "peek 1 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 1 got %d bytes left\n", left); + else + ok(left == sizeof(obuf), "peek 1 got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf), "read 1 got %d bytes\n", readden); ok(memcmp(obuf, ibuf, written) == 0, "content 1 check\n"); @@ -249,10 +254,18 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len 2\n"); - ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); + ok(PeekNamedPipe(hnp, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); + ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); ok(memcmp(obuf2, ibuf, written) == 0, "content 2 check\n"); @@ -261,6 +274,13 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf2), "peek got %d bytes available\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek got %d bytes left\n", left); + else + ok(left == sizeof(obuf2)-4, "peek got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(readden == 4, "read got %d bytes\n", readden); ok(ReadFile(hFile, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile\n"); @@ -270,12 +290,17 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf), "peek got %d bytes available\n", avail); if (pipemode == PIPE_TYPE_BYTE) { + ok(left == -4, "peek got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); } else { + ok(left == sizeof(obuf)-4, "peek got %d bytes left\n", left); SetLastError(0xdeadbeef); ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); @@ -316,15 +341,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile3b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek3 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + ok(left == 0, "peek3 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; @@ -346,15 +380,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 4a\n"); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile4b\n"); ok(written == sizeof(obuf2), "write file len 4b\n"); - ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek4 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + ok(left == 0, "peek4 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; @@ -392,10 +435,10 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek5\n"); ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + ok(left == 0, "peek5 got %d bytes left\n", left); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");

1 0

Stefan Dösinger : msvcp: Implement the wchar version of _Read_dir.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 3ddbd236d0363a8ea8753f70b4e74a0fc2cfae3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ddbd236d0363a8ea8753f70b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:45 2017 +0200 msvcp: Implement the wchar version of _Read_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 28 +++++++++++++++++++++------- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0627aed..4001b68 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1713,8 +1713,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a2b82cb..7cd3514 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index be11ca1..6a74f84 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() msvcp120.?_Random_device(a)std@@YAIXZ @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QAAXXZ @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QAEXXZ @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index faf0578..d5cedf9 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3692,7 +3692,7 @@ @ cdecl _Open_dir(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() -@ stub _Read_dir +@ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ stub _Remove_dir @ stub _Rename @ stub _Resize diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 838abf3..8e3376c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14962,23 +14962,25 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } -/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ -/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ -char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +/* ??_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z */ +/* ??_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z */ +wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum file_type* type) { - WIN32_FIND_DATAA data; + WIN32_FIND_DATAW data; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; TRACE("(%p %p %p)\n", target, handle, type); do { - if(!FindNextFileA(handle, &data)) { + if(!FindNextFileW(handle, &data)) { *type = status_unknown; *target = '\0'; return target; } - } while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")); + } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)); - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; else @@ -14986,6 +14988,18 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type return target; } +/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ +/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ +char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +{ + wchar_t target_w[MAX_PATH]; + + tr2_sys__Read_dir_wchar(target_w, handle, type); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + return target; +} + /* ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z */ /* ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z */ void __cdecl tr2_sys__Close_dir(void* handle)

1 0

Hugh McMaster : regedit: Always assign focus to the default value when refreshing the listview.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 5474b7a43ed42174911ad41c5240eae98b110c12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5474b7a43ed42174911ad41c5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:02:52 2017 +0000 regedit: Always assign focus to the default value when refreshing the listview. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index 11147a7..d8589b8 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -109,8 +109,7 @@ static void MakeMULTISZDisplayable(LPWSTR multi) /******************************************************************************* * Local module support methods */ -static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, - void* ValBuf, DWORD dwCount, BOOL bHighlight) +static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, void *ValBuf, DWORD dwCount) { LINE_INFO* linfo; LVITEMW item; @@ -137,9 +136,7 @@ static void AddEntryToList(HWND hwndLV, LPWSTR Name, DWORD dwValType, item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; item.pszText = Name ? Name : LPSTR_TEXTCALLBACKW; item.cchTextMax = Name ? lstrlenW(item.pszText) : 0; - if (bHighlight) { - item.stateMask = item.state = LVIS_FOCUSED; - } + switch (dwValType) { case REG_SZ: @@ -552,20 +549,25 @@ BOOL RefreshListView(HWND hwndLV, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR highli valSize = max_val_size; if (RegQueryValueExW(hKey, NULL, NULL, &valType, valBuf, &valSize) == ERROR_FILE_NOT_FOUND) { - AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0, !highlightValue); + AddEntryToList(hwndLV, NULL, REG_SZ, NULL, 0); } for(index = 0; index < val_count; index++) { - BOOL bSelected = (valName == highlightValue); /* NOT a bug, we check for double NULL here */ valNameLen = max_val_name_len; valSize = max_val_size; valType = 0; errCode = RegEnumValueW(hKey, index, valName, &valNameLen, NULL, &valType, valBuf, &valSize); if (errCode != ERROR_SUCCESS) goto done; valBuf[valSize] = 0; - if (highlightValue && !lstrcmpW(valName, highlightValue)) - bSelected = TRUE; - AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize, bSelected); + AddEntryToList(hwndLV, valName[0] ? valName : NULL, valType, valBuf, valSize); + } + + memset(&item, 0, sizeof(item)); + if (!highlightValue) + { + item.state = item.stateMask = LVIS_FOCUSED; + SendMessageW(hwndLV, LVM_SETITEMSTATE, 0, (LPARAM)&item); } + SendMessageW(hwndLV, LVM_SORTITEMS, (WPARAM)hwndLV, (LPARAM)CompareFunc); g_currentRootKey = hKeyRoot;

1 0

Jacek Caban : rpcrt4: Cache event handle in RpcConnection_np object.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 372c9e0db57099dd9d4277009f5f625562bc6343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=372c9e0db57099dd9d4277009… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:43 2017 +0200 rpcrt4: Cache event handle in RpcConnection_np object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index afcb0e7..ab87daa 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -68,6 +68,7 @@ typedef struct _RpcConnection_np HANDLE pipe; HANDLE listen_event; IO_STATUS_BLOCK io_status; + HANDLE event_cache; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -76,14 +77,17 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) return &npc->common; } -static HANDLE get_np_event(void) +static HANDLE get_np_event(RpcConnection_np *connection) { - return CreateEventW(NULL, TRUE, FALSE, NULL); + HANDLE event = InterlockedExchangePointer(&connection->event_cache, NULL); + return event ? event : CreateEventW(NULL, TRUE, FALSE, NULL); } -static void release_np_event(HANDLE event) +static void release_np_event(RpcConnection_np *connection, HANDLE event) { - CloseHandle(event); + event = InterlockedExchangePointer(&connection->event_cache, event); + if (event) + CloseHandle(event); } static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) @@ -382,7 +386,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -392,7 +396,7 @@ static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int c WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } @@ -403,7 +407,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne HANDLE event; NTSTATUS status; - event = get_np_event(); + event = get_np_event(connection); if (!event) return -1; @@ -413,7 +417,7 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne WaitForSingleObject(event, INFINITE); status = io_status.Status; } - release_np_event(event); + release_np_event(connection, event); if (status) return -1; @@ -435,6 +439,11 @@ static int rpcrt4_conn_np_close(RpcConnection *conn) CloseHandle(connection->listen_event); connection->listen_event = 0; } + if (connection->event_cache) + { + CloseHandle(connection->event_cache); + connection->event_cache = 0; + } return 0; } @@ -640,7 +649,7 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p NTSTATUS status; HANDLE event; - event = get_np_event(); + event = get_np_event(conn); if (!event) continue; @@ -727,7 +736,7 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, { if (b_handle == conn->listen_event) { - release_np_event(conn->listen_event); + release_np_event(conn, conn->listen_event); conn->listen_event = NULL; if (conn->io_status.Status == STATUS_SUCCESS || conn->io_status.Status == STATUS_PIPE_CONNECTED) RPCRT4_SpawnConnection(&cconn, &conn->common);

1 0

Stefan Dösinger : msvcp140: Implement _Close_dir.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: b21ca1887f13a70f8c1b805b9f8a6de5ecb1b6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21ca1887f13a70f8c1b805b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:46 2017 +0200 msvcp140: Implement _Close_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d5cedf9..ee01b42 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3620,7 +3620,7 @@ @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod -@ stub _Close_dir +@ cdecl _Close_dir(ptr) tr2_sys__Close_dir @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_destroy_in_situ(ptr)

1 0

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

May 22, 2017

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

Józef Kucia : wined3d: Implement temporary registers per phase.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 1ac5db4fc0d6100e5faffc37a41d06d5739a4ce4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ac5db4fc0d6100e5faffc37a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat May 20 13:46:03 2017 +0200 wined3d: Implement temporary registers per phase. 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> --- dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 22 ++++++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dd96703..27f089f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7509,10 +7509,13 @@ static HRESULT shader_glsl_generate_shader_phase(const struct wined3d_shader *sh struct shader_glsl_ctx_priv *priv_ctx, const struct wined3d_shader_phase *phase, const char *phase_name, unsigned phase_idx) { + unsigned int i; HRESULT hr; shader_addline(buffer, "void hs_%s_phase%u(%s)\n{\n", phase_name, phase_idx, phase->instance_count ? "int phase_instance_id" : ""); + for (i = 0; i < phase->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); hr = shader_generate_code(shader, buffer, reg_maps, priv_ctx, phase->start, phase->end); shader_addline(buffer, "}\n"); return hr; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a4d3a59..74cb92e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1105,13 +1105,20 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) { - struct wined3d_shader_indexable_temp *reg; + if (phase) + { + FIXME("Indexable temporary registers not supported.\n"); + } + else + { + struct wined3d_shader_indexable_temp *reg; - if (!(reg = HeapAlloc(GetProcessHeap(), 0, sizeof(*reg)))) - return E_OUTOFMEMORY; + if (!(reg = HeapAlloc(GetProcessHeap(), 0, sizeof(*reg)))) + return E_OUTOFMEMORY; - *reg = ins.declaration.indexable_temp; - list_add_tail(&reg_maps->indexable_temps, &reg->entry); + *reg = ins.declaration.indexable_temp; + list_add_tail(&reg_maps->indexable_temps, &reg->entry); + } } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PRIMITIVE) { @@ -1168,7 +1175,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS) { - reg_maps->temporary_count = ins.declaration.count; + if (phase) + phase->temporary_count = ins.declaration.count; + else + reg_maps->temporary_count = ins.declaration.count; } else if (ins.handler_idx == WINED3DSIH_DCL_TESSELLATOR_DOMAIN) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d177976..4f2916b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3738,6 +3738,7 @@ struct wined3d_shader_phase const DWORD *start; const DWORD *end; unsigned int instance_count; + unsigned int temporary_count; }; struct wined3d_vertex_shader

1 0