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

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

May 22, 2017

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

May 22, 2017

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 'acos' preshader opcode.
by Alexandre Julliard May 22, 2017

May 22, 2017

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

Hugh McMaster : regedit: Re-select the listview item after renaming is complete.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: c5d38ce42778726c7a243520e015d38d0bebc160 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5d38ce42778726c7a243520e… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon May 22 13:03:01 2017 +0000 regedit: Re-select the listview item after renaming is complete. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/listview.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c index d8589b8..a78a406 100644 --- a/programs/regedit/listview.c +++ b/programs/regedit/listview.c @@ -400,11 +400,16 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR LPNMLVDISPINFOW dispInfo = (LPNMLVDISPINFOW)lParam; LPWSTR oldName = GetItemText(hWnd, dispInfo->item.iItem); LONG ret; + LVITEMW item; + if (!oldName) return -1; /* cannot rename a default value */ ret = RenameValue(hWnd, g_currentRootKey, g_currentPath, oldName, dispInfo->item.pszText); if (ret) { RefreshListView(hWnd, g_currentRootKey, g_currentPath, dispInfo->item.pszText); + item.state = LVIS_FOCUSED | LVIS_SELECTED; + item.stateMask = LVIS_FOCUSED | LVIS_SELECTED; + SendMessageW(hWnd, LVM_SETITEMSTATE, dispInfo->item.iItem, (LPARAM)&item); } HeapFree(GetProcessHeap(), 0, oldName); return 0;

1 0

Jacek Caban : rpcrt4: Use non-blocking listening on named pipes.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 6e7a2978e7e1be40dc0e05f307dbefac3bbfaf24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e7a2978e7e1be40dc0e05f30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:31 2017 +0200 rpcrt4: Use non-blocking listening on named pipes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 139 ++++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 77 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 98fa597..afcb0e7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -38,6 +38,7 @@ #include "winerror.h" #include "wininet.h" #include "winternl.h" +#include "winioctl.h" #include "wine/unicode.h" #include "rpc.h" @@ -63,10 +64,10 @@ static RPC_STATUS RPCRT4_SpawnConnection(RpcConnection** Connection, RpcConnecti typedef struct _RpcConnection_np { - RpcConnection common; - HANDLE pipe; - HANDLE listen_thread; - BOOL listening; + RpcConnection common; + HANDLE pipe; + HANDLE listen_event; + IO_STATUS_BLOCK io_status; } RpcConnection_np; static RpcConnection *rpcrt4_conn_np_alloc(void) @@ -85,49 +86,6 @@ static void release_np_event(HANDLE event) CloseHandle(event); } -static DWORD CALLBACK listen_thread(void *arg) -{ - RpcConnection_np *npc = arg; - for (;;) - { - if (ConnectNamedPipe(npc->pipe, NULL)) - return RPC_S_OK; - - switch(GetLastError()) - { - case ERROR_PIPE_CONNECTED: - return RPC_S_OK; - case ERROR_HANDLES_CLOSED: - /* connection closed during listen */ - return RPC_S_NO_CONTEXT_AVAILABLE; - case ERROR_NO_DATA_DETECTED: - /* client has disconnected, retry */ - DisconnectNamedPipe( npc->pipe ); - break; - default: - npc->listening = FALSE; - WARN("Couldn't ConnectNamedPipe (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - } -} - -static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) -{ - if (npc->listening) - return RPC_S_OK; - - npc->listening = TRUE; - npc->listen_thread = CreateThread(NULL, 0, listen_thread, npc, 0, NULL); - if (!npc->listen_thread) - { - npc->listening = FALSE; - ERR("Couldn't create listen thread (error was %d)\n", GetLastError()); - return RPC_S_OUT_OF_RESOURCES; - } - return RPC_S_OK; -} - static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -333,14 +291,12 @@ static RPC_STATUS rpcrt4_protseq_ncacn_np_open_endpoint(RpcServerProtseq *protse static void rpcrt4_conn_np_handoff(RpcConnection_np *old_npc, RpcConnection_np *new_npc) { - /* because of the way named pipes work, we'll transfer the connected pipe - * to the child, then reopen the server binding to continue listening */ + /* because of the way named pipes work, we'll transfer the connected pipe + * to the child, then reopen the server binding to continue listening */ - new_npc->pipe = old_npc->pipe; - new_npc->listen_thread = old_npc->listen_thread; - old_npc->pipe = 0; - old_npc->listen_thread = 0; - old_npc->listening = FALSE; + new_npc->pipe = old_npc->pipe; + old_npc->pipe = 0; + assert(!old_npc->listen_event); } static RPC_STATUS rpcrt4_ncacn_np_handoff(RpcConnection *old_conn, RpcConnection *new_conn) @@ -465,19 +421,21 @@ static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigne return count; } -static int rpcrt4_conn_np_close(RpcConnection *Connection) +static int rpcrt4_conn_np_close(RpcConnection *conn) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - if (npc->pipe) { - FlushFileBuffers(npc->pipe); - CloseHandle(npc->pipe); - npc->pipe = 0; - } - if (npc->listen_thread) { - CloseHandle(npc->listen_thread); - npc->listen_thread = 0; - } - return 0; + RpcConnection_np *connection = (RpcConnection_np *) conn; + if (connection->pipe) + { + FlushFileBuffers(connection->pipe); + CloseHandle(connection->pipe); + connection->pipe = 0; + } + if (connection->listen_event) + { + CloseHandle(connection->listen_event); + connection->listen_event = 0; + } + return 0; } static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) @@ -677,9 +635,33 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p /* open and count connections */ *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - rpcrt4_conn_listen_pipe(conn); - if (conn->listen_thread) - (*count)++; + if (!conn->listen_event) + { + NTSTATUS status; + HANDLE event; + + event = get_np_event(); + if (!event) + continue; + + status = NtFsControlFile(conn->pipe, event, NULL, NULL, &conn->io_status, FSCTL_PIPE_LISTEN, NULL, 0, NULL, 0); + switch (status) + { + case STATUS_SUCCESS: + case STATUS_PIPE_CONNECTED: + conn->io_status.Status = status; + SetEvent(event); + break; + case STATUS_PENDING: + break; + default: + ERR("pipe listen error %x\n", status); + continue; + } + + conn->listen_event = event; + } + (*count)++; } /* make array of connections */ @@ -697,8 +679,8 @@ static void *rpcrt4_protseq_np_get_wait_array(RpcServerProtseq *protseq, void *p objs[0] = npps->mgr_event; *count = 1; LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if ((objs[*count] = conn->listen_thread)) - (*count)++; + if (conn->listen_event) + objs[(*count)++] = conn->listen_event; } LeaveCriticalSection(&protseq->cs); return objs; @@ -741,13 +723,16 @@ static int rpcrt4_protseq_np_wait_for_new_connection(RpcServerProtseq *protseq, b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); - LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) { - if (b_handle == conn->listen_thread) { - DWORD exit_code; - if (GetExitCodeThread(conn->listen_thread, &exit_code) && exit_code == RPC_S_OK) + LIST_FOR_EACH_ENTRY(conn, &protseq->connections, RpcConnection_np, common.protseq_entry) + { + if (b_handle == conn->listen_event) + { + release_np_event(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); - CloseHandle(conn->listen_thread); - conn->listen_thread = 0; + else + ERR("listen failed %x\n", conn->io_status.Status); break; } }

1 0

Jacek Caban : rpcrt4: Simplify rpcrt4_conn_np_read implementation.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: bd6f8071d87a6f3dd72ee6358fe2051e5b772aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6f8071d87a6f3dd72ee6358… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 16:04:02 2017 +0200 rpcrt4: Simplify rpcrt4_conn_np_read implementation. Since RPC messages are sent as a single message, if it's too short, it means the message is broken and we let the caller to handle an error. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_transport.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index bc2f4a3..6fa1e60 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -409,24 +409,14 @@ static RPC_STATUS rpcrt4_ncalrpc_handoff(RpcConnection *old_conn, RpcConnection return status; } -static int rpcrt4_conn_np_read(RpcConnection *Connection, - void *buffer, unsigned int count) +static int rpcrt4_conn_np_read(RpcConnection *conn, void *buffer, unsigned int count) { - RpcConnection_np *npc = (RpcConnection_np *) Connection; - IO_STATUS_BLOCK io_status; - char *buf = buffer; - unsigned int bytes_left = count; - NTSTATUS status; + RpcConnection_np *connection = (RpcConnection_np *) conn; + IO_STATUS_BLOCK io_status; + NTSTATUS status; - while (bytes_left) - { - status = NtReadFile(npc->pipe, NULL, NULL, NULL, &io_status, buf, bytes_left, NULL, NULL); - if (status && status != STATUS_BUFFER_OVERFLOW) - return -1; - bytes_left -= io_status.Information; - buf += io_status.Information; - } - return count; + status = NtReadFile(connection->pipe, NULL, NULL, NULL, &io_status, buffer, count, NULL, NULL); + return status && status != STATUS_BUFFER_OVERFLOW ? -1 : io_status.Information; } static int rpcrt4_conn_np_write(RpcConnection *conn, const void *buffer, unsigned int count)

1 0

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

May 22, 2017

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

May 22, 2017

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

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

May 22, 2017

Module: wine Branch: master Commit: 4193e717b6221d78fe2d7a559024df0f7468a834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4193e717b6221d78fe2d7a559… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:44 2017 +0200 msvcp: Implement the wchar version of _Open_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 | 58 ++++++++++++++++++++++++++++--------- 5 files changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 17e8531..0627aed 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1643,8 +1643,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0146719..a2b82cb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 70fa429..be11ca1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAAXXZ @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAEXXZ @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c75f8dd..faf0578 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3689,7 +3689,7 @@ @ stub _Mtxlock @ stub _Mtxunlock @ extern _Nan _Nan -@ stub _Open_dir +@ 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 diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 07aa651..838abf3 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -26,7 +26,9 @@ #include "msvcp90.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define SECSPERDAY 86400 @@ -14893,29 +14895,32 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ -/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ -void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +/* ??_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z */ +/* ??_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z */ +void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* err_code, enum file_type* type) { HANDLE handle; - WIN32_FIND_DATAA data; - char temppath[MAX_PATH]; - - TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); - if(strlen(dest) > MAX_PATH - 3) { + WIN32_FIND_DATAW data; + wchar_t temppath[MAX_PATH]; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; + static const wchar_t asterisk[] = {'\\', '*', 0}; + + TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); + if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; return NULL; } - strcpy(temppath, dest); - strcat(temppath, "\\*"); + wcscpy(temppath, dest); + wcscat(temppath, asterisk); - handle = FindFirstFileA(temppath, &data); + handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = GetLastError(); return NULL; } - while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { - if(!FindNextFileA(handle, &data)) { + while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { + if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; FindClose(handle); @@ -14923,7 +14928,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e } } - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); *err_code = ERROR_SUCCESS; if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; @@ -14932,6 +14937,31 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } +/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ +/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +{ + void *handle; + wchar_t target_w[MAX_PATH]; + wchar_t dest_w[MAX_PATH]; + + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); + + if (dest && !MultiByteToWideChar(CP_ACP, 0, dest, -1, dest_w, MAX_PATH)) + { + WARN("Failed to convert input string.\n"); + *err_code = ERROR_BAD_PATHNAME; + return NULL; + } + + handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); + + if (handle) + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + 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)

1 0

Jacek Caban : kernel32/tests: Run test_overlapped_transport in byte mode.
by Alexandre Julliard May 22, 2017

May 22, 2017

Module: wine Branch: master Commit: 0657b1d1f43968e07177519cc8d35d90a0ed8b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0657b1d1f43968e07177519cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:46:14 2017 +0200 kernel32/tests: Run test_overlapped_transport in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 8c62bd0..0a6edd6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3056,4 +3056,6 @@ START_TEST(pipe) test_readfileex_pending(); test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); + if (broken(1)) /* FIXME: Remove once Wine is ready. */ + test_overlapped_transport(FALSE, FALSE); }

1 0