Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 33583: Fix build
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:23:52 2008 New Revision: 33583 URL: http://svn.reactos.org/svn/reactos?rev=33583&view=rev Log: Fix build Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun May 18 10:23:52 2008 @@ -2597,7 +2597,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPWSTR pszGroupName) + LPCWSTR pszGroupName) { UNIMPLEMENTED; return ERROR_CALL_NOT_IMPLEMENTED; @@ -2893,7 +2893,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPSTR pszGroupName) + LPCSTR pszGroupName) { UNIMPLEMENTED; *pcbBytesNeeded = 0; @@ -2914,7 +2914,7 @@ LPBOUNDED_DWORD_256K pcbBytesNeeded, LPBOUNDED_DWORD_256K lpServicesReturned, LPBOUNDED_DWORD_256K lpResumeIndex, - LPWSTR pszGroupName) + LPCWSTR pszGroupName) { PMANAGER_HANDLE hManager; PSERVICE lpService;

1 0

[hpoussin] 33582: Add ms-dtyp.idl file, and use it
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 10:17:12 2008 New Revision: 33582 URL: http://svn.reactos.org/svn/reactos?rev=33582&view=rev Log: Add ms-dtyp.idl file, and use it Added: trunk/reactos/include/reactos/idl/ms-dtyp.idl (with props) Modified: trunk/reactos/include/reactos/idl/idl.rbuild trunk/reactos/include/reactos/idl/pnp.idl trunk/reactos/include/reactos/idl/svcctl.idl Modified: trunk/reactos/include/reactos/idl/idl.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rb… ============================================================================== --- trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/idl.rbuild [iso-8859-1] Sun May 18 10:17:12 2008 @@ -7,7 +7,7 @@ <module name="pnp_client" type="rpcclient"> <file>pnp.idl</file> </module> -<module name="scm_server" type="rpcserver"> +<module name="scm_server" type="rpcserver" allowwarnings="true"> <file>svcctl.idl</file> </module> <module name="scm_client" type="rpcclient"> @@ -19,7 +19,7 @@ <module name="eventlog_client" type="rpcclient" > <file>eventlogrpc.idl</file> </module> -<module name="lsa_server" type="rpcserver"> +<module name="lsa_server" type="rpcserver" allowwarnings="true"> <file>lsa.idl</file> </module> <module name="lsa_client" type="rpcclient"> Added: trunk/reactos/include/reactos/idl/ms-dtyp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/ms-dty… ============================================================================== --- trunk/reactos/include/reactos/idl/ms-dtyp.idl (added) +++ trunk/reactos/include/reactos/idl/ms-dtyp.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -1,0 +1,283 @@ +cpp_quote("#ifndef _DTYP_IDL"); +cpp_quote("#define _DTYP_IDL"); + +/* Common data types */ + +typedef int BOOL, *PBOOL, *LPBOOL; +typedef unsigned char BYTE, *PBYTE, *LPBYTE; +typedef char CHAR, *PCHAR; +typedef unsigned long DWORD, *PDWORD, *LPDWORD; +typedef unsigned int DWORD32; +typedef unsigned __int64 DWORD64; +//typedef unsigned long error_status_t; +typedef int INT, *LPINT; +typedef signed char INT8; +typedef signed short INT16; +typedef signed int INT32; +typedef signed __int64 INT64; +typedef signed int LONG32; +typedef signed __int64 LONG64; +cpp_quote("#if 0"); +typedef long NTSTATUS; +cpp_quote("#endif"); +typedef unsigned __int64 QWORD; +typedef short SHORT; +typedef __int64 TIME; +typedef unsigned char UCHAR, *PUCHAR; +typedef unsigned int UINT; +typedef unsigned char UINT8; +typedef unsigned short UINT16; +typedef unsigned int UINT32; +typedef unsigned __int64 UINT64; +typedef unsigned long ULONG, *PULONG; +typedef unsigned int ULONG32; +typedef unsigned __int64 ULONG64; +typedef unsigned __int64 ULONGLONG; +typedef unsigned short USHORT; +typedef unsigned short WORD, *PWORD, *LPWORD; +typedef long LONG, *PLONG, *LPLONG; +typedef signed __int64 LONGLONG; + +typedef float FLOAT; +typedef double DOUBLE; + +typedef BYTE BOOLEAN, *PBOOLEAN; +#ifdef _WIN64 +typedef __int64 LONG_PTR; +typedef unsigned __int64 ULONG_PTR; +#else +typedef LONG LONG_PTR; +typedef ULONG ULONG_PTR; +#endif +typedef ULONG_PTR SIZE_T; +cpp_quote("#if 0"); +typedef UCHAR *STRING; +cpp_quote("#endif"); +typedef DWORD NET_API_STATUS; +typedef ULONG_PTR DWORD_PTR; +typedef ULONGLONG DWORDLONG, *PDWORDLONG; +typedef DWORD HCALL; +//typedef DWORD HRESULT; + +typedef void *HANDLE; +typedef void /*VOID,*/ *PVOID; +typedef void *RPC_BINDING_HANDLE; +typedef [context_handle] void *PCONTEXT_HANDLE, *PPCONTEXT_HANDLE; + +typedef wchar_t WCHAR, *PWCHAR; +cpp_quote("#if 0"); +typedef wchar_t UNICODE; +cpp_quote("#endif"); +typedef const char *LPCSTR; +typedef const wchar_t *LPCWSTR; +typedef char *PSTR, *LPSTR; +typedef wchar_t *LPWSTR, *PWSTR; +typedef const wchar_t *LMCSTR; +typedef WCHAR *LMSTR; +typedef WCHAR *BSTR; + +cpp_quote("#if 0"); +#ifdef Unicode +typedef LPCWSTR LPCTSTR; +typedef LPWSTR LPTSTR; +typedef WCHAR TCHAR; +#else +typedef LPCSTR LPCTSTR; +typedef LPSTR LPTSTR; +typedef CHAR TCHAR; +#endif +cpp_quote("#endif"); + +/* Common data structures */ + +cpp_quote("#if 0"); + +typedef struct _FILETIME { + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME, *PFILETIME, *LPFILETIME; + +typedef struct _GUID { + DWORD Data1; + WORD Data2; + WORD Data3; + BYTE Data4[8]; +} GUID, UUID, *PGUID; + +typedef struct _LARGE_INTEGER { + LONGLONG QuadPart; +} LARGE_INTEGER, *PLARGE_INTEGER; + +typedef DWORD LCID; + +cpp_quote("#endif"); + +typedef struct _RPC_UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; +} RPC_UNICODE_STRING, *PRPC_UNICODE_STRING; + +cpp_quote("#if 0"); + +typedef struct _SYSTEMTIME { + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; +} SYSTEMTIME, *PSYSTEMTIME; + +typedef struct _UINT128 { + UINT64 lower; + UINT64 upper; +} UINT128, *PUINT128; + +typedef struct _ULARGE_INTEGER { + ULONGLONG QuadPart; +} ULARGE_INTEGER, *PULARGE_INTEGER; + +typedef struct _UNICODE_STRING { + USHORT Length; + USHORT MaximumLength; + [size_is(MaximumLength/2), length_is(Length/2)] LPWSTR Buffer; +} UNICODE_STRING, *PUNICODE_STRING; + +cpp_quote("#endif"); + +/* Constructed security types */ + +cpp_quote("#if 0"); + +typedef struct _SID_IDENTIFIER_AUTHORITY { + BYTE Value[6]; +} SID_IDENTIFIER_AUTHORITY; + +typedef struct _SID { + BYTE Revision; + BYTE SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + [size_is(SubAuthorityCount)] DWORD SubAuthority[*]; +} SID, *PSID; + +typedef struct _ACCESS_MASK { + DWORD ACCESS_MASK; +} ACCESS_MASK, *PACCESS_MASK; + +typedef struct _ACE_HEADER { + UCHAR AceType; + UCHAR AceFlags; + USHORT AceSize; +} ACE_HEADER, *PACE_HEADER; + +typedef struct _ACCESS_ALLOWED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_ALLOWED_ACE, *PACCESS_ALLOWED_ACE; + +typedef struct _ACCESS_ALLOWED_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_OBJECT_ACE, *PACCESS_ALLOWED_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_DENIED_ACE, *PACCESS_DENIED_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_ACE, *PACCESS_ALLOWED_CALLBACK_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_ACE, *PACCESS_DENIED_CALLBACK_ACE; + +typedef struct _ACCESS_ALLOWED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_ALLOWED_CALLBACK_OBJECT_ACE, *PACCESS_ALLOWED_CALLBACK_OBJECT_ACE; + +typedef struct _ACCESS_DENIED_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} ACCESS_DENIED_CALLBACK_OBJECT_ACE, *PACCESS_DENIED_CALLBACK_OBJECT_ACE; + +typedef struct _SYSTEM_AUDIT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_AUDIT_ACE, *PSYSTEM_AUDIT_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_ACE, *PSYSTEM_AUDIT_CALLBACK_ACE; + +typedef struct _SYSTEM_MANDATORY_LABEL_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD SidStart; +} SYSTEM_MANDATORY_LABEL_ACE, *PSYSTEM_MANDATORY_LABEL_ACE; + +typedef struct _SYSTEM_AUDIT_CALLBACK_OBJECT_ACE { + ACE_HEADER Header; + ACCESS_MASK Mask; + DWORD Flags; + GUID ObjectType; + GUID InheritedObjectType; + DWORD SidStart; +} SYSTEM_AUDIT_CALLBACK_OBJECT_ACE, *PSYSTEM_AUDIT_CALLBACK_OBJECT_ACE; + +typedef struct _ACL { + UCHAR AclRevision; + UCHAR Sbz1; + USHORT AclSize; + USHORT AceCount; + USHORT Sbz2; +} ACL, *PACL; + +typedef struct _SECURITY_DESCRIPTOR { + UCHAR Revision; + UCHAR Sbz1; + USHORT Control; + ULONG Owner; + ULONG Group; + ULONG Sacl; + ULONG Dacl; +} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; + +typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; + +cpp_quote("#endif"); + +typedef struct _RPC_SID { + UCHAR Revision; + UCHAR SubAuthorityCount; + SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + [size_is(SubAuthorityCount)] DWORD SubAuthority[]; +} RPC_SID, *PRPC_SID; + +cpp_quote("#endif /* _DTYP_IDL */"); Propchange: trunk/reactos/include/reactos/idl/ms-dtyp.idl ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/include/reactos/idl/pnp.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/pnp.id… ============================================================================== --- trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/pnp.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -2,7 +2,7 @@ * Plug and Play Manager RPC interface definition */ -#include "include/reactos/idl/wtypes.idl" +#include <ms-dtyp.idl> const unsigned long PNP_MAX_STRING_LEN = 32767; const unsigned long PNP_MAX_DEVICE_ID_LEN = 200; Modified: trunk/reactos/include/reactos/idl/svcctl.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/svcctl… ============================================================================== --- trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] (original) +++ trunk/reactos/include/reactos/idl/svcctl.idl [iso-8859-1] Sun May 18 10:17:12 2008 @@ -2,7 +2,7 @@ * Service Control Manager (SCM) interface definition */ -#include "include/reactos/idl/wtypes.idl" +#include <ms-dtyp.idl> const unsigned int MAX_SERVICE_NAME_LENGTH = 255; const unsigned short SC_MAX_DEPEND_SIZE = 4 * 1024;

1 0

[dchapyshev] 33581: - Add "ReactOS Standard" and "ReactOS Classic" color schemes - Add registry keys for cursors schemes
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 10:14:04 2008 New Revision: 33581 URL: http://svn.reactos.org/svn/reactos?rev=33581&view=rev Log: - Add "ReactOS Standard" and "ReactOS Classic" color schemes - Add registry keys for cursors schemes Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/boot/bootdata/hivesft.inf Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sun May 18 10:14:04 2008 @@ -23,6 +23,139 @@ HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\International",,0x00000012 HKCU,"Control Panel\International","Locale",0x00000000,"0409" + +;Cursors Schemes +HKCU,"Control Panel\Cursors",,,"ReactOS Default" +HKCU,"Control Panel\Cursors","Scheme Source",0x00010001,0x00000002 + +; Color schemes +HKCU,"Control Panel\Current","Color Schemes",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance","Current",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance","NewCurrent",0x00020000,"ReactOS Standard" +HKCU,"Control Panel\Appearance\New Schemes","SelectedStyle",0x00020000,"0" +; ReactOS Standard +HKCU,"Control Panel\Appearance\New Schemes\0","DisplayName",0x00020000,"@themeui.dll,-883" +HKCU,"Control Panel\Appearance\New Schemes\0","SelectedSize",0x00020000,"0" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Flat Menus",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #1",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #2",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #4",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #5",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Font #3",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,54,00,61,00,68,00,6f,00,6d,00,61,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #0",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #1",0x00010001,0x00a56e3a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #2",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #3",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #4",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #5",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #6",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #7",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #8",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #9",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #10",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #11",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #12",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #13",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #14",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #15",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #16",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #17",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #18",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #19",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #20",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #21",0x00010001,0x00404040 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #22",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #23",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #24",0x00010001,0x00e1ffff +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #25",0x00010001,0x00b5b5b5 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #26",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #27",0x00010001,0x00f0caa6 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #28",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #29",0x00010001,0x006a240a +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Color #30",0x00010001,0x00c8d0d4 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\0\Sizes\0","LegacyName",0x00020000,"ReactOS Standard" +; ReactOS Classic +HKCU,"Control Panel\Appearance\New Schemes\1","DisplayName",0x00020000,"@themeui.dll,-880" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","DisplayName",0x00020000,"@themeui.dll,-2019" +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Flat Menus",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #0",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,fc,\ +7f,22,14,fc,7f,b0,fe,12,00,00,00,00,00,00,00,00,00,98,23,eb,77 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #1",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,bc,02,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,f0,\ +77,00,20,14,00,00,00,00,10,80,05,14,00,f0,1f,14,00,00,00,14,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #2",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,14,\ +00,88,fb,e8,77,02,02,00,00,ac,b9,f0,77,00,00,00,00,20,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #4",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,00,\ +00,00,00,00,00,00,00,00,00,00,00,00,00,7c,6b,e8,77,00,00,00,00 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #5",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,00,\ +00,06,00,00,00,18,00,00,00,ff,ff,ff,ff,f0,4b,21,fc,00,c4,f0,77 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Font #3",0x00000001,f5,ff,ff,ff,00,00,00,\ +00,00,00,00,00,00,00,00,00,90,01,00,00,00,00,00,00,00,00,00,00,4d,00,69,00,63,00,72,00,6f,00,73,\ +00,6f,00,66,00,74,00,20,00,53,00,61,00,6e,00,73,00,20,00,53,00,65,00,72,00,69,00,66,00,00,00,14,\ +00,0b,00,00,00,00,ff,12,00,50,00,00,00,c0,fe,12,00,0c,10,00,01 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #0",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #1",0x00010001,0x00a56e3a +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #2",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #3",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #4",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #5",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #6",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #7",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #8",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #9",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #10",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #11",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #12",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #13",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #14",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #15",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #16",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #17",0x00010001,0x00808080 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #18",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #19",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #20",0x00010001,0x00ffffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #21",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #22",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #23",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #24",0x00010001,0x00e1ffff +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #25",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #26",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #27",0x00010001,0x00d08410 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #28",0x00010001,0x00b5b5b5 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #29",0x00010001,0x00800000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Color #30",0x00010001,0x00c0c0c0 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","Contrast",0x00010001,0x00000000 +HKCU,"Control Panel\Appearance\New Schemes\1\Sizes\0","LegacyName",0x00020000,"ReactOS Classic" HKCU,"Environment",,0x00000012 HKCU,"Environment","TEMP",0x00020000,"%USERPROFILE%\Local Settings\Temp" Modified: trunk/reactos/boot/bootdata/hivesft.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft.inf [iso-8859-1] Sun May 18 10:14:04 2008 @@ -795,6 +795,9 @@ HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","7",0x00000000,"time.windows.com" HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\DateTime\Servers","8",0x00000000,"time.nist.gov" +;Cursors Schemes +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Control Panel\Cursors\Schemes","ReactOS Default",0x00020000,"\",,,,,,,,,,,,,\"" + ; deskadp.dll shell extension HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Controls Folder\Device\shellex\PropertySheetHandlers\Display Adapter CPL Extension","",0x00000000,"{42071712-76d4-11d1-8b24-00a0c9068ff3}"

1 0

[dchapyshev] 33580: - Update icons
by dchapyshev＠svn.reactos.org 18 May '08

18 May '08

Author: dchapyshev Date: Sun May 18 10:06:30 2008 New Revision: 33580 URL: http://svn.reactos.org/svn/reactos?rev=33580&view=rev Log: - Update icons Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico trunk/reactos/dll/cpl/main/resources/folder_closed.ico Modified: trunk/reactos/dll/cpl/desk/resources/applet.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/resources/app… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/dll/cpl/main/resources/folder_closed.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/resources/fol… ============================================================================== Binary files - no diff available.

1 0

[ekohl] 33579: - Rename CheckUserName() to CheckAccountName() and move it to a new source file (misc.c). - Also use CheckAccountName() to check group names for illegal characters.
by ekohl＠svn.reactos.org 18 May '08

18 May '08

Author: ekohl Date: Sun May 18 09:59:44 2008 New Revision: 33579 URL: http://svn.reactos.org/svn/reactos?rev=33579&view=rev Log: - Rename CheckUserName() to CheckAccountName() and move it to a new source file (misc.c). - Also use CheckAccountName() to check group names for illegal characters. Added: trunk/reactos/dll/cpl/usrmgr/misc.c (with props) Modified: trunk/reactos/dll/cpl/usrmgr/groups.c trunk/reactos/dll/cpl/usrmgr/users.c trunk/reactos/dll/cpl/usrmgr/usrmgr.h trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild Modified: trunk/reactos/dll/cpl/usrmgr/groups.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/groups.c?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/groups.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -122,6 +122,12 @@ break; case IDOK: + if (!CheckAccountName(hwndDlg, IDC_GROUP_NEW_NAME, NULL)) + { + SetFocus(GetDlgItem(hwndDlg, IDC_GROUP_NEW_NAME)); + SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, EM_SETSEL, 0, -1); + break; + } nLength = SendDlgItemMessage(hwndDlg, IDC_GROUP_NEW_NAME, WM_GETTEXTLENGTH, 0, 0); if (nLength > 0) @@ -338,6 +344,9 @@ if (lstrcmp(szOldGroupName, szNewGroupName) == 0) return FALSE; + /* Check the group name for illegal characters */ + if (!CheckAccountName(NULL, 0, szNewGroupName)) + return FALSE; /* Change the user name */ lgrpi0.lgrpi0_name = szNewGroupName; Added: trunk/reactos/dll/cpl/usrmgr/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/misc.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/misc.c (added) +++ trunk/reactos/dll/cpl/usrmgr/misc.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -1,0 +1,38 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS User Manager Control Panel + * FILE: dll/cpl/usrmgr/misc.c + * PURPOSE: Miscellaneus functions + * + * PROGRAMMERS: Eric Kohl + */ + +#include "usrmgr.h" + + +BOOL +CheckAccountName(HWND hwndDlg, + INT nIdDlgItem, + LPTSTR lpAccountName) +{ + TCHAR szAccountName[256]; + UINT uLen; + + if (lpAccountName) + uLen = _tcslen(lpAccountName); + else + uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szAccountName, 256); + + /* Check the account name */ + if (uLen > 0 && + _tcspbrk((lpAccountName) ? lpAccountName : szAccountName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) + { + MessageBox(hwndDlg, + TEXT("The account name you entered is invalid! An account name must not contain the following charecters: *+,/:;<=>?[\\]|"), + TEXT("ERROR"), + MB_OK | MB_ICONERROR); + return FALSE; + } + + return TRUE; +} Propchange: trunk/reactos/dll/cpl/usrmgr/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/cpl/usrmgr/users.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Sun May 18 09:59:44 2008 @@ -56,36 +56,6 @@ } -static BOOL -CheckUserName(HWND hwndDlg, - INT nIdDlgItem, - LPTSTR lpUserName) -{ - TCHAR szUserName[256]; - UINT uLen; - - if (lpUserName) - uLen = _tcslen(lpUserName); - else - uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256); - - /* Check the user name */ - if (uLen > 0 && - _tcspbrk((lpUserName) ? lpUserName : szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL) - { - MessageBox(hwndDlg, - TEXT("The user name you entered is invalid! A user name must not contain the following charecters: *+,/:;<=>?[\\]|"), - TEXT("ERROR"), - MB_OK | MB_ICONERROR); - return FALSE; - } - - - return TRUE; -} - - - INT_PTR CALLBACK ChangePasswordDlgProc(HWND hwndDlg, UINT uMsg, @@ -204,7 +174,7 @@ break; case IDOK: - if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME, NULL)) + if (!CheckAccountName(hwndDlg, IDC_USER_NEW_NAME, NULL)) { SetFocus(GetDlgItem(hwndDlg, IDC_USER_NEW_NAME)); SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETSEL, 0, -1); @@ -554,7 +524,7 @@ return FALSE; /* Check the user name for illegal characters */ - if (!CheckUserName(NULL, 0, szNewUserName)) + if (!CheckAccountName(NULL, 0, szNewUserName)) return FALSE; /* Change the user name */ Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.h?re… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.h [iso-8859-1] Sun May 18 09:59:44 2008 @@ -29,6 +29,11 @@ INT_PTR CALLBACK GroupsPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ExtraPageProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); +/* misc.c */ +BOOL +CheckAccountName(HWND hwndDlg, + INT nIdDlgItem, + LPTSTR lpAccountName); #endif /* __CPL_DESK_H__ */ Modified: trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/usrmgr.rbui… ============================================================================== --- trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/usrmgr/usrmgr.rbuild [iso-8859-1] Sun May 18 09:59:44 2008 @@ -15,6 +15,7 @@ <library>msvcrt</library> <file>extra.c</file> <file>groups.c</file> + <file>misc.c</file> <file>users.c</file> <file>usrmgr.c</file> <file>usrmgr.rc</file>

1 0

[janderwald] 33578: - default to seperator item type - add the styles grayed and disabled in case they have not been added - initialize allocated user buffer to zero - allow support for bitmap items with MF_HELP style - check result of WideCharToMultiByte - always zero terminate a string buffer when enough space is available
by janderwald＠svn.reactos.org 18 May '08

18 May '08

Author: janderwald Date: Sun May 18 09:18:00 2008 New Revision: 33578 URL: http://svn.reactos.org/svn/reactos?rev=33578&view=rev Log: - default to seperator item type - add the styles grayed and disabled in case they have not been added - initialize allocated user buffer to zero - allow support for bitmap items with MF_HELP style - check result of WideCharToMultiByte - always zero terminate a string buffer when enough space is available Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun May 18 09:18:00 2008 @@ -1109,8 +1109,15 @@ } else /* Not a popup */ { - if (flags == 0 && id == 0 && *str == 0) - flags = MF_SEPARATOR | MF_GRAYED; + if (*str == 0) + flags = MF_SEPARATOR; + + if (flags & MF_SEPARATOR) + { + if (!(flags & (MF_GRAYED | MF_DISABLED))) + flags |= MF_GRAYED | MF_DISABLED; + } + if(!unicode) AppendMenuA(hMenu, flags, id, *str ? str : NULL); else @@ -3705,19 +3712,38 @@ */ if(Flags & MF_BITMAP) { - mii->fMask |= MIIM_BITMAP; /* Use the new way of seting hbmpItem.*/ - mii->hbmpItem = (HBITMAP) NewItem; - mii->fType &= ~MFT_BITMAP; /* just incase, Kill the old way */ + if (mii->fType & MFT_BITMAP) + { + /* use old way of storing bitmap */ + mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); + mii->fType |= MF_BITMAP; + mii->dwTypeData = (LPWSTR)NewItem; + } + else + { + /* use new way of storing type */ + mii->hbmpItem = (HBITMAP) NewItem; + mii->fType |= MFT_BITMAP; + mii->fMask |= MIIM_BITMAP; + } + + if (Flags & MF_HELP) + { + /* increase ident */ + mii->fType |= MF_HELP; + } } else if(Flags & MF_OWNERDRAW) { mii->fType |= MFT_OWNERDRAW; - mii->fMask |= MIIM_DATA; - mii->dwItemData = (DWORD) NewItem; + mii->fMask |= (MIIM_TYPE | MIIM_FTYPE); + mii->dwTypeData = (LPWSTR) NewItem; } else if (Flags & MF_SEPARATOR) { mii->fType |= MFT_SEPARATOR; + if (!(Flags & (MF_GRAYED|MF_DISABLED))) + Flags |= MF_GRAYED|MF_DISABLED; } else /* Default action MF_STRING. */ { @@ -3742,15 +3768,23 @@ NewItem = (LPCWSTR) NewItemA; } } - } - mii->fMask |= MIIM_STRING; - mii->fType |= MFT_STRING; /* Zero */ - mii->dwTypeData = (LPWSTR)NewItem; - if (Unicode) - mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); + + if (Flags & MF_HELP) + mii->fType |= MF_HELP; + mii->fMask |= MIIM_STRING; + mii->fType |= MFT_STRING; /* Zero */ + mii->dwTypeData = (LPWSTR)NewItem; + if (Unicode) + mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); + else + mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem)); + } else - mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem)); - mii->hbmpItem = NULL; + { + mii->fType |= MFT_SEPARATOR; + if (!(Flags & (MF_GRAYED|MF_DISABLED))) + Flags |= MF_GRAYED|MF_DISABLED; + } } if(Flags & MF_RIGHTJUSTIFY) /* Same as MF_HELP */ @@ -3767,14 +3801,14 @@ mii->fType |= MFT_MENUBARBREAK; } - if(Flags & MF_GRAYED) + if(Flags & MF_GRAYED || Flags & MF_DISABLED) { - mii->fState |= MFS_GRAYED; - mii->fMask |= MIIM_STATE; - } - else if(Flags & MF_DISABLED) - { - mii->fState |= MFS_DISABLED; + if (Flags & MF_GRAYED) + mii->fState |= MF_GRAYED; + + if (Flags & MF_DISABLED) + mii->fState |= MF_DISABLED; + mii->fMask |= MIIM_STATE; } else if (Flags & MF_HILITE) @@ -4213,6 +4247,7 @@ miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, miiW.cch * sizeof(WCHAR)); if (miiW.dwTypeData == NULL) return FALSE; + miiW.dwTypeData[0] = 0; } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO)&miiW, FALSE)) @@ -4233,13 +4268,27 @@ if ((miiW.fMask & MIIM_STRING) || (IS_STRING_ITEM(miiW.fType))) { - WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, - mii->cch, NULL, NULL); + if (miiW.cch) + { + if (!WideCharToMultiByte(CP_ACP, 0, miiW.dwTypeData, miiW.cch, AnsiBuffer, mii->cch, NULL, NULL)) + { + AnsiBuffer[0] = 0; + } + if (Count > miiW.cch) + { + AnsiBuffer[miiW.cch] = 0; + } + mii->cch = mii->cch; + } + } + else + { + AnsiBuffer[0] = 0; } RtlFreeHeap(GetProcessHeap(), 0, miiW.dwTypeData); mii->dwTypeData = AnsiBuffer; - mii->cch = strlen(AnsiBuffer); + return TRUE; } @@ -4281,6 +4330,7 @@ miiW.dwTypeData = RtlAllocateHeap(GetProcessHeap(), 0, miiW.cch * sizeof(WCHAR)); if (miiW.dwTypeData == NULL) return FALSE; + miiW.dwTypeData[0] = 0; } if (!NtUserMenuItemInfo(Menu, Item, ByPosition, (PROSMENUITEMINFO) &miiW, FALSE))

1 0

[hpoussin] 33577: Forward all IRPs, even unknown ones
by hpoussin＠svn.reactos.org 18 May '08

18 May '08

Author: hpoussin Date: Sun May 18 06:45:26 2008 New Revision: 33577 URL: http://svn.reactos.org/svn/reactos?rev=33577&view=rev Log: Forward all IRPs, even unknown ones Modified: trunk/reactos/drivers/serial/serenum/serenum.c Modified: trunk/reactos/drivers/serial/serenum/serenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/serial/serenum/ser… ============================================================================== --- trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/serial/serenum/serenum.c [iso-8859-1] Sun May 18 06:45:26 2008 @@ -37,55 +37,16 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - NTSTATUS Status = STATUS_NOT_SUPPORTED; - if (((PCOMMON_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->IsFDO) { - /* Forward some IRPs to lower device */ - switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) - { - case IRP_MJ_CREATE: - case IRP_MJ_CLOSE: - case IRP_MJ_CLEANUP: - case IRP_MJ_QUERY_INFORMATION: - case IRP_MJ_READ: - case IRP_MJ_WRITE: - case IRP_MJ_DEVICE_CONTROL: - return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); - default: - { - WARN_(SERENUM, "FDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - ASSERT(FALSE); - return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); - } - } + /* Forward IRPs to lower device */ + return ForwardIrpToLowerDeviceAndForget(DeviceObject, Irp); } else { - /* Forward some IRPs to attached FDO */ - switch (IoGetCurrentIrpStackLocation(Irp)->MajorFunction) - { - case IRP_MJ_CREATE: - case IRP_MJ_CLOSE: - case IRP_MJ_CLEANUP: - case IRP_MJ_READ: - case IRP_MJ_WRITE: - case IRP_MJ_DEVICE_CONTROL: - return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); - default: - { - WARN_(SERENUM, "PDO stub for major function 0x%lx\n", - IoGetCurrentIrpStackLocation(Irp)->MajorFunction); - ASSERT(FALSE); - return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); - } - } + /* Forward IRPs to attached FDO */ + return ForwardIrpToAttachedFdoAndForget(DeviceObject, Irp); } - - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; } /*

1 0

[gbrunmar] 33576: Reverted winesync's wrongly updated msi.rbuild to get rid of "always build msi" problem again.
by gbrunmar＠svn.reactos.org 18 May '08

18 May '08

Author: gbrunmar Date: Sun May 18 06:45:17 2008 New Revision: 33576 URL: http://svn.reactos.org/svn/reactos?rev=33576&view=rev Log: Reverted winesync's wrongly updated msi.rbuild to get rid of "always build msi" problem again. Modified: trunk/reactos/dll/win32/msi/msi.rbuild Modified: trunk/reactos/dll/win32/msi/msi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.rbuild?r… ============================================================================== --- trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/msi.rbuild [iso-8859-1] Sun May 18 06:45:17 2008 @@ -70,13 +70,13 @@ <library>kernel32</library> <library>odbccp32</library> <library>ntdll</library> - <dependency>msi_msiserver_typelib</dependency> - <dependency>msi_msiserver_header</dependency> + <dependency>msiserver</dependency> + <dependency>msiheader</dependency> </module> -<module name="msi_msiserver_header" type="idlheader"> +<module name="msiserver" type="embeddedtypelib" allowwarnings="true"> <file>msiserver.idl</file> </module> -<module name="msi_msiserver_typelib" type="embeddedtypelib" allowwarnings="true"> +<module name="msiheader" type="idlheader"> <file>msiserver.idl</file> </module> </group>

1 0

[gbrunmar] 33575: Reminder to self: Don't rely on MSDN. This should get taskmgr working again.
by gbrunmar＠svn.reactos.org 18 May '08

18 May '08

Author: gbrunmar Date: Sun May 18 06:41:32 2008 New Revision: 33575 URL: http://svn.reactos.org/svn/reactos?rev=33575&view=rev Log: Reminder to self: Don't rely on MSDN. This should get taskmgr working again. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun May 18 06:41:32 2008 @@ -1684,7 +1684,7 @@ SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); return -1; } - if (!IsWindow(hWndParent)) + if (hWndParent != NULL && !IsWindow(hWndParent)) { SetLastError(ERROR_INVALID_WINDOW_HANDLE); return 0; @@ -1717,7 +1717,7 @@ SetLastError(ERROR_RESOURCE_NAME_NOT_FOUND); return -1; } - if (!IsWindow(hWndParent)) + if (hWndParent != NULL && !IsWindow(hWndParent)) { SetLastError(ERROR_INVALID_WINDOW_HANDLE); return 0;

1 0

[fireball] 33574: - Add a comment describing behavior in case of HvSyncHive failure.
by fireball＠svn.reactos.org 18 May '08

18 May '08

Author: fireball Date: Sun May 18 06:26:36 2008 New Revision: 33574 URL: http://svn.reactos.org/svn/reactos?rev=33574&view=rev Log: - Add a comment describing behavior in case of HvSyncHive failure. Modified: trunk/reactos/ntoskrnl/config/cmapi.c Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun May 18 06:26:36 2008 @@ -18,18 +18,18 @@ NTAPI CmpDoFlushAll(IN BOOLEAN ForceFlush) { - NTSTATUS Status; PLIST_ENTRY NextEntry; PCMHIVE Hive; - BOOLEAN Result = TRUE; + NTSTATUS Status; + BOOLEAN Result = TRUE; /* Make sure that the registry isn't read-only now */ if (CmpNoWrite) return TRUE; - + /* Otherwise, acquire the hive list lock and disable force flush */ CmpForceForceFlush = FALSE; ExAcquirePushLockShared(&CmpHiveListHeadLock); - + /* Loop the hive list */ NextEntry = CmpHiveListHead.Flink; while (NextEntry != &CmpHiveListHead) @@ -43,6 +43,8 @@ /* Do the sync */ Status = HvSyncHive(&Hive->Hive); + + /* If something failed - set the flag and continue looping*/ if (!NT_SUCCESS(Status)) Result = FALSE; /* Release the flusher lock */ @@ -52,7 +54,7 @@ /* Try the next entry */ NextEntry = NextEntry->Flink; } - + /* Release lock and return */ ExReleasePushLock(&CmpHiveListHeadLock); return Result;

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