Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 63202: [RPCRT4] Detect whether we are connecting to a pipe on the local machine and use the \\.\ prefix instead of the full machine name. This patch modifies ReactOS-specific code (that ...
by hbelusca＠svn.reactos.org 09 May '14

09 May '14

Author: hbelusca Date: Fri May 9 01:57:43 2014 New Revision: 63202 URL: http://svn.reactos.org/svn/reactos?rev=63202&view=rev Log: [RPCRT4] Detect whether we are connecting to a pipe on the local machine and use the \\.\ prefix instead of the full machine name. This patch modifies ReactOS-specific code (that was introduced by Eric in revision 53630) (Wine still supports only local pipes), so I also update our rpcrt4_ros.diff file accordingly, r63201 with respect to the latest Wine 1.7.17 rpcrt4 code. CORE-6561 #resolve CORE-6562 #resolve CORE-7562 #comment Partly solved in revision 63202. Please retest. Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/rpc_transport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_trans… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_transport.c [iso-8859-1] Fri May 9 01:57:43 2014 @@ -307,7 +307,10 @@ { RpcConnection_np *npc = (RpcConnection_np *) Connection; static const char prefix[] = "\\\\"; - static const char local[] ="."; + static const char local[] = "."; + BOOL bUseLocalName = TRUE; + CHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; + DWORD bufLen = sizeof(ComputerName)/sizeof(ComputerName[0]); RPC_STATUS r; LPSTR pname; INT size; @@ -318,15 +321,39 @@ /* protseq=ncacn_np: named pipes */ size = strlen(prefix); + if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) + { + bUseLocalName = TRUE; size += strlen(local); + } else - size += strlen(Connection->NetworkAddr); + { + if (GetComputerNameA(ComputerName, &bufLen)) + { + if (stricmp(ComputerName, Connection->NetworkAddr) == 0) + { + bUseLocalName = TRUE; + size += strlen(local); + } + else + { + bUseLocalName = FALSE; + size += strlen(Connection->NetworkAddr); + } + } + else + { + bUseLocalName = FALSE; + size += strlen(Connection->NetworkAddr); + } + } + size += strlen(Connection->Endpoint) + 1; pname = I_RpcAllocate(size); strcpy(pname, prefix); - if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) + if (bUseLocalName) strcat(pname, local); else strcat(pname, Connection->NetworkAddr); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Fri May 9 01:57:43 2014 @@ -1,40 +1,705 @@ -diff -prudN e:\Wine\dlls\rpcrt4/epm_towers.h e:\reactos\dll\win32\rpcrt4/epm_towers.h ---- e:\Wine\dlls\rpcrt4/epm_towers.h 2011-09-16 23:22:37.031828000 +0100 -+++ e:\reactos\dll\win32\rpcrt4/epm_towers.h 2013-01-25 14:13:03.257632500 +0100 -@@ -19,7 +19,7 @@ +diff -prudN .\wine\dlls\rpcrt4/cproxy.c .\reactos\dll\win32\rpcrt4/cproxy.c +--- .\wine\dlls\rpcrt4/cproxy.c 2014-05-09 03:43:55.921033400 +0200 ++++ .\reactos\dll\win32\rpcrt4/cproxy.c 2013-12-27 18:11:56.483967600 +0100 +@@ -21,24 +21,7 @@ + * TODO: Handle non-i386 architectures + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <stdarg.h> +- +-#define COBJMACROS +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "objbase.h" +-#include "rpcproxy.h" +- +-#include "cpsf.h" +-#include "ndr_misc.h" +-#include "ndr_stubless.h" +-#include "wine/debug.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/cpsf.c .\reactos\dll\win32\rpcrt4/cpsf.c +--- .\wine\dlls\rpcrt4/cpsf.c 2014-05-09 03:43:55.924033600 +0200 ++++ .\reactos\dll\win32\rpcrt4/cpsf.c 2013-12-27 18:11:57.185968800 +0100 +@@ -18,28 +18,9 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +- +-#define COBJMACROS +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +-#include "winreg.h" +- +-#include "objbase.h" +- +-#include "rpcproxy.h" +- +-#include "wine/unicode.h" +-#include "wine/debug.h" ++#include "precomp.h" + +-#include "cpsf.h" ++#include <winreg.h> + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/cstub.c .\reactos\dll\win32\rpcrt4/cstub.c +--- .\wine\dlls\rpcrt4/cstub.c 2014-05-09 03:43:55.927033800 +0200 ++++ .\reactos\dll\win32\rpcrt4/cstub.c 2013-12-27 18:11:56.905168300 +0100 +@@ -19,25 +19,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <stdarg.h> +- +-#define COBJMACROS +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +-#include "excpt.h" +- +-#include "objbase.h" +-#include "rpcproxy.h" +- +-#include "wine/debug.h" +-#include "wine/exception.h" +- +-#include "cpsf.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/epm_towers.h .\reactos\dll\win32\rpcrt4/epm_towers.h +--- .\wine\dlls\rpcrt4/epm_towers.h 2014-05-09 03:43:55.988037200 +0200 ++++ .\reactos\dll\win32\rpcrt4/epm_towers.h 2013-12-27 18:11:57.170368800 +0100 +@@ -19,7 +19,9 @@ * */ -#include "epm.h" ++#pragma once ++ +#include <epm_c.h> #define EPM_PROTOCOL_DNET_NSP 0x04 #define EPM_PROTOCOL_OSI_TP4 0x05 -diff -prudN e:\Wine\dlls\rpcrt4/ndr_marshall.c e:\reactos\dll\win32\rpcrt4/ndr_marshall.c ---- e:\Wine\dlls\rpcrt4/ndr_marshall.c 2012-04-02 20:39:58.270363100 +0100 -+++ e:\reactos\dll\win32\rpcrt4/ndr_marshall.c 2013-12-06 20:04:02.897835300 +0100 -@@ -1211,7 +1211,7 @@ static unsigned char * EmbeddedPointerMa - unsigned char *bufptr = bufbase + *(const SHORT*)&info[2]; - unsigned char *saved_memory = pStubMsg->Memory; - -- pStubMsg->Memory = pMemory; -+ pStubMsg->Memory = membase; - PointerMarshall(pStubMsg, bufptr, *(unsigned char**)memptr, info+4); - pStubMsg->Memory = saved_memory; - } -@@ -1365,7 +1365,7 @@ static void EmbeddedPointerBufferSize(PM - unsigned char *memptr = membase + *(const SHORT*)&info[0]; - unsigned char *saved_memory = pStubMsg->Memory; - -- pStubMsg->Memory = pMemory; -+ pStubMsg->Memory = membase; - PointerBufferSize(pStubMsg, *(unsigned char**)memptr, info+4); - pStubMsg->Memory = saved_memory; - } -diff -prudN e:\Wine\dlls\rpcrt4/rpc_epmap.c e:\reactos\dll\win32\rpcrt4/rpc_epmap.c ---- e:\Wine\dlls\rpcrt4/rpc_epmap.c 2013-03-02 14:18:00.736492500 +0100 -+++ e:\reactos\dll\win32\rpcrt4/rpc_epmap.c 2013-12-06 20:28:21.361553600 +0100 -@@ -162,7 +169,7 @@ static RPC_STATUS get_epm_handle_server( +diff -prudN .\wine\dlls\rpcrt4/msvc.S .\reactos\dll\win32\rpcrt4/msvc.S +--- .\wine\dlls\rpcrt4/msvc.S 1970-01-01 01:00:00.000000000 +0100 ++++ .\reactos\dll\win32\rpcrt4/msvc.S 2012-02-14 21:27:35.943001900 +0100 +@@ -0,0 +1,146 @@ ++ ++#include <asm.inc> ++ ++#ifdef _M_IX86 ++.code32 ++ ++EXTERN _ndr_client_call:PROC ++ ++PUBLIC _call_stubless_func ++_call_stubless_func: ++ ++ mov ecx,[esp+4] /* This Pointer */ ++ mov ecx,[ecx] /* This->lpVtbl */ ++ mov ecx,[ecx-8] /* MIDL_STUBLESS_PROXY_INFO */ ++ mov edx,[ecx+8] /* Info->FormatStringOffset */ ++ mov edx,[edx+eax*2] /* FormatStringOffset[index] */ ++ and edx, 0000FFFFh ++ add edx,[ecx+4] /* info->ProcFormatString + offset */ ++ mov eax, [edx+8] /* arguments size */ ++ and eax, 0000FFFFh ++ push eax ++ lea eax, [esp+8] /* &This */ ++ push eax ++ push edx /* format string */ ++ push [ecx] /* info->pstubdesc */ ++ call _ndr_client_call ++ lea esp, [esp+12] ++ pop edx /* arguments size */ ++ mov ecx, [esp] /* return address */ ++ add esp, edx ++ jmp ecx ++#else ++.code64 ++ ++EXTERN ndr_client_call:PROC ++ ++PUBLIC call_stubless_func ++FUNC call_stubless_func ++ mov [rsp + 8], rcx ++ .SAVEREG rcx, 8 ++ mov [rsp + 10h], rdx ++ .SAVEREG rdx, 10h ++ mov [rsp + 18h], r8 ++ .SAVEREG r8, 18h ++ mov [rsp + 20h], r9 ++ .SAVEREG r9, 20h ++ sub rsp, 38h ++ .ALLOCSTACK 38h ++ .ENDPROLOG ++ ++ lea r8, [rsp +38h + 8] /* &This */ ++ mov rcx, [rcx] /* This->lpVtbl */ ++ mov rcx, [rcx - 10h] /* MIDL_STUBLESS_PROXY_INFO */ ++ mov rdx, [rcx + 10h] /* info->FormatStringOffset */ ++ movzx rdx, word ptr [rdx+r10*2] /* FormatStringOffset[index] */ ++ add rdx, [rcx + 8] /* info->ProcFormatString + offset */ ++ mov rcx, [rcx] /* info->pStubDesc */ ++ ++ movaps [rsp + 20h], xmm1 ++ movaps [rsp + 28h], xmm2 ++ movaps [rsp + 30h], xmm3 ++ lea r9, [rsp + 18h] /* fpu_args */ ++ call ndr_client_call ++ add rsp, 38h ++ ret ++ENDFUNC ++ ++PUBLIC call_server_func ++FUNC call_server_func ++ push rbp ++ .PUSHREG rbp ++ mov rbp, rsp ++ push rsi ++ .PUSHREG rsi ++ push rdi ++ .PUSHREG rdi ++ .ENDPROLOG ++ ++ mov rax, rcx /* function to call */ ++ mov rcx, 32 /* allocate max(32,stack_size) bytes of stack space */ ++ cmp r8, rcx ++ cmovg rcx, r8 ++ sub rsp, rcx ++ and rsp, NOT 15 ++ mov rcx, r8 ++ shr rcx, 3 ++ mov rdi, rsp ++ mov rsi, rdx ++ rep movsq /* copy arguments */ ++ mov rcx, [rsp] ++ mov rdx, [rsp + 8] ++ mov r8, [rsp + 16] ++ mov r9, [rsp + 24] ++ movd xmm0, rcx ++ movd xmm1, rdx ++ movd xmm2, r8 ++ movd xmm3, r9 ++ call rax ++ ++ lea rsp, [rbp - 16] /* restore stack */ ++ pop rdi ++ pop rsi ++ pop rbp ++ ret ++ENDFUNC ++ ++ ++PUBLIC NdrClientCall2 ++FUNC NdrClientCall2 ++ mov [rsp + 18h], r8 ++ .SAVEREG r8, 18h ++ mov [rsp + 20h], r9 ++ .SAVEREG r9, 20h ++ sub rsp, 28h ++ .ALLOCSTACK 28h ++ .ENDPROLOG ++ ++ lea r8, [rsp + 28h + 18h] ++ xor r9, r9 ++ call ndr_client_call ++ ++ add rsp, 28h ++ ret ++ENDFUNC ++ ++EXTERN ndr_async_client_call:PROC ++PUBLIC NdrAsyncClientCall ++FUNC NdrAsyncClientCall ++ mov [rsp + 18h], r8 ++ .SAVEREG r8, 18h ++ mov [rsp + 20h], r9 ++ .SAVEREG r9, 20h ++ sub rsp, 28h ++ .ALLOCSTACK 28h ++ .ENDPROLOG ++ ++ lea r8, [rsp + 28h + 18h] ++ call ndr_async_client_call ++ ++ add rsp, 28h ++ ret ++ENDFUNC ++ ++#endif ++ ++END +diff -prudN .\wine\dlls\rpcrt4/ncastatus.h .\reactos\dll\win32\rpcrt4/ncastatus.h +--- .\wine\dlls\rpcrt4/ncastatus.h 2014-05-09 03:43:55.867030300 +0200 ++++ .\reactos\dll\win32\rpcrt4/ncastatus.h 2013-12-27 18:11:56.764768100 +0100 +@@ -18,6 +18,8 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + ++#pragma once ++ + #define NCA_S_COMM_FAILURE 0x1C010001 + #define NCA_S_OP_RNG_ERROR 0x1C010002 + #define NCA_S_UNK_IF 0x1C010003 +diff -prudN .\wine\dlls\rpcrt4/ndr_clientserver.c .\reactos\dll\win32\rpcrt4/ndr_clientserver.c +--- .\wine\dlls\rpcrt4/ndr_clientserver.c 2014-05-09 03:43:55.931034000 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_clientserver.c 2013-12-27 18:11:56.437167500 +0100 +@@ -22,22 +22,7 @@ + * - check for errors and throw exceptions + */ + +-#include <stdarg.h> +- +-#define COBJMACROS +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "objbase.h" +- +-#include "rpcproxy.h" +- +-#include "wine/debug.h" +- +-#include "ndr_misc.h" +-#include "rpcndr.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/ndr_contexthandle.c .\reactos\dll\win32\rpcrt4/ndr_contexthandle.c +--- .\wine\dlls\rpcrt4/ndr_contexthandle.c 2014-05-09 03:43:55.935034200 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_contexthandle.c 2013-12-27 18:11:56.639967900 +0100 +@@ -19,14 +19,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include "ndr_misc.h" +-#include "rpc_assoc.h" +-#include "rpcndr.h" +- +-#include "wine/rpcfc.h" +- +-#include "wine/debug.h" +-#include "wine/list.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/ndr_es.c .\reactos\dll\win32\rpcrt4/ndr_es.c +--- .\wine\dlls\rpcrt4/ndr_es.c 2014-05-09 03:43:55.938034400 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_es.c 2013-12-27 18:11:56.764768100 +0100 +@@ -18,21 +18,9 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <stdio.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +-#include "rpc.h" +-#include "midles.h" +-#include "ndrtypes.h" +- +-#include "ndr_misc.h" +-#include "ndr_stubless.h" ++#include "precomp.h" + +-#include "wine/debug.h" +-#include "wine/rpcfc.h" ++#include <midles.h> + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/ndr_fullpointer.c .\reactos\dll\win32\rpcrt4/ndr_fullpointer.c +--- .\wine\dlls\rpcrt4/ndr_fullpointer.c 2014-05-09 03:43:55.941034600 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_fullpointer.c 2013-12-27 18:11:56.655567900 +0100 +@@ -18,14 +18,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "rpc.h" +-#include "rpcndr.h" +- +-#include "wine/debug.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/ndr_marshall.c .\reactos\dll\win32\rpcrt4/ndr_marshall.c +--- .\wine\dlls\rpcrt4/ndr_marshall.c 2014-05-09 03:43:55.945034800 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_marshall.c 2014-04-27 11:37:38.078578700 +0200 +@@ -27,25 +27,7 @@ + * - Checks for integer addition overflow in user marshall functions + */ + +-#include <assert.h> +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include <limits.h> +- +-#define NONAMELESSUNION +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "ndr_misc.h" +-#include "rpcndr.h" +-#include "ndrtypes.h" +- +-#include "wine/unicode.h" +-#include "wine/rpcfc.h" +- +-#include "wine/debug.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/ndr_misc.h .\reactos\dll\win32\rpcrt4/ndr_misc.h +--- .\wine\dlls\rpcrt4/ndr_misc.h 2014-05-09 03:43:55.873030700 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_misc.h 2013-12-27 18:11:56.624367800 +0100 +@@ -21,13 +21,6 @@ + #ifndef __WINE_NDR_MISC_H + #define __WINE_NDR_MISC_H + +-#include <stdarg.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "rpc.h" +-#include "rpcndr.h" +- + struct IPSFactoryBuffer; + + PFORMAT_STRING ComputeConformanceOrVariance( +diff -prudN .\wine\dlls\rpcrt4/ndr_ole.c .\reactos\dll\win32\rpcrt4/ndr_ole.c +--- .\wine\dlls\rpcrt4/ndr_ole.c 2014-05-09 03:43:55.948035000 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_ole.c 2013-12-27 18:11:56.468367600 +0100 +@@ -22,27 +22,7 @@ + * - finish RpcStream_Vtbl + */ + +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +- +-#define COBJMACROS +-#define NONAMELESSUNION +-#define NONAMELESSSTRUCT +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "objbase.h" +- +-#include "ndr_misc.h" +-#include "rpcndr.h" +-#include "rpcproxy.h" +-#include "wine/rpcfc.h" +-#include "cpsf.h" +- +-#include "wine/debug.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + +diff -prudN .\wine\dlls\rpcrt4/ndr_stubless.c .\reactos\dll\win32\rpcrt4/ndr_stubless.c +--- .\wine\dlls\rpcrt4/ndr_stubless.c 2014-05-09 03:43:55.952035200 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_stubless.c 2013-12-27 18:11:56.437167500 +0100 +@@ -23,28 +23,7 @@ + * - Some types of binding handles + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "objbase.h" +-#include "rpc.h" +-#include "rpcproxy.h" +- +-#include "wine/exception.h" +-#include "wine/debug.h" +-#include "wine/rpcfc.h" +- +-#include "cpsf.h" +-#include "ndr_misc.h" +-#include "ndr_stubless.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/ndr_stubless.h .\reactos\dll\win32\rpcrt4/ndr_stubless.h +--- .\wine\dlls\rpcrt4/ndr_stubless.h 2014-05-09 03:43:55.878030900 +0200 ++++ .\reactos\dll\win32\rpcrt4/ndr_stubless.h 2013-12-27 18:11:56.452767500 +0100 +@@ -18,10 +18,12 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include "ndrtypes.h" ++#pragma once ++ ++#include <ndrtypes.h> + + /* there can't be any alignment with the structures in this file */ +-#include "pshpack1.h" ++#include <pshpack1.h> + + typedef struct _NDR_PROC_HEADER + { +@@ -223,7 +225,7 @@ typedef struct _NDR_EHD_CONTEXT + unsigned char param_num; + } NDR_EHD_CONTEXT; + +-#include "poppack.h" ++#include <poppack.h> + + enum stubless_phase + { +diff -prudN .\wine\dlls\rpcrt4/precomp.h .\reactos\dll\win32\rpcrt4/precomp.h +--- .\wine\dlls\rpcrt4/precomp.h 1970-01-01 01:00:00.000000000 +0100 ++++ .\reactos\dll\win32\rpcrt4/precomp.h 2014-03-14 01:43:22.357516600 +0100 +@@ -0,0 +1,40 @@ ++#ifndef _RPCRT4_PCH_ ++#define _RPCRT4_PCH_ ++ ++#include <config.h> ++ ++#include <assert.h> ++#include <stdarg.h> ++#include <stdio.h> ++ ++#define _INC_WINDOWS ++ ++#define COBJMACROS ++#define NONAMELESSUNION ++#define NONAMELESSSTRUCT ++ ++#include <ntstatus.h> ++#define WIN32_NO_STATUS ++#include <windef.h> ++#include <winbase.h> ++#include <winternl.h> ++#include <objbase.h> ++#include <rpcproxy.h> ++#include <security.h> ++ ++#include <wine/debug.h> ++#include <wine/exception.h> ++#include <wine/list.h> ++#include <wine/rpcfc.h> ++#include <wine/unicode.h> ++ ++#include "cpsf.h" ++#include "ncastatus.h" ++#include "ndr_misc.h" ++#include "ndr_stubless.h" ++#include "rpc_assoc.h" ++#include "rpc_binding.h" ++#include "rpc_message.h" ++#include "rpc_server.h" ++ ++#endif /* _RPCRT4_PCH_ */ +diff -prudN .\wine\dlls\rpcrt4/rpc_assoc.c .\reactos\dll\win32\rpcrt4/rpc_assoc.c +--- .\wine\dlls\rpcrt4/rpc_assoc.c 2014-05-09 03:43:55.955035400 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_assoc.c 2013-12-27 18:11:56.780368100 +0100 +@@ -19,19 +19,7 @@ + * + */ + +-#include <stdarg.h> +-#include <assert.h> +- +-#include "rpc.h" +-#include "rpcndr.h" +-#include "winternl.h" +- +-#include "wine/unicode.h" +-#include "wine/debug.h" +- +-#include "rpc_binding.h" +-#include "rpc_assoc.h" +-#include "rpc_message.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/rpc_assoc.h .\reactos\dll\win32\rpcrt4/rpc_assoc.h +--- .\wine\dlls\rpcrt4/rpc_assoc.h 2014-05-09 03:43:55.884031300 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_assoc.h 2013-12-27 18:11:56.905168300 +0100 +@@ -20,7 +20,6 @@ + */ + + #include "rpc_binding.h" +-#include "wine/list.h" + + typedef struct _RpcAssoc + { +diff -prudN .\wine\dlls\rpcrt4/rpc_async.c .\reactos\dll\win32\rpcrt4/rpc_async.c +--- .\wine\dlls\rpcrt4/rpc_async.c 2014-05-09 03:43:55.958035500 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_async.c 2013-12-27 18:11:56.468367600 +0100 +@@ -19,17 +19,7 @@ + * + */ + +-#include <stdarg.h> +- +-#include "rpc.h" +-#include "rpcndr.h" +-#include "rpcasync.h" +- +-#include "wine/debug.h" +- +-#include "rpc_binding.h" +-#include "rpc_message.h" +-#include "ndr_stubless.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/rpc_binding.c .\reactos\dll\win32\rpcrt4/rpc_binding.c +--- .\wine\dlls\rpcrt4/rpc_binding.c 2014-05-09 03:43:55.962035800 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_binding.c 2013-12-27 18:11:56.452767500 +0100 +@@ -21,25 +21,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include <assert.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "winerror.h" +-#include "winternl.h" +-#include "wine/unicode.h" +- +-#include "rpc.h" +-#include "rpcndr.h" +- +-#include "wine/debug.h" +- +-#include "rpc_binding.h" +-#include "rpc_assoc.h" ++#include "precomp.h" + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/rpc_binding.h .\reactos\dll\win32\rpcrt4/rpc_binding.h +--- .\wine\dlls\rpcrt4/rpc_binding.h 2014-05-09 03:43:55.890031600 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_binding.h 2013-12-27 18:11:56.483967600 +0100 +@@ -21,12 +21,8 @@ + #ifndef __WINE_RPC_BINDING_H + #define __WINE_RPC_BINDING_H + +-#include "rpcndr.h" +-#include "security.h" +-#include "wine/list.h" + #include "rpc_defs.h" + +- + enum secure_packet_direction + { + SECURE_PACKET_SEND, +diff -prudN .\wine\dlls\rpcrt4/rpc_defs.h .\reactos\dll\win32\rpcrt4/rpc_defs.h +--- .\wine\dlls\rpcrt4/rpc_defs.h 2014-05-09 03:43:55.895031900 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_defs.h 2013-01-25 00:19:54.167254400 +0100 +@@ -22,7 +22,7 @@ + #ifndef __WINE_RPC_DEFS_H + #define __WINE_RPC_DEFS_H + +-#include "pshpack1.h" ++#include <pshpack1.h> + typedef struct + { + unsigned char rpc_ver; /* RPC major version (5) */ +@@ -168,7 +168,7 @@ typedef struct + unsigned char auth_reserved; /* reserved, must be zero */ + unsigned int auth_context_id; /* unique value for the authenticated connection */ + } RpcAuthVerifier; +-#include "poppack.h" ++#include <poppack.h> + + #define RPC_AUTH_VERIFIER_LEN(common_hdr) \ + ((common_hdr)->auth_len ? (common_hdr)->auth_len + sizeof(RpcAuthVerifier) : 0) +diff -prudN .\wine\dlls\rpcrt4/rpc_epmap.c .\reactos\dll\win32\rpcrt4/rpc_epmap.c +--- .\wine\dlls\rpcrt4/rpc_epmap.c 2014-05-09 03:43:55.965035900 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_epmap.c 2013-12-27 18:11:56.421567500 +0100 +@@ -20,19 +20,7 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "rpc.h" +- +-#include "wine/debug.h" +-#include "wine/exception.h" +- +-#include "rpc_binding.h" +-#include "epm.h" ++#include "precomp.h" + #include "epm_towers.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); +@@ -92,7 +80,7 @@ static BOOL start_rpcss(void) + lstrcatW( cmd, rpcss ); + + Wow64DisableWow64FsRedirection( &redir ); +- rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, DETACHED_PROCESS, NULL, NULL, &si, &pi ); ++ rslt = CreateProcessW( cmd, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi ); + Wow64RevertWow64FsRedirection( redir ); + + if (rslt) +@@ -162,7 +150,7 @@ static RPC_STATUS get_epm_handle_server( static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { @@ -43,10 +708,87 @@ { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: -diff -prudN e:\Wine\dlls\rpcrt4/rpc_server.c e:\reactos\dll\win32\rpcrt4/rpc_server.c ---- e:\Wine\dlls\rpcrt4/rpc_server.c 2012-12-09 09:57:02.680308600 +0100 -+++ e:\reactos\dll\win32\rpcrt4/rpc_server.c 2013-12-06 23:50:04.564226300 +0100 -@@ -1075,8 +1077,10 @@ void RPCRT4_destroy_all_protseqs(void) +diff -prudN .\wine\dlls\rpcrt4/rpc_message.c .\reactos\dll\win32\rpcrt4/rpc_message.c +--- .\wine\dlls\rpcrt4/rpc_message.c 2014-05-09 03:43:55.969036200 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_message.c 2014-04-27 11:37:38.078578700 +0200 +@@ -20,25 +20,9 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +-#include "winuser.h" +- +-#include "rpc.h" +-#include "rpcndr.h" +-#include "rpcdcep.h" +- +-#include "wine/debug.h" ++#include "precomp.h" + +-#include "rpc_binding.h" +-#include "rpc_defs.h" +-#include "rpc_message.h" +-#include "ncastatus.h" ++#include <winuser.h> + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/rpc_message.h .\reactos\dll\win32\rpcrt4/rpc_message.h +--- .\wine\dlls\rpcrt4/rpc_message.h 2014-05-09 03:43:55.901032300 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_message.h 2013-12-27 18:11:56.499567600 +0100 +@@ -21,8 +21,6 @@ + #ifndef __WINE_RPC_MESSAGE_H + #define __WINE_RPC_MESSAGE_H + +-#include "rpc_defs.h" +- + typedef unsigned int NCA_STATUS; + + RpcPktHdr *RPCRT4_BuildFaultHeader(ULONG DataRepresentation, RPC_STATUS Status) DECLSPEC_HIDDEN; +diff -prudN .\wine\dlls\rpcrt4/rpc_server.c .\reactos\dll\win32\rpcrt4/rpc_server.c +--- .\wine\dlls\rpcrt4/rpc_server.c 2014-05-09 03:43:55.973036400 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_server.c 2013-12-27 18:11:56.780368100 +0100 +@@ -20,31 +20,9 @@ + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +-#include "config.h" +-#include "wine/port.h" +- +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include <assert.h> +- +-#include "windef.h" +-#include "winbase.h" +-#include "winerror.h" +- +-#include "rpc.h" +-#include "rpcndr.h" +-#include "excpt.h" +- +-#include "wine/debug.h" +-#include "wine/exception.h" ++#include "precomp.h" + +-#include "rpc_server.h" +-#include "rpc_assoc.h" +-#include "rpc_message.h" +-#include "rpc_defs.h" +-#include "ncastatus.h" +-#include "secext.h" ++#include <secext.h> + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +@@ -1075,8 +1053,10 @@ void RPCRT4_destroy_all_protseqs(void) EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY_SAFE(cps, cursor2, &protseqs, RpcServerProtseq, entry) { @@ -57,10 +799,62 @@ destroy_serverprotoseq(cps); } LeaveCriticalSection(&server_cs); -diff -prudN e:\Wine\dlls\rpcrt4/rpc_transport.c e:\reactos\dll\win32\rpcrt4/rpc_transport.c ---- e:\Wine\dlls\rpcrt4/rpc_transport.c 2013-12-06 20:10:59.302378700 +0100 -+++ e:\reactos\dll\win32\rpcrt4/rpc_transport.c 2013-12-06 23:39:38.664465200 +0100 -@@ -111,31 +115,41 @@ typedef struct _RpcConnection_np +diff -prudN .\wine\dlls\rpcrt4/rpc_server.h .\reactos\dll\win32\rpcrt4/rpc_server.h +--- .\wine\dlls\rpcrt4/rpc_server.h 2014-05-09 03:43:55.907032600 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_server.h 2013-12-27 18:11:56.905168300 +0100 +@@ -22,7 +22,6 @@ + #define __WINE_RPC_SERVER_H + + #include "rpc_binding.h" +-#include "wine/list.h" + + struct protseq_ops; + +diff -prudN .\wine\dlls\rpcrt4/rpc_transport.c .\reactos\dll\win32\rpcrt4/rpc_transport.c +--- .\wine\dlls\rpcrt4/rpc_transport.c 2014-05-09 03:43:55.977036600 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpc_transport.c 2014-05-09 03:10:59.250551600 +0200 +@@ -23,14 +23,7 @@ + * + */ + +-#include "config.h" +- +-#include <stdarg.h> +-#include <stdio.h> +-#include <string.h> +-#include <assert.h> +-#include <stdlib.h> +-#include <sys/types.h> ++#include "precomp.h" + + #if defined(__MINGW32__) || defined (_MSC_VER) + # include <ws2tcpip.h> +@@ -76,23 +69,8 @@ + # define ioctlsocket ioctl + #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ + +-#include "windef.h" +-#include "winbase.h" +-#include "winnls.h" +-#include "winerror.h" +-#include "wininet.h" +-#include "winternl.h" +-#include "wine/unicode.h" +- +-#include "rpc.h" +-#include "rpcndr.h" +- +-#include "wine/debug.h" ++#include <wininet.h> + +-#include "rpc_binding.h" +-#include "rpc_assoc.h" +-#include "rpc_message.h" +-#include "rpc_server.h" + #include "epm_towers.h" + + #ifndef SOL_TCP +@@ -113,31 +91,41 @@ typedef struct _RpcConnection_np { RpcConnection common; HANDLE pipe; @@ -109,26 +903,20 @@ case ERROR_NO_DATA_DETECTED: /* client has disconnected, retry */ DisconnectNamedPipe( npc->pipe ); -@@ -148,28 +162,12 @@ static DWORD CALLBACK listen_thread(void +@@ -150,6 +138,7 @@ static DWORD CALLBACK listen_thread(void } } --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; --} -- ++#ifndef __REACTOS__ + static RPC_STATUS rpcrt4_conn_listen_pipe(RpcConnection_np *npc) + { + if (npc->listening) +@@ -165,13 +154,14 @@ static RPC_STATUS rpcrt4_conn_listen_pip + } + return RPC_S_OK; + } ++#endif + static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -139,7 +927,7 @@ PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE, PIPE_UNLIMITED_INSTANCES, RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); -@@ -181,6 +179,9 @@ static RPC_STATUS rpcrt4_conn_create_pip +@@ -183,6 +173,9 @@ static RPC_STATUS rpcrt4_conn_create_pip return RPC_S_CANT_CREATE_ENDPOINT; } @@ -149,7 +937,7 @@ /* Note: we don't call ConnectNamedPipe here because it must be done in the * server thread as the thread must be alertable */ return RPC_S_OK; -@@ -227,6 +228,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( +@@ -229,6 +222,9 @@ static RPC_STATUS rpcrt4_conn_open_pipe( if (err == ERROR_PIPE_BUSY) { TRACE("connection failed, error=%x\n", err); return RPC_S_SERVER_TOO_BUSY; @@ -159,7 +947,7 @@ } if (!wait || !WaitNamedPipeA(pname, NMPWAIT_WAIT_FOREVER)) { err = GetLastError(); -@@ -236,9 +240,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( +@@ -238,9 +234,11 @@ static RPC_STATUS rpcrt4_conn_open_pipe( } /* success */ @@ -171,13 +959,16 @@ npc->pipe = pipe; return RPC_S_OK; -@@ -306,18 +312,32 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc +@@ -308,18 +306,59 @@ static RPC_STATUS rpcrt4_protseq_ncalrpc static RPC_STATUS rpcrt4_ncacn_np_open(RpcConnection* Connection) { RpcConnection_np *npc = (RpcConnection_np *) Connection; - static const char prefix[] = "\\\\."; + static const char prefix[] = "\\\\"; -+ static const char local[] ="."; ++ static const char local[] = "."; ++ BOOL bUseLocalName = TRUE; ++ CHAR ComputerName[MAX_COMPUTERNAME_LENGTH + 1]; ++ DWORD bufLen = sizeof(ComputerName)/sizeof(ComputerName[0]); RPC_STATUS r; LPSTR pname; + INT size; @@ -191,15 +982,39 @@ - strcat(strcpy(pname, prefix), Connection->Endpoint); - r = rpcrt4_conn_open_pipe(Connection, pname, FALSE); + size = strlen(prefix); ++ + if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) ++ { ++ bUseLocalName = TRUE; + size += strlen(local); ++ } + else -+ size += strlen(Connection->NetworkAddr); ++ { ++ if (GetComputerNameA(ComputerName, &bufLen)) ++ { ++ if (stricmp(ComputerName, Connection->NetworkAddr) == 0) ++ { ++ bUseLocalName = TRUE; ++ size += strlen(local); ++ } ++ else ++ { ++ bUseLocalName = FALSE; ++ size += strlen(Connection->NetworkAddr); ++ } ++ } ++ else ++ { ++ bUseLocalName = FALSE; ++ size += strlen(Connection->NetworkAddr); ++ } ++ } ++ + size += strlen(Connection->Endpoint) + 1; + + pname = I_RpcAllocate(size); + strcpy(pname, prefix); -+ if (Connection->NetworkAddr == NULL || strlen(Connection->NetworkAddr) == 0) ++ if (bUseLocalName) + strcat(pname, local); + else + strcat(pname, Connection->NetworkAddr); @@ -208,7 +1023,7 @@ I_RpcFree(pname); return r; -@@ -366,9 +386,9 @@ static void rpcrt4_conn_np_handoff(RpcCo +@@ -368,9 +407,9 @@ static void rpcrt4_conn_np_handoff(RpcCo * to the child, then reopen the server binding to continue listening */ new_npc->pipe = old_npc->pipe; @@ -220,7 +1035,7 @@ old_npc->listening = FALSE; } -@@ -413,11 +433,17 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -415,11 +454,17 @@ static int rpcrt4_conn_np_read(RpcConnec char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -239,7 +1054,7 @@ if (!ret && GetLastError() == ERROR_MORE_DATA) ret = TRUE; if (!ret || !bytes_read) -@@ -425,6 +451,7 @@ static int rpcrt4_conn_np_read(RpcConnec +@@ -427,6 +472,7 @@ static int rpcrt4_conn_np_read(RpcConnec bytes_left -= bytes_read; buf += bytes_read; } @@ -247,7 +1062,7 @@ return ret ? count : -1; } -@@ -435,16 +462,23 @@ static int rpcrt4_conn_np_write(RpcConne +@@ -437,16 +483,23 @@ static int rpcrt4_conn_np_write(RpcConne const char *buf = buffer; BOOL ret = TRUE; unsigned int bytes_left = count; @@ -272,7 +1087,7 @@ return ret ? count : -1; } -@@ -456,9 +490,9 @@ static int rpcrt4_conn_np_close(RpcConne +@@ -458,9 +511,9 @@ static int rpcrt4_conn_np_close(RpcConne CloseHandle(npc->pipe); npc->pipe = 0; } @@ -285,7 +1100,7 @@ } return 0; } -@@ -662,7 +696,7 @@ static void *rpcrt4_protseq_np_get_wait_ +@@ -664,7 +717,7 @@ static void *rpcrt4_protseq_np_get_wait_ conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { rpcrt4_conn_listen_pipe(conn); @@ -294,7 +1109,7 @@ (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } -@@ -683,7 +717,7 @@ static void *rpcrt4_protseq_np_get_wait_ +@@ -685,7 +738,7 @@ static void *rpcrt4_protseq_np_get_wait_ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { @@ -303,7 +1118,7 @@ (*count)++; conn = CONTAINING_RECORD(conn->common.Next, RpcConnection_np, common); } -@@ -730,18 +764,12 @@ static int rpcrt4_protseq_np_wait_for_ne +@@ -732,18 +785,12 @@ static int rpcrt4_protseq_np_wait_for_ne EnterCriticalSection(&protseq->cs); conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); while (conn) { @@ -324,9 +1139,9 @@ else ERR("failed to locate connection for handle %p\n", b_handle); LeaveCriticalSection(&protseq->cs); -diff -prudN e:\Wine\dlls\rpcrt4/rpcrt4.spec e:\reactos\dll\win32\rpcrt4/rpcrt4.spec ---- e:\Wine\dlls\rpcrt4/rpcrt4.spec 2012-09-09 19:47:53.677232900 +0100 -+++ e:\reactos\dll\win32\rpcrt4/rpcrt4.spec 2013-12-06 20:29:09.804227500 +0100 +diff -prudN .\wine\dlls\rpcrt4/rpcrt4.spec .\reactos\dll\win32\rpcrt4/rpcrt4.spec +--- .\wine\dlls\rpcrt4/rpcrt4.spec 2014-05-09 03:43:55.911032800 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpcrt4.spec 2013-12-07 15:35:15.331527800 +0100 @@ -266,7 +266,7 @@ @ stdcall NdrRangeUnmarshall(ptr ptr ptr long) @ stub NdrRpcSmClientAllocate @@ -336,3 +1151,78 @@ @ stub NdrRpcSsDefaultAllocate @ stub NdrRpcSsDefaultFree @ stub NdrRpcSsDisableAllocate +diff -prudN .\wine\dlls\rpcrt4/rpcrt4_main.c .\reactos\dll\win32\rpcrt4/rpcrt4_main.c +--- .\wine\dlls\rpcrt4/rpcrt4_main.c 2014-05-09 03:43:55.980036800 +0200 ++++ .\reactos\dll\win32\rpcrt4/rpcrt4_main.c 2014-05-09 03:45:42.047103500 +0200 +@@ -28,35 +28,10 @@ + * NT-based native rpcrt4's. Commonly-used transport for self-to-self RPC's. + */ + +-#include "config.h" +- +-#include <stdarg.h> +-#include <stdio.h> +-#include <stdlib.h> +-#include <string.h> +- +-#include "ntstatus.h" +-#define WIN32_NO_STATUS +-#include "windef.h" +-#include "winerror.h" +-#include "winbase.h" +-#include "winuser.h" +-#include "winnt.h" +-#include "winternl.h" +-#include "ntsecapi.h" +-#include "iptypes.h" +-#include "iphlpapi.h" +-#include "wine/unicode.h" +-#include "rpc.h" +- +-#include "ole2.h" +-#include "rpcndr.h" +-#include "rpcproxy.h" +- +-#include "rpc_binding.h" +-#include "rpc_server.h" ++#include "precomp.h" + +-#include "wine/debug.h" ++#include <ntsecapi.h> ++#include <iphlpapi.h> + + WINE_DEFAULT_DEBUG_CHANNEL(rpc); + +diff -prudN .\wine\dlls\rpcrt4/unix_func.c .\reactos\dll\win32\rpcrt4/unix_func.c +--- .\wine\dlls\rpcrt4/unix_func.c 1970-01-01 01:00:00.000000000 +0100 ++++ .\reactos\dll\win32\rpcrt4/unix_func.c 2013-01-25 00:19:53.278052800 +0100 +@@ -0,0 +1,29 @@ ++#define WIN32_NO_STATUS ++#define _INC_WINDOWS ++#include <windef.h> ++#include <winsock2.h> ++ ++const char * ++WSAAPI ++inet_ntop (int af, ++ const void *src, ++ char *dst, ++ size_t cnt) ++{ ++ struct in_addr in; ++ char *text_addr; ++ ++ if (af == AF_INET) ++ { ++ memcpy(&in.s_addr, src, sizeof(in.s_addr)); ++ text_addr = inet_ntoa(in); ++ if (text_addr && dst) ++ { ++ strncpy(dst, text_addr, cnt); ++ return dst; ++ } ++ } ++ ++ return 0; ++} ++

1 0

[aandrejevic] 63201: [NTVDM] Fix the previous two fixes. Tests show that the first line is actually treated as an even-numbered line.
by aandrejevic＠svn.reactos.org 09 May '14

09 May '14

Author: aandrejevic Date: Fri May 9 00:34:10 2014 New Revision: 63201 URL: http://svn.reactos.org/svn/reactos?rev=63201&view=rev Log: [NTVDM] Fix the previous two fixes. Tests show that the first line is actually treated as an even-numbered line. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri May 9 00:34:10 2014 @@ -1205,8 +1205,7 @@ DWORD Offset = Address + (j / 8); BYTE LowPlaneData, HighPlaneData; - /* Check if the 0-based index is divisible by 2. If so, the 1-based index is an odd number. */ - if (i % 2 == 0) + if (i % 2 != 0) { /* Odd-numbered line - add the CGA emulation offset */ Offset += VGA_CGA_ODD_LINE_OFFSET;

1 0

[aandrejevic] 63200: [NTVDM] Add a comment which explains the weird check for odd-numbered lines.
by aandrejevic＠svn.reactos.org 09 May '14

09 May '14

Author: aandrejevic Date: Fri May 9 00:23:19 2014 New Revision: 63200 URL: http://svn.reactos.org/svn/reactos?rev=63200&view=rev Log: [NTVDM] Add a comment which explains the weird check for odd-numbered lines. Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri May 9 00:23:19 2014 @@ -1205,6 +1205,7 @@ DWORD Offset = Address + (j / 8); BYTE LowPlaneData, HighPlaneData; + /* Check if the 0-based index is divisible by 2. If so, the 1-based index is an odd number. */ if (i % 2 == 0) { /* Odd-numbered line - add the CGA emulation offset */

1 0

[aandrejevic] 63199: [NTVDM] Fix CGA emulation in shift interleave mode. CORE-8177 #comment Possibly fixed. Can you redo your tests with r63199?
by aandrejevic＠svn.reactos.org 09 May '14

09 May '14

Author: aandrejevic Date: Fri May 9 00:15:40 2014 New Revision: 63199 URL: http://svn.reactos.org/svn/reactos?rev=63199&view=rev Log: [NTVDM] Fix CGA emulation in shift interleave mode. CORE-8177 #comment Possibly fixed. Can you redo your tests with r63199? Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c trunk/reactos/subsystems/ntvdm/hardware/vga.h Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.c [iso-8859-1] Fri May 9 00:15:40 2014 @@ -1146,6 +1146,8 @@ /* Loop through the scanlines */ for (i = 0; i < Resolution.Y; i++) { + BOOL RepeatScanline = FALSE; + /* Loop through the pixels */ for (j = 0; j < Resolution.X; j++) { @@ -1199,10 +1201,23 @@ * 2 bits shifted from plane 0 and 2 for the first 4 pixels, * then 2 bits shifted from plane 1 and 3 for the next 4 */ - BYTE LowPlaneData = VgaMemory[((j / 4) % 2) * VGA_BANK_SIZE - + (Address + (j / 8)) * AddressSize]; - BYTE HighPlaneData = VgaMemory[(((j / 4) % 2) + 2) * VGA_BANK_SIZE - + (Address + (j / 8)) * AddressSize]; + DWORD BankNumber = (j / 4) % 2; + DWORD Offset = Address + (j / 8); + BYTE LowPlaneData, HighPlaneData; + + if (i % 2 == 0) + { + /* Odd-numbered line - add the CGA emulation offset */ + Offset += VGA_CGA_ODD_LINE_OFFSET; + } + else + { + /* Even-numbered line - use the same scanline */ + RepeatScanline = TRUE; + } + + LowPlaneData = VgaMemory[BankNumber * VGA_BANK_SIZE + Offset * AddressSize]; + HighPlaneData = VgaMemory[(BankNumber + 2) * VGA_BANK_SIZE + Offset * AddressSize]; /* Extract the two bits from each plane */ LowPlaneData = (LowPlaneData >> (6 - ((j % 4) * 2))) & 3; @@ -1296,7 +1311,7 @@ } /* Move to the next scanline */ - Address += ScanlineSize; + if (!RepeatScanline) Address += ScanlineSize; } /* Modified: trunk/reactos/subsystems/ntvdm/hardware/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/hardware/… ============================================================================== --- trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/hardware/vga.h [iso-8859-1] Fri May 9 00:15:40 2014 @@ -24,7 +24,7 @@ #define VGA_MINIMUM_HEIGHT 300 #define VGA_DAC_TO_COLOR(x) (((x) << 2) | ((x) >> 4)) #define VGA_COLOR_TO_DAC(x) ((x) >> 2) - +#define VGA_CGA_ODD_LINE_OFFSET 0x1000 /* Register I/O ports */

1 0

[hbelusca] 63198: [KERNEL32] No need to precalculate the string lengths before calling the helper functions. They can do it instead.
by hbelusca＠svn.reactos.org 09 May '14

09 May '14

Author: hbelusca Date: Thu May 8 22:24:38 2014 New Revision: 63198 URL: http://svn.reactos.org/svn/reactos?rev=63198&view=rev Log: [KERNEL32] No need to precalculate the string lengths before calling the helper functions. They can do it instead. Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c branches/condrv_restructure/dll/win32/kernel32/client/console/console.c branches/condrv_restructure/dll/win32/kernel32/client/console/history.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Thu May 8 22:24:38 2014 @@ -388,11 +388,13 @@ static DWORD -IntGetConsoleAliasesLength(LPVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +IntGetConsoleAliasesLength(LPVOID lpExeName, BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest = &ApiMessage.Data.GetAllAliasesLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (lpExeName == NULL || dwNumChars == 0) { @@ -442,13 +444,7 @@ WINAPI GetConsoleAliasesLengthW(LPWSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleAliasesLength(lpExeName, wcslen(lpExeName), TRUE); + return IntGetConsoleAliasesLength(lpExeName, TRUE); } @@ -459,13 +455,7 @@ WINAPI GetConsoleAliasesLengthA(LPSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleAliasesLength(lpExeName, strlen(lpExeName), FALSE); + return IntGetConsoleAliasesLength(lpExeName, FALSE); } Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu May 8 22:24:38 2014 @@ -1867,11 +1867,13 @@ static BOOL -IntSetConsoleTitle(CONST VOID *lpConsoleTitle, DWORD dwNumChars, BOOLEAN bUnicode) +IntSetConsoleTitle(CONST VOID *lpConsoleTitle, BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETSETCONSOLETITLE TitleRequest = &ApiMessage.Data.TitleRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpConsoleTitle ? (bUnicode ? wcslen(lpConsoleTitle) : strlen(lpConsoleTitle)) : 0); TitleRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; TitleRequest->Length = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); @@ -1915,7 +1917,7 @@ WINAPI SetConsoleTitleW(LPCWSTR lpConsoleTitle) { - return IntSetConsoleTitle(lpConsoleTitle, wcslen(lpConsoleTitle), TRUE); + return IntSetConsoleTitle(lpConsoleTitle, TRUE); } @@ -1928,7 +1930,7 @@ WINAPI SetConsoleTitleA(LPCSTR lpConsoleTitle) { - return IntSetConsoleTitle(lpConsoleTitle, strlen(lpConsoleTitle), FALSE); + return IntSetConsoleTitle(lpConsoleTitle, FALSE); } Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] Thu May 8 22:24:38 2014 @@ -52,11 +52,13 @@ #endif static VOID -IntExpungeConsoleCommandHistory(LPCVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +IntExpungeConsoleCommandHistory(LPCVOID lpExeName, BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest = &ApiMessage.Data.ExpungeCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (lpExeName == NULL || dwNumChars == 0) { @@ -98,11 +100,13 @@ static DWORD -IntGetConsoleCommandHistory(LPVOID lpHistory, DWORD cbHistory, LPCVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +IntGetConsoleCommandHistory(LPVOID lpHistory, DWORD cbHistory, LPCVOID lpExeName, BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &ApiMessage.Data.GetCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (lpExeName == NULL || dwNumChars == 0) { @@ -160,11 +164,13 @@ static DWORD -IntGetConsoleCommandHistoryLength(LPCVOID lpExeName, DWORD dwNumChars, BOOL bUnicode) +IntGetConsoleCommandHistoryLength(LPCVOID lpExeName, BOOL bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &ApiMessage.Data.GetCommandHistoryLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (lpExeName == NULL || dwNumChars == 0) { @@ -213,12 +219,13 @@ static BOOL IntSetConsoleNumberOfCommands(DWORD dwNumCommands, LPCVOID lpExeName, - DWORD dwNumChars, BOOLEAN bUnicode) { CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest = &ApiMessage.Data.SetHistoryNumberCommandsRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; + + DWORD dwNumChars = (lpExeName ? (bUnicode ? wcslen(lpExeName) : strlen(lpExeName)) : 0); if (lpExeName == NULL || dwNumChars == 0) { @@ -274,13 +281,7 @@ WINAPI ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return; - } - - IntExpungeConsoleCommandHistory(lpExeName, wcslen(lpExeName), TRUE); + IntExpungeConsoleCommandHistory(lpExeName, TRUE); } @@ -291,13 +292,7 @@ WINAPI ExpungeConsoleCommandHistoryA(LPCSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return; - } - - IntExpungeConsoleCommandHistory(lpExeName, strlen(lpExeName), FALSE); + IntExpungeConsoleCommandHistory(lpExeName, FALSE); } @@ -310,13 +305,7 @@ DWORD cbHistory, LPCWSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, wcslen(lpExeName), TRUE); + return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, TRUE); } @@ -329,13 +318,7 @@ DWORD cbHistory, LPCSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, strlen(lpExeName), FALSE); + return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, FALSE); } @@ -346,13 +329,7 @@ WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleCommandHistoryLength(lpExeName, wcslen(lpExeName), TRUE); + return IntGetConsoleCommandHistoryLength(lpExeName, TRUE); } @@ -363,13 +340,7 @@ WINAPI GetConsoleCommandHistoryLengthA(LPCSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - return IntGetConsoleCommandHistoryLength(lpExeName, strlen(lpExeName), FALSE); + return IntGetConsoleCommandHistoryLength(lpExeName, FALSE); } @@ -381,13 +352,7 @@ SetConsoleNumberOfCommandsW(DWORD dwNumCommands, LPCWSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, wcslen(lpExeName), TRUE); + return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, TRUE); } @@ -399,13 +364,7 @@ SetConsoleNumberOfCommandsA(DWORD dwNumCommands, LPCSTR lpExeName) { - if (lpExeName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, strlen(lpExeName), FALSE); + return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, FALSE); }

1 0

[tfaber] 63197: [IEFRAME] - Fix IID comparison in ShellUIHelper2_QueryInterface. Patch by Víctor Martínez CORE-8158 #resolve
by tfaber＠svn.reactos.org 08 May '14

08 May '14

Author: tfaber Date: Thu May 8 21:40:58 2014 New Revision: 63197 URL: http://svn.reactos.org/svn/reactos?rev=63197&view=rev Log: [IEFRAME] - Fix IID comparison in ShellUIHelper2_QueryInterface. Patch by Víctor Martínez CORE-8158 #resolve Modified: trunk/reactos/dll/win32/ieframe/shelluihelper.c Modified: trunk/reactos/dll/win32/ieframe/shelluihelper.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ieframe/shelluih… ============================================================================== --- trunk/reactos/dll/win32/ieframe/shelluihelper.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ieframe/shelluihelper.c [iso-8859-1] Thu May 8 21:40:58 2014 @@ -41,7 +41,7 @@ }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { TRACE("(%p)->(IID_IShellUIHelper %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; - }else if(IsEqualGUID(&IID_IShellUIHelper, riid)) { + }else if(IsEqualGUID(&IID_IShellUIHelper2, riid)) { TRACE("(%p)->(IID_IShellUIHelper2 %p)\n", This, ppv); *ppv = &This->IShellUIHelper2_iface; }else {

1 0

[dquintana] 63196: [BROWSEUI] * Fix gcc build. * Also, undo a change that wasn't as useful as I first thought it would be. CORE-8183 #resolve #comment Here you go. Thanks for reporting.
by dquintana＠svn.reactos.org 08 May '14

08 May '14

Author: dquintana Date: Thu May 8 20:16:06 2014 New Revision: 63196 URL: http://svn.reactos.org/svn/reactos?rev=63196&view=rev Log: [BROWSEUI] * Fix gcc build. * Also, undo a change that wasn't as useful as I first thought it would be. CORE-8183 #resolve #comment Here you go. Thanks for reporting. Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp branches/shell-experiments/dll/win32/browseui/addresseditbox.h Modified: branches/shell-experiments/dll/win32/browseui/addressband.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addressband.cpp [iso-8859-1] Thu May 8 20:16:06 2014 @@ -134,7 +134,7 @@ // create combo box ex combobox = CreateWindowEx(WS_EX_TOOLWINDOW, WC_COMBOBOXEXW, NULL, WS_CHILD | WS_VISIBLE | - WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY, + WS_CLIPCHILDREN | WS_TABSTOP | CCS_NODIVIDER | CCS_NOMOVEY | CBS_OWNERDRAWFIXED, 0, 0, 500, 250, parentWindow, (HMENU)0xa205, _AtlBaseModule.GetModuleInstance(), 0); if (combobox == NULL) return E_FAIL; Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Thu May 8 20:16:06 2014 @@ -40,7 +40,8 @@ */ CAddressEditBox::CAddressEditBox() : - fEditWindow(NULL, this, 1) + fCombobox(NULL, this, 1), + fEditWindow(NULL, this, 1) { } @@ -56,8 +57,6 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::FileSysChange(long param8, long paramC) { - LPWSTR str8 = reinterpret_cast<LPWSTR>(param8); - LPWSTR strC = reinterpret_cast<LPWSTR>(paramC); return E_NOTIMPL; } @@ -68,7 +67,7 @@ HRESULT STDMETHODCALLTYPE CAddressEditBox::Init(HWND comboboxEx, HWND editControl, long param14, IUnknown *param18) { - SubclassWindow(comboboxEx); + fCombobox.SubclassWindow(comboboxEx); fEditWindow.SubclassWindow(editControl); return S_OK; } Modified: branches/shell-experiments/dll/win32/browseui/addresseditbox.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/dll/win32/bro… ============================================================================== --- branches/shell-experiments/dll/win32/browseui/addresseditbox.h [iso-8859-1] (original) +++ branches/shell-experiments/dll/win32/browseui/addresseditbox.h [iso-8859-1] Thu May 8 20:16:06 2014 @@ -33,6 +33,7 @@ public IShellService { private: + CContainedWindow fCombobox; CContainedWindow fEditWindow; public: CAddressEditBox();

1 0

[tfaber] 63195: [QUARTZ] - Fix a trace check. Patch by Víctor Martínez CORE-8152 #resolve
by tfaber＠svn.reactos.org 08 May '14

08 May '14

Author: tfaber Date: Thu May 8 19:58:21 2014 New Revision: 63195 URL: http://svn.reactos.org/svn/reactos?rev=63195&view=rev Log: [QUARTZ] - Fix a trace check. Patch by Víctor Martínez CORE-8152 #resolve Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c Modified: trunk/reactos/dll/directx/wine/quartz/avisplit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/quartz/av… ============================================================================== --- trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/quartz/avisplit.c [iso-8859-1] Thu May 8 19:58:21 2014 @@ -803,7 +803,7 @@ TRACE("dwChunkId: %.4s\n", (const char *)&pIndex->dwChunkId); if (pIndex->dwReserved[0]) TRACE("dwReserved[0]: %u\n", pIndex->dwReserved[0]); - if (pIndex->dwReserved[2]) + if (pIndex->dwReserved[1]) TRACE("dwReserved[1]: %u\n", pIndex->dwReserved[1]); if (pIndex->dwReserved[2]) TRACE("dwReserved[2]: %u\n", pIndex->dwReserved[2]);

1 0

[hbelusca] 63194: [KERNEL32][CONSRV] Make kernel32 / winsrv console CSR structures Win2k3-compliant. The aim is to be able to put our kernel32.dll or winsrv.dll on win2k3, and vice-versa. - Fix alm...
by hbelusca＠svn.reactos.org 08 May '14

08 May '14

Author: hbelusca Date: Thu May 8 18:08:07 2014 New Revision: 63194 URL: http://svn.reactos.org/svn/reactos?rev=63194&view=rev Log: [KERNEL32][CONSRV] Make kernel32 / winsrv console CSR structures Win2k3-compliant. The aim is to be able to put our kernel32.dll or winsrv.dll on win2k3, and vice-versa. - Fix almost all the alias APIs and the history APIs. Unicode versions is OK, ANSI ones need correct fixes in server-side (see CORE-7931 for more details). - Half-plement SetConsoleCommandHistoryMode (client-side OK, server-side unimplemented). Part 4/X CORE-7931 Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c branches/condrv_restructure/dll/win32/kernel32/client/console/console.c branches/condrv_restructure/dll/win32/kernel32/client/console/history.c branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/alias.c [iso-8859-1] Thu May 8 18:08:07 2014 @@ -387,30 +387,24 @@ } -/* - * @implemented - */ -DWORD -WINAPI -GetConsoleAliasesLengthW(LPWSTR lpExeName) -{ - NTSTATUS Status; +static DWORD +IntGetConsoleAliasesLength(LPVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest = &ApiMessage.Data.GetAllAliasesLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DPRINT("GetConsoleAliasesLengthW entered\n"); - - if (lpExeName == NULL) + if (lpExeName == NULL || dwNumChars == 0) { SetLastError(ERROR_INVALID_PARAMETER); return 0; } - GetAllAliasesLengthRequest->ExeLength = (wcslen(lpExeName) + 1) * sizeof(WCHAR); - GetAllAliasesLengthRequest->Length = 0; - - /* Allocate a Capture Buffer */ + GetAllAliasesLengthRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetAllAliasesLengthRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetAllAliasesLengthRequest->Unicode = + GetAllAliasesLengthRequest->Unicode2 = bUnicode; + CaptureBuffer = CsrAllocateCaptureBuffer(1, GetAllAliasesLengthRequest->ExeLength); if (!CaptureBuffer) { @@ -419,22 +413,21 @@ return 0; } - /* Capture the exe name */ CsrCaptureMessageBuffer(CaptureBuffer, (PVOID)lpExeName, GetAllAliasesLengthRequest->ExeLength, (PVOID)&GetAllAliasesLengthRequest->ExeName); - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasesLength), - sizeof(CONSOLE_GETALLALIASESLENGTH)); + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasesLength), + sizeof(*GetAllAliasesLengthRequest)); CsrFreeCaptureBuffer(CaptureBuffer); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return 0; } @@ -447,42 +440,48 @@ */ DWORD WINAPI +GetConsoleAliasesLengthW(LPWSTR lpExeName) +{ + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleAliasesLength(lpExeName, wcslen(lpExeName), TRUE); +} + + +/* + * @implemented + */ +DWORD +WINAPI GetConsoleAliasesLengthA(LPSTR lpExeName) { - DWORD dwRetVal = 0; - LPWSTR lpExeNameW = NULL; - - if (lpExeName) - BasepAnsiStringToHeapUnicodeString(lpExeName, (LPWSTR*)&lpExeNameW); - - dwRetVal = GetConsoleAliasesLengthW(lpExeNameW); - if (dwRetVal) - dwRetVal /= sizeof(WCHAR); - - /* Clean up */ - if (lpExeNameW) - RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*)lpExeNameW); - - return dwRetVal; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, - DWORD ExeNameBufferLength) -{ - NTSTATUS Status; + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleAliasesLength(lpExeName, strlen(lpExeName), FALSE); +} + + +static DWORD +IntGetConsoleAliasExes(PVOID lpExeNameBuffer, + DWORD ExeNameBufferLength, + BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETALIASESEXES GetAliasesExesRequest = &ApiMessage.Data.GetAliasesExesRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DPRINT("GetConsoleAliasExesW entered\n"); - - /* Allocate a Capture Buffer */ + GetAliasesExesRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetAliasesExesRequest->Length = ExeNameBufferLength; + GetAliasesExesRequest->Unicode = bUnicode; + CaptureBuffer = CsrAllocateCaptureBuffer(1, ExeNameBufferLength); if (!CaptureBuffer) { @@ -491,33 +490,39 @@ return 0; } - GetAliasesExesRequest->Length = ExeNameBufferLength; - - /* Allocate space for the exe name buffer */ CsrAllocateMessagePointer(CaptureBuffer, ExeNameBufferLength, (PVOID*)&GetAliasesExesRequest->ExeNames); - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExes), - sizeof(CONSOLE_GETALIASESEXES)); - if (!NT_SUCCESS(Status)) + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExes), + sizeof(*GetAliasesExesRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) { CsrFreeCaptureBuffer(CaptureBuffer); - BaseSetLastNTError(Status); - return 0; - } - - /* Copy the returned target string into the user buffer */ + BaseSetLastNTError(ApiMessage.Status); + return 0; + } + memcpy(lpExeNameBuffer, GetAliasesExesRequest->ExeNames, GetAliasesExesRequest->Length); - /* Release the capture buffer and exit */ CsrFreeCaptureBuffer(CaptureBuffer); return GetAliasesExesRequest->Length; +} + +/* + * @implemented + */ +DWORD +WINAPI +GetConsoleAliasExesW(LPWSTR lpExeNameBuffer, + DWORD ExeNameBufferLength) +{ + return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, TRUE); } @@ -529,46 +534,26 @@ GetConsoleAliasExesA(LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) { - LPWSTR lpwExeNameBuffer; - DWORD dwResult; - - DPRINT("GetConsoleAliasExesA entered\n"); - - lpwExeNameBuffer = HeapAlloc(GetProcessHeap(), 0, ExeNameBufferLength * sizeof(WCHAR)); - - dwResult = GetConsoleAliasExesW(lpwExeNameBuffer, ExeNameBufferLength * sizeof(WCHAR)); - - if (dwResult) - dwResult = WideCharToMultiByte(CP_ACP, 0, lpwExeNameBuffer, dwResult / sizeof(WCHAR), lpExeNameBuffer, ExeNameBufferLength, NULL, NULL); - - HeapFree(GetProcessHeap(), 0, lpwExeNameBuffer); - return dwResult; -} - - -/* - * @implemented - */ -DWORD -WINAPI -GetConsoleAliasExesLengthW(VOID) -{ - NTSTATUS Status; + return IntGetConsoleAliasExes(lpExeNameBuffer, ExeNameBufferLength, FALSE); +} + + +static DWORD +IntGetConsoleAliasExesLength(BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &ApiMessage.Data.GetAliasesExesLengthRequest; - DPRINT("GetConsoleAliasExesLengthW entered\n"); - - GetAliasesExesLengthRequest->Length = 0; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExesLength), - sizeof(CONSOLE_GETALIASESEXESLENGTH)); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + GetAliasesExesLengthRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetAliasesExesLengthRequest->Unicode = bUnicode; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetAliasExesLength), + sizeof(*GetAliasesExesLengthRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return 0; } @@ -581,18 +566,20 @@ */ DWORD WINAPI +GetConsoleAliasExesLengthW(VOID) +{ + return IntGetConsoleAliasExesLength(TRUE); +} + + +/* + * @implemented + */ +DWORD +WINAPI GetConsoleAliasExesLengthA(VOID) { - DWORD dwLength; - - DPRINT("GetConsoleAliasExesLengthA entered\n"); - - dwLength = GetConsoleAliasExesLengthW(); - - if (dwLength) - dwLength /= sizeof(WCHAR); - - return dwLength; + return IntGetConsoleAliasExesLength(FALSE); } /* EOF */ Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/console.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/console.c [iso-8859-1] Thu May 8 18:08:07 2014 @@ -1496,18 +1496,17 @@ static BOOL IntScrollConsoleScreenBuffer(HANDLE hConsoleOutput, - const SMALL_RECT *lpScrollRectangle, - const SMALL_RECT *lpClipRectangle, + CONST SMALL_RECT* lpScrollRectangle, + CONST SMALL_RECT* lpClipRectangle, COORD dwDestinationOrigin, - const CHAR_INFO *lpFill, + CONST CHAR_INFO* lpFill, BOOL bUnicode) { - NTSTATUS Status; CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_SCROLLSCREENBUFFER ScrollScreenBufferRequest = &ApiMessage.Data.ScrollScreenBufferRequest; - ScrollScreenBufferRequest->OutputHandle = hConsoleOutput; - ScrollScreenBufferRequest->Unicode = bUnicode; + ScrollScreenBufferRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ScrollScreenBufferRequest->OutputHandle = hConsoleOutput; ScrollScreenBufferRequest->ScrollRectangle = *lpScrollRectangle; if (lpClipRectangle != NULL) @@ -1521,16 +1520,16 @@ } ScrollScreenBufferRequest->DestinationOrigin = dwDestinationOrigin; - ScrollScreenBufferRequest->Fill = *lpFill; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - NULL, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepScrollScreenBuffer), - sizeof(CONSOLE_SCROLLSCREENBUFFER)); - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + ScrollScreenBufferRequest->Fill = *lpFill; + ScrollScreenBufferRequest->Unicode = bUnicode; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepScrollScreenBuffer), + sizeof(*ScrollScreenBufferRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -1546,16 +1545,16 @@ BOOL WINAPI ScrollConsoleScreenBufferA(HANDLE hConsoleOutput, - CONST SMALL_RECT *lpScrollRectangle, - CONST SMALL_RECT *lpClipRectangle, + CONST SMALL_RECT* lpScrollRectangle, + CONST SMALL_RECT* lpClipRectangle, COORD dwDestinationOrigin, - CONST CHAR_INFO *lpFill) + CONST CHAR_INFO* lpFill) { return IntScrollConsoleScreenBuffer(hConsoleOutput, - (PSMALL_RECT)lpScrollRectangle, - (PSMALL_RECT)lpClipRectangle, + lpScrollRectangle, + lpClipRectangle, dwDestinationOrigin, - (PCHAR_INFO)lpFill, + lpFill, FALSE); } Modified: branches/condrv_restructure/dll/win32/kernel32/client/console/history.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… ============================================================================== --- branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] (original) +++ branches/condrv_restructure/dll/win32/kernel32/client/console/history.c [iso-8859-1] Thu May 8 18:08:07 2014 @@ -16,13 +16,14 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#if 0 /* Get the size needed to copy a string to a capture buffer, including alignment */ static ULONG IntStringSize(LPCVOID String, BOOL Unicode) { ULONG Size = (Unicode ? wcslen(String) : strlen(String)) * sizeof(WCHAR); - return (Size + 3) & -4; + return (Size + 3) & ~3; } @@ -48,67 +49,77 @@ } RequestString->Length = RequestString->MaximumLength = (USHORT)Size; } - - -static BOOL -IntExpungeConsoleCommandHistory(LPCVOID lpExeName, BOOL bUnicode) -{ - NTSTATUS Status; +#endif + +static VOID +IntExpungeConsoleCommandHistory(LPCVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest = &ApiMessage.Data.ExpungeCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - if (lpExeName == NULL || !(bUnicode ? *(PWCHAR)lpExeName : *(PCHAR)lpExeName)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + if (lpExeName == NULL || dwNumChars == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + + ExpungeCommandHistoryRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + ExpungeCommandHistoryRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + ExpungeCommandHistoryRequest->Unicode = + ExpungeCommandHistoryRequest->Unicode2 = bUnicode; + + // CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + CaptureBuffer = CsrAllocateCaptureBuffer(1, ExpungeCommandHistoryRequest->ExeLength); if (!CaptureBuffer) { DPRINT1("CsrAllocateCaptureBuffer failed!\n"); SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, - &ExpungeCommandHistoryRequest->ExeName); - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepExpungeCommandHistory), - sizeof(CONSOLE_EXPUNGECOMMANDHISTORY)); + return; + } + + // IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, + // &ExpungeCommandHistoryRequest->ExeName); + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpExeName, + ExpungeCommandHistoryRequest->ExeLength, + (PVOID)&ExpungeCommandHistoryRequest->ExeName); + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepExpungeCommandHistory), + sizeof(*ExpungeCommandHistoryRequest)); CsrFreeCaptureBuffer(CaptureBuffer); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + if (!NT_SUCCESS(ApiMessage.Status)) + BaseSetLastNTError(ApiMessage.Status); } static DWORD -IntGetConsoleCommandHistory(LPVOID lpHistory, DWORD cbHistory, LPCVOID lpExeName, BOOL bUnicode) -{ - NTSTATUS Status; +IntGetConsoleCommandHistory(LPVOID lpHistory, DWORD cbHistory, LPCVOID lpExeName, DWORD dwNumChars, BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &ApiMessage.Data.GetCommandHistoryRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - DWORD HistoryLength = cbHistory * (bUnicode ? 1 : sizeof(WCHAR)); - - if (lpExeName == NULL || !(bUnicode ? *(PWCHAR)lpExeName : *(PCHAR)lpExeName)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - CaptureBuffer = CsrAllocateCaptureBuffer(2, IntStringSize(lpExeName, bUnicode) + - HistoryLength); + + if (lpExeName == NULL || dwNumChars == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + GetCommandHistoryRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetCommandHistoryRequest->HistoryLength = cbHistory; + GetCommandHistoryRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetCommandHistoryRequest->Unicode = + GetCommandHistoryRequest->Unicode2 = bUnicode; + + // CaptureBuffer = CsrAllocateCaptureBuffer(2, IntStringSize(lpExeName, bUnicode) + + // HistoryLength); + CaptureBuffer = CsrAllocateCaptureBuffer(2, GetCommandHistoryRequest->ExeLength + + GetCommandHistoryRequest->HistoryLength); if (!CaptureBuffer) { DPRINT1("CsrAllocateCaptureBuffer failed!\n"); @@ -116,60 +127,58 @@ return 0; } - IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, - &GetCommandHistoryRequest->ExeName); - GetCommandHistoryRequest->Length = HistoryLength; - CsrAllocateMessagePointer(CaptureBuffer, HistoryLength, + // IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, + // &GetCommandHistoryRequest->ExeName); + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpExeName, + GetCommandHistoryRequest->ExeLength, + (PVOID)&GetCommandHistoryRequest->ExeName); + + // CsrAllocateMessagePointer(CaptureBuffer, HistoryLength, + CsrAllocateMessagePointer(CaptureBuffer, GetCommandHistoryRequest->HistoryLength, (PVOID*)&GetCommandHistoryRequest->History); - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCommandHistory), - sizeof(CONSOLE_GETCOMMANDHISTORY)); - if (!NT_SUCCESS(Status)) + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCommandHistory), + sizeof(*GetCommandHistoryRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) { CsrFreeCaptureBuffer(CaptureBuffer); - BaseSetLastNTError(Status); - return 0; - } - - if (bUnicode) - { - memcpy(lpHistory, - GetCommandHistoryRequest->History, - GetCommandHistoryRequest->Length); - } - else - { - WideCharToMultiByte(CP_ACP, 0, - GetCommandHistoryRequest->History, - GetCommandHistoryRequest->Length / sizeof(WCHAR), - lpHistory, - cbHistory, - NULL, NULL); - } + BaseSetLastNTError(ApiMessage.Status); + return 0; + } + + memcpy(lpHistory, + GetCommandHistoryRequest->History, + GetCommandHistoryRequest->HistoryLength); CsrFreeCaptureBuffer(CaptureBuffer); - return GetCommandHistoryRequest->Length; + return GetCommandHistoryRequest->HistoryLength; } static DWORD -IntGetConsoleCommandHistoryLength(LPCVOID lpExeName, BOOL bUnicode) -{ - NTSTATUS Status; +IntGetConsoleCommandHistoryLength(LPCVOID lpExeName, DWORD dwNumChars, BOOL bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &ApiMessage.Data.GetCommandHistoryLengthRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - if (lpExeName == NULL || !(bUnicode ? *(PWCHAR)lpExeName : *(PCHAR)lpExeName)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - - CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + if (lpExeName == NULL || dwNumChars == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + GetCommandHistoryLengthRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + GetCommandHistoryLengthRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + GetCommandHistoryLengthRequest->Unicode = + GetCommandHistoryLengthRequest->Unicode2 = bUnicode; + + // CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + CaptureBuffer = CsrAllocateCaptureBuffer(1, GetCommandHistoryLengthRequest->ExeLength); if (!CaptureBuffer) { DPRINT1("CsrAllocateCaptureBuffer failed!\n"); @@ -177,43 +186,54 @@ return 0; } - IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, - &GetCommandHistoryLengthRequest->ExeName); - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCommandHistoryLength), - sizeof(CONSOLE_GETCOMMANDHISTORYLENGTH)); + // IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, + // &GetCommandHistoryLengthRequest->ExeName); + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpExeName, + GetCommandHistoryLengthRequest->ExeLength, + (PVOID)&GetCommandHistoryLengthRequest->ExeName); + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepGetCommandHistoryLength), + sizeof(*GetCommandHistoryLengthRequest)); CsrFreeCaptureBuffer(CaptureBuffer); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return 0; - } - - return GetCommandHistoryLengthRequest->Length; + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return 0; + } + + return GetCommandHistoryLengthRequest->HistoryLength; } static BOOL IntSetConsoleNumberOfCommands(DWORD dwNumCommands, LPCVOID lpExeName, - BOOL bUnicode) -{ - NTSTATUS Status; + DWORD dwNumChars, + BOOLEAN bUnicode) +{ CONSOLE_API_MESSAGE ApiMessage; PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest = &ApiMessage.Data.SetHistoryNumberCommandsRequest; PCSR_CAPTURE_BUFFER CaptureBuffer; - if (lpExeName == NULL || !(bUnicode ? *(PWCHAR)lpExeName : *(PCHAR)lpExeName)) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + if (lpExeName == NULL || dwNumChars == 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + SetHistoryNumberCommandsRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetHistoryNumberCommandsRequest->NumCommands = dwNumCommands; + SetHistoryNumberCommandsRequest->ExeLength = dwNumChars * (bUnicode ? sizeof(WCHAR) : sizeof(CHAR)); + SetHistoryNumberCommandsRequest->Unicode = + SetHistoryNumberCommandsRequest->Unicode2 = bUnicode; + + // CaptureBuffer = CsrAllocateCaptureBuffer(1, IntStringSize(lpExeName, bUnicode)); + CaptureBuffer = CsrAllocateCaptureBuffer(1, SetHistoryNumberCommandsRequest->ExeLength); if (!CaptureBuffer) { DPRINT1("CsrAllocateCaptureBuffer failed!\n"); @@ -221,20 +241,23 @@ return FALSE; } - IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, - &SetHistoryNumberCommandsRequest->ExeName); - SetHistoryNumberCommandsRequest->NumCommands = dwNumCommands; - - Status = CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, - CaptureBuffer, - CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetNumberOfCommands), - sizeof(CONSOLE_SETHISTORYNUMBERCOMMANDS)); + // IntCaptureMessageString(CaptureBuffer, lpExeName, bUnicode, + // &SetHistoryNumberCommandsRequest->ExeName); + CsrCaptureMessageBuffer(CaptureBuffer, + (PVOID)lpExeName, + SetHistoryNumberCommandsRequest->ExeLength, + (PVOID)&SetHistoryNumberCommandsRequest->ExeName); + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + CaptureBuffer, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetNumberOfCommands), + sizeof(*SetHistoryNumberCommandsRequest)); CsrFreeCaptureBuffer(CaptureBuffer); - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); return FALSE; } @@ -247,22 +270,34 @@ /* * @implemented (Undocumented) */ -BOOL +VOID WINAPI ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName) { - return IntExpungeConsoleCommandHistory(lpExeName, TRUE); -} - - -/* - * @implemented (Undocumented) - */ -BOOL + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + + IntExpungeConsoleCommandHistory(lpExeName, wcslen(lpExeName), TRUE); +} + + +/* + * @implemented (Undocumented) + */ +VOID WINAPI ExpungeConsoleCommandHistoryA(LPCSTR lpExeName) { - return IntExpungeConsoleCommandHistory(lpExeName, FALSE); + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + + IntExpungeConsoleCommandHistory(lpExeName, strlen(lpExeName), FALSE); } @@ -275,7 +310,13 @@ DWORD cbHistory, LPCWSTR lpExeName) { - return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, TRUE); + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, wcslen(lpExeName), TRUE); } @@ -288,7 +329,13 @@ DWORD cbHistory, LPCSTR lpExeName) { - return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, FALSE); + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleCommandHistory(lpHistory, cbHistory, lpExeName, strlen(lpExeName), FALSE); } @@ -299,7 +346,13 @@ WINAPI GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName) { - return IntGetConsoleCommandHistoryLength(lpExeName, TRUE); + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleCommandHistoryLength(lpExeName, wcslen(lpExeName), TRUE); } @@ -310,7 +363,13 @@ WINAPI GetConsoleCommandHistoryLengthA(LPCSTR lpExeName) { - return IntGetConsoleCommandHistoryLength(lpExeName, FALSE) / sizeof(WCHAR); + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + + return IntGetConsoleCommandHistoryLength(lpExeName, strlen(lpExeName), FALSE); } @@ -320,33 +379,60 @@ BOOL WINAPI SetConsoleNumberOfCommandsW(DWORD dwNumCommands, + LPCWSTR lpExeName) +{ + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, wcslen(lpExeName), TRUE); +} + + +/* + * @implemented (Undocumented) + */ +BOOL +WINAPI +SetConsoleNumberOfCommandsA(DWORD dwNumCommands, LPCSTR lpExeName) { - return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, TRUE); -} - - -/* - * @implemented (Undocumented) + if (lpExeName == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, strlen(lpExeName), FALSE); +} + + +/* + * @implemented */ BOOL WINAPI -SetConsoleNumberOfCommandsA(DWORD dwNumCommands, - LPCWSTR lpExeName) -{ - return IntSetConsoleNumberOfCommands(dwNumCommands, lpExeName, FALSE); -} - - -/* - * @unimplemented - */ -BOOL -WINAPI SetConsoleCommandHistoryMode(IN DWORD dwMode) { - STUB; - return FALSE; + CONSOLE_API_MESSAGE ApiMessage; + PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &ApiMessage.Data.SetHistoryModeRequest; + + SetHistoryModeRequest->ConsoleHandle = NtCurrentPeb()->ProcessParameters->ConsoleHandle; + SetHistoryModeRequest->Mode = dwMode; + + CsrClientCallServer((PCSR_API_MESSAGE)&ApiMessage, + NULL, + CSR_CREATE_API_NUMBER(CONSRV_SERVERDLL_INDEX, ConsolepSetCommandHistoryMode), + sizeof(*SetHistoryModeRequest)); + if (!NT_SUCCESS(ApiMessage.Status)) + { + BaseSetLastNTError(ApiMessage.Status); + return FALSE; + } + + return TRUE; } /* EOF */ Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… ============================================================================== --- branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] (original) +++ branches/condrv_restructure/include/reactos/subsys/win/conmsg.h [iso-8859-1] Thu May 8 18:08:07 2014 @@ -701,20 +701,35 @@ typedef struct { - UNICODE_STRING ExeName; - PWCHAR History; - DWORD Length; + HANDLE ConsoleHandle; + ULONG HistoryLength; + PVOID History; + // UNICODE_STRING ExeName; + USHORT ExeLength; + PVOID ExeName; + BOOLEAN Unicode; + BOOLEAN Unicode2; } CONSOLE_GETCOMMANDHISTORY, *PCONSOLE_GETCOMMANDHISTORY; typedef struct { - UNICODE_STRING ExeName; - DWORD Length; + HANDLE ConsoleHandle; + ULONG HistoryLength; + // UNICODE_STRING ExeName; + USHORT ExeLength; + PVOID ExeName; + BOOLEAN Unicode; + BOOLEAN Unicode2; } CONSOLE_GETCOMMANDHISTORYLENGTH, *PCONSOLE_GETCOMMANDHISTORYLENGTH; typedef struct { - UNICODE_STRING ExeName; + HANDLE ConsoleHandle; + // UNICODE_STRING ExeName; + USHORT ExeLength; + PVOID ExeName; + BOOLEAN Unicode; + BOOLEAN Unicode2; } CONSOLE_EXPUNGECOMMANDHISTORY, *PCONSOLE_EXPUNGECOMMANDHISTORY; typedef struct @@ -726,8 +741,13 @@ typedef struct { - UNICODE_STRING ExeName; - DWORD NumCommands; + HANDLE ConsoleHandle; + ULONG NumCommands; + // UNICODE_STRING ExeName; + USHORT ExeLength; + PVOID ExeName; + BOOLEAN Unicode; + BOOLEAN Unicode2; } CONSOLE_SETHISTORYNUMBERCOMMANDS, *PCONSOLE_SETHISTORYNUMBERCOMMANDS; typedef struct Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/alias.c [iso-8859-1] Thu May 8 18:08:07 2014 @@ -483,6 +483,7 @@ CSR_API(SrvGetConsoleAliasesLength) { + NTSTATUS Status; PCONSOLE_GETALLALIASESLENGTH GetAllAliasesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAllAliasesLengthRequest; PCONSOLE Console; PALIAS_HEADER Header; @@ -496,28 +497,34 @@ return STATUS_INVALID_PARAMETER; } - if (GetAllAliasesLengthRequest->ExeName == NULL) - { - return STATUS_INVALID_PARAMETER; - } - - ApiMessage->Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); - if (!NT_SUCCESS(ApiMessage->Status)) - { - return ApiMessage->Status; - } + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME!! Convert GetAllAliasesLengthRequest->ExeName into UNICODE if Unicode2 is FALSE + // and make use of GetAllAliasesLengthRequest->ExeLength Header = IntFindAliasHeader(Console->Aliases, GetAllAliasesLengthRequest->ExeName); - if (!Header) - { - ConSrvReleaseConsole(Console, TRUE); - return STATUS_INVALID_PARAMETER; - } - - Length = IntGetAllConsoleAliasesLength(Header); - GetAllAliasesLengthRequest->Length = Length; + if (Header) + { + Length = IntGetAllConsoleAliasesLength(Header); + GetAllAliasesLengthRequest->Length = Length; + + /* + * Quick and dirty way of getting the number of bytes of the + * corresponding ANSI string from the one in UNICODE. + */ + if (!GetAllAliasesLengthRequest->Unicode) + GetAllAliasesLengthRequest->Length /= sizeof(WCHAR); + + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + ConSrvReleaseConsole(Console, TRUE); - return STATUS_SUCCESS; + return Status; } CSR_API(SrvGetConsoleAliasExes) @@ -530,7 +537,7 @@ DPRINT("SrvGetConsoleAliasExes entered\n"); if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID)&GetAliasesExesRequest->ExeNames, + (PVOID*)&GetAliasesExesRequest->ExeNames, GetAliasesExesRequest->Length, sizeof(BYTE))) { @@ -568,17 +575,24 @@ CSR_API(SrvGetConsoleAliasExesLength) { + NTSTATUS Status; PCONSOLE_GETALIASESEXESLENGTH GetAliasesExesLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetAliasesExesLengthRequest; PCONSOLE Console; - DPRINT("SrvGetConsoleAliasExesLength entered\n"); - - ApiMessage->Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); - if (NT_SUCCESS(ApiMessage->Status)) - { - GetAliasesExesLengthRequest->Length = IntGetConsoleAliasesExesLength(Console->Aliases); - ConSrvReleaseConsole(Console, TRUE); - } - return ApiMessage->Status; + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + GetAliasesExesLengthRequest->Length = IntGetConsoleAliasesExesLength(Console->Aliases); + + /* + * Quick and dirty way of getting the number of bytes of the + * corresponding ANSI string from the one in UNICODE. + */ + if (!GetAliasesExesLengthRequest->Unicode) + GetAliasesExesLengthRequest->Length /= sizeof(WCHAR); + + ConSrvReleaseConsole(Console, TRUE); + return Status; } /* EOF */ Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… ============================================================================== --- branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] (original) +++ branches/condrv_restructure/win32ss/user/winsrv/consrv/lineinput.c [iso-8859-1] Thu May 8 18:08:07 2014 @@ -455,158 +455,193 @@ CSR_API(SrvGetConsoleCommandHistory) { + NTSTATUS Status; PCONSOLE_GETCOMMANDHISTORY GetCommandHistoryRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; - NTSTATUS Status; PHISTORY_BUFFER Hist; + UNICODE_STRING ExeName; PBYTE Buffer = (PBYTE)GetCommandHistoryRequest->History; - ULONG BufferSize = GetCommandHistoryRequest->Length; + ULONG BufferSize = GetCommandHistoryRequest->HistoryLength; UINT i; if ( !CsrValidateMessageBuffer(ApiMessage, (PVOID*)&GetCommandHistoryRequest->History, - GetCommandHistoryRequest->Length, + GetCommandHistoryRequest->HistoryLength, sizeof(BYTE)) || !CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&GetCommandHistoryRequest->ExeName.Buffer, - GetCommandHistoryRequest->ExeName.Length, + (PVOID*)&GetCommandHistoryRequest->ExeName, + GetCommandHistoryRequest->ExeLength, sizeof(BYTE)) ) { return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &GetCommandHistoryRequest->ExeName); - if (Hist) - { - for (i = 0; i < Hist->NumEntries; i++) + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME: convert to UNICODE if Unicode(2) == FALSE + ExeName.Length = ExeName.MaximumLength = GetCommandHistoryRequest->ExeLength; + ExeName.Buffer = GetCommandHistoryRequest->ExeName; + + Hist = HistoryFindBuffer(Console, &ExeName); + if (Hist) + { + for (i = 0; i < Hist->NumEntries; i++) + { + if (BufferSize < (Hist->Entries[i].Length + sizeof(WCHAR))) { - if (BufferSize < (Hist->Entries[i].Length + sizeof(WCHAR))) - { - Status = STATUS_BUFFER_OVERFLOW; - break; - } - memcpy(Buffer, Hist->Entries[i].Buffer, Hist->Entries[i].Length); - Buffer += Hist->Entries[i].Length; - *(PWCHAR)Buffer = L'\0'; - Buffer += sizeof(WCHAR); + Status = STATUS_BUFFER_OVERFLOW; + break; } - } - GetCommandHistoryRequest->Length = Buffer - (PBYTE)GetCommandHistoryRequest->History; - ConSrvReleaseConsole(Console, TRUE); - } + // FIXME: convert to UNICODE if Unicode == FALSE + memcpy(Buffer, Hist->Entries[i].Buffer, Hist->Entries[i].Length); + Buffer += Hist->Entries[i].Length; + *(PWCHAR)Buffer = L'\0'; + Buffer += sizeof(WCHAR); + + // { + // WideCharToMultiByte(CP_ACP, 0, + // GetCommandHistoryRequest->History, + // GetCommandHistoryRequest->HistoryLength / sizeof(WCHAR), + // lpHistory, + // cbHistory, + // NULL, NULL); + // } + + } + } + // FIXME: convert to UNICODE if Unicode == FALSE + GetCommandHistoryRequest->HistoryLength = Buffer - (PBYTE)GetCommandHistoryRequest->History; + + ConSrvReleaseConsole(Console, TRUE); return Status; } CSR_API(SrvGetConsoleCommandHistoryLength) { + NTSTATUS Status; PCONSOLE_GETCOMMANDHISTORYLENGTH GetCommandHistoryLengthRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.GetCommandHistoryLengthRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; - NTSTATUS Status; PHISTORY_BUFFER Hist; + UNICODE_STRING ExeName; ULONG Length = 0; UINT i; if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&GetCommandHistoryLengthRequest->ExeName.Buffer, - GetCommandHistoryLengthRequest->ExeName.Length, + (PVOID*)&GetCommandHistoryLengthRequest->ExeName, + GetCommandHistoryLengthRequest->ExeLength, sizeof(BYTE))) { return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &GetCommandHistoryLengthRequest->ExeName); - if (Hist) - { - for (i = 0; i < Hist->NumEntries; i++) - Length += Hist->Entries[i].Length + sizeof(WCHAR); - } - GetCommandHistoryLengthRequest->Length = Length; - ConSrvReleaseConsole(Console, TRUE); - } + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME: convert to UNICODE if Unicode(2) == FALSE + ExeName.Length = ExeName.MaximumLength = GetCommandHistoryLengthRequest->ExeLength; + ExeName.Buffer = GetCommandHistoryLengthRequest->ExeName; + + Hist = HistoryFindBuffer(Console, &ExeName); + if (Hist) + { + for (i = 0; i < Hist->NumEntries; i++) + Length += Hist->Entries[i].Length + sizeof(WCHAR); + } + GetCommandHistoryLengthRequest->HistoryLength = Length; + + /* + * Quick and dirty way of getting the number of bytes of the + * corresponding ANSI string from the one in UNICODE. + */ + if (!GetCommandHistoryLengthRequest->Unicode) + GetCommandHistoryLengthRequest->HistoryLength /= sizeof(WCHAR); + + ConSrvReleaseConsole(Console, TRUE); return Status; } CSR_API(SrvExpungeConsoleCommandHistory) { + NTSTATUS Status; PCONSOLE_EXPUNGECOMMANDHISTORY ExpungeCommandHistoryRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.ExpungeCommandHistoryRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; PHISTORY_BUFFER Hist; + UNICODE_STRING ExeName; + + if (!CsrValidateMessageBuffer(ApiMessage, + (PVOID*)&ExpungeCommandHistoryRequest->ExeName, + ExpungeCommandHistoryRequest->ExeLength, + sizeof(BYTE))) + { + return STATUS_INVALID_PARAMETER; + } + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME: convert to UNICODE if Unicode(2) == FALSE + ExeName.Length = ExeName.MaximumLength = ExpungeCommandHistoryRequest->ExeLength; + ExeName.Buffer = ExpungeCommandHistoryRequest->ExeName; + + Hist = HistoryFindBuffer(Console, &ExeName); + HistoryDeleteBuffer(Hist); + + ConSrvReleaseConsole(Console, TRUE); + return Status; +} + +CSR_API(SrvSetConsoleNumberOfCommands) +{ NTSTATUS Status; - - if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&ExpungeCommandHistoryRequest->ExeName.Buffer, - ExpungeCommandHistoryRequest->ExeName.Length, - sizeof(BYTE))) - { - return STATUS_INVALID_PARAMETER; - } - - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &ExpungeCommandHistoryRequest->ExeName); - HistoryDeleteBuffer(Hist); - ConSrvReleaseConsole(Console, TRUE); - } - return Status; -} - -CSR_API(SrvSetConsoleNumberOfCommands) -{ PCONSOLE_SETHISTORYNUMBERCOMMANDS SetHistoryNumberCommandsRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryNumberCommandsRequest; - PCONSOLE_PROCESS_DATA ProcessData = ConsoleGetPerProcessData(CsrGetClientThread()->Process); PCONSOLE Console; PHISTORY_BUFFER Hist; - NTSTATUS Status; UINT MaxEntries = SetHistoryNumberCommandsRequest->NumCommands; + UNICODE_STRING ExeName; PUNICODE_STRING OldEntryList, NewEntryList; if (!CsrValidateMessageBuffer(ApiMessage, - (PVOID*)&SetHistoryNumberCommandsRequest->ExeName.Buffer, - SetHistoryNumberCommandsRequest->ExeName.Length, + (PVOID*)&SetHistoryNumberCommandsRequest->ExeName, + SetHistoryNumberCommandsRequest->ExeLength, sizeof(BYTE))) { return STATUS_INVALID_PARAMETER; } - Status = ConSrvGetConsole(ProcessData, &Console, TRUE); - if (NT_SUCCESS(Status)) - { - Hist = HistoryFindBuffer(Console, &SetHistoryNumberCommandsRequest->ExeName); - if (Hist) - { - OldEntryList = Hist->Entries; - NewEntryList = ConsoleAllocHeap(0, MaxEntries * sizeof(UNICODE_STRING)); - if (!NewEntryList) + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + // FIXME: convert to UNICODE if Unicode(2) == FALSE + ExeName.Length = ExeName.MaximumLength = SetHistoryNumberCommandsRequest->ExeLength; + ExeName.Buffer = SetHistoryNumberCommandsRequest->ExeName; + + Hist = HistoryFindBuffer(Console, &ExeName); + if (Hist) + { + OldEntryList = Hist->Entries; + NewEntryList = ConsoleAllocHeap(0, MaxEntries * sizeof(UNICODE_STRING)); + if (!NewEntryList) + { + Status = STATUS_NO_MEMORY; + } + else + { + /* If necessary, shrink by removing oldest entries */ + for (; Hist->NumEntries > MaxEntries; Hist->NumEntries--) { - Status = STATUS_NO_MEMORY; + RtlFreeUnicodeString(Hist->Entries++); + Hist->Position += (Hist->Position == 0); } - else - { - /* If necessary, shrink by removing oldest entries */ - for (; Hist->NumEntries > MaxEntries; Hist->NumEntries--) - { - RtlFreeUnicodeString(Hist->Entries++); - Hist->Position += (Hist->Position == 0); - } - - Hist->MaxEntries = MaxEntries; - Hist->Entries = memcpy(NewEntryList, Hist->Entries, - Hist->NumEntries * sizeof(UNICODE_STRING)); - ConsoleFreeHeap(OldEntryList); - } - } - ConSrvReleaseConsole(Console, TRUE); - } + + Hist->MaxEntries = MaxEntries; + Hist->Entries = memcpy(NewEntryList, Hist->Entries, + Hist->NumEntries * sizeof(UNICODE_STRING)); + ConsoleFreeHeap(OldEntryList); + } + } + + ConSrvReleaseConsole(Console, TRUE); return Status; } @@ -642,8 +677,21 @@ CSR_API(SrvSetConsoleCommandHistoryMode) { - DPRINT1("%s not yet implemented\n", __FUNCTION__); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + PCONSOLE_SETHISTORYMODE SetHistoryModeRequest = &((PCONSOLE_API_MESSAGE)ApiMessage)->Data.SetHistoryModeRequest; + PCONSOLE Console; + + DPRINT1("SrvSetConsoleCommandHistoryMode(Mode = %d) is not yet implemented\n", + SetHistoryModeRequest->Mode); + + Status = ConSrvGetConsole(ConsoleGetPerProcessData(CsrGetClientThread()->Process), &Console, TRUE); + if (!NT_SUCCESS(Status)) return Status; + + /* This API is not yet implemented */ + Status = STATUS_NOT_IMPLEMENTED; + + ConSrvReleaseConsole(Console, TRUE); + return Status; } /* EOF */

1 0

[hbelusca] 63193: Sync with trunk r63192.
by hbelusca＠svn.reactos.org 08 May '14

08 May '14

Author: hbelusca Date: Thu May 8 14:40:52 2014 New Revision: 63193 URL: http://svn.reactos.org/svn/reactos?rev=63193&view=rev Log: Sync with trunk r63192. Added: branches/condrv_restructure/include/ddk/isvbop.h - copied unchanged from r63184, trunk/reactos/include/ddk/isvbop.h branches/condrv_restructure/include/ddk/isvbop.inc - copied unchanged from r63184, trunk/reactos/include/ddk/isvbop.inc branches/condrv_restructure/include/ddk/nt_vdd.h - copied unchanged from r63184, trunk/reactos/include/ddk/nt_vdd.h branches/condrv_restructure/include/ddk/vddsvc.h - copied unchanged from r63184, trunk/reactos/include/ddk/vddsvc.h branches/condrv_restructure/include/reactos/libs/fast486/ - copied from r63184, trunk/reactos/include/reactos/libs/fast486/ branches/condrv_restructure/include/reactos/subsys/win/vdm.h - copied unchanged from r63184, trunk/reactos/include/reactos/subsys/win/vdm.h branches/condrv_restructure/lib/fast486/ - copied from r63184, trunk/reactos/lib/fast486/ branches/condrv_restructure/subsystems/ntvdm/bios/ (props changed) - copied from r63184, trunk/reactos/subsystems/ntvdm/bios/ branches/condrv_restructure/subsystems/ntvdm/bop.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/bop.c branches/condrv_restructure/subsystems/ntvdm/bop.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/bop.h branches/condrv_restructure/subsystems/ntvdm/callback.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/callback.c branches/condrv_restructure/subsystems/ntvdm/callback.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/callback.h branches/condrv_restructure/subsystems/ntvdm/clock.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/clock.c branches/condrv_restructure/subsystems/ntvdm/clock.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/clock.h branches/condrv_restructure/subsystems/ntvdm/dos/ (props changed) - copied from r63184, trunk/reactos/subsystems/ntvdm/dos/ branches/condrv_restructure/subsystems/ntvdm/emulator.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/emulator.c branches/condrv_restructure/subsystems/ntvdm/emulator.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/emulator.h branches/condrv_restructure/subsystems/ntvdm/hardware/ (props changed) - copied from r63184, trunk/reactos/subsystems/ntvdm/hardware/ branches/condrv_restructure/subsystems/ntvdm/int32.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/int32.c branches/condrv_restructure/subsystems/ntvdm/int32.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/int32.h branches/condrv_restructure/subsystems/ntvdm/io.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/io.c branches/condrv_restructure/subsystems/ntvdm/io.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/io.h branches/condrv_restructure/subsystems/ntvdm/lang/cs-CZ.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/cs-CZ.rc branches/condrv_restructure/subsystems/ntvdm/lang/de-DE.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/de-DE.rc branches/condrv_restructure/subsystems/ntvdm/lang/en-US.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/en-US.rc branches/condrv_restructure/subsystems/ntvdm/lang/es-ES.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/es-ES.rc branches/condrv_restructure/subsystems/ntvdm/lang/fr-FR.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/fr-FR.rc branches/condrv_restructure/subsystems/ntvdm/lang/it-IT.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/it-IT.rc branches/condrv_restructure/subsystems/ntvdm/lang/pl-PL.rc - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc branches/condrv_restructure/subsystems/ntvdm/ntvdm.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/ntvdm.h branches/condrv_restructure/subsystems/ntvdm/ntvdm.spec - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/ntvdm.spec branches/condrv_restructure/subsystems/ntvdm/registers.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/registers.c branches/condrv_restructure/subsystems/ntvdm/registers.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/registers.h branches/condrv_restructure/subsystems/ntvdm/res/ (props changed) - copied from r63184, trunk/reactos/subsystems/ntvdm/res/ branches/condrv_restructure/subsystems/ntvdm/utils.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/utils.c branches/condrv_restructure/subsystems/ntvdm/utils.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/utils.h branches/condrv_restructure/subsystems/ntvdm/vddsup.c - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/vddsup.c branches/condrv_restructure/subsystems/ntvdm/vddsup.h - copied unchanged from r63184, trunk/reactos/subsystems/ntvdm/vddsup.h branches/condrv_restructure/subsystems/win/basesrv/vdm.h - copied unchanged from r63184, trunk/reactos/subsystems/win/basesrv/vdm.h Removed: branches/condrv_restructure/subsystems/ntvdm/lang/bg-BG.rc branches/condrv_restructure/subsystems/ntvdm/lang/hu-HU.rc branches/condrv_restructure/subsystems/ntvdm/lang/id-ID.rc branches/condrv_restructure/subsystems/ntvdm/lang/ja-JP.rc branches/condrv_restructure/subsystems/ntvdm/lang/no-NO.rc branches/condrv_restructure/subsystems/ntvdm/lang/pt-BR.rc branches/condrv_restructure/subsystems/ntvdm/lang/ro-RO.rc branches/condrv_restructure/subsystems/ntvdm/lang/ru-RU.rc branches/condrv_restructure/subsystems/ntvdm/lang/sk-SK.rc branches/condrv_restructure/subsystems/ntvdm/lang/th-TH.rc branches/condrv_restructure/subsystems/ntvdm/lang/uk-UA.rc branches/condrv_restructure/subsystems/ntvdm/lang/zh-CN.rc branches/condrv_restructure/subsystems/ntvdm/lang/zh-TW.rc Modified: branches/condrv_restructure/ (props changed) branches/condrv_restructure/base/applications/cmdutils/comp/comp.c branches/condrv_restructure/base/applications/mscutils/devmgmt/mainwnd.c branches/condrv_restructure/base/applications/network/ftp/cmds.c branches/condrv_restructure/base/applications/network/ipconfig/ipconfig.c branches/condrv_restructure/base/applications/network/telnet/src/ansiprsr.cpp branches/condrv_restructure/base/setup/usetup/partlist.c branches/condrv_restructure/base/setup/usetup/partlist.h branches/condrv_restructure/base/shell/cmd/cmd.c branches/condrv_restructure/boot/bootdata/hivedef.inf branches/condrv_restructure/cmake/gcc.cmake branches/condrv_restructure/cmake/msvc.cmake branches/condrv_restructure/configure.sh branches/condrv_restructure/dll/directx/wine/msdmo/dmoreg.c branches/condrv_restructure/dll/ntdll/CMakeLists.txt branches/condrv_restructure/dll/ntdll/csr/capture.c branches/condrv_restructure/dll/ntdll/def/ntdll.spec branches/condrv_restructure/dll/ntdll/ldr/ldrapi.c branches/condrv_restructure/dll/win32/beepmidi/beepmidi.c branches/condrv_restructure/dll/win32/kernel32/client/proc.c branches/condrv_restructure/dll/win32/kernel32/client/vdm.c branches/condrv_restructure/dll/win32/kernel32/include/vdm.h branches/condrv_restructure/dll/win32/kernel32/k32.h branches/condrv_restructure/dll/win32/kernel32/wine/actctx.c branches/condrv_restructure/dll/win32/msafd/msafd.h branches/condrv_restructure/dll/win32/netapi32/nbcmdqueue.h branches/condrv_restructure/dll/win32/netapi32/nbnamecache.h branches/condrv_restructure/dll/win32/netapi32/nbt.c branches/condrv_restructure/dll/win32/netapi32/netapi32.c branches/condrv_restructure/dll/win32/netapi32/netapi32.h branches/condrv_restructure/dll/win32/netapi32/netapi32.spec branches/condrv_restructure/dll/win32/netapi32/netbios.c branches/condrv_restructure/dll/win32/netapi32/netbios.h branches/condrv_restructure/dll/win32/netapi32/wksta.c branches/condrv_restructure/dll/win32/shlwapi/path.c branches/condrv_restructure/dll/win32/uxtheme/ncscrollbar.c branches/condrv_restructure/dll/win32/ws2help/context.c branches/condrv_restructure/drivers/base/bootvid/i386/vga.c branches/condrv_restructure/drivers/base/nmidebug/nmidebug.c branches/condrv_restructure/drivers/filesystems/npfs/npfs.h branches/condrv_restructure/drivers/input/i8042prt/i8042prt.c branches/condrv_restructure/drivers/input/i8042prt/mouse.c branches/condrv_restructure/drivers/input/i8042prt/pnp.c branches/condrv_restructure/hal/halx86/apic/apic.c branches/condrv_restructure/hal/halx86/apic/apic.h branches/condrv_restructure/hal/halx86/apic/rtctimer.c branches/condrv_restructure/hal/halx86/up/pic.c branches/condrv_restructure/include/ndk/rtlfuncs.h branches/condrv_restructure/include/reactos/kdros.h branches/condrv_restructure/include/reactos/libs/pseh/pseh3.h branches/condrv_restructure/include/reactos/subsys/win/conmsg.h branches/condrv_restructure/include/reactos/wine/port.h branches/condrv_restructure/lib/CMakeLists.txt branches/condrv_restructure/lib/rtl/actctx.c branches/condrv_restructure/lib/sdk/crt/include/internal/tls.h branches/condrv_restructure/lib/sdk/crt/signal/xcptinfo.c branches/condrv_restructure/media/doc/README.WINE branches/condrv_restructure/ntoskrnl/include/internal/i386/trap_x.h branches/condrv_restructure/ntoskrnl/mm/section.c branches/condrv_restructure/subsystems/CMakeLists.txt branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt branches/condrv_restructure/subsystems/ntvdm/dos/dos32krnl/ (props changed) branches/condrv_restructure/subsystems/ntvdm/ntvdm.c branches/condrv_restructure/subsystems/ntvdm/ntvdm.rc branches/condrv_restructure/subsystems/ntvdm/resource.h branches/condrv_restructure/subsystems/win/basesrv/basesrv.h branches/condrv_restructure/subsystems/win/basesrv/init.c branches/condrv_restructure/subsystems/win/basesrv/proc.c branches/condrv_restructure/subsystems/win/basesrv/vdm.c branches/condrv_restructure/subsystems/win32/csrsrv/procsup.c branches/condrv_restructure/tools/pipetools/piperead.cpp branches/condrv_restructure/win32ss/drivers/font/bmfd/glyph.c branches/condrv_restructure/win32ss/gdi/eng/pdevobj.c branches/condrv_restructure/win32ss/gdi/eng/surface.h branches/condrv_restructure/win32ss/gdi/eng/xlateobj.h branches/condrv_restructure/win32ss/gdi/gdi32/gdi32.spec branches/condrv_restructure/win32ss/gdi/ntgdi/brush.h branches/condrv_restructure/win32ss/gdi/ntgdi/coord.h branches/condrv_restructure/win32ss/gdi/ntgdi/dc.h branches/condrv_restructure/win32ss/gdi/ntgdi/freetype.c branches/condrv_restructure/win32ss/gdi/ntgdi/palette.h branches/condrv_restructure/win32ss/gdi/ntgdi/rect.h branches/condrv_restructure/win32ss/gdi/ntgdi/text.h branches/condrv_restructure/win32ss/include/ntuser.h branches/condrv_restructure/win32ss/user/ntuser/accelerator.c branches/condrv_restructure/win32ss/user/ntuser/clipboard.c branches/condrv_restructure/win32ss/user/ntuser/menu.c branches/condrv_restructure/win32ss/user/ntuser/menu.h branches/condrv_restructure/win32ss/user/ntuser/ntstubs.c branches/condrv_restructure/win32ss/user/ntuser/userfuncs.h branches/condrv_restructure/win32ss/user/ntuser/window.c branches/condrv_restructure/win32ss/user/user32/CMakeLists.txt branches/condrv_restructure/win32ss/user/user32/controls/listbox.c branches/condrv_restructure/win32ss/user/user32/misc/stubs.c branches/condrv_restructure/win32ss/user/user32/user32.spec branches/condrv_restructure/win32ss/user/user32/windows/clipboard.c branches/condrv_restructure/win32ss/user/user32/windows/mdi.c branches/condrv_restructure/win32ss/user/user32/windows/menu.c branches/condrv_restructure/win32ss/user/user32/windows/window.c branches/condrv_restructure/win32ss/w32ksvc.db branches/condrv_restructure/win32ss/w32ksvc.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/condrv_restructure/base/applications/cmdutils/comp/comp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/mscutils/devmgmt/mainwnd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/applications/network/telnet/src/ansiprsr.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/applica… Modified: branches/condrv_restructure/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/setup/u… Modified: branches/condrv_restructure/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/base/shell/c… Modified: branches/condrv_restructure/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/boot/bootdat… Modified: branches/condrv_restructure/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/cmake/gcc.cm… Modified: branches/condrv_restructure/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/cmake/msvc.c… Modified: branches/condrv_restructure/configure.sh URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/configure.sh… Modified: branches/condrv_restructure/dll/directx/wine/msdmo/dmoreg.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/directx/… Modified: branches/condrv_restructure/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/ntdll/CM… Modified: branches/condrv_restructure/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/ntdll/cs… Modified: branches/condrv_restructure/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/ntdll/de… Modified: branches/condrv_restructure/dll/ntdll/ldr/ldrapi.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/ntdll/ld… Modified: branches/condrv_restructure/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/be… Modified: branches/condrv_restructure/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/client/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/include/vdm.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/k32.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/kernel32/wine/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ke… Modified: branches/condrv_restructure/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ms… Modified: branches/condrv_restructure/dll/win32/netapi32/nbcmdqueue.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/nbnamecache.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/nbt.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/netapi32.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/netapi32.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/netapi32.spec URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/netbios.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/netbios.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/netapi32/wksta.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ne… Modified: branches/condrv_restructure/dll/win32/shlwapi/path.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/sh… Modified: branches/condrv_restructure/dll/win32/uxtheme/ncscrollbar.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ux… Modified: branches/condrv_restructure/dll/win32/ws2help/context.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/dll/win32/ws… Modified: branches/condrv_restructure/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… Modified: branches/condrv_restructure/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/base… Modified: branches/condrv_restructure/drivers/filesystems/npfs/npfs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/file… Modified: branches/condrv_restructure/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/drivers/input/i8042prt/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/drivers/inpu… Modified: branches/condrv_restructure/hal/halx86/apic/apic.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/hal/halx86/a… Modified: branches/condrv_restructure/hal/halx86/apic/apic.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/hal/halx86/a… Modified: branches/condrv_restructure/hal/halx86/apic/rtctimer.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/hal/halx86/a… Modified: branches/condrv_restructure/hal/halx86/up/pic.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/hal/halx86/u… Modified: branches/condrv_restructure/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/ndk/… Modified: branches/condrv_restructure/include/reactos/kdros.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/libs/pseh/pseh3.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/subsys/win/conmsg.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/include/reac… Modified: branches/condrv_restructure/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/CMakeLis… Modified: branches/condrv_restructure/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/rtl/actc… Modified: branches/condrv_restructure/lib/sdk/crt/include/internal/tls.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/sdk/crt/… Modified: branches/condrv_restructure/lib/sdk/crt/signal/xcptinfo.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/lib/sdk/crt/… Modified: branches/condrv_restructure/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/media/doc/RE… Modified: branches/condrv_restructure/ntoskrnl/include/internal/i386/trap_x.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/inc… Modified: branches/condrv_restructure/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/ntoskrnl/mm/… Modified: branches/condrv_restructure/subsystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/C… Modified: branches/condrv_restructure/subsystems/ntvdm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Removed: branches/condrv_restructure/subsystems/ntvdm/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/ntvdm.rc URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/ntvdm/resource.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/n… Modified: branches/condrv_restructure/subsystems/win/basesrv/basesrv.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/subsystems/win/basesrv/init.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/subsystems/win/basesrv/proc.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/subsystems/win/basesrv/vdm.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/subsystems/win32/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/subsystems/w… Modified: branches/condrv_restructure/tools/pipetools/piperead.cpp URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/tools/pipeto… Modified: branches/condrv_restructure/win32ss/drivers/font/bmfd/glyph.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/driv… Modified: branches/condrv_restructure/win32ss/gdi/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/eng/surface.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/eng/xlateobj.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/gdi32/gdi32.spec URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/brush.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/coord.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/dc.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/freetype.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/palette.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/rect.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/gdi/ntgdi/text.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/gdi/… Modified: branches/condrv_restructure/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/incl… Modified: branches/condrv_restructure/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/user32.spec URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/windows/mdi.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/user/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user… Modified: branches/condrv_restructure/win32ss/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/w32k… Modified: branches/condrv_restructure/win32ss/w32ksvc.h URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/w32k…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs