Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 42771: - Fix a typo
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 21:04:51 2009 New Revision: 42771 URL: http://svn.reactos.org/svn/reactos?rev=42771&view=rev Log: - Fix a typo Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Aug 18 21:04:51 2009 @@ -346,7 +346,7 @@ case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); - *Errno = WSANOBUFS; + *Errno = WSAENOBUFS; break; case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n");

1 0

[cgutman] 42770: - Make sure HeapAlloc returned a valid pointer - Fix some memory leaks - Return a better status for STATUS_INSUFFICIENT_RESOURCES and STATUS_NO_MEMORY - Fix a potential null pointer dereference in SetSocketInformation and GetSocketInformation - Initialize RemoteAddress so we aren't trying to copy the remote address to 0 - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 20:53:10 2009 New Revision: 42770 URL: http://svn.reactos.org/svn/reactos?rev=42770&view=rev Log: - Make sure HeapAlloc returned a valid pointer - Fix some memory leaks - Return a better status for STATUS_INSUFFICIENT_RESOURCES and STATUS_NO_MEMORY - Fix a potential null pointer dereference in SetSocketInformation and GetSocketInformation - Initialize RemoteAddress so we aren't trying to copy the remote address to 0 - Found by Amine Khaldi Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Tue Aug 18 20:53:10 2009 @@ -98,6 +98,9 @@ /* Set Socket Data */ Socket = HeapAlloc(GlobalHeap, 0, sizeof(*Socket)); + if (!Socket) + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + RtlZeroMemory(Socket, sizeof(*Socket)); Socket->RefCount = 2; Socket->Handle = -1; @@ -140,6 +143,9 @@ /* Set up EA Buffer */ EABuffer = HeapAlloc(GlobalHeap, 0, SizeOfEA); + if (!EABuffer) + return MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + RtlZeroMemory(EABuffer, SizeOfEA); EABuffer->NextEntryOffset = 0; EABuffer->Flags = 0; @@ -240,6 +246,8 @@ EABuffer, SizeOfEA); + HeapFree(GlobalHeap, 0, EABuffer); + /* Save Handle */ Socket->Handle = (SOCKET)Sock; @@ -290,6 +298,9 @@ error: AFD_DbgPrint(MID_TRACE,("Ending %x\n", Status)); + + if( Socket ) + HeapFree(GlobalHeap, 0, Socket); if( lpErrno ) *lpErrno = Status; @@ -335,7 +346,7 @@ case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); - *Errno = WSA_NOT_ENOUGH_MEMORY; + *Errno = WSANOBUFS; break; case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); @@ -1038,6 +1049,11 @@ { /* Allocate needed space */ PendingData = HeapAlloc(GlobalHeap, 0, PendingDataLength); + if (!PendingData) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } /* We want the data now */ PendingAcceptData.ReturnSize = FALSE; @@ -1079,6 +1095,13 @@ CalleeID.buf = (PVOID)Socket->LocalAddress; CalleeID.len = Socket->SharedData.SizeOfLocalAddress; + RemoteAddress = HeapAlloc(GlobalHeap, 0, sizeof(*RemoteAddress)); + if (!RemoteAddress) + { + MsafdReturnWithErrno(STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL); + return INVALID_SOCKET; + } + /* Set up Address in SOCKADDR Format */ RtlCopyMemory (RemoteAddress, &ListenReceiveData->Address.Address[0].AddressType, @@ -1097,6 +1120,10 @@ { /* Allocate Buffer for Callee Data */ CalleeDataBuffer = HeapAlloc(GlobalHeap, 0, 4096); + if (!CalleeDataBuffer) { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } CalleeData.buf = CalleeDataBuffer; CalleeData.len = 4096; } @@ -1288,6 +1315,11 @@ /* Get the Wildcard Address */ BindAddressLength = Socket->HelperData->MaxWSAddressLength; BindAddress = HeapAlloc(GetProcessHeap(), 0, BindAddressLength); + if (!BindAddress) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, BindAddress, &BindAddressLength); @@ -1938,7 +1970,10 @@ } /* Return Information */ - *Ulong = InfoData.Information.Ulong; + if (Ulong != NULL) + { + *Ulong = InfoData.Information.Ulong; + } if (LargeInteger != NULL) { *LargeInteger = InfoData.Information.LargeInteger; @@ -1975,7 +2010,10 @@ InfoData.InformationClass = AfdInformationClass; /* Set Information */ - InfoData.Information.Ulong = *Ulong; + if (Ulong != NULL) + { + InfoData.Information.Ulong = *Ulong; + } if (LargeInteger != NULL) { InfoData.Information.LargeInteger = *LargeInteger; @@ -2491,6 +2529,7 @@ /* Wait on new events */ AsyncData = HeapAlloc(GetProcessHeap(), 0, sizeof(ASYNC_DATA)); + if (!AsyncData) return; /* Create the Asynch Thread if Needed */ SockCreateOrReferenceAsyncThread(); @@ -2538,6 +2577,7 @@ /* Allocate Heap for 1024 Sockets, can be expanded later */ Sockets = HeapAlloc(GetProcessHeap(), 0, sizeof(PSOCKET_INFORMATION) * 1024); + if (!Sockets) return FALSE; AFD_DbgPrint(MAX_TRACE, ("MSAFD.DLL has been loaded\n")); Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Tue Aug 18 20:53:10 2009 @@ -32,6 +32,11 @@ /* Allocate the Async Data Structure to pass on to the Thread later */ AsyncData = HeapAlloc(GetProcessHeap(), 0, sizeof(*AsyncData)); + if (!AsyncData) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } /* Change the Socket to Non Blocking */ BlockMode = 1; @@ -533,6 +538,11 @@ /* Get the Wildcard Address */ BindAddressLength = Socket->HelperData->MaxWSAddressLength; BindAddress = HeapAlloc(GlobalHeap, 0, BindAddressLength); + if (!BindAddress) + { + MsafdReturnWithErrno( STATUS_INSUFFICIENT_RESOURCES, lpErrno, 0, NULL ); + return INVALID_SOCKET; + } Socket->HelperData->WSHGetWildcardSockaddr (Socket->HelperContext, BindAddress, &BindAddressLength);

1 0

[cgutman] 42769: - Handle failure of NdisMInitializeWrapper - Found by Amine Khaldi
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 20:01:26 2009 New Revision: 42769 URL: http://svn.reactos.org/svn/reactos?rev=42769&view=rev Log: - Handle failure of NdisMInitializeWrapper - Found by Amine Khaldi Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Aug 18 20:01:26 2009 @@ -1342,6 +1342,7 @@ Characteristics.SendHandler = MiniportSend; NdisMInitializeWrapper(&WrapperHandle, DriverObject, RegistryPath, 0); + if (!WrapperHandle) return NDIS_STATUS_FAILURE; Status = NdisMRegisterMiniport(WrapperHandle, &Characteristics, sizeof(Characteristics)); if(Status != NDIS_STATUS_SUCCESS)

1 0

[cgutman] 42768: - Verify that we got a handle to a file object
by cgutman＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: cgutman Date: Tue Aug 18 18:23:31 2009 New Revision: 42768 URL: http://svn.reactos.org/svn/reactos?rev=42768&view=rev Log: - Verify that we got a handle to a file object Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Aug 18 18:23:31 2009 @@ -130,7 +130,7 @@ if (NT_SUCCESS(Status)) { Status = ObReferenceObjectByHandle(*Handle, /* Handle to open file */ GENERIC_READ | GENERIC_WRITE | SYNCHRONIZE, /* Access mode */ - NULL, /* Object type */ + IoFileObjectType, /* Object type */ KernelMode, /* Access mode */ (PVOID*)Object, /* Pointer to object */ NULL); /* Handle information */

1 0

[gschneider] 42767: Check the correct buffer for failed memory allocation, found by Amine Khaldi
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 16:43:47 2009 New Revision: 42767 URL: http://svn.reactos.org/svn/reactos?rev=42767&view=rev Log: Check the correct buffer for failed memory allocation, found by Amine Khaldi Modified: trunk/reactos/dll/win32/kernel32/file/move.c Modified: trunk/reactos/dll/win32/kernel32/file/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/mo… ============================================================================== --- trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/file/move.c [iso-8859-1] Tue Aug 18 16:43:47 2009 @@ -405,7 +405,7 @@ } lpExistingFileName2 = (LPWSTR) HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,max_size * sizeof(WCHAR)); - if (lpNewFileName2 == NULL) + if (lpExistingFileName2 == NULL) { HeapFree(GetProcessHeap(),0,(VOID *) lpNewFileName2); HeapFree(GetProcessHeap(),0,(VOID *) lpDeleteFile);

1 0

[gschneider] 42766: Sync scanf to current wine sources, correct msvcrt cpp sync date
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 16:23:51 2009 New Revision: 42766 URL: http://svn.reactos.org/svn/reactos?rev=42766&view=rev Log: Sync scanf to current wine sources, correct msvcrt cpp sync date Modified: trunk/reactos/lib/sdk/crt/string/scanf.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/sdk/crt/string/scanf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.c [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -48,10 +48,10 @@ * given base, or -1 if the given character is not a digit of the base. */ static int wchar2digit(wchar_t c, int base) { - if ((c>=L'0') && (c<=L'9') && (c<=L'0'+base-1)) return (c-L'0'); + if ((c>='0') && (c<='9') && (c<='0'+base-1)) return (c-'0'); if (base<=10) return -1; - if ((c>=L'A') && (c<=L'Z') && (c<=L'A'+base-11)) return (c-L'A'+10); - if ((c>=L'a') && (c<=L'z') && (c<=L'a'+base-11)) return (c-L'a'+10); + if ((c>='A') && (c<='Z') && (c<='A'+base-11)) return (c-'A'+10); + if ((c>='a') && (c<='z') && (c<='a'+base-11)) return (c-'a'+10); return -1; } @@ -166,7 +166,7 @@ /********************************************************************* * swscanf (MSVCRT.@) */ -int swscanf(const wchar_t *str, const wchar_t *format, ...) +int CDECL swscanf(const wchar_t *str, const wchar_t *format, ...) { va_list valist; int res; @@ -181,7 +181,7 @@ /********************************************************************* * _cscanf (MSVCRT.@) */ -int _cscanf(const char *format, ...) +int CDECL _cscanf(const char *format, ...) { va_list valist; int res; Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -79,7 +79,7 @@ if (!*format) return 0; #ifndef WIDE_SCANF #ifdef CONSOLE - TRACE("(%s): \n", debugstr_a(format)); + TRACE("(%s):\n", debugstr_a(format)); #else /* CONSOLE */ #ifdef STRING TRACE("%s (%s)\n", file, debugstr_a(format)); @@ -151,6 +151,8 @@ switch(*format) { case 'p': case 'P': /* pointer. */ + if (sizeof(void *) == sizeof(LONGLONG)) I64_prefix = 1; + /* fall through */ case 'x': case 'X': /* hexadecimal integer. */ base = 16; @@ -224,7 +226,7 @@ if (!suppress) { #define _SET_NUMBER_(type) *va_arg(ap, type*) = negative ? -cur : cur if (I64_prefix) _SET_NUMBER_(LONGLONG); - else if (l_prefix) _SET_NUMBER_(long int); + else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix) _SET_NUMBER_(short int); else _SET_NUMBER_(int); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Tue Aug 18 16:23:51 2009 @@ -207,7 +207,7 @@ reactos/dll/win32/advapi32/sec/sid.c # Out of Sync gdi32 - - reactos/dll/win32/gdi32/objects/linedda.c # Synched at 20090410 + reactos/dll/win32/gdi32/objects/linedda.c # Synced at 20090410 kernel32 - reactos/dll/win32/kernel32/misc/errormsg.c # Out of sync @@ -216,9 +216,9 @@ reactos/dll/win32/kernel32/misc/lzexpand.c # Synced to Wine-1_1_23 msvcrt - - reactos/lib/sdk/crt/except/cpp.c # Synced at 20071111 + reactos/lib/sdk/crt/except/cpp.c # Synced at 20080528 reactos/lib/sdk/crt/except/cppexcept.c # Synced at 20071111 - reactos/lib/sdk/crt/strings/scanf.c/h # Synced at 20080604 + reactos/lib/sdk/crt/string/scanf.c/h # Synced to Wine-1_1_27 reactos/lib/sdk/crt/strings/wcs.c # Synced at 20080611 reactos/lib/sdk/crt/wine/heap.c # Synced at 20080529 reactos/lib/sdk/crt/wine/undname.c # Synced at 20081130

1 0

[gschneider] 42765: - GetConsoleAliasW: Check for invalid target buffer, failed memory allocation + set last error
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 15:47:02 2009 New Revision: 42765 URL: http://svn.reactos.org/svn/reactos?rev=42765&view=rev Log: - GetConsoleAliasW: Check for invalid target buffer, failed memory allocation + set last error Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Aug 18 15:47:02 2009 @@ -352,6 +352,12 @@ DPRINT("GetConsoleAliasW entered lpSource %S lpExeName %S\n", lpSource, lpExeName); + if (lpTargetBuffer == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + CsrRequest = MAKE_CSR_API(GET_CONSOLE_ALIAS, CSR_CONSOLE); ExeLength = wcslen(lpExeName) + 1; @@ -361,11 +367,17 @@ RequestLength = Size + sizeof(CSR_API_MESSAGE); Request = RtlAllocateHeap(GetProcessHeap(), 0, RequestLength); + if (Request == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } CaptureBuffer = CsrAllocateCaptureBuffer(1, TargetBufferLength); if (!CaptureBuffer) { RtlFreeHeap(GetProcessHeap(), 0, Request); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); return 0; }

1 0

[gschneider] 42764: - GetConsoleAliasA: Check for invalid target buffer, failed memory allocations (3x) - Found by Amine Khaldi
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 15:39:28 2009 New Revision: 42764 URL: http://svn.reactos.org/svn/reactos?rev=42764&view=rev Log: - GetConsoleAliasA: Check for invalid target buffer, failed memory allocations (3x) - Found by Amine Khaldi Modified: trunk/reactos/dll/win32/kernel32/misc/console.c Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c [iso-8859-1] Tue Aug 18 15:39:28 2009 @@ -2,7 +2,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/misc/console.c + * FILE: dll/win32/kernel32/misc/console.c * PURPOSE: Win32 server console functions * PROGRAMMER: James Tabor * <jimtabor(a)adsl-64-217-116-74.dsl.hstntx.swbell.net> @@ -426,15 +426,39 @@ DPRINT("GetConsoleAliasA entered\n"); + if (lpTargetBuffer == NULL) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + dwSourceSize = (strlen(lpSource)+1) * sizeof(WCHAR); lpwSource = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwSourceSize); + if (lpwSource == NULL) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } MultiByteToWideChar(CP_ACP, 0, lpSource, -1, lpwSource, dwSourceSize); dwExeNameSize = (strlen(lpExeName)+1) * sizeof(WCHAR); lpwExeName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwExeNameSize); + if (lpwExeName == NULL) + { + HeapFree(GetProcessHeap(), 0, lpwSource); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } MultiByteToWideChar(CP_ACP, 0, lpExeName, -1, lpwExeName, dwExeNameSize); lpwTargetBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, TargetBufferLength * sizeof(WCHAR)); + if (lpwTargetBuffer == NULL) + { + HeapFree(GetProcessHeap(), 0, lpwSource); + HeapFree(GetProcessHeap(), 0, lpwExeName); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return 0; + } dwResult = GetConsoleAliasW(lpwSource, lpwTargetBuffer, TargetBufferLength * sizeof(WCHAR), lpwExeName);

1 0

[gschneider] 42763: - Improve pipe client mode for improved QEmu debugging: it now waits for a pipe server, threaded - Remove automatic pipe connection mode, that idea is outdated
by gschneider＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: gschneider Date: Tue Aug 18 14:45:45 2009 New Revision: 42763 URL: http://svn.reactos.org/svn/reactos?rev=42763&view=rev Log: - Improve pipe client mode for improved QEmu debugging: it now waits for a pipe server, threaded - Remove automatic pipe connection mode, that idea is outdated Modified: trunk/tools/reactosdbg/Pipe/namedpipe.cs trunk/tools/reactosdbg/RosDBG/Connect.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.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] Tue Aug 18 14:45:45 2009 @@ -13,7 +13,6 @@ { MODE_CLIENT = 0x00000000, MODE_SERVER = 0x00000001, - MODE_AUTO = 0x00000002 } public class NamedPipe : Pipe, NPipe @@ -26,6 +25,7 @@ private bool bClientConn; private Thread waitThread; private NamedPipeServerStream sStream; + private NamedPipeClientStream cStream; public event EventHandler ClientConnectedEvent; public event EventHandler ClientDisconnectedEvent; @@ -90,30 +90,49 @@ waitThread.Start(); } + private void WaitForServer() + { + while (true) + { + try + { + cStream.Connect(10); + } + catch (TimeoutException) + { + /* Dismiss timeout, will try again */ + } + catch (Exception) + { + /* Pipe was killed externally */ + return; + } + if (cStream.IsConnected) + { + ioStream = cStream; + signalConnected(); + return; + } + Thread.Sleep(500); + } + } + public bool CreateClientPipe(string name) { - /* try to connect as a client */ + /* 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; - signalConnected(); - return true; - } - else - { - return false; - } + cStream = new NamedPipeClientStream(".", name, PipeDirection.InOut, PipeOptions.Asynchronous); } catch (Exception) { + /* Pipe couldn't be created */ return false; } + waitThread = new Thread(WaitForServer); + waitThread.Start(); + return true; } public bool CreatePipe(string name, ConnectionMode mode) @@ -124,14 +143,6 @@ } 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 - CreateClientPipe(name); - CreateServerPipe(name); - - return true; - case ConnectionMode.MODE_CLIENT: CreateClientPipe(name); return true; @@ -153,9 +164,17 @@ /* Wake up the write thread so it can die */ newWriteData.Set(); + /* Close connection streams */ if (waitThread != null) { - sStream.Close(); + if (sStream != null) + { + sStream.Close(); + } + else if (cStream != null) + { + cStream.Close(); + } } } Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] Tue Aug 18 14:45:45 2009 @@ -98,8 +98,6 @@ pipeMode = ConnectionMode.MODE_CLIENT; else if (cType.SelectedItem.ToString().CompareTo("Server") == 0) pipeMode = ConnectionMode.MODE_SERVER; - else if (cType.SelectedItem.ToString().CompareTo("Automatic") == 0) - pipeMode = ConnectionMode.MODE_AUTO; Settings.SelectedConnType = Type; Settings.Mode = cType.SelectedItem.ToString(); Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Aug 18 14:45:45 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.68")] -[assembly: AssemblyFileVersion("1.0.2.68")] +[assembly: AssemblyVersion("1.0.2.69")] +[assembly: AssemblyFileVersion("1.0.2.69")]

1 0

[janderwald] 42762: - Implement IPortEvents interface for IPortTopology - Fix a bug in the IPortEvents::QueryInterface handler of IPortWaveCyclic & IPortWavePci
by janderwald＠svn.reactos.org 18 Aug '09

18 Aug '09

Author: janderwald Date: Tue Aug 18 10:24:09 2009 New Revision: 42762 URL: http://svn.reactos.org/svn/reactos?rev=42762&view=rev Log: - Implement IPortEvents interface for IPortTopology - Fix a bug in the IPortEvents::QueryInterface handler of IPortWaveCyclic & IPortWavePci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c [iso-8859-1] Tue Aug 18 10:24:09 2009 @@ -12,6 +12,7 @@ { IPortTopologyVtbl *lpVtbl; ISubdeviceVtbl *lpVtblSubDevice; + IPortEventsVtbl *lpVtblPortEvents; LONG ref; BOOL bInitialized; @@ -66,6 +67,98 @@ } }; +//--------------------------------------------------------------- +// IPortEvents +// + +static +NTSTATUS +NTAPI +IPortEvents_fnQueryInterface( + IPortEvents* iface, + IN REFIID refiid, + OUT PVOID* Output) +{ + IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblPortEvents); + + DPRINT("IPortEvents_fnQueryInterface entered\n"); + + if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || + IsEqualGUIDAligned(refiid, &IID_IUnknown)) + { + *Output = &This->lpVtblPortEvents; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + return STATUS_UNSUCCESSFUL; +} + +static +ULONG +NTAPI +IPortEvents_fnAddRef( + IPortEvents* iface) +{ + IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblPortEvents); + DPRINT("IPortEvents_fnQueryInterface entered\n"); + return InterlockedIncrement(&This->ref); +} + +static +ULONG +NTAPI +IPortEvents_fnRelease( + IPortEvents* iface) +{ + IPortTopologyImpl * This = (IPortTopologyImpl*)CONTAINING_RECORD(iface, IPortTopologyImpl, lpVtblPortEvents); + + DPRINT("IPortEvents_fnRelease entered\n"); + InterlockedDecrement(&This->ref); + + if (This->ref == 0) + { + FreeItem(This, TAG_PORTCLASS); + return 0; + } + /* Return new reference count */ + return This->ref; +} + +static +void +NTAPI +IPortEvents_fnAddEventToEventList( + IPortEvents* iface, + IN PKSEVENT_ENTRY EventEntry) +{ + UNIMPLEMENTED +} + + +static +void +NTAPI +IPortEvents_fnGenerateEventList( + IPortEvents* iface, + IN GUID* Set OPTIONAL, + IN ULONG EventId, + IN BOOL PinEvent, + IN ULONG PinId, + IN BOOL NodeEvent, + IN ULONG NodeId) +{ + UNIMPLEMENTED +} + +static IPortEventsVtbl vt_IPortEvents = +{ + IPortEvents_fnQueryInterface, + IPortEvents_fnAddRef, + IPortEvents_fnRelease, + IPortEvents_fnAddEventToEventList, + IPortEvents_fnGenerateEventList +}; + //--------------------------------------------------------------- // IUnknown interface functions @@ -94,6 +187,12 @@ else if (IsEqualGUIDAligned(refiid, &IID_ISubdevice)) { *Output = &This->lpVtblSubDevice; + InterlockedIncrement(&This->ref); + return STATUS_SUCCESS; + } + else if (IsEqualGUIDAligned(refiid, &IID_IPortEvents)) + { + *Output = &This->lpVtblPortEvents; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } @@ -707,6 +806,7 @@ This->lpVtbl = &vt_IPortTopology; This->lpVtblSubDevice = &vt_ISubdeviceVtbl; + This->lpVtblPortEvents = &vt_IPortEvents; This->ref = 1; *OutPort = (PPORT)(&This->lpVtbl); DPRINT("NewPortTopology result %p\n", *OutPort); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c [iso-8859-1] Tue Aug 18 10:24:09 2009 @@ -13,9 +13,6 @@ typedef struct { IPortWaveCyclicVtbl *lpVtbl; - IPortEventsVtbl *lpVbtlPortEvents; - IUnregisterSubdeviceVtbl *lpVtblUnregisterSubdevice; - IUnregisterPhysicalConnectionVtbl *lpVtblPhysicalConnection; IPortEventsVtbl *lpVtblPortEvents; ISubdeviceVtbl *lpVtblSubDevice; @@ -111,7 +108,7 @@ if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { - *Output = &This->lpVbtlPortEvents; + *Output = &This->lpVtblPortEvents; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.c [iso-8859-1] Tue Aug 18 10:24:09 2009 @@ -93,7 +93,7 @@ if (IsEqualGUIDAligned(refiid, &IID_IPortEvents) || IsEqualGUIDAligned(refiid, &IID_IUnknown)) { - *Output = &This->lpVtblServiceSink; + *Output = &This->lpVtblPortEvents; InterlockedIncrement(&This->ref); return STATUS_SUCCESS; }

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