Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[sginsberg] 35032: - Clean up ntdll a bit
by sginsberg＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: sginsberg Date: Sat Aug 2 07:46:02 2008 New Revision: 35032 URL: http://svn.reactos.org/svn/reactos?rev=35032&view=rev Log: - Clean up ntdll a bit Added: trunk/reactos/dll/ntdll/dispatch/ (props changed) - copied from r35027, trunk/reactos/dll/ntdll/main/ trunk/reactos/dll/ntdll/include/ (props changed) - copied from r35027, trunk/reactos/dll/ntdll/inc/ Removed: trunk/reactos/dll/ntdll/inc/ trunk/reactos/dll/ntdll/main/ Modified: trunk/reactos/dll/ntdll/csr/capture.c trunk/reactos/dll/ntdll/dispatch/dispatch.c trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/dll/ntdll/include/ntdll.h trunk/reactos/dll/ntdll/include/ntdllp.h trunk/reactos/dll/ntdll/ldr/elf.c trunk/reactos/dll/ntdll/ldr/startup.c trunk/reactos/dll/ntdll/ldr/utils.c trunk/reactos/dll/ntdll/ntdll.rbuild trunk/reactos/dll/ntdll/rtl/version.c Modified: trunk/reactos/dll/ntdll/csr/capture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/csr/capture.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/csr/capture.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/csr/capture.c - * PURPOSE: routines for probing and capturing CSR API Messages + * PURPOSE: Routines for probing and capturing CSR API Messages * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 2 07:46:02 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/ntdll/dispatch/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/dll/ntdll/dispatch/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/dispatc… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/dispatch.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,6 +1,7 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NT Library - * FILE: lib/ntdll/main/dispatch.c + * FILE: dll/ntdll/dispatch/dispatch.c * PURPOSE: User-Mode NT Dispatchers * PROGRAMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch <welch(a)cwcom.net> Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… ============================================================================== --- trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS NT Library - * FILE: lib/ntdll/main/i386/dispatch.S + * FILE: dl/ntdll/dispatch/i386/dispatch.S * PURPOSE: User-Mode NT Dispatchers * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ Propchange: trunk/reactos/dll/ntdll/include/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Sat Aug 2 07:46:02 2008 @@ -1,0 +1,7 @@ +GNUmakefile +*.vcproj +*.user +*.cbp +*.ncb +*.suo +*.sln Propchange: trunk/reactos/dll/ntdll/include/ ------------------------------------------------------------------------------ svn:mergeinfo = Modified: trunk/reactos/dll/ntdll/include/ntdll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdll.h?… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdll.h [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries - * FILE: lib/ntdll/inc/ntdll.h + * FILE: dll/ntdll/include/ntdll.h * PURPOSE: Native Libary Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/ntdll/include/ntdllp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h… ============================================================================== --- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS System Libraries - * FILE: lib/ntdll/inc/ntdllp.h + * FILE: dll/ntdll/include/ntdllp.h * PURPOSE: Native Libary Internal Header * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) */ Modified: trunk/reactos/dll/ntdll/ldr/elf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/elf.c?rev=35… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/elf.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,6 +1,3 @@ -/* $Id$ -*/ - /* * REACTOS ELF LOADER * @@ -35,6 +32,7 @@ * * $FreeBSD: src/libexec/rtld-elf/rtld.c,v 1.101 2004/11/02 09:42:21 ssouhlal Exp $ */ + /* * Dynamic linker for ELF. Modified: trunk/reactos/dll/ntdll/ldr/startup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/startup.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/startup.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/ldr/startup.c Modified: trunk/reactos/dll/ntdll/ldr/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/utils.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/utils.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: lib/ntdll/ldr/utils.c Modified: trunk/reactos/dll/ntdll/ntdll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ntdll.rbuild?rev… ============================================================================== --- trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ntdll.rbuild [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -4,8 +4,8 @@ <module name="ntdll" type="win32dll" entrypoint="0" baseaddress="${BASEADDRESS_NTDLL}" installbase="system32" installname="ntdll.dll"> <bootstrap installbase="$(CDOUTPUT)/system32" /> <importlibrary definition="def/ntdll_$(ARCH).def" /> - <include base="ntdll">inc</include> - <include base="ntdll" root="intermediate">def</include> + <include base="ntdll">include</include> + <include base="ntdll" root="intermediate"></include> <include base="ReactOS">include/reactos/subsys</include> <define name="__NTDLL__" /> <define name="_DISABLE_TIDENTS" /> @@ -25,11 +25,7 @@ <directory name="dbg"> <file>dbgui.c</file> </directory> - <directory name="ldr"> - <file>startup.c</file> - <file>utils.c</file> - </directory> - <directory name="main"> + <directory name="dispatch"> <if property="ARCH" value="i386"> <directory name="i386"> <file>dispatch.S</file> @@ -44,6 +40,13 @@ <file>dispatch.c</file> </ifnot> </directory> + <directory name="include"> + <pch>ntdll.h</pch> + </directory> + <directory name="ldr"> + <file>startup.c</file> + <file>utils.c</file> + </directory> <directory name="rtl"> <file>libsupp.c</file> <file>version.c</file> @@ -51,8 +54,5 @@ <directory name="def"> <file>ntdll.rc</file> </directory> - <directory name="inc"> - <pch>ntdll.h</pch> - </directory> </module> </group> Modified: trunk/reactos/dll/ntdll/rtl/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/rtl/version.c?re… ============================================================================== --- trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/rtl/version.c [iso-8859-1] Sat Aug 2 07:46:02 2008 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * FILE: lib/ntdll/rtl/process.c

1 0

[fireball] 35031: - Update with 3 more additional (only available in a checked build) syscalls.
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 06:53:54 2008 New Revision: 35031 URL: http://svn.reactos.org/svn/reactos?rev=35031&view=rev Log: - Update with 3 more additional (only available in a checked build) syscalls. Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db Modified: branches/nwin32/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/nwin32/subsystems/win32/win32k/… ============================================================================== --- branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/nwin32/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Sat Aug 2 06:53:54 2008 @@ -661,5 +661,8 @@ NtGdiBRUSHOBJ_DeleteRbrush 2 NtGdiUMPDEngFreeUserMem 1 NtGdiDrawStream 3 +#NtUserDbgWin32HeapFail 2 # checked build only +#NtUserDbgWin32HeapStat 2 # checked build only +#NtUserSetRipFlags 1 # checked build only NtGdiMakeObjectXferable 2 NtGdiMakeObjectUnXferable 1

1 0

[fireball] 35030: - Remove unneeded code, which would have its 10 years anniversary in ~20 days (committed originally by Rex back in August, 1998, revision number 8(!), and coded by David Welch, never touched since then).
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 05:55:56 2008 New Revision: 35030 URL: http://svn.reactos.org/svn/reactos?rev=35030&view=rev Log: - Remove unneeded code, which would have its 10 years anniversary in ~20 days (committed originally by Rex back in August, 1998, revision number 8(!), and coded by David Welch, never touched since then). Removed: trunk/reactos/ntoskrnl/rtl/strtok.c Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sat Aug 2 05:55:56 2008 @@ -443,7 +443,6 @@ </if> <file>libsupp.c</file> <file>misc.c</file> - <file>strtok.c</file> </directory> <directory name="se"> <file>access.c</file> Removed: trunk/reactos/ntoskrnl/rtl/strtok.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/strtok.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/strtok.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/strtok.c (removed) @@ -1,109 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/rtl/strtok.c - * PURPOSE: Unicode and thread safe implementation of strtok - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - - -/* FUNCTIONS *****************************************************************/ - -char* __cdecl strtok(char *s, const char *delim) -{ - const char *spanp; - int c, sc; - char *tok; - static char *last; - - if (s == NULL && (s = last) == NULL) - return (NULL); - - /* - * Skip (span) leading delimiters (s += strspn(s, delim), sort of). - */ - cont: - c = *s++; - for (spanp = delim; (sc = *spanp++) != 0;) { - if (c == sc) - goto cont; - } - - if (c == 0) { /* no non-delimiter characters */ - last = NULL; - return (NULL); - } - tok = s - 1; - - /* - * Scan token (scan for delimiters: s += strcspn(s, delim), sort of). - * Note that delim must have one NUL; we stop if we see that, too. - */ - for (;;) { - c = *s++; - spanp = delim; - do { - if ((sc = *spanp++) == c) { - if (c == 0) - s = NULL; - else - s[-1] = 0; - last = s; - return (tok); - } - } while (sc != 0); - } - /* NOTREACHED */ -} - -PWSTR RtlStrtok(PUNICODE_STRING _string, PWSTR _sep, - PWSTR* temp) -/* - * FUNCTION: Splits a string into tokens - * ARGUMENTS: - * string = string to operate on - * if NULL then continue with previous string - * sep = Token deliminators - * temp = Tempory storage provided by the caller - * ARGUMENTS: Returns the beginning of the next token - */ -{ - PWSTR string; - PWSTR sep; - PWSTR start; - - if (_string!=NULL) - { - string = _string->Buffer; - } - else - { - string = *temp; - } - - start = string; - - while ((*string)!=0) - { - sep = _sep; - while ((*sep)!=0) - { - if ((*string)==(*sep)) - { - *string=0; - *temp=string+1; - return(start); - } - sep++; - } - string++; - } - *temp=NULL; - return(start); -}

1 0

[cfinck] 35029: Change the version to 0.3.6
by cfinck＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cfinck Date: Sat Aug 2 05:19:56 2008 New Revision: 35029 URL: http://svn.reactos.org/svn/reactos?rev=35029&view=rev Log: Change the version to 0.3.6 Modified: branches/ros-branch-0_3_6/reactos/include/reactos/version.h Modified: branches/ros-branch-0_3_6/reactos/include/reactos/version.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_6/reactos/includ… ============================================================================== --- branches/ros-branch-0_3_6/reactos/include/reactos/version.h [iso-8859-1] (original) +++ branches/ros-branch-0_3_6/reactos/include/reactos/version.h [iso-8859-1] Sat Aug 2 05:19:56 2008 @@ -18,13 +18,13 @@ #define __VERSION_H #define KERNEL_VERSION_MAJOR 0 -#define KERNEL_VERSION_MINOR 4 -#define KERNEL_VERSION_PATCH_LEVEL 0 +#define KERNEL_VERSION_MINOR 3 +#define KERNEL_VERSION_PATCH_LEVEL 6 #define COPYRIGHT_YEAR "2008" /* KERNEL_VERSION_BUILD_TYPE is L"SVN", L"RC1", L"RC2" or L"" (for the release) */ -#define KERNEL_VERSION_BUILD_TYPE L"SVN" +#define KERNEL_VERSION_BUILD_TYPE L"" #endif

1 0

[arty] 35028: Automatic modules. This will be safe at early breakin after the int1 fix that's forthcoming.
by arty＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: arty Date: Sat Aug 2 04:48:48 2008 New Revision: 35028 URL: http://svn.reactos.org/svn/reactos?rev=35028&view=rev Log: Automatic modules. This will be safe at early breakin after the int1 fix that's forthcoming. Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/Modules.cs Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sat Aug 2 04:48:48 2008 @@ -39,6 +39,7 @@ static Regex mRegLineEFLAGS = new Regex("EFLAGS 0x(?<eflags>[0-9a-fA-F]+).*"); static Regex mSregLine = new Regex("[CDEFGS]S 0x(?<seg>[0-9a-fA-F]+).*"); + bool mFirstModuleUpdate = false; StringBuilder mInputBuffer = new StringBuilder(); int usedInput; @@ -83,8 +84,13 @@ if (cleanedLine.StartsWith("Entered debugger on ")) { GetRegisterUpdate(); + continue; + } + + if (!mFirstModuleUpdate) + { GetModuleUpdate(); - continue; + mFirstModuleUpdate = true; } Match memoryMatch = mMemoryRowUpdate.Match(cleanedLine); @@ -289,23 +295,27 @@ { QueueCommand("step"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Next() { QueueCommand("next"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Break() { mConnection.Write("\r"); GetRegisterUpdate(); + GetModuleUpdate(); } public void Go(ulong address) { mRunning = true; + mFirstModuleUpdate = false; QueueCommand("cont"); } Modified: trunk/tools/reactosdbg/RosDBG/Modules.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Modules.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Modules.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Modules.cs [iso-8859-1] Sat Aug 2 04:48:48 2008 @@ -10,7 +10,7 @@ namespace RosDBG { - [DebugControl] + [DebugControl,BuildAtStartup] public partial class Modules : UserControl, IUseDebugConnection { public SortedList<uint, string> mModules = new SortedList<uint, string>();

1 0

[sginsberg] 35027: - Fix broken UnmapViewOfFile definition
by sginsberg＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: sginsberg Date: Sat Aug 2 04:29:16 2008 New Revision: 35027 URL: http://svn.reactos.org/svn/reactos?rev=35027&view=rev Log: - Fix broken UnmapViewOfFile definition Modified: trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/section.c [iso-8859-1] Sat Aug 2 04:29:16 2008 @@ -240,12 +240,12 @@ */ BOOL NTAPI -UnmapViewOfFile(LPVOID lpBaseAddress) +UnmapViewOfFile(LPCVOID lpBaseAddress) { NTSTATUS Status; /* Unmap the section */ - Status = NtUnmapViewOfSection(NtCurrentProcess(), lpBaseAddress); + Status = NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)lpBaseAddress); if (!NT_SUCCESS(Status)) { /* We failed */ Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Sat Aug 2 04:29:16 2008 @@ -2046,7 +2046,7 @@ BOOL WINAPI UnlockFileEx(HANDLE,DWORD,DWORD,DWORD,LPOVERLAPPED); #define UnlockResource(h) (h) #define UnlockSegment(w) GlobalUnfix((HANDLE)(w)) /* Obsolete: Has no effect. */ -BOOL WINAPI UnmapViewOfFile(PVOID); +BOOL WINAPI UnmapViewOfFile(LPCVOID); #if (_WIN32_WINNT >= 0x0500) BOOL WINAPI UnregisterWait(HANDLE); BOOL WINAPI UnregisterWaitEx(HANDLE,HANDLE);

1 0

[fireball] 35026: Branch 0.3.6 release.
by fireball＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: fireball Date: Sat Aug 2 02:14:00 2008 New Revision: 35026 URL: http://svn.reactos.org/svn/reactos?rev=35026&view=rev Log: Branch 0.3.6 release. Added: branches/ros-branch-0_3_6/ - copied from r35025, trunk/

1 0

[jimtabor] 35025: - Dereference pointer to event and fix module check in hooks.
by jimtabor＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: jimtabor Date: Sat Aug 2 01:21:55 2008 New Revision: 35025 URL: http://svn.reactos.org/svn/reactos?rev=35025&view=rev Log: - Dereference pointer to event and fix module check in hooks. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c trunk/reactos/subsystems/win32/win32k/ntuser/hook.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/event.c [iso-8859-1] Sat Aug 2 01:21:55 2008 @@ -362,6 +362,8 @@ else pEH->Proc = lpfnWinEventProc; + UserDereferenceObject(pEH); + Ret = Handle; IntSetSrvEventMask( eventMin, eventMax); } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/hook.c [iso-8859-1] Sat Aug 2 01:21:55 2008 @@ -1143,10 +1143,9 @@ RETURN( NULL); } Hook->ModuleName.Length = ModuleName.Length; - } - - if (Mod) /* make proc relative to the module base */ - Hook->Proc = (void *)((char *)HookProc - (char *)Mod); + /* make proc relative to the module base */ + Hook->Proc = (void *)((char *)HookProc - (char *)Mod); + } else Hook->Proc = HookProc;

1 0

[cgutman] 35024: - Fix a bug where Irp->IoStatus wasn't set if Status == STATUS_PENDING
by cgutman＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cgutman Date: Fri Aug 1 22:51:17 2008 New Revision: 35024 URL: http://svn.reactos.org/svn/reactos?rev=35024&view=rev Log: - Fix a bug where Irp->IoStatus wasn't set if Status == STATUS_PENDING Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Aug 1 22:51:17 2008 @@ -237,6 +237,9 @@ UINT Information, PIO_COMPLETION_ROUTINE Completion ) { + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = Information; + if( Status == STATUS_PENDING ) { /* We should firstly mark this IRP as pending, because otherwise it may be completed by StreamSocketConnectComplete() @@ -246,8 +249,6 @@ } else { if ( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); SocketStateUnlock( FCB ); - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = Information; if( Completion ) Completion( FCB->DeviceExt->DeviceObject, Irp, FCB ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT );

1 0

[cgutman] 35023: - Make sure to set Irp->IoStatus.Status to the correct status
by cgutman＠svn.reactos.org 02 Aug '08

02 Aug '08

Author: cgutman Date: Fri Aug 1 22:17:53 2008 New Revision: 35023 URL: http://svn.reactos.org/svn/reactos?rev=35023&view=rev Log: - Make sure to set Irp->IoStatus.Status to the correct status Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Fri Aug 1 22:17:53 2008 @@ -518,6 +518,8 @@ if( Complete ) IRPFinish( Irp, Status ); + else + Irp->IoStatus.Status = Status; return Status; }

1 0

← Newer
1
...
79
80
81
82
83
84
85
86
Older →

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 August 2008