Author: tfaber
Date: Thu Apr 9 10:36:35 2015
New Revision: 67110
URL: http://svn.reactos.org/svn/reactos?rev=67110&view=rev
Log:
[NDISUIO]
- Another addendum to r67107: don't let CleanupAndFreePacket try to free the buffer since it does not have the correct pointer
CORE-8210
Modified:
trunk/reactos/drivers/network/ndisuio/protocol.c
Modified: trunk/reactos/drivers/network/ndisuio/protocol.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndisuio/pr…
==============================================================================
--- trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/network/ndisuio/protocol.c [iso-8859-1] Thu Apr 9 10:36:35 2015
@@ -187,7 +187,7 @@
if (Status != NDIS_STATUS_SUCCESS)
{
DPRINT1("Failed to transfer data with status 0x%x\n", Status);
- CleanupAndFreePacket(Packet, TRUE);
+ CleanupAndFreePacket(Packet, FALSE);
ExFreePool(PacketBuffer);
return NDIS_STATUS_NOT_ACCEPTED;
}
Author: hbelusca
Date: Wed Apr 8 23:19:18 2015
New Revision: 67105
URL: http://svn.reactos.org/svn/reactos?rev=67105&view=rev
Log:
[CONSRV]
- Remove a useless declaration in conio.h and a useless import lib.
- Move "condrv" part of the console server into "conlib" (console library): the functions that are there are quite general enough to implement a NT text+graphics console library (which is indeed used by the console server to implement the win32 consoles). See CORE-9496 for the details: the aim now would be to extract the pith and marrow out of this conlib to place it into a real "condrv" (console driver).
Added:
branches/condrv_restructure/win32ss/user/winsrv/consrv/conlib/
- copied from r67083, branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/
Removed:
branches/condrv_restructure/win32ss/user/winsrv/consrv/condrv/
Modified:
branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv.cmake [iso-8859-1] Wed Apr 8 23:19:18 2015
@@ -20,12 +20,12 @@
consrv/settings.c
consrv/shutdown.c
consrv/subsysreg.c
- consrv/condrv/coninput.c
- consrv/condrv/conoutput.c
- consrv/condrv/console.c
- consrv/condrv/dummyterm.c
- consrv/condrv/graphics.c
- consrv/condrv/text.c
+ consrv/conlib/coninput.c
+ consrv/conlib/conoutput.c
+ consrv/conlib/console.c
+ consrv/conlib/dummyterm.c
+ consrv/conlib/graphics.c
+ consrv/conlib/text.c
consrv/frontends/input.c
consrv/frontends/terminal.c
consrv/frontends/gui/conwnd.c
@@ -55,7 +55,7 @@
add_dependencies(consrv psdk)
add_pch(consrv consrv/consrv.h CONSRV_SOURCE)
#add_object_library(consrv ${CONSRV_SOURCE})
-list(APPEND CONSRV_IMPORT_LIBS psapi)
+#list(APPEND CONSRV_IMPORT_LIBS )
list(APPEND CONSRV_DELAY_IMPORT_LIBS ole32)
list(APPEND CONSRV_TARGET_LINK_LIBS concfg uuid)
set_module_type(consrv module UNICODE)
Modified: branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h
URL: http://svn.reactos.org/svn/reactos/branches/condrv_restructure/win32ss/user…
==============================================================================
--- branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] (original)
+++ branches/condrv_restructure/win32ss/user/winsrv/consrv/include/conio.h [iso-8859-1] Wed Apr 8 23:19:18 2015
@@ -354,10 +354,6 @@
VOID NTAPI
ConDrvUnpause(PCONSOLE Console);
-NTSTATUS
-ConSrvConsoleCtrlEvent(IN ULONG CtrlEvent,
- IN PCONSOLE_PROCESS_DATA ProcessData);
-
#define GetConsoleInputBufferMode(Console) \
(Console)->InputBuffer.Mode