Ros-diffs September 2005

ros-diffs@reactos.org

22 participants
582 discussions

[hpoussin] 17641: Allow compilation of fs_rec driver with MSVC

by hpoussin＠svn.reactos.com

Allow compilation of fs_rec driver with MSVC Modified: trunk/reactos/drivers/fs/fs_rec/blockdev.c Modified: trunk/reactos/drivers/fs/fs_rec/cdfs.c Modified: trunk/reactos/drivers/fs/fs_rec/fat.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.h Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.rc Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml Modified: trunk/reactos/drivers/fs/fs_rec/ntfs.c Modified: trunk/reactos/drivers/fs/fs_rec/udfs.c _____ Modified: trunk/reactos/drivers/fs/fs_rec/blockdev.c --- trunk/reactos/drivers/fs/fs_rec/blockdev.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/blockdev.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/fs/fs_rec/blockdev.c @@ -27,8 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ddk/ntddk.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/fs_rec/cdfs.c --- trunk/reactos/drivers/fs/fs_rec/cdfs.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/cdfs.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/fs/fs_rec/cdfs.c @@ -27,10 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> -#include <ntdddisk.h> -#include <ntddcdrm.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/fs_rec/fat.c --- trunk/reactos/drivers/fs/fs_rec/fat.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/fat.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/fs_rec/vfat.c @@ -27,9 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> -#include <ntdddisk.h> - #define NDEBUG #include <debug.h> @@ -46,7 +42,7 @@ DISK_GEOMETRY DiskGeometry; ULONG Size; struct _BootSector* Boot; - BOOL RecognizedFS = FALSE; + BOOLEAN RecognizedFS = FALSE; Size = sizeof(DISK_GEOMETRY); Status = FsRecDeviceIoControl(DeviceObject, @@ -90,8 +86,8 @@ } else if (DiskGeometry.MediaType == RemovableMedia && PartitionInfo.PartitionNumber > 0 && - PartitionInfo.StartingOffset.QuadPart == 0LL && - PartitionInfo.PartitionLength.QuadPart > 0LL) + PartitionInfo.StartingOffset.QuadPart == 0 && + PartitionInfo.PartitionLength.QuadPart > 0) { /* This is possible a removable media formated as super floppy */ RecognizedFS = TRUE; _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.c --- trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/fs_rec/fs_rec.c @@ -27,8 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.h --- trunk/reactos/drivers/fs/fs_rec/fs_rec.h 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.h 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/fs_rec/fs_rec.h @@ -25,7 +24,14 @@ * PROGRAMMER: Eric Kohl */ +#include <ntifs.h> +#include <ntdddisk.h> +#include <ntddcdrm.h> +#ifdef _MSC_VER +#define STDCALL +#endif + /* Filesystem types (add new filesystems here)*/ #define FS_TYPE_UNUSED 0 @@ -40,6 +46,7 @@ ULONG FsType; } DEVICE_EXTENSION, *PDEVICE_EXTENSION; +#include <pshpack1.h> struct _BootSector { unsigned char magic0, res0, magic1; @@ -57,7 +64,8 @@ unsigned char VolumeLabel[11], SysType[8]; unsigned char Res2[448]; unsigned short Signatur1; -} __attribute__((packed)); +}; +#include <poppack.h> /* blockdev.c */ _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.rc --- trunk/reactos/drivers/fs/fs_rec/fs_rec.rc 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.rc 2005-09-04 21:14:54 UTC (rev 17641) @@ -1,5 +1,3 @@ -/* $Id$ */ - #define REACTOS_VERSION_DLL #define REACTOS_STR_FILE_DESCRIPTION "Filesystem recognizer driver\0" #define REACTOS_STR_INTERNAL_NAME "fs_rec\0" _____ Modified: trunk/reactos/drivers/fs/fs_rec/fs_rec.xml --- trunk/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/fs_rec.xml 2005-09-04 21:14:54 UTC (rev 17641) @@ -1,6 +1,6 @@ <module name="fs_rec" type="kernelmodedriver" installbase="system32/drivers" installname="fs_rec.sys"> <include base="fs_rec">.</include> - <define name="__USE_W32API" /> + <define name="__USE_W32API" /> <library>ntoskrnl</library> <library>hal</library> <file>blockdev.c</file> _____ Modified: trunk/reactos/drivers/fs/fs_rec/ntfs.c --- trunk/reactos/drivers/fs/fs_rec/ntfs.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/ntfs.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/fs_rec/ntfs.c @@ -27,9 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> -#include <ntdddisk.h> - #define NDEBUG #include <debug.h> _____ Modified: trunk/reactos/drivers/fs/fs_rec/udfs.c --- trunk/reactos/drivers/fs/fs_rec/udfs.c 2005-09-04 20:45:34 UTC (rev 17640) +++ trunk/reactos/drivers/fs/fs_rec/udfs.c 2005-09-04 21:14:54 UTC (rev 17641) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: drivers/fs/fs_rec/udfs.c @@ -27,10 +26,6 @@ /* INCLUDES *****************************************************************/ -#include <ntifs.h> -#include <ntdddisk.h> -#include <ntddcdrm.h> - #define NDEBUG #include <debug.h>

19 years, 3 months

[hpoussin] 17640: Don't double-define KEBUGCHECK(EX)

by hpoussin＠svn.reactos.com

Don't double-define KEBUGCHECK(EX) Modified: trunk/reactos/include/reactos/helper.h _____ Modified: trunk/reactos/include/reactos/helper.h --- trunk/reactos/include/reactos/helper.h 2005-09-04 20:11:51 UTC (rev 17639) +++ trunk/reactos/include/reactos/helper.h 2005-09-04 20:45:34 UTC (rev 17640) @@ -11,8 +11,10 @@ #define ABS_VALUE(V) (((V) < 0) ? -(V) : (V)) #define RtlRosMin(X,Y) (((X) < (Y))? (X) : (Y)) #define RtlRosMin3(X,Y,Z) (((X) < (Y)) ? RtlRosMin(X,Z) : RtlRosMin(Y,Z)) +#ifndef KEBUGCHECK #define KEBUGCHECKEX(a,b,c,d,e) DbgPrint("KeBugCheckEx at %s:%i\n",__FILE__,__LINE__), KeBugCheckEx(a,b,c,d,e) #define KEBUGCHECK(a) DbgPrint("KeBugCheck at %s:%i\n",__FILE__,__LINE__), KeBugCheck(a) +#endif #define EXPORTED __declspec(dllexport) #define IMPORTED __declspec(dllimport) #define LIST_FOR_EACH(entry, head) \

19 years, 3 months

[hpoussin] 17639: Implement SetComputerNameExA/W

by hpoussin＠svn.reactos.com

Implement SetComputerNameExA/W Modified: trunk/reactos/lib/kernel32/misc/computername.c Modified: trunk/reactos/lib/kernel32/misc/stubs.c Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/lib/kernel32/misc/computername.c --- trunk/reactos/lib/kernel32/misc/computername.c 2005-09-04 18:00:59 UTC (rev 17638) +++ trunk/reactos/lib/kernel32/misc/computername.c 2005-09-04 20:11:51 UTC (rev 17639) @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Computer name functions @@ -285,32 +284,16 @@ /* * @implemented */ -BOOL STDCALL -SetComputerNameA (LPCSTR lpComputerName) -{ - UNICODE_STRING ComputerName; - BOOL bResult; - - RtlCreateUnicodeStringFromAsciiz (&ComputerName, - (LPSTR)lpComputerName); - - bResult = SetComputerNameW (ComputerName.Buffer); - - RtlFreeUnicodeString (&ComputerName); - - return bResult; -} - - -/* - * @implemented - */ static BOOL -IsValidComputerName (LPCWSTR lpComputerName) +IsValidComputerName ( + COMPUTER_NAME_FORMAT NameType, + LPCWSTR lpComputerName) { PWCHAR p; ULONG Length; + /* FIXME: do verification according to NameType */ + Length = 0; p = (PWCHAR)lpComputerName; while (*p != 0) @@ -346,60 +329,137 @@ } +static BOOL SetComputerNameToRegistry( + LPCWSTR RegistryKey, + LPCWSTR ValueNameStr, + LPCWSTR lpBuffer) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING KeyName; + UNICODE_STRING ValueName; + HANDLE KeyHandle; + NTSTATUS Status; + + RtlInitUnicodeString (&KeyName, RegistryKey); + InitializeObjectAttributes (&ObjectAttributes, + &KeyName, + OBJ_CASE_INSENSITIVE, + NULL, + NULL ); + + Status = NtOpenKey (&KeyHandle, + KEY_WRITE, + &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus (Status); + return FALSE; + } + + RtlInitUnicodeString (&ValueName, ValueNameStr); + + Status = NtSetValueKey (KeyHandle, + &ValueName, + 0, + REG_SZ, + (PVOID)lpBuffer, + (wcslen (lpBuffer) + 1) * sizeof(WCHAR)); + if (!NT_SUCCESS(Status)) + { + ZwClose (KeyHandle); + SetLastErrorByStatus (Status); + return FALSE; + } + + NtFlushKey (KeyHandle); + ZwClose (KeyHandle); + + return TRUE; +} + + /* * @implemented */ BOOL STDCALL +SetComputerNameA (LPCSTR lpComputerName) +{ + return SetComputerNameExA( ComputerNameNetBIOS, lpComputerName ); +} + + +/* + * @implemented + */ +BOOL STDCALL SetComputerNameW (LPCWSTR lpComputerName) { - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; - HANDLE KeyHandle; - NTSTATUS Status; + return SetComputerNameExW( ComputerNameNetBIOS, lpComputerName ); +} - if (!IsValidComputerName (lpComputerName)) + +/* + * @implemented + */ +BOOL STDCALL +SetComputerNameExA ( + COMPUTER_NAME_FORMAT NameType, + LPCSTR lpBuffer) +{ + UNICODE_STRING Buffer; + BOOL bResult; + + RtlCreateUnicodeStringFromAsciiz (&Buffer, + (LPSTR)lpBuffer); + + bResult = SetComputerNameExW (NameType, Buffer.Buffer); + + RtlFreeUnicodeString (&Buffer); + + return bResult; +} + + +/* + * @implemented + */ +BOOL STDCALL +SetComputerNameExW ( + COMPUTER_NAME_FORMAT NameType, + LPCWSTR lpBuffer) +{ + if (!IsValidComputerName (NameType, lpBuffer)) { SetLastError (ERROR_INVALID_PARAMETER); return FALSE; } - RtlInitUnicodeString (&KeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\ComputerName\ \ComputerName"); - InitializeObjectAttributes (&ObjectAttributes, - &KeyName, - OBJ_CASE_INSENSITIVE, - NULL, - NULL); - Status = NtOpenKey (&KeyHandle, - KEY_WRITE, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } + switch( NameType ) { + case ComputerNamePhysicalDnsDomain: + return SetComputerNameToRegistry + ( L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Domain", + lpBuffer ); - RtlInitUnicodeString (&ValueName, - L"ComputerName"); + case ComputerNamePhysicalDnsHostname: + return SetComputerNameToRegistry + ( L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Services\\Tcpip\\Parameters", + L"Hostname", + lpBuffer ); - Status = NtSetValueKey (KeyHandle, - &ValueName, - 0, - REG_SZ, - (PVOID)lpComputerName, - (wcslen (lpComputerName) + 1) * sizeof(WCHAR)); - if (!NT_SUCCESS(Status)) - { - ZwClose (KeyHandle); - SetLastErrorByStatus (Status); - return FALSE; - } + case ComputerNamePhysicalNetBIOS: + return SetComputerNameToRegistry + ( L"\\Registry\\Machine\\System\\CurrentControlSet" + L"\\Control\\ComputerName\\ComputerName", + L"ComputerName", + lpBuffer ); - NtFlushKey (KeyHandle); - ZwClose (KeyHandle); - - return TRUE; + default: + SetLastError (ERROR_INVALID_PARAMETER); + return FALSE; + } } /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/misc/stubs.c --- trunk/reactos/lib/kernel32/misc/stubs.c 2005-09-04 18:00:59 UTC (rev 17638) +++ trunk/reactos/lib/kernel32/misc/stubs.c 2005-09-04 20:11:51 UTC (rev 17639) @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * KERNEL32.DLL stubs (STUB functions) * Remove from this file, if you implement them. */ @@ -1239,20 +1238,6 @@ */ BOOL STDCALL -SetComputerNameExW ( - COMPUTER_NAME_FORMAT NameType, - LPCWSTR lpBuffer - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL SetFirmwareEnvironmentVariableW( LPCWSTR lpName, LPCWSTR lpGuid, @@ -1498,20 +1483,6 @@ */ BOOL STDCALL -SetComputerNameExA ( - COMPUTER_NAME_FORMAT NameType, - LPCSTR lpBuffer - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -STDCALL SetFirmwareEnvironmentVariableA( LPCSTR lpName, LPCSTR lpGuid, _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2005-09-04 18:00:59 UTC (rev 17638) +++ trunk/reactos/w32api/include/winbase.h 2005-09-04 20:11:51 UTC (rev 17639) @@ -2093,6 +2093,7 @@ #define ReportEvent ReportEventW #define SearchPath SearchPathW #define SetComputerName SetComputerNameW +#define SetComputerNameEx SetComputerNameExW #define SetCurrentDirectory SetCurrentDirectoryW #define SetDefaultCommConfig SetDefaultCommConfigW #if (_WIN32_WINNT >= 0x0502) @@ -2291,6 +2292,7 @@ #define ReportEvent ReportEventA #define SearchPath SearchPathA #define SetComputerName SetComputerNameA +#define SetComputerNameEx SetComputerNameExA #define SetCurrentDirectory SetCurrentDirectoryA #define SetDefaultCommConfig SetDefaultCommConfigA #if (_WIN32_WINNT >= 0x0502)

19 years, 3 months

[ion] 17638: - Various fixes to headers, such as fixing some LPC prototypes, adding/correcting some structures, adding some missing definitions, etc...

by ion＠svn.reactos.com

- Various fixes to headers, such as fixing some LPC prototypes, adding/correcting some structures, adding some missing definitions, etc... Modified: trunk/reactos/include/ndk/dbgktypes.h Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/lpctypes.h Modified: trunk/reactos/include/ndk/mmtypes.h Modified: trunk/reactos/include/ndk/ntndk.h Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtltypes.h Modified: trunk/reactos/include/ndk/setypes.h Modified: trunk/reactos/include/ndk/umfuncs.h Modified: trunk/reactos/include/ndk/zwfuncs.h Modified: trunk/reactos/lib/ntdll/ldr/utils.c Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/include/internal/port.h Modified: trunk/reactos/ntoskrnl/lpc/reply.c Modified: trunk/reactos/ntoskrnl/lpc/send.c Modified: trunk/reactos/subsys/smss/smapi.c _____ Modified: trunk/reactos/include/ndk/dbgktypes.h --- trunk/reactos/include/ndk/dbgktypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/dbgktypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -35,6 +35,7 @@ } DEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION, * PDEBUG_OBJECT_KILL_PROCESS_ON_EXIT_INFORMATION; +#ifndef NTOS_MODE_USER typedef struct _DBGK_DEBUG_OBJECT { KEVENT Event; @@ -45,11 +46,12 @@ ULONG Flags; struct { - UCHAR DebuggerInactive :1; - UCHAR KillProcessOnExit :1; + UCHAR DebuggerInactive:1; + UCHAR KillProcessOnExit:1; }; }; } DBGK_DEBUG_OBJECT, *PDBGK_DEBUG_OBJECT; +#endif typedef enum _DBG_STATE { @@ -136,4 +138,21 @@ } StateInfo; } DBGUI_WAIT_STATE_CHANGE, *PDBGUI_WAIT_STATE_CHANGE; +typedef struct _DBGKM_MSG +{ + PORT_MESSAGE h; + ULONG Opcode; + ULONG Status; + union + { + DBGKM_EXCEPTION Exception; + DBGKM_CREATE_THREAD CreateThread; + DBGKM_CREATE_PROCESS CreateProcess; + DBGKM_EXIT_THREAD ExitThread; + DBGKM_EXIT_PROCESS ExitProcess; + DBGKM_LOAD_DLL LoadDll; + DBGKM_UNLOAD_DLL UnloadDll; + }; +} DBGKM_MSG, *PDBGKM_MSG; + #endif _____ Modified: trunk/reactos/include/ndk/extypes.h --- trunk/reactos/include/ndk/extypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/extypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -37,6 +37,8 @@ #define SEMAPHORE_QUERY_STATE 0x0001 #endif +#define MAXIMUM_HARDERROR_PARAMETERS 4 + /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ _____ Modified: trunk/reactos/include/ndk/lpctypes.h --- trunk/reactos/include/ndk/lpctypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/lpctypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -171,6 +171,24 @@ } LPCP_CONNECTION_MESSAGE, *PLPCP_CONNECTION_MESSAGE; #endif +typedef struct _HARDERROR_MSG +{ + PORT_MESSAGE h; + NTSTATUS Status; + LARGE_INTEGER ErrorTime; + ULONG ValidResponseOptions; + ULONG Response; + ULONG NumberOfParameters; + ULONG UnicodeStringParameterMask; + ULONG Parameters[MAXIMUM_HARDERROR_PARAMETERS]; +} HARDERROR_MSG, *PHARDERROR_MSG; + +typedef struct _CLIENT_DIED_MSG +{ + PORT_MESSAGE h; + LARGE_INTEGER CreateTime; +} CLIENT_DIED_MSG, *PCLIENT_DIED_MSG; + /* CONSTANTS *****************************************************************/ #define PORT_MAXIMUM_MESSAGE_LENGTH 256 _____ Modified: trunk/reactos/include/ndk/mmtypes.h --- trunk/reactos/include/ndk/mmtypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/mmtypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -15,6 +15,10 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ +#ifdef NTOS_MODE_USER +#define SEC_BASED 0x00200000 +#define SEC_NO_CHANGE 0x00400000 +#endif /* ENUMERATIONS **************************************************************/ _____ Modified: trunk/reactos/include/ndk/ntndk.h --- trunk/reactos/include/ndk/ntndk.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/ntndk.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -25,7 +25,6 @@ #include "kdfuncs.h" /* Kernel Debugger Functions */ #include "cctypes.h" /* Cache Manager Types */ #include "potypes.h" /* Power Manager Types */ -#include "dbgktypes.h" /* User-Mode Kernel Debugging Types */ #include "haltypes.h" /* Hardware Abstraction Layer Types */ #include "halfuncs.h" /* Hardware Abstraction Layer Functions */ #include "inbvfuncs.h" /* Initialization Boot Video Functions */ @@ -34,7 +33,6 @@ #include "mmfuncs.h" /* Memory Manager Functions */ #include "obfuncs.h" /* Object Manager Functions */ #include "psfuncs.h" /* Process Manager Functions */ -#include "setypes.h" /* Security Subsystem Types */ #include "sefuncs.h" /* Security Subsystem Functions */ #endif /* !NTOS_MODE_USER */ @@ -50,10 +48,12 @@ #include "obtypes.h" /* Object Manager Types */ #include "pstypes.h" /* Process Manager Types */ #include "lpctypes.h" /* Local Procedure Call Types */ +#include "dbgktypes.h" /* User-Mode Kernel Debugging Types */ #include "zwtypes.h" /* Native Types */ #include "zwfuncs.h" /* Native Functions (System Calls) */ #include "rtltypes.h" /* Runtime Library Types */ #include "rtlfuncs.h" /* Runtime Library Functions */ +#include "setypes.h" /* Security Subsystem Types */ #include "umfuncs.h" /* User-Mode NT Library Functions */ #include "i386/floatsave.h" /* Floating Point Save Area Definitions for i386 */ #include "i386/segment.h" /* Kernel CPU Segment Definitions for i386 */ _____ Modified: trunk/reactos/include/ndk/rtlfuncs.h --- trunk/reactos/include/ndk/rtlfuncs.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/rtlfuncs.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -53,6 +53,10 @@ STDCALL RtlRaiseStatus(NTSTATUS Status); +LONG +STDCALL +RtlUnhandledExceptionFilter(struct _EXCEPTION_POINTERS* ExceptionInfo); + VOID STDCALL RtlUnwind( @@ -231,6 +235,15 @@ NTSTATUS STDCALL +RtlAdjustPrivilege( + IN ULONG Privilege, + IN BOOLEAN NewValue, + IN BOOLEAN ForThread, + OUT PBOOLEAN OldValue +); + +NTSTATUS +STDCALL RtlAllocateAndInitializeSid( IN PSID_IDENTIFIER_AUTHORITY IdentifierAuthority, IN UCHAR SubAuthorityCount, _____ Modified: trunk/reactos/include/ndk/rtltypes.h --- trunk/reactos/include/ndk/rtltypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/rtltypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -210,6 +210,9 @@ sizeof(__SOURCE_STRING__), \ (__SOURCE_STRING__) \ } + +#define RtlEqualLuid(L1, L2) (((L1)->HighPart == (L2)->HighPart) && \ + ((L1)->LowPart == (L2)->LowPart)) #endif /* FIXME: Rename these */ _____ Modified: trunk/reactos/include/ndk/setypes.h --- trunk/reactos/include/ndk/setypes.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/setypes.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -14,11 +14,40 @@ /* EXPORTED DATA *************************************************************/ /* CONSTANTS *****************************************************************/ +#ifdef NTOS_MODE_USER +#define SE_MIN_WELL_KNOWN_PRIVILEGE (2L) +#define SE_CREATE_TOKEN_PRIVILEGE (2L) +#define SE_ASSIGNPRIMARYTOKEN_PRIVILEGE (3L) +#define SE_LOCK_MEMORY_PRIVILEGE (4L) +#define SE_INCREASE_QUOTA_PRIVILEGE (5L) +#define SE_UNSOLICITED_INPUT_PRIVILEGE (6L) +#define SE_MACHINE_ACCOUNT_PRIVILEGE (6L) +#define SE_TCB_PRIVILEGE (7L) +#define SE_SECURITY_PRIVILEGE (8L) +#define SE_TAKE_OWNERSHIP_PRIVILEGE (9L) +#define SE_LOAD_DRIVER_PRIVILEGE (10L) +#define SE_SYSTEM_PROFILE_PRIVILEGE (11L) +#define SE_SYSTEMTIME_PRIVILEGE (12L) +#define SE_PROF_SINGLE_PROCESS_PRIVILEGE (13L) +#define SE_INC_BASE_PRIORITY_PRIVILEGE (14L) +#define SE_CREATE_PAGEFILE_PRIVILEGE (15L) +#define SE_CREATE_PERMANENT_PRIVILEGE (16L) +#define SE_BACKUP_PRIVILEGE (17L) +#define SE_RESTORE_PRIVILEGE (18L) +#define SE_SHUTDOWN_PRIVILEGE (19L) +#define SE_DEBUG_PRIVILEGE (20L) +#define SE_AUDIT_PRIVILEGE (21L) +#define SE_SYSTEM_ENVIRONMENT_PRIVILEGE (22L) +#define SE_CHANGE_NOTIFY_PRIVILEGE (23L) +#define SE_REMOTE_SHUTDOWN_PRIVILEGE (24L) +#define SE_MAX_WELL_KNOWN_PRIVILEGE (SE_REMOTE_SHUTDOWN_PRIVILEGE) +#endif /* ENUMERATIONS **************************************************************/ /* TYPES *********************************************************************/ +#ifndef NTOS_MODE_USER typedef struct _SEP_AUDIT_POLICY_CATEGORIES { UCHAR System:4; @@ -96,3 +125,4 @@ } SE_AUDIT_PROCESS_CREATION_INFO, *PSE_AUDIT_PROCESS_CREATION_INFO; #endif +#endif _____ Modified: trunk/reactos/include/ndk/umfuncs.h --- trunk/reactos/include/ndk/umfuncs.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/umfuncs.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -138,10 +138,10 @@ NTSTATUS STDCALL LdrGetDllHandle( - IN PWCHAR Path OPTIONAL, - IN ULONG Unknown2, + IN PWSTR DllPath OPTIONAL, + IN PULONG DllCharacteristics, IN PUNICODE_STRING DllName, - OUT PVOID *BaseAddress + OUT PVOID *DllHandle ); NTSTATUS _____ Modified: trunk/reactos/include/ndk/zwfuncs.h --- trunk/reactos/include/ndk/zwfuncs.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/include/ndk/zwfuncs.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -21,15 +21,26 @@ STDCALL NtAcceptConnectPort( PHANDLE PortHandle, - HANDLE NamedPortHandle, - PPORT_MESSAGE ServerReply, - BOOLEAN AcceptIt, - PPORT_VIEW WriteMap, - PREMOTE_PORT_VIEW ReadMap + PVOID PortContext OPTIONAL, + PPORT_MESSAGE ConnectionRequest, + BOOLEAN AcceptConnection, + PPORT_VIEW ServerView OPTIONAL, + PREMOTE_PORT_VIEW ClientView OPTIONAL ); NTSTATUS STDCALL +ZwAcceptConnectPort( + PHANDLE PortHandle, + PVOID PortContext OPTIONAL, + PPORT_MESSAGE ConnectionRequest, + BOOLEAN AcceptConnection, + PPORT_VIEW ServerView OPTIONAL, + PREMOTE_PORT_VIEW ClientView OPTIONAL +); + +NTSTATUS +STDCALL NtAccessCheck( IN PSECURITY_DESCRIPTOR SecurityDescriptor, IN HANDLE ClientToken, @@ -347,11 +358,11 @@ PHANDLE PortHandle, PUNICODE_STRING PortName, PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW SectionInfo, - PREMOTE_PORT_VIEW MapInfo, - PULONG MaxMessageSize, - PVOID ConnectInfo, - PULONG ConnectInfoLength + PPORT_VIEW ClientView OPTIONAL, + PREMOTE_PORT_VIEW ServerView OPTIONAL, + PULONG MaxMessageLength OPTIONAL, + PVOID ConnectionInformation OPTIONAL, + PULONG ConnectionInformationLength OPTIONAL ); NTSTATUS @@ -360,11 +371,11 @@ PHANDLE PortHandle, PUNICODE_STRING PortName, PSECURITY_QUALITY_OF_SERVICE SecurityQos, - PPORT_VIEW SectionInfo, - PREMOTE_PORT_VIEW MapInfo, - PULONG MaxMessageSize, - PVOID ConnectInfo, - PULONG ConnectInfoLength + PPORT_VIEW ClientView OPTIONAL, + PREMOTE_PORT_VIEW ServerView OPTIONAL, + PULONG MaxMessageLength OPTIONAL, + PVOID ConnectionInformation OPTIONAL, + PULONG ConnectionInformationLength OPTIONAL ); NTSTATUS @@ -612,19 +623,19 @@ NtCreatePort( PHANDLE PortHandle, POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectInfoLength, - ULONG MaxDataLength, - ULONG NPMessageQueueSize OPTIONAL + ULONG MaxConnectionInfoLength, + ULONG MaxMessageLength, + ULONG MaxPoolUsage ); NTSTATUS STDCALL -NtCreatePort( +ZwCreatePort( PHANDLE PortHandle, POBJECT_ATTRIBUTES ObjectAttributes, - ULONG MaxConnectInfoLength, - ULONG MaxDataLength, - ULONG NPMessageQueueSize OPTIONAL + ULONG MaxConnectionInfoLength, + ULONG MaxMessageLength, + ULONG MaxPoolUsage ); NTSTATUS @@ -1313,13 +1324,13 @@ NTSTATUS STDCALL NtListenPort(HANDLE PortHandle, - PPORT_MESSAGE LpcMessage + PPORT_MESSAGE ConnectionRequest ); NTSTATUS STDCALL ZwListenPort(HANDLE PortHandle, - PPORT_MESSAGE LpcMessage + PPORT_MESSAGE ConnectionRequest ); NTSTATUS @@ -2745,11 +2756,11 @@ NtRaiseHardError( IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, - IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, - IN PVOID *Parameters, - IN HARDERROR_RESPONSE_OPTION ResponseOption, - OUT PHARDERROR_RESPONSE Response -); + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response +); NTSTATUS STDCALL @@ -2955,18 +2966,18 @@ STDCALL NtReplyWaitReceivePort( HANDLE PortHandle, - PULONG PortId, - PPORT_MESSAGE MessageReply, - PPORT_MESSAGE MessageRequest + PVOID *PortContext OPTIONAL, + PPORT_MESSAGE ReplyMessage OPTIONAL, + PPORT_MESSAGE ReceiveMessage ); NTSTATUS STDCALL ZwReplyWaitReceivePort( HANDLE PortHandle, - PULONG PortId, - PPORT_MESSAGE MessageReply, - PPORT_MESSAGE MessageRequest + PVOID *PortContext OPTIONAL, + PPORT_MESSAGE ReplyMessage, + PPORT_MESSAGE ReceiveMessage ); NTSTATUS _____ Modified: trunk/reactos/lib/ntdll/ldr/utils.c --- trunk/reactos/lib/ntdll/ldr/utils.c 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/lib/ntdll/ldr/utils.c 2005-09-04 18:00:59 UTC (rev 17638) @@ -2285,33 +2285,34 @@ * @implemented */ NTSTATUS STDCALL -LdrGetDllHandle(IN PWCHAR Path OPTIONAL, - IN ULONG Unknown2, +LdrGetDllHandle(IN PWSTR DllPath OPTIONAL, + IN PULONG DllCharacteristics, IN PUNICODE_STRING DllName, - OUT PVOID* BaseAddress) + OUT PVOID *DllHandle) { PLDR_DATA_TABLE_ENTRY Module; NTSTATUS Status; - TRACE_LDR("LdrGetDllHandle, searching for %wZ from %S\n", DllName, Path ? Path : L""); + TRACE_LDR("LdrGetDllHandle, searching for %wZ from %S\n", + DllName, DllPath ? DllPath : L""); /* NULL is the current executable */ if (DllName == NULL) { - *BaseAddress = ExeModule->DllBase; - DPRINT("BaseAddress %x\n", *BaseAddress); + *DllHandle = ExeModule->DllBase; + DPRINT("BaseAddress %x\n", *DllHandle); return STATUS_SUCCESS; } Status = LdrFindEntryForName(DllName, &Module, FALSE); if (NT_SUCCESS(Status)) { - *BaseAddress = Module->DllBase; + *DllHandle = Module->DllBase; return STATUS_SUCCESS; } DPRINT("Failed to find dll %wZ\n", DllName); - *BaseAddress = NULL; + *DllHandle = NULL; return STATUS_DLL_NOT_FOUND; } _____ Modified: trunk/reactos/ntoskrnl/ex/error.c --- trunk/reactos/ntoskrnl/ex/error.c 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/ntoskrnl/ex/error.c 2005-09-04 18:00:59 UTC (rev 17638) @@ -92,10 +92,10 @@ STDCALL ExRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, - IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, - IN PVOID *Parameters, - IN HARDERROR_RESPONSE_OPTION ResponseOption, - OUT PHARDERROR_RESPONSE Response) + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response) { UNIMPLEMENTED; } @@ -104,10 +104,10 @@ STDCALL NtRaiseHardError(IN NTSTATUS ErrorStatus, IN ULONG NumberOfParameters, - IN PUNICODE_STRING UnicodeStringParameterMask OPTIONAL, - IN PVOID *Parameters, - IN HARDERROR_RESPONSE_OPTION ResponseOption, - OUT PHARDERROR_RESPONSE Response) + IN ULONG UnicodeStringParameterMask, + IN PULONG_PTR Parameters, + IN ULONG ValidResponseOptions, + OUT PULONG Response) { DPRINT1("Hard error %x\n", ErrorStatus); @@ -116,7 +116,7 @@ NumberOfParameters, UnicodeStringParameterMask, Parameters, - ResponseOption, + ValidResponseOptions, Response); /* Return Success */ _____ Modified: trunk/reactos/ntoskrnl/include/internal/port.h --- trunk/reactos/ntoskrnl/include/internal/port.h 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/ntoskrnl/include/internal/port.h 2005-09-04 18:00:59 UTC (rev 17638) @@ -90,61 +90,6 @@ PORT_MESSAGE Message; } QUEUEDMESSAGE, *PQUEUEDMESSAGE; -typedef struct _LPC_DBG_MESSAGE -{ - PORT_MESSAGE Header; - ULONG Type; - ULONG Status; - union - { - struct - { - EXCEPTION_RECORD ExceptionRecord; - ULONG FirstChance; - } Exception; - struct - { - ULONG Reserved; - PVOID StartAddress; - } CreateThread; - struct - { - ULONG Reserved; - HANDLE FileHandle; - PVOID Base; - ULONG PointerToSymbolTable; - ULONG NumberOfSymbols; - ULONG Reserved2; - PVOID EntryPoint; - } CreateProcess; - struct - { - ULONG ExitCode; - } ExitThread; - struct - { - ULONG ExitCode; - } ExitProcess; - struct - { - HANDLE FileHandle; - PVOID Base; - ULONG PointerToSymbolTable; - ULONG NumberOfSymbols; - } LoadDll; - struct - { - PVOID Base; - } UnloadDll; - } Data; -} LPC_DBG_MESSAGE, *PLPC_DBG_MESSAGE; - -typedef struct _LPC_TERMINATION_MESSAGE -{ - PORT_MESSAGE Header; - LARGE_INTEGER CreationTime; -} LPC_TERMINATION_MESSAGE, *PLPC_TERMINATION_MESSAGE; - /* Code in ntoskrnl/lpc/close.h */ VOID STDCALL _____ Modified: trunk/reactos/ntoskrnl/lpc/reply.c --- trunk/reactos/ntoskrnl/lpc/reply.c 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/ntoskrnl/lpc/reply.c 2005-09-04 18:00:59 UTC (rev 17638) @@ -146,11 +146,11 @@ * REVISIONS */ NTSTATUS STDCALL -NtReplyWaitReceivePortEx(IN HANDLE PortHandle, - OUT PULONG PortId, - IN PPORT_MESSAGE LpcReply, - OUT PPORT_MESSAGE LpcMessage, - IN PLARGE_INTEGER Timeout) +NtReplyWaitReceivePortEx(IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage, + IN PLARGE_INTEGER Timeout OPTIONAL) { PEPORT Port; KIRQL oldIrql; @@ -169,7 +169,7 @@ { _SEH_TRY { - ProbeForWrite(LpcMessage, + ProbeForWrite(ReceiveMessage, sizeof(PORT_MESSAGE), 1); } @@ -211,10 +211,10 @@ /* * Send the reply, only if port is connected */ - if (LpcReply != NULL && !Disconnected) + if (ReplyMessage != NULL && !Disconnected) { Status = EiReplyOrRequestPort(Port->OtherPort, - LpcReply, + ReplyMessage, LPC_REPLY, Port); KeReleaseSemaphore(&Port->OtherPort->Semaphore, IO_NO_INCREMENT, 1, @@ -283,14 +283,14 @@ { _SEH_TRY { - ProbeForWrite((PVOID)(LpcMessage + 1), + ProbeForWrite((PVOID)(ReceiveMessage + 1), CRequest->ConnectDataLength, 1); - RtlCopyMemory(LpcMessage, + RtlCopyMemory(ReceiveMessage, &Header, sizeof(PORT_MESSAGE)); - RtlCopyMemory((PVOID)(LpcMessage + 1), + RtlCopyMemory((PVOID)(ReceiveMessage + 1), CRequest->ConnectData, CRequest->ConnectDataLength); } @@ -302,10 +302,10 @@ } else { - RtlCopyMemory(LpcMessage, + RtlCopyMemory(ReceiveMessage, &Header, sizeof(PORT_MESSAGE)); - RtlCopyMemory((PVOID)(LpcMessage + 1), + RtlCopyMemory((PVOID)(ReceiveMessage + 1), CRequest->ConnectData, CRequest->ConnectDataLength); } @@ -316,11 +316,11 @@ { _SEH_TRY { - ProbeForWrite(LpcMessage, + ProbeForWrite(ReceiveMessage, Request->Message.u1.s1.TotalLength, 1); - RtlCopyMemory(LpcMessage, + RtlCopyMemory(ReceiveMessage, &Request->Message, Request->Message.u1.s1.TotalLength); } @@ -332,7 +332,7 @@ } else { - RtlCopyMemory(LpcMessage, + RtlCopyMemory(ReceiveMessage, &Request->Message, Request->Message.u1.s1.TotalLength); } @@ -387,16 +387,16 @@ * REVISIONS */ NTSTATUS STDCALL -NtReplyWaitReceivePort (IN HANDLE PortHandle, - OUT PULONG PortId, - IN PPORT_MESSAGE LpcReply, - OUT PPORT_MESSAGE LpcMessage) +NtReplyWaitReceivePort(IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage) { - return(NtReplyWaitReceivePortEx (PortHandle, - PortId, - LpcReply, - LpcMessage, - NULL)); + return NtReplyWaitReceivePortEx(PortHandle, + PortContext, + ReplyMessage, + ReceiveMessage, + NULL); } /********************************************************************** _____ Modified: trunk/reactos/ntoskrnl/lpc/send.c --- trunk/reactos/ntoskrnl/lpc/send.c 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/ntoskrnl/lpc/send.c 2005-09-04 18:00:59 UTC (rev 17638) @@ -30,16 +30,16 @@ */ NTSTATUS STDCALL LpcSendTerminationPort (IN PEPORT Port, - IN LARGE_INTEGER CreationTime) + IN LARGE_INTEGER CreateTime) { NTSTATUS Status; - LPC_TERMINATION_MESSAGE Msg; + CLIENT_DIED_MSG Msg; #ifdef __USE_NT_LPC__ - Msg.Header.u2.s2.Type = LPC_NEW_MESSAGE; + Msg.h.u2.s2.Type = LPC_CLIENT_DIED; #endif - Msg.CreationTime = CreationTime; - Status = LpcRequestPort (Port, &Msg.Header); + Msg.CreateTime = CreateTime; + Status = LpcRequestPort (Port, &Msg.h); return(Status); } @@ -58,15 +58,15 @@ */ NTSTATUS STDCALL LpcSendDebugMessagePort (IN PEPORT Port, - IN PLPC_DBG_MESSAGE Message, - OUT PLPC_DBG_MESSAGE Reply) + IN PDBGKM_MSG Message, + OUT PDBGKM_MSG Reply) { NTSTATUS Status; KIRQL oldIrql; PQUEUEDMESSAGE ReplyMessage; Status = EiReplyOrRequestPort(Port, - &Message->Header, + &Message->h, LPC_REQUEST, Port); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/subsys/smss/smapi.c --- trunk/reactos/subsys/smss/smapi.c 2005-09-04 15:57:17 UTC (rev 17637) +++ trunk/reactos/subsys/smss/smapi.c 2005-09-04 18:00:59 UTC (rev 17638) @@ -107,7 +107,6 @@ SmpApiConnectedThread(PVOID pConnectedPort) { NTSTATUS Status = STATUS_SUCCESS; - PVOID Unknown = NULL; PPORT_MESSAGE Reply = NULL; SM_PORT_MESSAGE Request; HANDLE ConnectedPort = * (PHANDLE) pConnectedPort; @@ -120,7 +119,7 @@ DPRINT("SM: %s: waiting for message\n",__FUNCTION__); Status = NtReplyWaitReceivePort(ConnectedPort, - (PULONG) & Unknown, + NULL, Reply, (PPORT_MESSAGE) & Request); if (NT_SUCCESS(Status))

19 years, 3 months

[ion] 17637: - Disable two tests since the Balance Set Manager isn't implemented yet and they'll freeze ROS.

by ion＠svn.reactos.com

- Disable two tests since the Balance Set Manager isn't implemented yet and they'll freeze ROS. Modified: trunk/reactos/regtests/winetests/kernel32/thread.c _____ Modified: trunk/reactos/regtests/winetests/kernel32/thread.c --- trunk/reactos/regtests/winetests/kernel32/thread.c 2005-09-04 15:18:52 UTC (rev 17636) +++ trunk/reactos/regtests/winetests/kernel32/thread.c 2005-09-04 15:57:17 UTC (rev 17637) @@ -425,10 +425,10 @@ "SetThreadPriority Failed\n"); ok(GetThreadPriority(curthread)==THREAD_PRIORITY_TIME_CRITICAL, "GetThreadPriority Failed\n"); - ok(SetThreadPriority(curthread,THREAD_PRIORITY_IDLE)!=0, - "SetThreadPriority Failed\n"); - ok(GetThreadPriority(curthread)==THREAD_PRIORITY_IDLE, - "GetThreadPriority Failed\n"); + //ok(SetThreadPriority(curthread,THREAD_PRIORITY_IDLE)!=0, + //"SetThreadPriority Failed\n"); + //ok(GetThreadPriority(curthread)==THREAD_PRIORITY_IDLE, + //"GetThreadPriority Failed\n"); ok(SetThreadPriority(curthread,0)!=0,"SetThreadPriority Failed\n"); /* Check thread priority boost */

19 years, 3 months

[navaraf] 17636: Get correct physical address in HalpGrowMapBuffers.

by navaraf＠svn.reactos.com

Get correct physical address in HalpGrowMapBuffers. Modified: trunk/reactos/hal/halx86/generic/dma.c _____ Modified: trunk/reactos/hal/halx86/generic/dma.c --- trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 14:40:12 UTC (rev 17635) +++ trunk/reactos/hal/halx86/generic/dma.c 2005-09-04 15:18:52 UTC (rev 17636) @@ -235,6 +235,8 @@ if (VirtualAddress == NULL) return FALSE; + PhysicalAddress = MmGetPhysicalAddress(VirtualAddress); + /* * All the following must be done with the master adapter lock held * to prevent corruption.

19 years, 3 months

[ekohl] 17635: Implement CM_Get_Class_Name_ExA.

by ekohl＠svn.reactos.com

Implement CM_Get_Class_Name_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:47:50 UTC (rev 17634) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 14:40:12 UTC (rev 17635) @@ -474,9 +474,39 @@ LPGUID ClassGuid, PCHAR Buffer, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + WCHAR szBuffer[MAX_CLASS_NAME_LEN]; + CONFIGRET ret = CR_SUCCESS; + ULONG ulLength; + ULONG ulOrigLength; + + TRACE("%p %p %p %lx %lx\n", ClassGuid, Buffer, pulLength, ulFlags, hMachine); - return CR_FAILURE; + + if (ClassGuid == NULL || Buffer == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + ulOrigLength = *pulLength; + *pulLength = 0; + + ulLength = MAX_CLASS_NAME_LEN; + ret = CM_Get_Class_Name_ExW(ClassGuid, szBuffer, &ulLength, + ulFlags, hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + szBuffer, + ulLength, + Buffer, + ulOrigLength, + NULL, + NULL) == 0) + ret = CR_FAILURE; + else + *pulLength = lstrlenA(Buffer) + 1; + } + + return ret; }

19 years, 3 months

[greatlrd] 17634: fix bug 739 can not create file notepad newfile.txt

by greatlrd＠svn.reactos.com

fix bug 739 can not create file notepad newfile.txt at cmd prompt Modified: trunk/reactos/subsys/system/notepad/dialog.c _____ Modified: trunk/reactos/subsys/system/notepad/dialog.c --- trunk/reactos/subsys/system/notepad/dialog.c 2005-09-04 11:31:54 UTC (rev 17633) +++ trunk/reactos/subsys/system/notepad/dialog.c 2005-09-04 11:47:50 UTC (rev 17634) @@ -216,7 +216,7 @@ return; hFile = CreateFile(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, - OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); + OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); if(hFile == INVALID_HANDLE_VALUE) { ShowLastError();

19 years, 3 months

[greatlrd] 17633: Revers the change after reboot it did carcgh for me hole time.

by greatlrd＠svn.reactos.com

Revers the change after reboot it did carcgh for me hole time. Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/cmdinput.c _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-04 11:31:54 UTC (rev 17633) @@ -1037,14 +1037,13 @@ ProcessInput (BOOL bFlag) { TCHAR commandline[CMDLINE_LENGTH]; - TCHAR *readline = NULL; + TCHAR readline[CMDLINE_LENGTH]; LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; BOOL bEchoThisLine; - - readline = malloc(CMDLINE_LENGTH * sizeof(TCHAR)); + do { /* if no batch input then... */ @@ -1053,7 +1052,7 @@ if (bFlag) return 0; - readline = ReadCommand (readline, CMDLINE_LENGTH); + ReadCommand (readline, CMDLINE_LENGTH); ip = readline; bEchoThisLine = FALSE; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-04 11:31:54 UTC (rev 17633) @@ -106,7 +106,7 @@ /* Prototypes for CMDINPUT.C */ -TCHAR * ReadCommand (LPTSTR, INT); +VOID ReadCommand (LPTSTR, INT); /* Prototypes for CMDTABLE.C */ _____ Modified: trunk/reactos/subsys/system/cmd/cmdinput.c --- trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:26:09 UTC (rev 17632) +++ trunk/reactos/subsys/system/cmd/cmdinput.c 2005-09-04 11:31:54 UTC (rev 17633) @@ -124,7 +124,7 @@ /* read in a command line */ -TCHAR * ReadCommand (LPTSTR str, INT maxlen) +VOID ReadCommand (LPTSTR str, INT maxlen) { SHORT orgx; /* origin x/y */ SHORT orgy; @@ -508,15 +508,10 @@ default: #ifdef _UNICODE ch = ir.Event.KeyEvent.uChar.UnicodeChar; - charcount ++; - str = realloc(str, charcount); - - if ((ch >= 32 && ch <= 255)) + if ((ch >= 32 && ch <= 255) && (charcount != (maxlen - 2))) #else - ch = ir.Event.KeyEvent.uChar.AsciiChar; - str = realloc(str, 2 + current * sizeof(TCHAR)); - - if ((UCHAR)ch >= 32 ) + ch = ir.Event.KeyEvent.uChar.AsciiChar; + if ((UCHAR)ch >= 32 && (charcount != (maxlen - 2))) #endif /* _UNICODE */ { /* insert character into string... */ @@ -525,8 +520,6 @@ /* If this character insertion will cause screen scrolling, * adjust the saved origin of the command prompt. */ tempscreen = _tcslen(str + current) + curx; - str = realloc(str, tempscreen * sizeof(TCHAR)); - if ((tempscreen % maxx) == (maxx - 1) && (tempscreen / maxx) + cury == (maxy - 1)) { @@ -534,8 +527,6 @@ cury--; } - - for (count = charcount; count > current; count--) str[count] = str[count - 1]; str[current++] = ch; @@ -579,6 +570,4 @@ while (ir.Event.KeyEvent.wVirtualKeyCode != VK_RETURN); SetCursorType (bInsert, TRUE); - - return str; }

19 years, 3 months

[ekohl] 17632: - Enclose GUID in curly brackets.

by ekohl＠svn.reactos.com

- Enclose GUID in curly brackets. - Implement CM_Get_Class_Key_Name_ExA. Modified: trunk/reactos/lib/setupapi/cfgmgr.c _____ Modified: trunk/reactos/lib/setupapi/cfgmgr.c --- trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:18:39 UTC (rev 17631) +++ trunk/reactos/lib/setupapi/cfgmgr.c 2005-09-04 11:26:09 UTC (rev 17632) @@ -357,9 +357,39 @@ LPGUID ClassGuid, LPSTR pszKeyName, PULONG pulLength, ULONG ulFlags, HMACHINE hMachine) { - FIXME("%p %p %p %lx %lx\n", + WCHAR szBuffer[MAX_GUID_STRING_LEN]; + CONFIGRET ret = CR_SUCCESS; + ULONG ulLength; + ULONG ulOrigLength; + + TRACE("%p %p %p %lx %lx\n", ClassGuid, pszKeyName, pulLength, ulFlags, hMachine); - return CR_FAILURE; + + if (ClassGuid == NULL || pszKeyName == NULL || pulLength == NULL) + return CR_INVALID_POINTER; + + ulOrigLength = *pulLength; + *pulLength = 0; + + ulLength = MAX_GUID_STRING_LEN; + ret = CM_Get_Class_Key_Name_ExW(ClassGuid, szBuffer, &ulLength, + ulFlags, hMachine); + if (ret == CR_SUCCESS) + { + if (WideCharToMultiByte(CP_ACP, + 0, + szBuffer, + ulLength, + pszKeyName, + ulOrigLength, + NULL, + NULL) == 0) + ret = CR_FAILURE; + else + *pulLength = lstrlenA(pszKeyName) + 1; + } + + return CR_SUCCESS; } @@ -370,8 +400,12 @@ if (UuidToStringW(Guid, &lpString) != RPC_S_OK) return FALSE; - lstrcpyW(String, lpString); + lstrcpyW(&String[1], lpString); + String[0] = L'{'; + String[MAX_GUID_STRING_LEN - 2] = L'}'; + String[MAX_GUID_STRING_LEN - 1] = 0; + RpcStringFree(&lpString); return TRUE; @@ -400,7 +434,7 @@ return CR_BUFFER_SMALL; } - if (!GuidToString(ClassGuid, pszKeyName)) + if (!GuidToString(ClassGuid, pszKeyName)) return CR_INVALID_DATA; *pulLength = MAX_GUID_STRING_LEN;

19 years, 3 months

← Newer
1
...
52
53
54
55
56
57
58
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2005