May 2006 - Wine-commits - list.winehq.org

Huw Davies : rpcrt4: Use IsClient to determine whether we can use the Buffer memory or not.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: f151ecb0d1400aa029e89b3abc97bf3b212891f6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f151ecb0d1400aa029e89b3… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 19 11:47:20 2006 +0100 rpcrt4: Use IsClient to determine whether we can use the Buffer memory or not. Add simple struct tests. --- dlls/rpcrt4/ndr_marshall.c | 5 - dlls/rpcrt4/tests/ndr_marshall.c | 361 ++++++++++++++++++++++++++++++++++---- 2 files changed, 325 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=f151ecb0d1400aa029e…

1 0

Robert Shearman : rpcrt4: Warn if CreateNamedPipe fails.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: cfa769fb9fe91b071a4d9ac7dbffcc49f6c0d8fd URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=cfa769fb9fe91b071a4d9ac… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 11:03:29 2006 +0100 rpcrt4: Warn if CreateNamedPipe fails. --- dlls/rpcrt4/rpc_transport.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 447cbd8..b4e71e7 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -89,6 +89,11 @@ static RPC_STATUS rpcrt4_connect_pipe(Rp PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); + if (npc->pipe == INVALID_HANDLE_VALUE) { + WARN("CreateNamedPipe failed with error %ld\n", GetLastError()); + return RPC_S_SERVER_UNAVAILABLE; + } + memset(&npc->ovl, 0, sizeof(npc->ovl)); npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (ConnectNamedPipe(npc->pipe, &npc->ovl))

1 0

Robert Shearman : rpcrt4: Add the correct amount of auth padding to messages.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 5f266c54a160ec6f8363c23cc6d14843c5adee56 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5f266c54a160ec6f8363c23… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 11:03:39 2006 +0100 rpcrt4: Add the correct amount of auth padding to messages. --- dlls/rpcrt4/rpc_message.c | 29 ++++++++++++++++++++++------- 1 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index 3cf993a..6646ce7 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -42,6 +42,14 @@ #include "rpc_message.h" WINE_DEFAULT_DEBUG_CHANNEL(rpc); +/* note: the DCE/RPC spec says the alignment amount should be 4, but + * MS/RPC servers seem to always use 16 */ +#define AUTH_ALIGNMENT 16 + +/* gets the amount needed to round a value up to the specified alignment */ +#define ROUND_UP_AMOUNT(value, alignment) \ + (((alignment) - (((value) % (alignment)))) % (alignment)) + static DWORD RPCRT4_GetHeaderSize(RpcPktHdr *Header) { static const DWORD header_sizes[] = { @@ -273,12 +281,19 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon Header->common.flags |= RPC_FLG_FIRST; Header->common.flags &= ~RPC_FLG_LAST; while (!(Header->common.flags & RPC_FLG_LAST)) { + unsigned char auth_pad_len = ROUND_UP_AMOUNT(BufferLength, AUTH_ALIGNMENT); + unsigned short pkt_size = BufferLength + hdr_size + alen + auth_pad_len; + /* decide if we need to split the packet into fragments */ - if ((BufferLength + hdr_size + alen) <= Connection->MaxTransmissionSize) { - Header->common.flags |= RPC_FLG_LAST; - Header->common.frag_len = BufferLength + hdr_size + alen; + if (pkt_size <= Connection->MaxTransmissionSize) { + Header->common.flags |= RPC_FLG_LAST; + Header->common.frag_len = pkt_size; } else { - Header->common.frag_len = Connection->MaxTransmissionSize; + auth_pad_len = 0; + /* make sure packet payload will be a multiple of 16 */ + Header->common.frag_len = + ((Connection->MaxTransmissionSize - hdr_size - alen) & ~(AUTH_ALIGNMENT-1)) + + hdr_size + alen; } pkt = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Header->common.frag_len); @@ -298,7 +313,7 @@ static RPC_STATUS RPCRT4_SendAuth(RpcCon auth_hdr[0] = Connection->AuthInfo->AuthnSvc; auth_hdr[1] = Connection->AuthInfo->AuthnLevel; - auth_hdr[2] = 0x00; /* FIXME: add padding */ + auth_hdr[2] = auth_pad_len; auth_hdr[3] = 0x00; /* a unique number... */ @@ -314,8 +329,8 @@ write: return RPC_S_PROTOCOL_ERROR; } - buffer_pos += Header->common.frag_len - hdr_size - alen; - BufferLength -= Header->common.frag_len - hdr_size - alen; + buffer_pos += Header->common.frag_len - hdr_size - alen - auth_pad_len; + BufferLength -= Header->common.frag_len - hdr_size - alen - auth_pad_len; Header->common.flags &= ~RPC_FLG_FIRST; }

1 0

Robert Shearman : rpcrt4: Update the todo lists and copyrights.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: a2d2d4db63cf0f72a5779ff97651986ad3c70122 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a2d2d4db63cf0f72a5779ff… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 11:03:06 2006 +0100 rpcrt4: Update the todo lists and copyrights. --- dlls/rpcrt4/ndr_marshall.c | 13 +++++++++++-- dlls/rpcrt4/ndr_ole.c | 4 +--- dlls/rpcrt4/rpc_binding.c | 4 +--- dlls/rpcrt4/rpc_message.c | 5 +---- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index d80e45b..2c7f78d 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2,6 +2,7 @@ * NDR data marshalling * * Copyright 2002 Greg Turner + * Copyright 2003-2006 CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,8 +19,16 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * TODO: - * - figure out whether we *really* got this right - * - check for errors and throw exceptions + * - Non-conformant strings + * - String structs + * - Varying arrays + * - Encapsulated unions + * - Byte count pointers + * - transmit_as/represent as + * - Multi-dimensional arrays + * - Conversion functions (NdrConvert) + * - Checks for integer overflow when calculating array sizes + * - Checks for out-of-memory conditions */ #include <stdarg.h> diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index e84bda6..5089191 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -18,9 +18,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * TODO: - * - figure out whether we *really* got this right - * - check for errors and throw exceptions - * - what are the marshalling functions supposed to return? + * - fix the wire-protocol to match MS/RPC * - finish RpcStream_Vtbl */ diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c index c3aebbd..3184040 100644 --- a/dlls/rpcrt4/rpc_binding.c +++ b/dlls/rpcrt4/rpc_binding.c @@ -4,6 +4,7 @@ * Copyright 2001 Ove K�ven, TransGaming Technologies * Copyright 2003 Mike Hearn * Copyright 2004 Filip Navara + * Copyright 2006 CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,9 +19,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * TODO: - * - a whole lot */ #include <stdarg.h> diff --git a/dlls/rpcrt4/rpc_message.c b/dlls/rpcrt4/rpc_message.c index d4ddb41..3cf993a 100644 --- a/dlls/rpcrt4/rpc_message.c +++ b/dlls/rpcrt4/rpc_message.c @@ -3,6 +3,7 @@ * * Copyright 2001-2002 Ove K�ven, TransGaming Technologies * Copyright 2004 Filip Navara + * Copyright 2006 CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -17,10 +18,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * TODO: - * - figure out whether we *really* got this right - * - check for errors and throw exceptions */ #include <stdarg.h>

1 0

Robert Shearman : rpcrt4: Wait for all of the requested bytes to be returned for tcp connections.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 4fb6295528eb4021fa625394a871c9dc414bc035 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4fb6295528eb4021fa62539… Author: Robert Shearman <rob(a)codeweavers.com> Date: Fri May 19 11:03:20 2006 +0100 rpcrt4: Wait for all of the requested bytes to be returned for tcp connections. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 4b2f9ae..447cbd8 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -353,7 +353,7 @@ static int rpcrt4_conn_tcp_read(RpcConne void *buffer, unsigned int count) { RpcConnection_tcp *tcpc = (RpcConnection_tcp *) Connection; - int r = read(tcpc->sock, buffer, count); + int r = recv(tcpc->sock, buffer, count, MSG_WAITALL); TRACE("%d %p %u -> %d\n", tcpc->sock, buffer, count, r); return r; }

1 0

Robert Shearman : rpcrt4: Fix for the open functions in the transports being transposed between ncacn_np and ncalrpc .
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 9cebbdd80ffc7fc21369c2ceefc9479535575c63 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=9cebbdd80ffc7fc21369c2c… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 17:27:35 2006 +0100 rpcrt4: Fix for the open functions in the transports being transposed between ncacn_np and ncalrpc. --- dlls/rpcrt4/rpc_transport.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 7e6ea97..4b2f9ae 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -381,7 +381,7 @@ static int rpcrt4_conn_tcp_close(RpcConn struct protseq_ops protseq_list[] = { { "ncacn_np", rpcrt4_conn_np_alloc, - rpcrt4_ncalrpc_open, + rpcrt4_ncacn_np_open, rpcrt4_conn_np_get_connect_event, rpcrt4_conn_np_handoff, rpcrt4_conn_np_read, @@ -390,7 +390,7 @@ struct protseq_ops protseq_list[] = { }, { "ncalrpc", rpcrt4_conn_np_alloc, - rpcrt4_ncacn_np_open, + rpcrt4_ncalrpc_open, rpcrt4_conn_np_get_connect_event, rpcrt4_conn_np_handoff, rpcrt4_conn_np_read,

1 0

Robert Shearman : rpcrt4: Don't release the auth info if it isn't present.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: c1a31cef3d9a611f0d8d42f4261acaa5b47e3c01 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=c1a31cef3d9a611f0d8d42f… Author: Robert Shearman <rob(a)codeweavers.com> Date: Thu May 18 17:27:26 2006 +0100 rpcrt4: Don't release the auth info if it isn't present. --- dlls/rpcrt4/rpc_transport.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_transport.c b/dlls/rpcrt4/rpc_transport.c index 9758b6c..7e6ea97 100644 --- a/dlls/rpcrt4/rpc_transport.c +++ b/dlls/rpcrt4/rpc_transport.c @@ -484,7 +484,7 @@ RPC_STATUS RPCRT4_DestroyConnection(RpcC RPCRT4_CloseConnection(Connection); RPCRT4_strfree(Connection->Endpoint); RPCRT4_strfree(Connection->NetworkAddr); - RpcAuthInfo_Release(Connection->AuthInfo); + if (Connection->AuthInfo) RpcAuthInfo_Release(Connection->AuthInfo); HeapFree(GetProcessHeap(), 0, Connection); return RPC_S_OK; }

1 0

Robert Reif : winmm: Fix wave test handle use after close bug.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: ed62b0150c44c3ac4428cd0ca8b3c5658678554d URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=ed62b0150c44c3ac4428cd0… Author: Robert Reif <reif(a)earthlink.net> Date: Fri May 19 07:34:08 2006 -0400 winmm: Fix wave test handle use after close bug. --- dlls/winmm/tests/wave.c | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 576de4f..ceeeba0 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -534,8 +534,13 @@ static DWORD WINAPI callback_thread(LPVO { MSG msg; - while (GetMessage(&msg, 0, 0, 0)) - SetEvent((HANDLE)lpParameter); + while (GetMessage(&msg, 0, 0, 0)) { + UINT message = msg.message; + ok (message == WOM_OPEN || message == WOM_DONE || message == WOM_CLOSE, + "GetMessage returned unexpected message: %u\n", message); + if (message == WOM_OPEN || message == WOM_DONE || message == WOM_CLOSE) + SetEvent((HANDLE)lpParameter); + } return 0; } @@ -579,16 +584,20 @@ static void wave_out_test_deviceOut(int callback_instance = 0; } else { trace("CreateThread() failed\n"); + CloseHandle(hevent); return; } } else if ((flags & CALLBACK_TYPEMASK) == CALLBACK_WINDOW) { trace("CALLBACK_THREAD not implemented\n"); + CloseHandle(hevent); return; } else if (flags && CALLBACK_TYPEMASK) { trace("Undefined callback type!\n"); + CloseHandle(hevent); return; } else { trace("CALLBACK_NULL not implemented\n"); + CloseHandle(hevent); return; } wout=NULL; @@ -728,12 +737,12 @@ static void wave_out_test_deviceOut(int wave_out_error(rc)); free(frag.lpData); - CloseHandle(hevent); rc=waveOutClose(wout); ok(rc==MMSYSERR_NOERROR,"waveOutClose(%s): rc=%s\n",dev_name(device), wave_out_error(rc)); if ((flags & CALLBACK_TYPEMASK) == CALLBACK_THREAD) TerminateThread(thread, 0); + CloseHandle(hevent); } static void wave_out_test_device(int device)

1 0

Dmitry Timoshkov : x11drv: Fix the regression caused by the recent ShowWindow fixes.
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 94cc17b53ca2725505d33b5bcb0b1e1d676228de URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=94cc17b53ca2725505d33b5… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Fri May 19 18:55:50 2006 +0900 x11drv: Fix the regression caused by the recent ShowWindow fixes. --- dlls/x11drv/winpos.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/x11drv/winpos.c b/dlls/x11drv/winpos.c index bc19aa8..aaeddd6 100644 --- a/dlls/x11drv/winpos.c +++ b/dlls/x11drv/winpos.c @@ -962,14 +962,15 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; - case SW_MINIMIZE: case SW_SHOWMINNOACTIVE: swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ - case SW_SHOWMINIMIZED: + case SW_MINIMIZE: case SW_FORCEMINIMIZE: /* FIXME: Does not work if thread is hung. */ - swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; /* fall through */ + case SW_SHOWMINIMIZED: + swp |= SWP_SHOWWINDOW | SWP_FRAMECHANGED; swp |= WINPOS_MinMaximize( hwnd, cmd, &newPos ); if (style & WS_MINIMIZE) return wasVisible; state_change = TRUE; @@ -989,6 +990,7 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c case SW_SHOW: if (wasVisible) return TRUE; swp |= SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; case SW_RESTORE: @@ -1001,10 +1003,10 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c case SW_SHOWNORMAL: /* same as SW_NORMAL: */ case SW_SHOWDEFAULT: /* FIXME: should have its own handler */ swp |= SWP_SHOWWINDOW; - if (style & (WS_MINIMIZE | WS_MAXIMIZE)) swp |= WINPOS_MinMaximize( hwnd, SW_RESTORE, &newPos ); else swp |= SWP_NOSIZE | SWP_NOMOVE; + if (style & WS_CHILD) swp |= SWP_NOACTIVATE | SWP_NOZORDER; break; } @@ -1023,12 +1025,9 @@ BOOL X11DRV_ShowWindow( HWND hwnd, INT c } else { - /* ShowWindow won't activate a not being maximized child window */ if (style & WS_CHILD) { - if (!state_change) - swp |= SWP_NOACTIVATE | SWP_NOZORDER; - else + if (state_change) { /* it appears that Windows always adds an undocumented 0x8000 * flag if the state of a window changes.

1 0

Mike McCormack : secur32: Cleanup InitializeSecurityContext ( reduce indent and duplication).
by Alexandre Julliard 20 May '06

20 May '06

Module: wine Branch: refs/heads/master Commit: 4cd377d49c58da2c85fdfb2f92861d54d674c923 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4cd377d49c58da2c85fdfb2… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri May 19 18:47:55 2006 +0900 secur32: Cleanup InitializeSecurityContext (reduce indent and duplication). --- dlls/secur32/ntlm.c | 462 +++++++++++++++++++++------------------------------ 1 files changed, 192 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=4cd377d49c58da2c85f…

1 0