Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 24476: Formatting and add a call to StartServiceCtrlDispatcher
by hpoussin＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: hpoussin Date: Mon Oct 9 23:16:47 2006 New Revision: 24476 URL: http://svn.reactos.org/svn/reactos?rev=24476&view=rev Log: Formatting and add a call to StartServiceCtrlDispatcher Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/base/system/lsass/lsass.rbuild Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c (original) +++ trunk/reactos/base/system/lsass/lsass.c Mon Oct 9 23:16:47 2006 @@ -37,44 +37,63 @@ #define NDEBUG #include <debug.h> +static VOID CALLBACK +ServiceMain(DWORD argc, LPTSTR *argv); -int STDCALL -WinMain(HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPSTR lpCmdLine, - int nShowCmd) +static SERVICE_TABLE_ENTRY ServiceTable[2] = { - NTSTATUS Status = STATUS_SUCCESS; + {TEXT("NetLogon"), ServiceMain}, + {NULL, NULL} +}; - DPRINT("Local Security Authority Subsystem\n"); - DPRINT(" Initializing...\n"); +static VOID CALLBACK +ServiceMain( + IN DWORD argc, + IN LPWSTR *argv) +{ + DPRINT1("ServiceMain() called\n"); +} - /* Initialize the LSA server DLL. */ - Status = LsapInitLsa(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } +INT WINAPI +WinMain( + IN HINSTANCE hInstance, + IN HINSTANCE hPrevInstance, + IN LPSTR lpCmdLine, + IN INT nShowCmd) +{ + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("Local Security Authority Subsystem\n"); + DPRINT(" Initializing...\n"); + + /* Initialize the LSA server DLL. */ + Status = LsapInitLsa(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("LsapInitLsa() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #if 0 - /* Initialize the SAM server DLL. */ - Status = SamIInitialize(); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); - goto ByeBye; - } + /* Initialize the SAM server DLL. */ + Status = SamIInitialize(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SamIInitialize() failed (Status 0x%08lX)\n", Status); + goto ByeBye; + } #endif - /* FIXME: More initialization */ + /* FIXME: More initialization */ - DPRINT(" Done...\n"); + StartServiceCtrlDispatcher(ServiceTable); + + DPRINT(" Done...\n"); ByeBye: - NtTerminateThread(NtCurrentThread(), Status); + NtTerminateThread(NtCurrentThread(), Status); - return 0; + return 0; } /* EOF */ Modified: trunk/reactos/base/system/lsass/lsass.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.rb… ============================================================================== --- trunk/reactos/base/system/lsass/lsass.rbuild (original) +++ trunk/reactos/base/system/lsass/lsass.rbuild Mon Oct 9 23:16:47 2006 @@ -6,6 +6,7 @@ <define name="UNICODE" /> <define name="_UNICODE" /> <define name="__USE_W32API" /> + <library>advapi32</library> <library>ntdll</library> <library>kernel32</library> <library>lsasrv</library>

1 0

[greatlrd] 24475: make our msvcrt bit more windows nt4/2000 compatible do not link _i64toa and _i64tow to ntdll they are missing in windows nt4/windows 2000 ntdll.
by greatlrd＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: greatlrd Date: Mon Oct 9 22:42:24 2006 New Revision: 24475 URL: http://svn.reactos.org/svn/reactos?rev=24475&view=rev Log: make our msvcrt bit more windows nt4/2000 compatible do not link _i64toa and _i64tow to ntdll they are missing in windows nt4/windows 2000 ntdll. Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.de… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.def (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.def Mon Oct 9 22:42:24 2006 @@ -326,8 +326,8 @@ _heapused=stub _heapwalk _hypot -_i64toa=NTDLL._i64toa -_i64tow=NTDLL._i64tow +_i64toa +_i64tow _initterm _inp=stub _inpd=stub

1 0

[greatlrd] 24474: fixed so our taskmgr works in windows 2000
by greatlrd＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: greatlrd Date: Mon Oct 9 22:01:56 2006 New Revision: 24474 URL: http://svn.reactos.org/svn/reactos?rev=24474&view=rev Log: fixed so our taskmgr works in windows 2000 Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild Modified: trunk/reactos/base/applications/taskmgr/taskmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/taskmgr.rbuild (original) +++ trunk/reactos/base/applications/taskmgr/taskmgr.rbuild Mon Oct 9 22:01:56 2006 @@ -5,6 +5,7 @@ <define name="_WIN32_WINNT">0x0501</define> <define name="UNICODE" /> <define name="_UNICODE" /> + <library>msvcrt</library> <library>ntdll</library> <library>kernel32</library> <library>advapi32</library>

1 0

[weiden] 24473: Make sure the compiler doesn't optimize away writes to video memory
by weiden＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: weiden Date: Mon Oct 9 20:37:27 2006 New Revision: 24473 URL: http://svn.reactos.org/svn/reactos?rev=24473&view=rev Log: Make sure the compiler doesn't optimize away writes to video memory Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vgatext.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vgatext.c Mon Oct 9 20:37:27 2006 @@ -61,7 +61,7 @@ static VOID NTAPI VidpVgaTextClearDisplay(VOID) { - WORD *ptr = (WORD*)VidpMemory; + volatile WORD *ptr = (volatile WORD*)VidpMemory; ULONG i; for (i = 0; i < SizeX * SizeY; i++, ptr++) @@ -166,13 +166,12 @@ static VOID NTAPI VidpVgaTextScrollDisplay(VOID) { - PUSHORT ptr; + volatile USHORT *ptr; int i; - ptr = (PUSHORT)VidpMemory + SizeX; - RtlMoveMemory(VidpMemory, ptr, SizeX * (SizeY - 1) * 2); - - ptr = (PUSHORT)VidpMemory + (SizeX * (SizeY - 1)); + RtlMoveMemory(VidpMemory, (PUSHORT)VidpMemory + SizeX, SizeX * (SizeY - 1) * 2); + + ptr = (volatile USHORT *)VidpMemory + (SizeX * (SizeY - 1)); for (i = 0; i < (int)SizeX; i++, ptr++) *ptr = (CHAR_ATTRIBUTE << 8) + ' '; } @@ -210,9 +209,9 @@ } else if (*pch != '\r') { - PUSHORT ptr; - - ptr = (PUSHORT)VidpMemory + ((CursorY * SizeX) + CursorX); + volatile USHORT *ptr; + + ptr = (volatile USHORT *)VidpMemory + ((CursorY * SizeX) + CursorX); *ptr = (CHAR_ATTRIBUTE << 8) + *pch; CursorX++;

1 0

[weiden] 24472: Some portability fixes that address possible alignment issues. Read R. Chen's blog 10/06/06 for more information.
by weiden＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: weiden Date: Mon Oct 9 19:09:50 2006 New Revision: 24472 URL: http://svn.reactos.org/svn/reactos?rev=24472&view=rev Log: Some portability fixes that address possible alignment issues. Read R. Chen's blog 10/06/06 for more information. Modified: trunk/reactos/dll/win32/aclui/aclui.c trunk/reactos/dll/win32/advapi32/sec/sid.c trunk/reactos/lib/rtl/sd.c trunk/reactos/lib/rtl/sid.c trunk/reactos/ntoskrnl/se/sid.c Modified: trunk/reactos/dll/win32/aclui/aclui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/aclui/aclui.c?re… ============================================================================== --- trunk/reactos/dll/win32/aclui/aclui.c (original) +++ trunk/reactos/dll/win32/aclui/aclui.c Mon Oct 9 19:09:50 2006 @@ -1047,7 +1047,8 @@ WORD AceSize; SidLen = GetLengthSid(pSid); - AceSize = sizeof(ACCESS_ALLOWED_ACE) + (WORD)SidLen - sizeof(DWORD); + AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, + SidStart) + (WORD)SidLen; Ace = HeapAlloc(GetProcessHeap(), 0, AceSize); Modified: trunk/reactos/dll/win32/advapi32/sec/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/sid… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/sid.c (original) +++ trunk/reactos/dll/win32/advapi32/sec/sid.c Mon Oct 9 19:09:50 2006 @@ -184,7 +184,7 @@ return !status; } -#define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE) + sizeof(sidWorld) - sizeof(DWORD)) +#define WINE_SIZE_OF_WORLD_ACCESS_ACL (sizeof(ACL) + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + sizeof(sidWorld)) /* some helper functions - taken from winehq cvs 20050916 */ @@ -428,7 +428,7 @@ goto lerr; StringAcl++; - length += sizeof(ACCESS_ALLOWED_ACE) - sizeof(DWORD) + sidlen; + length += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + sidlen; } *cBytes = length; Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=24472&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Mon Oct 9 19:09:50 2006 @@ -812,8 +812,6 @@ &pSacl, &SaclLength); - ASSERT(sizeof(SECURITY_DESCRIPTOR) > sizeof(SECURITY_DESCRIPTOR_RELATIVE)); - /* calculate the start and end of the data area, we simply just move the data by the difference between the size of the relative and absolute security descriptor structure */ Modified: trunk/reactos/lib/rtl/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sid.c?rev=24472&r1… ============================================================================== --- trunk/reactos/lib/rtl/sid.c (original) +++ trunk/reactos/lib/rtl/sid.c Mon Oct 9 19:09:50 2006 @@ -42,8 +42,8 @@ { PAGED_CODE_RTL(); - return (sizeof(SID) - (ANYSIZE_ARRAY * sizeof(ULONG)) + - (SubAuthorityCount * sizeof(ULONG))); + return (ULONG)FIELD_OFFSET(SID, + SubAuthority[SubAuthorityCount]); } @@ -132,8 +132,8 @@ PAGED_CODE_RTL(); - return (sizeof(SID) - sizeof(Sid->SubAuthority) + - (Sid->SubAuthorityCount * sizeof(ULONG))); + return (ULONG)FIELD_OFFSET(SID, + SubAuthority[Sid->SubAuthorityCount]); } Modified: trunk/reactos/ntoskrnl/se/sid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sid.c?rev=2447… ============================================================================== --- trunk/reactos/ntoskrnl/se/sid.c (original) +++ trunk/reactos/ntoskrnl/se/sid.c Mon Oct 9 19:09:50 2006 @@ -246,7 +246,8 @@ _SEH_TRY { ProbeForRead(Sid, - sizeof(*Sid) - sizeof(Sid->SubAuthority), + FIELD_OFFSET(SID, + SubAuthority), sizeof(UCHAR)); SidSize = RtlLengthRequiredSid(Sid->SubAuthorityCount); ProbeForRead(Sid,

1 0

[fireball] 24471: Revert r24430 changes (by Magnus Olsen) since they are incorrect (additionally confirmed by Filip Navara)
by fireball＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: fireball Date: Mon Oct 9 19:02:33 2006 New Revision: 24471 URL: http://svn.reactos.org/svn/reactos?rev=24471&view=rev Log: Revert r24430 changes (by Magnus Olsen) since they are incorrect (additionally confirmed by Filip Navara) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Mon Oct 9 19:02:33 2006 @@ -1221,7 +1221,7 @@ } if (RgnType != ERROR && RgnType != NULLREGION) { - if ((Window->Parent == UserGetDesktopWindow()) && (Window->Style & WS_VISIBLE)) + if (Window->Parent) { NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left - Window->Parent->ClientRect.left, @@ -1229,7 +1229,7 @@ co_UserRedrawWindow(Window->Parent, NULL, DirtyRgn, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_ALLCHILDREN); } - else + else { NtGdiOffsetRgn(DirtyRgn, Window->WindowRect.left - Window->ClientRect.left,

1 0

[weiden] 24470: Fix compilation with GCC4
by weiden＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: weiden Date: Mon Oct 9 18:59:10 2006 New Revision: 24470 URL: http://svn.reactos.org/svn/reactos?rev=24470&view=rev Log: Fix compilation with GCC4 Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c Mon Oct 9 18:59:10 2006 @@ -502,7 +502,7 @@ /* Assign drive letters */ IoAssignDriveLetters(LoaderBlock, &NtBootPath, - RootString.Buffer, + (PUCHAR)RootString.Buffer, &RootString); /* Update system root */

1 0

[weiden] 24469: Strings should be const char *. Fixes compilation with GCC4
by weiden＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: weiden Date: Mon Oct 9 18:54:40 2006 New Revision: 24469 URL: http://svn.reactos.org/svn/reactos?rev=24469&view=rev Log: Strings should be const char *. Fixes compilation with GCC4 Modified: trunk/reactos/ntoskrnl/inbv/inbv.c Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c Mon Oct 9 18:54:40 2006 @@ -31,7 +31,7 @@ static VOID (NTAPI *VidScreenToBufferBlt)(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); static VOID (NTAPI *VidBitBlt)(PUCHAR, ULONG, ULONG); static VOID (NTAPI *VidSolidColorFill)(ULONG, ULONG, ULONG, ULONG, ULONG); -static VOID (NTAPI *VidDisplayString)(PUCHAR); +static VOID (NTAPI *VidDisplayString)(PCSTR); static NTSTATUS (NTAPI *BootVidDisplayBootLogo)(PVOID); static VOID (NTAPI *BootVidUpdateProgress)(ULONG Progress); static VOID (NTAPI *BootVidFinalizeBootLogo)(VOID);

1 0

[weiden] 24468: Strings should be const char *. Fixes compilation with GCC4
by weiden＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: weiden Date: Mon Oct 9 18:43:16 2006 New Revision: 24468 URL: http://svn.reactos.org/svn/reactos?rev=24468&view=rev Log: Strings should be const char *. Fixes compilation with GCC4 Modified: trunk/reactos/drivers/base/bootvid/bootvid.h trunk/reactos/drivers/base/bootvid/vid.c trunk/reactos/drivers/base/bootvid/vid_vga.c trunk/reactos/drivers/base/bootvid/vid_vgatext.c trunk/reactos/drivers/base/bootvid/vid_xbox.c Modified: trunk/reactos/drivers/base/bootvid/bootvid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/bootv… ============================================================================== --- trunk/reactos/drivers/base/bootvid/bootvid.h (original) +++ trunk/reactos/drivers/base/bootvid/bootvid.h Mon Oct 9 18:43:16 2006 @@ -39,7 +39,7 @@ VOID NTAPI VidScreenToBufferBlt(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); VOID NTAPI VidBitBlt(PUCHAR, ULONG, ULONG); VOID NTAPI VidSolidColorFill(ULONG, ULONG, ULONG, ULONG, ULONG); -VOID NTAPI VidDisplayString(PUCHAR); +VOID NTAPI VidDisplayString(PCSTR); typedef BOOLEAN (NTAPI *PVID_INITIALIZE)(BOOLEAN); typedef VOID (NTAPI *PVID_CLEAN_UP)(VOID); @@ -48,7 +48,7 @@ typedef VOID (NTAPI *PVID_SCREEN_TO_BUFFER_BLT)(PUCHAR, ULONG, ULONG, ULONG, ULONG, ULONG); typedef VOID (NTAPI *PVID_BITBLT)(PUCHAR, ULONG, ULONG); typedef VOID (NTAPI *PVID_SOLID_COLOR_FILL)(ULONG, ULONG, ULONG, ULONG, ULONG); -typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PUCHAR); +typedef VOID (NTAPI *PVID_DISPLAY_STRING)(PCSTR); typedef struct _VID_FUNCTION_TABLE { Modified: trunk/reactos/drivers/base/bootvid/vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid.c… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid.c (original) +++ trunk/reactos/drivers/base/bootvid/vid.c Mon Oct 9 18:43:16 2006 @@ -113,7 +113,7 @@ VOID NTAPI VidDisplayString( - IN PUCHAR String) + IN PCSTR String) { VidTable->DisplayString(String); } Modified: trunk/reactos/drivers/base/bootvid/vid_vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vga.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vga.c Mon Oct 9 18:43:16 2006 @@ -495,7 +495,7 @@ static VOID NTAPI VidVgaDisplayString( - IN PUCHAR String) + IN PCSTR String) { } Modified: trunk/reactos/drivers/base/bootvid/vid_vgatext.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_v… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_vgatext.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_vgatext.c Mon Oct 9 18:43:16 2006 @@ -179,9 +179,9 @@ static VOID NTAPI VidVgaTextDisplayString( - IN PUCHAR String) -{ - PCH pch; + IN PCSTR String) +{ + PCSTR pch; int offset; ULONG CursorX; ULONG CursorY; Modified: trunk/reactos/drivers/base/bootvid/vid_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/vid_x… ============================================================================== --- trunk/reactos/drivers/base/bootvid/vid_xbox.c (original) +++ trunk/reactos/drivers/base/bootvid/vid_xbox.c Mon Oct 9 18:43:16 2006 @@ -85,7 +85,7 @@ static VOID NTAPI VidXboxDisplayString( - IN PUCHAR String) + IN PCSTR String) { }

1 0

[mflyer] 24467: Change copyright to 1996-2006, because a) our earliest version records show 1996 b) we are now in 2006
by mflyer＠svn.reactos.org 09 Oct '06

09 Oct '06

Author: mflyer Date: Mon Oct 9 16:37:03 2006 New Revision: 24467 URL: http://svn.reactos.org/svn/reactos?rev=24467&view=rev Log: Change copyright to 1996-2006, because a) our earliest version records show 1996 b) we are now in 2006 Modified: trunk/reactos/drivers/base/bootvid/bootimage.bmp Modified: trunk/reactos/drivers/base/bootvid/bootimage.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/bootvid/booti… ============================================================================== Binary files - no diff available.

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