Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 40484: - Simplify my last changes. Thanks Goplat ; )
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 20:06:08 2009 New Revision: 40484 URL: http://svn.reactos.org/svn/reactos?rev=40484&view=rev Log: - Simplify my last changes. Thanks Goplat ;) Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Mon Apr 13 20:06:08 2009 @@ -720,34 +720,12 @@ if (lpCurrentDirectory) { - LPWSTR FilePart, Buffer = NULL; - - Buffer = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - (MAX_PATH + 1) * sizeof(WCHAR)); - - if (!Buffer) - { - SetLastErrorByStatus(STATUS_NO_MEMORY); - return FALSE; - } - - if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + if ((GetFileAttributesW(lpCurrentDirectory) == INVALID_FILE_ATTRIBUTES) || + !(GetFileAttributesW(lpCurrentDirectory) & FILE_ATTRIBUTE_DIRECTORY)) + { SetLastError(ERROR_DIRECTORY); return FALSE; } - - if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) || - !(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY)) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); - SetLastError(ERROR_DIRECTORY); - return FALSE; - } - - RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); } /*

1 0

[dchapyshev] 40483: - Fix 3 winetests for CreateProcessA/W
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 19:49:54 2009 New Revision: 40483 URL: http://svn.reactos.org/svn/reactos?rev=40483&view=rev Log: - Fix 3 winetests for CreateProcessA/W Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c Modified: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/procsup.c [iso-8859-1] Mon Apr 13 19:49:54 2009 @@ -718,6 +718,38 @@ return FALSE; } + if (lpCurrentDirectory) + { + LPWSTR FilePart, Buffer = NULL; + + Buffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + (MAX_PATH + 1) * sizeof(WCHAR)); + + if (!Buffer) + { + SetLastErrorByStatus(STATUS_NO_MEMORY); + return FALSE; + } + + if (GetFullPathNameW(lpCurrentDirectory, MAX_PATH, Buffer, &FilePart) > MAX_PATH) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastError(ERROR_DIRECTORY); + return FALSE; + } + + if ((GetFileAttributesW(Buffer) == INVALID_FILE_ATTRIBUTES) || + !(GetFileAttributesW(Buffer) & FILE_ATTRIBUTE_DIRECTORY)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + SetLastError(ERROR_DIRECTORY); + return FALSE; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, Buffer); + } + /* * We're going to modify and mask out flags and stuff in lpStartupInfo, * so we'll use our own local copy for that.

1 0

[sedwards] 40482: move telnetd out of rosapps
by sedwards＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: sedwards Date: Mon Apr 13 17:30:03 2009 New Revision: 40482 URL: http://svn.reactos.org/svn/reactos?rev=40482&view=rev Log: move telnetd out of rosapps Removed: trunk/rosapps/applications/sysutils/telnetd/ Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu… ============================================================================== --- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Mon Apr 13 17:30:03 2009 @@ -52,10 +52,6 @@ <xi:include href="tcat/tcat.rbuild" /> </directory> - <directory name="telnetd"> - <xi:include href="telnetd/telnetd.rbuild" /> - </directory> - <directory name="utils"> <xi:include href="utils/utils.rbuild" /> </directory>

1 0

[sedwards] 40481: move telnetd to main tree, not enabled yet
by sedwards＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: sedwards Date: Mon Apr 13 17:29:21 2009 New Revision: 40481 URL: http://svn.reactos.org/svn/reactos?rev=40481&view=rev Log: move telnetd to main tree, not enabled yet Added: trunk/reactos/base/services/telnetd/ (props changed) - copied from r40480, trunk/rosapps/applications/sysutils/telnetd/ Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Propchange: trunk/reactos/base/services/telnetd/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Mon Apr 13 17:29:21 2009 @@ -670,7 +670,6 @@ modules\rosapps\applications\sysutils\pedump\pedump.exe 1 optional modules\rosapps\applications\sysutils\regexpl\regexpl.exe 1 optional modules\rosapps\applications\sysutils\tcat\tcat.exe 1 optional -modules\rosapps\applications\sysutils\telnetd\telnetd.exe 1 optional modules\rosapps\applications\sysutils\tlist\tlist.exe 1 optional modules\rosapps\applications\sysutils\screenshot\screenshot.exe 1 optional modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe 1 optional

1 0

[dchapyshev] 40480: - Add more check on CodePage = 0. +2 passed wine tests
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 16:33:33 2009 New Revision: 40480 URL: http://svn.reactos.org/svn/reactos?rev=40480&view=rev Log: - Add more check on CodePage = 0. +2 passed wine tests Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 16:33:33 2009 @@ -3023,12 +3023,20 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) + if (Request->Data.SetConsoleOutputCodePage.CodePage == 0) + { + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; + } + else + { + if (IsValidCodePage(Request->Data.SetConsoleOutputCodePage.CodePage)) { Console->OutputCodePage = Request->Data.SetConsoleOutputCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } + } ConioUnlockConsole(Console); return STATUS_UNSUCCESSFUL; }

1 0

[dchapyshev] 40479: - Add check on CodePage = 0. +2 passed wine tests
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 16:26:28 2009 New Revision: 40479 URL: http://svn.reactos.org/svn/reactos?rev=40479&view=rev Log: - Add check on CodePage = 0. +2 passed wine tests Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Mon Apr 13 16:26:28 2009 @@ -2970,12 +2970,20 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) + if (Request->Data.SetConsoleCodePage.CodePage == 0) + { + ConioUnlockConsole(Console); + return STATUS_INVALID_PARAMETER; + } + else + { + if (IsValidCodePage(Request->Data.SetConsoleCodePage.CodePage)) { Console->CodePage = Request->Data.SetConsoleCodePage.CodePage; ConioUnlockConsole(Console); return STATUS_SUCCESS; } + } ConioUnlockConsole(Console); return STATUS_UNSUCCESSFUL; }

1 0

[dchapyshev] 40478: - Fully implement GetProcessVersion. +1 passed winetest
by dchapyshev＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: dchapyshev Date: Mon Apr 13 15:58:39 2009 New Revision: 40478 URL: http://svn.reactos.org/svn/reactos?rev=40478&view=rev Log: - Fully implement GetProcessVersion. +1 passed winetest Modified: trunk/reactos/dll/win32/kernel32/process/proc.c Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… ============================================================================== --- trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/process/proc.c [iso-8859-1] Mon Apr 13 15:58:39 2009 @@ -781,30 +781,89 @@ * @implemented */ DWORD WINAPI -GetProcessVersion (DWORD ProcessId) -{ - DWORD Version = 0; - PIMAGE_NT_HEADERS NtHeader = NULL; - PVOID BaseAddress = NULL; - - /* Caller's */ - if (0 == ProcessId || GetCurrentProcessId() == ProcessId) - { - BaseAddress = (PVOID) NtCurrentPeb()->ImageBaseAddress; - NtHeader = RtlImageNtHeader (BaseAddress); - if (NULL != NtHeader) - { - Version = - (NtHeader->OptionalHeader.MajorOperatingSystemVersion << 16) | - (NtHeader->OptionalHeader.MinorOperatingSystemVersion); - } - } - else /* other process */ - { - /* FIXME: open the other process */ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - } - return (Version); +GetProcessVersion(DWORD ProcessId) +{ + DWORD Version = 0; + PIMAGE_NT_HEADERS NtHeader = NULL; + IMAGE_NT_HEADERS NtHeaders; + IMAGE_DOS_HEADER DosHeader; + PROCESS_BASIC_INFORMATION ProcessBasicInfo; + PVOID BaseAddress = NULL; + HANDLE ProcessHandle; + NTSTATUS Status; + SIZE_T Count; + PEB Peb; + + _SEH2_TRY + { + /* Caller's */ + if (0 == ProcessId || GetCurrentProcessId() == ProcessId) + { + BaseAddress = (PVOID) NtCurrentPeb()->ImageBaseAddress; + NtHeader = RtlImageNtHeader(BaseAddress); + + Version = (NtHeader->OptionalHeader.MajorOperatingSystemVersion << 16) | + (NtHeader->OptionalHeader.MinorOperatingSystemVersion); + } + else /* other process */ + { + ProcessHandle = OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, + FALSE, + ProcessId); + + if (!ProcessHandle) return 0; + + Status = NtQueryInformationProcess(ProcessHandle, + ProcessBasicInformation, + &ProcessBasicInfo, + sizeof(ProcessBasicInfo), + NULL); + if (!NT_SUCCESS(Status)) goto Error; + + Status = NtReadVirtualMemory(ProcessHandle, + ProcessBasicInfo.PebBaseAddress, + &Peb, + sizeof(Peb), + &Count); + if (!NT_SUCCESS(Status) || Count != sizeof(Peb)) goto Error; + + memset(&DosHeader, 0, sizeof(DosHeader)); + Status = NtReadVirtualMemory(ProcessHandle, + Peb.ImageBaseAddress, + &DosHeader, + sizeof(DosHeader), + &Count); + + if (!NT_SUCCESS(Status) || Count != sizeof(DosHeader)) goto Error; + if (DosHeader.e_magic != IMAGE_DOS_SIGNATURE) goto Error; + + memset(&NtHeaders, 0, sizeof(NtHeaders)); + Status = NtReadVirtualMemory(ProcessHandle, + (char *)Peb.ImageBaseAddress + DosHeader.e_lfanew, + &NtHeaders, + sizeof(NtHeaders), + &Count); + + if (!NT_SUCCESS(Status) || Count != sizeof(NtHeaders)) goto Error; + if (NtHeaders.Signature != IMAGE_NT_SIGNATURE) goto Error; + + Version = MAKELONG(NtHeaders.OptionalHeader.MinorSubsystemVersion, + NtHeaders.OptionalHeader.MajorSubsystemVersion); + +Error: + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + } + } + } + _SEH2_FINALLY + { + if (ProcessHandle) CloseHandle(ProcessHandle); + } + _SEH2_END; + + return Version; }

1 0

[cgutman] 40477: - Fix release build (try 1)
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 10:04:14 2009 New Revision: 40477 URL: http://svn.reactos.org/svn/reactos?rev=40477&view=rev Log: - Fix release build (try 1) Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 10:04:14 2009 @@ -14,9 +14,7 @@ #include "ndissys.h" #include "efilter.h" -#ifdef DBG #include <buffer.h> -#endif /* DBG */ #undef NdisMSendComplete VOID

1 0

[cgutman] 40476: - Fix a typo
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 07:26:18 2009 New Revision: 40476 URL: http://svn.reactos.org/svn/reactos?rev=40476&view=rev Log: - Fix a typo Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 07:26:18 2009 @@ -328,7 +328,7 @@ LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); - if (!LookAheadSize) + if (!LookAheadBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); return;

1 0

[cgutman] 40475: - Implement the rest of MiniIndicateReceivePacket - rtl8139 partially works now - It gets an IP address and can ping other computers but attempting to download something results in a page fault during the download
by cgutman＠svn.reactos.org 13 Apr '09

13 Apr '09

Author: cgutman Date: Mon Apr 13 07:11:42 2009 New Revision: 40475 URL: http://svn.reactos.org/svn/reactos?rev=40475&view=rev Log: - Implement the rest of MiniIndicateReceivePacket - rtl8139 partially works now - It gets an IP address and can ping other computers but attempting to download something results in a page fault during the download Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Mon Apr 13 07:11:42 2009 @@ -297,6 +297,60 @@ (*AdapterBinding->ProtocolBinding->Chars.ReceivePacketHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, PacketArray[i]); + } + } + else + { + for (i = 0; i < NumberOfPackets; i++) + { + UINT FirstBufferLength, TotalBufferLength, LookAheadSize, HeaderSize; + PNDIS_BUFFER NdisBuffer; + PVOID NdisBufferVA, LookAheadBuffer; + NDIS_STATUS NdisStatus; + + + NdisGetFirstBufferFromPacket(PacketArray[i], + &NdisBuffer, + &NdisBufferVA, + &FirstBufferLength, + &TotalBufferLength); + + HeaderSize = NDIS_GET_PACKET_HEADER_SIZE(PacketArray[i]); + + if (Adapter->NdisMiniportBlock.CurrentLookahead < (TotalBufferLength - HeaderSize)) + { + LookAheadSize = Adapter->NdisMiniportBlock.CurrentLookahead; + } + else + { + LookAheadSize = TotalBufferLength - HeaderSize; + } + + + LookAheadBuffer = ExAllocatePool(NonPagedPool, LookAheadSize); + if (!LookAheadSize) + { + NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + return; + } + + CopyBufferChainToBuffer(LookAheadBuffer, + NdisBuffer, + HeaderSize, + LookAheadSize); + + NdisStatus = (*AdapterBinding->ProtocolBinding->Chars.ReceiveHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + AdapterBinding->NdisOpenBlock.MacHandle, + NdisBufferVA, + HeaderSize, + LookAheadBuffer, + LookAheadSize, + TotalBufferLength - HeaderSize); + + NDIS_SET_PACKET_STATUS(PacketArray[i], NdisStatus); + + ExFreePool(LookAheadBuffer); } }

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