Ros-dev

ros-dev@reactos.org

1 participants
5793 discussions

Re: [ros-dev] [ros-diffs] [gschneider] 36737: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related t
by gedmurphy 13 Oct '08

13 Oct '08

I'd originally refrained from doing it this way, using pinvoke instead to keep .net 2.0 compatibility. Using classes such as NamedPipeServerStream forces a .net 3.5 dependency. Is this ok with everyone? Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of gschneider(a)svn.reactos.org Sent: 12 October 2008 22:56 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [gschneider] 36737: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related to .n Author: gschneider Date: Sun Oct 12 16:55:50 2008 New Revision: 36737 URL: http://svn.reactos.org/svn/reactos?rev=36737&view=rev Log: RosDbg Part 3/3: - Named pipe implementation based on .net namespace IO.Pipes with support of threads - Previous win32 test version would strip random characters from debug messages and crash on entering kdbg (related to .net ReadFile approach) - Works with QEMU (Client mode), VirtualBox (Client and Server), VMware Server (Client and Server) - Usually faster than pure serial connection mode Known bugs: - Input to kdbg using /KDSERIAL is not displayed until enter pressed (but input works) - Reconnect issues, depending on virtual machine behaviour Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/Pipe/serialpipe.cs Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/namedpipe.cs… ============================================================================== --- trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/namedpipe.cs [iso-8859-1] Sun Oct 12 16:55:50 2008 @@ -1,227 +1,205 @@ ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; using System.IO; -using System.ComponentModel; +using System.IO.Pipes; using System.Runtime.InteropServices; - +using System.Text; +using System.Threading; namespace AbstractPipe { - class Kernel32 + public enum ConnectionMode { - [DllImport("kernel32.dll", SetLastError = true)] - public static extern IntPtr CreateNamedPipe( - String lpName, - OpenMode dwOpenMode, - uint dwPipeMode, - uint nMaxInstances, - uint nOutBufferSize, - uint nInBufferSize, - DefaultTimeout nDefaultTimeOut, - IntPtr pipeSecurityDescriptor - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool ConnectNamedPipe( - IntPtr hHandle, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool ReadFile( - IntPtr hHandle, - byte[] lpBuffer, - uint nNumberOfBytesToRead, - ref uint lpNumberOfBytesRead, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool WriteFile( - IntPtr hHandle, - byte[] lpBuffer, - uint nNumberOfBytesToWrite, - ref uint lpNumberOfBytesWritten, - IntPtr lpOverlapped - ); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool CloseHandle( - IntPtr hHandle); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern uint GetLastError(); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool DisconnectNamedPipe( - IntPtr hHandle); - - [DllImport("kernel32.dll", SetLastError = true)] - public static extern bool FlushFileBuffers(IntPtr handle); + MODE_CLIENT = 0x00000000, + MODE_SERVER = 0x00000001, + MODE_AUTO = 0x00000002 } - [StructLayout(LayoutKind.Sequential)] - public class Overlapped + public class NamedPipe : Pipe { - } - - public enum OpenMode : uint - { - PIPE_ACCESS_INBOUND = 0x00000001, - PIPE_ACCESS_OUTBOUND = 0x00000002, - PIPE_ACCESS_DUPLEX = 0x00000003, - FILE_FLAG_FIRST_PIPE_INSTANCE = 0x00080000, - FILE_FLAG_OVERLAPPED = 0x40000000, - FILE_FLAG_WRITE_THROUGH = 0x80000000 - } - - public enum DefaultTimeout : uint - { - NMPWAIT_USE_DEFAULT_WAIT = 0x00000000, - NMPWAIT_NOWAIT = 0x00000001, - NMPWAIT_WAIT_FOREVER = 0xffffffff - } - - [StructLayout(LayoutKind.Sequential)] - public struct SECURITY_ATTRIBUTES - { - public int nLength; - public IntPtr lpSecurityDescriptor; - public int bInheritHandle; - } - - public class NamedPipe// : Pipe - { - private const Int32 INVALID_HANDLE_VALUE = -1; - private const ulong ERROR_PIPE_CONNECTED = 535; - - private IntPtr handle; - //FileAccess mode; + public const int PIPE_SIZE = 1024; + + private PipeStream ioStream; /* stream for io operations */ + private String wCommand; /* buffer of a single command line */ + private List<String> cmdList; /*list of commands pending to be written */ + + public event PipeReceiveEventHandler PipeReceiveEvent; + public event PipeErrorEventHandler PipeErrorEvent; + + private static ManualResetEvent newWriteData = new ManualResetEvent(false); public NamedPipe() { - handle = IntPtr.Zero; - } - - public IntPtr Create(string name) - { - handle = Kernel32.CreateNamedPipe(name, - OpenMode.PIPE_ACCESS_DUPLEX | OpenMode.FILE_FLAG_OVERLAPPED, - 0, - 1, - 100, - 100, - DefaultTimeout.NMPWAIT_WAIT_FOREVER, - IntPtr.Zero); - if (handle.ToInt32() == INVALID_HANDLE_VALUE) - { - throw new Win32Exception("Error creating named pipe " + name + " . Internal error: " + Marshal.GetLastWin32Error().ToString()); - } - - return handle; - } - - public void Disconnect() - { - Kernel32.DisconnectNamedPipe(handle); + cmdList = new List<string>(); + } + + public bool CreateServerPipe(string name) + { + /* create a pipe and wait for a client */ + NamedPipeServerStream sStream = new NamedPipeServerStream(name, PipeDirection.InOut, 1, + PipeTransmissionMode.Byte, PipeOptions.Asynchronous, PIPE_SIZE, PIPE_SIZE); + sStream.WaitForConnection(); + + if (sStream.IsConnected) + { + ioStream = sStream; + return true; + } + else + { + return false; + } + } + + public bool CreateClientPipe(string name) + { + /* try to connect as a client */ + /* (QEMU -serial pipe or VMware in pipe server mode) */ + try + { + NamedPipeClientStream cStream = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.Asynchronous); + cStream.Connect(100); + + if (cStream.IsConnected) + { + ioStream = cStream; + return true; + } + else + { + return false; + } + } + catch (Exception) + { + return false; + } + } + + public bool CreatePipe(string name, ConnectionMode mode) + { + if (name == "" || name == null) + { + return false; + } + switch (mode) + { + case ConnectionMode.MODE_AUTO: + //check if pipe exists, if not create server pipe, wait certain time, check if pipe... + //TODO: server-client lookup should time out + while (true) + { + if (CreateClientPipe(name)) + { + break; + } + if (CreateServerPipe(name)) + { + break; + } + } + return true; + + case ConnectionMode.MODE_CLIENT: + while (!CreateClientPipe(name)) ; + + /* pipe open, everything fine */ + return true; + + case ConnectionMode.MODE_SERVER: + if (CreateServerPipe(name)) + { + /* wait for a client*/ + + return true; + } + break; + } + return false; } public void Close() { - Kernel32.CloseHandle(handle); - handle = IntPtr.Zero; - } - - public void Flush() - { - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - Kernel32.FlushFileBuffers(handle); - } - - public bool Listen() - { - Disconnect(); - if (Kernel32.ConnectNamedPipe(handle, IntPtr.Zero) != true) - { - uint lastErr = (uint)Marshal.GetLastWin32Error(); - if (lastErr == ERROR_PIPE_CONNECTED) - return true; - return false; + if (ioStream != null) + ioStream.Close(); + } + + public void WriteLoop() + { + try + { + while (true) + { + if (cmdList.Count > 0) + { + byte[] wBuf = new byte[cmdList[0].Length]; + UTF8Encoding.UTF8.GetBytes(cmdList[0], 0, cmdList[0].Length, wBuf, 0); + + ioStream.Write(wBuf, 0, cmdList[0].Length); + + /* remove written data from commandlist */ + cmdList.RemoveAt(0); + } + else if (cmdList.Count == 0) + { + /* wait until new data is signaled */ + newWriteData.Reset(); + newWriteData.WaitOne(); + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + + } + + public void ReadLoop() + { + byte[] buf = new byte[PIPE_SIZE]; + int read = 0; + + try + { + while(true) + { + read = ioStream.Read(buf, 0, PIPE_SIZE); + if (read > 0) + { + if (PipeReceiveEvent != null) + PipeReceiveEvent.Invoke(this, new PipeReceiveEventArgs(UTF8Encoding.UTF8.GetString(buf, 0, read))); + } + else + { + /* connecion closed */ + break; + } + } + } + catch (Exception e) + { + if (PipeErrorEvent != null) + PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(e.Message)); + } + } + + public bool Write(string str) + { + /* only forward a complete line */ + wCommand += str; + + if (str[str.Length-1] == '\r') + { + cmdList.Add(wCommand); + wCommand = null; + + /* wake up the write thread */ + newWriteData.Set(); } return true; - } - - public int Read(byte[] buffer, int offset, int count) - { - if (buffer == null) - throw new ArgumentNullException("buffer", "The buffer to read into cannot be null"); - if (buffer.Length < (offset + count)) - throw new ArgumentException("Buffer is not large enough to hold requested data", "buffer"); - if (offset < 0) - throw new ArgumentOutOfRangeException("offset", offset, "Offset cannot be negative"); - if (count < 0) - throw new ArgumentOutOfRangeException("count", count, "Count cannot be negative"); - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - - // first read the data into an internal buffer since ReadFile cannot read into a buf at - // a specified offset - uint read = 0; - - byte[] buf = buffer; - if (offset != 0) - { - buf = new byte[count]; - } - bool f = Kernel32.ReadFile(handle, buf, (uint)count, ref read, IntPtr.Zero); - if (!f) - { - throw new Win32Exception(Marshal.GetLastWin32Error(), "ReadFile failed"); - } - if (offset != 0) - { - for (int x = 0; x < read; x++) - { - buffer[offset + x] = buf[x]; - } - - } - return (int)read; - } - - public void Write(byte[] buffer, int offset, int count) - { - if (buffer == null) - throw new ArgumentNullException("buffer", "The buffer to write into cannot be null"); - if (buffer.Length < (offset + count)) - throw new ArgumentException("Buffer does not contain amount of requested data", "buffer"); - if (offset < 0) - throw new ArgumentOutOfRangeException("offset", offset, "Offset cannot be negative"); - if (count < 0) - throw new ArgumentOutOfRangeException("count", count, "Count cannot be negative"); - if (handle == IntPtr.Zero) - throw new ObjectDisposedException("NamedPipeStream", "The stream has already been closed"); - - // copy data to internal buffer to allow writing from a specified offset - if (offset != 0) - { - byte[] buf = new Byte[count]; - for (int x = 0; x < count; x++) - { - buf[x] = buffer[offset + x]; - } - buffer = buf; - } - uint written = 0; - bool result = Kernel32.WriteFile(handle, buffer, (uint)count, ref written, IntPtr.Zero); - - if (!result) - { - int err = (int)Marshal.GetLastWin32Error(); - throw new Win32Exception(err, "Writing to the stream failed"); - } - if (written < count) - throw new IOException("Unable to write entire buffer to stream"); } } } Modified: trunk/tools/reactosdbg/Pipe/serialpipe.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/serialpipe.c… ============================================================================== --- trunk/tools/reactosdbg/Pipe/serialpipe.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/serialpipe.cs [iso-8859-1] Sun Oct 12 16:55:50 2008 @@ -80,7 +80,7 @@ public void SerialPortErrorReceived(object sender, SerialErrorReceivedEventArgs args) { - mSerialPort.Close(); + /* port will be closed by debug connection */ if (PipeErrorEvent != null) PipeErrorEvent.Invoke(this, new PipeErrorEventArgs(args.EventType.ToString())); }

1 0

Re: [ros-dev] [ros-diffs] [mjmartin] 36732: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match wind
by gedmurphy 12 Oct '08

12 Oct '08

You're duplicating code here. REnumServicesStatusExA should call REnumServicesStatusExW to do the work. Ged. -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of mjmartin(a)svn.reactos.org Sent: 12 October 2008 14:10 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [mjmartin] 36732: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match windows. Author: mjmartin Date: Sun Oct 12 08:10:05 2008 New Revision: 36732 URL: http://svn.reactos.org/svn/reactos?rev=36732&view=rev Log: - Implement REnumServicesStatusExA - REnumServicesStatusA/W: Fixed returned param values to match Windows - REnumServicesStatusExW: Dont try to access lpResumeIndex if it is NULL. Fixed returned param values to match windows. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Oct 12 08:10:05 2008 @@ -2371,6 +2371,12 @@ dwRequiredSize += dwSize; } + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeHandle) *lpResumeHandle = 0; + } + Done:; /* FIXME: Unlock the service list */ @@ -3451,8 +3457,8 @@ continue; dwSize = sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1)); + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; if (dwRequiredSize + dwSize > dwBufSize) { @@ -3487,9 +3493,9 @@ if ((dwState & dwServiceState) == 0) continue; - dwRequiredSize += (sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1))); + dwRequiredSize += sizeof(ENUM_SERVICE_STATUSA) + + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; dwError = ERROR_MORE_DATA; } @@ -3524,8 +3530,8 @@ continue; dwSize = sizeof(ENUM_SERVICE_STATUSA) + - ((wcslen(CurrentService->lpServiceName) + 1)) + - ((wcslen(CurrentService->lpDisplayName) + 1)); + wcslen(CurrentService->lpServiceName) + 1 + + wcslen(CurrentService->lpDisplayName) + 1; if (dwRequiredSize + dwSize > dwBufSize) break; @@ -3561,6 +3567,12 @@ lpStatusPtr++; dwRequiredSize += dwSize; + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeHandle) *lpResumeHandle = 0; } Done:; @@ -4509,10 +4521,295 @@ LPBOUNDED_DWORD_256K lpResumeIndex, LPCSTR pszGroupName) { - UNIMPLEMENTED; + PMANAGER_HANDLE hManager; + PSERVICE lpService; + DWORD dwError = ERROR_SUCCESS; + PLIST_ENTRY ServiceEntry; + PSERVICE CurrentService; + DWORD dwState; + DWORD dwRequiredSize; + DWORD dwServiceCount; + DWORD dwSize; + DWORD dwLastResumeCount = 0; + LPENUM_SERVICE_STATUS_PROCESSA lpStatusPtr; + LPSTR lpStringPtr; + LPWSTR pszGroupNameW = NULL; + + DPRINT("REnumServicesStatusExA() called\n"); + + if (ScmShutdown) + return ERROR_SHUTDOWN_IN_PROGRESS; + + if (InfoLevel != SC_ENUM_PROCESS_INFO) + return ERROR_INVALID_LEVEL; + + hManager = (PMANAGER_HANDLE)hSCManager; + if (!hManager || hManager->Handle.Tag != MANAGER_TAG) + { + DPRINT1("Invalid manager handle!\n"); + return ERROR_INVALID_HANDLE; + } + *pcbBytesNeeded = 0; *lpServicesReturned = 0; - return ERROR_CALL_NOT_IMPLEMENTED; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT1("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT1("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; + } + + /* Check access rights */ + if (!RtlAreAllAccessesGranted(hManager->Handle.DesiredAccess, + SC_MANAGER_ENUMERATE_SERVICE)) + { + DPRINT1("Insufficient access rights! 0x%lx\n", + hManager->Handle.DesiredAccess); + return ERROR_ACCESS_DENIED; + } + + if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; + + /* FIXME: Lock the service list shared */ + + lpService = ScmGetServiceEntryByResumeCount(dwLastResumeCount); + if (lpService == NULL) + { + dwError = ERROR_SUCCESS; + goto Done; + } + + dwRequiredSize = 0; + dwServiceCount = 0; + + if (pszGroupName) + { + pszGroupNameW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (strlen(pszGroupName) + 1) * sizeof(WCHAR)); + if (!pszGroupNameW) + { + DPRINT1("Failed to allocate buffer!\n"); + return ERROR_NOT_ENOUGH_MEMORY; + } + MultiByteToWideChar(CP_ACP, + 0, + pszGroupName, + -1, + pszGroupNameW, + strlen(pszGroupName) + 1); + } + + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + (wcslen(CurrentService->lpServiceName) + 1) + + (wcslen(CurrentService->lpDisplayName) + 1); + + if (dwRequiredSize + dwSize <= cbBufSize) + { + DPRINT("Service name: %S fit\n", CurrentService->lpServiceName); + dwRequiredSize += dwSize; + dwServiceCount++; + dwLastResumeCount = CurrentService->dwResumeCount; + } + else + { + DPRINT("Service name: %S no fit\n", CurrentService->lpServiceName); + break; + } + + } + + DPRINT("dwRequiredSize: %lu\n", dwRequiredSize); + DPRINT("dwServiceCount: %lu\n", dwServiceCount); + + for (; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwRequiredSize += (sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + (wcslen(CurrentService->lpServiceName) + 1) + + (wcslen(CurrentService->lpDisplayName) + 1)); + + dwError = ERROR_MORE_DATA; + } + + DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); + + if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; + *lpServicesReturned = dwServiceCount; + *pcbBytesNeeded = dwRequiredSize; + + /* If there was no services that matched */ + if (!dwServiceCount) + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto Done; + } + + lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSA)lpBuffer; + lpStringPtr = (LPSTR)((ULONG_PTR)lpBuffer + + dwServiceCount * sizeof(ENUM_SERVICE_STATUS_PROCESSA)); + + dwRequiredSize = 0; + for (ServiceEntry = &lpService->ServiceListEntry; + ServiceEntry != &ServiceListHead; + ServiceEntry = ServiceEntry->Flink) + { + CurrentService = CONTAINING_RECORD(ServiceEntry, + SERVICE, + ServiceListEntry); + + if ((CurrentService->Status.dwServiceType & dwServiceType) == 0) + continue; + + dwState = SERVICE_ACTIVE; + if (CurrentService->Status.dwCurrentState == SERVICE_STOPPED) + dwState = SERVICE_INACTIVE; + + if ((dwState & dwServiceState) == 0) + continue; + + if (pszGroupNameW) + { + if (*pszGroupNameW == 0) + { + if (CurrentService->lpGroup != NULL) + continue; + } + else + { + if ((CurrentService->lpGroup == NULL) || + _wcsicmp(pszGroupNameW, CurrentService->lpGroup->lpGroupName)) + continue; + } + } + + dwSize = sizeof(ENUM_SERVICE_STATUS_PROCESSW) + + ((wcslen(CurrentService->lpServiceName) + 1) * sizeof(WCHAR)) + + ((wcslen(CurrentService->lpDisplayName) + 1) * sizeof(WCHAR)); + + if (dwRequiredSize + dwSize <= cbBufSize) + { + /* Copy the service name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpServiceName, + -1, + lpStringPtr, + wcslen(CurrentService->lpServiceName), + 0, + 0); + lpStatusPtr->lpServiceName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpServiceName) + 1); + + /* Copy the display name */ + WideCharToMultiByte(CP_ACP, + 0, + CurrentService->lpDisplayName, + -1, + lpStringPtr, + wcslen(CurrentService->lpDisplayName), + 0, + 0); + lpStatusPtr->lpDisplayName = (LPSTR)((ULONG_PTR)lpStringPtr - (ULONG_PTR)lpBuffer); + lpStringPtr += (wcslen(CurrentService->lpDisplayName) + 1); + + /* Copy the status information */ + memcpy(&lpStatusPtr->ServiceStatusProcess, + &CurrentService->Status, + sizeof(SERVICE_STATUS)); + lpStatusPtr->ServiceStatusProcess.dwProcessId = CurrentService->ProcessId; /* FIXME */ + lpStatusPtr->ServiceStatusProcess.dwServiceFlags = 0; /* FIXME */ + + lpStatusPtr++; + dwRequiredSize += dwSize; + } + else + { + break; + } + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeIndex) *lpResumeIndex = 0; + } + +Done:; + /* Unlock the service list */ + + if (pszGroupNameW) HeapFree(GetProcessHeap(),0,pszGroupNameW); + + DPRINT("REnumServicesStatusExA() done (Error %lu)\n", dwError); + + return dwError; } @@ -4539,7 +4836,7 @@ DWORD dwRequiredSize; DWORD dwServiceCount; DWORD dwSize; - DWORD dwLastResumeCount; + DWORD dwLastResumeCount = 0; LPENUM_SERVICE_STATUS_PROCESSW lpStatusPtr; LPWSTR lpStringPtr; @@ -4556,6 +4853,21 @@ { DPRINT1("Invalid manager handle!\n"); return ERROR_INVALID_HANDLE; + } + + *pcbBytesNeeded = 0; + *lpServicesReturned = 0; + + if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + { + DPRINT1("Not a valid Service Type!\n"); + return ERROR_INVALID_PARAMETER; + } + + if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + { + DPRINT1("Not a valid Service State!\n"); + return ERROR_INVALID_PARAMETER; } /* Check access rights */ @@ -4567,10 +4879,7 @@ return ERROR_ACCESS_DENIED; } - *pcbBytesNeeded = 0; - *lpServicesReturned = 0; - - dwLastResumeCount = *lpResumeIndex; + if (lpResumeIndex) dwLastResumeCount = *lpResumeIndex; /* Lock the service list shared */ @@ -4681,9 +4990,16 @@ DPRINT("*pcbBytesNeeded: %lu\n", dwRequiredSize); - *lpResumeIndex = dwLastResumeCount; + if (lpResumeIndex) *lpResumeIndex = dwLastResumeCount; *lpServicesReturned = dwServiceCount; *pcbBytesNeeded = dwRequiredSize; + + /* If there was no services that matched */ + if (!dwServiceCount) + { + dwError = ERROR_SERVICE_DOES_NOT_EXIST; + goto Done; + } lpStatusPtr = (LPENUM_SERVICE_STATUS_PROCESSW)lpBuffer; lpStringPtr = (LPWSTR)((ULONG_PTR)lpBuffer + @@ -4755,7 +5071,12 @@ { break; } - + } + + if (dwError != ERROR_MORE_DATA) + { + *pcbBytesNeeded = 0; + if (lpResumeIndex) *lpResumeIndex = 0; } Done:;

1 0

Re: [ros-dev] [ros-diffs] [pschweitzer] 36714: - Added "stub" for internal notification structure - Implemented FsRtlNotifyInitializeSync. It's not complete, not perfect. That's a WIP. See issue #2821 for more details.
by Alex Ionescu 12 Oct '08

12 Oct '08

UDT : _REAL_NOTIFY_SYNC Data : this+0x0, Member, Type: struct _FAST_MUTEX, FastMutex UDT : _FAST_MUTEX Data : this+0x20, Member, Type: unsigned long, OwningThread Data : this+0x24, Member, Type: unsigned long, OwnerCount It's just initializing a fast mutex and setting the owner to NULL and count to 0. On 11-Oct-08, at 7:29 AM, pschweitzer(a)svn.reactos.org wrote: > VOID > NTAPI > FsRtlNotifyInitializeSync(IN PNOTIFY_SYNC *NotifySync) > { > - KEBUGCHECK(0); > + PINT_NOTIFY_SYNC IntNotifySync; > + > + *NotifySync = NULL; > + > + IntNotifySync = FsRtlAllocatePoolWithTag(NonPagedPool, > sizeof(INT_NOTIFY_SYNC), TAG('F', 'S', 'N', 'S')); > + IntNotifySync->Unknown1 = 0; > + IntNotifySync->Unknown2 = 0; > + IntNotifySync->Unknown5 = 0; > + IntNotifySync->Unknown0 = 1; > + IntNotifySync->Unknown3 = 1; > + IntNotifySync->Unknown4 = 4; > + InitializeListHead(&(IntNotifySync->Unknown6)); > + IntNotifySync->Unknown8 = 0; > + IntNotifySync->Unknown9 = 0; > + > + *NotifySync = IntNotifySync; Best regards, Alex Ionescu

2 1

Re: [ros-dev] [ros-diffs] [pschweitzer] 36709: Fixed a FIXME A bit cleaned header
by Aleksey Bragin 11 Oct '08

11 Oct '08

Do you really need finally clause in this case? It's not the most beautiful way when doing it via PSEH. WBR, Aleksey. On Oct 10, 2008, at 11:26 PM, pschweitzer(a)svn.reactos.org wrote: > Author: pschweitzer > Date: Fri Oct 10 14:26:42 2008 > New Revision: 36709 > > URL: http://svn.reactos.org/svn/reactos?rev=36709&view=rev > Log: > Fixed a FIXME > A bit cleaned header > > Modified: > branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c > branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h > > Modified: branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/ > filesystems/fastfat/finfo.c?rev=36709&r1=36708&r2=36709&view=diff > ====================================================================== > ======== > --- branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c > [iso-8859-1] (original) > +++ branches/pierre-fsd/drivers/filesystems/fastfat/finfo.c > [iso-8859-1] Fri Oct 10 14:26:42 2008 > @@ -443,6 +443,10 @@ > } > > > +_SEH_FINALLYFUNC(VfatGetEaInformationFinal_PSEH) > +{ > +} > + > static NTSTATUS > VfatGetEaInformation(PFILE_OBJECT FileObject, > PVFATFCB Fcb, > @@ -452,15 +456,19 @@ > { > PDEVICE_EXTENSION DeviceExt = DeviceObject->DeviceExtension; > > - /* FIXME - use SEH to access the buffer! */ > - Info->EaSize = 0; > - *BufferLength -= sizeof(*Info); > - if (DeviceExt->FatInfo.FatType == FAT12 || > - DeviceExt->FatInfo.FatType == FAT16) > - { > - /* FIXME */ > - DPRINT1("VFAT: FileEaInformation not implemented!\n"); > - } > + _SEH_TRY > + { > + RtlZeroMemory(Info, sizeof(FILE_EA_INFORMATION)); > + if (DeviceExt->FatInfo.FatType == FAT12 || > + DeviceExt->FatInfo.FatType == FAT16) > + { > + /* FIXME */ > + DPRINT1("VFAT: FileEaInformation not implemented!\n"); > + } > + *BufferLength -= sizeof(FILE_EA_INFORMATION); > + } > + _SEH_FINALLY(VfatGetEaInformationFinal_PSEH) > + _SEH_END; > return STATUS_SUCCESS; > } > > > Modified: branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h > URL: http://svn.reactos.org/svn/reactos/branches/pierre-fsd/drivers/ > filesystems/fastfat/vfat.h?rev=36709&r1=36708&r2=36709&view=diff > ====================================================================== > ======== > --- branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h > [iso-8859-1] (original) > +++ branches/pierre-fsd/drivers/filesystems/fastfat/vfat.h > [iso-8859-1] Fri Oct 10 14:26:42 2008 > @@ -608,15 +608,7 @@ > > /* -------------------------------------------------------- > string.c */ > > -VOID > -vfatSplitPathName(PUNICODE_STRING PathNameU, > - PUNICODE_STRING DirNameU, > - PUNICODE_STRING FileNameU); > - > BOOLEAN vfatIsLongIllegal(WCHAR c); > - > -BOOLEAN wstrcmpjoki (PWSTR s1, > - PWSTR s2); > > /* ----------------------------------------------------------- > fat.c */ > > @@ -702,6 +694,11 @@ > > /* ----------------------------------------------------------- > fcb.c */ > > +VOID > +vfatSplitPathName(PUNICODE_STRING PathNameU, > + PUNICODE_STRING DirNameU, > + PUNICODE_STRING FileNameU); > + > PVFATFCB vfatNewFCB (PDEVICE_EXTENSION pVCB, > PUNICODE_STRING pFileNameU); > >

2 1

Re: [ros-dev] confused by "rtlpInitDeferedCriticalSection"
by tamlin＠algonet.se 11 Oct '08

11 Oct '08

Colin wrote: >The name "Rtlp..." already says it: This is a private function only used >internally by ntdll. To elaborate: if the name has a "p" in it after the "namespace" name (here Rtl), it usually means "private". -- Mike

1 0

question about InterlockedCompareExchange.
by Jack Yi 10 Oct '08

10 Oct '08

question about InterlockedCompareExchange. MSDN says: The function returns the initial value of the destination. I just don't understand, why can we get the initial value of destination as return value by 'return 0Ch' ? Thank you! .text:7C8097A2 ; PVOID __stdcall InterlockedCompareExchange(PVOID *Destination,PVOID Exchange,PVOID Comperand) .text:7C8097A2 public _InterlockedCompareExchange@12 .text:7C8097A2 _InterlockedCompareExchange@12 proc near .text:7C8097A2 ; CODE XREF: BaseComputeProcessDllPath(x,x)+97B3p .text:7C8097A2 ; CreateActCtxW(x)+15D2Dp .text:7C8097A2 .text:7C8097A2 Destination = dword ptr 4 .text:7C8097A2 Exchange = dword ptr 8 .text:7C8097A2 Comperand = dword ptr 0Ch .text:7C8097A2 .text:7C8097A2 mov ecx, [esp+Destination] .text:7C8097A6 mov edx, [esp+Exchange] .text:7C8097AA mov eax, [esp+Comperand] .text:7C8097AE .text:7C8097AE loc_7C8097AE: ; DATA XREF: .data:7C884014o .text:7C8097AE lock cmpxchg [ecx], edx .text:7C8097B2 retn 0Ch .text:7C8097B2 _InterlockedCompareExchange@12 endp

3 2

confused by "rtlpInitDeferedCriticalSection"
by Jack Yi 10 Oct '08

10 Oct '08

hi, guys! How and when should I use this function(lib\rtl\critical.c, line 222) ? In fact,I can not find such a fuction in the export table of ntdll(XP sp2).

2 1

Re: [ros-dev] [ros-diffs] [cgutman] 36699: - Some of my work on NDIS 6.0 - Doesn't compile yet - Part 1 of X
by gedmurphy 08 Oct '08

08 Oct '08

please pair ExAllocatePoolWithTag with ExFreePoolWithTag -----Original Message----- From: ros-diffs-bounces(a)reactos.org [mailto:ros-diffs-bounces@reactos.org] On Behalf Of cgutman(a)svn.reactos.org Sent: 08 October 2008 22:17 To: ros-diffs(a)reactos.org Subject: [ros-diffs] [cgutman] 36699: - Some of my work on NDIS 6.0 - Doesn't compile yet - Part 1 of X Author: cgutman Date: Wed Oct 8 16:17:10 2008 New Revision: 36699 URL: http://svn.reactos.org/svn/reactos?rev=36699&view=rev Log: - Some of my work on NDIS 6.0 - Doesn't compile yet - Part 1 of X Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c (with props) Added: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c (added) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c [iso-8859-1] Wed Oct 8 16:17:10 2008 @@ -1,0 +1,40 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NDIS library + * FILE: object.c + * PURPOSE: Implements the NDIS 6.0 object interface + * PROGRAMMERS: Cameron Gutman (aicommander(a)gmail.com) + */ + +#include "ndissys.h" + +PNDIS_GENERIC_OBJECT +EXPORT +NdisAllocateGenericObject( + IN PDRIVER_OBJECT DriverObject OPTIONAL, + IN ULONG Tag, + IN USHORT Size) +{ + PNDIS_GENERIC_OBJECT Object; + + Object = ExAllocatePoolWithTag(NonPagedPool, sizeof(NDIS_GENERIC_OBJECT) + Size, Tag); + if (!Object) return NULL; + + RtlZeroMemory(Object, sizeof(NDIS_GENERIC_OBJECT) + Size); + + Object->DriverObject = DriverObject; + Object->Header.Type = NDIS_OBJECT_TYPE_GENERIC_OBJECT; + Object->Header.Revision = NDIS_GENERIC_OBJECT_REVISION_1; + Object->Header.Size = sizeof(NDIS_GENERIC_OBJECT); + + return Object; +} + +VOID +EXPORT +NdisFreeGenericObject( + IN PNDIS_GENERIC_OBJECT NdisGenericObject) +{ + ExFreePool(NdisGenericObject); +} + Propchange: branches/aicom-network-fixes/drivers/network/ndis/ndis/object.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

WDK not working
by മഹേഷ് മുകുന്ദന് | Mahesh M 08 Oct '08

08 Oct '08

hi.. I tried the latest WDK provided by Micrsoft - http://download.microsoft.com/download/9/0/f/90f019ac-8243-48d3-91cf-81fc40… It was attached to Qemu as a CDROM. It did boot showing the D:\ But I couldnt install it. I tried installing via wine in Lenny.That too didnt work. Any help.. Can i get an alternative older one that works with ROS? -- Mahesh M Happy hacking... , , / \ ((__-^^-,-^^-__)) `-_---' `---_-' `--|o` 'o|--' \ ` / ): :( :o_o: "-"

5 6

[gedmurphy] 36658: Remove the address and command windows from the bottom of the file browser. They're buggy and they're not too pretty
by Gabriel ilardi 07 Oct '08

07 Oct '08

Commit by gedmurphy :: r36658 reactos/base/shell/explorer/shell/ (mainframe.cpp mainframe.h): Remove the address and command windows from the bottom of the file browser. They're buggy and they're not too pretty Hi everyone, Even though explorer looks nicer indeed with this change, bear in mind that you can't use the internal web browser anymore (you can't type any web address). Regards, Gabriel. _________________________________________________________________ Stanco della solita finestra? Personalizza la tua Hotmail! http://www.messenger.it/personalizza.html#sfondi

4 7

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-dev